More handling of encryption passphrase

This fixes #6318
2025-06-20 17:08:07 +02:00
parent 15863bdd10
commit 95a8297888
1 changed files with 11 additions and 5 deletions
@@ -42,14 +42,20 @@ backupApp.controller('RestoreDirectController', function ($rootScope, $scope, $l
            var opts = {};
            var obj = {'Backup': {'TargetURL':  $scope.TargetURL } };

-            if (($scope.EncryptionPassphrase || '') == '')
-                opts['--no-encryption'] = 'true';
-            else
-                opts['passphrase'] = $scope.EncryptionPassphrase;
-
            if (!AppUtils.parse_extra_options($scope.ExtendedOptions, opts))
                return false;

+            if (($scope.EncryptionPassphrase || '') == '')
+            {
+                opts['--no-encryption'] = 'true';
+                delete opts['passphrase'];
+            }
+            else
+            {
+                opts['passphrase'] = $scope.EncryptionPassphrase;
+                delete opts['--no-encryption'];
+            }
+
            obj.Backup.Settings = [];
            for(var k in opts) {
                obj.Backup.Settings.push({