Fixes bug for backup loops on shutil.

app/classes/shared/server.py

@@ -428,6 +428,9 @@ class Server:
     def backup_server(self):
         backup_thread = threading.Thread(target=self.a_backup_server, daemon=True, name="backup")
         logger.info("Starting Backup Thread for server {}.".format(self.settings['server_name']))
+        if self.server_path == None:
+            self.server_path = self.settings['path']
+            logger.info("Backup Thread - Local server path not defined. Setting local server path variable.")
         #checks if the backup thread is currently alive for this server
         if not self.is_backingup:
             try:

app/frontend/templates/panel/server_backup.html

@@ -81,10 +81,9 @@
                       <table class="table table-responsive dataTable" id="backup_table">
                         <thead>
                         <tr>
-                            <th width="10%">{{ translate('serverBackups', 'download', data['lang']) }}</th>
+                            <th width="10%">{{ translate('serverBackups', 'options', data['lang']) }}</th>
                             <th>{{ translate('serverBackups', 'path', data['lang']) }}</th>
                             <th width="20%">{{ translate('serverBackups', 'size', data['lang']) }}</th>
-                            <th width="10%">{{ translate('serverBackups', 'delete', data['lang']) }}</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -95,16 +94,15 @@
                                     <i class="fas fa-download" aria-hidden="true"></i>
                                     {{ translate('serverBackups', 'download', data['lang']) }}
                                 </a>
-                            </td>
-                            <td>{{ backup['path'] }}</td>
-                            <td>{{ backup['size'] }}</td>
-                            <td>
-                                <button data-file="{{ backup['path'] }}" class="btn btn-danger del_button">
+                                <br>
+                                <br>
+                                                                <button data-file="{{ backup['path'] }}" class="btn btn-danger del_button">
                                     <i class="fas fa-trash" aria-hidden="true"></i>
                                     {{ translate('serverBackups', 'delete', data['lang']) }}
                                 </button>
-
                             </td>
+                            <td>{{ backup['path'] }}</td>
+                            <td>{{ backup['size'] }}</td>
                             </tr>
                         {% end %}
 

app/translations/en_EN.json

@@ -172,7 +172,8 @@
         "backupTask": "A backup task has been started.",
         "destroyBackup": "Destroy backup \" + file_to_del + \"?",
         "confirmDelete": "Do you want to delete this backup? This cannot be undone.",
-        "confirm": "Confirm"
+        "confirm": "Confirm",
+        "options": "Options"
     },
     "serverFiles": {
         "noscript": "The file manager does not work without JavaScript",

app/translations/fi_FI.json

@@ -173,7 +173,8 @@
         "backupTask": "Varmuuskopiointitehtävä on aloitettu.",
         "destroyBackup": "Tuhotaanko varmuuskopio \" + file_to_del + \"?",
         "confirmDelete": "Haluatko poistaa tämän varmuuskopion? Tätä ei voi peruuttaa.",
-        "confirm": "Vahvista"
+        "confirm": "Vahvista",
+        "options": "Vaihtoehtoja"
     },
     "serverFiles": {
         "noscript": "Tiedostojenhallinta ei toimi ilman JavaScriptiä",

app/translations/fr_FR.json

@@ -172,7 +172,8 @@
         "backupTask": "Une sauvegarde vient de démarrer.",
         "destroyBackup": "Supprimer la sauvegarde \" + file_to_del + \" ?",
         "confirmDelete": "Es-tu sûr de vouloir supprimer cette sauvegarde ? Tu ne pourras pas revenir en arrière.",
-        "confirm": "Confirmer"
+        "confirm": "Confirmer",
+        "options": "Options"
     },
     "serverFiles": {
         "noscript": "Le gestionnaire de fichiers ne fonctionne pas sans JavaScript",