X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=1a8ebe194ab92d561001406e4dd181168fe3f145;hp=9a774b446cebaa14de8930dc3375e201b04e7cda;hb=2379934be6a196a54f4155bb8e24c49b20736969;hpb=2e394cb5b8a6225a39a6942b1fcc17c37a17a175

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 9a774b446c..1a8ebe194a 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -46,7 +46,13 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
 	// Fix empty 'what'
 	if (empty($what)) {
 		$what = getIndexHome();
-	} // END - if
+	} elseif ((isGetRequestElementSet('action')) && ($column == 'what')) {
+		// Get it from action
+		return getTitleFromMenu($mode, getAction(), 'action', $ADD);
+	} elseif ($what == 'overview') {
+		// Overview page
+		return '{--WHAT_IS_OVERVIEW--}';
+	}
 
 	// Default is not found
 	$data['title'] = '??? (' . $what . ')';
@@ -98,13 +104,16 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 		// This is a 'what file'!
 		$type = 'what';
 		$search = substr($file, 5);
-		$ADD = " AND `visible`='Y' AND `locked`='N'";
 
 		// Get access level from it
 		$modCheck = getModuleFromFileName($file, $accessLevel);
 
 		// Do we have admin? Then display all
-		if (isAdmin()) $ADD = '';
+		$ADD = " AND `visible`='Y' AND `locked`='N'";
+		if (isAdmin()) {
+			// Display all!
+			$ADD = '';
+		} // END - if
 
 		$dummy = substr($search, 0, -4);
 		$ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
@@ -128,11 +137,12 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 		$GLOBALS['nav_depth'] = '0';
 
 		// Run the pre-filter chain
-		$ret = runFilterChain('pre_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+		$ret = runFilterChain('pre_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'search' => $search, 'prefix' => $prefix, 'link_add' => $LINK_ADD, 'content' => '', 'add' => $ADD));
 
 		// Add pre-content
 		$prefix = $ret['content'];
 
+		// Add default content
 		$prefix .= '<div class="you_are_here">{--YOU_ARE_HERE--}&nbsp;<strong><a class="you_are_here" href="{%url=modules.php?module=' . getModule() . $LINK_ADD . '%}">Home</a></strong>';
 	} elseif ($return === false) {
 		// Count depth
@@ -152,18 +162,20 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 		$OUT = $prefix . '<strong><a class="you_are_here" href="{%url=modules.php?module=' . $modCheck . '&amp;' . $type . '=' . $search . $LINK_ADD . '%}">' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . '</a></strong>';
 
 		// Can we close the you-are-here navigation?
-		//* DEBUG: */ debugOutput(__LINE__.'*'.$type.'/'.getWhat().'*');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type . 'getWhat()=' . getWhat());
 		if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
-			//* DEBUG: */ debugOutput(__LINE__.'+'.$type.'+');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type);
 			// Add closing div and br-tag
-			$OUT .= '</div>';
 			$GLOBALS['nav_depth'] = '0';
 
 			// Run the post-filter chain
-			$ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+			$ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'search' => $search, 'prefix' => $prefix, 'link_add' => $LINK_ADD, 'content' => $OUT, 'add' => $ADD));
+
+			// Get content from filter back
+			$OUT = $ret['content'];
 
-			// Add additional content
-			$OUT .= $ret['content'];
+			// Close div-tag, so not the filters have to do it
+			$OUT .= '</div>';
 		} // END - if
 	} // END - if
 
@@ -181,7 +193,6 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 function addMenu ($mode, $action, $what) {
 	// Init some variables
 	$main_cnt = '0';
-	$ADD = '';
 
 	// is the menu action valid?
 	if (!isMenuActionValid($mode, $action, $what, true)) {
@@ -189,13 +200,15 @@ function addMenu ($mode, $action, $what) {
 	} // END - if
 
 	// Non-admin shall not see all menus
-	if (!isAdmin()) {
-		$ADD = " AND `visible`='Y' AND `locked`='N'";
+	$ADD = " AND `visible`='Y' AND `locked`='N'";
+	if (isAdmin()) {
+		// Is admin, so make all visible
+		$ADD = '';
 	} // END - if
 
 	// Load SQL data and add the menu to the output stream...
 	$result_main = SQL_QUERY_ESC("SELECT
-	`title`, `what`, `action`, `visible`, `locked`
+	`title`,`what`,`action`,`visible`,`locked`
 FROM
 	`{?_MYSQL_PREFIX?}_%s_menu`
 WHERE
@@ -205,12 +218,12 @@ ORDER BY
 	`sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
 
-	//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
 	if (!SQL_HASZERONUMS($result_main)) {
 		// There are menus available, so we simply display them... :)
 		$GLOBALS['rows'] = '';
 		while ($content = SQL_FETCHARRAY($result_main)) {
-			//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . ':' . getWhat() . '*');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
 			// Disable the block-mode
 			enableBlockMode(false);
 
@@ -248,7 +261,7 @@ ORDER BY
 					$OUT = '';
 
 					// Full file name for checking menu
-					//* DEBUG: */ debugOutput(__LINE__ . ':!!!!' . $content['sub_what'] . '!!!');
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sub_what=' . $content['sub_what']);
 					$inc = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
 					if (isIncludeReadable($inc)) {
 						// Mark currently selected menu - open
@@ -256,11 +269,17 @@ ORDER BY
 							$OUT = '<strong>';
 						} // END - if
 
-						// Navigation link
-						$OUT .= '<a name="menu" class="menu_blur" href="{%url=modules.php?module=' . getModule() . '&amp;what=' . $content['sub_what'] . '%}" target="_self">';
+						// Is ext-sql_patches up-to-date, and display_home_in_index is Y?
+						if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled()) && ($content['sub_what'] == getIndexHome())) {
+							// Use index.php as link
+							$OUT .= '<a name="menu" class="menu_blur" href="{%url=index.php%}" target="_self">';
+						} else {
+							// Regular navigation link
+							$OUT .= '<a name="menu" class="menu_blur" href="{%url=modules.php?module=' . getModule() . '&amp;what=' . $content['sub_what'] . '%}" target="_self">';
+						}
 					} else {
 						// Not found - open
-						$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $content['sub_what'] . '%}">';
+						$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $content['sub_what'] . '%}">';
 					}
 
 					// Menu title
@@ -305,12 +324,12 @@ ORDER BY
 				if (isFileReadable($INC)) {
 					// Load include file
 					if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
-					//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat().'*');
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
 					loadInclude($INC);
-					//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat() . '*');
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
 					if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
 				}
-				//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*');
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
 			}
 
 			// Free result
@@ -319,7 +338,7 @@ ORDER BY
 			// Count one up
 			$main_cnt++;
 
-			//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
 			if (SQL_NUMROWS($result_main) > $main_cnt) {
 				// Add seperator
 				$GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
@@ -354,7 +373,7 @@ ORDER BY
 		);
 
 		// Load main template
-		//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
 		loadTemplate('menu_table', false, $content);
 	} // END - if
 }
@@ -428,6 +447,15 @@ function isMember () {
 
 // Fetch user data for given user id
 function fetchUserData ($value, $column = 'userid') {
+	// Extension ext-user must be there at any case
+	if (!isExtensionActive('user')) {
+		// Absent ext-user is really not good
+		return false;
+	} elseif (is_null($value)) {
+		// This shall never happen, so please report it
+		debug_report_bug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL');
+	}
+
 	// If we should look for userid secure&set it here
 	if (substr($column, -2, 2) == 'id') {
 		// Secure userid
@@ -442,10 +470,12 @@ function fetchUserData ($value, $column = 'userid') {
 			debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.');
 		} elseif (isUserDataValid()) {
 			// Use cache, so it is fine
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1');
 			return true;
 		}
-	} elseif (isUserDataValid()) {
-		// Use cache, so it is fine
+	} elseif (isUserDataValid())  {
+		// Using cache is fine
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2');
 		return true;
 	}
 
@@ -477,7 +507,7 @@ function fetchUserData ($value, $column = 'userid') {
 		if ((isExtensionInstalledAndNewer('user', '0.3.7')) && (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure']))) {
 			// Backup the raw one and zero it
 			$GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] = $GLOBALS['user_data'][getCurrentUserId()]['last_failure'];
-			$GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = null;
+			$GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = NULL;
 
 			// Is it not zero?
 			if (!is_null($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'])) {
@@ -531,7 +561,7 @@ function isAdmin () {
 		$adminId    = getCurrentAdminId();
 		$passCookie = getAdminMd5();
 	} // END - if
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId.'/'.$passCookie);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mainId=' . $adminId . 'passCookie=' . $passCookie);
 
 	// Abort if admin id is zero
 	if ($adminId == '0') {
@@ -583,13 +613,13 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 	switch ($mode) {
 		case 'guest':
 			// Guests (in the registration form) are not allowed to select 0 mails per day.
-			$result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC',
+			$result = SQL_QUERY('SELECT `value`,`comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC',
 			__FUNCTION__, __LINE__);
 			break;
 
 		case 'member':
 			// Members are allowed to set to zero mails per day (we will change this soon!)
-			$result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC',
+			$result = SQL_QUERY('SELECT `value`,`comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC',
 			__FUNCTION__, __LINE__);
 			break;
 
@@ -603,7 +633,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			$OUT .= '      <option value="' . $content['value'] . '"';
-			if (postRequestParameter('max_mails') == $content['value']) $OUT .= ' selected="selected"';
+			if (postRequestElement('max_mails') == $content['value']) $OUT .= ' selected="selected"';
 			$OUT .= '>' . $content['value'] . ' {--PER_DAY--}';
 			if (!empty($content['comment'])) $OUT .= '(' . $content['comment'] . ')';
 			$OUT .= '</option>';
@@ -665,7 +695,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 	$add = '';
 	if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
-	//* DEBUG: */ debugOutput(__LINE__ . ':' . $mode . '/' . $action . '/' . $what . '*');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',action=' . $action . ',what=' . $what);
 	if (($mode != 'admin') && ($updateEntry === true)) {
 		// Update guest or member menu
 		$sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
@@ -676,7 +706,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 			), __FUNCTION__, __LINE__, false);
 	} elseif (($what != 'overview') && (!empty($what))) {
 		// Other actions
-		$sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY `action` DESC LIMIT 1",
+		$sql = SQL_QUERY_ESC("SELECT `id`,`what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY `action` DESC LIMIT 1",
 			array(
 				$mode,
 				$action,
@@ -684,7 +714,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 			), __FUNCTION__, __LINE__, false);
 	} else {
 		// Admin login overview
-		$sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND (`what`='' OR `what` IS NULL)".$add." ORDER BY `action` DESC LIMIT 1",
+		$sql = SQL_QUERY_ESC("SELECT `id`,`what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND (`what`='' OR `what` IS NULL)".$add." ORDER BY `action` DESC LIMIT 1",
 			array(
 				$mode,
 				$action
@@ -715,10 +745,10 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 
 // Get action value from mode (admin/guest/member) and what-value
 function getActionFromModuleWhat ($module, $what) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'module=' . $module . ',what=' . $what);
 	// Init status
 	$data['action'] = '';
 
-	//* DEBUG: */ debugOutput(__LINE__ . '=' . $module . '/'.$what . '/' . getAction() . '=');
 	if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
 		// sql_patches is missing so choose depending on mode
 		if (isWhatSet()) {
@@ -738,9 +768,9 @@ function getActionFromModuleWhat ($module, $what) {
 
 	if ($module == 'admin') {
 		// Action value for admin area
-		if (isGetRequestParameterSet('action')) {
+		if (isGetRequestElementSet('action')) {
 			// Use from request!
-			return getRequestParameter('action');
+			return getRequestElement('action');
 		} elseif (isActionSet()) {
 			// Get it directly from URL
 			return getAction();
@@ -752,7 +782,7 @@ function getActionFromModuleWhat ($module, $what) {
 		// Get it directly from URL
 		return getAction();
 	}
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): ret=' . $data['action']);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' ret=' . $data['action']);
 
 	// Does the module have a menu?
 	if (ifModuleHasMenu($module)) {
@@ -760,11 +790,16 @@ function getActionFromModuleWhat ($module, $what) {
 		$module = mapModuleToTable($module);
 
 		// Guest and member menu is 'main' as the default
-		if (empty($data['action'])) $data['action'] = 'main';
+		if (empty($data['action'])) {
+			$data['action'] = 'main';
+		} // END - if
 
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
-			array($module, $what), __FUNCTION__, __LINE__);
+			array(
+				$module,
+				$what
+			), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load action value and pray that this one is the right you want... ;-)
 			$data = SQL_FETCHARRAY($result);
@@ -816,7 +851,7 @@ function getPaymentTitlePrice ($pid, $full=false) {
 	$ret = '{--_PAYMENT_404--}';
 
 	// Load payment data
-	$result = SQL_QUERY_ESC("SELECT `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `mail_title`,`price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
 		array(bigintval($pid)), __FUNCTION__, __LINE__);
 
 	// Do we have an entry?
@@ -890,7 +925,7 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = 0, $i
 			// Was it *not* found?
 			if (SQL_HASZERONUMS($result)) {
 				// So we add one!
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_links` (`%s`, `userid`, `link_type`) VALUES ('%s','%s','%s')",
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_links` (`%s`,`userid`,`link_type`) VALUES ('%s','%s','%s')",
 					array($rowName, $stats_id, bigintval($userid), $type), __FUNCTION__, __LINE__);
 
 				// Update 'mails_sent' if sql_patches is updated
@@ -915,32 +950,50 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = 0, $i
 }
 
 // Calculate sum (default) or count records of given criteria
-function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
+function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '', $mode = '=') {
 	// Init count/sum
 	$data['res'] = '0';
 
-	//* DEBUG: */ debugOutput($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',tableName=' . $tableName . ',lookFor=' . $lookFor . ',whereStatement=' . $whereStatement . ',add=' . $add);
 	if ((empty($search)) && ($search != '0')) {
 		// Count or sum whole table?
 		if ($countRows === true) {
 			// Count whole table
 			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
-				array($lookFor, $tableName), __FUNCTION__, __LINE__);
+				array(
+					$lookFor,
+					$tableName
+				), __FUNCTION__, __LINE__);
 		} else {
 			// Sum whole table
 			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
-				array($lookFor, $tableName), __FUNCTION__, __LINE__);
+				array(
+					$lookFor,
+					$tableName
+				), __FUNCTION__, __LINE__);
 		}
 	} elseif (($countRows === true) || ($lookFor == 'userid')) {
 		// Count rows
-		//* DEBUG: */ debugOutput('COUNT!');
-		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
-			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
+		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'".$add,
+			array(
+				$lookFor,
+				$tableName,
+				$whereStatement,
+				$mode,
+				$search
+			), __FUNCTION__, __LINE__);
 	} else {
 		// Add all rows
-		//* DEBUG: */ debugOutput('SUM!');
-		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
-			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
+		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'".$add,
+			array(
+				$lookFor,
+				$tableName,
+				$whereStatement,
+				$mode,
+				$search
+			), __FUNCTION__, __LINE__);
 	}
 
 	// Load row
@@ -959,260 +1012,9 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 	}
 
 	// Return value
-	//* DEBUG: */ debugOutput('ret=' . $data['res']);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'res=' . $data['res']);
 	return $data['res'];
 }
-// Getter fro ref level percents
-function getReferalLevelPercents ($level) {
-	// Default is zero
-	$data['percents'] = '0';
-
-	// Do we have cache?
-	if ((isset($GLOBALS['cache_array']['refdepths']['level'])) && (isExtensionActive('cache'))) {
-		// First look for level
-		$key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
-		if ($key !== false) {
-			// Entry found
-			$data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
-
-			// Count cache hit
-			incrementStatsEntry('cache_hits');
-		} // END - if
-	} elseif (!isExtensionActive('cache')) {
-		// Get referal data
-		$result_level = SQL_QUERY_ESC("SELECT `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level`='%s' LIMIT 1",
-			array(bigintval($level)), __FUNCTION__, __LINE__);
-
-		// Entry found?
-		if (SQL_NUMROWS($result_level) == 1) {
-			// Get percents
-			$data = SQL_FETCHARRAY($result_level);
-		} // END - if
-
-		// Free result
-		SQL_FREERESULT($result_level);
-	}
-
-	// Return percent
-	return $data['percents'];
-}
-
-/**
- *
- * Dynamic referal and points system, can also send mails!
- *
- * subject     = Subject line, write in lower-case letters and underscore is allowed
- * userid      = Referal id wich should receive...
- * points      = ... xxx points
- * sendNotify  = shall I send the referal an email or not?
- * refid       = inc/modules/guest/what-confirm.php need this
- * locked      = Shall I pay it to normal (false) or locked (true) points ammount?
- * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
- *               for default value will cause no referal will get points ever!!!)
- */
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $addMode = 'ref') {
-	// By default nothing has been added
-	$added = false;
-
-	//* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">' . __FUNCTION__ . ' - ENTRY</font> ------------------------<ul><li>');
-	// Convert mode to lower-case
-	$addMode = strtolower($addMode);
-
-	// When $userid = '0' add points to jackpot
-	if (($userid == '0') && (isExtensionActive('jackpot'))) {
-		// Add points to jackpot
-		return addPointsToJackpot($points);
-	} // END - if
-
-	// Count up referal depth
-	if (!isset($GLOBALS['ref_level'])) {
-		// Initialialize referal system
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): Referal system initialized!');
-		$GLOBALS['ref_level'] = '0';
-	} else {
-		// Increase referal level
-		$GLOBALS['ref_level']++;
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): Referal level increased. DEPTH='.$GLOBALS['ref_level']);
-	}
-
-	// Check user account
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points);
-	if (fetchUserData($userid)) {
-		// Determine wether the user has some mails to click before he/she gets the points
-		$locked = ifUserPointsLocked($userid);
-
-		// Detect database column
-		$pointsColumn = determinePointsColumnFromSubjectLocked($subject, $locked);
-
-		// This is the user and his ref
-		$GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
-
-		// Get percents
-		$per = getReferalLevelPercents($GLOBALS['ref_level']);
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$addMode);
-
-		// Some percents found?
-		if ($per > 0) {
-			// Calculate new points
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points.',per='.$per.',depth='.$GLOBALS['ref_level']);
-			$ref_points = $points * $per / 100;
-
-			// Pay refback here if level > 0 and in ref-mode
-			if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($addMode == 'ref') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
-				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - BEFORE!');
-				$ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
-				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - AFTER!');
-			} // END - if
-
-			// Update points...
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth`=%s LIMIT 1",
-				array(
-					$pointsColumn,
-					$pointsColumn,
-					$ref_points,
-					bigintval($userid),
-					bigintval($GLOBALS['ref_level'])
-				), __FUNCTION__, __LINE__);
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - UPDATE! ('.SQL_AFFECTEDROWS().')');
-
-			// No entry updated?
-			if (SQL_HASZEROAFFECTED()) {
-				// First ref in this level! :-)
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s, %s, %s)",
-					array(
-						$pointsColumn,
-						bigintval($userid),
-						bigintval($GLOBALS['ref_level']),
-						$ref_points
-					), __FUNCTION__, __LINE__);
-				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
-			} // END - if
-
-			// Check affected rows
-			$added = SQL_AFFECTEDROWS();
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):added='.intval($added));
-
-			// Prepare data for the filter
-			$filterData = array(
-				'subject'    => $subject,
-				'userid'     => $userid,
-				'points'     => $points,
-				'ref_points' => $ref_points,
-				'column'     => $pointsColumn,
-				'notify'     => $sendNotify,
-				'refid'      => $refid,
-				'locked'     => $locked,
-				'mode'       => 'add',
-				'add_mode'   => $addMode,
-				'added'      => $added
-			);
-
-			// Filter it now
-			$filterData = runFilterChain('post_add_points', $filterData);
-
-			// Extract $added
-			$added = $filterData['added'];
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):added='.intval($added));
-
-			// Points updated, maybe I shall send him an email?
-			if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
-				// Prepare content
-				$content = array(
-					'percents' => $per,
-					'level'    => bigintval($GLOBALS['ref_level']),
-					'points'   => $ref_points,
-				);
-
-				// Load email template
-				$message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
-
-				// Send email
-				sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
-			} elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($addMode == 'direct')) {
-				// Prepare content
-				$content = array(
-					'reason' => '{--REASON_DIRECT_PAYMENT--}',
-					'points' => $ref_points
-				);
-
-				// Load message
-				$message = loadEmailTemplate('add-points', $content, $userid);
-
-				// And sent it away
-				sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
-				if (!isGetRequestParameterSet('mid')) {
-					// Output message to admin
-					displayMessage('{--ADMIN_POINTS_ADDED--}');
-				} // END - if
-			}
-
-			// Maybe there's another ref?
-			if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($addMode == 'ref')) {
-				// Then let's credit him here...
-				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
-				$added = ($added && addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid')));
-			} // END - if
-		} // END - if
-	} // END - if
-
-	//* DEBUG: */ debugOutput('</li></ul>----------------------- <font color="#aa0000">'.__FUNCTION__.': added=' . intval($added) . ' - EXIT</font> ------------------------<br />');
-	return $added;
-}
-
-// Updates the referal counter
-function updateReferalCounter ($userid) {
-	// Make it sure referal level zero (member him-/herself) is at least selected
-	if (empty($GLOBALS['cache_array']['ref_level'][$userid])) $GLOBALS['cache_array']['ref_level'][$userid] = 1;
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',level='.$GLOBALS['cache_array']['ref_level'][$userid]);
-
-	// Update counter
-	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`='%s' LIMIT 1",
-		array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
-
-	// When no entry was updated then we have to create it here
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):updated=' . SQL_AFFECTEDROWS());
-	if (SQL_HASZEROAFFECTED()) {
-		// First count!
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
-			array(
-				bigintval($userid),
-				$GLOBALS['cache_array']['ref_level'][$userid]
-			), __FUNCTION__, __LINE__);
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid);
-	} // END - if
-
-	// Init referal id
-	$ref = '0';
-
-	// Check for his referal
-	if (fetchUserData($userid)) {
-		// Get it
-		$ref = getUserData('refid');
-	} // END - if
-
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.$ref);
-
-	// When he has a referal...
-	if (($ref > 0) && ($ref != $userid)) {
-		// Move to next referal level and count his counter one up!
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):ref='.$ref.' - ADVANCE!');
-		$GLOBALS['cache_array']['ref_level'][$userid]++;
-		updateReferalCounter($ref);
-	} elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
-		// Remove cache here
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):ref='.$ref.' - CACHE!');
-		rebuildCache('refsystem', 'refsystem');
-	}
-
-	// "Walk" back here
-	$GLOBALS['cache_array']['ref_level'][$userid]--;
-
-	// Handle refback here if extension is installed
-	// @TODO Rewrite this to a filter
-	if (isExtensionActive('refback')) {
-		updateRefbackTable($userid);
-	} // END - if
-}
 
 // Sends out mail to all administrators. This function is no longer obsolete
 // because we need it when there is no ext-admins installed
@@ -1387,7 +1189,7 @@ function getAdminEmail ($adminId) {
 // Get default ACL  of admin id
 function getAdminDefaultAcl ($adminId) {
 	// By default an invalid ACL value is returned
-	$data['default_acl'] = '***';
+	$data['default_acl'] = 'NO-ACL';
 
 	// Is sql_patches there and was it found in cache?
 	if (!isExtensionActive('sql_patches')) {
@@ -1403,6 +1205,8 @@ function getAdminDefaultAcl ($adminId) {
 		// Load from database
 		$result_admin_id = SQL_QUERY_ESC("SELECT `default_acl` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+		// Do we have an entry?
 		if (SQL_NUMROWS($result_admin_id) == 1) {
 			// Fetch data
 			$data = SQL_FETCHARRAY($result_admin_id);
@@ -1420,7 +1224,7 @@ function getAdminDefaultAcl ($adminId) {
 }
 
 // Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default = '', $special = '', $where = '', $disabled = array(), $callback = '') {
+function generateOptionList ($table, $id, $name, $default = '', $special = '', $whereStatement = '', $disabled = array(), $callback = '') {
 	$ret = '';
 	if ($table == '/ARRAY/') {
 		// Selection from array
@@ -1457,7 +1261,7 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 		} // END - if
 
 		// Query the database
-		$result = SQL_QUERY_ESC("SELECT `%s`, `%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY `%s` ASC",
+		$result = SQL_QUERY_ESC("SELECT `%s`,`%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$whereStatement." ORDER BY `%s` ASC",
 			array(
 				$id,
 				$name,
@@ -1506,30 +1310,6 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 	// Return - hopefully - the requested data
 	return $ret;
 }
-// Activate exchange
-function FILTER_ACTIVATE_EXCHANGE () {
-	// Is the extension 'user' there?
-	if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) {
-		// Silently abort here
-		return false;
-	} // END - if
-
-	// Check total amount of users
-	if (getTotalConfirmedUser() >= getActivateXchange()) {
-		// Activate System
-		addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1");
-		addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2");
-
-		// Run SQLs
-		runFilterChain('run_sqls');
-
-		// Update configuration
-		updateConfiguration('activate_xchange' ,0);
-
-		// Rebuild cache
-		rebuildCache('modules', 'modules');
-	} // END - if
-}
 
 // Deletes a user account with given reason
 function deleteUserAccount ($userid, $reason) {
@@ -1590,7 +1370,7 @@ LIMIT 1",
 	$data['text']   = $reason;
 
 	// Now a mail to the user and that's all...
-	$message = loadEmailTemplate('del-user', $data, $userid);
+	$message = loadEmailTemplate('member_user_deleted', $data, $userid);
 	sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message);
 
 	// Ok, delete the account!
@@ -1600,15 +1380,15 @@ LIMIT 1",
 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
 	// Is the request element set?
-	if (isGetRequestParameterSet('what')) {
+	if (isGetRequestElementSet('what')) {
 		// Then return this!
-		return getRequestParameter('what');
+		return getRequestElement('what');
 	} // END - if
 
 	// Default is empty
 	$what = '';
 
-	//* DEBUG: */ debugOutput(__LINE__.'!'.$modCheck.'!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'modCheck=' . $modCheck);
 	switch ($modCheck) {
 		case 'admin':
 			$what = 'overview';
@@ -1635,37 +1415,6 @@ function getWhatFromModule ($modCheck) {
 	return $what;
 }
 
-// Subtract points from database and mediadata cache
-function subtractPoints ($subject, $userid, $points) {
-	// Add points to used points
-	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `used_points`=`used_points`+%s WHERE `userid`=%s LIMIT 1",
-		array($points, bigintval($userid)), __FUNCTION__, __LINE__);
-
-	// Prepare filter data
-	$filterData = array(
-		'subject' => $subject,
-		'userid'  => $userid,
-		'points'  => $points,
-		'mode'    => 'sub',
-		'added'   => (!SQL_HASZEROAFFECTED())
-	);
-
-	// Insert booking record
-	$filterData = runFilterChain('sub_points', $filterData);
-
-	// Return result
-	return $filterData['added'];
-}
-
-// "Getter" for total available receivers
-function getTotalReceivers ($mode = 'normal') {
-	// Get num rows
-	$numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode));
-
-	// Return value
-	return $numRows;
-}
-
 // Returns HTML code with an option list of all categories
 function generateCategoryOptionsList ($mode) {
 	// Prepare WHERE statement
@@ -1680,7 +1429,7 @@ function generateCategoryOptionsList ($mode) {
 	);
 
 	// Get categories
-	$result = SQL_QUERY('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC',
+	$result = SQL_QUERY('SELECT `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC',
 		__FUNCTION__, __LINE__);
 
 	// Do we have entries?
@@ -1730,7 +1479,7 @@ function generateCategoryOptionsList ($mode) {
 }
 
 // Add bonus mail to queue
-function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode='normal', $receiver=0) {
+function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $categoryId, $mode='normal', $receiver=0) {
 	// Is admin or bonus extension there?
 	if (!isAdmin()) {
 		// Abort here
@@ -1751,27 +1500,21 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 
 	// HTML extension active?
 	if (isExtensionActive('html_mail')) {
-		// No HTML by default
-		$HTML = 'N';
-
-		// HTML mode?
-		if ($mode == 'html') {
-			// Yes, please
-			$HTML = 'Y';
-		} // END - if
+		// Determine if we have HTML mode active
+		$HTML = convertBooleanToYesNo($mode == 'html');
 
 		// Add HTML mail
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
-(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `html_msg`)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
+(`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send`,`mails_sent`,`html_msg`)
+VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
 		array(
 			$subject,
 			$text,
 			$receiverList,
 			$points,
-			$seconds,
+			bigintval($seconds),
 			$url,
-			$cat,
+			bigintval($categoryId),
 			$target,
 			bigintval($receiver),
 			$HTML
@@ -1779,16 +1522,16 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s
 	} else {
 		// Add regular mail
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
-(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
+(`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send`,`mails_sent`)
+VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
 		array(
 			$subject,
 			$text,
 			$receiverList,
 			$points,
-			$seconds,
+			bigintval($seconds),
 			$url,
-			$cat,
+			bigintval($categoryId),
 			$target,
 			bigintval($receiver),
 		), __FUNCTION__, __LINE__);
@@ -1796,7 +1539,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
 }
 
 // Generate a receiver list for given category and maximum receivers
-function generateReceiverList ($cat, $receiver, $mode = '') {
+function generateReceiverList ($categoryId, $receiver, $mode = '') {
 	// Init variables
 	$CAT_TABS     = '';
 	$CAT_WHERE    = '';
@@ -1804,8 +1547,8 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 	$result       = false;
 
 	// Secure data
-	$cat      = bigintval($cat);
-	$receiver = bigintval($receiver);
+	$categoryId = bigintval($categoryId);
+	$receiver   = bigintval($receiver);
 
 	// Is the receiver zero and mode set?
 	if (($receiver == '0') && (!empty($mode))) {
@@ -1814,10 +1557,10 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 	} // END - if
 
 	// Category given?
-	if ($cat > 0) {
+	if ($categoryId > 0) {
 		// Select category
 		$CAT_TABS  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`";
-		$CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $cat);
+		$CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $categoryId);
 	} // END - if
 
 	// Exclude users in holiday?
@@ -1828,13 +1571,13 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 
 	if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
 		// Only include HTML receivers
-		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s",
+		$result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
 			array(
 				$receiver
 			), __FUNCTION__, __LINE__);
 	} else {
 		// Include all
-		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s",
+		$result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
 			array(
 				$receiver
 			), __FUNCTION__, __LINE__);
@@ -1845,7 +1588,9 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 		// Load all entries
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Add receiver when not empty
-			if (!empty($content['userid'])) $receiverList .= $content['userid'] . ';';
+			if (!empty($content['userid'])) {
+				$receiverList .= $content['userid'] . ';';
+			} // END - if
 		} // END - while
 
 		// Free memory
@@ -1859,86 +1604,6 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 	return $receiverList;
 }
 
-// "Getter" for array for user refs and points in given level
-function getUserReferalPoints ($userid, $level) {
-	//* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">'.__FUNCTION__.' - ENTRY</font> ------------------------<ul><li>');
-	// Default is no refs and no nickname
-	$add = '';
-	$refs = array();
-
-	// Do we have nickname extension installed?
-	if (isExtensionActive('nickname')) {
-		$add = ', ud.nickname';
-	} // END - if
-
-	// Get refs from database
-	$result = SQL_QUERY_ESC("SELECT
-	ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$add."
-FROM
-	`{?_MYSQL_PREFIX?}_user_refs` AS ur
-LEFT JOIN
-	`{?_MYSQL_PREFIX?}_user_points` AS up
-ON
-	ur.refid=up.userid AND ur.level=0
-LEFT JOIN
-	`{?_MYSQL_PREFIX?}_user_data` AS ud
-ON
-	ur.refid=ud.userid
-WHERE
-	ur.userid=%s AND ur.level=%s
-ORDER BY
-	ur.refid ASC",
-		array(
-			bigintval($userid),
-			bigintval($level)
-		), __FUNCTION__, __LINE__);
-
-	// Are there some entries?
-	if (!SQL_HASZERONUMS($result)) {
-		// Fetch all entries
-		while ($row = SQL_FETCHARRAY($result)) {
-			// Get total points of this user
-			$row['points'] = getTotalPoints($row['refid']);
-
-			// Get unconfirmed mails
-			$row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);
-
-			// Init clickrate with zero
-			$row['clickrate'] = '0';
-
-			// Is at least one mail received?
-			if ($row['emails_received'] > 0) {
-				// Calculate clickrate
-				$row['clickrate'] = ($row['mails_confirmed'] / $row['emails_received'] * 100);
-			} // END - if
-
-			// Activity is 'active' by default because if autopurge is not installed
-			$row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}';
-
-			// Is autopurge installed and the user inactive?
-			if ((isExtensionActive('autopurge')) && ((time() - getApInactiveSince()) >= $row['last_online']))  {
-				// Inactive user!
-				$row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}';
-			} // END - if
-
-			// Remove some entries
-			unset($row['mails_confirmed']);
-			unset($row['emails_received']);
-			unset($row['last_online']);
-
-			// Add row
-			$refs[$row['id']] = $row;
-		} // END - while
-	} // END - if
-
-	// Free result
-	SQL_FREERESULT($result);
-
-	// Return result
-	//* DEBUG: */ debugOutput('</li></ul>----------------------- <font color="#aa0000">'.__FUNCTION__.' - EXIT</font> ------------------------<br />');
-	return $refs;
-}
-
 // Recuce the amount of received emails for the receipients for given email
 function reduceRecipientReceivedMails ($column, $id, $count) {
 	// Search for mail in database
@@ -1964,7 +1629,9 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 			}
 
 			// Reduce this users total received emails?
-			if ($num === 0) $userids[$data['userid']] = $data['userid'];
+			if ($num === 0) {
+				$userids[$data['userid']] = $data['userid'];
+			} // END - if
 		} // END - while
 
 		if (count($userids) > 0) {
@@ -1973,7 +1640,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 				array(implode(',', $userids), count($userids)), __FUNCTION__, __LINE__);
 		} else {
 			// Nothing deleted
-			displayMessage(getMaskedMessage('ADMIN_MAIL_NOTHING_DELETED', $id));
+			displayMessage('{%message,ADMIN_MAIL_NOTHING_DELETED=' . $id . '%}');
 		}
 	} // END - if
 
@@ -1982,9 +1649,9 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 }
 
 // Creates a new task
-function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '0', $strip = true) {
+function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = '0', $strip = true) {
 	// Insert the task data into the database
-	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
+	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`,`userid`,`status`,`task_type`,`subject`,`text`,`task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
 		array(
 			$adminId,
 			$userid,
@@ -2001,7 +1668,15 @@ function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '
 // @TODO Fix inconsistency between last_module and getWhat()
 function updateLastActivity($userid) {
 	// Run the update query
-	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1",
+	SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`last_module`='%s',
+	`last_online`=UNIX_TIMESTAMP(),
+	`REMOTE_ADDR`='%s'
+WHERE
+	`userid`=%s
+LIMIT 1",
 		array(
 			getWhat(),
 			detectRemoteAddr(),
@@ -2009,32 +1684,5 @@ function updateLastActivity($userid) {
 		), __FUNCTION__, __LINE__);
 }
 
-// Determines database column name from given subject and locked
-function determinePointsColumnFromSubjectLocked ($subject, $locked) {
-	// Default is 'normal' points
-	$pointsColumn = 'points';
-
-	// Which points, locked or normal?
-	if ($locked === true) {
-		$pointsColumn = 'locked_points';
-	} // END - if
-
-	// Prepare array for filter
-	$filterData = array(
-		'subject' => $subject,
-		'locked'  => $locked,
-		'column'  => $pointsColumn
-	);
-
-	// Run the filter
-	$filterData = runFilterChain('determine_points_column_name', $filterData);
-
-	// Extract column name from array
-	$pointsColumn = $filterData['column'];
-
-	// Return it
-	return $pointsColumn;
-}
-
 // [EOF]
 ?>