X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=9065ccf701edaa5bc5d6800c9c54b79bdd00d78f;hp=ee33a91fde18c9784eaad0d6c6369896ad9a204c;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index ee33a91fde..9065ccf701 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -53,21 +53,16 @@ if (!isExtensionActive('register')) {
 }
 
 // Initialize variables
-$isFailed   = false;
+$isOkay     = true;
 $shortPass  = false;
-$cats       = 0;
+$cats       = '0';
 $ipTimedOut = false;
 
 // Default refid is zero
 setRequestPostElement('refid', 0);
 if (determineReferalId() > 0) {
 	// Test if the refid is valid
-	$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-		array(determineReferalId()), __FILE__, __LINE__);
-
-	// Userid found?
-	//* DEBUG: */ die("refid={determineReferalId()}/numRows=".SQL_NUMROWS($result)."");
-	if (SQL_NUMROWS($result) == 0) {
+	if (!fetchUserData(determineReferalId())) {
 		// Not found so we set your refid!
 		setRequestPostElement('refid', getConfig('def_refid'));
 		setSession('refid', getConfig('def_refid'));
@@ -83,31 +78,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 +116,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 +134,7 @@ if (isFormSent()) {
 
 		if ($cats < getConfig('least_cats')) {
 			// ... nope!
-			$isFailed = true;
+			$isOkay = false;
 		} // END - if
 	} // END - if
 
@@ -148,7 +143,7 @@ if (isFormSent()) {
 		$CHK = isEmailTaken(postRequestElement('email'));
 		if ($CHK === true) {
 			setRequestPostElement('email', '?');
-			$isFailed = true;
+			$isOkay = false;
 		} // END - if
 	} // END - if
 
@@ -168,18 +163,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, ...
@@ -196,7 +193,7 @@ if ((isFormSent()) && (($isFailed === false) || (isAdmin()))) {
 	// @TODO Rewrite these all to a single filter
 	$ADD1 = '';
 	$ADD2 = '';
-	if (getExtensionVersion('theme') >= '0.0.8') {
+	if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
 		// Okay, add design here
 		$ADD1 = ', `curr_theme`';
 		$ADD2 = ", '".getCurrentTheme()."'";
@@ -205,7 +202,7 @@ if ((isFormSent()) && (($isFailed === false) || (isAdmin()))) {
 	// Check if I shall disable sending mail to newly registered members out about active/begging rallye
 	//
 	// First comes first: begging rallye
-	if (getExtensionVersion('beg') >= '0.1.7') {
+	if (isExtensionInstalledAndNewer('beg', '0.1.7')) {
 		// Okay, shall I disable now?
 		if (getConfig('beg_new_mem_notify') != 'Y') {
 			$ADD1 .= ', `beg_ral_notify`, `beg_ral_en_notify`';
@@ -214,7 +211,7 @@ if ((isFormSent()) && (($isFailed === false) || (isAdmin()))) {
 	} // END - if
 
 	// Second: active rallye
-	if (getExtensionVersion('bonus') >= '0.7.7') {
+	if (isExtensionInstalledAndNewer('bonus', '0.7.7')) {
 		// Okay, shall I disable now?
 		if (getConfig('bonus_new_mem_notify') != 'Y') {
 			$ADD1 .= ', `bonus_ral_notify`, `bonus_ral_en_notify`';
@@ -264,7 +261,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	$userid = SQL_INSERTID();
 
 	// Did this work?
-	if ($userid == 0) {
+	if ($userid == '0') {
 		// Something bad happened!
 		loadTemplate('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED'));
 		return;
@@ -280,7 +277,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	// Write his welcome-points
 	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`=0 LIMIT 1",
 		array(bigintval($userid)), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 0) {
+	if (SQL_NUMROWS($result) == '0') {
 		// Add only when the line was not found (maybe some more secure?)
 		$locked = 'points';
 
@@ -288,11 +285,11 @@ 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')) {
+		if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
 			// Update database
 			updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
 		} // END - if
@@ -312,7 +309,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	// Rewrite gender
 	$gender = translateGender(postRequestElement('gender'));
 
-	// ... rewrite a zero referal ID to the main title
+	// ... rewrite a zero referal id to the main title
 	if (postRequestElement('refid') == '0') setRequestPostElement('refid', getConfig('MAIN_TITLE'));
 
 	// Is ZIP code set?
@@ -321,7 +318,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 +334,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')),