X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=b05768a24c75634a1b9bc53cf1b15c260ad11248;hp=d42cd4ecdce94b2af26066db9c3c08e7d7989076;hb=ab5ff5126ef56b08f5130a9e110b53c00d0a2761;hpb=c0c6d5d58bdecd22bdcf7dfe5b24bec69e1810c7

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index d42cd4ecdc..b05768a24c 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,13 +69,13 @@ 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'];
@@ -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,10 +227,10 @@ 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);
@@ -239,7 +239,7 @@ ORDER BY
 			$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);
 
@@ -273,7 +273,7 @@ ORDER BY
 
 					// Full file name for checking menu
 					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sub_what=' . $content['sub_what']);
-					$inc = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
+					$inc = sprintf('inc/modules/%s/what-%s.php', $mode, $content['sub_what']);
 					if (isIncludeReadable($inc)) {
 						// Mark currently selected menu - open
 						if ((!empty($what)) && (($what == $content['sub_what']))) {
@@ -320,7 +320,7 @@ ORDER BY
 					);
 
 					// Add regular menu row or bottom row?
-					if ($count < SQL_NUMROWS($result_sub)) {
+					if ($count < sqlNumRows($result_sub)) {
 						$GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', TRUE, $content);
 					} else {
 						$GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', TRUE, $content);
@@ -331,7 +331,7 @@ ORDER BY
 				enableBlockMode();
 
 				// Load menu block
-				$INC = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
+				$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);
@@ -344,13 +344,13 @@ ORDER BY
 			}
 
 			// 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);
 
@@ -371,7 +371,7 @@ ORDER BY
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result_main);
+		sqlFreeResult($result_main);
 
 		// Prepare filter data array
 		$filterData = array(
@@ -492,12 +492,12 @@ 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;
 		} // END - if
-	} elseif (isUserDataValid()) {
+	} elseif (isValidUserData()) {
 		// Using cache is fine
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2');
 		return TRUE;
@@ -510,16 +510,16 @@ function fetchUserData ($value, $column = 'userid') {
 	$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']);
@@ -555,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;
@@ -580,7 +580,7 @@ function isAdmin () {
 	} // END - if
 
 	// No admin in installation phase!
-	if ((isInstallationPhase()) || (!isAdminRegistered())) {
+	if ((isInstaller()) || (!isAdminRegistered())) {
 		$GLOBALS[__FUNCTION__] = FALSE;
 		return FALSE;
 	} // END - if
@@ -646,26 +646,26 @@ function addMaxReceiveList ($mode, $default = '') {
 	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;
 
 		default: // Invalid!
-			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode));
+			logDebugMessage(__FUNCTION__, __LINE__, sprintf('Invalid mode %s detected.', $mode));
 			break;
 	}
 
 	// 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']) {
@@ -685,7 +685,7 @@ function addMaxReceiveList ($mode, $default = '') {
 	}
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return generated HTML code
 	return $OUT;
@@ -706,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`
@@ -720,10 +720,10 @@ 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);
@@ -750,7 +750,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry = FALSE) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',action=' . $action . ',what=' . $what);
 	if (($mode != 'admin') && ($updateEntry === TRUE)) {
 		// Update guest or member menu
-		$sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
+		$sql = sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
 			array(
 				$mode,
 				$action,
@@ -758,7 +758,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry = 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,
@@ -766,7 +766,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry = FALSE) {
 			), __FUNCTION__, __LINE__, FALSE);
 	} else {
 		// Admin login overview
-		$sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND (`what`='' OR `what` IS NULL)".$add." ORDER BY `action` DESC LIMIT 1",
+		$sql = 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
@@ -774,19 +774,19 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry = 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) {
 		// 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;
@@ -838,18 +838,20 @@ 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 ext-sql_patches installed, but maybe we need to register an admin?
 		if (isAdminRegistered()) {
@@ -873,15 +875,15 @@ function getCategory ($cid) {
 		$data['cat'] = '{--_CATEGORY_NONE--}';
 	} 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
@@ -933,20 +935,20 @@ function getPaymentData ($paymentsId, $lookFor) {
 		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
@@ -976,7 +978,7 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 			} // 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),
@@ -985,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),
@@ -1007,7 +1009,7 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 			}
 
 			// Free memory
-			SQL_FREERESULT($result);
+			sqlFreeResult($result);
 		} // END - if
 	} // END - if
 
@@ -1024,7 +1026,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		if ($countRows === TRUE) {
 			// Count whole table
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
-			$result = SQL_QUERY_ESC('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
+			$result = sqlQueryEscaped('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName
@@ -1032,7 +1034,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		} else {
 			// Sum whole table
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
-			$result = SQL_QUERY_ESC('SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
+			$result = sqlQueryEscaped('SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName
@@ -1050,7 +1052,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 
 			// Look for NULL/0
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT-NULL!');
-			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
+			$result = sqlQueryEscaped("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName,
@@ -1061,7 +1063,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		} else {
 			// Regular entry
 			//* 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',
+			$result = sqlQueryEscaped("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName,
@@ -1082,7 +1084,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 
 			// Look for NULL/0
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM-NULL!');
-			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
+			$result = sqlQueryEscaped("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName,
@@ -1093,7 +1095,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		} else {
 			// Regular entry
 			//* 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',
+			$result = sqlQueryEscaped("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName,
@@ -1105,10 +1107,10 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 	}
 
 	// 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')) {
@@ -1139,16 +1141,16 @@ function sendAdminEmails ($subject, $message, $isBugReport = FALSE) {
 	} // 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... ;-)
 }
@@ -1167,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
@@ -1223,20 +1225,20 @@ 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
@@ -1257,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
@@ -1290,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
@@ -1327,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
@@ -1364,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
@@ -1385,8 +1387,15 @@ function getAdminMenuMode ($adminId) {
 }
 
 // Generates an option list from various parameters
-function generateOptions ($table, $key, $value, $default = '', $extra = '', $whereStatement = '', $disabled = array(), $callback = '') {
+function generateOptions ($table, $key, $value, $default = '', $extra = '', $whereStatement = '', $disabled = array(), $callback = '', $allowNone = FALSE) {
 	$ret = '';
+
+	// Allow none?
+	if ($allowNone === TRUE) {
+		// Add option for none
+		$ret .= '<option value="0">{--SELECT_NONE--}</option>';
+	} // END - if
+
 	if ($table == '/ARRAY/') {
 		// Selection from array
 		if ((is_array($key)) && (is_array($value)) && ((count($key)) == (count($value)) || (!empty($callback)))) {
@@ -1426,7 +1435,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,
@@ -1435,9 +1444,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
@@ -1474,7 +1483,7 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe
 		}
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return - hopefully - the requested data
@@ -1487,7 +1496,7 @@ function deleteUserAccount ($userid, $reason) {
 	$data['points'] = '0';
 
 	// Search for the points and user data
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	(SUM(`p`.`points`) - `d`.`used_points`) AS `points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_points` AS `p`
@@ -1501,13 +1510,13 @@ 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
@@ -1523,16 +1532,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
 
@@ -1544,7 +1553,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
@@ -1595,7 +1604,7 @@ function generateCategoryOptionsList ($mode, $userid = NULL) {
 	);
 
 	// Get categories
-	$result = SQL_QUERY('SELECT
+	$result = sqlQuery('SELECT
 	`id`,
 	`cat`
 FROM
@@ -1606,15 +1615,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)
@@ -1624,20 +1633,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"));
 			} // 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 = '';
@@ -1676,7 +1685,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`,
@@ -1717,7 +1726,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`,
@@ -1780,7 +1789,7 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
 	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);
+		$addWhere = sprintf(' AND `c`.`cat_id`=%s', $categoryId);
 	} // END - if
 
 	// Exclude users in holiday?
@@ -1789,13 +1798,8 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
 		$addWhere .= " AND `d`.`holiday_active`='N'";
 	} // END - if
 
-	// Include only HTML recipients?
-	if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
-		$addWhere .= " AND `d`.`html`='Y'";
-	} // END - if
-
 	// Run query
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	`d`.`userid`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data` AS `d`
@@ -1811,9 +1815,9 @@ LIMIT %s",
 		), __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'] . ';';
@@ -1821,7 +1825,7 @@ LIMIT %s",
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Remove trailing semicolon
 		$receiverList = substr($receiverList, 0, -1);
@@ -1834,23 +1838,28 @@ LIMIT %s",
 // 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)) {
+		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)) {
+			} 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'])));
 			}
@@ -1861,9 +1870,9 @@ 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",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
 				array(
 					implode(',', $userids),
 					count($userids)
@@ -1875,13 +1884,13 @@ 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) {
 	// 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),
@@ -1891,7 +1900,7 @@ function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId =
 		), __FUNCTION__, __LINE__, TRUE, $strip);
 
 	// Return insert id which is the task id
-	return SQL_INSERTID();
+	return getSqlInsertId();
 }
 
 // Updates last module / online time
@@ -1899,7 +1908,7 @@ function updateLastActivity ($userid) {
 	// Is 'what' set?
 	if (isWhatSet()) {
 		// Run the update query
-		SQL_QUERY_ESC("UPDATE
+		sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`{%%pipe,getUserLastWhatName%%}`='{%%pipe,getWhat%%}',
@@ -1913,7 +1922,7 @@ LIMIT 1",
 		), __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
 	`{%%pipe,getUserLastWhatName%%}`=NULL,
@@ -1934,7 +1943,7 @@ function doGenericJoinedListEntries ($tableTemplate, $rowTemplate, $noEntryMessa
 	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]);
 	}
@@ -1967,7 +1976,7 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId,
 	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]);
 	}
@@ -1994,13 +2003,13 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId,
 // Do the listing of entries
 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 ($row = SQL_FETCHARRAY($result)) {
+		while ($row = sqlFetchArray($result)) {
 			// "Translate" content
 			foreach ($callbackColumns as $columnName => $callbackName) {
 				// Fill the callback arguments
@@ -2014,7 +2023,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
 
 				// Call the callback-function
 				//* 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
+				// @TODO If the EL sub-system can support more than one parameter, this call_user_func_array() can be avoided
 				$row[$columnName] = call_user_func_array($callbackName, $args);
 			} // END - foreach
 
@@ -2023,7 +2032,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
 		} // END - while
 
 		// Is at least one entry set in content?
-		if ((is_array($content)) && (count($content) > 0)) {
+		if (isFilledArray($content)) {
 			// Then add generic 'rows' element
 			$content['rows'] = $OUT;
 		} else {
@@ -2039,7 +2048,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
 	}
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 }
 
 // Adds a given entry to the database
@@ -2049,7 +2058,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 	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.');
 	}
@@ -2062,7 +2071,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 	$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
@@ -2086,9 +2095,18 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 		// 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'])));
 
+		// 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));
+		$sqlColumns[$key] = sqlEscapeString($columnName);
+		$sqlValues[$key]  = sqlEscapeString($value);
 
 		// Search for it
 		$search = key(search_array($columns, 'column', $columnName));
@@ -2125,22 +2143,22 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 		$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 number
-		setPostRequestElement('id', SQL_INSERTID());
+		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,
 		);
 
@@ -2152,7 +2170,7 @@ 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(), $subject = '') {
 	// Is there "time columns"?
-	if (count($timeColumns) > 0) {
+	if (isFilledArray($timeColumns)) {
 		// Then "walk" through all entries
 		foreach ($timeColumns as $column) {
 			// Convert all (possible) selections
@@ -2170,8 +2188,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 		$content = array();
 
 		// Prepare SQL for this row
-		$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
-			SQL_ESCAPE($tableName[0])
+		$sql = sprintf('UPDATE `{?_MYSQL_PREFIX?}_%s` SET',
+			sqlEscapeString($tableName[0])
 		);
 
 		// "Walk" through all entries
@@ -2225,7 +2243,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 		} // END - foreach
 
 		// Finish SQL command
-		$sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . $id;
+		$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]));
@@ -2234,14 +2252,14 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 
 		// Run this query
 		//* BUG: */ die($sql.'<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
-		SQL_QUERY($sql, __FUNCTION__, __LINE__);
+		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],
@@ -2249,7 +2267,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(
@@ -2268,11 +2286,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
@@ -2281,11 +2299,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
 
@@ -2324,7 +2339,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],
@@ -2332,10 +2347,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);
@@ -2346,7 +2361,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 	} // END - foreach
 
 	// Run the query
-	SQL_QUERY_ESC($sql,
+	sqlQueryEscaped($sql,
 		array(
 			$tableName[0],
 			$idColumn[0],
@@ -2354,7 +2369,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 		), __FUNCTION__, __LINE__);
 
 	// Return affected rows
-	return SQL_AFFECTEDROWS();
+	return sqlAffectedRows();
 }
 
 // Build a special template list
@@ -2382,12 +2397,12 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 		$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
-			$row = SQL_FETCHARRAY($result);
+			$row = sqlFetchArray($result);
 
 			// Filter all data
 			foreach ($row as $key => $value) {
@@ -2437,7 +2452,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 			} // END - foreach
 
 			// Then list it
-			$OUT .= loadTemplate(sprintf("%s_%s_%s_row",
+			$OUT .= loadTemplate(sprintf('%s_%s_%s_row',
 				$prefix,
 				$listType,
 				$tableName[0]
@@ -2446,11 +2461,11 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 		} // END - if
 
 		// Free the result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} // END - foreach
 
 	// Is there an entry in $content?
-	if ((is_array($content)) && (count($content) > 0)) {
+	if (isFilledArray($content)) {
 		// Use generic 'rows'
 		$content['rows'] = $OUT;
 	} else {
@@ -2460,7 +2475,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 
 	// Load master template
 	loadTemplate(
-		sprintf("%s_%s_%s",
+		sprintf('%s_%s_%s',
 			$prefix,
 			$listType,
 			$tableName[0]
@@ -2477,19 +2492,19 @@ function addKeyValueSql ($key, $value) {
 	if (($value == 'NULL') || (is_null($value))) {
 		// Add key with NULL
 		$sql .= sprintf(' `%s`=NULL,',
-			SQL_ESCAPE($key)
+			sqlEscapeString($key)
 		);
 	} elseif ((is_double($value)) || (is_float($value)) || (is_int($value))) {
 		// Is a number, so addd it directly
-		$sql .= sprintf(" `%s`=%s,",
-			SQL_ESCAPE($key),
+		$sql .= sprintf(' `%s`=%s,',
+			sqlEscapeString($key),
 			$value
 		);
 	} else {
 		// Else add the value escape'd
 		$sql .= sprintf(" `%s`='%s',",
-			SQL_ESCAPE($key),
-			SQL_ESCAPE($value)
+			sqlEscapeString($key),
+			sqlEscapeString($value)
 		);
 	}
 
@@ -2497,5 +2512,43 @@ function addKeyValueSql ($key, $value) {
 	return $sql;
 }
 
+// "Getter" for an array from given table and columns
+function getArrayFromTable ($tableName, $columns, $orderBy, $ordered = 'ASC', $whereSql = '') {
+	// The table must exist
+	assert(ifSqlTableExists($tableName));
+
+	// Search for it
+	$result = sqlQueryEscaped('SELECT
+	`' . implode('`, `', $columns) . '`
+FROM
+	`{?_MYSQL_PREFIX?}_%s`
+' . $whereSql . '
+ORDER BY
+	`%s` %S',
+		array(
+			$tableName,
+			$orderBy,
+			$ordered
+		), __FUNCTION__, __LINE__
+	);
+
+	// Init array
+	$rows = array();
+
+	// Are there entries?
+	if (!ifSqlHasZeroNums($result)) {
+		// Load all entries
+		while ($row = sqlFetchArray($result)) {
+			array_push($rows, $row);
+		} // END - while
+	} // END - if
+
+	// Free result
+	sqlFreeResult($result);
+
+	// Return all found rows
+	return $rows;
+}
+
 // [EOF]
 ?>