diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index e76a518d9..527f04581 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -2147,10 +2147,11 @@ $parameters = array( from managePHP.phpManager import PHPManager import json tempStatusPath = self.extraArgs['tempStatusPath'] + self.tempStatusPath = tempStatusPath + statusFile = open(tempStatusPath, 'w') statusFile.writelines('Creating BackUp...,10') statusFile.close() - wpsite = WPSites.objects.get(pk=self.extraArgs['WPid']) website =Websites.objects.get(pk=wpsite.owner_id) @@ -2282,10 +2283,10 @@ $parameters = array( if os.path.exists(ProcessUtilities.debugPath): logging.writeToFile(result) + command = f'rm -rf {tempPath}' ProcessUtilities.executioner(command) - statusFile = open(tempStatusPath, 'w') statusFile.writelines("Successfully Created. [200]") statusFile.close() @@ -2293,6 +2294,8 @@ $parameters = array( except BaseException as msg: + command = f'rm -rf {self.tempPath}' + ProcessUtilities.executioner(command) logging.writeToFile("Error WPCreateBackup ....... %s" % str(msg)) statusFile = open(self.tempStatusPath, 'w') statusFile.writelines(str(msg) + " [404]") diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index c8f8eb2b3..7f7eb881d 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -1149,10 +1149,14 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo $scope.goBackDisable = false; $("#installProgress").css("width", "100%"); + $("#installProgressbackup").css("width", "100%"); $scope.installPercentage = "100"; $scope.currentStatus = response.data.currentStatus; $timeout.cancel(); + + + } else { $scope.wordpresshomeloading = true; @@ -1166,17 +1170,22 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo $scope.errorMessage = response.data.error_message; $("#installProgress").css("width", "0%"); + $("#installProgressbackup").css("width", "0%"); $scope.installPercentage = "0"; $scope.goBackDisable = false; + + } } else { $("#installProgress").css("width", response.data.installationProgress + "%"); + $("#installProgressbackup").css("width", response.data.installationProgress + "%"); $scope.installPercentage = response.data.installationProgress; $scope.currentStatus = response.data.currentStatus; $timeout(getCreationStatus, 1000); + } } diff --git a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html index 3d6b21343..fdd0c619a 100644 --- a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html +++ b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html @@ -378,7 +378,7 @@
-
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 421c9fee2..89cab4e21 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -710,7 +710,6 @@ class WebsiteManager: extraArgs['tempStatusPath'] = "/home/cyberpanel/" + str(randint(1000, 9999)) - background = ApplicationInstaller('WPCreateBackup', extraArgs) background.start()