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

Change database creation, and bug fixes.

Browse Source
This commit is contained in:
usmannasir
2017-11-09 00:35:52 +05:00
parent 3028dc5f60
commit 0ee10a04c5
7 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/install.py
View File

@@ -682,7 +682,7 @@ class preFlightsChecks:
cmd = [] cmd = []
cmd.append("wget") cmd.append("wget")
cmd.append("http://cyberpanel.net/CyberPanelTemp.tar.gz") cmd.append("http://cyberpanel.net/CyberPanel.1.5.1.tar.gz")
res = subprocess.call(cmd) res = subprocess.call(cmd)
@@ -701,7 +701,7 @@ class preFlightsChecks:
cmd.append("tar") cmd.append("tar")
cmd.append("zxf") cmd.append("zxf")
cmd.append("CyberPanelTemp.tar.gz") cmd.append("CyberPanel.1.5.1.tar.gz")
res = subprocess.call(cmd) res = subprocess.call(cmd)

2
loginSystem/views.py
View File

@@ -116,7 +116,7 @@ def loadLoginPage(request):
firstName="Cyber",lastName="Panel") firstName="Cyber",lastName="Panel")
admin.save() admin.save()
vers = version(currentVersion="1.0",build=5) vers = version(currentVersion="1.5",build=1)
vers.save() vers.save()
package = Package(admin=admin, packageName="Default", diskSpace=1000, package = Package(admin=admin, packageName="Default", diskSpace=1000,

2
managePHP/views.py
View File

@@ -1836,7 +1836,7 @@ def getRequestStatus(request):
size = data['size'] size = data['size']
extensionName = data['extensionName'] extensionName = data['extensionName']
path = "/usr/local/lscp/logs/phpExtensionRequestLog" path = "/usr/local/CyberCP/managePHP/phpExtensionRequestLog"
requestStatus = unicode(open(path, "r").read()) requestStatus = unicode(open(path, "r").read())
requestStatusSize = len(requestStatus) requestStatusSize = len(requestStatus)

11
packages/views.py
View File

@@ -83,6 +83,12 @@ def submitPackage(request):
emails = int(data['emails']) emails = int(data['emails'])
allowedDomains = int(data['allowedDomains']) allowedDomains = int(data['allowedDomains'])
if packageSpace < 0 or packageBandwidth < 0 or packageDatabases < 0 or ftpAccounts < 0 or emails < 0 or allowedDomains < 0:
data_ret = {'saveStatus': 0, 'error_message': "All values should be positive or 0."}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
admin = Administrator.objects.get(pk=request.session['userID']) admin = Administrator.objects.get(pk=request.session['userID'])
@@ -205,6 +211,11 @@ def saveChanges(request):
data = json.loads(request.body) data = json.loads(request.body)
packageName = data['packageName'] packageName = data['packageName']
if data['diskSpace'] < 0 or data['bandwidth'] < 0 or data['ftpAccounts'] < 0 or data['dataBases'] < 0 or data['emails'] < 0 or data['allowedDomains'] < 0:
data_ret = {'saveStatus': 0, 'error_message': "All values should be positive or 0."}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
modifyPack = Package.objects.get(packageName=packageName) modifyPack = Package.objects.get(packageName=packageName)
modifyPack.diskSpace = data['diskSpace'] modifyPack.diskSpace = data['diskSpace']

12
plogical/phpUtilities.py
View File

@@ -14,17 +14,17 @@ class phpUtilities:
cmd = shlex.split(command) cmd = shlex.split(command)
with open('/usr/local/lscp/logs/phpExtensionRequestLog', 'w') as f: with open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'w') as f:
res = subprocess.call(cmd, stdout=f) res = subprocess.call(cmd, stdout=f)
if res == 1: if res == 1:
writeToFile = open('/usr/local/lscp/logs/phpExtensionRequestLog', 'a') writeToFile = open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'a')
writeToFile.writelines("Can not be installed.\n") writeToFile.writelines("Can not be installed.\n")
writeToFile.close() writeToFile.close()
logging.CyberCPLogFileWriter.writeToFile("[Could not Install]") logging.CyberCPLogFileWriter.writeToFile("[Could not Install]")
return 0 return 0
else: else:
writeToFile = open('/usr/local/lscp/logs/phpExtensionRequestLog', 'a') writeToFile = open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'a')
writeToFile.writelines("PHP Extension Installed.\n") writeToFile.writelines("PHP Extension Installed.\n")
writeToFile.close() writeToFile.close()
@@ -40,17 +40,17 @@ class phpUtilities:
cmd = shlex.split(command) cmd = shlex.split(command)
with open('/usr/local/lscp/logs/phpExtensionRequestLog', 'w') as f: with open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'w') as f:
res = subprocess.call(cmd, stdout=f) res = subprocess.call(cmd, stdout=f)
if res == 1: if res == 1:
writeToFile = open('/usr/local/lscp/logs/phpExtensionRequestLog', 'a') writeToFile = open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'a')
writeToFile.writelines("Can not un-install Extension.\n") writeToFile.writelines("Can not un-install Extension.\n")
writeToFile.close() writeToFile.close()
logging.CyberCPLogFileWriter.writeToFile("[Could not Install]") logging.CyberCPLogFileWriter.writeToFile("[Could not Install]")
return 0 return 0
else: else:
writeToFile = open('/usr/local/lscp/logs/phpExtensionRequestLog', 'a') writeToFile = open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'a')
writeToFile.writelines("PHP Extension Removed.\n") writeToFile.writelines("PHP Extension Removed.\n")
writeToFile.close() writeToFile.close()

2
plogical/processUtilities.py
View File

@@ -17,7 +17,7 @@ class ProcessUtilities:
finalListOfProcesses.append(proc.pid) finalListOfProcesses.append(proc.pid)
except BaseException,msg: except BaseException,msg:
logging.CyberCPLogFileWriter.writeToFile( logging.writeToFile(
str(msg) + " [getLitespeedProcessNumber]") str(msg) + " [getLitespeedProcessNumber]")
return 0 return 0