X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fregister.php;h=7e569ff21752b155cc1253f78658ab0ee0d41e1f;hp=7f3266bba19d0fa4885a60d73f3758a5d6f038ac;hb=e9a0778e2270c200bdb77034a56c7c613606d737;hpb=44e91af3fd631752e4de74673b591bce17ce7a79

diff --git a/include/register.php b/include/register.php
index 7f3266b..7e569ff 100644
--- a/include/register.php
+++ b/include/register.php
@@ -1,4 +1,23 @@
 <?php
+/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+ *
+ *   This file is part of e-DoKo.
+ *
+ *   e-DoKo is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   e-DoKo is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with e-DoKo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
@@ -6,7 +25,7 @@ if(!isset($HOST))
   exit;
 
 /* new user wants to register */
-if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
+if(myisset("Rfullname","Remail","Rtimezone") )
   {
     global $HOST,$INDEX;
 
@@ -23,6 +42,19 @@ if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
 	echo "this email address is already used ?!<br />";
 	$ok=0;
       }
+    /* need either openid or password */
+    if(!myisset('Rpassword')  &&  !myisset('Ropenid'))
+      {
+	echo "I need either a Password or an Openid url.<br />";
+	$ok=0;
+      }
+    /* check for password length */
+    if(myisset('Rpassword') && strlen(trim($_REQUEST['Rpassword']))==0 )
+      {
+	echo "Password can't be empty!<br />";
+	$ok=0;
+      }
+
     /* check against robots */
     $robots=0; /* at least one anti-robot question needs to be answered */
     if(myisset('Robotproof0'))
@@ -65,15 +97,34 @@ if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
 	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"])).
-		    ",".DB_quote_smart($_REQUEST["Rtimezone"]).",NULL,NULL)");
-
+	if(myisset('Rpassword'))
+	  {
+	    $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)");
+	  }
+	else if(myisset('Ropenid'))
+	  {
+	    $password = $_REQUEST["Rfullname"].preg_replace('/([ ])/e', 'chr(rand(33,122))', '               ');
+	    $r=DB_query("INSERT INTO User VALUES(NULL,".DB_quote_smart($_REQUEST["Rfullname"]).
+			",".DB_quote_smart($_REQUEST["Remail"]).
+			",".DB_quote_smart(md5($password)).
+			",".DB_quote_smart($_REQUEST["Rtimezone"]).",NULL,NULL)");
+	    if($r)
+	      {
+		include_once('openid.php');
+		$myid = DB_get_userid('email',$_REQUEST['Remail']);
+		DB_AttachOpenID($_REQUEST['Ropenid'], $myid);
+	      }
+	  }
+	else
+	  {
+	    echo 'Error during registration, please contact '.$ADMIN_NAME.' at '.$ADMIN_EMAIL;
+	  }
 	if($r)
 	  {
 	    /* Set session, so that new user doesn't need to log in */
@@ -88,54 +139,11 @@ if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
       }
     else
       {
-	echo "Couldn't register you. Please <a href=\"index.php?action=register\">try again</a>! </br />\n";
+	echo "Couldn't register you. Please <a href=\"index.php\">try again</a>! </br />\n";
       }
   }
- else
-   {
-     /* 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>
-            <legend>Register</legend>
-             <table>
-              <tr>
-               <td><label for="Rfullname">Full name:</label></td>
-	       <td><input type="text" id="Rfullname" name="Rfullname" size="20" maxlength="30" /> </td>
-              </tr><tr>
-               <td><label for="Remail">Email:</label></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>
-               <td><input type="password" id="Rpassword" name="Rpassword" size="20" maxlength="30" /></td>
-              </tr><tr>
-	       <td><label for="Rtimezone">Timezone:</label></td>
-               <td>
-<?php
-               output_select_timezone("Rtimezone");
-?>
-	       </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>
-             </table>
-          </fieldset>
-        </form>
-<?php
-   }
+else
+  {
+    echo "Test test test... hmm, this page shouldn't really be here, should it? <a href=\"index.php\">Go back here :)</a> </br />\n";
+  }
 ?>
\ No newline at end of file