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

Bug Fixes to Remote Transfer

Browse Source
This commit is contained in:
usmannasir
2017-10-27 00:09:34 +05:00
parent f41b420071
commit 4e24f610c7
4 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
backup/views.py
View File

@@ -1096,18 +1096,6 @@ def submitRemoteBackups(request):
return HttpResponse(data_ret)
#transferRequest = rBackup.remoteBackup.postRemoteTransfer(ipAddress, ownIP, password, sshkey)
#if transferRequest[0] == 1:
# pass
#else:
# final_json = json.dumps({'status': 0, 'error_message': transferRequest[1]})
# return HttpResponse(final_json)
#data_ret = {'status': 1, 'error_message': "None", "dir":transferRequest[1]}
#json_data = json.dumps(data_ret)
#return HttpResponse(json_data)
else:
return HttpResponse("This URL only accepts POST requests")
@@ -1124,10 +1112,12 @@ def starRemoteTransfer(request):
ipAddress = data['ipAddress']
password = data['password']
accountsToTransfer = data['accountsToTransfer']
ownIP = requests.get('https://api.ipify.org').text
finalData = json.dumps({'username': "admin", "password": password,"ipAddress": ownIP})
finalData = json.dumps({'username': "admin", "password": password,"ipAddress": ownIP,"accountsToTransfer":accountsToTransfer})
url = "https://" + ipAddress + ":8090/api/remoteTransfer"
@@ -1171,15 +1161,6 @@ def getRemoteTransferStatus(request):
if data['fetchStatus'] == 1:
if data['status'].find("Backups are successfully generated and received on") > -1:
#try:
#finalData = json.dumps({"backupDir": dir})
#r = requests.post("http://localhost:5003/backup/remoteBackupRestore", data=finalData)
#logging.CyberCPLogFileWriter.writeToFile(r.text)
#except BaseException,msg:
# logging.CyberCPLogFileWriter.writeToFile("Something happened here:" +str(msg))
data = {'remoteTransferStatus': 1, 'error_message': "None", "status": data['status'],'backupsSent': 1}
json_data = json.dumps(data)
return HttpResponse(json_data)