X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=5e20e785c67d941876596340e745c91f13d9b3ab;hp=fac07ce8cad9b34676fd8cfd024998f98b6b109c;hb=ca256746fe0757a23df4064824c8fe2087ad5634;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index fac07ce8ca..5e20e785c6 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,12 +41,12 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 //
-function handleSponsorRequest ($postData, $update=false, $messageArray=array(), $RET_STATUS=false) {
+function handleSponsorRequest ($postData, $update=false, $messageArray = array(), $RET_STATUS=false) {
 	// Init a lot variables
-	$SAVE = true;
-	$UPDATE = false;
-	$skip = false;
-	$ALREADY = false;
+	$SAVE = TRUE;
+	$UPDATE = FALSE;
+	$skip = FALSE;
+	$ALREADY = FALSE;
 	$ret = 'unused';
 
 	// Skip these entries
@@ -66,24 +66,24 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 				// Check only posted input entries not the submit button
 				switch ($k) {
 					case 'email':
-						$ALREADY = false;
+						$ALREADY = FALSE;
 						if (!isEmailValid($v)) {
 							// Email address is not valid
-							$SAVE = false;
+							$SAVE = FALSE;
 						} else {
-							// Do we want to add a new sponsor or update his data?
+							// Add a new sponsor or update his data?
 							$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE email='%s' LIMIT 1",
-							array($postData['email']), __FUNCTION__, __LINE__);
+								array($postData['email']), __FUNCTION__, __LINE__);
 
 							// Is a sponsor alread in the db?
 							if (SQL_NUMROWS($result) == 1) {
 								// Yes, he is!
 								if ((getWhat() == 'add_sponsor') || ($update)) {
-									// Already found!
-									$ALREADY = true;
+									// Already found
+									$ALREADY = TRUE;
 								} else {
 									// Update his data
-									$UPDATE = true;
+									$UPDATE = TRUE;
 								}
 							}
 
@@ -92,33 +92,37 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 						}
 						break;
 
-					case 'pass1':
+					case 'password1':
 						$k = ''; $v = '';
 						break;
 
-					case 'pass2':
+					case 'password2':
 						$k = 'password'; $v = md5($v);
 						break;
 
 					case 'url':
-						if (!isUrlValid($v)) $SAVE = false;
+						if (!isUrlValid($v)) {
+							// Don't save the URL
+							$SAVE = FALSE;
+						} // END - if
 						break;
 
 					default:
 						// Test if there is are time selections
-						convertSelectionsToTimestamp($postData, $DATA, $k, $skip);
+						convertSelectionsToEpocheTime($postData, $DATA, $k, $skip);
 						break;
 				} // END - switch
 
-				if ((!empty($k)) && ($skip == false)) {
+				if ((!empty($k)) && ($skip == FALSE)) {
 					// Add data
-					$DATA['keys'][] = $k; $DATA['values'][] = $v;
+					array_push($DATA['keys']  , $k);
+					array_push($DATA['values'], $v);
 				} // END - if
 			} // END - if
 		} // END - foreach
 
 		// Save sponsor?
-		if ($SAVE === true) {
+		if ($SAVE === TRUE) {
 			// Default is no force even when a guest want to abuse this force switch
 			if ((empty($postData['force'])) || (!isAdmin())) $postData['force'] = '0';
 
@@ -135,31 +139,31 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 
 				// Remove last ", " from SQL string
 				$sql = substr($sql, 0, -2)." WHERE `id`=%s LIMIT 1";
-				$DATA['values'][] = bigintval(getRequestParameter('id'));
+				array_push($DATA['values'], bigintval(getRequestElement('id')));
 
 				// Generate message
 				$message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray);
 				$ret = 'updated';
-			} elseif (($ALREADY === false) || (($postData['force'] == 1) && (isAdmin()))) {
+			} elseif (($ALREADY === FALSE) || (($postData['force'] == 1) && (isAdmin()))) {
 				// Add new sponsor, first add more data
-				$DATA['keys'][] = 'status';
-				if (($update === true) && (isAdmin()) && (getWhat() == 'add_sponsor')) {
+				array_push($DATA['keys'], 'status');
+				if (($update === TRUE) && (isAdmin()) && (getWhat() == 'add_sponsor')) {
 					// Only allowed for admin
-					$DATA['values'][] = 'PENDING';
+					array_push($DATA['values'], 'PENDING');
 
 					// Add remote IP address as well
-					$DATA['keys'][] = 'remote_addr';
-					$DATA['values'][] = detectRemoteAddr();
+					array_push($DATA['keys'], 'remote_addr');
+					array_push($DATA['values'], detectRemoteAddr());
 				} else {
 					// Guest area
-					$DATA['values'][] = 'UNCONFIRMED';
+					array_push($DATA['values'], 'UNCONFIRMED');
 
 					// Generate hash code
-					$DATA['keys'][] = 'hash';
+					array_push($DATA['keys'], 'hash');
 					// @TODO Rewrite this to API function
-					$DATA['values'][] = md5(session_id().':'.$postData['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time());
-					$DATA['keys'][] = 'remote_addr';
-					$DATA['values'][] = detectRemoteAddr();
+					array_push($DATA['values'], md5(session_id() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . time()));
+					array_push($DATA['keys'], 'remote_addr');
+					array_push($DATA['values'], detectRemoteAddr());
 				}
 
 				// Search the entry
@@ -179,7 +183,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 				// Generate message
 				$message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_ADDED--}', 'added', $messageArray);
 				$ret = 'added';
-			} elseif (($update === true) && (isAdmin())) {
+			} elseif (($update === TRUE) && (isAdmin())) {
 				// Add all data as hidden data
 				$OUT = '';
 				foreach ($postData as $k => $v) {
@@ -194,11 +198,11 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 				$content['email']  = $postData['email'];
 
 				// Ask for adding a sponsor with same email address
-				loadTemplate('admin_add_sponsor_already', false, $content);
+				loadTemplate('admin_add_sponsor_already', FALSE, $content);
 				return;
 			} else {
 				// Already added!
-				$message = getMaskedMessage('SPONSOR_ALREADY_FOUND', $postData['email']);
+				$message = '{%message,SPONSOR_ALREADY_FOUND=' . $postData['email'] . '%}';
 				$ret = 'already';
 			}
 
@@ -207,9 +211,9 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 				$result = SQL_QUERY_ESC($sql, $DATA['values'], __FUNCTION__, __LINE__);
 			} // END - if
 		} else {
-			// Error found!
+			// Error detected
 			$message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray);
-			loadTemplate('admin_settings_saved', false, $message);
+			displayMessage($message);
 		}
 
 	// Always return the status
@@ -217,7 +221,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 }
 
 // Translate the account status
-function sponsorTranslateUserStatus ($status) {
+function translateSponsorStatus ($status) {
 	// Construct constant name
 	$constantName = sprintf("ACCOUNT_STATUS_%s", $status);
 
@@ -226,10 +230,10 @@ function sponsorTranslateUserStatus ($status) {
 		// Then use it
 		$ret = getMessage($constantName);
 	} else {
-		// Not found!
-		//* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+		// Not found
+		//* DEBUG: */ reportBug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
-		$ret = getMaskedMessage('ACCOUNT_STATUS_UNKNOWN', $status);
+		$ret = '{%message,ACCOUNT_STATUS_UNKNOWN=' . $status . '%}';
 	}
 
 	// Return status
@@ -238,8 +242,8 @@ function sponsorTranslateUserStatus ($status) {
 
 // Search for an email address in the database
 function isSponsorRegisteredWithEmail ($email) {
-	// Do we already have the provided email address in our DB?
-	$ret = (countSumTotalData($email, 'sponsor_data', 'id', 'email', true) == 1);
+	// Is there already the provided email address in database?
+	$ret = (countSumTotalData($email, 'sponsor_data', 'id', 'email', TRUE) == 1);
 
 	// Return result
 	return $ret;
@@ -248,7 +252,7 @@ function isSponsorRegisteredWithEmail ($email) {
 // Wether the current user is a sponsor
 function isSponsor () {
 	// Failed is default
-	$ret = false;
+	$ret = FALSE;
 
 	// Determine it
 	$ret = (
@@ -269,7 +273,8 @@ function addSponsorMenu ($current) {
 
 	// Load main menu entries
 	$result_main = SQL_QUERY("SELECT
-	`action` AS `main_action`, `title` AS `main_title`
+	`action` AS `main_action`,
+	`title` AS `main_title`
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_menu`
 WHERE
@@ -282,7 +287,8 @@ ORDER BY
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Load sub menus
 			$result_sub = SQL_QUERY_ESC("SELECT
-	`what` AS `sub_what`, `title` AS `sub_title`
+	`what` AS `sub_what`,
+	`title` AS `sub_title`
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_menu`
 WHERE
@@ -301,17 +307,17 @@ ORDER BY
 					if ($current == $content2['sub_what']) $content2['sub_title'] = '<strong>' . $content2['sub_title'] . '</strong>';
 
 					// Load row template
-					$SUB .= loadTemplate('sponsor_what', true, $content2);
+					$SUB .= loadTemplate('sponsor_what', TRUE, $content2);
 				} // END - while
 
 				// Prepare data for the main template
 				$content['menu'] = $SUB;
 
 				// Load menu template
-				$OUT .= loadTemplate('sponsor_action', true, $content);
+				$OUT .= loadTemplate('sponsor_action', TRUE, $content);
 			} else {
 				// No sub menus active
-				$OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_SUB_MENUS_ACTIVE--}');
+				$OUT .= displayMessage('{--SPONSOR_NO_SUB_MENUS_ACTIVE--}', TRUE);
 			}
 
 			// Free memory
@@ -319,7 +325,7 @@ ORDER BY
 		} // END - while
 	} else {
 		// No main menus active
-		$OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}');
+		$OUT .= displayMessage('{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}', TRUE);
 	}
 
 	// Free memory
@@ -340,8 +346,8 @@ function addSponsorContent ($what) {
 		// Every sponsor action will output nothing directly. It will be written into $GLOBALS['sponsor_output']!
 		loadIncludeOnce($INC);
 	} else {
-		// File not found!
-		$GLOBALS['sponsor_output'] .= loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_CONTENT_404', $what));
+		// File not found
+		$GLOBALS['sponsor_output'] .= displayMessage('{%message,SPONSOR_CONTENT_404=' . $what . '%}', TRUE);
 	}
 
 	// Return content
@@ -351,7 +357,7 @@ function addSponsorContent ($what) {
 //
 function updateSponsorLogin () {
 	// Failed by default
-	$login = false;
+	$login = FALSE;
 
 	// Is sponsor?
 	if (isSponsor()) {
@@ -379,22 +385,22 @@ LIMIT 1",
 
 // Saves sponsor's data
 function saveSponsorData ($postData, $content) {
-	$EMAIL = false;
+	$EMAIL = FALSE;
 
 	// Unsecure data which we don't want
 	$UNSAFE = array('password', 'id', 'remote_addr', 'sponsor_created', 'last_online', 'status', 'ref_count',
 	                'points_amount', 'points_used', 'refid', 'hash', 'last_payment', 'last_currency',
-	                'pass_old', 'ok', 'pass1', 'pass2');
+	                'pass_old', 'ok', 'password1', 'password2');
 
 	// Set default message ("not saved")
 	$message = '{--SPONSOR_ACCOUNT_DATA_NOT_SAVED--}';
 
 	// Check for submitted passwords
-	if ((!empty($postData['pass1'])) && (!empty($postData['pass2']))) {
+	if ((!empty($postData['password1'])) && (!empty($postData['password2']))) {
 		// Are both passwords the same?
-		if ($postData['pass1'] == $postData['pass2']) {
-			// Okay, then set password and remove pass1 and pass2
-			$postData['password'] = md5($postData['pass1']);
+		if ($postData['password1'] == $postData['password2']) {
+			// Okay, then set password and remove password1 and password2
+			$postData['password'] = md5($postData['password1']);
 		} // END - if
 	} // END - if
 
@@ -414,46 +420,45 @@ function saveSponsorData ($postData, $content) {
 		$sql   .= " `" . secureString($key) . "`='%s',";
 
 		// We will secure this later inside the SQL_QUERY_ESC() function
-		$DATA[] = secureString($value);
+		array_push($DATA, secureString($value));
 	} // END - foreach
 
 	// Check if email has changed
 	if ((!empty($content['email'])) && (!empty($postData['email']))) {
 		if ($content['email'] != $postData['email']) {
 			// Change email address
-			$EMAIL = true;
+			$EMAIL = TRUE;
 
 			// Okay, has changed then add status with UNCONFIRMED and new hash code
-			$sql .= " `status`='EMAIL', `hash`='%s',";
+			$sql .= " `status`='EMAIL',`hash`='%s',";
 
 			// Generate hash code
 			// @TODO Rewrite this to API function
-			$HASH = md5(session_id() . ':' . $postData['email'] . ':' . detectRemoteAddr() . ':' . detectUserAgent() . ':' . time());
-			$DATA[] = $HASH;
+			$HASH = md5(session_id() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . time());
+			array_push($DATA, $HASH);
 		} // END - if
 	} // END - if
 	// Remove last commata
 	$sql = substr($sql, 0, -1);
 
 	// Add last_change
-	$sql .= ', `last_change`=NOW()';
+	$sql .= ',`last_change`=NOW()';
 
 	// Add SQL tail data
 	$sql .= " WHERE `id`=%s AND `password`='%s' LIMIT 1";
-	$DATA[] = bigintval(getSession('sponsor_id'));
-	$DATA[] = getSession('sponsor_pass');
+	array_push($DATA, bigintval(getSession('sponsor_id')), getSession('sponsor_pass'));
 
 	// Saving data was completed... ufff...
 	switch (getWhat()) {
 		case 'account': // Change account data
-			if ($EMAIL === true) {
+			if ($EMAIL === TRUE) {
 				$message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}';
 				$templ   = 'admin_sponsor_change_email';
-				$subj    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}';
+				$subject    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}';
 			} else {
 				$message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}';
 				$templ   = 'admin_sponsor_change_data';
-				$subj    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}';
+				$subject    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}';
 			}
 			break;
 
@@ -461,21 +466,21 @@ function saveSponsorData ($postData, $content) {
 			// Set message template and subject for admin
 			$message = '{--SPONSOR_SETTINGS_SAVED--}';
 			$templ   = 'admin_sponsor_settings';
-			$subj    = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}';
+			$subject    = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}';
 			break;
 
 		default: // Unknown sponsor what value!
 			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", getWhat()));
-			$message = getMaskedMessage('SPONSOR_UNKNOWN_WHAT', getWhat());
+			$message = '{--SPONSOR_UNKNOWN_WHAT--}';
 			$templ   = '';
-			$subj    = '';
+			$subject    = '';
 			break;
 	} // END - switch
 
 	// Has an entry updated?
 	if (!SQL_HASZEROAFFECTED()) {
 		// Template and subject are set?
-		if (!empty($templ) && !empty($subj)) {
+		if (!empty($templ) && !empty($subject)) {
 			// Run SQL command and check for success
 			$result = SQL_QUERY_ESC($sql, $DATA, __FUNCTION__, __LINE__);
 
@@ -483,7 +488,7 @@ function saveSponsorData ($postData, $content) {
 			$content['new_data'] = $postData;
 
 			// Send email to admins
-			sendAdminNotification($subj, $templ, $content);
+			sendAdminNotification($subject, $templ, $content);
 
 			// Shall we send mail to the sponsor's new email address?
 			if ($content['receive_warnings'] == 'Y') {
@@ -498,7 +503,7 @@ function saveSponsorData ($postData, $content) {
 						$email_msg = loadEmailTemplate('sponsor_change_data', $content);
 						sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg);
 
-						if ($EMAIL === true) {
+						if ($EMAIL === TRUE) {
 							// Add hash code to content array
 							$content['hash'] = $HASH;
 
@@ -535,7 +540,8 @@ function generateSponsorEmailLink ($email, $mod = 'admin') {
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
-	`email`='%s'" . $locked."
+	'%s' REGEXP `email`
+	" . $locked . "
 LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
@@ -559,14 +565,14 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
 	$message = '';
 
 	// Handle the request
-	$status = handleSponsorRequest(postRequestArray(), true, $messageArray, true);
+	$status = handleSponsorRequest(postRequestArray(), TRUE, $messageArray, TRUE);
 
 	// Check the status of the registration process
 	switch ($status) {
 		case 'added': // Sponsor successfully added with account status = UNCONFIRMED!
 			// Check for his id number
-			$result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `email`='%s' LIMIT 1",
-				array(postRequestParameter('email')), __FUNCTION__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE '%s' REGEXP `email` LIMIT 1",
+				array(postRequestElement('email')), __FUNCTION__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// id found so let's load it for the confirmation email
 				list($id, $hash) = SQL_FETCHROW($result);
@@ -574,15 +580,15 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
 				// Prepare data for the email template
 				$content['id']        = $id;
 				$content['hash']      = $hash;
-				$content['email']     = secureString(postRequestParameter('email'));
-				$content['surname']   = secureString(postRequestParameter('surname'));
-				$content['family']    = secureString(postRequestParameter('family'));
+				$content['email']     = postRequestElement('email');
+				$content['surname']   = postRequestElement('surname');
+				$content['family']    = postRequestElement('family');
 				$content['timestamp'] = generateDateTime(time(), 0);
-				$content['password']  = secureString(postRequestParameter('pass1'));
+				$content['password']  = postRequestElement('password1');
 
 				// Generate email and send it to the new sponsor
 				$message = loadEmailTemplate('sponsor_confirm', $content, $id);
-				sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message);
+				sendEmail(postRequestElement('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message);
 
 				// Send mail to admin
 				sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_reg', $content);
@@ -591,7 +597,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
 				$message = $messageArray['added'];
 			} else {
 				// Sponsor account not found???
-				$message = getMaskedMessage('SPONSOR_EMAIL_404', postRequestParameter('email'));
+				$message = '{%message,SPONSOR_EMAIL_404=' . postRequestElement('email') . '%}';
 			}
 
 			// Free memory
@@ -602,10 +608,10 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
 			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
 			if (!isAdmin()) {
 				// Message for testing admin
-				$message = getMaskedMessage('ADMIN_SPONSOR_UNKNOWN_STATUS', $status);
+				$message = '{%message,ADMIN_SPONSOR_UNKNOWN_STATUS=' . $status . '%}';
 			} else {
 				// Message for the guest
-				$message = getMaskedMessage('SPONSOR_UNKNOWN_STATUS', $status);
+				$message = '{%message,SPONSOR_UNKNOWN_STATUS=' . $status . '%}';
 			}
 			break;
 	} // END - switch
@@ -621,7 +627,7 @@ function doExpressionSponsor ($data) {
 
 	// Sponsor-related data, so is there a sponsor_id?
 	if (!empty($data['matches'][4][$data['key']])) {
-		// Do we have a sponsor_id or $sponsor_id?
+		// Is there a sponsor_id or $sponsor_id?
 		if ($data['matches'][4][$data['key']] == '$userid') {
 			// Use dynamic call
 			$functionName = "getFetchedSponsorData('id', \$userid, '" . $data['callback'] . "')";
@@ -634,7 +640,7 @@ function doExpressionSponsor ($data) {
 		$functionName = "getSponsorData('" . $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 . ')';
@@ -661,20 +667,20 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
 		setCurrentSponsorId($sponsor_id);
 
 		// Don't look for invalid sponsor_ids...
-		if (!isValidUserId($sponsor_id)) {
+		if (!isValidId($sponsor_id)) {
 			// Invalid, so abort here
-			debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.');
+			reportBug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.');
 		} elseif (isSponsorDataValid()) {
 			// Use cache, so it is fine
-			return true;
+			return TRUE;
 		}
 	} elseif (isSponsorDataValid()) {
 		// Use cache, so it is fine
-		return true;
+		return TRUE;
 	}
 
 	// By default none was found
-	$found = false;
+	$found = FALSE;
 
 	// Extra statements
 	$ADD = '';
@@ -683,7 +689,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
 	$result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `%s`='%s' LIMIT 1",
 		array($column, $sponsor_id), __FUNCTION__, __LINE__);
 
-	// Do we have a record?
+	// Is there a record?
 	if (SQL_NUMROWS($result) == 1) {
 		// Load data from cookies
 		$data = SQL_FETCHARRAY($result);
@@ -696,7 +702,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
 		if (isset($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'])) {
 			// Backup the raw one and zero it
 			$GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'] = $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'];
-			$GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = null;
+			$GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = NULL;
 
 			// Is it not zero?
 			if (!is_null($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'])) {
@@ -735,7 +741,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
 	// Zero ids are not valid
 	if ($sponsor_id == 0) {
 		// Abort here
-		debug_report_bug(__FUNCTION__, __LINE__, 'Zero sponsor_id provided');
+		reportBug(__FUNCTION__, __LINE__, 'Zero sponsor_id provided');
 	} // END - if
 
 	// Is it cached?
@@ -744,7 +750,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
 		$data = '';
 
 		// Can we fetch the sponsor data?
-		if ((isValidSponsorId($sponsor_id)) && (fetchSponsorData($sponsor_id, $keyColumn))) {
+		if ((isValidId($sponsor_id)) && (fetchSponsorData($sponsor_id, $keyColumn))) {
 			// Now get the data back
 			$data = getSponsorData($valueColumn);
 		} // END - if
@@ -762,7 +768,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
 // in, but you should use isMember() if you want to find that out.
 function isSponsorDataValid () {
 	// Sponsor id should not be zero so abort here
-	if (!isCurrentSponsorIdSet()) return false;
+	if (!isCurrentSponsorIdSet()) return FALSE;
 
 	// Is it cached?
 	if (!isset($GLOBALS['is_sponsor_data_valid'][getCurrentSponsorId()])) {
@@ -788,7 +794,7 @@ function getCurrentSponsorId () {
 	// Sponsorid must be set before it can be used
 	if (!isCurrentSponsorIdSet()) {
 		// Not set
-		debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id is not set.');
+		reportBug(__FUNCTION__, __LINE__, 'Sponsor id is not set.');
 	} // END - if
 
 	// Return the sponsor_id
@@ -797,26 +803,14 @@ function getCurrentSponsorId () {
 
 // Checks if current sponsor_id is set
 function isCurrentSponsorIdSet () {
-	return ((isset($GLOBALS['current_sponsor_id'])) && (isValidSponsorId($GLOBALS['current_sponsor_id'])));
-}
-
-// Is given sponsor_id valid?
-function isValidSponsorId ($sponsor_id) {
-	// Do we have cache?
-	if (!isset($GLOBALS[__FUNCTION__][$sponsor_id])) {
-		// Check it out
-		$GLOBALS[__FUNCTION__][$sponsor_id] = ((!is_null($sponsor_id)) && (!empty($sponsor_id)) && ($sponsor_id > 0));
-	} // END - if
-
-	// Return cache
-	return $GLOBALS[__FUNCTION__][$sponsor_id];
+	return ((isset($GLOBALS['current_sponsor_id'])) && (isValidId($GLOBALS['current_sponsor_id'])));
 }
 
 // Getter for sponsor data
 function getSponsorData ($column) {
 	// Sponsor id should not be zero
-	if (!isValidUserId(getCurrentSponsorId())) {
-		debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id is zero.');
+	if (!isValidId(getCurrentSponsorId())) {
+		reportBug(__FUNCTION__, __LINE__, 'Sponsor id is zero.');
 	} // END - if
 
 	// Return the value
@@ -839,7 +833,7 @@ function destroySponsorSession () {
 		(setSession('sponsor_id', '')) &&
 		(setSession('sponsor_pass', '')) &&
 		(
-			((isExtensionActive('theme')) && (setTheme(''))) ||
+			((isExtensionActive('theme')) && (setMailerTheme(''))) ||
 			(!isExtensionActive('theme'))
 		)
 	);
@@ -847,7 +841,7 @@ function destroySponsorSession () {
 
 // Getter for sponsor_min_points
 function getSponsorMinPoints () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('sponsor_min_points');
@@ -859,7 +853,7 @@ function getSponsorMinPoints () {
 
 // Getter for sponsor_ref_points
 function getSponsorRefPoints () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('sponsor_ref_points');