simplify getPHPString() & update php version for mail domain

Author: Istiak Ferdous

managePHP/phpManager.py

@@ -7,6 +7,7 @@
 from xml.etree import ElementTree
 from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 
+
 class PHPManager:
 
     @staticmethod
@@ -23,27 +24,9 @@ def findPHPVersions():
 
     @staticmethod
     def getPHPString(phpVersion):
-
-        if phpVersion == "PHP 5.3":
-            php = "53"
-        elif phpVersion == "PHP 5.4":
-            php = "54"
-        elif phpVersion == "PHP 5.5":
-            php = "55"
-        elif phpVersion == "PHP 5.6":
-            php = "56"
-        elif phpVersion == "PHP 7.0":
-            php = "70"
-        elif phpVersion == "PHP 7.1":
-            php = "71"
-        elif phpVersion == "PHP 7.2":
-            php = "72"
-        elif phpVersion == "PHP 7.3":
-            php = "73"
-        elif phpVersion == "PHP 7.4":
-            php = "74"
-        elif phpVersion == "PHP 8.0":
-            php = "80"
+        # Ex: "PHP 5.3" type string, return Ex: "53" type string
+        phpVersion = phpVersion.split()
+        php = phpVersion[1].replace(".", "")
 
         return php
 
@@ -134,22 +117,22 @@ def savePHPConfigBasic(data):
         max_input_time = data['max_input_time']
         post_max_size = data['post_max_size']
 
-        if allow_url_fopen == True:
+        if allow_url_fopen:
             allow_url_fopen = "allow_url_fopen = On"
         else:
             allow_url_fopen = "allow_url_fopen = Off"
 
-        if display_errors == True:
+        if display_errors:
             display_errors = "display_errors = On"
         else:
             display_errors = "display_errors = Off"
 
-        if file_uploads == True:
+        if file_uploads:
             file_uploads = "file_uploads = On"
         else:
             file_uploads = "file_uploads = Off"
 
-        if allow_url_include == True:
+        if allow_url_include:
             allow_url_include = "allow_url_include = On"
         else:
             allow_url_include = "allow_url_include = Off"
@@ -303,7 +286,3 @@ def fetchPHPExtensions(data):
         json_data = json_data + ']'
         final_json = json.dumps({'status': 1, 'error_message': "None", "data": json_data})
         return HttpResponse(final_json)
-
-
-
-

plogical/virtualHostUtilities.py

@@ -58,7 +58,7 @@ def setupAutoDiscover(mailDomain, tempStatusPath, virtualHostName, admin):
             childDomain = 'mail.%s' % (virtualHostName)
             childPath = '/home/%s/%s' % (virtualHostName, childDomain)
 
-            result = virtualHostUtilities.createDomain(virtualHostName, childDomain, 'PHP 7.2', childPath, 1, 0, 0,
+            result = virtualHostUtilities.createDomain(virtualHostName, childDomain, 'PHP 7.3', childPath, 1, 0, 0,
                                               admin.userName, 0, "/home/cyberpanel/" + str(randint(1000, 9999)))
 
             if result[0] == 0:
@@ -120,7 +120,7 @@ def setupAutoDiscover(mailDomain, tempStatusPath, virtualHostName, admin):
     @staticmethod
     def createVirtualHost(virtualHostName, administratorEmail, phpVersion, virtualHostUser, ssl,
                           dkimCheck, openBasedir, websiteOwner, packageName, apache,
-                          tempStatusPath='/home/cyberpanel/fakePath', mailDomain = None, LimitsCheck = 1):
+                          tempStatusPath='/home/cyberpanel/fakePath', mailDomain=None, LimitsCheck=1):
         try:
 
             logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Running some checks..,0')
@@ -505,7 +505,6 @@ def issueSSLForHostName(virtualHost, path):
             print("1,None")
             return 1, 'None'
 
-
         except BaseException as msg:
             logging.CyberCPLogFileWriter.writeToFile(str(msg) + "  [issueSSLForHostName]")
             print("0," + str(msg))
@@ -929,7 +928,7 @@ def saveSSL(virtualHost, keyPath, certPath):
 
     @staticmethod
     def createDomain(masterDomain, virtualHostName, phpVersion, path, ssl, dkimCheck, openBasedir, owner, apache,
-                     tempStatusPath='/home/cyberpanel/fakePath', LimitsCheck = 1):
+                     tempStatusPath='/home/cyberpanel/fakePath', LimitsCheck=1):
         try:
 
             logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Running some checks..,0')
@@ -957,7 +956,6 @@ def createDomain(masterDomain, virtualHostName, phpVersion, path, ssl, dkimCheck
                                                               'This domain already exists as child domain. [404]')
                     return 0, "This domain already exists as child domain."
 
-
                 if ChildDomains.objects.filter(domain=virtualHostName.lstrip('www.')).count() > 0:
                     logging.CyberCPLogFileWriter.statusWriter(tempStatusPath,
                                                               'This domain already exists as child domain. [404]')