diff --git a/ApachController/ApacheController.py b/ApachController/ApacheController.py index 498f74665..289cf2e6b 100755 --- a/ApachController/ApacheController.py +++ b/ApachController/ApacheController.py @@ -48,7 +48,7 @@ LoadModule mpm_event_module modules/mod_mpm_event.so @staticmethod def checkIfApacheInstalled(): try: - if os.path.exists(ApacheController.serverRootPath): + if os.path.exists(ApacheController.php80Path): return 1 else: return 0 diff --git a/plogical/cPanelImporter.py b/plogical/cPanelImporter.py index c1fe4a06e..1f39bcc09 100644 --- a/plogical/cPanelImporter.py +++ b/plogical/cPanelImporter.py @@ -80,33 +80,33 @@ class cPanelImporter: def PHPDecider(self, domainName): - if self.PHPVersion == 'inherit' or not self.PHPVersion: - self.PHPVersion = self.InheritPHP or 'PHP 7.4' - else: - version_number = ''.join(filter(str.isdigit, self.PHPVersion)) - if len(version_number) == 2: # Ensure there are exactly two digits - self.PHPVersion = f'PHP {version_number[0]}.{version_number[1]}' + if self.PHPVersion == 'inherit' or not self.PHPVersion: + self.PHPVersion = self.InheritPHP or 'PHP 7.4' + else: + version_number = ''.join(filter(str.isdigit, self.PHPVersion)) + if len(version_number) == 2: # Ensure there are exactly two digits + self.PHPVersion = f'PHP {version_number[0]}.{version_number[1]}' - ### if the PHP Version extracted from file is not available then change it to next available + ### if the PHP Version extracted from file is not available then change it to next available - try: + try: - from plogical.phpUtilities import phpUtilities + from plogical.phpUtilities import phpUtilities - if domainName !=None: - completePathToConfigFile = f'/usr/local/lsws/conf/vhosts/{domainName}/vhost.conf' - else: - completePathToConfigFile = None + if domainName !=None: + completePathToConfigFile = f'/usr/local/lsws/conf/vhosts/{domainName}/vhost.conf' + else: + completePathToConfigFile = None - phpVersion = phpUtilities.FindIfSaidPHPIsAvaiableOtherwiseMaketheNextOneAvailableToUse(completePathToConfigFile, self.PHPVersion) + phpVersion = phpUtilities.FindIfSaidPHPIsAvaiableOtherwiseMaketheNextOneAvailableToUse(completePathToConfigFile, self.PHPVersion) - if phpVersion != self.PHPVersion: - logging.statusWriter(self.logFile, f'PHP version for {self.mainDomain} has been changed from {self.PHPVersion} to {phpVersion}.', 1) - self.PHPVersion = phpVersion - except: - pass + if phpVersion != self.PHPVersion: + logging.statusWriter(self.logFile, f'PHP version for {self.mainDomain} has been changed from {self.PHPVersion} to {phpVersion}.', 1) + self.PHPVersion = phpVersion + except: + pass - return self.PHPVersion + return self.PHPVersion def SetupSSL(self, path, domain):