Update to 7.27.0

1. Added Domains menu to manage Domains and SSL Certificates
2. Added Add Site automatic record creation when adding websites (Only supported by IPv4)
3. Added Vietnamese language
4. Added Indonesian language
5. Added HTTPS Protection function for Website (disables automatic HTTP to HTTPS redirection when enabled)
6. Added Mail Marketing -- Automation trigger tasks
7. Added Mail Marketing -- Groups Import, Export, Merge
8. Added Mail Marketing -- Subscribers to support paste import
9. Added Mail Marketing -- Template Import Export Duplicate
10. Added Mail server -- Other Settings add timed Auto Responder
11. Added Mail Marketing -- Suspend List to detect abnormal mailboxes
12. Added Mail Marketing -- Marketing Task to export error mail logs
13. Added Mail Domain -- SSL certificate expiration alert
14. Optimized Webmail management to display based on domain additions
15. Optimize Website Interface Button Integration
16. Optimize the response speed of WP Toolkit interface

class/panelSSL.py

@@ -1111,7 +1111,7 @@ class panelSSL:
                 if "ssl_hash" in Info:
                     get.ssl_hash = Info['ssl_hash']
                 result = self.SetCertToSite(get)
-                if not result:
+                if not result or result.get("status") is False:
                     set_result['status'] = False
                     failnum += 1
                     faildList.append(set_result)
@@ -1174,6 +1174,9 @@ class panelSSL:
             public.serviceReload()
             return public.return_msg_gettext(True, public.lang("Setup successfully!"))
         except Exception as ex:
+            import traceback
+            public.print_log(traceback.format_exc())
+            public.print_log(f"error : {ex}")
             if 'isBatch' in get: return False
             return public.returnMsg(False, 'SET_ERROR,' + public.get_error_info())
 
@@ -1224,10 +1227,15 @@ class panelSSL:
     # 读取证书
     def GetCert(self, get):
         vpath = os.path.join('/www/server/panel/vhost/ssl', get.certName.replace("*.", ''))
-        if not os.path.exists(vpath): return public.return_msg_gettext(False, public.lang("Certificate does NOT exist!"))
-        data = {}
-        data['privkey'] = public.readFile(vpath + '/privkey.pem')
-        data['fullchain'] = public.readFile(vpath + '/fullchain.pem')
+        if not os.path.exists(vpath):
+            return public.return_msg_gettext(False, public.lang("Certificate does NOT exist!"))
+            # vpath = os.path.join('/www/server/panel/vhost/ssl_saved', get.ssl_hash)
+            # if not os.path.exists(vpath):
+            #     return public.return_msg_gettext(False, public.lang("Certificate does NOT exist!"))
+        data = {
+            'privkey': public.readFile(vpath + '/privkey.pem'),
+            'fullchain': public.readFile(vpath + '/fullchain.pem'),
+        }
         return data
 
     # 获取证书名称