From 3067458acbff330d144bddd779492d9b247b04b4 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 15 Nov 2012 08:18:48 +0100
Subject: Fix wrong (non-specific) error message on crypt or connection error
 (#1488808)

---
 plugins/password/package.xml  | 33 ++++++++++++++++++++++++---------
 plugins/password/password.php |  2 ++
 2 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'plugins/password')

diff --git a/plugins/password/package.xml b/plugins/password/package.xml
index 29d222409..e639a04ef 100644
--- a/plugins/password/package.xml
+++ b/plugins/password/package.xml
@@ -15,9 +15,9 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-03-07</date>
+	<date>2012-11-15</date>
 	<version>
-		<release>3.1</release>
+		<release>3.2</release>
 		<api>2.0</api>
 	</version>
 	<stability>
@@ -26,13 +26,7 @@
 	</stability>
 	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
 	<notes>
-- Added pw_usermod driver (#1487826)
-- Added option password_login_exceptions (#1487826)
-- Added domainfactory driver (#1487882)
-- Added DBMail driver (#1488281)
-- Helper files moved to helpers/ directory from drivers/
-- Added Expect driver (#1488363)
-- Added Samba password (#1488364)
+- Fix wrong (non-specific) error message on crypt or connection error (#1488808)
     </notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">
@@ -331,5 +325,26 @@
 - Fixed drivers namespace issues
             </notes>
         </release>
+        <release>
+        	<date>2012-03-07</date>
+        	<version>
+		        <release>3.1</release>
+        		<api>2.0</api>
+        	</version>
+        	<stability>
+		        <release>stable</release>
+        		<api>stable</api>
+        	</stability>
+        	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+        	<notes>
+- Added pw_usermod driver (#1487826)
+- Added option password_login_exceptions (#1487826)
+- Added domainfactory driver (#1487882)
+- Added DBMail driver (#1488281)
+- Helper files moved to helpers/ directory from drivers/
+- Added Expect driver (#1488363)
+- Added Samba password (#1488364)
+            </notes>
+        </release>
     </changelog>
 </package>
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 58b6f8cd9..e795d115f 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -274,8 +274,10 @@ class password extends rcube_plugin
                 return;
             case PASSWORD_CRYPT_ERROR;
                 $reason = $this->gettext('crypterror');
+                break;
             case PASSWORD_CONNECT_ERROR;
                 $reason = $this->gettext('connecterror');
+                break;
             case PASSWORD_ERROR:
             default:
                 $reason = $this->gettext('internalerror');
-- 
cgit v1.2.3