diff --git a/src/js/restore.js b/src/js/restore.js index eab72e5dd..514159c78 100644 --- a/src/js/restore.js +++ b/src/js/restore.js @@ -36,6 +36,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien $scope.format = 'tgz'; $scope.advancedVisible = false; $scope.password = ''; + $scope.encryptedFilenames = true; $scope.encrypted = false; // only used if a backup config contains that flag $scope.setupToken = ''; $scope.skipDnsSetup = false; @@ -206,7 +207,10 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien provider: $scope.provider, format: $scope.format, }; - if ($scope.password) backupConfig.password = $scope.password; + if ($scope.password) { + backupConfig.password = $scope.password; + backupConfig.encryptedFilenames = $scope.encryptedFilenames; + } // only set provider specific fields, this will clear them in the db if ($scope.s3like(backupConfig.provider)) { diff --git a/src/restore.html b/src/restore.html index cad5a2a0f..448bc0f63 100644 --- a/src/restore.html +++ b/src/restore.html @@ -256,7 +256,7 @@ -
+
@@ -267,11 +267,17 @@
-
+
+
+ +
+
+
+ +
+
diff --git a/src/views/app.js b/src/views/app.js index f1c8d8889..7ec3b445e 100644 --- a/src/views/app.js +++ b/src/views/app.js @@ -1324,6 +1324,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location' format: 'tgz', remotePath: '', password: '', + encryptedFilenames: true, mountOptions: {}, encrypted: false, // helps with ng-required when backupConfig is read from file @@ -1341,6 +1342,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location' $scope.importBackup.format = 'tgz'; $scope.importBackup.acceptSelfSignedCerts = false; $scope.importBackup.password = ''; + $scope.importBackup.encryptedFilenames = true; $scope.importBackup.remotePath = ''; $scope.importBackup.mountOptions = {}; }, @@ -1352,7 +1354,10 @@ angular.module('Application').controller('AppController', ['$scope', '$location' var backupConfig = { provider: $scope.importBackup.provider, }; - if ($scope.importBackup.password) backupConfig.password = $scope.importBackup.password; + if ($scope.importBackup.password) { + backupConfig.password = $scope.importBackup.password; + backupConfig.encryptedFilenames = $scope.importBackup.encryptedFilenames; + } var remotePath = $scope.importBackup.remotePath; diff --git a/src/views/backups.html b/src/views/backups.html index 0d58a21fb..1f7efc53b 100644 --- a/src/views/backups.html +++ b/src/views/backups.html @@ -365,6 +365,13 @@ +
+ +
+ {{ 'backups.configureBackupStorage.advancedSettings' | tr }}
diff --git a/src/views/backups.js b/src/views/backups.js index 7e179a00f..46fa7a5dc 100644 --- a/src/views/backups.js +++ b/src/views/backups.js @@ -508,6 +508,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat format: 'tgz', password: '', passwordRepeat: '', + encryptedFilenames: true, advancedVisible: false, memoryTicks: [], @@ -578,6 +579,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat $scope.configureBackup.endpoint = $scope.backupConfig.endpoint; $scope.configureBackup.password = $scope.backupConfig.password || ''; $scope.configureBackup.passwordRepeat = ''; + $scope.configureBackup.encryptedFilenames = 'encryptedFilenames' in $scope.backupConfig ? $scope.backupConfig.encryptedFilenames : true; $scope.configureBackup.backupFolder = $scope.backupConfig.backupFolder; $scope.configureBackup.mountPoint = $scope.backupConfig.mountPoint; $scope.configureBackup.format = $scope.backupConfig.format; @@ -631,7 +633,10 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat schedulePattern: $scope.backupConfig.schedulePattern, retentionPolicy: $scope.backupConfig.retentionPolicy }; - if ($scope.configureBackup.password) backupConfig.password = $scope.configureBackup.password; + if ($scope.configureBackup.password) { + backupConfig.password = $scope.configureBackup.password; + backupConfig.encryptedFilenames = $scope.configureBackup.encryptedFilenames; // ignored with tgz format + } // only set provider specific fields, this will clear them in the db if ($scope.s3like(backupConfig.provider)) {