TODO | 6 ------ frontend/php/account/register.php | 30 +++++++++++++++++------------- 2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/TODO b/TODO index cdbbf13..52ea631 100644 --- a/TODO +++ b/TODO @@ -1,12 +1,6 @@ - Explain mail hidding more precisely http://savannah.gnu.org/support/?105697 -- Support Mercurial - http://savannah.gnu.org/support/?105710 - -- Authenticate via e-mail - http://savannah.gnu.org/support/?105727 - - Clean-up themes wrt guidelines version http://savannah.gnu.org/support/?105647 diff --git a/frontend/php/account/register.php b/frontend/php/account/register.php index 95f27d0..5116ab4 100644 --- a/frontend/php/account/register.php +++ b/frontend/php/account/register.php @@ -65,7 +65,7 @@ if (!empty($update) and form_check($form_id)) if ($GLOBALS['sys_registration_text_spam_test']) { if ($form_year != 1983) - fb(_("Please answer the antispam test!"),1); + fb(_("Please answer the antispam test correctly."),1); else $antispam_is_valid = true; } @@ -75,7 +75,7 @@ if (!empty($update) and form_check($form_id)) $securimage = new Securimage(); if ($securimage->check($_POST['captcha_code']) == false) - fb(_("Please correctly answer the antispam captcha!"),1); + fb(_("Please answer the antispam captcha correctly."),1); else $antispam_is_valid = true; } @@ -85,7 +85,7 @@ if (!empty($update) and form_check($form_id)) # Login. if ($form_loginname == '') - fb(_("You must supply a username."),1); + fb(_("Please supply a username."),1); elseif (!account_namevalid($form_loginname)) { # Feedback included by the check function. @@ -93,7 +93,7 @@ if (!empty($update) and form_check($form_id)) # Avoid duplicates. elseif (db_numrows(db_execute("SELECT user_id FROM user WHERE user_name = ?", array($form_loginname))) > 0) - fb(_("That username already exists."),1); + fb(_("That username is already active or is awaiting email confirmation."),1); elseif (db_numrows(db_execute("SELECT group_list_id FROM mail_group_list " . "WHERE " . "list_name = ?", array($form_loginname))) > 0) @@ -103,7 +103,7 @@ _("That username is blocked to avoid conflict with mailing-list addresses."),1); $login_is_valid = true; if ($form_pw == '') - fb(_("You must supply a password."),1); + fb(_("Please supply a password."),1); # Password sanity checks - unless PAM is used. elseif ($GLOBALS['sys_use_pamauth'] != "yes" and $form_usepam != 1 and $form_pw != $form_pw2) @@ -117,7 +117,7 @@ _("That username is blocked to avoid conflict with mailing-list addresses."),1); $pw_is_valid = true; if (!$form_email) - fb(_("You must supply a valid email address."),1); + fb(_("Please supply a valid email address."),1); elseif (!account_emailvalid($form_email)) { # Feedback included by the check function. @@ -126,7 +126,7 @@ _("That username is blocked to avoid conflict with mailing-list addresses."),1); $email_is_valid = true; if (!account_realname_valid ($form_realname)) - fb(_("You must supply a real name."), 1); + fb(_("Please supply a full name."), 1); else $realname_is_valid = true; $form_realname = account_sanitize_realname ($form_realname); @@ -192,7 +192,7 @@ if ($form_is_valid) { user_purge ($newuserid); - fb(_("That username already exists."),1); + fb(_("That username is already active or is awaiting email confirmation."),1); } form_clean($form_id); @@ -219,7 +219,7 @@ in the %s database.'), $GLOBALS['sys_name'])." "; $message .= _('For better security we advise you to register an encryption-capable GPG key and enable encryption when sending password reset messages (if you do, please request password reset and make sure that you -actually can read those messages).'). "\n"; +can actually read those messages).'). "\n"; } sendmail_mail($GLOBALS['sys_mail_replyto']."@" .$GLOBALS['sys_mail_domain'], @@ -255,6 +255,9 @@ else 'context'=>'account')); print form_header($_SERVER['PHP_SELF'], htmlentities($form_id, ENT_QUOTES, 'UTF-8')); + print "<br />\n" . '<span class="text">' + . _("Please fill all fields to complete registration.") . '<br />'; + print '<p><span class="preinput">'._("Login Name:") .'</span>'."<br />\n".' '; print form_input("text", "form_loginname", $form_loginname); @@ -267,7 +270,7 @@ else .'</span><br /> '; print form_input("password", "form_pw2", $form_pw2); print "</p>\n"; - print '<p><span class="preinput">'._("Real Name:").'</span><br /> '; + print '<p><span class="preinput">'._("Full Name:").'</span><br /> '; print '<input size="30" type="text" name="form_realname" value="' .htmlentities($form_realname, ENT_QUOTES , 'UTF-8')."\" /></p>\n"; print '<p><span class="preinput">'._("Email Address:") @@ -275,9 +278,9 @@ else print '<input size="30" type="text" name="form_email" value="' .htmlentities($form_email, ENT_QUOTES , 'UTF-8').'" />'; print "<br />\n".'<span class="text">' -._("This email address will be verified before account activation. Check your -spam filters. Do not use a hotmail or comcast address here.") -."</span></p>\n"; +._("This address will be verified by an email before account activation. Check your +spam filters. Please do not use a hotmail or comcast address here.") +."</span></p>\n"; # why don't use hotmail or comcast? explain to the user if possible if ($GLOBALS['sys_registration_text_spam_test']) { @@ -304,6 +307,7 @@ _("In what year was the GNU project announced? [<a href='%s'>hint</a>]"), .'<input type="text" name="captcha_code" size="10" ' .'maxlength="6" />'; } + # Extension for PAM authentication. # FIXME: for now, only the PAM authentication that exists is for AFS. # but PAM is not limited to AFS, so we should consider a way to configure -- 2.20.1
