fix selecting a backup container

Signed-off-by: szaimen <[email protected]>

Author: szaimen

Containers/borgbackup/backupscript.sh

@@ -15,11 +15,6 @@ get_expiration_time() {
     DURATION_READABLE=$(printf "%02d hours %02d minutes %02d seconds" $DURATION_HOUR $DURATION_MIN $DURATION_SEC)
 }
 
-# Export defaults 
-export BORG_PASSPHRASE="$BORG_PASSWORD"
-export BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=yes
-export BORG_RELOCATED_REPO_ACCESS_IS_OK=yes
-
 # Test if all volumes aren't empty
 VOLUME_DIRS="$(find /nextcloud_aio_volumes -mindepth 1 -maxdepth 1 -type d)"
 mapfile -t VOLUME_DIRS <<< "$VOLUME_DIRS"
@@ -168,7 +163,7 @@ if [ "$BORG_MODE" = restore ]; then
 
     # Perform the restore
     if [ -n "$SELECTED_RESTORE_TIME" ]; then
-        SELECTED_ARCHIVE"$(borg list "$BORG_BACKUP_DIRECTORY" | grep "nextcloud-aio" | grep "$SELECTED_RESTORE_TIME" | awk -F " " '{print $1}' | head -1)"
+        SELECTED_ARCHIVE="$(borg list "$BORG_BACKUP_DIRECTORY" | grep "nextcloud-aio" | grep "$SELECTED_RESTORE_TIME" | awk -F " " '{print $1}' | head -1)"
     else
         SELECTED_ARCHIVE="$(borg list "$BORG_BACKUP_DIRECTORY" | grep "nextcloud-aio" | awk -F " " '{print $1}' | sort -r | head -1)"
     fi

Containers/borgbackup/start.sh

@@ -9,7 +9,10 @@ if [ -z "$BORG_PASSWORD" ]; then
     exit 1
 fi
 
-export BORG_PASSWORD
+# Export defaults 
+export BORG_PASSPHRASE="$BORG_PASSWORD"
+export BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=yes
+export BORG_RELOCATED_REPO_ACCESS_IS_OK=yes
 
 # Validate BORG_MODE
 if [ "$BORG_MODE" != backup ] && [ "$BORG_MODE" != restore ] && [ "$BORG_MODE" != check ]; then

php/src/Data/ConfigurationManager.php

@@ -64,7 +64,7 @@ public function GetLastBackupTime() : string {
         }
 
         $content = file_get_contents(DataConst::GetBackupArchivesList());
-        if (count($content) === 0) {
+        if ($content === '') {
             return '';
         }
 
@@ -85,23 +85,25 @@ public function GetLastBackupTime() : string {
 
     public function GetBackupTimes() : array {
         if (!file_exists(DataConst::GetBackupArchivesList())) {
-            return $array[] = '';
+            return [];
         }
 
         $content = file_get_contents(DataConst::GetBackupArchivesList());
-        if (count($content) === 0) {
-            return $array[] = '';
+        if ($content === '') {
+            return [];
         }
 
-        $backupLines = explode('\n', $content);
+        $backupLines = explode("\n", $content);
         $backupTimes = [];
         foreach($backupLines as $lines) {
-            $backupTimesTemp = explode(',', $lines);
-            $backupTimes[] = $backupTimesTemp[1];
+            if ($lines !== "") {
+                $backupTimesTemp = explode(',', $lines);
+                $backupTimes[] = $backupTimesTemp[1];     
+            }
         }
 
         if (!is_array($backupTimes)) {
-            return $array[] = '';
+            return [];
         }
 
         return $backupTimes;

php/templates/containers.twig

@@ -212,7 +212,7 @@
                                         <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                                         <select id="selected_restore_time" name="selected_restore_time" form="restore_selection">
                                             {% for restore_time in backup_times %}
-                                                <option value="{{ restore_time }}">{{ restore_time }}"</option>
+                                                <option value="{{ restore_time }}">{{ restore_time }}</option>
                                             {% endfor %}
                                         </select>
                                         <input class="button" type="submit" value="Restore selected backup" onclick="return confirm('Restore the selected backup? Are you sure that you want to restore the selected backup? This will stop all running containers and restore the selected backup. It is recommended to create a backup first. You might also want to check the backup integrity.')" />