X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=b53d0bdaedbb9d31c3163d716c566c41b02abd05;hb=5e4fd904c6045b66540a4e8fd77bf4f2f04537eb;hp=ee33a91fde18c9784eaad0d6c6369896ad9a204c;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index ee33a91fde..b53d0bdaed 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -53,7 +53,7 @@ if (!isExtensionActive('register')) {
 }
 
 // Initialize variables
-$isFailed   = false;
+$isOkay     = true;
 $shortPass  = false;
 $cats       = 0;
 $ipTimedOut = false;
@@ -83,31 +83,31 @@ if (isFormSent()) {
 	// Did he agree to our Terms Of Usage?
 	if (postRequestElement('agree') != 'Y') {
 		setRequestPostElement('agree', '!');
-		$isFailed = true;
+		$isOkay = false;
 	} // END - if
 
 	// Did he enter a valid email address? (we really don't care about
 	// that, he has to click on a confirmation link :P )
 	if ((!isPostRequestElementSet('email')) || (!isEmailValid(postRequestElement('email')))) {
 		setRequestPostElement('email', '!');
-		$isFailed = true;
+		$isOkay = false;
 	} // END - if
 
 	// And what about surname and family's name?
 	if (!isPostRequestElementSet('surname')) {
 		setRequestPostElement('surname', '!');
-		$isFailed = true;
+		$isOkay = false;
 	} // END - if
 	if (!isPostRequestElementSet('family')) {
 		setRequestPostElement('family', '!');
-		$isFailed = true;
+		$isOkay = false;
 	} // END - if
 
 	// Get temporary array for modification
 	$postArray = postRequestArray();
 
 	// Check for required fields
-	if ($isFailed === false) $isFailed = ifRequiredRegisterFieldsAreSet($postArray);
+	if ($isOkay === true) $isOkay = ifRequiredRegisterFieldsAreSet($postArray);
 
 	// Set it back in request
 	setPostRequestArray($postArray);
@@ -121,13 +121,13 @@ if (isFormSent()) {
 			if (!isPostRequestElementSet('pass1')) { setRequestPostElement('pass1', '!'); } else { setRequestPostElement('pass1', ''); }
 			if (!isPostRequestElementSet('pass2')) { setRequestPostElement('pass2', '!'); } else { setRequestPostElement('pass2', ''); }
 		}
-		$isFailed = true;
+		$isOkay = false;
 	} // END - if
 
 	// Is the password long enouth?
-	if ((strlen(postRequestElement('pass1')) < getConfig('pass_len')) && ($isFailed === false)) {
+	if ((strlen(postRequestElement('pass1')) < getConfig('pass_len')) && ($isOkay === true)) {
 		$shortPass = true;
-		$isFailed = true;
+		$isOkay = false;
 	} // END - if
 
 	// No admin? Admins can always register!
@@ -139,7 +139,7 @@ if (isFormSent()) {
 
 		if ($cats < getConfig('least_cats')) {
 			// ... nope!
-			$isFailed = true;
+			$isOkay = false;
 		} // END - if
 	} // END - if
 
@@ -148,7 +148,7 @@ if (isFormSent()) {
 		$CHK = isEmailTaken(postRequestElement('email'));
 		if ($CHK === true) {
 			setRequestPostElement('email', '?');
-			$isFailed = true;
+			$isOkay = false;
 		} // END - if
 	} // END - if
 
@@ -168,18 +168,20 @@ LIMIT 1",
 			// Same IP in timeout range and different email address entered... Eat this, faker! ;-)
 			// But admins are allowed to fake their own exchange service.
 			$ipTimedOut = true;
-			$isFailed = true;
+			$isOkay = false;
 		} // END - if
-	} // END - if
 
-	// Free memory
-	SQL_FREERESULT($result);
+		// Free memory
+		SQL_FREERESULT($result);
+	} // END - if
 } // END - if
 
-if ((isFormSent()) && (($isFailed === false) || (isAdmin()))) {
+// Is the form sent and all went fine or admin logged in?
+//* DEBUG: */ print intval(isFormSent()).'/'.intval($isOkay).'/'.intval(isAdmin()).'<br />';
+if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
 	// Prepapre month and day of birth
-	if (strlen(postRequestElement('day'))   == 1) setRequestPostElement('day'  , '0'.postRequestElement('day'));
-	if (strlen(postRequestElement('month')) == 1) setRequestPostElement('month', '0'.postRequestElement('month'));
+	if (strlen(postRequestElement('day'))   == 1) setRequestPostElement('day'  , 0 . postRequestElement('day'));
+	if (strlen(postRequestElement('month')) == 1) setRequestPostElement('month', 0 . postRequestElement('month'));
 
 	// Get total ...
 	// ... confirmed, ...
@@ -288,8 +290,8 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		if (getConfig('ref_payout') > 0) $locked = 'locked_points';
 
 		// @TODO Rewrite this to addPointsDirectly()
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `".$locked."`) VALUES (%s,0,'%s')",
-			array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `".$locked."`) VALUES (%s,0,'{?points_register?}')",
+			array(bigintval($userid)), __FILE__, __LINE__);
 
 		// Update mediadata as well
 		if ((getExtensionVersion('mediadata') >= '0.0.4') && ($locked == 'points')) {
@@ -313,7 +315,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	$gender = translateGender(postRequestElement('gender'));
 
 	// ... rewrite a zero referal ID to the main title
-	if (postRequestElement('refid') == '0') setRequestPostElement('refid', getConfig('MAIN_TITLE'));
+	if (postRequestElement('refid') == 0) setRequestPostElement('refid', getConfig('MAIN_TITLE'));
 
 	// Is ZIP code set?
 	if (isPostRequestElementSet('zip')) {
@@ -321,7 +323,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		// Start with the gender...
 		$content = array(
 			'hash'    => $hash,
-			'userid'     => $userid,
+			'userid'  => $userid,
 			'gender'  => $gender,
 			'surname' => SQL_ESCAPE(postRequestElement('surname')),
 			'family'  => SQL_ESCAPE(postRequestElement('family')),
@@ -337,7 +339,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		// No ZIP code entered
 		$content = array(
 			'hash'    => $hash,
-			'userid'     => $userid,
+			'userid'  => $userid,
 			'gender'  => $gender,
 			'surname' => SQL_ESCAPE(postRequestElement('surname')),
 			'family'  => SQL_ESCAPE(postRequestElement('family')),