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

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 71f2c44439..c38e2e5bb5 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 global $_CONFIG, $DATA;
 
@@ -68,33 +68,47 @@ 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__);
+
+	// Userid found?
+	//* DEBUG: */ die("refid={$GLOBALS['refid']}/numRows=".SQL_NUMROWS($result)."");
+	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?
-	if ($_POST['agree'] != "Y")
-	{
+	if ($_POST['agree'] != "Y") {
 		$_POST['agree'] = "!";
 		$FAILED = true;
 	}
 
 	// Did he enter a valid email address? (we really don't care about
 	// that, he has to click on a confirmation link :P )
-	if ((empty($_POST['addy'])) || (!VALIDATE_EMAIL($_POST['addy'])))
-	{
+	if ((empty($_POST['addy'])) || (!VALIDATE_EMAIL($_POST['addy']))) {
 		$_POST['addy'] = "!";
 		$FAILED = true;
 	}
 
 	// And what about surname and family's name?
-	if (empty($_POST['surname']))
-	{
+	if (empty($_POST['surname'])) {
 		$_POST['surname'] = "!";
 		$FAILED = true;
 	}
-	if (empty($_POST['family_name']))
-	{
+	if (empty($_POST['family_name'])) {
 		$_POST['family_name'] = "!";
 		$FAILED = true;
 	}
@@ -146,7 +160,7 @@ if (isset($_POST['ok']))
 
 	// Check his IP number
 	$result = SQL_QUERY_ESC("SELECT joined, last_update FROM "._MYSQL_PREFIX."_user_data WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1",
-	 array(getenv('REMOTE_ADDR'), $_CONFIG['ip_timeout'], $_CONFIG['ip_timeout']), __FILE__, __LINE__);
+	 array(GET_REMOTE_ADDR(), $_CONFIG['ip_timeout'], $_CONFIG['ip_timeout']), __FILE__, __LINE__);
 	if ((SQL_NUMROWS($result) == 1) && (!IS_ADMIN()))
 	{
 		// Same IP in timeout range and different email address entered... Eat this, faker! ;-)
@@ -155,53 +169,44 @@ 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);
 }
 
-if ((isset($_POST['ok'])) && (!$FAILED))
-{
-	// Save the registration
+if ((isset($_POST['ok'])) && (!$FAILED)) {
+	// Prepapre month and day of birth
 	if (strlen($_POST['day'])   == 1) $_POST['day']   = "0".$_POST['day'];
 	if (strlen($_POST['month']) == 1) $_POST['month'] = "0".$_POST['month'];
 
-	// Hash = MM-DD-YYYY:IP:USER_AGENT:TIMEMARK
-	$hash = generateHash($_POST['month']."-".$_POST['day']."-".$_POST['year'].":".getenv('SERVER_NAME').":".getenv('REMOTE_ADDR').":".getenv('HTTP_USER_AGENT').":".time());
+	// Get total ...
+	// ... confirmed, ...
+	$confirmedUsers   = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
+	// ... unconfirmed ...
+	$unconfirmedUsers = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
+	// ... and locked users!
+	$lockedUsers      = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
+
+	// Generate hash which will be inserted into confirmation mail
+	$hash = generateHash(sha1($confirmedUsers.":".$unconfirmedUsers.":".$lockedUsers.":".$_POST['month']."-".$_POST['day']."-".$_POST['year'].":".getenv('SERVER_NAME').":".GET_REMOTE_ADDR().":".GET_USER_AGENT()."/".SITE_KEY."/".DATE_KEY."/".RAND_NUMBER));
 
 	// 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") {
@@ -220,7 +225,7 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 	} else {
 		// Old way with enterable two-char-code
 		$countryRow = "country";
-		$countryData = addslashes(substr($_POST['cntry'], 0, 2));
+		$countryData = substr($_POST['cntry'], 0, 2);
 	}
 
 	//////////////////////////////
@@ -231,14 +236,14 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
 	array(
 		$countryRow,
-		SQL_ESCAPE(substr($_POST['gender'], 0, 1)),
-		SQL_ESCAPE($_POST['surname']),
-		SQL_ESCAPE($_POST['family_name']),
-		SQL_ESCAPE($_POST['street_nr']),
+		substr($_POST['gender'], 0, 1),
+		$_POST['surname'],
+		$_POST['family_name'],
+		$_POST['street_nr'],
 		$countryData,
 		bigintval($_POST['zip']),
-		SQL_ESCAPE($_POST['city']),
-		SQL_ESCAPE($_POST['addy']),
+		$_POST['city'],
+		$_POST['addy'],
 		bigintval($_POST['day']),
 		bigintval($_POST['month']),
 		bigintval($_POST['year']),
@@ -247,7 +252,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		bigintval($_POST['max_mails']),
 		bigintval($_POST['refid']),
 		$hash,
-		getenv('REMOTE_ADDR'),
+		GET_REMOTE_ADDR(),
 	), __FILE__, __LINE__);
 
 	// Get his userid
@@ -260,6 +265,12 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		return;
 	} // END - if
 
+	// Is the refback extension there?
+	if (EXT_IS_ACTIVE("refback")) {
+		// Update refback table
+		UPDATE_REFBACK_TABLE($userid);
+	} // END - if
+
 	// 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__);
@@ -267,7 +278,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		// Add only when the line was not found (maybe some more secure?)
 		$locked = "points";
 		if ($_CONFIG['ref_payout'] > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES(%s,0,'%s')",
+		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
 		 array(bigintval($userid), $_CONFIG['points_register']), __FILE__, __LINE__);
 
 		// Update mediadata as well
@@ -291,7 +302,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	// Rewrite gender
 	$gender = TRANSLATE_GENDER($_POST['gender']);
 
-	// ... rewrite a zero referral ID to the main title
+	// ... rewrite a zero referal ID to the main title
 	if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
 
 	// Prepare data array for the email template
@@ -396,28 +407,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 +432,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 +440,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."\">");
 	}