From 23092be7754760f9fed1035ec1e8bacacb9e06bb Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 16 Apr 2021 22:00:18 +0500
Subject: [PATCH] fixed some issues in
 https://github.com/usmannasir/cyberpanel/commit/c32a2e78eb57575ce835eab435372c84dc520cb8

---
 plogical/upgrade.py             | 9 +++++++++
 static/IncBackups/IncBackups.js | 1 +
 static/backup/backup.js         | 9 ++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index e1116d943..2ace0c409 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -1512,6 +1512,15 @@ imap_folder_list_limit = 0
   `websiteDataEmails` int(11) NOT NULL,
   PRIMARY KEY (`id`)
 )"""
+            try:
+                cursor.execute(query)
+            except:
+                pass
+
+
+            query = 'ALTER TABLE IncBackups_backupjob ADD retention integer DEFAULT 0'
+
+
             try:
                 cursor.execute(query)
             except:
diff --git a/static/IncBackups/IncBackups.js b/static/IncBackups/IncBackups.js
index 9031c393d..79b13571e 100644
--- a/static/IncBackups/IncBackups.js
+++ b/static/IncBackups/IncBackups.js
@@ -599,6 +599,7 @@ app.controller('scheduleBackupInc', function ($scope, $http) {
         var data = {
             backupDestinations: $scope.backupDest,
             backupFreq: $scope.backupFreq,
+            backupRetention: $scope.backupRetention,
             websiteData: $scope.websiteData,
             websiteEmails: $scope.websiteEmails,
             websiteDatabases: $scope.websiteDatabases,
diff --git a/static/backup/backup.js b/static/backup/backup.js
index 49980c5f9..92ccab6a5 100644
--- a/static/backup/backup.js
+++ b/static/backup/backup.js
@@ -1247,7 +1247,8 @@ app.controller('googleDrive', function ($scope, $http) {
         };
         var data = {
             selectedAccount: $scope.selectedAccount,
-            backupFrequency: $scope.backupFrequency
+            backupFrequency: $scope.backupFrequency,
+            backupRetention: $scope.backupRetention,
         };
 
         dataurl = "/backup/changeAccountFrequencygDrive";
@@ -1654,7 +1655,8 @@ app.controller('scheduleBackup', function ($scope, $http, $window) {
         var data = {
             selectedAccount: $scope.selectedAccountAdd,
             name: $scope.name,
-            backupFrequency: $scope.backupFrequency
+            backupFrequency: $scope.backupFrequency,
+            backupRetention: $scope.backupRetention,
         };
 
         dataurl = "/backup/submitBackupSchedule";
@@ -1856,7 +1858,8 @@ app.controller('scheduleBackup', function ($scope, $http, $window) {
         };
         var data = {
             selectedJob: $scope.selectedJob,
-            backupFrequency: $scope.backupFrequency
+            backupFrequency: $scope.backupFrequency,
+            backupRetention: $scope.backupRetention,
         };
 
         dataurl = "/backup/changeAccountFrequencyNormal";