summaryrefslogtreecommitdiff
path: root/includes/account.php
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2011-09-14 16:05:15 +0200
committerBernhard Fröhlich <bernhard@cacert.org>2011-09-14 16:05:15 +0200
commitb14806a5215a9fc1e95383c7f543d7e17f24a1f5 (patch)
treef84885788fdc62cb8dcd9d50d2be21d854c03ed9 /includes/account.php
parenta2c2ddd7b5ef0c04d52fe9f22439e30a6de27a87 (diff)
parenteb4d4d1ca50d08211ec230a60cee11f65b74c2bd (diff)
downloadcacert-devel-b14806a5215a9fc1e95383c7f543d7e17f24a1f5.tar.gz
cacert-devel-b14806a5215a9fc1e95383c7f543d7e17f24a1f5.tar.xz
cacert-devel-b14806a5215a9fc1e95383c7f543d7e17f24a1f5.zip
Merge branch 'release' of ssh://git-dev.cacert/var/cache/git/cacert-devel into bug-975
Diffstat (limited to 'includes/account.php')
-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..24c61d8 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: Pass Phrase not Changed"),
+ '</h3>', "\n";
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: Pass Phrase not Changed"), '</h3>', "\n";
echo _("The Pass Phrase you submitted was too short.");
} else if($score < 3) {
+ echo '<h3 style="color:red">',
+ _("Failure: Pass Phrase not Changed"), '</h3>', "\n";
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: Pass Phrase not Changed"), '</h3>', "\n";
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>', _("Pass Phrase Changed Successfully"), '</h3>', "\n";
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";