X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=b020a6d4e26017d01af5040efa916513fb9210c2;hp=71f2c4443984099982cbea6686b98a58a0aa66e0;hb=831c60d4cec333ea95e0ce23d9e53fd5d8133ce6;hpb=143e78d4231adddd9e706cbf55ec5dd8c1651890

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 71f2c44439..b020a6d4e2 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -68,8 +68,23 @@ if (empty($_POST['city']))         $_POST['city']         = "";
 if (empty($_POST['cntry']))        $_POST['cntry']        = "";
 if (empty($_POST['country_code'])) $_POST['country_code'] = "1";
 
-if (isset($_POST['ok']))
-{
+// Default refid is zero
+$_POST['refid'] = 0;
+if ($GLOBALS['refid'] > 0) {
+	// Test if the refid is valid
+	$result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+		array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) == 0) {
+		// Not found so we set your refid!
+		$_POST['refid'] = $_CONFIG['def_refid'];
+		set_session('refid', $_CONFIG['def_refid']);
+	} else {
+		// Use the refid here
+		$_POST['refid'] = $GLOBALS['refid'];
+	}
+} // END - if
+
+if (isset($_POST['ok'])) {
 	// First we only check the submitted data then we continue... :)
 	//
 	// Did he agree to our Terms Of Usage?
@@ -155,19 +170,6 @@ if (isset($_POST['ok']))
 		$FAILED = true;
 	}
 
-	// Default refid is zero
-	$_POST['refid'] = 0;
-	if ($GLOBALS['refid'] > 0) {
-		// Test if the refid is valid
-		$result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-			array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 0) {
-			// Not found so we set your refid!
-			$_POST['refid'] = $_CONFIG['def_refid'];
-			set_session("refid", $_CONFIG['def_refid']);
-		} // END - if
-	} // END - if
-
 	// Free memory
 	SQL_FREERESULT($result);
 }
@@ -183,25 +185,22 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 
 	// Add design when extension sql_patches is v0.2.7 or greater
 	$ADD1 = ""; $ADD2 = "";
-	if (GET_EXT_VERSION("sql_patches") >= "0.2.7")
-	{
+	if (GET_EXT_VERSION("sql_patches") >= "0.2.7") {
 		// Okay, add design here
 		$ADD1 = ", curr_theme";
 		$ADD2 = ", '".GET_CURR_THEME()."'";
-	}
+	} // END - if
 
 	// Check if I shall disable sending mail to newly registered members out about active/begging rallye
 	//
 	// First comes first: begging rallye
-	if (GET_EXT_VERSION("beg") >= "0.1.7")
-	{
+	if (GET_EXT_VERSION("beg") >= "0.1.7") {
 		// Okay, shall I disable now?
-		if ($_CONFIG['beg_new_mem_notify'] == "N")
-		{
+		if ($_CONFIG['beg_new_mem_notify'] == "N") {
 			$ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
-		}
-	}
+		} // END - if
+	} // END - if
 
 	// Second: active rallye
 	if (GET_EXT_VERSION("bonus") >= "0.7.7") {
@@ -396,28 +395,12 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	// Adds maximum receiveable mails list... :)
 	define('MAX_RECEIVE_LIST', ADD_MAX_RECEIVE_LIST("guest", "", true));
 
-	// Check if nickname extension is active and get state if nickname is selected or userid
-	$nick = false;
-	if (EXT_IS_ACTIVE("nickname")) $nick = NICKNAME_IS_ACTIVE($GLOBALS['refid']);
-
-	// Is the nickname valid?
-	if (!$nick) {
-		// Nope, disable it
-		if (GET_EXT_VERSION("sql_patches") != '') {
-			// Use default refid
-			$GLOBALS['refid'] = $_CONFIG['def_refid'];
-		} else {
-			// Set zero
-			$GLOBALS['refid'] = 0;
-		}
-	} // END - if
-
 	// Shall I display the refid or shall I make it editable?
 	if ($_CONFIG['display_refid'] == "Y") {
-		// Load template to enter it
+		// Load "hide" form template
 		define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid_hide", true, $GLOBALS['refid']));
 	} else {
-		// Load "hide" form template
+		// Load template to enter it
 		define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
 	}
 
@@ -437,8 +420,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	define('__ADDY',    SQL_ESCAPE($_POST['addy']));
 
 	// Shall I add a counrty selection box or the old input box?
-	if (EXT_IS_ACTIVE("country"))
-	{
+	if (EXT_IS_ACTIVE("country")) {
 		// New variant, good!
 		$OUT  = "<SELECT name=\"country_code\" class=\"guest_select\" size=\"1\">\n";
 		$whereStatement = "WHERE is_active='Y'";
@@ -446,9 +428,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		$OUT .= ADD_OPTION_LINES("countries", "id", "descr", $_POST['country_code'], "code", $whereStatement);
 		$OUT .= "</SELECT>";
 		define('__COUNTRY_CONTENT', $OUT);
-	}
-	 else
-	{
+	} else {
 		// Old out-dated variant
 		define('__COUNTRY_CONTENT', "<INPUT type=\"text\" name=\"cntry\" class=\"guest_normal\" size=\"2\" maxlength=\"3\" value=\"".__COUNTRY."\">");
 	}