Merge branch 'stable' into v1.9.4

This commit is contained in:
Usman Nasir
2020-01-29 19:31:25 +05:00

View File

@@ -1793,12 +1793,20 @@ class WebsiteManager:
try:
statusFile = data['statusFile']
statusData = ProcessUtilities.outputExecutioner("sudo cat " + statusFile).splitlines()
if (statusFile[:16] == "/home/cyberpanel" or statusFile[:4] == '/tmp' or statusFile[:18] == '/usr/local/CyberCP') and statusFile != '/usr/local/CyberCP/CyberCP/settings.py':
pass
else:
data_ret = {'abort': 1, 'installStatus': 0, 'installationProgress': "100",
'currentStatus': 'Invalid status file.'}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
statusData = ProcessUtilities.outputExecutioner("cat " + statusFile).splitlines()
lastLine = statusData[-1]
if lastLine.find('[200]') > -1:
command = 'sudo rm -f ' + statusFile
command = 'rm -f ' + statusFile
subprocess.call(shlex.split(command))
data_ret = {'abort': 1, 'installStatus': 1, 'installationProgress': "100",
'currentStatus': 'Successfully Installed.'}