Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-05-07 00:16:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

mautic version 5 and php 8.1 support

Browse Source
This commit is contained in:
usmannasir
2024-01-16 17:04:43 +05:00
parent 84e3569a0d
commit 8c4fd751a6
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApachController/ApacheController.py
View File

@@ -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

40
plogical/cPanelImporter.py
View File

@@ -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):