X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fuser_functions.php;h=5c0dcb49467a423e911e4b1a8a058f1c59d9d7c6;hb=a524135c24dd0a8fa359c9a92399467d50fd69e0;hp=566c762b0c3752b84821dd0849dcd09c4ca36fe9;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 566c762b0c..5c0dcb4946 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -77,7 +77,7 @@ function addAlphabeticalSorting ($sortby) {
 	);
 
 	// Load template
-	$OUT = loadTemplate('admin_list_user_alpha', true, $content);
+	$OUT = loadTemplate('admin_list_user_alpha', TRUE, $content);
 
 	// Return generated code
 	return $OUT;
@@ -129,7 +129,7 @@ function addSortLinks ($letter, $sortby) {
 	$content['list'] = substr($OUT, 0, -1);
 
 	// Load template
-	$OUT = loadTemplate('admin_list_user_sort', true, $content);
+	$OUT = loadTemplate('admin_list_user_sort', TRUE, $content);
 
 	// Return code
 	return $OUT;
@@ -181,7 +181,7 @@ function addPageNavigation ($numPages) {
 		$content['list'] = $OUT;
 
 		// Load template
-		$OUT = loadTemplate('admin_list_user_pagenav', true, $content);
+		$OUT = loadTemplate('admin_list_user_pagenav', TRUE, $content);
 	} // END - if
 
 	// Return code
@@ -199,7 +199,7 @@ function generateUserEmailLink ($email, $mod = 'admin') {
 	} // END - if
 
 	// Search for the email address
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	`userid`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
@@ -209,17 +209,17 @@ WHERE
 LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 
-	// Do we have an entry?
-	if (SQL_NUMROWS($result) == 1) {
+	// Is there an entry?
+	if (sqlNumRows($result) == 1) {
 		// Load userid
-		list($userid) = SQL_FETCHROW($result);
+		list($userid) = sqlFetchRow($result);
 
 		// Rewrite email address to contact link
 		$email = '{%url=modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid) . '%}';
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return rewritten (?) email address
 	return $email;
@@ -233,28 +233,28 @@ function determineRandomReferralId () {
 	// Is the extension version fine?
 	if ((isRandomReferralIdEnabled()) && (isExtensionInstalledAndNewer('user', '0.3.4'))) {
 		// Get all user ids
-		$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, runFilterChain('user_exclusion_sql', ' AND `rand_confirmed` >= {?user_min_confirmed?}'));
+		$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', TRUE, runFilterChain('user_exclusion_sql', ' AND `rand_confirmed` >= {?user_min_confirmed?}'));
 
-		// Do we have at least one?
+		// Is there at least one?
 		if ($totalUsers > 0) {
 			// Then choose random userid
 			$randUserid = mt_rand(0, ($totalUsers - 1));
 
 			// Look for random user
-			$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` " . runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'") . ' AND `rand_confirmed` >= {?user_min_confirmed?} ORDER BY `rand_confirmed` DESC LIMIT %s, 1',
+			$result = sqlQueryEscaped("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` " . runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'") . ' AND `rand_confirmed` >= {?user_min_confirmed?} ORDER BY `rand_confirmed` DESC LIMIT %s, 1',
 				array($randUserid), __FUNCTION__, __LINE__);
 
-			// Do we have one entry there?
-			if (SQL_NUMROWS($result) == 1) {
+			// Is there one entry there?
+			if (sqlNumRows($result) == 1) {
 				// Use that userid as new referral id
-				list($refid) = SQL_FETCHROW($result);
+				list($refid) = sqlFetchRow($result);
 
 				// Debug message
 				/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'refid=' . $refid . ' - choosen!');
 			} // END - if
 
 			// Free result
-			SQL_FREERESULT($result);
+			sqlFreeResult($result);
 		} // END - if
 	} // END - if
 
@@ -269,7 +269,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 	$add = '';
 	$errorCode = '0';
 	$ext = '';
-	$isFound = false;
+	$isFound = FALSE;
 
 	// Init array
 	$content = array(
@@ -294,7 +294,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 	}
 
 	// No error found?
-	if (($errorCode == '0') && ($isFound === true)) {
+	if (($errorCode == '0') && ($isFound === TRUE)) {
 		// Get user data array and set userid (e.g. important if we login with nickname)
 		$content = getUserDataArray();
 		if (!empty($content['userid'])) {
@@ -303,10 +303,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 	} // END - if
 
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isUserDataValid()=' . intval(isUserDataValid()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isValidUserData()=' . intval(isValidUserData()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
 
 	// Is there an entry?
-	if (($errorCode == '0') && (isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
+	if (($errorCode == '0') && (isValidUserData()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
 		// Check for old MD5 passwords
 		if ((strlen(getUserData('password')) == 32) && (md5($passwd) == getUserData('password'))) {
 			// Just set the hash to the password from DB... :)
@@ -323,11 +323,11 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 
 			// ... and update database
 			// @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
 				array($content['hash'], $userid), __FUNCTION__, __LINE__);
 
 			// No login bonus by default
-			$GLOBALS['bonus_payed'] = false;
+			$GLOBALS['bonus_payed'] = FALSE;
 
 			// Is bonus up-to-date?
 			if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {
@@ -339,10 +339,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 				} // END - if
 
 				// Is the timeout reached?
-				if ($probe >= getConfig('login_timeout')) {
+				if ($probe >= getLoginTimeout()) {
 					// Add login bonus to user's account
 					$add = ',`login_bonus`=`login_bonus`+{?login_bonus?}';
-					$GLOBALS['bonus_payed'] = true;
+					$GLOBALS['bonus_payed'] = TRUE;
 
 					// Subtract login bonus from userid's account or jackpot
 					if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD')) {
@@ -360,13 +360,13 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',hash=' . $content['hash'] . '(' . strlen($content['hash']) . ')');
 			if ((setSession('userid', $userid )) && (setSession('u_hash', encodeHashForCookie($content['hash'])))) {
 				// Update database records
-				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
+				sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
 					array($userid), __FUNCTION__, __LINE__);
-				if (!SQL_HASZEROAFFECTED()) {
+				if (!ifSqlHasZeroAffectedRows()) {
 					// Is a success URL set?
 					if (empty($successUrl)) {
 						// Procedure to checking for login data
-						if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
+						if (($GLOBALS['bonus_payed'] === TRUE) && (isExtensionActive('bonus'))) {
 							// Bonus added (just displaying!)
 							$url = 'modules.php?module=chk_login&do=bonus';
 						} else {
@@ -387,19 +387,19 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			}
 		} elseif (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) {
 			// Update failure counter
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
 				array($userid), __FUNCTION__, __LINE__);
 
 			// Wrong password!
 			$errorCode = getCode('WRONG_PASS');
 		}
-	} elseif ((isUserDataValid()) && (getUserData('status') != 'CONFIRMED')) {
+	} elseif ((isValidUserData()) && (getUserData('status') != 'CONFIRMED')) {
 		// Create an error code from given status
 		$errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
 
 		// Set userid in session
 		setSession('userid', getUserData('userid'));
-	} elseif (!isUserDataValid()) {
+	} elseif (!isValidUserData()) {
 		// User id not found
 		$errorCode = getCode('WRONG_ID');
 	} else {
@@ -427,7 +427,7 @@ function doNewUserPassword ($email, $userid) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'email=' . $email . ',userid=' . $userid . ' - ENTERED!');
 	// Init found-status and error
 	$errorCode = '';
-	$accountFound = false;
+	$accountFound = FALSE;
 
 	// Probe userid/nickname
 	if (!empty($email)) {
@@ -436,34 +436,37 @@ function doNewUserPassword ($email, $userid) {
 	} elseif ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) {
 		// Nickname entered
 		$accountFound = fetchUserData($userid, 'nickname');
-	} elseif ((isValidUserId($userid)) && (empty($email))) {
+	} elseif ((isValidId($userid)) && (empty($email))) {
 		// Direct userid entered
 		$accountFound = fetchUserData($userid);
-	} else {
+	} elseif (isDebugModeEnabled()) {
 		// Userid not set!
 		logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',email=' . $email . ': Important variables are empty.');
 	}
 
 	// Any entry found?
-	if ($accountFound === true) {
+	if ($accountFound === TRUE) {
 		// Is the account confirmed
 		if (getUserData('status') == 'CONFIRMED') {
 			// Generate new password
-			$NEW_PASS = generatePassword();
+			$newPassword = generatePassword();
 
 			// Update database
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1",
-				array(generateHash($NEW_PASS), getUserData('userid')), __FUNCTION__, __LINE__);
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1",
+				array(
+					generateHash($newPassword),
+					getUserData('userid')
+				), __FUNCTION__, __LINE__);
 
 			// Prepare data and message for email
 			$message = loadEmailTemplate('guest_new_password',
 				array(
-					'new_pass' => $NEW_PASS,
+					'new_pass' => $newPassword,
 					'nickname' => $userid
-				), bigintval(getUserData('userid')));
+				), getUserData('userid'));
 
 			// ... and send it away
-			sendEmail(bigintval(getUserData('userid')), '{--GUEST_NEW_PASSWORD--}', $message);
+			sendEmail(bigintval(getUserData('userid')), '{--GUEST_NEW_PASSWORD_SUBJECT--}', $message);
 
 			// Output note to user
 			displayMessage('{--GUEST_NEW_PASSWORD_SEND--}');
@@ -501,8 +504,8 @@ function getEpocheTimeFromUserStats ($statsType, $statsData, $userid = NULL) {
 	} // END - if
 
 	// Try to find the entry
-	$result = SQL_QUERY_ESC("SELECT
-	UNIX_TIMESTAMP(`inserted`) AS inserted
+	$result = sqlQueryEscaped("SELECT
+	UNIX_TIMESTAMP(`inserted`) AS `inserted`
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats_data`
 WHERE
@@ -517,13 +520,13 @@ LIMIT 1",
 		), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Get this stamp
-		$data = SQL_FETCHARRAY($result);
+		$data = sqlFetchArray($result);
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return stamp
 	return $data['inserted'];
@@ -534,16 +537,16 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
 	// Is the extension installed and updated?
 	if ((!isExtensionActive('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.6'))) {
 		// Return zero here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Default is not working
-	$return = false;
+	$return = FALSE;
 
 	// Does it exist?
 	if ((!getEpocheTimeFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
 		// Then insert it!
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",
+		sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`, `stats_type`, `stats_data`) VALUES (%s,'%s','%s')",
 			array(
 				bigintval($userid),
 				$statsType,
@@ -551,7 +554,7 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
 			), __FUNCTION__, __LINE__);
 
 		// Does it have worked?
-		$return = (!SQL_HASZEROAFFECTED());
+		$return = (!ifSqlHasZeroAffectedRows());
 	} elseif (is_array($statsData)) {
 		// Invalid data!
 		logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',type=' . $statsType . ',data=' . gettype($statsData) . ': Invalid statistics data type!');
@@ -573,23 +576,50 @@ function doConfirmUserAccount ($hash) {
 	$userid = NULL;
 
 	// Search for an unconfirmed or confirmed account
-	$result = SQL_QUERY_ESC("SELECT `userid`,`refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
+	$result = sqlQueryEscaped("SELECT `userid`, `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
 		array($hash), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
-		// Ok, he want's to confirm now so we load some data
-		list($userid, $refid) = SQL_FETCHROW($result);
-
-		// Fetch user data
-		if (!fetchUserData($userid)) {
-			// Not found, should not happen
-			reportBug(__FILE__, __LINE__, 'User account ' . $userid . ' not found.');
-		} // END - if
 
-		// Load all data and add points
-		$content = getUserDataArray();
+	// One result should be found
+	if (ifSqlHasZeroNumRows($result)) {
+		// Nothing found or tried to confirm twice?
+		displayMessage('{--GUEST_CONFIRMED_TWICE--}');
+		return;
+	} // END - if
+
+	// Okay, the user want's to confirm now so we load some data
+	list($userid, $refid) = sqlFetchRow($result);
+
+	// Fetch user data
+	if (!fetchUserData($userid)) {
+		// Not found, should not happen
+		reportBug(__FILE__, __LINE__, 'User account ' . $userid . ' not found.');
+	} // END - if
+
+	// Load all data and add points
+	$content = merge_array($content, getUserDataArray());
 
+	// Is 'user' updated?
+	if (isExtensionInstalledAndNewer('user', '0.6.3')) {
 		// Unlock his account (but only when it is on UNCONFIRMED!)
-		SQL_QUERY_ESC("UPDATE
+		sqlQueryEscaped("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`status`='CONFIRMED',
+	`user_hash`=NULL,
+	`confirmed_timestamp`=NOW(),
+	`confirmed_ip_address`='%s'
+WHERE
+	`user_hash`='%s' AND
+	`status`='UNCONFIRMED'
+LIMIT 1",
+			array(
+				determineRealRemoteAddress(),
+				$hash
+			), __FILE__, __LINE__
+		);
+	} else {
+		// Unlock his account (but only when it is on UNCONFIRMED!)
+		sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`status`='CONFIRMED',
@@ -598,68 +628,65 @@ WHERE
 	`user_hash`='%s' AND
 	`status`='UNCONFIRMED'
 LIMIT 1",
-			array($hash), __FILE__, __LINE__);
-
-		// Was it updated?
-		if (!SQL_HASZEROAFFECTED()) {
-			// Send email if updated
-			$message = loadEmailTemplate('guest_user_confirmed', $content, bigintval($userid));
-
-			// And send him right away the confirmation mail
-			sendEmail($userid, '{--GUEST_THANX_CONFIRM--}', $message);
-
-			// Maybe he got "referraled"?
-			if ((isValidUserId($refid)) && ($refid != $userid)) {
-				// Select the referral userid
-				if (fetchUserData($refid)) {
-					// Update ref counter...
-					updateReferralCounter($refid);
-
-					// If version matches add ref bonus to refid's account
-					if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isBonusRallyeActive())) {
-						// Add points (directly only!)
-						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_ref`=`bonus_ref`+{?bonus_ref?} WHERE `userid`=%s LIMIT 1",
-							array(bigintval($refid)), __FILE__, __LINE__);
-
-						// Subtract points from system
-						handleBonusPoints(getConfig('bonus_ref'), $refid);
-					} // END - if
+			array(
+				$hash
+			), __FILE__, __LINE__
+		);
+	}
 
-					// Add one-time referral bonus over referral system or directly
-					initReferralSystem();
-					addPointsThroughReferralSystem('referral_bonus', $refid, getPointsRef(), bigintval($userid));
-				} // END - if
-			} // END - if
+	// Was it updated?
+	if (ifSqlHasZeroAffectedRows()) {
+		// Nobody was found unter this hash key... or our new member want's to confirm twice?
+		displayMessage('{--GUEST_CONFIRMED_TWICE--}');
+		return;
+	} // END - if
+
+	// Load email template
+	$message = loadEmailTemplate('guest_user_confirmed', $content, bigintval($userid));
 
-			if (isExtensionActive('rallye')) {
-				// Add user to rallye (or not?)
-				addUserToReferralRallye(bigintval($userid));
+	// And send him right away the confirmation mail
+	sendEmail($userid, '{--GUEST_THANX_CONFIRM--}', $message);
+
+	// Maybe he got "referraled"?
+	if ((isValidId($refid)) && ($refid != $userid)) {
+		// Select the referral userid
+		if (fetchUserData($refid)) {
+			// Update ref counter...
+			updateReferralCounter($refid);
+
+			// If version matches add ref bonus to refid's account
+			if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isBonusRallyeActive())) {
+				// Add points (directly only!)
+				sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_ref`=`bonus_ref`+{?bonus_ref?} WHERE `userid`=%s LIMIT 1",
+					array(bigintval($refid)), __FILE__, __LINE__);
+
+				// Subtract points from system
+				handleBonusPoints(getBonusRef(), $refid);
 			} // END - if
 
-			// Account confirmed!
-			if (isExtensionActive('lead')) {
-				// Set special lead cookie
-				setSession('lead_userid', bigintval($userid));
+			// Add one-time referral bonus over referral system or directly
+			initReferralSystem();
+			addPointsThroughReferralSystem('referral_bonus', $refid, getPointsRef(), bigintval($userid));
+		} // END - if
+	} // END - if
 
-				// Lead-Code mode enabled
-				redirectToUrl('lead-confirm.php');
-			} else {
-				$content['message'] = '{--GUEST_CONFIRMED_DONE--}';
-				$content['userid']  = bigintval($userid);
-			}
-		} elseif (isExtensionActive('lead')) {
-			// Set special lead cookie
-			setSession('lead_userid', bigintval($userid));
+	// @TODO Rewrite this to 2 filters as a possible redirect must always come last
+	if (isExtensionActive('rallye')) {
+		// Add user to rallye (or not?)
+		addUserToReferralRallye(bigintval($userid));
+	} // END - if
 
-			// Lead-Code mode enabled
-			redirectToUrl('lead-confirm.php');
-		} else {
-			// Nobody was found unter this hash key... or our new member want's to confirm twice?
-			$content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
-		}
+	// Account confirmed!
+	if (isExtensionActive('lead')) {
+		// Set special lead cookie
+		setSession('lead_userid', bigintval($userid));
+
+		// Lead-Code mode enabled
+		redirectToUrl('lead-confirm.php');
 	} else {
-		// Nobody was found unter this hash key... or our new member want's to confirm twice?
-		$content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
+		// Regular confirmation
+		$content['message'] = '{--GUEST_CONFIRMED_DONE--}';
+		$content['userid']  = bigintval($userid);
 	}
 
 	// Load template
@@ -725,10 +752,10 @@ function getConfirmationMessageFromUserStatus ($status) {
 
 // "Getter" for total tester accounts
 function getTotalTesterUsers () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = countSumTotalData('', 'user_data', 'userid', '', true, runFilterChain('user_inclusion_sql'));
+		$GLOBALS[__FUNCTION__] = countSumTotalData('', 'user_data', 'userid', '', TRUE, runFilterChain('user_inclusion_sql'));
 	} // END - if
 
 	// Return cache
@@ -756,7 +783,7 @@ function getNextFreeTesterUserNumber () {
 	$nextTester = getTotalTesterUsers();
 
 	// Prepend zeros
-	$nextTester = prependZeros($nextTester, 6);
+	$nextTester = padLeftZero($nextTester, 6);
 
 	// Return it
 	return $nextTester;
@@ -765,7 +792,7 @@ function getNextFreeTesterUserNumber () {
 // Wrapper function to return a selection box for tester user default referral id
 function addTesterUserDefaultRefidSelectionBox ($fieldName = 'tester_user_default_refid') {
 	// Return it
-	return addMemberSelectionBox(getConfig('tester_user_default_refid'), false, true, true, $fieldName, " WHERE `surname` LIKE '{?tester_user_surname_prefix?}%'");
+	return addMemberSelectionBox(getConfig('tester_user_default_refid'), FALSE, TRUE, TRUE, $fieldName, " WHERE `surname` LIKE '{?tester_user_surname_prefix?}%'");
 }
 
 // Checks whether given surname is a test user name
@@ -783,7 +810,7 @@ function createTesterUserAccount () {
 	if (!isRegistrationDataComplete()) {
 		// Then abort here
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isRegistrationDataComplete()=false, please check if you e.g. have selected the required minimum of categories.');
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Do registration
@@ -796,6 +823,198 @@ function createTesterUserAccount () {
 	return $isCreated;
 }
 
+// Checks whether the given sub id is fused by current member
+function isMemberSubIdFree ($subId) {
+	// Only do this for logged-in members
+	assert(isMember());
+
+	// Check it
+	$isFree = (countSumTotalData(getMemberId(), 'user_subids', 'id', 'userid', TRUE, sprintf(" AND `subid`='%s'", $subId)) == 0);
+
+	// Return result
+	return $isFree;
+}
+
+// Checks whether the sub id is valid
+function isValidSubId ($subId) {
+	// First convert any spaces/dashes to underscores
+	$subId = str_replace(' ', '_', str_replace('-', '_', $subId));
+
+	// Then filter out any unwanted characters
+	$subIdTest = preg_replace('/([^a-zA-Z0-9_])/', '', $subId);
+
+	// Is it valid?
+	return ($subId == $subIdTest);
+} // END - if
+
+// Prepares found sub id for updating in database
+function prepareFoundSubId ($subId) {
+	// Then check if it is valid and available
+	if ((!isValidSubId($subId)) || (isMemberSubIdFree($subId))) {
+		// Is not free or invalid
+		$subId = FALSE;
+	} // END - if
+
+	// Return prepared sub id
+	return $subId;
+}
+
+// Validates sub id and returns FALSE if not valid
+function validateSubId ($subId) {
+	// Then check if it is valid and available
+	if (!isValidSubId($subId)) {
+		// Is not free or invalid
+		$subId = FALSE;
+	} // END - if
+
+	// Return prepared sub id
+	return $subId;
+}
+
+// Prepares given sub id for inserting into database
+function prepareSubId ($subId) {
+	// Then check if it is valid and available
+	if ((!isValidSubId($subId)) || (!isMemberSubIdFree($subId))) {
+		// Is not free or invalid
+		$subId = FALSE;
+	} // END - if
+
+	// Return prepared sub id
+	return $subId;
+}
+
+// Check whether given sub *id* is assigned to current member
+function isUserSubIdAssignedToMember ($subId, $userid = NULL) {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$subId][$userid])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__][$subId][$userid] = (
+			(
+				// Is a userid set or current set?
+				(isValidId($userid)) || (isMember())
+			) && (
+				// .. and it assigned with subid's id?
+				countSumTotalData(
+					(isValidId($userid) ? $userid : getMemberId()),
+						'user_subids',
+						'id',
+						'userid',
+						TRUE,
+						sprintf(' AND `id`=%s', bigintval($subId))
+				) == 1
+			)
+		);
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$subId][$userid];
+}
+
+// Getter for subid from given id number
+function getSubId ($id) {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$id])) {
+		// Check database for record
+		$result = sqlQueryEscaped("SELECT `subid` FROM `{?_MYSQL_PREFIX?}_user_subids` WHERE `id`=%s LIMIT 1",
+			array(bigintval($id)), __FUNCTION__, __LINE__);
+
+		// Is there an entry?
+		if (sqlNumRows($result) == 1) {
+			// Load it
+			list($GLOBALS[__FUNCTION__][$id]) = sqlFetchRow($result);
+		} // END - if
+
+		// Free result
+		sqlFreeResult($result);
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$id];
+}
+
+// "Getter for total count of current user's sub ids
+function getTotalMemberSubIds () {
+	// Only do this for logged-in members
+	assert(isMember());
+
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = countSumTotalData(getMemberId(), 'user_subids', 'id', 'userid', TRUE);
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Displays generic user registration form
+function doDisplayGenericUserRegistrationForm () {
+	// Do this only if form is sent
+	if (isFormSent()) {
+		if (postRequestElement('agree') == '!') {
+			registerOutputFailedMessage('HAVE_TO_AGREE');
+		} // END - if
+
+		if (postRequestElement('email') == '!') {
+			registerOutputFailedMessage('ENTER_EMAIL');
+			setPostRequestElement('email', '');
+		} elseif (postRequestElement('email') == '?') {
+			registerOutputFailedMessage('GUEST_EMAIL_IS_ALREADY_REGISTERED');
+			setPostRequestElement('email', '');
+		}
+
+		if (postRequestElement('surname') == '!') {
+			registerOutputFailedMessage('ENTER_SURNAME');
+			setPostRequestElement('surname', '');
+		} // END - if
+
+		if (postRequestElement('family') == '!') {
+			registerOutputFailedMessage('ENTER_FAMILY');
+			setPostRequestElement('family', '');
+		} // END - if
+
+		if ((postRequestElement('password1') == '!') && (postRequestElement('password2') == '!')) {
+			registerOutputFailedMessage('ENTER_BOTH_PASSWORDS');
+		} elseif (postRequestElement('password1') == '!') {
+			registerOutputFailedMessage('ENTER_PASSWORD1');
+		} elseif (postRequestElement('password2') == '!') {
+			registerOutputFailedMessage('ENTER_PASSWORD2');
+		}
+
+		if ((isset($GLOBALS['registration_weak_password'])) && ($GLOBALS['registration_weak_password'] === TRUE)) {
+			registerOutputFailedMessage('GUEST_WEAK_PASSWORD');
+		} // END - if
+
+		if ((isset($GLOBALS['registration_ip_timeout'])) && ($GLOBALS['registration_ip_timeout'] === TRUE)) {
+			registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
+		} // END - if
+
+		if ((!empty($GLOBALS['registration_selected_cats'])) && ($GLOBALS['registration_selected_cats'] < getLeastCats())) {
+			registerOutputFailedMessage('', '{--CHOOSE_MORE_CATEGORIES--}');
+		} // END - if
+	} // END - if
+
+	// Generate birthday selection
+	$content['birthday_selection'] = generateDayMonthYearSelectionBox(postRequestElement('day'),postRequestElement('month'),postRequestElement('year'));
+
+	// ZIP codes are numerical values
+	$content['zip'] = '';
+	if ((isPostRequestElementSet('zip')) && (isValidNumber(postRequestElement('zip')))) {
+		$content['zip'] = bigintval(postRequestElement('zip'));
+	} // END - if
+
+	// Other values
+	foreach (array('gender', 'surname', 'family', 'street_nr', 'city', 'email') as $entry) {
+		$content[$entry] = sqlEscapeString(postRequestElement($entry));
+	} // END - foreach
+
+	// Set must-fillout fields
+	$content = runFilterChain('register_must_fillout', $content);
+
+	// Display registration form
+	loadTemplate('guest_register', FALSE, $content);
+}
+
 //-----------------------------------------------------------------------------
 //                                EL code functions
 //-----------------------------------------------------------------------------
@@ -807,12 +1026,12 @@ function doExpressionUser ($data) {
 
 	// User-related data, so is there a userid?
 	if (!empty($data['matches'][4][$data['key']])) {
-		// Do we have a userid or $userid?
+		// Is there a userid or $userid?
 		if (substr($data['matches'][4][$data['key']], 0, 1) == '$') {
 			// Use dynamic call
 			$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
 		} elseif (!empty($data['matches'][4][$data['key']])) {
-			// Do we have a number or a dollar sign in front of it?
+			// Is there a number or a dollar sign in front of it?
 			if (preg_replace('/[^0123456789]/', '', $data['matches'][4][$data['key']]) != $data['matches'][4][$data['key']]) {
 				// Possible database column, so get it again
 				$data['matches'][4][$data['key']] = "getFetchedUserData('userid', getMemberId(), '" . $data['matches'][4][$data['key']] . "')";
@@ -821,12 +1040,12 @@ function doExpressionUser ($data) {
 			// Fix all together
 			$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
 		}
-	} elseif ((!empty($data['callback'])) && (isUserDataValid())) {
+	} elseif ((!empty($data['callback'])) && (isValidUserData())) {
 		// "Call-back" alias column for current logged in user's data
 		$functionName = "getUserData('" . $data['callback'] . "')";
 	}
 
-	// Do we have another function to run (e.g. translations)
+	// Is there another function to run (e.g. translations)
 	if (!empty($data['extra_func'])) {
 		// Surround the original function call with it
 		$functionName = $data['extra_func'] . '(' . $functionName . ')';
@@ -848,11 +1067,11 @@ function doExpressionUser ($data) {
 //-----------------------------------------------------------------------------
 
 // Template call-back function for list_user admin function
-function doTemplateAdminListUserTitle ($template, $clear = false) {
+function doTemplateAdminListUserTitle ($template, $clear = FALSE) {
 	// Init title with "all accounts"
 	$code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 
-	// Do we have a 'status' or 'do' set?
+	// Is there a 'status' or 'do' set?
 	if (isGetRequestElementSet('status')) {
 		// Set title according to the 'status'
 		$code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestElement('status')));
@@ -866,14 +1085,14 @@ function doTemplateAdminListUserTitle ($template, $clear = false) {
 }
 
 // Template call-back function for displaying "username"
-function doTemplateDisplayUsername ($template, $clear = false, $userid = NULL) {
+function doTemplateDisplayUsername ($template, $clear = FALSE, $userid = NULL) {
 	// Is a userid set?
-	if (!isValidUserId($userid)) {
+	if (!isValidId($userid)) {
 		// Please don't call this without a valid userid
 		reportBug(__FUNCTION__, __LINE__, 'template=' . $template . ',clear=' . intval($clear) . ',userid[' . gettype($userid) . ']=' . intval($userid) . ' - Invalid userid provided.');
 	} // END - if
 
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$userid])) {
 		// Generate code
 		$GLOBALS[__FUNCTION__][$userid] = $userid . ' ({%user,nickname,fixEmptyContentToDashes=' . $userid . '%})';
@@ -883,13 +1102,24 @@ function doTemplateDisplayUsername ($template, $clear = false, $userid = NULL) {
 	return $GLOBALS[__FUNCTION__][$userid];
 }
 
+// ----------------------------------------------------------------------------
+//                             XML call-back functions
+// ----------------------------------------------------------------------------
+
+// For 'doing' add subid, the column-index is required
+function addXmlSpecialMemberAddDoUserSubid () {
+	// So set it all here
+	$GLOBALS['__COLUMN_INDEX']['doXmlCallbackFunction']  = 'column';
+	$GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['column_index'] = 'column';
+}
+
 // ----------------------------------------------------------------------------
 //                 Wrapper functions for configuration entries
 // ----------------------------------------------------------------------------
 
 // Getter for user_alpha
 function getUserAlpha () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('user_alpha');
@@ -901,7 +1131,7 @@ function getUserAlpha () {
 
 // Getter for user_limit
 function getUserLimit () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('user_limit');
@@ -913,7 +1143,7 @@ function getUserLimit () {
 
 // Getter for tester_user_surname_prefix
 function getTesterUserSurnamePrefix () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_surname_prefix');
@@ -925,7 +1155,7 @@ function getTesterUserSurnamePrefix () {
 
 // Getter for tester_user_maximum
 function getTesterUserMaximum () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_maximum');
@@ -937,7 +1167,7 @@ function getTesterUserMaximum () {
 
 // Getter for tester_user_check_cat
 function getTesterUserCheckCat () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_check_cat');
@@ -949,7 +1179,7 @@ function getTesterUserCheckCat () {
 
 // Getter for tester_user_gender
 function getTesterUserGender () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_gender');
@@ -961,7 +1191,7 @@ function getTesterUserGender () {
 
 // Getter for tester_user_family
 function getTesterUserFamily () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_family');
@@ -973,7 +1203,7 @@ function getTesterUserFamily () {
 
 // Getter for tester_user_password
 function getTesterUserPassword () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_password');
@@ -985,7 +1215,7 @@ function getTesterUserPassword () {
 
 // Getter for tester_user_street_nr
 function getTesterUserStreetNr () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_street_nr');
@@ -997,7 +1227,7 @@ function getTesterUserStreetNr () {
 
 // Getter for tester_user_zip
 function getTesterUserZip () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_zip');
@@ -1009,7 +1239,7 @@ function getTesterUserZip () {
 
 // Getter for tester_user_city
 function getTesterUserCity () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_city');
@@ -1021,7 +1251,7 @@ function getTesterUserCity () {
 
 // Getter for tester_user_email
 function getTesterUserEmail () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('tester_user_email');
@@ -1031,5 +1261,53 @@ function getTesterUserEmail () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// Getter for 'ap_subids' config entry
+function getApSubids () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('ap_subids');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Determines whether 'ap_subids' is set to 'Y'
+function isApSubidsEnabled () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = (getApSubids() == 'Y');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'ap_subids_since' config entry
+function getApSubidsSince () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('ap_subids_since');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'select_user_zero_refid' config entry
+function getSelectUserZeroRefid () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('select_user_zero_refid');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>