CLEANUP: clean up the preferences html output a bit

[e-DoKo.git] / include / register.php

diff --git a/include/register.php b/include/register.php
index 0dc204d5ec18471a7befc0ceb90f0bbc9632f960..7f3266bba19d0fa4885a60d73f3758a5d6f038ac 100644 (file)
--- a/include/register.php
+++ b/include/register.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,

  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))


@@ -9,43 +9,95 @@ if(!isset($HOST))
 if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
   {
     global $HOST,$INDEX;
 if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
   {
     global $HOST,$INDEX;

+
+    /* is this name already in use/ */

     $ok=1;
     $ok=1;

-    if(DB_get_userid('name',$_REQUEST["Rfullname"]))
+    if(DB_get_userid('name',$_REQUEST['Rfullname']))

       {
        echo "please chose another name<br />";
        $ok=0;
       }
       {
        echo "please chose another name<br />";
        $ok=0;
       }

-    if(DB_get_userid('email',$_REQUEST["Remail"]))
+    /* check if email address is already used */
+    if(DB_get_userid('email',$_REQUEST['Remail']))

       {
        echo "this email address is already used ?!<br />";
        $ok=0;
       }
       {
        echo "this email address is already used ?!<br />";
        $ok=0;
       }

+    /* check against robots */
+    $robots=0; /* at least one anti-robot question needs to be answered */
+    if(myisset('Robotproof0'))
+      {
+       if($_REQUEST['Robotproof0']!=42)
+         $ok=0;
+       else
+         $robot=1;
+      }
+    else if(myisset('Robotproof1'))
+      {
+       if($_REQUEST['Robotproof1']!=35)
+         $ok=0;
+       else
+         $robot=1;
+      }
+    else if(myisset('Robotproof2'))
+      {
+       if($_REQUEST['Robotproof2']!=28)
+         $ok=0;
+       else
+         $robot=1;
+      }
+    else if(myisset('Robotproof3'))
+      {
+       if($_REQUEST['Robotproof3']!=21)
+         $ok=0;
+       else
+         $robot=1;
+      }
+    else if(myisset('Robotproof4'))
+      {
+       if($_REQUEST['Robotproof4']!=14)
+         $ok=0;
+       else
+         $robot=1;
+      }
+    if($robot==0)
+      {
+       echo "You answered the math question wrong. <br />\n";
+       $ok=0;
+      }
+
+    /* everything ok, go ahead and create user */

     if($ok)
       {
        $r=DB_query("INSERT INTO User VALUES(NULL,".DB_quote_smart($_REQUEST["Rfullname"]).
                    ",".DB_quote_smart($_REQUEST["Remail"]).
                    ",".DB_quote_smart(md5($_REQUEST["Rpassword"])).
     if($ok)
       {
        $r=DB_query("INSERT INTO User VALUES(NULL,".DB_quote_smart($_REQUEST["Rfullname"]).
                    ",".DB_quote_smart($_REQUEST["Remail"]).
                    ",".DB_quote_smart(md5($_REQUEST["Rpassword"])).

-                   ",".DB_quote_smart($_REQUEST["Rtimezone"]).",NULL,NULL)"); 
-       
+                   ",".DB_quote_smart($_REQUEST["Rtimezone"]).",NULL,NULL)");
+

        if($r)
          {
            /* Set session, so that new user doesn't need to log in */
            $myname = DB_get_name('email',$_REQUEST['Remail']);
            $_SESSION["name"] = $myname;
        if($r)
          {
            /* Set session, so that new user doesn't need to log in */
            $myname = DB_get_name('email',$_REQUEST['Remail']);
            $_SESSION["name"] = $myname;

-           
-           echo "myname $myname --";
-           
+

            echo " Welcome to e-DoKo, you are now registered, please visit the".
              " <a href=\"".$HOST.$INDEX."\">homepage</a> to continue.";
          }
        else
          echo " something went wrong, couldn't add you to the database, please contact $ADMIN_NAME at $ADMIN_EMAIL.";
       }
            echo " Welcome to e-DoKo, you are now registered, please visit the".
              " <a href=\"".$HOST.$INDEX."\">homepage</a> to continue.";
          }
        else
          echo " something went wrong, couldn't add you to the database, please contact $ADMIN_NAME at $ADMIN_EMAIL.";
       }

-   }
-/* page for registration */
+    else
+      {
+       echo "Couldn't register you. Please <a href=\"index.php?action=register\">try again</a>! </br />\n";
+      }
+  }

  else
    {
  else
    {

-     echo "IMPORTANT: passwords are going over the net as clear text, so pick an easy password. No need to pick anything complicated here ;)<br /><br />";
+     /* No information for new user given, ouput a page for registration */
+     echo "<p><br /><strong> IMPORTANT: passwords are going over the net as clear text, so pick an easy password. ".
+       "No need to pick anything complicated here ;)<br />";
+     echo "N.B. Your email address will be exposed to other players whom you play games with. ";
+     echo "<br /><br /></strong></p>";

      ?>
         <form action="index.php?action=register" method="post">
           <fieldset>
      ?>
         <form action="index.php?action=register" method="post">
           <fieldset>


@@ -53,31 +105,37 @@ if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
              <table>
               <tr>
                <td><label for="Rfullname">Full name:</label></td>
              <table>
               <tr>
                <td><label for="Rfullname">Full name:</label></td>

-              <td><input type="text" id="Rfullname" name="Rfullname" size="20" maxsize="30" /> </td>
+              <td><input type="text" id="Rfullname" name="Rfullname" size="20" maxlength="30" /> </td>

               </tr><tr>
                <td><label for="Remail">Email:</label></td>
               </tr><tr>
                <td><label for="Remail">Email:</label></td>

-              <td><input type="text" id="Remail" name="Remail" size="20" maxsize="30" /></td>
+              <td><input type="text" id="Remail" name="Remail" size="20" maxlength="30" /></td>

               </tr><tr>
               <td><label for="Rpassword">Password(will be displayed in cleartext on the next page):</label></td>
               </tr><tr>
               <td><label for="Rpassword">Password(will be displayed in cleartext on the next page):</label></td>

-               <td><input type="password" id="Rpassword" name="Rpassword" size="20" maxsize="30" /></td>
+               <td><input type="password" id="Rpassword" name="Rpassword" size="20" maxlength="30" /></td>

               </tr><tr>
               <td><label for="Rtimezone">Timezone:</label></td>
                <td>
               </tr><tr>
               <td><label for="Rtimezone">Timezone:</label></td>
                <td>

-                 <select id="Rtimezone" name="Rtimezone" size="1">
-                     <option value="Europe/London">Berlin</option>
-                     <option value="Europe/Berlin">Berlin</option>
-                     <option value="America/Vancouver">Berkeley</option>
-                     <option value="Pacific/Auckland">Wellington</option>
-                 </select>
-                (If your timezone is not listed, just select whatever you want and email the admin your correct time zone.)
+<?php
+               output_select_timezone("Rtimezone");
+?>

               </td>
               </td>

+              </tr><tr>
+              </tr><tr>
+<?php
+              /* random number to select robotproof question */
+             $rand_number = mt_rand(0,3); /* to get numbers between 0 and 4  */
+              $Robotproof = "Robotproof".$rand_number;
+?>
+               <td><label for="Robotproof">Please answer this question: <?php echo output_robotproof($rand_number); ?></label></td>
+<?php
+        echo "<td><input type=\"text\" id=\"$Robotproof\" name=\"$Robotproof\" size=\"20\" maxlength=\"30\" /></td>\n";
+?>

               </tr><tr>
                <td colspan="2"> <input type="submit" value="register" /></td>
               </tr><tr>
                <td colspan="2"> <input type="submit" value="register" /></td>

+              </tr>

              </table>
           </fieldset>
         </form>
 <?php
    }
              </table>
           </fieldset>
         </form>
 <?php
    }

-
-

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file