X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=28ba603cfe196063e7e2302e87b53ce23212ba87;hp=d0ec3ca7942f3e651d9ed2a2e9b7175c9151ab22;hb=f888a0bda52e7dd2ea799837ed2991c263864e9f;hpb=e88e30c24737cf641f2e93f6a311e641ccbf5960

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index d0ec3ca794..28ba603cfe 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -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>';
 
@@ -354,28 +354,38 @@ ORDER BY
 				// Add separator
 				$GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $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);
+				// Prepare filter data array
+				$filterData = array(
+					'output'    => '',
+					'exclusive' => FALSE,
+					'action'    => $action,
+					'mode'      => $mode,
+				);
 
-					// Add separator again
-					$GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);
-				} // END - if
+				// Run filter chain
+				$filterData = runFilterChain($mode . '_menu_advert', $filterData);
+
+				// Add content output
+				$GLOBALS['rows'] .= $filterData['output'];
 			} // END - if
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result_main);
 
-		// 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);
+		// Prepare filter data array
+		$filterData = array(
+			'output'    => '',
+			'exclusive' => FALSE,
+			'action'    => $action,
+			'mode'      => $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(
@@ -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
@@ -562,8 +572,16 @@ 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())) {
+		$GLOBALS[__FUNCTION__] = FALSE;
 		return FALSE;
 	} // END - if
 
@@ -571,61 +589,53 @@ function isAdmin () {
 	$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
+		$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"
@@ -858,10 +868,10 @@ 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',
 			array(bigintval($cid)), __FUNCTION__, __LINE__);
@@ -891,8 +901,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;
 
@@ -931,12 +959,12 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 	$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';
@@ -970,8 +998,7 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 				// 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 {
@@ -990,14 +1017,13 @@ 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';
-
+	// 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) {
 			// Count whole table
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
 			$result = SQL_QUERY_ESC('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
 				array(
 					$lookFor,
@@ -1005,6 +1031,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 				), __FUNCTION__, __LINE__);
 		} 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',
 				array(
 					$lookFor,
@@ -1013,26 +1040,68 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		}
 	} 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 = SQL_QUERY_ESC("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 = 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__);
+		}
 	} 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 = SQL_QUERY_ESC("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 = 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__);
+		}
 	}
 
 	// Load row
@@ -1045,7 +1114,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 	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';
 	}
@@ -1066,7 +1135,7 @@ function sendAdminEmails ($subject, $message, $isBugReport = FALSE) {
 	// Is it a bug report?
 	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
@@ -1141,9 +1210,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];
@@ -1169,6 +1240,7 @@ function getAdminHash ($adminId) {
 	}
 
 	// Return password hash
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . ',data[password]=' . $data['password'] . ' - EXIT!');
 	return $data['password'];
 }
 
@@ -1246,7 +1318,7 @@ function getAdminDefaultAcl ($adminId) {
 	// 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];
@@ -1283,7 +1355,7 @@ function getAdminMenuMode ($adminId) {
 	// 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];
@@ -1416,15 +1488,15 @@ function deleteUserAccount ($userid, $reason) {
 
 	// Search for the points and user data
 	$result = SQL_QUERY_ESC("SELECT
-	(SUM(p.`points`) - d.`used_points`) AS `points`
+	(SUM(`p`.`points`) - `d`.`used_points`) AS `points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_points` AS `p`
 LEFT JOIN
 	`{?_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__);
 
@@ -1619,7 +1691,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 	`html_msg`
 ) VALUES (
 	'%s',
-	%s',
+	'%s',
 	'%s',
 	%s,
 	%s,
@@ -1705,25 +1777,35 @@ 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'";
+		$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`.`html`='Y'";
 	} // 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 = 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",
 		array(
 			$receiver
 		), __FUNCTION__, __LINE__);
@@ -1760,7 +1842,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 		// 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
+			// 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
@@ -1809,7 +1891,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 SQL_INSERT_ID();
 }
 
 // Updates last module / online time
@@ -1846,8 +1928,8 @@ LIMIT 1",
 	}
 }
 
-// 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
@@ -1863,83 +1945,54 @@ 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 (count($columns) == 0) {
+		// 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__);
 
@@ -1947,11 +2000,11 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
 	if (!SQL_HASZERONUMS($result)) {
 		// List all URLs
 		$OUT = '';
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($row = SQL_FETCHARRAY($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,15 +2015,24 @@ 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
-				$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 ((is_array($content)) && (count($content) > 0)) {
+			// 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] . '--}');
@@ -2014,7 +2076,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"
@@ -2022,27 +2084,28 @@ 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'])));
 
 		// 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__, 'columnName=' . $columnName . ',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__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
-		} elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key])) && (!empty($sqlValues[$key]))) {
-			// Run through an extra filter
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
-			$sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], NULL);
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
+		// 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);
@@ -2064,15 +2127,15 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 		// Run the SQL query
 		SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
-		// Add id
-		setPostRequestElement('id', SQL_INSERTID());
+		// Add id number
+		setPostRequestElement('id', SQL_INSERT_ID());
 
 		// Prepare filter data array
 		$filterData = array(
 			'mode'          => 'add',
 			'table_name'    => $tableName,
 			'content'       => postRequestArray(),
-			'id'            => SQL_INSERTID(),
+			'id'            => SQL_INSERT_ID(),
 			'subject'       => '',
 			// @TODO Used generic 'userid' here
 			'userid_column' => array('userid'),
@@ -2088,6 +2151,15 @@ 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) {
+		// 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) {
@@ -2105,68 +2177,63 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
 		// "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]))) {
-				//die($key.'/'.$id.'=<pre>'.print_r($columns,TRUE).'</pre><pre>'.print_r($filterFunctions,TRUE).'</pre>');
 				// 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 + extra value set
-					$entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
-				} elseif (isset($filterFunctions[$search])) {
-					// Filter function set
-					//* BUG: */ die($id.'/'.$key.'='.$entries[$id].'/'.$filterFunctions[$search]);
-					/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - BEFORE!');
-					$entries[$id] = handleExtraValues($filterFunctions[$search], $entries[$id], NULL);
-					/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - AFTER!');
-					assert(!is_bool($entries[$id]));
-				}
+				// 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 `" . SQL_ESCAPE($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
+		//* BUG: */ die($sql.'<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
 		SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
 		// Add affected rows
@@ -2233,7 +2300,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 
 	// 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]))) {
+	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
@@ -2245,11 +2312,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
@@ -2291,7 +2358,8 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 }
 
 // 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
@@ -2319,12 +2387,21 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 		// Is there one entry?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load all data
-			$content = SQL_FETCHARRAY($result);
+			$row = SQL_FETCHARRAY($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) {
@@ -2338,8 +2415,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
@@ -2353,24 +2430,10 @@ 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
@@ -2378,7 +2441,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 				$prefix,
 				$listType,
 				$tableName[0]
-				), TRUE, $content
+				), TRUE, $row
 			);
 		} // END - if
 
@@ -2386,47 +2449,52 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 		SQL_FREERESULT($result);
 	} // END - foreach
 
+	// Is there an entry in $content?
+	if ((is_array($content)) && (count($content) > 0)) {
+		// 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;
-
-	// 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
+// Adds key/value pair to a working SQL string together
+function addKeyValueSql ($key, $value) {
+	// Init SQL
+	$sql = '';
 
-		// Free result
-		SQL_FREERESULT($result);
+	// Is it NULL?
+	if (($value == 'NULL') || (is_null($value))) {
+		// Add key with NULL
+		$sql .= sprintf(' `%s`=NULL,',
+			SQL_ESCAPE($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),
+			$value
+		);
 	} else {
-		// Is found in cache -> black-listed
-		$listed = TRUE;
+		// Else add the value escape'd
+		$sql .= sprintf(" `%s`='%s',",
+			SQL_ESCAPE($key),
+			SQL_ESCAPE($value)
+		);
 	}
 
-	// Return result
-	return $listed;
+	// Return SQL string
+	return $sql;
 }
 
 // [EOF]