diff options
author | Andrew Dolgov <[email protected]> | 2015-07-06 21:31:57 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-07-06 21:31:57 +0300 |
commit | 74c1ff6065a4fc7c58bb453a87dfcf59a14e88f8 (patch) | |
tree | 48372c8e7d4e65984e40a6e95373609bd5cb13a3 /classes | |
parent | 5dcc7bf1f6a5dceddf28f179438531d3f08b0d6a (diff) | |
parent | 35c373549453d962907c14a81059a1de0dfc5e7a (diff) |
Merge branch 'master' of git.fakecake.org:tt-rss
Diffstat (limited to 'classes')
-rw-r--r-- | classes/pref/prefs.php | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 6c33170bd..d36e31f0b 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -65,26 +65,26 @@ class Pref_Prefs extends Handler_Protected { $con_pw = $_POST["confirm_password"]; if ($old_pw == "") { - print "ERROR: ".__("Old password cannot be blank."); + print "ERROR: ".format_error("Old password cannot be blank."); return; } if ($new_pw == "") { - print "ERROR: ".__("New password cannot be blank."); + print "ERROR: ".format_error("New password cannot be blank."); return; } if ($new_pw != $con_pw) { - print "ERROR: ".__("Entered passwords do not match."); + print "ERROR: ".format_error("Entered passwords do not match."); return; } $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); if (method_exists($authenticator, "change_password")) { - print $authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw); + print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw)); } else { - print "ERROR: ".__("Function not supported by authentication module."); + print "ERROR: ".format_error("Function not supported by authentication module."); } } @@ -244,6 +244,8 @@ class Pref_Prefs extends Handler_Protected { print "<h2>" . __("Password") . "</h2>"; + print "<div style='display : none' id='pwd_change_infobox'></div>"; + $result = $this->dbh->query("SELECT id FROM ttrss_users WHERE id = ".$_SESSION["uid"]." AND pwd_hash = 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'"); @@ -264,12 +266,20 @@ class Pref_Prefs extends Handler_Protected { onComplete: function(transport) { notify(''); if (transport.responseText.indexOf('ERROR: ') == 0) { - notify_error(transport.responseText.replace('ERROR: ', '')); + + $('pwd_change_infobox').innerHTML = + transport.responseText.replace('ERROR: ', ''); + } else { - notify_info(transport.responseText); + $('pwd_change_infobox').innerHTML = + transport.responseText.replace('ERROR: ', ''); + var warn = $('default_pass_warning'); if (warn) Element.hide(warn); } + + new Effect.Appear('pwd_change_infobox'); + }}); this.reset(); } |