Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-06 21:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

simplify getPHPString() & update php version for mail domain

Browse Source
This commit is contained in:
Istiak Ferdous
2021-10-07 16:27:13 +06:00
parent dba466b8f1
commit ca54d69360
2 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plogical/virtualHostUtilities.py
View File

@@ -58,7 +58,7 @@ class virtualHostUtilities:
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 @@ class virtualHostUtilities:
@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 @@ class virtualHostUtilities:
print("1,None")
return 1, 'None'
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [issueSSLForHostName]")
print("0," + str(msg))
@@ -929,7 +928,7 @@ class virtualHostUtilities:
@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 @@ class virtualHostUtilities:
'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]')