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

Bug fix to Remote Backups

Browse Source
This commit is contained in:
usmannasir
2018-09-05 19:06:06 +05:00
parent 7a9e358d5a
commit 2921125c06
1539 changed files with 360759 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plogical/backupManager.py
View File

@@ -280,7 +280,7 @@ class BackupManager:
return HttpResponse(final_json)
def submitRestore(self, userID = None, data = None):
def submitRestore(self, data = None):
try:
backupFile = data['backupFile']
originalFile = "/home/backup/" + backupFile
@@ -293,7 +293,6 @@ class BackupManager:
execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/backupUtilities.py"
execPath = execPath + " submitRestore --backupFile " + backupFile + " --dir " + dir
subprocess.Popen(shlex.split(execPath))
time.sleep(4)
final_dic = {'restoreStatus': 1, 'error_message': "None"}
@@ -304,7 +303,7 @@ class BackupManager:
final_json = json.dumps(final_dic)
return HttpResponse(final_json)
def restoreStatus(self, userID = None, data = None):
def restoreStatus(self, data = None):
try:
backupFile = data['backupFile'].strip(".tar.gz")
@@ -1182,11 +1181,9 @@ class BackupManager:
def remoteBackupRestore(self, userID = None, data = None):
try:
currentACL = ACLManager.loadedACL(userID)
if ACLManager.currentContextPermission(currentACL, 'remoteBackups') == 0:
return ACLManager.loadErrorJson('remoteTransferStatus', 0)
backupDir = data['backupDir']
backupDirComplete = "/home/backup/transfer-" + str(backupDir)