From 0959ae40564a188a586f545229176f1e790ceae5 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Thu, 25 Mar 2021 20:46:04 +0500
Subject: [PATCH] bug fix in template loading

---
 backup/backupManager.py     | 4 ++--
 plogical/backupUtilities.py | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/backup/backupManager.py b/backup/backupManager.py
index ba5dcd9e8..db0bbf542 100755
--- a/backup/backupManager.py
+++ b/backup/backupManager.py
@@ -345,7 +345,7 @@ class BackupManager:
     def restoreSite(self, request=None, userID=None, data=None):
         path = os.path.join("/home", "backup")
         if not os.path.exists(path):
-            proc = httpProc(request, 'backup/restore.html', 'restoreBackup')
+            proc = httpProc(request, 'backup/restore.html', None, 'restoreBackup')
             return proc.render()
         else:
             all_files = []
@@ -969,7 +969,7 @@ class BackupManager:
             return HttpResponse(final_json)
 
     def remoteBackups(self, request, userID=None, data=None):
-        proc = httpProc(request, 'backup/remoteBackups.html', 'remoteBackups')
+        proc = httpProc(request, 'backup/remoteBackups.html', None, 'remoteBackups')
         return proc.render()
 
     def submitRemoteBackups(self, userID=None, data=None):
diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py
index 6f29d6436..6efde5870 100755
--- a/plogical/backupUtilities.py
+++ b/plogical/backupUtilities.py
@@ -1939,8 +1939,9 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain):
                    + backupName + " --backupPath " + backupPath + ' --backupDomain ' + backupDomain + ' --metaPath %s' % (
                        result[2])
 
-        output = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
-        if output.find('[5009') > -1:
+        output = ProcessUtilities.outputExecutioner(execPath)
+
+        if output.find('[5009]') > -1:
             logging.CyberCPLogFileWriter.writeToFile(output)
             writeToFile = open(schedulerPath, 'w')
             writeToFile.writelines(output)
@@ -1968,7 +1969,7 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain):
 
         ##
 
-        output = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
+        #output = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
 
         if output.find('1,None') > -1:
             execPath = "sudo nice -n 10 /usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/backupUtilities.py"