check if password was changed successfully, before looking for error messages

pull/136/head
Till Krüss 11 years ago
parent 0f4c9b850f
commit 910a3581be

@ -54,7 +54,12 @@ class rcube_domainfactory_password
curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields); curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields);
if ($result = curl_exec($ch)) { 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) { if (strpos($result, '<div class="d-msg-text">') !== false) {
preg_match_all('#<div class="d-msg-text">(.*?)</div>#s', $result, $errors); preg_match_all('#<div class="d-msg-text">(.*?)</div>#s', $result, $errors);
if (isset($errors[1])) { if (isset($errors[1])) {
@ -66,9 +71,6 @@ class rcube_domainfactory_password
} }
} }
if (strpos($result, 'Einstellungen erfolgreich') !== false) {
return PASSWORD_SUCCESS;
}
} else { } else {
return PASSWORD_CONNECT_ERROR; return PASSWORD_CONNECT_ERROR;

Loading…
Cancel
Save