Merge branch 'develop' into 'develop'

Performance backup garbage collection potentially tries to delete same file multiple times

See merge request ispconfig/ispconfig3!1885

Author: Till Brehm

server/lib/classes/backup.inc.php

@@ -1197,22 +1197,25 @@ protected static function getAllArchives($backup_dir, $backup_mode, $password, $
                 case 'borg':
                     $repos_path = $backup_dir . '/' . $entry;
                     if (is_dir($repos_path) && strncmp('borg_', $entry, 5) === 0) {
-                        $archivesJson = json_decode(implode("", self::getReposArchives($backup_mode, $repos_path, $password, 'json')), TRUE);
-                        foreach ($archivesJson['archives'] as $archive) {
-                            if (is_null($prefix_list)) { //fallback if no prefix_list
-                                $archives[] = [
-                                    'repos' => $entry,
-                                    'archive' => $archive['name'],
-                                    'created_at' => strtotime($archive['time']),
-                                ];
-                            } else {
-                                foreach ($prefix_list as $prefix) {
-                                    if (substr($archive['name'], 0, strlen($prefix)) == $prefix) { //filter backup list of all if no prefix_list
-                                        $archives[] = [
-                                            'repos' => $entry,
-                                            'archive' => $archive['name'],
-                                            'created_at' => strtotime($archive['time']),
-                                        ];
+                        $repos_archives = self::getReposArchives($backup_mode, $repos_path, $password, 'json');
+                        if(is_array($repos_archives)) {
+                            $archivesJson = json_decode(implode("", $repos_archives), TRUE);
+                            foreach ($archivesJson['archives'] as $archive) {
+                                if (is_null($prefix_list)) { //fallback if no prefix_list
+                                    $archives[] = [
+                                        'repos' => $entry,
+                                        'archive' => $archive['name'],
+                                        'created_at' => strtotime($archive['time']),
+                                    ];
+                                } else {
+                                    foreach ($prefix_list as $prefix) {
+                                        if (substr($archive['name'], 0, strlen($prefix)) == $prefix) { //filter backup list of all if no prefix_list
+                                            $archives[] = [
+                                                'repos' => $entry,
+                                                'archive' => $archive['name'],
+                                                'created_at' => strtotime($archive['time']),
+                                            ];
+                                        }
                                     }
                                 }
                             }
@@ -1313,8 +1316,8 @@ protected static function backups_garbage_collection($server_id, $backup_type =
                         }
                     }
                 }
-                array_unique( $untracked_backup_files );
-                foreach ($untracked_backup_files as $f) {
+                $unique_untracked_backup_files = array_unique( $untracked_backup_files );
+                foreach ($unique_untracked_backup_files as $f) {
                     $backup_file = $backup_dir . '/web' . $domain_id . '/' . $f;
                     $app->log('Backup file ' . $backup_file . ' is not contained in database, deleting this file from disk', LOGLEVEL_DEBUG);
                     @unlink($backup_file);