X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=da948fbee81fbe68a32abe9adba2f5357564d939;hp=db1db43c106c11241a12ca79cf5915854f839db0;hb=1ba8d9449de1b6fea32e88d581fb7c121b0522b1;hpb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index db1db43c10..da948fbee8 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -61,7 +61,7 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD = '') {
 	$data['title'] = '??? (' . $what . ')';
 
 	// Look for title
-	$result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `%s`='%s'" . $ADD . " LIMIT 1",
+	$result = sqlQueryEscaped("SELECT `title` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `%s`='%s'" . $ADD . " LIMIT 1",
 		array(
 			$mode,
 			$column,
@@ -69,20 +69,20 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD = '') {
 		), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Fetch the title
-		$data = SQL_FETCHARRAY($result);
+		$data = sqlFetchArray($result);
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return it
 	return $data['title'];
 }
 
 // Add link into output stream (or return it) for 'You Are Here' navigation
-function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
+function addYouAreHereLink ($accessLevel, $FQFN, $return = FALSE) {
 	// Use only filename of the FQFN...
 	$file = basename($FQFN);
 
@@ -145,7 +145,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 
 		// 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() . $linkAdd . '%}">Home</a></strong>';
-	} elseif ($return === false) {
+	} elseif ($return === FALSE) {
 		// Count depth
 		$GLOBALS['nav_depth']++;
 	}
@@ -160,8 +160,8 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 	} // END - if
 
 	// Is ext-sql_patches installed?
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isExtensionInstalledAndNewer()=' . intval(isExtensionInstalledAndNewer('sql_patches', '0.2.3')) . ',youre_here=' . getConfig('youre_here') . ',isAdmin()=' . intval(isAdmin()) . ',modCheck=' . $modCheck);
-	if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isExtensionInstalledAndNewer()=' . intval(isExtensionInstalledAndNewer('sql_patches', '0.2.3')) . ',youre_here=' . getYoureHere() . ',isAdmin()=' . intval(isAdmin()) . ',modCheck=' . $modCheck);
+	if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (isYoureHereEnabled())) || ((isAdmin()) && ($modCheck == 'admin'))) {
 		// Output HTML code
 		$OUT = $prefix . '<strong><a class="you_are_here" href="{%url=modules.php?module=' . $modCheck . '&amp;' . $type . '=' . $search . $linkAdd . '%}">' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . '</a></strong>';
 
@@ -184,7 +184,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 	} // END - if
 
 	// Return or output HTML code?
-	if ($return === true) {
+	if ($return === TRUE) {
 		// Return HTML code
 		return $OUT;
 	} else {
@@ -199,7 +199,7 @@ function addMenu ($mode, $action, $what) {
 	$main_cnt = '0';
 
 	// is the menu action valid?
-	if (!isMenuActionValid($mode, $action, $what, true)) {
+	if (!isMenuActionValid($mode, $action, $what, TRUE)) {
 		return getCode('MENU_NOT_VALID');
 	} // END - if
 
@@ -211,7 +211,7 @@ function addMenu ($mode, $action, $what) {
 	} // END - if
 
 	// Load SQL data and add the menu to the output stream...
-	$result_main = SQL_QUERY_ESC("SELECT
+	$result_main = sqlQueryEscaped("SELECT
 	`title`,
 	`what`,
 	`action`,
@@ -227,19 +227,19 @@ ORDER BY
 		array($mode), __FUNCTION__, __LINE__);
 
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
-	if (!SQL_HASZERONUMS($result_main)) {
+	if (!ifSqlHasZeroNums($result_main)) {
 		// There are menus available, so we simply display them... :)
 		$GLOBALS['rows'] = '';
-		while ($content = SQL_FETCHARRAY($result_main)) {
+		while ($content = sqlFetchArray($result_main)) {
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
 			// Disable the block-mode
-			enableBlockMode(false);
+			enableBlockMode(FALSE);
 
 			// Load menu header template
-			$GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', true, $content);
+			$GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', TRUE, $content);
 
 			// Sub menu
-			$result_sub = SQL_QUERY_ESC("SELECT
+			$result_sub = sqlQueryEscaped("SELECT
 	`title` AS `sub_title`,
 	`what` AS `sub_what`,
 	`visible` AS `sub_visible`,
@@ -259,12 +259,12 @@ ORDER BY
 				), __FUNCTION__, __LINE__);
 
 			// Are there some entries?
-			if (!SQL_HASZERONUMS($result_sub)) {
+			if (!ifSqlHasZeroNums($result_sub)) {
 				// Init counter
 				$count = '0';
 
 				// Load all sub menus
-				while ($content2 = SQL_FETCHARRAY($result_sub)) {
+				while ($content2 = sqlFetchArray($result_sub)) {
 					// Merge both arrays in one
 					$content = merge_array($content, $content2);
 
@@ -320,10 +320,10 @@ ORDER BY
 					);
 
 					// Add regular menu row or bottom row?
-					if ($count < SQL_NUMROWS($result_sub)) {
-						$GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
+					if ($count < sqlNumRows($result_sub)) {
+						$GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', TRUE, $content);
 					} else {
-						$GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
+						$GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', TRUE, $content);
 					}
 				} // END - while
 			} else {
@@ -334,48 +334,58 @@ ORDER BY
 				$INC = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
 				if (isFileReadable($INC)) {
 					// Load include file
-					if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
+					if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', TRUE, $mode);
 					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
 					loadInclude($INC);
 					//* 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);
+					if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', TRUE, $mode);
 				}
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
 			}
 
 			// Free result
-			SQL_FREERESULT($result_sub);
+			sqlFreeResult($result_sub);
 
 			// Count one up
 			$main_cnt++;
 
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
-			if (SQL_NUMROWS($result_main) > $main_cnt) {
+			if (sqlNumRows($result_main) > $main_cnt) {
 				// Add separator
-				$GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
+				$GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);
+
+				// Prepare filter data array
+				$filterData = array(
+					'output'    => '',
+					'exclusive' => FALSE,
+					'action'    => $action,
+					'mode'      => $mode,
+				);
 
-				// Should we display adverts in this menu?
-				if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y') && ($action != 'admin')) {
-					// Display advert template
-					$GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_' . $action, true);
+				// Run filter chain
+				$filterData = runFilterChain($mode . '_menu_advert', $filterData);
 
-					// Add separator again
-					$GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
-				} // END - if
+				// Add content output
+				$GLOBALS['rows'] .= $filterData['output'];
 			} // END - if
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result_main);
+		sqlFreeResult($result_main);
+
+		// Prepare filter data array
+		$filterData = array(
+			'output'    => '',
+			'exclusive' => FALSE,
+			'action'    => $action,
+			'mode'      => $mode,
+		);
 
-		// Should we display adverts in this menu?
-		if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) {
-			// Add separator again
-			$GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
+		// Run filter chain
+		$filterData = runFilterChain($mode . '_menu_advert_end', $filterData);
 
-			// Display advert template
-			$GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', true);
-		} // END - if
+		// Add content output
+		$GLOBALS['rows'] .= $filterData['output'];
 
 		// Prepare data
 		$content = array(
@@ -385,14 +395,14 @@ ORDER BY
 
 		// Load main template
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
-		loadTemplate('menu_table', false, $content);
+		loadTemplate('menu_table', FALSE, $content);
 	} // END - if
 }
 
 // Checks whether the current user is a member
 function isMember () {
 	// By default no member
-	$ret = false;
+	$ret = FALSE;
 
 	// Fix missing 'last_online' array, damn stupid code :(((
 	// @TODO Try to rewrite this to one or more functions
@@ -411,7 +421,7 @@ function isMember () {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
 
 		// Abort further processing
-		return false;
+		return FALSE;
 	}
 
 	// Get userid secured from session
@@ -427,7 +437,7 @@ function isMember () {
 	fixDeletedCookies(array('userid', 'u_hash'));
 
 	// Are cookies set and can the member data be loaded?
-	if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+	if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === TRUE)) {
 		// Validate password by created the difference of it and the secret key
 		$valPass = encodeHashForCookie(getUserData('password'));
 
@@ -438,12 +448,12 @@ function isMember () {
 			$GLOBALS['last_online']['online'] = getUserData('last_online');
 
 			// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
-			$ret = true;
+			$ret = TRUE;
 		} // END - if
 	} // END - if
 
 	// Is $ret still false?
-	if ($ret === false) {
+	if ($ret === FALSE) {
 		// Yes, so destroy the session
 		destroyMemberSession();
 	} // END - if
@@ -461,7 +471,7 @@ 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;
+		return FALSE;
 	} elseif (is_null($value)) {
 		// This shall never happen, so please report it
 		reportBug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL');
@@ -473,7 +483,7 @@ function fetchUserData ($value, $column = 'userid') {
 		$value = bigintval($value);
 
 		// Don't look for invalid userids...
-		if (!isValidUserId($value)) {
+		if (!isValidId($value)) {
 			// Invalid, so abort here
 			reportBug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.');
 		} // END - if
@@ -482,34 +492,34 @@ function fetchUserData ($value, $column = 'userid') {
 		if ((isCurrentUserIdSet()) && (getCurrentUserId() != $value)) {
 			// Unset it
 			unsetCurrentUserId();
-		} elseif (isUserDataValid()) {
+		} elseif (isValidUserData()) {
 			// Use cache, so it is fine
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1');
-			return true;
+			return TRUE;
 		} // END - if
-	} elseif (isUserDataValid()) {
+	} elseif (isValidUserData()) {
 		// Using cache is fine
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2');
-		return true;
+		return TRUE;
 	}
 
 	// By default none was found
-	$found = false;
+	$found = FALSE;
 
 	// Extra SQL statements
 	$ADD = runFilterChain('convert_user_data_columns', ' ');
 
 	// Query for the user
-	$result = SQL_QUERY_ESC("SELECT *" . $ADD . " FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
+	$result = sqlQueryEscaped("SELECT *" . $ADD . " FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
 		array(
 			$column,
 			$value
 		), __FUNCTION__, __LINE__);
 
 	// Is there a record?
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Load data from cookies
-		$data = SQL_FETCHARRAY($result);
+		$data = sqlFetchArray($result);
 
 		// Set the userid for later use
 		setCurrentUserId($data['userid']);
@@ -545,11 +555,11 @@ function fetchUserData ($value, $column = 'userid') {
 		} // END - if
 
 		// Found, but valid?
-		$found = isUserDataValid();
+		$found = isValidUserData();
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
 	return $found;
@@ -562,88 +572,88 @@ function fetchUserData ($value, $column = 'userid') {
  * login.
  */
 function isAdmin () {
+	// Is there cache?
+	if (isset($GLOBALS[__FUNCTION__])) {
+		// Return it
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__]));
+		return $GLOBALS[__FUNCTION__];
+	} // END - if
+
 	// No admin in installation phase!
-	if ((isInstallationPhase()) || (!isAdminRegistered())) {
-		return false;
+	if ((isInstaller()) || (!isAdminRegistered())) {
+		$GLOBALS[__FUNCTION__] = FALSE;
+		return FALSE;
 	} // END - if
 
 	// Init variables
-	$ret = false;
+	$ret = FALSE;
 	$adminId = '0';
 	$passwordFromCookie = '';
-	$valPass = '';
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId);
 
 	// If admin login is not given take current from cookies...
 	if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) {
 		// Get admin login and password from session/cookies
-		$adminId    = getCurrentAdminId();
+		$adminId            = getCurrentAdminId();
 		$passwordFromCookie = getAdminMd5();
 	} // END - if
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . 'passwordFromCookie=' . $passwordFromCookie);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . ',passwordFromCookie=' . $passwordFromCookie);
 
 	// Abort if admin id is zero
-	if ($adminId == '0') {
+	if (($adminId == '0') || (empty($passwordFromCookie))) {
 		// A very noisy debug message ...
 		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Current adminId is zero. isSessionVariableSet(admin_id)=' . intval(isSessionVariableSet('admin_id')) . ',isSessionVariableSet(admin_md5)=' . intval(isSessionVariableSet('admin_md5')));
 
 		// Abort here now
-		return false;
+		$GLOBALS[__FUNCTION__] = FALSE;
+		return FALSE;
 	} // END - if
 
-	// Is there cache?
-	if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
-		// Init it with failed
-		$GLOBALS[__FUNCTION__][$adminId] = false;
-
-		// Search in array for entry
-		if (isset($GLOBALS['admin_hash'])) {
-			// Use cached string
-			$valPass = $GLOBALS['admin_hash'];
-		} elseif ((!empty($passwordFromCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) {
-			// Login data is valid or not?
-			$valPass = encodeHashForCookie(getAdminHash($adminId));
-
-			// Cache it away
-			$GLOBALS['admin_hash'] = $valPass;
-
-			// Count cache hits
-			incrementStatsEntry('cache_hits');
-		} elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === false))) {
-			// Get admin hash and hash it
-			$valPass = encodeHashForCookie(getAdminHash($adminId));
-
-			// Cache it away
-			$GLOBALS['admin_hash'] = $valPass;
-		}
+	// Init it with failed
+	$GLOBALS[__FUNCTION__] = FALSE;
 
-		if (!empty($valPass)) {
-			// Check if password is valid
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passwordFromCookie . ')='.intval($valPass == $passwordFromCookie));
-			$GLOBALS[__FUNCTION__][$adminId] = ($GLOBALS['admin_hash'] == $passwordFromCookie);
-		} // END - if
-	} // END - if
+	// Search in array for entry
+	if (isset($GLOBALS['admin_hash'])) {
+		// Use cached string
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using admin_hash=' . $GLOBALS['admin_hash'] . ' from cache');
+	} elseif ((!empty($adminId)) && (!empty($passwordFromCookie)) && (isAdminHashSet($adminId) === TRUE)) {
+		// Get admin hash and hash it
+		$GLOBALS['admin_hash'] = encodeHashForCookie(getAdminHash($adminId));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valPass=' . $GLOBALS['admin_hash']);
+
+		// Count cache hits
+		incrementStatsEntry('cache_hits');
+	} elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === FALSE))) {
+		// Get admin hash and hash it
+		$GLOBALS['admin_hash'] = encodeHashForCookie(getAdminHash($adminId));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valPass=' . $GLOBALS['admin_hash']);
+	}
+
+	// Check if password is valid
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $GLOBALS['admin_hash'] . '==' . $passwordFromCookie . ')='.intval($GLOBALS['admin_hash'] == $passwordFromCookie));
+	$GLOBALS[__FUNCTION__] = ((!empty($GLOBALS['admin_hash'])) && ($GLOBALS['admin_hash'] == $passwordFromCookie));
 
 	// Return result of comparision
-	return $GLOBALS[__FUNCTION__][$adminId];
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__]));
+	return $GLOBALS[__FUNCTION__];
 }
 
 // Generates a list of "max receiveable emails per day"
 function addMaxReceiveList ($mode, $default = '') {
 	$OUT = '';
-	$result = false;
+	$result = 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 = sqlQuery('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC',
 			__FUNCTION__, __LINE__);
 			break;
 
 		case 'admin':
 		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 = sqlQuery('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC',
 			__FUNCTION__, __LINE__);
 			break;
 
@@ -653,9 +663,9 @@ function addMaxReceiveList ($mode, $default = '') {
 	}
 
 	// Some entries are found?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNums($result)) {
 		$OUT = '';
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			$OUT .= '      <option value="' . $content['value'] . '"';
 
 			if (postRequestElement('max_mails') == $content['value']) {
@@ -668,14 +678,14 @@ function addMaxReceiveList ($mode, $default = '') {
 		}
 
 		// Load template
-		$OUT = loadTemplate(($mode . '_receive_table'), true, $OUT);
+		$OUT = loadTemplate(($mode . '_receive_table'), TRUE, $OUT);
 	} else {
 		// Maybe the admin has to setup some maximum values?
 		reportBug(__FUNCTION__, __LINE__, 'Nothing is being done here?');
 	}
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return generated HTML code
 	return $OUT;
@@ -696,7 +706,7 @@ function isEmailTaken ($email) {
 	$email = str_replace('.', '{DOT}', $email);
 
 	// Query the database
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	COUNT(`userid`) AS `cnt`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
@@ -710,19 +720,19 @@ LIMIT 1",
 		), __FUNCTION__, __LINE__);
 
 	// Is the email there?
-	list($count) = SQL_FETCHROW($result);
+	list($count) = sqlFetchRow($result);
 
 	// Free the result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
 	return ($count == 1);
 }
 
 // Validate the given menu action
-function isMenuActionValid ($mode, $action, $what, $updateEntry = false) {
+function isMenuActionValid ($mode, $action, $what, $updateEntry = FALSE) {
 	// Is the cache entry there and we shall not update?
-	if ((isset($GLOBALS['action_valid'][$mode][$action][$what])) && ($updateEntry === false)) {
+	if ((isset($GLOBALS['action_valid'][$mode][$action][$what])) && ($updateEntry === FALSE)) {
 		// Count cache hit
 		incrementStatsEntry('cache_hits');
 
@@ -731,52 +741,52 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry = false) {
 	} // END - if
 
 	// By default nothing is valid
-	$ret = false;
+	$ret = FALSE;
 
 	// Look in all menus or only unlocked
 	$add = '';
 	if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',action=' . $action . ',what=' . $what);
-	if (($mode != 'admin') && ($updateEntry === true)) {
+	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",
+		$sql = sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
 			array(
 				$mode,
 				$action,
 				$what
-			), __FUNCTION__, __LINE__, false);
+			), __FUNCTION__, __LINE__, FALSE);
 	} elseif (($what != 'welcome') && (!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 = sqlQueryEscaped("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY `action` DESC LIMIT 1",
 			array(
 				$mode,
 				$action,
 				$what
-			), __FUNCTION__, __LINE__, 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 = sqlQueryEscaped("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
-			), __FUNCTION__, __LINE__, false);
+			), __FUNCTION__, __LINE__, FALSE);
 	}
 
 	// Run SQL command
-	$result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
+	$result = sqlQuery($sql, __FUNCTION__, __LINE__);
 
 	// Should we look for affected rows (only update) or found rows?
-	if ($updateEntry === true) {
+	if ($updateEntry === TRUE) {
 		// Check updated/affected rows
-		$ret = (!SQL_HASZEROAFFECTED());
+		$ret = (!ifSqlHasZeroAffectedRows());
 	} else {
 		// Check found rows
-		$ret = (!SQL_HASZERONUMS($result));
+		$ret = (!ifSqlHasZeroNums($result));
 	}
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Set cache entry
 	$GLOBALS['action_valid'][$mode][$action][$what] = $ret;
@@ -792,7 +802,7 @@ function getActionFromModuleWhat ($module, $what) {
 	$data['action'] = '';
 
 	if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
-		// sql_patches is missing so choose depending on mode
+		// ext-sql_patches is missing so choose depending on mode
 		$what = determineWhat($module);
 	} elseif ((empty($what)) && ($module != 'admin')) {
 		// Use configured 'home'
@@ -828,20 +838,22 @@ function getActionFromModuleWhat ($module, $what) {
 		} // END - if
 
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
 			array(
 				$module,
 				$what
 			), __FUNCTION__, __LINE__);
-		if (SQL_NUMROWS($result) == 1) {
+
+		// Entry found?
+		if (sqlNumRows($result) == 1) {
 			// Load action value and pray that this one is the right you want... ;-)
-			$data = SQL_FETCHARRAY($result);
+			$data = sqlFetchArray($result);
 		} // END - if
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} elseif ((!isExtensionInstalled('sql_patches')) && ($module != 'admin') && ($module != 'unknown')) {
-		// No sql_patches installed, but maybe we need to register an admin?
+		// No ext-sql_patches installed, but maybe we need to register an admin?
 		if (isAdminRegistered()) {
 			// Redirect to admin area
 			redirectToUrl('admin.php');
@@ -858,20 +870,20 @@ function getCategory ($cid) {
 	$data['cat'] = '{--_CATEGORY_404--}';
 
 	// Is the category id set?
-	if ($cid == '0') {
+	if (!isValidId($cid)) {
 		// No category
 		$data['cat'] = '{--_CATEGORY_NONE--}';
-	} elseif ($cid > 0) {
+	} elseif (isValidId($cid)) {
 		// Lookup the category in database
-		$result = SQL_QUERY_ESC('SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1',
+		$result = sqlQueryEscaped('SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1',
 			array(bigintval($cid)), __FUNCTION__, __LINE__);
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Category found... :-)
-			$data = SQL_FETCHARRAY($result);
+			$data = sqlFetchArray($result);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} // END - if
 
 	// Return result
@@ -879,9 +891,9 @@ function getCategory ($cid) {
 }
 
 // Get a string of "mail title" and price back
-function getPaymentTitlePrice ($paymentsId, $full = false) {
+function getPaymentTitlePrice ($paymentsId, $full = FALSE) {
 	// Only title or also including price?
-	if ($full === false) {
+	if ($full === FALSE) {
 		$ret = getPaymentData($paymentsId, 'main_title');
 	} else {
 		$ret = getPaymentData($paymentsId, 'main_title') . ' / {%pipe,getPaymentData,translateComma=' . $paymentsId . '%} {?POINTS?}';
@@ -891,8 +903,26 @@ function getPaymentTitlePrice ($paymentsId, $full = false) {
 	return $ret;
 }
 
+// Get payment price
+function getPaymentPrice ($paymentsId) {
+	// Return result
+	return getPaymentData($paymentsId, 'price');
+}
+
+// Get payment time
+function getPaymentTime ($paymentsId) {
+	// Return result
+	return getPaymentData($paymentsId, 'time');
+}
+
+// Get payment 'payment'
+function getPaymentPayment ($paymentsId) {
+	// Return result
+	return getPaymentData($paymentsId, 'payment');
+}
+
 // "Getter" for payment data (cached)
-function getPaymentData ($paymentsId, $lookFor = 'price') {
+function getPaymentData ($paymentsId, $lookFor) {
 	// Default value...
 	$data[$lookFor] = NULL;
 
@@ -905,20 +935,20 @@ function getPaymentData ($paymentsId, $lookFor = 'price') {
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Search for it in database
-		$result = SQL_QUERY_ESC('SELECT `%s` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1',
+		$result = sqlQueryEscaped('SELECT `%s` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1',
 			array(
 				$lookFor,
 				bigintval($paymentsId)
 			), __FUNCTION__, __LINE__);
 
 		// Is the entry there?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Payment type found... :-)
-			$data = SQL_FETCHARRAY($result);
+			$data = sqlFetchArray($result);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return value
@@ -926,29 +956,29 @@ function getPaymentData ($paymentsId, $lookFor = 'price') {
 }
 
 // Remove a receiver's id from $receivers and add a link for him to confirm
-function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isBonusMail = false) {
+function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isBonusMail = FALSE) {
 	// Default is not removed
 	$ret = 'failed';
 
 	// Is the userid valid?
-	if (isValidUserId($userid)) {
+	if (isValidId($userid)) {
 		// Remove entry from array
 		unset($receivers[$key]);
 
 		// Is there already a line for this user available?
-		if ($statsId > 0) {
+		if (isValidId($statsId)) {
 			// Default is 'normal' mail
 			$type = 'NORMAL';
 			$rowName = 'stats_id';
 
 			// Only when we got a real stats id continue searching for the entry
-			if ($isBonusMail === true) {
+			if ($isBonusMail === TRUE) {
 				$type = 'BONUS';
 				$rowName = 'bonus_id';
 			} // END - if
 
 			// Try to look the entry up
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `%s`=%s AND `userid`=%s AND `link_type`='%s' LIMIT 1",
+			$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `%s`=%s AND `userid`=%s AND `link_type`='%s' LIMIT 1",
 				array(
 					$rowName,
 					bigintval($statsId),
@@ -957,9 +987,9 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 				), __FUNCTION__, __LINE__);
 
 			// Was it *not* found?
-			if (SQL_HASZERONUMS($result)) {
+			if (ifSqlHasZeroNums($result)) {
 				// So we add one!
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_links` (`%s`, `userid`, `link_type`) VALUES (%s,%s,'%s')",
+				sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_user_links` (`%s`, `userid`, `link_type`) VALUES (%s,%s,'%s')",
 					array(
 						$rowName,
 						bigintval($statsId),
@@ -967,11 +997,10 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 						$type
 					), __FUNCTION__, __LINE__);
 
-				// Update 'mails_sent' if sql_patches is updated
+				// Update 'mails_sent' if ext-sql_patches is updated
 				if (isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
 					// Update the pool
-					SQL_QUERY_ESC('UPDATE `{?_MYSQL_PREFIX?}_pool` SET `mails_sent`=`mails_sent`+1 WHERE `id`=%s LIMIT 1',
-						array(bigintval($poolId)), __FUNCTION__, __LINE__);
+					updatePoolDataById($poolId, 'mails_sent', 1, '+');
 				} // END - if
 				$ret = 'done';
 			} else {
@@ -980,7 +1009,7 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 			}
 
 			// Free memory
-			SQL_FREERESULT($result);
+			sqlFreeResult($result);
 		} // END - if
 	} // END - if
 
@@ -989,63 +1018,105 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 }
 
 // Calculate sum (default) or count records of given criteria
-function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '', $mode = '=') {
-	// Init count/sum
-	$data['res'] = '0';
-
+function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = FALSE, $add = '', $mode = '=') {
+	// Debug message
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',tableName=' . $tableName . ',lookFor=' . $lookFor . ',whereStatement=' . $whereStatement . ',add=' . $add);
-	if ((empty($search)) && ($search != '0')) {
+	if ((empty($search)) && (!is_null($search))) {
 		// Count or sum whole table?
-		if ($countRows === true) {
+		if ($countRows === TRUE) {
 			// Count whole table
-			$result = SQL_QUERY_ESC('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
+			$result = sqlQueryEscaped('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName
 				), __FUNCTION__, __LINE__);
 		} else {
 			// Sum whole table
-			$result = SQL_QUERY_ESC('SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
+			$result = sqlQueryEscaped('SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName
 				), __FUNCTION__, __LINE__);
 		}
-	} elseif (($countRows === true) || ($lookFor == 'userid')) {
+	} elseif (($countRows === TRUE) || ($lookFor == 'userid')) {
 		// Count rows
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
-		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
-			array(
-				$lookFor,
-				$tableName,
-				$whereStatement,
-				$mode,
-				$search
-			), __FUNCTION__, __LINE__);
+		if (is_null($search)) {
+			// Fix mode
+			if ($mode == '=') {
+				$mode = 'IS';
+			} elseif ($mode == '!=') {
+				$mode = 'IS NOT';
+			}
+
+			// Look for NULL/0
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT-NULL!');
+			$result = sqlQueryEscaped("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
+				array(
+					$lookFor,
+					$tableName,
+					$whereStatement,
+					$mode,
+					$whereStatement
+				), __FUNCTION__, __LINE__);
+		} else {
+			// Regular entry
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
+			$result = sqlQueryEscaped("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
+				array(
+					$lookFor,
+					$tableName,
+					$whereStatement,
+					$mode,
+					$search
+				), __FUNCTION__, __LINE__);
+		}
 	} else {
-		// Add all rows
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
-		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
-			array(
-				$lookFor,
-				$tableName,
-				$whereStatement,
-				$mode,
-				$search
-			), __FUNCTION__, __LINE__);
+		// Sum all rows
+		if (is_null($search)) {
+			// Fix mode
+			if ($mode == '=') {
+				$mode = 'IS';
+			} elseif ($mode == '!=') {
+				$mode = 'IS NOT';
+			}
+
+			// Look for NULL/0
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM-NULL!');
+			$result = sqlQueryEscaped("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
+				array(
+					$lookFor,
+					$tableName,
+					$whereStatement,
+					$mode,
+					$whereStatement
+				), __FUNCTION__, __LINE__);
+		} else {
+			// Regular entry
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
+			$result = sqlQueryEscaped("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
+				array(
+					$lookFor,
+					$tableName,
+					$whereStatement,
+					$mode,
+					$search
+				), __FUNCTION__, __LINE__);
+		}
 	}
 
 	// Load row
-	$data = SQL_FETCHARRAY($result);
+	$data = sqlFetchArray($result);
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Fix empty values
 	if ((empty($data['res'])) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid') && ($lookFor != 'rallye_id')) {
 		// Float number
 		$data['res'] = '0.00000';
-	} elseif (''.$data['res'].'' == '') {
+	} elseif ('' . $data['res'] . '' == '') {
 		// Fix empty result
 		$data['res'] = '0';
 	}
@@ -1059,27 +1130,27 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
  * Sends out mail to all administrators. This function is no longer obsolete
  * because we need it when there is no ext-admins installed
  */
-function sendAdminEmails ($subject, $message, $isBugReport = false) {
+function sendAdminEmails ($subject, $message, $isBugReport = FALSE) {
 	// Default is no special header
 	$mailHeader = '';
 
 	// Is it a bug report?
-	if ($isBugReport === true) {
+	if ($isBugReport === TRUE) {
 		// Then add a reply-to line back to the author (me)
-		$mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+		$mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL;
 	} // END - if
 
 	// Load all admin email addresses
-	$result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', __FUNCTION__, __LINE__);
+	$result = sqlQuery('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', __FUNCTION__, __LINE__);
 
 	// And send the notification to all of them
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		// Send the email out
 		sendEmail($content['email'], $subject, $message, 'N', $mailHeader);
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Really simple... ;-)
 }
@@ -1098,17 +1169,17 @@ function getAdminId ($adminLogin) {
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
 			array($adminLogin), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Get it
-			$data = SQL_FETCHARRAY($result);
+			$data = sqlFetchArray($result);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return the id
@@ -1141,9 +1212,11 @@ function setCurrentAdminId ($currentAdminId) {
 
 // Get password hash from administrator's login name
 function getAdminHash ($adminId) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . ' - ENTERED!');
 	// By default an invalid hash is returned
 	$data['password'] = -1;
 
+	// Is admin hash set?
 	if (isAdminHashSet($adminId)) {
 		// Check cache
 		$data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminId];
@@ -1152,23 +1225,24 @@ function getAdminHash ($adminId) {
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array(bigintval($adminId)), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Fetch data
-			$data = SQL_FETCHARRAY($result);
+			$data = sqlFetchArray($result);
 
 			// Set cache
 			setAdminHash($adminId, $data['password']);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return password hash
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . ',data[password]=' . $data['password'] . ' - EXIT!');
 	return $data['password'];
 }
 
@@ -1185,20 +1259,20 @@ function getAdminLogin ($adminId) {
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT `login` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `login` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array(bigintval($adminId)), __FUNCTION__, __LINE__);
 
 		// Entry found?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Fetch data
-			$data = SQL_FETCHARRAY($result);
+			$data = sqlFetchArray($result);
 
 			// Set cache
 			$GLOBALS['cache_array']['admin']['login'][$adminId] = $data['login'];
 		} // END - if
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return the result
@@ -1218,20 +1292,20 @@ function getAdminEmail ($adminId) {
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Load from database
-		$result_admin_id = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result_admin_id = sqlQueryEscaped("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array(bigintval($adminId)), __FUNCTION__, __LINE__);
 
 		// Entry found?
-		if (SQL_NUMROWS($result_admin_id) == 1) {
+		if (sqlNumRows($result_admin_id) == 1) {
 			// Get data
-			$data = SQL_FETCHARRAY($result_admin_id);
+			$data = sqlFetchArray($result_admin_id);
 
 			// Set cache
 			$GLOBALS['cache_array']['admin']['email'][$adminId] = $data['email'];
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result_admin_id);
+		sqlFreeResult($result_admin_id);
 	}
 
 	// Return email
@@ -1243,10 +1317,10 @@ function getAdminDefaultAcl ($adminId) {
 	// By default an invalid ACL value is returned
 	$data['default_acl'] = 'NO-ACL';
 
-	// Is sql_patches there and was it found in cache?
+	// Is ext-sql_patches there and was it found in cache?
 	if (!isExtensionActive('sql_patches')) {
 		// Not found, which is bad, so we need to allow all
-		$data['default_acl'] =  'allow';
+		$data['default_acl'] = 'allow';
 	} elseif (isset($GLOBALS['cache_array']['admin']['default_acl'][$adminId])) {
 		// Use cache
 		$data['default_acl'] = $GLOBALS['cache_array']['admin']['default_acl'][$adminId];
@@ -1255,20 +1329,20 @@ function getAdminDefaultAcl ($adminId) {
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Load from database
-		$result_admin_id = SQL_QUERY_ESC("SELECT `default_acl` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result_admin_id = sqlQueryEscaped("SELECT `default_acl` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array(bigintval($adminId)), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
-		if (SQL_NUMROWS($result_admin_id) == 1) {
+		if (sqlNumRows($result_admin_id) == 1) {
 			// Fetch data
-			$data = SQL_FETCHARRAY($result_admin_id);
+			$data = sqlFetchArray($result_admin_id);
 
 			// Set cache
 			$GLOBALS['cache_array']['admin']['default_acl'][$adminId] = $data['default_acl'];
 		}
 
 		// Free result
-		SQL_FREERESULT($result_admin_id);
+		sqlFreeResult($result_admin_id);
 	}
 
 	// Return default ACL
@@ -1280,10 +1354,10 @@ function getAdminMenuMode ($adminId) {
 	// By default an invalid mode
 	$data['la_mode'] = 'INVALID';
 
-	// Is sql_patches there and was it found in cache?
+	// Is ext-sql_patches there and was it found in cache?
 	if (!isExtensionActive('sql_patches')) {
 		// Not found, which is bad, so we need to allow all
-		$data['la_mode'] =  'global';
+		$data['la_mode'] = 'global';
 	} elseif (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) {
 		// Use cache
 		$data['la_mode'] = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
@@ -1292,20 +1366,20 @@ function getAdminMenuMode ($adminId) {
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Load from database
-		$result_admin_id = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result_admin_id = sqlQueryEscaped("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array(bigintval($adminId)), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
-		if (SQL_NUMROWS($result_admin_id) == 1) {
+		if (sqlNumRows($result_admin_id) == 1) {
 			// Fetch data
-			$data = SQL_FETCHARRAY($result_admin_id);
+			$data = sqlFetchArray($result_admin_id);
 
 			// Set cache
 			$GLOBALS['cache_array']['admin']['la_mode'][$adminId] = $data['la_mode'];
 		}
 
 		// Free result
-		SQL_FREERESULT($result_admin_id);
+		sqlFreeResult($result_admin_id);
 	}
 
 	// Return default ACL
@@ -1354,7 +1428,7 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe
 		} // END - if
 
 		// Run SQL query
-		$result = SQL_QUERY_ESC("SELECT `%s` AS `key`, `%s` AS `value`" . $extraColumn . " FROM `{?_MYSQL_PREFIX?}_%s` " . $whereStatement . " ORDER BY `%s` ASC",
+		$result = sqlQueryEscaped("SELECT `%s` AS `key`, `%s` AS `value`" . $extraColumn . " FROM `{?_MYSQL_PREFIX?}_%s` " . $whereStatement . " ORDER BY `%s` ASC",
 			array(
 				$key,
 				$value,
@@ -1363,9 +1437,9 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe
 			), __FUNCTION__, __LINE__);
 
 		// Is there rows?
-		if (!SQL_HASZERONUMS($result)) {
+		if (!ifSqlHasZeroNums($result)) {
 			// Found data so add them as OPTION lines
-			while ($content = SQL_FETCHARRAY($result)) {
+			while ($content = sqlFetchArray($result)) {
 				// Is extra set?
 				if (!isset($content['extra'])) {
 					// Set it to empty
@@ -1402,7 +1476,7 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe
 		}
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return - hopefully - the requested data
@@ -1415,27 +1489,27 @@ function deleteUserAccount ($userid, $reason) {
 	$data['points'] = '0';
 
 	// Search for the points and user data
-	$result = SQL_QUERY_ESC("SELECT
-	(SUM(p.`points`) - d.`used_points`) AS `points`
+	$result = sqlQueryEscaped("SELECT
+	(SUM(`p`.`points`) - `d`.`used_points`) AS `points`
 FROM
-	`{?_MYSQL_PREFIX?}_user_points` AS p
+	`{?_MYSQL_PREFIX?}_user_points` AS `p`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_user_data` AS d
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-	p.`userid`=d.`userid`
+	`p`.`userid`=`d`.`userid`
 WHERE
-	p.`userid`=%s
+	`p`.`userid`=%s
 LIMIT 1",
 		array(bigintval($userid)), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Save his points to add them to the jackpot
-		$data = SQL_FETCHARRAY($result);
+		$data = sqlFetchArray($result);
 
 		// Delete points entries as well
 		// @TODO Rewrite these lines to a filter
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s",
+		sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s",
 			array(bigintval($userid)), __FUNCTION__, __LINE__);
 
 		// Update mediadata as well
@@ -1451,16 +1525,16 @@ LIMIT 1",
 	} // END - if
 
 	// Free the result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Delete category selections as well...
-	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s",
+	sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s",
 		array(bigintval($userid)), __FUNCTION__, __LINE__);
 
 	// Remove from rallye if found
 	// @TODO Rewrite this to a filter
 	if (isExtensionActive('rallye')) {
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `userid`=%s",
+		sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `userid`=%s",
 			array(bigintval($userid)), __FUNCTION__, __LINE__);
 	} // END - if
 
@@ -1472,7 +1546,7 @@ LIMIT 1",
 	sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message);
 
 	// Ok, delete the account!
-	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
+	sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
 }
 
 // Gets the matching what name from module
@@ -1523,7 +1597,7 @@ function generateCategoryOptionsList ($mode, $userid = NULL) {
 	);
 
 	// Get categories
-	$result = SQL_QUERY('SELECT
+	$result = sqlQuery('SELECT
 	`id`,
 	`cat`
 FROM
@@ -1534,15 +1608,15 @@ ORDER BY
 		__FUNCTION__, __LINE__);
 
 	// Are there entries?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNums($result)) {
 		// ... and begin loading stuff
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			// Transfer some data
 			$categories['id'][]   = $content['id'];
 			array_push($categories['name'], $content['cat']);
 
 			// Check which users are in this category
-			$result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != %s ORDER BY `userid` ASC",
+			$result_userids = sqlQueryEscaped("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != %s ORDER BY `userid` ASC",
 				array(
 					bigintval($content['id']),
 					convertNullToZero($userid)
@@ -1552,20 +1626,20 @@ ORDER BY
 			$userid_cnt = '0';
 
 			// Start adding all
-			while ($data = SQL_FETCHARRAY($result_userids)) {
+			while ($data = sqlFetchArray($result_userids)) {
 				// Add user count
-				$userid_cnt += countSumTotalData($data['userid'], 'user_data', 'userid', 'userid', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED' AND `receive_mails` > 0"));
+				$userid_cnt += countSumTotalData($data['userid'], 'user_data', 'userid', 'userid', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED' AND `receive_mails` > 0"));
 			} // END - while
 
 			// Free memory
-			SQL_FREERESULT($result_userids);
+			sqlFreeResult($result_userids);
 
 			// Add counter
 			array_push($categories['userids'], $userid_cnt);
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Generate options
 		$OUT = '';
@@ -1586,10 +1660,10 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 	// Is admin or bonus extension there?
 	if (!isAdmin()) {
 		// Abort here
-		return false;
+		return FALSE;
 	} elseif (!isExtensionActive('bonus')) {
 		// Abort here
-		return false;
+		return FALSE;
 	}
 
 	// Calculcate target sent
@@ -1604,7 +1678,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 	// HTML extension active?
 	if (isExtensionActive('html_mail')) {
 		// Add HTML mail
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (
+		sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (
 	`subject`,
 	`text`,
 	`receivers`,
@@ -1619,7 +1693,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 	`html_msg`
 ) VALUES (
 	'%s',
-	%s',
+	'%s',
 	'%s',
 	%s,
 	%s,
@@ -1645,7 +1719,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 		), __FUNCTION__, __LINE__);
 	} else {
 		// Add regular mail
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (
+		sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (
 	`subject`,
 	`text`,
 	`receivers`,
@@ -1689,7 +1763,7 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
 	// Init variables
 	$extraColumns = '';
 	$receiverList = '';
-	$result       = false;
+	$result       = FALSE;
 
 	// Secure data
 	$categoryId = bigintval($categoryId);
@@ -1705,33 +1779,38 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
 	$addWhere = runFilterChain('user_exclusion_sql', ' ');
 
 	// Category given?
-	if ($categoryId > 0) {
+	if (isValidId($categoryId)) {
 		// Select category
-		$extraColumns  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`";
-		$addWhere = sprintf(" AND c.`cat_id`=%s", $categoryId);
+		$extraColumns  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS `c` ON `d`.`userid`=`c`.`userid`";
+		$addWhere = sprintf(" AND `c`.`cat_id`=%s", $categoryId);
 	} // END - if
 
 	// Exclude users in holiday?
 	if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 		// Add something for the holiday extension
-		$addWhere .= " AND d.`holiday_active`='N'";
-	} // END - if
-
-	// Include only HTML recipients?
-	if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
-		$addWhere .= " AND d.`html`='Y'";
+		$addWhere .= " AND `d`.`holiday_active`='N'";
 	} // END - if
 
 	// Run query
-	$result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$extraColumns." WHERE d.`status`='CONFIRMED' ".$addWhere." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
+	$result = sqlQueryEscaped("SELECT
+	`d`.`userid`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
+	" . $extraColumns . "
+WHERE
+	`d`.`status`='CONFIRMED'
+	" . $addWhere . "
+ORDER BY
+	`d`.`{?order_select?}` {?order_mode?}
+LIMIT %s",
 		array(
 			$receiver
 		), __FUNCTION__, __LINE__);
 
 	// Entries found?
-	if ((SQL_NUMROWS($result) >= $receiver) && ($receiver > 0)) {
+	if ((sqlNumRows($result) >= $receiver) && ($receiver > 0)) {
 		// Load all entries
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			// Add receiver when not empty
 			if (!empty($content['userid'])) {
 				$receiverList .= $content['userid'] . ';';
@@ -1739,7 +1818,7 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Remove trailing semicolon
 		$receiverList = substr($receiverList, 0, -1);
@@ -1752,25 +1831,30 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
 // Recuce the amount of received emails for the receipients for given email
 function reduceRecipientReceivedMails ($column, $id, $count) {
 	// Search for mail in database
-	$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
-		array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
+	$result = sqlQueryEscaped("SELECT * FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
+		array(
+			$column,
+			bigintval($id),
+			$count
+		), __FUNCTION__, __LINE__
+	);
 
 	// Are there entries?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNums($result)) {
 		// Now load all userids for one big query!
 		$userids = array();
-		while ($data = SQL_FETCHARRAY($result)) {
-			// By default we want to reduce and have no mails found
+		while ($data = sqlFetchArray($result)) {
+			// By default reduce and found no emails
 			$num = 0;
 
 			// We must now look if he has already confirmed this mail, so might sound double, but it may resolve problems
 			// @TODO Rewrite this to a filter
-			if ((isset($data['stats_id'])) && ($data['stats_id'] > 0)) {
+			if ((isset($data['stats_id'])) && (isValidId($data['stats_id']))) {
 				// User email
-				$num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', true, sprintf(" AND `stats_type`='mailid' AND `stats_data`=%s", bigintval($data['stats_id'])));
-			} elseif ((isset($data['bonus_id'])) && ($data['bonus_id'] > 0)) {
+				$num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', TRUE, sprintf(" AND `stats_type`='mailid' AND `stats_data`=%s", bigintval($data['stats_id'])));
+			} elseif ((isset($data['bonus_id'])) && (isValidId($data['bonus_id']))) {
 				// Bonus mail
-				$num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', true, sprintf(" AND `stats_type`='bonusid' AND `stats_data`=%s", bigintval($data['bonus_id'])));
+				$num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', TRUE, sprintf(" AND `stats_type`='bonusid' AND `stats_data`=%s", bigintval($data['bonus_id'])));
 			}
 
 			// Reduce this users total received emails?
@@ -1779,10 +1863,13 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 			} // END - if
 		} // END - while
 
-		if (count($userids) > 0) {
+		if (isFilledArray($userids)) {
 			// Now update all user accounts
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
-				array(implode(',', $userids), count($userids)), __FUNCTION__, __LINE__);
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
+				array(
+					implode(',', $userids),
+					count($userids)
+				), __FUNCTION__, __LINE__);
 		} else {
 			// Nothing deleted
 			displayMessage('{%message,ADMIN_MAIL_NOTHING_DELETED=' . $id . '%}');
@@ -1790,71 +1877,66 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 }
 
 // Creates a new task
-function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = NULL, $strip = true) {
+function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = NULL, $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())",
+	sqlQueryEscaped("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(
 			convertZeroToNull($adminId),
 			convertZeroToNull($userid),
 			$taskType,
 			$subject,
 			$notes
-		), __FUNCTION__, __LINE__, true, $strip);
+		), __FUNCTION__, __LINE__, TRUE, $strip);
 
 	// Return insert id which is the task id
-	return SQL_INSERTID();
+	return getSqlInsertId();
 }
 
 // Updates last module / online time
-function updateLastActivity($userid) {
+function updateLastActivity ($userid) {
 	// Is 'what' set?
 	if (isWhatSet()) {
 		// Run the update query
-		SQL_QUERY_ESC("UPDATE
+		sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`%s`='%s',
+	`{%%pipe,getUserLastWhatName%%}`='{%%pipe,getWhat%%}',
 	`last_online`=UNIX_TIMESTAMP(),
-	`REMOTE_ADDR`='%s'
+	`REMOTE_ADDR`='{%%pipe,detectRemoteAddr%%}'
 WHERE
 	`userid`=%s
 LIMIT 1",
 		array(
-			getUserLastWhatName(),
-			getWhat(),
-			detectRemoteAddr(),
 			bigintval($userid)
 		), __FUNCTION__, __LINE__);
 	} else {
 		// No what set, needs to be ignored (last_module is last_what)
-		SQL_QUERY_ESC("UPDATE
+		sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`%s`=NULL,
+	`{%%pipe,getUserLastWhatName%%}`=NULL,
 	`last_online`=UNIX_TIMESTAMP(),
-	`REMOTE_ADDR`='%s'
+	`REMOTE_ADDR`='{%%pipe,detectRemoteAddr%%}'
 WHERE
 	`userid`=%s
 LIMIT 1",
 		array(
-			getUserLastWhatName(),
-			detectRemoteAddr(),
 			bigintval($userid)
 		), __FUNCTION__, __LINE__);
 	}
 }
 
-// List all given rows (callback function from XML)
-function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array()) {
+// List all given joined rows (callback function from XML)
+function doGenericJoinedListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $tableJoinType, $tableJoinName, $joinOnLeftTable, $joinOnCondition, $joinOnRightTable, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = array()) {
 	// Verify that tableName and columns are not empty
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
 		reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
-	} elseif (count($columns) == 0) {
+	} elseif (!isFilledArray($columns)) {
 		// No columns specified
 		reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
 	}
@@ -1865,95 +1947,66 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId,
 	// Get the sql part back from given array
 	$sql .= getSqlPartFromXmlArray($columns);
 
-	// Remove last commata and add FROM statement
-	$sql .= ' FROM `{?_MYSQL_PREFIX?}_' . $tableName[0] . '`';
+	// Add "FROM"
+	$sql .= getSqlXmlFromTable($tableName);
 
-	// Are there entries from whereColumns to add?
-	if (count($whereColumns) > 0) {
-		// Then add these as well
-		if (count($whereColumns) == 1) {
-			// One entry found
-			$sql .= ' WHERE ';
+	// Add "JOIN"
+	$sql .= getSqlXmlJoinedTable($tableJoinType, $tableJoinName, $joinOnLeftTable, $joinOnCondition, $joinOnRightTable);
 
-			// Table/alias included?
-			if (!empty($whereColumns[0]['table'])) {
-				// Add it as well
-				$sql .= $whereColumns[0]['table'] . '.';
-			} // END - if
+	// Add "WHERE"
+	$sql .= getSqlXmlWhereConditions($whereColumns, $conditions);
 
-			// Add the rest
-			$sql .= '`' . $whereColumns[0]['column'] . '`' . $whereColumns[0]['condition'] . chr(39) . $whereColumns[0]['look_for'] . chr(39);
-		} elseif ((count($whereColumns > 1)) && (count($conditions) > 0)) {
-			// More than one "WHERE" + condition found
-			foreach ($whereColumns as $idx => $columnArray) {
-				// Default is WHERE
-				$condition = ' WHERE ';
-
-				// Is the condition element there?
-				if (isset($conditions[$columnArray['column']])) {
-					// Assume the condition
-					$condition = ' ' . $conditions[$columnArray['column']] . ' ';
-				} // END - if
+	// Add "ORDER BY"
+	$sql .= getSqlXmlOrderBy($orderByColumns);
 
-				// Add to SQL query
-				$sql .= $condition;
+	// Now handle all over to the inner function which will execute the listing
+	doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content);
+}
 
-				// Table/alias included?
-				if (!empty($whereColumns[$idx]['table'])) {
-					// Add it as well
-					$sql .= $whereColumns[$idx]['table'] . '.';
-				} // END - if
+// List all given rows (callback function from XML)
+function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = array()) {
+	// Verify that tableName and columns are not empty
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// No tableName specified
+		reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
+	} elseif (!isFilledArray($columns)) {
+		// No columns specified
+		reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
+	}
 
-				// Add the rest
-				$sql .= '`' . $whereColumns[$idx]['column'] . '`' . $whereColumns[$idx]['condition'] . chr(39) . convertDollarDataToGetElement($whereColumns[$idx]['look_for']) . chr(39);
-			} // END - foreach
-		} else {
-			// Did not set $conditions
-			reportBug(__FUNCTION__, __LINE__, 'Supplied more than &quot;whereColumns&quot; entries but no conditions! Please fix your XML template.');
-		}
-	} // END - if
+	// This is the minimum query, so at least columns and tableName must have entries
+	$sql = 'SELECT ';
 
-	// Are there entries from orderByColumns to add?
-	if (count($orderByColumns) > 0) {
-		// Add them as well
-		$sql .= ' ORDER BY ';
-		foreach ($orderByColumns as $orderByColumn => $array) {
-			// Get keys (table/alias) and values (sorting itself)
-			$table   = trim(implode('', array_keys($array)));
-			$sorting = trim(implode('', array_keys($array)));
-
-			// table/alias can be omitted
-			if (!empty($table)) {
-				// table/alias is given
-				$sql .= $table . '.';
-			} // END - if
+	// Get the sql part back from given array
+	$sql .= getSqlPartFromXmlArray($columns);
 
-			// Add order-by column
-			$sql .= '`' . $orderByColumn . '` ' . $sorting . ',';
-		} // END - foreach
+	// Add "FROM"
+	$sql .= getSqlXmlFromTable($tableName);
 
-		// Remove last column
-		$sql = substr($sql, 0, -1);
-	} // END - if
+	// Add "WHERE"
+	$sql .= getSqlXmlWhereConditions($whereColumns, $conditions);
+
+	// Add "ORDER BY"
+	$sql .= getSqlXmlOrderBy($orderByColumns);
 
 	// Now handle all over to the inner function which will execute the listing
-	doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters);
+	doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content);
 }
 
 // Do the listing of entries
-function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) {
+function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array(), $content = array()) {
 	// Run the SQL query
-	$result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
+	$result = sqlQuery($sql, __FUNCTION__, __LINE__);
 
 	// Are there some URLs left?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNums($result)) {
 		// List all URLs
 		$OUT = '';
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($row = sqlFetchArray($result)) {
 			// "Translate" content
 			foreach ($callbackColumns as $columnName => $callbackName) {
 				// Fill the callback arguments
-				$args = array($content[$columnName]);
+				$args = array($row[$columnName]);
 
 				// Is there more to add?
 				if (isset($extraParameters[$columnName])) {
@@ -1962,34 +2015,43 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
 				} // END - if
 
 				// Call the callback-function
-				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, true).'</pre>');
+				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, TRUE).'</pre>');
 				// @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-				$content[$columnName] = call_user_func_array($callbackName, $args);
+				$row[$columnName] = call_user_func_array($callbackName, $args);
 			} // END - foreach
 
 			// Load row template
-			$OUT .= loadTemplate(trim($rowTemplate[0]), true, $content);
+			$OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $row);
 		} // END - while
 
+		// Is at least one entry set in content?
+		if (isFilledArray($content)) {
+			// Then add generic 'rows' element
+			$content['rows'] = $OUT;
+		} else {
+			// Direct output is content
+			$content = $OUT;
+		}
+
 		// Load main template
-		loadTemplate(trim($tableTemplate[0]), false, $OUT);
+		loadTemplate(trim($tableTemplate[0]), FALSE, $content);
 	} else {
 		// No URLs in surfbar
 		displayMessage('{--' .$noEntryMessageId[0] . '--}');
 	}
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 }
 
 // Adds a given entry to the database
 function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
-	//* DEBUG: */ die('columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,POST=<pre>'.print_r($_POST,true).'</pre>');
+	//* DEBUG: */ die(__FUNCTION__.':columns=<pre>'.print_r($columns,TRUE).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,TRUE).'</pre>,extraValues=<pre>'.print_r($extraValues,TRUE).'</pre>,timeColumns=<pre>'.print_r($timeColumns,TRUE).'</pre>,columnIndex=<pre>'.print_r($columnIndex,TRUE).'</pre>,POST=<pre>'.print_r($_POST,TRUE).'</pre>');
 	// Verify that tableName and columns are not empty
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
 		reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
-	} elseif (count($columns) == 0) {
+	} elseif (!isFilledArray($columns)) {
 		// No columns specified
 		reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.');
 	}
@@ -1999,10 +2061,10 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 	$sqlValues  = array();
 
 	// Default is that all went fine
-	$GLOBALS['__XML_PARSE_RESULT'] = true;
+	$GLOBALS['__XML_PARSE_RESULT'] = TRUE;
 
 	// Is there "time columns"?
-	if (count($timeColumns) > 0) {
+	if (isFilledArray($timeColumns)) {
 		// Then "walk" through all entries
 		foreach ($timeColumns as $column) {
 			// Convert all (possible) selections
@@ -2016,7 +2078,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 		// Is columnIndex set?
 		if (!is_null($columnIndex)) {
 			// Check conditions
-			//* DEBUG: */ die('columnIndex=<pre>'.print_r($columnIndex,true).'</pre>'.debug_get_printable_backtrace());
+			//* DEBUG: */ die('columnName=<pre>'.print_r($columnName,TRUE).'</pre>columnIndex=<pre>'.print_r($columnIndex,TRUE).'</pre>'.debug_get_printable_backtrace());
 			assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex])));
 
 			// Then use that index "blindly"
@@ -2024,62 +2086,72 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 		} // END - if
 
 		// Debug message
-		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])) . '<br />');
+		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])));
+
+		// Get value back (no array supported)
+		$value = postRequestElement($columnName);
+
+		// Is this an array and element 0 is set?
+		if ((is_array($value)) && (isset($value[0]))) {
+			// Then only take this
+			$value = $value[0];
+		} // END - if
 
 		// Copy entry securely to the final arrays
-		$sqlColumns[$key] = SQL_ESCAPE($columnName);
-		$sqlValues[$key]  = SQL_ESCAPE(postRequestElement($columnName));
-
-		// Send data through the filter function if found
-		if ((isset($filterFunctions[$key])) && (isset($extraValues[$key . '_list']))) {
-			// Filter function set!
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
-			$sqlValues[$key] = call_user_func_array($filterFunctions[$key], merge_array(array($columnName), $extraValues[$key . '_list']));
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
-		} elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key]))) {
-			// Run through an extra filter
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
-			$sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], '');
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
+		$sqlColumns[$key] = sqlEscapeString($columnName);
+		$sqlValues[$key]  = sqlEscapeString($value);
+
+		// Search for it
+		$search = key(search_array($columns, 'column', $columnName));
+
+		// Try to handle call-back functions and/or extra values on the list
+		//* DEBUG: */ outputHtml($key . '/' . $columnName . '=<pre>'.print_r($columns,true).'</pre>search_array()=<pre>'.print_r(search_array($columns, 'column', $columnName), TRUE).'</pre>');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
+		if (is_string($key)) {
+			// Key is a string
+			$sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key . '_list', $sqlValues[$key], array(''), $search);
+		} else {
+			// Is a number
+			$sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key, $sqlValues[$key], array(''), $search);
 		}
 
 		// Is the value not a number?
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key]);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
 		if (($sqlValues[$key] != 'NULL') && (is_string($sqlValues[$key]))) {
 			// Add quotes around it
 			$sqlValues[$key] = chr(39) . $sqlValues[$key] . chr(39);
 		} // END - if
 
 		// Is the value false?
-		if ($sqlValues[$key] === false) {
+		if ($sqlValues[$key] === FALSE) {
 			// One "parser" didn't like it
-			$GLOBALS['__XML_PARSE_RESULT'] = false;
+			$GLOBALS['__XML_PARSE_RESULT'] = FALSE;
 			break;
 		} // END - if
 	} // END - foreach
 
 	// If all values are okay, continue
-	if ($sqlValues[$key] !== false) {
+	if ($sqlValues[$key] !== FALSE) {
 		// Build the SQL query
 		$sql = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES (" . implode(',', $sqlValues) . ')';
 
 		// Run the SQL query
-		SQL_QUERY($sql, __FUNCTION__, __LINE__);
+		sqlQuery($sql, __FUNCTION__, __LINE__);
 
-		// Add id
-		setPostRequestElement('id', SQL_INSERTID());
+		// Add id number
+		setPostRequestElement('id', getSqlInsertId());
 
 		// Prepare filter data array
 		$filterData = array(
 			'mode'          => 'add',
 			'table_name'    => $tableName,
 			'content'       => postRequestArray(),
-			'id'            => SQL_INSERTID(),
+			'id'            => getSqlInsertId(),
 			'subject'       => '',
 			// @TODO Used generic 'userid' here
 			'userid_column' => array('userid'),
 			'raw_userid'    => array('userid'),
-			'affected'      => SQL_AFFECTEDROWS(),
+			'affected'      => sqlAffectedRows(),
 			'sql'           => $sql,
 		);
 
@@ -2089,80 +2161,98 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 }
 
 // Edit rows by given id numbers
-function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $subject = '') {
+	// Is there "time columns"?
+	if (isFilledArray($timeColumns)) {
+		// Then "walk" through all entries
+		foreach ($timeColumns as $column) {
+			// Convert all (possible) selections
+			convertSelectionsToEpocheTimeInPostData($column . '_ye');
+		} // END - foreach
+	} // END - if
+
 	// Change them all
 	$affected = '0';
 	foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+		// Secure id number
+		$id = bigintval($id);
+
 		// Prepare content array (new values)
 		$content = array();
 
 		// Prepare SQL for this row
 		$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
-			SQL_ESCAPE($tableName[0])
+			sqlEscapeString($tableName[0])
 		);
 
 		// "Walk" through all entries
 		foreach (postRequestArray() as $key => $entries) {
 			// Skip raw userid which is always invalid
-			if ($key == $rawUserId[0]) {
+			if (($key == $rawUserId[0]) || ($key == ($rawUserId[0] . '_raw')) || ($key == 'do_edit')) {
 				// Continue with next field
 				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',rawUserId=' . $rawUserId[0]);
 				continue;
 			} // END - if
 
 			// Debug message
-			//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,true).'</pre>');
+			//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,TRUE).'</pre>');
 
 			// Is entries an array?
 			if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
+				// Search for the right array index
+				$search = key(search_array($columns, 'column', $key));
+
 				// Add this entry to content
 				$content[$key] = $entries[$id];
 
-				// Send data through the filter function if found
-				if ($key == $userIdColumn[0]) {
-					// Is the userid, we have to process it with convertZeroToNull()
-					$entries[$id] = convertZeroToNull($entries[$id]);
-				} elseif ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
-					// Filter function set!
-					$entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
-				}
+				// Debug message
+				//* BUG: */ die($key.'/'.$id.'/'.$search.'=<pre>'.print_r($columns,TRUE).'</pre><pre>'.print_r($filterFunctions,TRUE).'</pre>');
 
-				// Is the value NULL?
-				if ($entries[$id] == 'NULL') {
-					// Add it directly
-					$sql .= sprintf(' `%s`=NULL,',
-						SQL_ESCAPE($key)
-					);
-				} else {
-					// Else add the value covered
-					$sql .= sprintf(" `%s`='%s',",
-						SQL_ESCAPE($key),
-						SQL_ESCAPE($entries[$id])
-					);
-				}
+				// Handle possible call-back functions and/or extra values
+				$entries[$id] = doHandleExtraValues($filterFunctions, $extraValues, $key, $entries[$id], $userIdColumn, $search);
+
+				// Add key/value pair to SQL string
+				$sql .= addKeyValueSql($key, $entries[$id]);
 			} elseif (($key != $idColumn[0]) && (!is_array($entries))) {
-				// Add normal entries as well!
-				$content[$key] =  $entries;
+				// Search for it
+				$search = key(search_array($columns, 'column', $key));
+				//* BUG: */ die($key.'/<pre>'.print_r($search, TRUE).'</pre>=<pre>'.print_r($columns, TRUE).'</pre>');
+
+				// Debug message
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!');
+
+				// Add normal entries as well
+				$content[$key] = $entries;
+
+				// Handle possible call-back functions and/or extra values
+				$entries = doHandleExtraValues($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search);
+
+				// Debug message
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!');
+
+				// Add key/value pair to SQL string
+				$sql .= addKeyValueSql($key, $entries);
 			}
 		} // END - foreach
 
 		// Finish SQL command
-		$sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id);
-		if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
+		$sql = substr($sql, 0, -1) . " WHERE `" . sqlEscapeString($idColumn[0]) . "`=" . $id;
+		if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) {
 			// Add user id as well
 			$sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));
 		} // END - if
 		$sql .= " LIMIT 1";
 
 		// Run this query
-		SQL_QUERY($sql, __FUNCTION__, __LINE__);
+		//* BUG: */ die($sql.'<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
+		sqlQuery($sql, __FUNCTION__, __LINE__);
 
 		// Add affected rows
-		$edited = SQL_AFFECTEDROWS();
+		$edited = sqlAffectedRows();
 		$affected += $edited;
 
 		// Load all data from that id
-		$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+		$result = sqlQueryEscaped("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
 			array(
 				$tableName[0],
 				$idColumn[0],
@@ -2170,7 +2260,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 			), __FUNCTION__, __LINE__);
 
 		// Fetch the data and merge it into $content
-		$content = merge_array($content, SQL_FETCHARRAY($result));
+		$content = merge_array($content, sqlFetchArray($result));
 
 		// Prepare filter data array
 		$filterData = array(
@@ -2178,7 +2268,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 			'table_name'    => $tableName,
 			'content'       => $content,
 			'id'            => $id,
-			'subject'       => '',
+			'subject'       => $subject,
 			'userid_column' => $userIdColumn,
 			'raw_userid'    => $rawUserId,
 			'affected'      => $edited,
@@ -2189,11 +2279,11 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 		runFilterChain('send_build_mail', $filterData);
 
 		// Free the result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} // END - foreach
 
 	// Delete cache?
-	if ((count($cacheFiles) > 0) && (!empty($cacheFiles[0]))) {
+	if ((isFilledArray($cacheFiles)) && (!empty($cacheFiles[0]))) {
 		// Delete cache file(s)
 		foreach ($cacheFiles as $cache) {
 			// Skip any empty entries
@@ -2202,11 +2292,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 				continue;
 			} // END - if
 
-			// Is the cache file loadable?
-			if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
-				// Then remove it
-				$GLOBALS['cache_instance']->removeCacheFile();
-			} // END - if
+			// Use rebuildCache() to delete it
+			rebuildCache($cache);
 		} // END - foreach
 	} // END - if
 
@@ -2215,13 +2302,13 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 }
 
 // Delete rows by given id numbers
-function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
 	// The base SQL command:
 	$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
 
 	// Is a user id provided?
-	//* BUG: */ die('<pre>'.print_r($rawUserId,true).'</pre><pre>'.print_r($userIdColumn,true).'</pre>');
-	if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
+	//* BUG: */ die('<pre>'.print_r($rawUserId,TRUE).'</pre><pre>'.print_r($userIdColumn,TRUE).'</pre>');
+	if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) {
 		// Add user id as well
 		$sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));
 	} // END - if
@@ -2233,11 +2320,11 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 	} // END - if
 
 	// Delete them all
-	//* BUG: */ die($sql.'<br /><pre>'.print_r($tableName,true).'</pre><pre>'.print_r($columns,true).'</pre><pre>'.print_r($filterFunctions,true).'</pre><pre>'.print_r($extraValues,true).'</pre><pre>'.print_r($deleteNow,true).'</pre><pre>'.print_r($idColumn,true).'</pre>');
+	//* BUG: */ die($sql.'<pre>'.print_r($tableName,TRUE).'</pre><pre>'.print_r($columns,TRUE).'</pre><pre>'.print_r($filterFunctions,TRUE).'</pre><pre>'.print_r($extraValues,TRUE).'</pre><pre>'.print_r($deleteNow,TRUE).'</pre><pre>'.print_r($idColumn,TRUE).'</pre>');
 	$idList = '';
 	foreach (postRequestElement($idColumn[0]) as $id => $sel) {
 		// Is id zero?
-		if ($id == '0') {
+		if (!isValidId($id)) {
 			// Then skip this
 			continue;
 		} // END - if
@@ -2245,7 +2332,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 		// Is there a userid?
 		if (isPostRequestElementSet($userIdColumn[0])) {
 			// Load all data from that id
-			$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+			$result = sqlQueryEscaped("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
 				array(
 					$tableName[0],
 					$idColumn[0],
@@ -2253,10 +2340,10 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 				), __FUNCTION__, __LINE__);
 
 			// Fetch the data
-			$content = SQL_FETCHARRAY($result);
+			$content = sqlFetchArray($result);
 
 			// Free the result
-			SQL_FREERESULT($result);
+			sqlFreeResult($result);
 
 			// Send "build mails" out
 			sendGenericBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
@@ -2267,7 +2354,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 	} // END - foreach
 
 	// Run the query
-	SQL_QUERY_ESC($sql,
+	sqlQueryEscaped($sql,
 		array(
 			$tableName[0],
 			$idColumn[0],
@@ -2275,11 +2362,12 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 		), __FUNCTION__, __LINE__);
 
 	// Return affected rows
-	return SQL_AFFECTEDROWS();
+	return sqlAffectedRows();
 }
 
 // Build a special template list
-function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
 	// $tableName and $idColumn must bove be arrays!
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// $tableName is no array
@@ -2296,26 +2384,35 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 	$OUT = '';
 
 	// "Walk" through all entries
-	//* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,idColumn=<pre>'.print_r($idColumn,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
+	//* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,TRUE).'</pre>,tableName<pre>'.print_r($tableName,TRUE).'</pre>,columns=<pre>'.print_r($columns,TRUE).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,TRUE).'</pre>,extraValues=<pre>'.print_r($extraValues,TRUE).'</pre>,idColumn=<pre>'.print_r($idColumn,TRUE).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,TRUE).'</pre>,rawUserId=<pre>'.print_r($rawUserId,TRUE).'</pre>');
 	foreach (postRequestElement($idColumn[0]) as $id => $selected) {
 		// Secure id number
 		$id = bigintval($id);
 
 		// Get result from a given column array and table name
-		$result = SQL_RESULT_FROM_ARRAY($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__);
+		$result = getSqlResultFromArray($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__);
 
 		// Is there one entry?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Load all data
-			$content = SQL_FETCHARRAY($result);
+			$row = sqlFetchArray($result);
 
 			// Filter all data
-			foreach ($content as $key => $value) {
+			foreach ($row as $key => $value) {
 				// Search index
-				$idx = searchXmlArray($key, $columns, 'column');
+				$idx  = searchXmlArray($key, $columns, 'column');
+
+				// Default name is NULL
+				$name = NULL;
+
+				// Is the name there?
+				if (isset($columns[$idx]['name'])) {
+					// Then use it
+					$name = $columns[$idx]['name'];
+				} // END - if
 
 				// Skip any missing entries
-				if ($idx === false) {
+				if ($idx === FALSE) {
 					// Skip this one
 					//* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
 					continue;
@@ -2326,8 +2423,8 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 				if ($key == $userIdColumn[0]) {
 					// Add it again as raw id
 					//* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
-					$content[$userIdColumn[0]] = convertZeroToNull($value);
-					$content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
+					$row[$userIdColumn[0]] = convertZeroToNull($value);
+					$row[$userIdColumn[0] . '_raw'] = $row[$userIdColumn[0]];
 				} // END - if
 
 				// If the key matches the idColumn variable, we need to temporary remember it
@@ -2341,80 +2438,71 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 					$GLOBALS[$prefix . '_list_builder_id_value'] = bigintval($value);
 				} // END - if
 
-				// Is there a call-back function and extra-value pair?
-				if ((isset($filterFunctions[$idx])) && (isset($extraValues[$idx]))) {
-					// Handle the call in external function
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
-					$content[$key] = handleExtraValues(
-						$filterFunctions[$idx],
-						$value,
-						$extraValues[$idx]
-					);
-				} elseif ((isset($columns[$idx]['name'])) && (isset($filterFunctions[$columns[$idx]['name']])) && (isset($extraValues[$columns[$idx]['name']]))) {
-					// Handle the call in external function
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$columns[$idx]['name']] . ',value=' . $value);
-					$content[$key] = handleExtraValues(
-						$filterFunctions[$columns[$idx]['name']],
-						$value,
-						$extraValues[$columns[$idx]['name']]
-					);
-				}
+				// Try to handle call-back functions and/or extra values
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',row[' . $key . ']=' . $row[$key]);
+				//if ($key == 'forced_campaign_created') die($idx.'=<pre>'.print_r($columns,true).'</pre><pre>'.print_r($extraValues,true).'</pre>');
+				$row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, ((!is_null($name)) ? $name : $key), $id);
 			} // END - foreach
 
 			// Then list it
-			$OUT .= loadTemplate(sprintf("%s_%s_%s_row",
+			$OUT .= loadTemplate(sprintf('%s_%s_%s_row',
 				$prefix,
 				$listType,
 				$tableName[0]
-				), true, $content
+				), TRUE, $row
 			);
 		} // END - if
 
 		// Free the result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} // END - foreach
 
+	// Is there an entry in $content?
+	if (isFilledArray($content)) {
+		// Use generic 'rows'
+		$content['rows'] = $OUT;
+	} else {
+		// Use direct output
+		$content = $OUT;
+	}
+
 	// Load master template
-	loadTemplate(sprintf("%s_%s_%s",
-		$prefix,
-		$listType,
-		$tableName[0]
-		), false, $OUT
+	loadTemplate(
+		sprintf('%s_%s_%s',
+			$prefix,
+			$listType,
+			$tableName[0]
+		), FALSE, $content
 	);
 }
 
-// Checks whether given URL is blacklisted
-function isUrlBlacklisted ($url) {
-	// Mark it as not listed by default
-	$listed = false;
+// Adds key/value pair to a working SQL string together
+function addKeyValueSql ($key, $value) {
+	// Init SQL
+	$sql = '';
 
-	// Is black-listing enbaled?
-	if (!isUrlBlacklistEnabled()) {
-		// No, then all URLs are not in this list
-		return false;
-	} elseif (!isset($GLOBALS['blacklist_data'][$url])) {
-		// Check black-list for given URL
-		$result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS `blist_timestamp` FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
-			array($url), __FILE__, __LINE__);
-
-		// Is there an entry?
-		if (SQL_NUMROWS($result) == 1) {
-			// Jupp, we got one listed
-			$GLOBALS['blacklist_data'][$url] = SQL_FETCHARRAY($result);
-
-			// Mark it as listed
-			$listed = true;
-		} // END - if
-
-		// Free result
-		SQL_FREERESULT($result);
+	// Is it NULL?
+	if (($value == 'NULL') || (is_null($value))) {
+		// Add key with NULL
+		$sql .= sprintf(' `%s`=NULL,',
+			sqlEscapeString($key)
+		);
+	} elseif ((is_double($value)) || (is_float($value)) || (is_int($value))) {
+		// Is a number, so addd it directly
+		$sql .= sprintf(' `%s`=%s,',
+			sqlEscapeString($key),
+			$value
+		);
 	} else {
-		// Is found in cache -> black-listed
-		$listed = true;
+		// Else add the value escape'd
+		$sql .= sprintf(" `%s`='%s',",
+			sqlEscapeString($key),
+			sqlEscapeString($value)
+		);
 	}
 
-	// Return result
-	return $listed;
+	// Return SQL string
+	return $sql;
 }
 
 // [EOF]