diff pages/register.inc.php @ 1014:87eda2e9023f

Back out the stValidateRequestUserData() parameter change, use separate function instead for checking for if e-mail is required.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Nov 2015 18:25:05 +0200
parents fd957c37fd80
children b7ebc845e740
line wrap: on
line diff
--- a/pages/register.inc.php	Thu Nov 05 00:05:50 2015 +0200
+++ b/pages/register.inc.php	Thu Nov 05 18:25:05 2015 +0200
@@ -156,7 +156,7 @@
   " <table class=\"register\">\n";
   stPrintFormTextInput("Handle:", "(elite)", 20, SET_LEN_USERNAME, "name");
   stPrintFormTextInput("Group(s):", "(elite crew^supahmen)", 30, SET_LEN_GROUPS, "groups");
-  stPrintFormTextInput("E-mail:", "(to be informed of location etc)", 30, SET_LEN_EMAIL, "email");
+  stPrintFormTextInput("E-mail:", stCheckRequireEmail() ? "(required)" : "", 30, SET_LEN_EMAIL, "email");
   stPrintFormTextInput("Oneliner:", "(whatever)", 30, SET_LEN_ONELINER, "oneliner");
   stPrintFormTextInput(hashToCheckStr($botCheckHash)." = ", "(I.Q. / robot check".
   //" [".hashToAnswer($botCheckHash)."]".
@@ -177,7 +177,7 @@
   stChkRequestItem("hash", $hash,
     array(CHK_GTEQ, VT_STR, 0, "Invalid data."));
 
-  stValidateRequestUserData(FALSE, $requireEmail, FALSE);
+  stValidateRequestUserData(FALSE, FALSE);
 
   $answer = stGetRequestItem("botcheck");
   if (hashToAnswer($hash) != intval($answer))