From 910a3581be47da1d19eb15a68ea6b51c2c31ef67 Mon Sep 17 00:00:00 2001
From: Till Krüss <me@tillkruess.com>
Date: Tue, 15 Oct 2013 18:13:24 +0800
Subject: check if password was changed successfully, before looking for error
 messages

---
 plugins/password/drivers/domainfactory.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'plugins/password')

diff --git a/plugins/password/drivers/domainfactory.php b/plugins/password/drivers/domainfactory.php
index e253faa49..9128720c9 100644
--- a/plugins/password/drivers/domainfactory.php
+++ b/plugins/password/drivers/domainfactory.php
@@ -54,7 +54,12 @@ class rcube_domainfactory_password
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields);
 				if ($result = curl_exec($ch)) {
 
-					// did the new password match the requirements?
+					// has the password been changed?
+					if (strpos($result, 'Einstellungen erfolgreich') !== false) {
+						return PASSWORD_SUCCESS;
+					}
+
+					// show error message(s) if possible
 					if (strpos($result, '<div class="d-msg-text">') !== false) {
 						preg_match_all('#<div class="d-msg-text">(.*?)</div>#s', $result, $errors);
 						if (isset($errors[1])) {
@@ -66,9 +71,6 @@ class rcube_domainfactory_password
 						}
 					}
 
-					if (strpos($result, 'Einstellungen erfolgreich') !== false) {
-						return PASSWORD_SUCCESS;
-					}
 
 				} else {
 					return PASSWORD_CONNECT_ERROR;
-- 
cgit v1.2.3