summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-07-12 23:48:18 +0200
committerMichael Tänzer <neo@nhng.de>2011-07-12 23:48:18 +0200
commit5bb9baba4c9a6ded9bcf1dbe984731420c2a36fd (patch)
treea1ec47dd9690729b3b585abfa0848d950f0b8026
parent00675c949494888ac5f3cd802de41bf6f2caf45b (diff)
downloadcacert-devel-5bb9baba4c9a6ded9bcf1dbe984731420c2a36fd.tar.gz
cacert-devel-5bb9baba4c9a6ded9bcf1dbe984731420c2a36fd.tar.xz
cacert-devel-5bb9baba4c9a6ded9bcf1dbe984731420c2a36fd.zip
bug 953: Make error messages more impressive
bug 953: "After change of password change on account.php?id=14 does not meet requirements wrong redirect" Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--includes/account.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/includes/account.php b/includes/account.php
index 14702b9..f805595 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -1290,6 +1290,8 @@
showheader(_("My CAcert.org Account!"));
if($_SESSION['_config']['user']['pword1'] == "" || $_SESSION['_config']['user']['pword1'] != $_SESSION['_config']['user']['pword2'])
{
+ echo '<h3 style="color:red">', _("Failure: Password not Changed"),
+ '</h3>';
echo _("New Pass Phrases specified don't match or were blank.");
} else {
$score = checkpw($_SESSION['_config']['user']['pword1'], $_SESSION['profile']['email'], $_SESSION['profile']['fname'],
@@ -1306,14 +1308,21 @@
}
if(strlen($_SESSION['_config']['user']['pword1']) < 6) {
+ echo '<h3 style="color:red">',
+ _("Failure: Password not Changed"), '</h3>';
echo _("The Pass Phrase you submitted was too short.");
} else if($score < 3) {
+ echo '<h3 style="color:red">',
+ _("Failure: Password not Changed"), '</h3>';
printf(_("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. Only scored %s points out of 6."), $score);
} else if($rc <= 0) {
+ echo '<h3 style="color:red">',
+ _("Failure: Password not Changed"), '</h3>';
echo _("You failed to correctly enter your current Pass Phrase.");
} else {
mysql_query("update `users` set `password`=sha1('".$_SESSION['_config']['user']['pword1']."')
where `id`='".$_SESSION['profile']['id']."'");
+ echo '<h3>', _("Password Changed Successfully"), '</h3>';
echo _("Your Pass Phrase has been updated and your primary email account has been notified of the change.");
$body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n";
$body .= _("You are receiving this email because you or someone else")."\n";