new coolness from sigger

1 files changed, 59 insertions, 50 deletions

diff --git a/register.php b/register.php
index 010fb380..410f2e96 100644
--- a/register.php
+++ b/register.php
@@ -24,87 +24,96 @@
 	@header User Registration page
 	@discussion this page handles new user
 		registration, this is by default disabled
-		(it allows public reg) 
+		(it allows public reg)
 
 */
-$no_session = 1;
+$no_session = true;
 require_once ("modules/init.php");
 
 /* Check Perms */
-if (!conf('allow_public_registration')) { 
+if (!conf('allow_public_registration')) {
 	access_denied();
 }
 
 
 $action = scrub_in($_REQUEST['action']);
 
+?>
 
-show_template('header');
+<?php
 
-/* Start switch based on action passed */ 
+/* Start switch based on action passed */
 switch ($action) {
     case 'add_user':
-        if (conf('demo_mode')) { break; }
-	$username = scrub_in($_REQUEST['username']);
+    // User information has been entered
+    // we need to check the database for possible existing username first
+    // if username exists, error and say "Please choose a different name."
+    // if username does not exist, insert user information into database
+    // then allow the user to 'click here to login'
+    // possibly by logging them in right then and there with their current info
+    // and 'click here to login' would just be a link back to index.php
+    if (conf('demo_mode')) { break; }
+    $accept_agreement = scrub_in($_REQUEST['accept_agreement']);
 	$fullname = scrub_in($_REQUEST['fullname']);
+	$username = scrub_in($_REQUEST['username']);
 	$email = scrub_in($_REQUEST['email']);
 	$pass1 = scrub_in($_REQUEST['password_1']);
 	$pass2 = scrub_in($_REQUEST['password_2']);
-	if ( $pass1 != $pass2 ) {
-		echo "<CENTER><B>Your passwords do not match</b><br />";
-		echo "Click <B><a href=\"javascript:history.back(1)\">here</a></B> to go back";
+	if(conf('user_agreement')==true){
+		if(!$accept_agreement){
+			echo("<center><b>You <u>must</u> accept the user agreement</b><br>");
+			echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
+			break;
+		}
+	}
+
+	if(!$username){
+		echo("<center><b>You did not enter a username</b><br>");
+		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
 		break;
 	}
-// INSERTED BY TERRY FOR MAIL ADDRESS CHECK
-	require("../templates/validateEmailFormat.php");
-        require("../templates/validateEmail.php");
-    // get the address from wherever you get it ... form input, etc.
-    // $email = "info@xs4all.nl";
-    // $email = $_GET['email'];
-    // try a few extra times if we're concerned about fsockopen problems
-    $attempt = 0;
-    $max_attempts = 3;
-    $response_code = "";
-
-    while ( $response_code == "" || strstr( $response_code, "fsockopen error" )) {
-        $validate_results = validateEmail( $email );
-
-        $response_code = $validate_results[1];
-        if($attempt == $max_attempts) break;
-        $attempt++;
-    }
-
-    // display results
-    //echo "successful check during attempt #$attempt<br />";
-    if ( $validate_results[0] ) {
-    $validation = str_rand(20);
-    $regdate = "2004-01-01";
-	if (!$user->create($username, $fullname, $email, $pass1, $access, $validation)) {
-		echo "<CENTER>Registratie van gebruiker gefaald!<br />";
-		echo "User ID of Email adres reeds in gebruik<br />";
-		echo "Click <B><a href=\"javascript:history.back(1)\">here</a></B> to go back";
-	break;
+
+	if(!$fullname){
+		echo("<center><b>Please enter your full name</b><br>");
+		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
+		break;
+	}
+
+	if(!good_email($email)){
+		echo("<center><b>You must enter a valid email address</b><br>");
+		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
+		break;
 	}
-	echo "<CENTER>Successvol gechecked na #$attempt poging<br />";
-        echo "Email verificatie van het email adres <B>$email</B> is gelukt<br />";
-	echo "<B>Your User ID is Created<br />";
-	echo "<P>You will receive an email when your account is approved<B><br />";   
-	echo "<A HREF=\"http://www.pb1unx.com\">Ga naar homepagina</A><br />";
-        } else {
-        echo "<CENTER>Geen successvolle check. Er is/zijn #$attempt pogingen gedaan!<br />";
-	echo "D'oh! <B>$email</B> is niet in orde!<br />";
-        echo "$validate_results[1]<br />";
-	echo "Click <B><a href=\"javascript:history.back(1)\">here</a></B> to go back";
+
+	if(!$pass1){
+		echo("<center><b>You must enter a password</b><br>");
+		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
+		break;
 	}
-	break;
 
+	if ( $pass1 != $pass2 ) {
+		echo("<center><b>Your passwords do not match</b><br>");
+		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
+		break;
+	}
+	$new_user = new_user("$username", "$fullname", "$email", "$pass1");
+	if(!$new_user){
+		echo("<center><b>That username already exists</b><br>");
+		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
+		break;
+	}
+	break;
 
+    // This is the default action.
     case 'show_add_user':
     default:
         if (conf('demo_mode')) { break; }
 	$values = array('type'=>"new_user");
 	show_user_registration($values);
 	break;
+	case 'new_user':
+	include("templates/show_new_user.inc");
+	break;
 
 }