Merge branch 'master' of github.com:duplicati/duplicati

Duplicati/Library/Modules/Builtin/HttpOptions.cs

@@ -24,7 +24,7 @@ using System.Linq;
 
 namespace Duplicati.Library.Modules.Builtin
 {
-    public class HttpOptions : Duplicati.Library.Interface.IGenericModule, Duplicati.Library.Interface.IConnectionModule, IDisposable
+    public class HttpOptions : Duplicati.Library.Interface.IConnectionModule, IDisposable
     {
         private const string OPTION_DISABLE_EXPECT100 = "disable-expect100-continue";
         private const string OPTION_DISABLE_NAGLING = "disable-nagling";

Duplicati/Server/webroot/ngax/scripts/controllers/CommandlineController.js

@@ -35,7 +35,7 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
     $scope.$watchCollection("ExtendedOptions", reloadOptionsList);
     $scope.$watch("TargetURL", reloadOptionsList);
     $scope.$on('systeminfochanged', reloadOptionsList);
-    
+
     reloadOptionsList();
 
     var scope = $scope;
@@ -48,7 +48,7 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
 
         var opts = AppUtils.parseOptionStrings($scope.ExtendedOptions || []);
         var combined = angular.copy($scope.Arguments || []);
-        
+
         if (($scope.TargetURL || '').trim().length != 0)
             combined.unshift($scope.TargetURL);
 
@@ -79,7 +79,7 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
     $scope.Abort = function()
     {
         AppService.post('/commandline/' + viewid + '/abort' ).then(function(resp) {
-            
+
         }, function() {
             AppUtils.connectionError.apply(AppUtils, arguments);
         });
@@ -155,13 +155,13 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
     }
 
     if ($routeParams.backupid != null) {
-        AppService.get('/backup/' + $routeParams.backupid + '/export?argsonly=true').then(
+        AppService.get('/backup/' + $routeParams.backupid + '/export?argsonly=true&export-passwords=true').then(
             function(resp) {
                 $scope.TargetURL = resp.data.Backend;
                 $scope.Arguments = resp.data.Arguments;
                 $scope.ExtendedOptions = resp.data.Options;
                 $scope.Command = 'backup';
-            }, 
+            },
             function(resp) {
                 var message = resp.statusText;
                 if (resp.data != null && resp.data.Message != null)
@@ -171,4 +171,4 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
             }
         );
     }
-});
+});

Duplicati/Server/webroot/ngax/scripts/services/AppUtils.js

@@ -655,7 +655,6 @@ backupApp.service('AppUtils', function($rootScope, $timeout, $cookies, DialogSer
         }
 
         copyToList(sysinfo.GenericModules);
-        copyToList(sysinfo.ConnectionModules);
 
         if (encmodule !== false)
             copyToList(sysinfo.EncryptionModules, encmodule);