From 0ee10a04c5b11ab0709689aa61716996f94c00ec Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Thu, 9 Nov 2017 00:35:52 +0500 Subject: [PATCH] Change database creation, and bug fixes. --- install/install.py | 4 ++-- loginSystem/views.py | 2 +- managePHP/views.py | 2 +- packages/views.py | 11 +++++++++++ plogical/mysqlUtilities.py | 2 +- plogical/phpUtilities.py | 12 ++++++------ plogical/processUtilities.py | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/install/install.py b/install/install.py index 161cecfc9..431bb0340 100644 --- a/install/install.py +++ b/install/install.py @@ -682,7 +682,7 @@ class preFlightsChecks: cmd = [] 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) @@ -701,7 +701,7 @@ class preFlightsChecks: cmd.append("tar") cmd.append("zxf") - cmd.append("CyberPanelTemp.tar.gz") + cmd.append("CyberPanel.1.5.1.tar.gz") res = subprocess.call(cmd) diff --git a/loginSystem/views.py b/loginSystem/views.py index dca4a21bf..50e424ff8 100644 --- a/loginSystem/views.py +++ b/loginSystem/views.py @@ -116,7 +116,7 @@ def loadLoginPage(request): firstName="Cyber",lastName="Panel") admin.save() - vers = version(currentVersion="1.0",build=5) + vers = version(currentVersion="1.5",build=1) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/managePHP/views.py b/managePHP/views.py index 2eb4375ed..caeb5bd21 100644 --- a/managePHP/views.py +++ b/managePHP/views.py @@ -1836,7 +1836,7 @@ def getRequestStatus(request): size = data['size'] extensionName = data['extensionName'] - path = "/usr/local/lscp/logs/phpExtensionRequestLog" + path = "/usr/local/CyberCP/managePHP/phpExtensionRequestLog" requestStatus = unicode(open(path, "r").read()) requestStatusSize = len(requestStatus) diff --git a/packages/views.py b/packages/views.py index ebf038c13..c205a5dd0 100644 --- a/packages/views.py +++ b/packages/views.py @@ -83,6 +83,12 @@ def submitPackage(request): emails = int(data['emails']) 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']) @@ -205,6 +211,11 @@ def saveChanges(request): data = json.loads(request.body) 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.diskSpace = data['diskSpace'] diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py index 885f0783c..410cdd026 100644 --- a/plogical/mysqlUtilities.py +++ b/plogical/mysqlUtilities.py @@ -75,7 +75,7 @@ class mysqlUtilities: return 0 else: - + dropDB = "GRANT ALL PRIVILEGES ON " +dbname+ ".* TO '" +dbuser+ "'@'localhost'" command = 'sudo mysql -u root -p' + password + ' -e "' + dropDB + '"' cmd = shlex.split(command) diff --git a/plogical/phpUtilities.py b/plogical/phpUtilities.py index 309324431..c5ca10549 100644 --- a/plogical/phpUtilities.py +++ b/plogical/phpUtilities.py @@ -14,17 +14,17 @@ class phpUtilities: 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) 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.close() logging.CyberCPLogFileWriter.writeToFile("[Could not Install]") return 0 else: - writeToFile = open('/usr/local/lscp/logs/phpExtensionRequestLog', 'a') + writeToFile = open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'a') writeToFile.writelines("PHP Extension Installed.\n") writeToFile.close() @@ -40,17 +40,17 @@ class phpUtilities: 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) 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.close() logging.CyberCPLogFileWriter.writeToFile("[Could not Install]") return 0 else: - writeToFile = open('/usr/local/lscp/logs/phpExtensionRequestLog', 'a') + writeToFile = open('/usr/local/CyberCP/managePHP/phpExtensionRequestLog', 'a') writeToFile.writelines("PHP Extension Removed.\n") writeToFile.close() diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py index e6a40f6fb..0c828bf9b 100644 --- a/plogical/processUtilities.py +++ b/plogical/processUtilities.py @@ -17,7 +17,7 @@ class ProcessUtilities: finalListOfProcesses.append(proc.pid) except BaseException,msg: - logging.CyberCPLogFileWriter.writeToFile( + logging.writeToFile( str(msg) + " [getLitespeedProcessNumber]") return 0