From db9d6d227ad4e4bc6c1b42b299eb51b00bb2c3c2 Mon Sep 17 00:00:00 2001
From: Sebastian Kehr <kehr@ub.uni-leipzig.de>
Date: Mon, 23 Apr 2018 12:34:07 +0200
Subject: [PATCH] refs #11902 * fixes error message at change password form *
 catch auth exception and return status array instead

---
 local/languages/de.ini                   | 1 +
 local/languages/en.ini                   | 2 ++
 module/finc/src/finc/ILS/Driver/PAIA.php | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/local/languages/de.ini b/local/languages/de.ini
index 679f7430b45..f45c864c302 100644
--- a/local/languages/de.ini
+++ b/local/languages/de.ini
@@ -740,6 +740,7 @@ errorcode_empty_member_code = "Es wurde keine Benutzernummer übergeben"
 errorcode_empty_password = "Es wurde kein Passwort übergeben"
 errorcode_member_not_found = "Die Benutzernummer exisitiert nicht"
 errorcode_password_validation_error = "Das übergebene Password ist nicht korrekt"
+errorcode_old_password_validation_error = "Die Kombination aus Benutzernummer und Kennwort ist nicht gültig. Bitte überprüfen Sie Ihre Eingabe."
 errorcode_empty_req_param_error = "Um das Formular erfolgreich zu senden, müssen alle erforderlichen Felder ausgefüllt sein"
 exclude_newspapers = "Ohne Zeitungsartikel"
 export_download = "Datei herunterladen"
diff --git a/local/languages/en.ini b/local/languages/en.ini
index d823454839c..f3264480832 100644
--- a/local/languages/en.ini
+++ b/local/languages/en.ini
@@ -392,7 +392,9 @@ errorcode_empty_member_code = "Some data was missing. No member number was submi
 errorcode_empty_password = "Some data was missing. No password was submitted"
 errorcode_member_not_found = "The member number does not exist"
 errorcode_password_validation_error = "Your passed password is not correct"
+errorcode_old_password_validation_error = "Invalid combination of username and password, please check your entries."
 errorcode_empty_req_param_error = "All required fields have to be filled to submit successfully the form"
+
 exclude_newspapers = "Exclude Newspaper Articles"
 export_download = "Download File"
 export_exporting = "Creating Export File"
diff --git a/module/finc/src/finc/ILS/Driver/PAIA.php b/module/finc/src/finc/ILS/Driver/PAIA.php
index 3fb3aa87569..d052e79a181 100644
--- a/module/finc/src/finc/ILS/Driver/PAIA.php
+++ b/module/finc/src/finc/ILS/Driver/PAIA.php
@@ -206,6 +206,11 @@ class PAIA extends \VuFind\ILS\Driver\PAIA
             $array_response = $this->paiaPostAsArray(
                 'auth/change', $post_data
             );
+        } catch (AuthException $e) {
+            return [
+                'success' => false,
+                'status' => 'errorcode_old_password_validation_error'
+            ];
         } catch (\Exception $e) {
             $this->debug($e->getMessage());
             return [
-- 
GitLab