From bb736f113aaf56aa9f79dda616242f3db69bbd44 Mon Sep 17 00:00:00 2001
From: Rune Henriksen <ruju@itu.dk>
Date: Sat, 22 Dec 2018 18:41:36 +0100
Subject: [PATCH 1/2] added passphrase confirmation

---
 .../webroot/ngax/scripts/controllers/ExportController.js     | 5 ++++-
 Duplicati/Server/webroot/ngax/templates/export.html          | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js
index 8a7cbf230..b3b68bbce 100644
--- a/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js
+++ b/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js
@@ -53,9 +53,12 @@ backupApp.controller("ExportController", function($scope, $routeParams, AppServi
         // Make checks that do not require user input
         $scope.fileEncrypted = false;
         if ($scope.UseEncryption && $scope.ExportType === "file") {
-            if (($scope.Passphrase || "").trim().length === 0) {
+            if (typeof $scope.Passphrase === 'undefined' || $scope.Passphrase.trim().length === 0) {
                 DialogService.dialog(gettextCatalog.getString("No passphrase entered"), gettextCatalog.getString("To export without a passphrase, uncheck the \"Encrypt file\" box"));
                 return;
+            } else if ($scope.Passphrase != $scope.ConfirmPassphrase) {
+                DialogService.dialog(gettextCatalog.getString('Error'), gettextCatalog.getString('The passwords do not match'));
+                return;
             } else {
                $scope.fileEncrypted = true;
             }
diff --git a/Duplicati/Server/webroot/ngax/templates/export.html b/Duplicati/Server/webroot/ngax/templates/export.html
index 97109754d..24ed2d1bd 100644
--- a/Duplicati/Server/webroot/ngax/templates/export.html
+++ b/Duplicati/Server/webroot/ngax/templates/export.html
@@ -25,6 +25,10 @@
                 <label for="encryption-passphrase" translate>Passphrase</label>
                 <input type="password" name="encryption-password" id="encryption-passphrase" ng-model="Passphrase" placeholder="{{'Enter encryption passphrase' | translate}}" >
             </div>
+            <div class="input text" ng-show="UseEncryption && ExportType == 'file'">
+                <label for="encryption-passphrase" translate>Confirm passphrase</label>
+                <input type="password" name="confirm-encryption-password" id="confirm-encryption-passphrase" ng-model="ConfirmPassphrase" placeholder="{{'Confirm encryption passphrase' | translate}}" >
+            </div>
 
             <div class="buttons" ng-hide="Connecting">
                 <a href="#" class="submit" translate>Cancel</a>

From ce66368997191000a8e9ec989263328566e29958 Mon Sep 17 00:00:00 2001
From: Rune Henriksen <ruju@itu.dk>
Date: Sat, 22 Dec 2018 19:17:49 +0100
Subject: [PATCH 2/2] codacy compliance

---
 .../webroot/ngax/scripts/controllers/ExportController.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js
index b3b68bbce..22949b9e0 100644
--- a/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js
+++ b/Duplicati/Server/webroot/ngax/scripts/controllers/ExportController.js
@@ -53,11 +53,11 @@ backupApp.controller("ExportController", function($scope, $routeParams, AppServi
         // Make checks that do not require user input
         $scope.fileEncrypted = false;
         if ($scope.UseEncryption && $scope.ExportType === "file") {
-            if (typeof $scope.Passphrase === 'undefined' || $scope.Passphrase.trim().length === 0) {
+            if (typeof $scope.Passphrase === "undefined" || $scope.Passphrase.trim().length === 0) {
                 DialogService.dialog(gettextCatalog.getString("No passphrase entered"), gettextCatalog.getString("To export without a passphrase, uncheck the \"Encrypt file\" box"));
                 return;
-            } else if ($scope.Passphrase != $scope.ConfirmPassphrase) {
-                DialogService.dialog(gettextCatalog.getString('Error'), gettextCatalog.getString('The passwords do not match'));
+            } else if ($scope.Passphrase !== $scope.ConfirmPassphrase) {
+                DialogService.dialog(gettextCatalog.getString("Error"), gettextCatalog.getString("The passwords do not match"));
                 return;
             } else {
                $scope.fileEncrypted = true;