From: Roland Häder <roland@mxchange.org>
Date: Thu, 1 Jul 2010 04:45:22 +0000 (+0000)
Subject: More rewrites to make use of (cached) wrapper functions
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=30ae22f62ae87c53a56baf0d134569ba91011111;p=mailer.git

More rewrites to make use of (cached) wrapper functions
---

diff --git a/beg.php b/beg.php
index 57b930c8d9..65516a55b6 100644
--- a/beg.php
+++ b/beg.php
@@ -98,7 +98,7 @@ if (isGetRequestParameterSet('userid')) {
 	} // END - if
 
 	// User id valid and not webmaster's id?
-	if ((getUserData('userid') > 0) && (getConfig('beg_userid') != getUserData('userid'))) {
+	if ((isValidUserId(getUserData('userid'))) && (getConfig('beg_userid') != getUserData('userid'))) {
 		// Update counter
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_clicks`=`beg_clicks`+1 WHERE `userid`=%s LIMIT 1",
 			array(getUserData('userid')), __FILE__, __LINE__);
@@ -109,7 +109,6 @@ if (isGetRequestParameterSet('userid')) {
 
 		// Entry not found, points set and not logged in?
 		if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) {
-
 			// Admin is testing?
 			if (!isAdmin()) {
 				// Remember remote address, userid and timestamp for next click
diff --git a/doubler.php b/doubler.php
index 635448e77b..8685143cf2 100644
--- a/doubler.php
+++ b/doubler.php
@@ -117,7 +117,7 @@ if (isFormSent()) {
 				incrementConfigEntry('doubler_points', $points);
 
 				// Add second line for the referal but only when userid != refid
-				if ((determineReferalId() > 0) && (determineReferalId() != getUserData('userid'))) {
+				if ((isValidUserId(determineReferalId())) && (determineReferalId() != getUserData('userid'))) {
 					// Okay add a refid line and apply refid percents
 					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES ('%s',0,'%s','".detectRemoteAddr()."',UNIX_TIMESTAMP(),'N','Y')",
 						array(
diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index 0e26307b13..68b98ac435 100644
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -66,7 +66,7 @@ WHERE
 	s.timestamp_ordered <= (UNIX_TIMESTAMP() - {?auto_purge?})
 ORDER BY
 	s.userid ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Start deleting procedure
 		$userid = '0'; $points = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -108,14 +108,14 @@ ORDER BY
 	if (isExtensionActive('bonus', true)) {
 		// Check for bonus campaigns
 		$result = SQL_QUERY("SELECT `id`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='SEND' AND `timestamp` <= {?auto_purge?} ORDER BY `id` ASC", __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Start deleting procedure
 			$points = '0';
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Check if confirmation links are purged or not
 				$result_links = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
 					array(bigintval($content['id'])), __FILE__, __LINE__);
-				if (SQL_NUMROWS($result_links) > 0) {
+				if (!SQL_HASZERONUMS($result_links)) {
 					// At least one link was found, enougth to pay back the points
 					$points += $content['points'] * SQL_NUMROWS($result_links);
 
diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 74dd7469a1..4a0ef16865 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -56,10 +56,7 @@ if (getConfig('autopurge_inactive') == 'Y') {
 	// Init exclusion list
 	// @TODO Rewrite these if() blocks to a filter
 	$EXCLUDE_LIST = '';
-	if (getConfig('def_refid') > 0) {
-		$EXCLUDE_LIST = ' AND d.`userid` != {?def_refid?}';
-	} // END - if
-
+	if (isValidUserId(getConfig('def_refid'))) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}';
 	// Check for more extensions
 	if (isExtensionActive('beg'))     $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}';
 	if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}';
@@ -89,7 +86,7 @@ ORDER BY
 			getApInactiveSince()
 		), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_inactive) > 0) {
+	if (!SQL_HASZERONUMS($result_inactive)) {
 		// Prepare variables and constants...
 		$useridsContent = '';
 		$content['since'] = (getApInactiveSince() / 60 / 60);
@@ -140,7 +137,7 @@ WHERE
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_inactive) > 0) {
+	if (!SQL_HASZERONUMS($result_inactive)) {
 		// Prepare variable...
 		$useridsContent = '';
 
diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index d605fc33a9..8f9e3308b1 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -62,7 +62,7 @@ ORDER BY
 $deletedStats = '0';
 
 // Do we have "purged" mails?
-if (SQL_NUMROWS($result_mails) > 0) {
+if (!SQL_HASZERONUMS($result_mails)) {
 	// Okay, check for their sender's
 	while ($content = SQL_FETCHARRAY($result_mails)) {
 		// Check now...
@@ -101,7 +101,7 @@ ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
 // Do we have "purged" mails?
-if (SQL_NUMROWS($result_mails) > 0) {
+if (!SQL_HASZERONUMS($result_mails)) {
 	// Okay, check for their sender's
 	while ($content = SQL_FETCHARRAY($result_mails)) {
 		// Check now...
diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 8b94274b75..162b4f6f48 100644
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -59,7 +59,7 @@ WHERE
 	`status`='UNCONFIRMED' AND `joined` < (UNIX_TIMESTAMP() - {?ap_unconfirmed_time?})
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_uncon) > 0) {
+	if (!SQL_HASZERONUMS($result_uncon)) {
 		// Prepare variable...
 		$userids = '';
 		$content['time'] = (getConfig('ap_unconfirmed_time')  / 60 / 60);
diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 316bc6c93a..d0e881ae8c 100644
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -71,7 +71,7 @@ ORDER BY
 	`filter_id` ASC", __FUNCTION__, __LINE__);
 
 		// Are there entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Load all filters
 			while ($filterArray = SQL_FETCHARRAY($result)) {
 				// Get filter name and function
diff --git a/inc/fix_filters.php b/inc/fix_filters.php
index b2762810fe..f18079a787 100644
--- a/inc/fix_filters.php
+++ b/inc/fix_filters.php
@@ -51,7 +51,7 @@ ORDER BY
 	`filter_name` ASC, `filter_function` ASC', __FILE__, __LINE__);
 
 // Do we have entries? (we should have!)
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Load row by row
 	while ($filter = SQL_FETCHARRAY($result)) {
 		// Now search again for this filter and get it's total count
diff --git a/inc/functions.php b/inc/functions.php
index fbfc362017..69d696e544 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -907,7 +907,7 @@ function sendRawRequest ($host, $request) {
 	$useProxy = false;
 
 	// Are proxy settins set?
-	if ((isConfigEntrySet('proxy_host')) && (getConfig('proxy_host') != '') && (isConfigEntrySet('proxy_port')) && (getConfig('proxy_port') > 0)) {
+	if (isProxyUsed()) {
 		// Then use it
 		$useProxy = true;
 	} // END - if
@@ -1919,13 +1919,13 @@ function determineReferalId () {
 	} elseif (isGetRequestParameterSet('ref')) {
 		// Set refid=ref (the referal link uses such variable)
 		$GLOBALS['refid'] = secureString(getRequestParameter('ref'));
-	} elseif ((isSessionVariableSet('refid')) && (getSession('refid') > 0)) {
+	} elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
 		// Set session refid als global
 		$GLOBALS['refid'] = bigintval(getSession('refid'));
 	} elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (isRandomReferalIdEnabled())) {
 		// Select a random user which has confirmed enougth mails
 		$GLOBALS['refid'] = determineRandomReferalId();
-	} elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (getConfig('def_refid') > 0)) {
+	} elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getConfig('def_refid')))) {
 		// Set default refid as refid in URL
 		$GLOBALS['refid'] = getConfig('def_refid');
 	} else {
@@ -1934,7 +1934,7 @@ function determineReferalId () {
 	}
 
 	// Set cookie when default refid > 0
-	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) {
+	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) {
 		// Default is not found
 		$found = false;
 
diff --git a/inc/gen_refback.php b/inc/gen_refback.php
index 47d20055ba..0ffa66449a 100644
--- a/inc/gen_refback.php
+++ b/inc/gen_refback.php
@@ -47,7 +47,7 @@ loadIncludeOnce('inc/libs/refback_functions.php');
 
 // Sanity-check: Do we have ref level 0?
 $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE `level`=0", __FILE__, __LINE__);
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Remove index temporaly
 	SQL_ALTER_TABLE("ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` DROP INDEX `userid_level`", __FILE__, __LINE__);
 
@@ -78,7 +78,7 @@ ORDER BY
 	u.userid ASC', __FILE__, __LINE__);
 
 // Do we have entries?
-if (SQL_NUMROWS($result_direct) > 0) {
+if (!SQL_HASZERONUMS($result_direct) > 0) {
 	// When 'walk' through all users
 	while ($content = SQL_FETCHARRAY($result_direct)) {
 		// Init level
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 8570debddf..55fb01e9ce 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -151,7 +151,7 @@ function addBonusRanks ($data, $type, $userid) {
 	// Load rankings
 	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
 		array($type, $data), __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Start generating the ranking list
 		$max = SQL_NUMROWS($result);
 
@@ -240,7 +240,7 @@ function handleBonusPoints ($mode) {
 	// Subtract points from...
 	switch (getConfig('bonus_mode')) {
 		case 'JACKPOT': // ... jackpot
-			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (getConfig('bonus_userid') > 0)) {
+			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getConfig('bonus_userid')))) {
 				if ($total >= $points) {
 					// Subtract points from userid's account
 					subtractPointsFromJackpot('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index ba8b2902d0..5e331bd71e 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -86,7 +86,7 @@ LIMIT %s",
 			$limit
 		), __FUNCTION__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List entries
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -146,7 +146,7 @@ function getDoublerTotalPointsLeft() {
 		if (!empty($jackpot)) $points += $jackpot;
 	} // END - if
 
-	if (getConfig('doubler_userid') > 0) {
+	if (isValidUserId(getConfig('doubler_userid'))) {
 		// Get user's points
 		$user = countSumTotalData(getConfig('doubler_userid'), 'user_points', 'points');
 		$points += $user;
diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index da20b81374..246e054dfc 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -366,7 +366,7 @@ ORDER BY
 	`network_short_name` ASC", __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$rows = array();
 		while ($row = SQL_FETCHARRAY($result)) {
@@ -410,7 +410,7 @@ ORDER BY
 		), __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$rows = array();
 		while ($row = SQL_FETCHARRAY($result)) {
@@ -454,7 +454,7 @@ ORDER BY
 	t.`network_type_handle` ASC", __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$rows = array();
 		while ($row = SQL_FETCHARRAY($result)) {
@@ -618,7 +618,7 @@ function doAdminNetworkProcessAddnetworkForm () {
 // Displays selected networks for editing
 function doAdminNetworkProcessHandlenetworkForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Something has been selected, so start displaying one by one
 		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $sel) {
@@ -684,7 +684,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 // Handle network type form
 function doAdminNetworkProcessHandlenetworktypeForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Load network data
 		$networkData = getNetworkDataById(getRequestParameter('network'));
 
@@ -742,7 +742,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 // Handle network request parameter form
 function doAdminNetworkProcessHandlerequestparamsForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Init cache array
 		$GLOBALS['network_params_disabled'] = array();
 
@@ -812,7 +812,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 // Changes given networks
 function doAdminNetworkProcessChangenetworkForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is updated
 		$updated = 0;
 
@@ -857,7 +857,7 @@ function doAdminNetworkProcessChangenetworkForm () {
 // Removes given networks
 function doAdminNetworkProcessRemovenetworkForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is removed
 		$removed = 0;
 
@@ -926,7 +926,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
 // Changes given network type handlers
 function doAdminNetworkProcessChangenetworktypeForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is updated
 		$updated = 0;
 
@@ -977,7 +977,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
 // Changes given network request parameters
 function doAdminNetworkProcessChangenetworkparamForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is updated
 		$updated = 0;
 
@@ -1028,7 +1028,7 @@ function doAdminNetworkProcessChangenetworkparamForm () {
 // Removes given network type handlers
 function doAdminNetworkProcessRemovenetworktypeForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is removed
 		$removed = 0;
 
@@ -1055,7 +1055,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
 // Removes given network request parameters
 function doAdminNetworkProcessRemovenetworkparamForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is removed
 		$removed = 0;
 
diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index 14c8503b62..73ff9147fb 100644
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -59,7 +59,7 @@ function FILTER_UPDATE_ONLINE_LIST () {
 	$isAdmin = 'N';
 
 	// Valid userid?
-	if ((isMemberIdSet()) && (getMemberId() > 0) && (isMember())) {
+	if (isMember()) {
 		// Is valid user
 		$userid = getMemberId();
 		$isMember = 'Y';
diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index 8cdac37d2b..492eeda10e 100644
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -56,7 +56,7 @@ WHERE
 ORDER BY
 	`type` ASC",
 			array($points), __FUNCTION__, __LINE__);
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Now let's check
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Are these points enougth?
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 62bc2a03cb..a840198c4a 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -193,7 +193,7 @@ ORDER BY
 		array($rallye), __FUNCTION__, __LINE__);
 
 	// Entries found?
-	if (SQL_NUMROWS($result_prices) > 0) {
+	if (!SQL_HASZERONUMS($result_prices)) {
 		// Load prices
 		if ($mode == "\n") $prices = '{--RALLYE_MEMBER_PRICES_ADDED--}:' . $mode . '------------------------------' . $mode;
 
@@ -775,7 +775,7 @@ WHERE
 	`expired`='Y'",
 		array($EXPIRE), __FUNCTION__, __LINE__);
 
-	if (SQL_NUMROWS($result_rallye) > 0) {
+	if (!SQL_HASZERONUMS($result_rallye)) {
 		// Init SQLs
 		initSqls();
 
diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index bc50b0a209..69f7fe73ca 100644
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -163,7 +163,7 @@ ORDER BY
 
 	// Entries found?
 	//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):numRows=".SQL_NUMROWS($result)."<br />");
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Add all
 		while ($content = SQL_FETCHARRAY($result)) {
 			//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):rid={$rid},level={$level},userid={$content['userid']}<br />");
@@ -308,7 +308,7 @@ ORDER BY
 		array(bigintval($userid), bigintval($level)), __FUNCTION__, __LINE__);
 
 	// Are there some entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Fetch all entries
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Add row
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index e34ccd2b50..abe48e3d13 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -87,7 +87,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 	$result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ".$AND." ORDER BY `sort` ASC",
 		__FUNCTION__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List alle visible modules (or all to the admin)
 		$OUT .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 76296b04e9..81810de1d1 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -276,18 +276,32 @@ function addSponsorMenu ($current) {
 	if (isAdmin()) $WHERE = '';
 
 	// Load main menu entries
-	$result_main = SQL_QUERY("SELECT action AS main_action, title AS main_title FROM `{?_MYSQL_PREFIX?}_sponsor_menu`
-WHERE (`what`='' OR `what` IS NULL) ".$WHERE."
-ORDER BY `sort`", __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result_main) > 0) {
+	$result_main = SQL_QUERY("SELECT
+	`action` AS `main_action`, `title` AS `main_title`
+FROM
+	`{?_MYSQL_PREFIX?}_sponsor_menu`
+WHERE
+	(`what`='' OR `what` IS NULL)
+	".$WHERE."
+ORDER BY
+	`sort` ASC", __FUNCTION__, __LINE__);
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Load every menu and it's sub menus
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Load sub menus
-			$result_sub = SQL_QUERY_ESC("SELECT what AS sub_what, title AS sub_title FROM `{?_MYSQL_PREFIX?}_sponsor_menu`
-WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$WHERE."
-ORDER BY `sort`",
+			$result_sub = SQL_QUERY_ESC("SELECT
+	`what` AS `sub_what`, `title` AS `sub_title`
+FROM
+	`{?_MYSQL_PREFIX?}_sponsor_menu`
+WHERE
+	`action`='%s' AND
+	`what` != '' AND
+	`what` IS NOT NULL
+	".$WHERE."
+ORDER BY
+	`sort` ASC",
 			array($content['main_action']), __FUNCTION__, __LINE__);
-			if (SQL_NUMROWS($result_sub) > 0) {
+			if (!SQL_HASZERONUMS($result_sub)) {
 				// Load sub menus
 				$SUB = '';
 				while ($content2 = SQL_FETCHARRAY($result_sub)) {
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index fff246464e..9feb142f5a 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -565,7 +565,7 @@ ORDER BY
 		), __FUNCTION__, __LINE__);
 
 	// Is there at least one record?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Then load all!
 		while ($dataRow = SQL_FETCHARRAY($result)) {
 			// Shall we group these results?
@@ -1020,7 +1020,7 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
 function SURFBAR_PAY_POINTS () {
 	// Remove it from the URL owner
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS().'', false);
-	if (SURFBAR_GET_USERID() > 0) {
+	if (isValidUserId(SURFBAR_GET_USERID())) {
 		subtractPoints(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
 	} // END - if
 
@@ -1510,7 +1510,7 @@ ORDER BY
 	array(getMemberId()), __FUNCTION__, __LINE__);
 
 	// Are there entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Load all rows
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Add the row
@@ -1535,7 +1535,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) {
 		array($status), __FUNCTION__, __LINE__);
 
 	// Some entries there?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Load all actions
 		// @TODO This can be somehow rewritten
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index cb5fc1c283..b4ea70bfd0 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -91,7 +91,7 @@ if (!empty($sql)) {
 
 	// Check for accounts to be notified
 	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Normal notification mails or bonus mails?
 		$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 7696dbf933..c236c76b44 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -93,7 +93,7 @@ if (!empty($sql)) {
 
 	// Check for accounts to be notified
 	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Okay lets notify all users!
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Update account
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index e4296a066b..12d20dcf4a 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -256,7 +256,7 @@ ORDER BY
 	`id` DESC", __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		$OUT .= '<ul class="admin_menu_main">';
 		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 		while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
@@ -322,10 +322,10 @@ ORDER BY
 					array($menu), __FUNCTION__, __LINE__);
 
 				// Remember the count for later checks
-				setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($action == $menu)));
+				setAdminMenuHasEntries($menu, ((!SQL_HASZERONUMS($result_what)) && ($action == $menu)));
 
 				// Do we have entries?
-				if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
+				if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
 					$GLOBALS['menu']['description'] = array();
 					$GLOBALS['menu']['title'] = array(); $SUB = true;
 					$OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
@@ -443,7 +443,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 
 	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Load menu as selection
 		$OUT = '<select name="' . $mode . '_menu';
 		if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
@@ -1393,7 +1393,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 			$NAV .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
 
 			// Add userid when we shall show all mails from a single member
-			if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('userid')) > 0)) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
+			if ((isGetRequestParameterSet('userid')) && (isValidUserId(getRequestParameter('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
 
 			// Close open anchor tag
 			$NAV .= '%}">';
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index ecd876f699..abeab6b2fe 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -116,7 +116,7 @@ ORDER BY
 	`task_created` DESC",
 		array(getCurrentAdminId()), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_tasks) > 0) {
+	if (!SQL_HASZERONUMS($result_tasks)) {
 		// New jobs found!
 		$jobsDone = false;
 	} // END - if
diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index ae6c292bd2..f205f3c17b 100644
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -56,7 +56,7 @@ if (!isFormSent()) {
 
 	// Get all available main menus
 	$result = SQL_QUERY("SELECT action, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Read menu structure
 		// @TODO Cant this be rewritten?
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -95,7 +95,7 @@ if (!isFormSent()) {
 		foreach ($menus as $key_main => $value_main) {
 			$result = SQL_QUERY_ESC("SELECT `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 			array($value_main), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Init arrays
 				$menus[$value_main] = array();
 				$titles[$value_main] = array();
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 8e6b10bc6e..d6d95ec5a3 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -53,7 +53,7 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Edit menu entries
 	// @TODO Kill all constants in this file
 	$content['sub'] = $SUB;
@@ -100,7 +100,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 
 	// Load template
 	loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Prepare misc content
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
diff --git a/inc/modules/admin/what-admins_edit.php b/inc/modules/admin/what-admins_edit.php
index 05747bc21e..3826085fc4 100644
--- a/inc/modules/admin/what-admins_edit.php
+++ b/inc/modules/admin/what-admins_edit.php
@@ -58,17 +58,17 @@ if (isGetRequestParameterSet('admin')) {
 	setPostRequestParameter('sel', array($adminId => 1));
 } // END - if
 
-if ((isFormSent('edit')) && (countPostSelection() > 0)) {
+if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit account(s)
 	adminsEditAdminAccount(postRequestArray());
 } elseif ((isFormSent('change')) && (count(postRequestParameter('login')) > 0)) {
 	// Change admin accounts
 	adminsChangeAdminAccount(postRequestArray());
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
 	// Show admin accounts for deletetion
 	adminsDeleteAdminAccount(postRequestArray());
 } else {
-	if ((isFormSent('remove')) && (countPostSelection() > 0)) {
+	if ((isFormSent('remove')) && (ifPostContainsSelections())) {
 		// Remove accounts now
 		adminsRemoveAdminAccount(postRequestArray());
 	} // END - if
diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 6873a5889e..bc6ff230aa 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent('edit')) {
 	// Check if entires are checked
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Add option for events
 		$adminsList = generateOptionList('admins', 'id', 'login', '', 'email');
 		$rows = '';
@@ -118,7 +118,7 @@ ORDER BY
 	m.admin_id ASC,
 	m.mail_template ASC", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Shall I change entries?
 		if (isFormSent('change')) {
 			// Init SQLs
diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php
index 4760a60105..55fa4aa54b 100644
--- a/inc/modules/admin/what-chk_regs.php
+++ b/inc/modules/admin/what-chk_regs.php
@@ -55,7 +55,7 @@ WHERE
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// We have some (new?) registrations!
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index f53b8c206a..25b0fb3980 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if ((isFormSent('edit')) && (countPostSelection() > 0)) {
+if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit ACLs
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $selected) {
@@ -78,7 +78,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
 
 	// Load main template
 	loadTemplate('admin_config_admins_edit', false, $OUT);
-} elseif ((isFormSent('change')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('change')) && (ifPostContainsSelections())) {
 	// Change entries
 	foreach (postRequestParameter('sel') as $id => $selected) {
 		// Secure id
@@ -102,7 +102,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
 
 	// Entries changed
 	loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
 	// Delete ACLs
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $selected) {
@@ -121,7 +121,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
 
 	// Load main template
 	loadTemplate('admin_config_admins_del', false, $OUT);
-} elseif ((isFormSent('remove')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('remove')) && (ifPostContainsSelections())) {
 	// Remove entries
 	// @TODO Rewrite this to filter 'run_sqls'
 	foreach (postRequestParameter('sel') as $id => $selected) {
@@ -193,7 +193,7 @@ VALUES ('%s','%s','%s','%s')",
 	$result_acls = SQL_QUERY('SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `id` ASC', __FILE__, __LINE__);
 
 	// Entries found?
-	if (SQL_NUMROWS($result_acls) > 0) {
+	if (!SQL_HASZERONUMS($result_acls)) {
 		// List ACLs
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result_acls)) {
diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 393d94333e..59fadde8d5 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -111,7 +111,7 @@ if (isFormSent('add')) {
 		// Display message
 		loadTemplate('admin_settings_saved', false, $TEXT);
 	} // END - if
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
 	// Delete categories
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
@@ -135,7 +135,7 @@ if (isFormSent('add')) {
 
 	// Load main template
 	loadTemplate('admin_del_cats', false, $OUT);
-} elseif ((isFormSent('edit')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit categories
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
@@ -165,7 +165,7 @@ if (isFormSent('add')) {
 
 	// Load all categories
 	$result = SQL_QUERY("SELECT `id`, `cat`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Init variables
 		$OUT = '';
 
diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index 8af929b111..88c10a2e39 100644
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -98,7 +98,7 @@ if (isPostRequestParameterSet(('add_max'))) {
 		// Display message
 		loadTemplate('admin_settings_saved', false, $TEXT);
 	} // END - if
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
 	// Delete entries
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
@@ -115,7 +115,7 @@ if (isPostRequestParameterSet(('add_max'))) {
 
 	// Load main template
 	loadTemplate('admin_config_email_del', false, $content);
-} elseif ((isFormSent('edit')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit entries
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
@@ -135,7 +135,7 @@ if (isPostRequestParameterSet(('add_max'))) {
 } else {
 	$result = SQL_QUERY("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
 	__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List already existing entries for editing
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-config_imprint.php b/inc/modules/admin/what-config_imprint.php
index 47ea2b39eb..95e5eaed59 100644
--- a/inc/modules/admin/what-config_imprint.php
+++ b/inc/modules/admin/what-config_imprint.php
@@ -53,7 +53,7 @@ if (isFormSent()) {
 	$result = SQL_QUERY('SELECT `imprint_key`,`imprint_value` FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Load all entries
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-config_mediadata.php b/inc/modules/admin/what-config_mediadata.php
index 7b87200ab3..7a5b8f423a 100644
--- a/inc/modules/admin/what-config_mediadata.php
+++ b/inc/modules/admin/what-config_mediadata.php
@@ -66,8 +66,8 @@ if (isFormSent()) {
 	if (postRequestParameter('mt_stage') <= getTotalConfirmedUser()) {
 		// Not enougth!
 		unsetPostRequestParameter('ok');
-	}
-}
+	} // END - if
+} // END - if
 
 if (isFormSent()) {
 	// Save data
diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index aad70b3f74..809f4be165 100644
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent('edit')) {
 	// Check if at least one module is selected
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Output header
 		$OUT = '';
 
@@ -122,7 +122,7 @@ if (isFormSent('edit')) {
 	loadTemplate('admin_settings_saved', false, '{--ADMIN_MODS_CHANGED--}');
 }
 
-if (countPostSelection() == 0) {
+if (!ifPostContainsSelections()) {
 	// Load module data (We do not need to check if there's at least one...)
 	$result = SQL_QUERY('SELECT
 	`id`, `module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`
diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index de84bf55b0..46e22c3d30 100644
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -84,7 +84,7 @@ VALUES ('%s', %s, %s,'%s','%s','%s','%s','%s','%s','%s')",
 $result_mem = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `status`='NEW' ORDER BY payout_timestamp DESC", __FILE__, __LINE__);
 
 $display = true;
-if ((isFormSent('edit')) && (countPostSelection() > 0)) {
+if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit payout types
 	if ((isGetRequestParameterSet('ok')) && (getRequestParameter('ok') == 'ok')) {
 		// Init SQLs
@@ -141,7 +141,7 @@ LIMIT 1",
 		// Load main template
 		loadTemplate('admin_config_payouts_edit', false, $OUT);
 	}
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
 	// Delete payout types
 	if ((isGetRequestParameterSet('ok')) && (getRequestParameter('ok') == 'ok')) {
 		// Init SQLs
@@ -193,7 +193,7 @@ FROM
 ORDER BY
 	`type` ASC", __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
+if ((!SQL_HASZERONUMS($result_type)) && ($display)) {
 	// List all payout types
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result_type)) {
@@ -209,7 +209,7 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
 } // END - if
 
 // Does your members request payouts?
-if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
+if ((!SQL_HASZERONUMS($result_mem)) && ($display)) {
 	// Members has requested payouts
 	loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=list_payouts%}">{--ADMIN_PAYOUT_LIST_REQUESTS--}</a>');
 } elseif ($display) {
diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 20f6d0f0ee..beff7d490e 100644
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -184,7 +184,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
 	loadTemplate('admin_config_point_settings', false, $content);
 } elseif (getRequestParameter('sub') == 'ref') {
 	// 12                  3     32    2                  3     32    2               3            4     43    21
-	if ((isFormSent('del')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
+	if ((isFormSent('del')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
 		// Delete entries
 		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $value) {
@@ -199,7 +199,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
 
 		// Load main template
 		loadTemplate('admin_points_del', false, $OUT);
-	} elseif ((isFormSent('edit')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
+	} elseif ((isFormSent('edit')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
 		// Edit entries
 		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $value) {
@@ -217,7 +217,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
 	} else {
 		// Referal levels
 		$result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Make referal levels editable and deletable
 			$OUT = '';
 
diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 693e7f057c..1d211e3d10 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -77,7 +77,7 @@ if (isGetRequestParameterSet('rallye')) {
 		}
 	} elseif (isFormSent('remove')) {
 		// Check if at last one line is selected
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// Delete selected entries
 			foreach (postRequestParameter('sel') as $id => $sel) {
 				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
@@ -121,7 +121,7 @@ LIMIT 1",
 
 	if (isFormSent('edit')) {
 		// Check if at last one line is selected
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// Make selected editable
 			$OUT = '';
 			foreach (postRequestParameter('sel') as $id => $sel) {
@@ -153,7 +153,7 @@ LIMIT 1",
 		}
 	} elseif (isFormSent('del')) {
 		// Check if at last one line is selected
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// List all prices
 			$OUT = '';
 			foreach (postRequestParameter('sel') as $id => $sel) {
@@ -183,7 +183,7 @@ LIMIT 1",
 		$result = SQL_QUERY_ESC("SELECT `id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC",
 			array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
 
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Load all prices for the selected rallye
 			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
@@ -221,7 +221,7 @@ ON
 	d.admin_id=a.id
 ORDER BY
 	d.start_time DESC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List found rallyes
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 66004b2f8e..55b4d6159e 100644
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Shall I delete selected holidays???
-if (countPostSelection() > 0) {
+if (ifPostContainsSelections()) {
 	// Delete multiple holiday requests (for list_holiday)
 	$cnt = '0';
 	foreach (postRequestParameter('sel') as $id => $sel) {
diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index 0681df69ac..3b578c409c 100644
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent('del')) {
 	// Delete entries from tables
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Init SQLs
 		initSqls();
 
@@ -73,7 +73,7 @@ ORDER BY
 	`trans_id` ASC', __FILE__, __LINE__);
 
 $total = '0';
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Output rows
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 6cc821b374..0ecb55d49f 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -58,7 +58,7 @@ ORDER BY
 	`timestamp` ASC", __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	if (isFormSent()) {
 		// Make mail editable...
 		$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index d08304294e..e5f66afc11 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -77,7 +77,7 @@ $numPages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 0.5);
 // Free the result which we don't need
 SQL_FREERESULT($result_maximum);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Mail orders are in pool so we can display them
 
 	// Add navigation table rows
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 60f0462e39..0e5023dc8e 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -153,7 +153,7 @@ if (isConfigEntrySet('mails_page')) {
 SQL_FREERESULT($result_normal);
 
 $MAIL = false;
-if (SQL_NUMROWS($result_list) > 0) {
+if (!SQL_HASZERONUMS($result_list)) {
 	// Init rows
 	$OUT = '';
 
@@ -195,13 +195,13 @@ if (SQL_NUMROWS($result_list) > 0) {
 	$MAIL = true;
 	if ((isExtensionActive('bonus')) && (empty($WHO))) {
 		// Only check if bonus extension is active
-		if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
+		if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
 	} // END - if
 }
 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
 	// Load bonus mails only when extension is active
-	if (SQL_NUMROWS($result_bonus) > 0) {
+	if (!SQL_HASZERONUMS($result_bonus)) {
 		// Calculate pages
 		$numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
 
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index aad057e0f9..1da8cee398 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -52,7 +52,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 	// We are about to register a new extension
 	$do = 'register'; $taskId = bigintval(getRequestParameter('reg_ext'));
 	// The id comes from task management and it is - of course - *not* the extension's name!
-} elseif ((isFormSent('change')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('change')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// De-/activate extensions
 	foreach (postRequestParameter('sel') as $taskId => $active) {
 		// Shall we keep the extension always active?
@@ -73,7 +73,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 	// Redirect to prevent missing cache in js.php
 	redirectToUrl('modules.php?module=admin&amp;what=extensions&amp;changed=' . countPostSelection());
-} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('modify'))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('modify'))) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change settings like CSS file load
 	if (isPostRequestParameterSet('modify')) {
 		// Change entries
@@ -160,7 +160,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 		loadTemplate('admin_extensions_edit', false, $OUT);
 		$do = 'edit';
 	}
-} elseif ((isPostRequestParameterSet('delete')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestParameterSet('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// List extensions and when verbose is enabled SQL statements which will be executed
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $taskId => $sel) {
@@ -208,7 +208,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 	// Load template
 	loadTemplate('admin_extensions_delete', false, $OUT);
 	$do = 'delete';
-} elseif ((isFormSent('remove')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('remove')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Remove extensions from DB (you have to delete all files manually!)
 	$cache_update = '0';
 	foreach (postRequestParameter('sel') as $taskId => $active) {
@@ -287,7 +287,7 @@ ORDER BY
 		}
 
 		// Are there some entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Extensions are registered
 			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 423415b7bb..d86210f531 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -64,7 +64,7 @@ WHERE
 	(`what`='' OR `what` IS NULL)
 ORDER BY
 	`sort` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Read menu structure
 		// @TODO Cant this be rewritten?
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -112,7 +112,7 @@ WHERE
 	`what` IS NOT NULL
 ORDER BY `sort` ASC",
 				array($value_main), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Initialize arrays
 				$menus[$value_main] = array();
 				$titles[$value_main] = array();
diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index eb779a1f35..78a6d96ffd 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -54,7 +54,7 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Edit menu entries
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
@@ -98,7 +98,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 
 	// Load template
 	loadTemplate('admin_gmenu_edit_form', false, $content);
-} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Del menu entries with or without confirmation
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
@@ -176,7 +176,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
 			break;
 	} // END - switch
-} elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change status (visible / locked)
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index aa8f843ec6..1d2cd22b69 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -48,11 +48,7 @@ addMenuDescription('admin', __FILE__);
 // Exclude default referal id if set
 // @TODO Rewrite those lines to filter
 $EXCLUDE_LIST = '';
-if (getConfig('def_refid') > 0) {
-	$EXCLUDE_LIST = ' AND d.userid != {?def_refid?}';
-} // END - if
-
-// Check for more extensions
+if (getConfig('def_refid') > 0)                $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
 if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}';
 if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}';
 if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}';
@@ -72,7 +68,7 @@ WHERE
 ORDER BY
 	d.userid ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Ok, we have found some inactive accounts
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php
index fb6f1e8321..e388fc0ccc 100644
--- a/inc/modules/admin/what-list_bank_package.php
+++ b/inc/modules/admin/what-list_bank_package.php
@@ -87,7 +87,7 @@ ORDER BY
 	`id` ASC", __FILE__, __LINE__);
 
 // Is there at lease one package?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all packages
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 954a70a92f..51281d1a6f 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -73,7 +73,7 @@ ORDER BY
 	`last_online` DESC,
 	`userid` ASC", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List users
 		$OUT = ''; $cnt = 1; $total = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 2cf00c09d6..d3b45396ac 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -91,7 +91,7 @@ ORDER BY
 	`userid` ASC",
 		array($ONLINE), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List users
 		$OUT = ''; $cnt = 1; $total = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 9659b0bde8..74ae670e96 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -60,7 +60,7 @@ if (isGetRequestParameterSet('userid')) {
 		// Ok, list categories of this user
 		$result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
 
-		if (SQL_NUMROWS($result_cats) > 0) {
+		if (!SQL_HASZERONUMS($result_cats)) {
 			// List categories
 			$cnt = 1; $OUT = '';
 			while ($row = SQL_FETCHARRAY($result_cats)) {
diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index fe0e6b9ee7..a419063cf5 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -170,12 +170,12 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
 		// Display message
 		loadTemplate('admin_settings_saved', false, $message);
-	}
+	} // END - if
 
 	// Load currenty setup country codes to list
 	$result = SQL_QUERY('SELECT id, code, descr, is_active FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY code',
 	__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all countries
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index b6573bb1dd..f2d29b2723 100644
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -57,7 +57,7 @@ ON
 ORDER BY
 	h.userid ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all holiday requests
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php
index 5946800572..47f3b62189 100644
--- a/inc/modules/admin/what-list_network_params.php
+++ b/inc/modules/admin/what-list_network_params.php
@@ -98,7 +98,7 @@ ORDER BY
 		array(getRequestParameter('network')), __FILE__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$OUT = '';
 		while ($row = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php
index c6ca40c374..3f2b02ec76 100644
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -83,7 +83,7 @@ ORDER BY
 		array(getRequestParameter('network')), __FILE__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$OUT = '';
 		while ($row = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php
index 62123ad33c..c9e26e2c16 100644
--- a/inc/modules/admin/what-list_networks.php
+++ b/inc/modules/admin/what-list_networks.php
@@ -72,7 +72,7 @@ ORDER BY
 	`network_short_name` ASC', __FILE__, __LINE__);
 
 // Do we have entries?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 5509489086..deb3f600a9 100644
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -78,12 +78,12 @@ $add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequ
 // Add limitation
 if (!empty($SQL2)) $SQL2 .= $add;
 
-if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2))) {
+if ((isExtensionActive('bonus')) && (!SQL_HASHZERONUMS($result_max)) && (!empty($SQL2))) {
 	// Run SQL query for notification mails
 	$result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 	// Load bonus mails only when extension is active
-	if (SQL_NUMROWS($result_bonus) > 0) {
+	if (!SQL_HASZERONUMS($result_bonus)) {
 		// Calculate pages
 		$numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
 
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 2f5d98b20b..7e10f9a4f7 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -233,7 +233,7 @@ ON
 ORDER BY
 	p.payout_timestamp DESC", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List found payouts
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php
index b49af4ed8b..a707841391 100644
--- a/inc/modules/admin/what-list_primera.php
+++ b/inc/modules/admin/what-list_primera.php
@@ -56,7 +56,7 @@ ORDER BY
 	__FILE__, __LINE__);
 
 // Are there some entries to display?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all entries
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 65cf9f270d..fa0d0a2ee9 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -104,7 +104,7 @@ if (isGetRequestParameterSet('rallye')) {
 	runFilterChain('run_sqls');
 } elseif (isFormSent('remove')) {
 	// Delete rallyes
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Init SQLs
 		initSqls();
 
@@ -130,7 +130,7 @@ if (isGetRequestParameterSet('rallye')) {
 	}
 } elseif (isFormSent('change')) {
 	// Change rallye
-	if (countSelection(postRequestParameter('title')) > 0) {
+	if (ifPostContainsSelections('title')) {
 		// Init SQLs
 		initSqls();
 
@@ -179,7 +179,7 @@ LIMIT 1",
 
 if (isFormSent('edit')) {
 	// Check for selections
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Make all selected and deactivated rallyes editable
 		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $selected) {
@@ -239,7 +239,7 @@ WHERE
 ORDER BY
 	`userid` ASC",
 		array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		$OUT = '';
 		$content['rallye'] = getRequestParameter('rallye');
 		while ($row = SQL_FETCHARRAY($result)) {
@@ -295,7 +295,7 @@ ORDER BY
 	`start_time` DESC", __FILE__, __LINE__);
 
 	// Records found?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List found rallyes
 		$OUT = '';
 		while ($data = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php
index 70ab759ac2..55e70338d0 100644
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -73,7 +73,7 @@ ORDER BY
 	`level` ASC", __FILE__, __LINE__);
 
 		// Are there some levels (VERY BAD IF NONE!)
-		if (SQL_NUMROWS($result_levels) > 0) {
+		if (!SQL_HASZERONUMS($result_levels)) {
 			// List all ref levels or entries if no refback is installed
 			$OUT = '';
 			while ($levels = SQL_FETCHARRAY($result_levels)) {
@@ -85,7 +85,7 @@ ORDER BY
 					//* DEBUG: */ debugOutput($userid.'/'.$levels['level'].'/'.SQL_NUMROWS($result_refs));
 
 					// Do we have levels?
-					if (SQL_NUMROWS($result_refs) > 0) {
+					if (!SQL_HASZERONUMS($result_refs)) {
 						// Count entries
 						$menge =     countSumTotalData($userid, 'user_data', 'userid', 'refid', true);
 						$menge_lck = countSumTotalData($userid, 'user_data', 'userid', 'refid', true, " AND `status` != 'CONFIRMED'");
diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 1fd3ed5270..32ad71a64a 100644
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -107,7 +107,7 @@ ORDER BY
 	`id` ASC",
 		array(bigintval(getRequestParameter('rid'))), __FILE__, __LINE__);
 
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// List refs now
 			// Free memory
 			SQL_FREERESULT($result);
@@ -129,7 +129,7 @@ FROM
 ORDER BY
 	`id` ASC", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// At least one sponsor found!
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result_main)) {
diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index 7375e79285..dee8f22e8c 100644
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -183,7 +183,7 @@ ORDER BY
 		__FILE__, __LINE__);
 
 	// Do we have some paytypes setup?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Prepare variables for listing
 		$OUT = '';
 
diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index afacd0579a..29dcdb6519 100644
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -58,7 +58,7 @@ ORDER BY
 	`actions_action` ASC", __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all entries
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 105a80be10..d8ab249666 100644
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -175,7 +175,7 @@ ORDER BY
 	`url_id` ASC", __FILE__, __LINE__);
 
 // Do we have some URLs left?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all URLs
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 32469cadf7..f9884af24a 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -85,7 +85,7 @@ switch (getRequestParameter('type')) {
 } // END - switch
 
 if (!empty($whereStatement)) {
-	if ((isPostRequestParameterSet('assign')) && (countPostSelection() > 0)) {
+	if ((isPostRequestParameterSet('assign')) && (ifPostContainsSelections())) {
 		// Assign / do tasks
 		loadIncludeOnce('inc/modules/admin/overview-inc.php');
 		if (empty($dmy)) $dmy = '';
@@ -104,7 +104,7 @@ ORDER BY
 	`subject` ASC,
 	`task_created` DESC',
 			__FILE__, __LINE__);
-		if ((countPostSelection() > 0) && (!isDemoModeActive())) {
+		if ((ifPostContainsSelections()) && (!isDemoModeActive())) {
 			// Only unassign / delete tasks when there are selected tasks posted
 			if (isPostRequestParameterSet('unassign')) {
 				// Unassign from tasks
diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php
index a66c6acfd2..41a3cb9546 100644
--- a/inc/modules/admin/what-list_transfer.php
+++ b/inc/modules/admin/what-list_transfer.php
@@ -54,7 +54,7 @@ ORDER BY
 	`trans_id` ASC', __FILE__, __LINE__);
 
 $total = '0';
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Output rows
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index f28d7376d3..6e78f65d9e 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -239,7 +239,7 @@ LIMIT 1",
 	$result = SQL_QUERY($sql, __FILE__, __LINE__);
 
 	// Are there some entries?
-	if (SQL_NUMROWS($result_master) > 0) {
+	if (!SQL_HASZERONUMS($result_master)) {
 		// We have some (new?) registrations!
 		$templateContent['colspan2']   = ($colspan + 2);
 		$templateContent['user_count'] = getTotalConfirmedUser();
diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php
index 418e8c11e5..333b916556 100644
--- a/inc/modules/admin/what-list_wernis.php
+++ b/inc/modules/admin/what-list_wernis.php
@@ -56,7 +56,7 @@ ORDER BY
 	__FILE__, __LINE__);
 
 // Are there some entries to display?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all entries
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 102e4ca1bb..61be3eca8e 100644
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -60,7 +60,7 @@ if (!isFormSent()) {
 	// Get all available main menus
 	$result = SQL_QUERY("SELECT `action`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC",
 		__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Read menu structure
 		// @TODO Cant this be rewritten?
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -101,7 +101,7 @@ if (!isFormSent()) {
 		foreach ($menus as $key_main => $value_main) {
 			$result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort`",
 			array($value_main), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Initialize arrays
 				$menus[$value_main] = array();
 				$titles[$value_main] = array();
diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index 0349a74b35..82f666c408 100644
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -54,7 +54,7 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Edit menu entries
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
@@ -96,7 +96,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 
 	// Load template
 	loadTemplate('admin_mmenu_edit', false, $content);
-} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Del menu entries with or without confirmation
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
@@ -134,7 +134,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 
 	// Load template
 	loadTemplate('admin_mmenu_delete', false, $content);
-} elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change status (visible / locked)
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index 7edb41e4b9..1df93ee820 100644
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -89,7 +89,7 @@ if (isFormSent()) {
 
 	// Output template
 	loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
 	// Delete entries here
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
@@ -111,7 +111,7 @@ if (isFormSent()) {
 
 	// Load main template
 	loadTemplate('admin_del_payments', false, $OUT);
-} elseif ((isFormSent('edit')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit entries
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
@@ -138,7 +138,7 @@ if (isFormSent()) {
 } else {
 	// Referal levels
 	$result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Make referal levels editable and deletable
 		$OUT = '';
 
diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index 33635e8eef..8f23c36e46 100644
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -104,7 +104,7 @@ VALUES ('%s','%s','%s')",
 
 	// Display message
 	loadTemplate('admin_settings_saved', false, $content);
-} elseif ((countPostSelection() > 0) && (isFormSent('edit'))) {
+} elseif ((ifPostContainsSelections()) && (isFormSent('edit'))) {
 	// Edit banner
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $sel) {
@@ -124,7 +124,7 @@ VALUES ('%s','%s','%s')",
 	// Load main template
 	loadTemplate('admin_refbanner_edit', false, $OUT);
 } else {
-	if ((countPostSelection() > 0) && (isFormSent('del'))) {
+	if ((ifPostContainsSelections()) && (isFormSent('del'))) {
 		// Delete banner
 		foreach (postRequestParameter('sel') as $id => $sel) {
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1",
@@ -136,7 +136,7 @@ VALUES ('%s','%s','%s')",
 	$result = SQL_QUERY('SELECT `id`, `url`, `alternate`, `visible`, `counter`, `clicks` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `url` ASC', __FILE__, __LINE__);
 
 	// Entries found?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Make referal banner editable and deletable
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php
index 5e99503109..32b6e415d3 100644
--- a/inc/modules/admin/what-repair_cats.php
+++ b/inc/modules/admin/what-repair_cats.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 // Go through all categories
 $result = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` GROUP BY `userid` ORDER BY `userid` ASC", __FILE__, __LINE__);
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	 // Nothing is removed for now... ;-)
 	$REMOVED = '0';
 
diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 5458ff6e5f..2d9eaef8a6 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -54,7 +54,7 @@ WHERE
 	`status`='CONFIRMED' AND `nl_receive`='Y'
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Members are available so we can send out the newsletter!
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Construct mail...
diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php
index 161c0d0eb9..1790adc248 100644
--- a/inc/modules/admin/what-surfbar_stats.php
+++ b/inc/modules/admin/what-surfbar_stats.php
@@ -61,7 +61,7 @@ ORDER BY
 		array(bigintval(getRequestParameter('url_id'))), __FILE__, __LINE__);
 
 	// Entries found?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Get all rows
 		$OUT = ''; $cnt = '0'; $visits = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -104,7 +104,7 @@ ORDER BY
 	`stats_userid` ASC", __FILE__, __LINE__);
 
 	// Entries found?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Get all rows
 		$OUT = ''; $urlArray = '0'; $visits = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 6fc4f50557..cc0f464db5 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -51,7 +51,7 @@ if (!isExtensionActive('theme')) {
 } // END - if
 
 // Check for selected themes
-if (countPostSelection() > 0) {
+if (ifPostContainsSelections()) {
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $sel) {
 		$sql = '';
@@ -113,7 +113,7 @@ FROM
 ORDER BY
 	`theme_path` ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Construct IFN
 		$inc = sprintf("theme/%s/theme.php", $content['theme_path']);
diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index a7c5a861df..881f9c21c7 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -55,9 +55,9 @@ WHERE
 ORDER BY
 	`timestamp` ASC", __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result_main) > 0) || (isFormSent('lock'))) {
+if ((!SQL_HASZERONUMS($result_main)) || (isFormSent('lock'))) {
 	if (isFormSent('accept')) {
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// Accept mail orders
 			foreach (postRequestParameter('sel') as $id => $value) {
 				// Secure id number
@@ -124,7 +124,7 @@ LIMIT 1",
 		// Mails unlocked for mail delivery
 		loadTemplate('admin_settings_saved', false, $message);
 	} elseif (isPostRequestParameterSet(('reject'))) {
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// Reject mail orders
 			$OUT = '';
 			foreach (postRequestParameter('sel') as $id => $value) {
@@ -168,7 +168,7 @@ LIMIT 1",
 			// Nothing selected
 			loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}');
 		}
-	} elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
+	} elseif ((isFormSent('lock')) && (ifPostContainsSelections()) && (getConfig('url_blacklist') == 'Y')) {
 		// Lock URLs
 		foreach (postRequestParameter('sel') as $id => $url) {
 			// Secure id number
diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 06d20c510f..ba14bdff29 100644
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -48,7 +48,7 @@ addMenuDescription('admin', __FILE__);
 // Check if admin has submitted form
 if (isFormSent()) {
 	// Does he have selected at least one sponsor?
-	if (countSelection(postRequestParameter('id')) > 0) {
+	if (ifPostContainsSelections('id')) {
 		// At least one entry selected
 		foreach (postRequestParameter('id') as $id => $selected) {
 			// Secure id number and init $content
@@ -87,7 +87,7 @@ WHERE
 ORDER BY
 	sp.pay_name ASC",
 					array($content['id']), __FILE__, __LINE__);
-				if (SQL_NUMROWS($result) > 0) {
+				if (!SQL_HASZERONUMS($result)) {
 					// Payment does exist
 					while ($content2 = SQL_FETCHARRAY($result)) {
 						// Merge both arrays
@@ -196,7 +196,7 @@ WHERE
 ORDER BY
 	`id`", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Entries found so let's list them!
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php
index 6dc57d0511..0eb908dd5d 100644
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -80,7 +80,7 @@ ORDER BY
 	`url_id` ASC", __FILE__, __LINE__);
 
 // Do we have some URLs left?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all URLs
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index fbc6143f48..22c4a00e44 100644
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -59,7 +59,7 @@ if (isExtensionActive('online')) {
 	// Check for online users
 	$result = SQL_QUERY("SELECT `id`, `ip`, `userid`, `refid`, `module`, `action`, `what`, `is_member`, `is_admin`, `timestamp` FROM `{?_MYSQL_PREFIX?}_online` ORDER by `timestamp` DESC",
 		__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all online users
 		$OUT = '';
 		while ($row = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index 17e4d33797..7e017196db 100644
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -68,7 +68,7 @@ ORDER BY
 LIMIT {?active_limit?}", __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// At least one member was online so let's load them all
 	$OUT = '';
 	while (list($userid, $nick, $last) = SQL_FETCHROW($result)) {
diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index a6d7246e9f..ae57f8345b 100644
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -62,7 +62,7 @@ LEFT JOIN `{?_MYSQL_PREFIX?}_sponsor_registry` AS r ON m.what=r.ext_name
 WHERE m.`action`='actions' AND r.is_active='Y'
 ORDER BY m.sort ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result_act) > 0) {
+if (!SQL_HASZERONUMS($result_act)) {
 	// Load all actions
 	$OUT_ACT = '';
 	while ($content = SQL_FETCHARRAY($result_act)) {
@@ -80,7 +80,7 @@ if (SQL_NUMROWS($result_act) > 0) {
 
 	// Check for pay types
 	$result_pay = SQL_QUERY('SELECT `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` ORDER BY `pay_name` ASC', __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_pay) > 0) {
+	if (!SQL_HASZERONUMS($result_pay)) {
 		// Load all pay types
 		$OUT_PAY = '';
 		while ($content = SQL_FETCHARRAY($result_pay)) {
diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 28673055b3..a689431833 100644
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -285,7 +285,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_sponsor_paytypes`
 ORDER BY 
 	pay_name` ASC', __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Load all types...
 		// @TODO Swap this HTML code to templates
 		$OUT = '<table border="0" cellspacing="0" cellpadding="0" width="300" class="left right top">';
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 38ea6bbf47..9dd3fe9102 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -194,7 +194,7 @@ switch (getConfig('guest_stats')) {
 		$mem_t10   = SQL_QUERY("SELECT `counter`, `title` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `counter` > 0".$AND." ORDER BY `counter` DESC LIMIT 0,10", __FILE__, __LINE__);
 		$OUT = ''; 
 
-		if (SQL_NUMROWS($guest_t10) > 0) {
+		if (!SQL_HASZERONUMS($guest_t10)) {
 			// Guest clicks
 			$OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_GUEST_STATS--}');
 			while ($content = SQL_FETCHARRAY($guest_t10)) {
@@ -203,7 +203,7 @@ switch (getConfig('guest_stats')) {
 			} // END - while
 		} // END - if
 
-		if (SQL_NUMROWS($mem_t10) > 0) {
+		if (!SQL_HASZERONUMS($mem_t10)) {
 			// Member clicks
 			$OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_MEMBER_STATS--}');
 			while ($content = SQL_FETCHARRAY($mem_t10)) {
@@ -212,7 +212,7 @@ switch (getConfig('guest_stats')) {
 			} // END - while
 		} // END - if
 
-		if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) {
+		if ((!SQL_HASZERONUMS($guest_t10)) || (!SQL_HASZERONUMS($mem_t10))) {
 			// Prepare content
 			$content = array(
 				'rows'   => $OUT,
diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index 7a29cbe3e1..126a08492f 100644
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -70,7 +70,7 @@ $rdf->set_Options(
 );
 
 // Use proxy?
-if ((getConfig('proxy_host') != '') && (getConfig('proxy_port') > 0)) {
+if (isProxyUsed()) {
 	// Set proxy data
 	$rdf->set_proxy(getConfig('proxy_host'), getConfig('proxy_port'));
 
diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index b5f03912f6..a0ff700d63 100644
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -81,7 +81,7 @@ LIMIT {?beg_ranks?}",
 
 // Reset temporary variable and check for users
 $OUT = '';
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Load our winners...
 	$cnt = 1;
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index c6191e92ff..6f88dcfa5d 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -94,7 +94,7 @@ LIMIT {?bonus_ranks?}",
 
 // Reset temporary variable and check for users
 $OUT = '';
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Load our winners...
 	$cnt = 1;
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index d6744299fa..281248a795 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -444,7 +444,7 @@ FROM
 ".$whereStatement."
 ORDER BY
 	`sort` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_cats) > 0) {
+	if (!SQL_HASZERONUMS($result_cats)) {
 		if ($total > 0) {
 			// Initialize array...
 			$categories = array(
@@ -534,7 +534,7 @@ LIMIT 1",
 			$result = SQL_QUERY("SELECT `id`, `price`, `payment`, `mail_title` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `payment` ASC", __FILE__, __LINE__);
 
 			$types = array();
-			if (SQL_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Check for message id in URL
 				$message = getMessageFromErrorCode(getRequestParameter('code'));
 
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 246e0e3140..edb05b8042 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -77,7 +77,7 @@ WHERE
 ORDER BY
 	`type` ASC",
 		array($totalPoints), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Free memory
 		SQL_FREERESULT($result);
 
@@ -95,7 +95,7 @@ WHERE
 ORDER BY
 	p.payout_timestamp DESC",
 			array(getMemberId()), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result_payouts) > 0) {
+		if (!SQL_HASZERONUMS($result_payouts)) {
 			// List all his requests
 			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result_payouts)) {
diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index 128e19c846..b69124c94c 100644
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -108,7 +108,7 @@ ORDER BY
 	r.level ASC', __FILE__, __LINE__);
 
 // Are there some entries? (Shall be!)
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all levels
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php
index 2e838689b8..c25d3ff012 100644
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -69,7 +69,7 @@ $whereStatement = " WHERE `visible`='Y'";
 if (isAdmin()) $whereStatement = '';
 $result = SQL_QUERY("SELECT `id`, `url`, `alternate`, `counter`, `clicks` FROM `{?_MYSQL_PREFIX?}_refbanner`", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List available ref banners
 	$OUT = '';
 	while ($row = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php
index d4b3e97f5e..cc34322a03 100644
--- a/inc/modules/member/what-reflist.php
+++ b/inc/modules/member/what-reflist.php
@@ -59,7 +59,7 @@ ORDER BY
 	`level` ASC', __FILE__, __LINE__);
 
 // Are there some entries? (Shall be!)
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all levels
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index 510dc049db..8a37457834 100644
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -63,7 +63,7 @@ ORDER BY
 	array(getMemberId()), __FILE__, __LINE__);
 
 // Are there mails left in pool?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Load all orders
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
@@ -95,7 +95,7 @@ ORDER BY
 	`timestamp_ordered` DESC",
 	array(getMemberId()), __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Mail orders are in pool so we can display them
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 699dc3d867..aad5bf37e2 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -88,7 +88,7 @@ switch ($mode) {
 			$valid_reason = (isPostRequestParameterSet('reason'));
 
 			// Test if a recipient is selected
-			$valid_recipient = (postRequestParameter('to_userid') > 0);
+			$valid_recipient = isValidUserId(postRequestParameter('to_userid'));
 
 			// Check for nickname extension and set additional data
 			// @TODO Rewrite this to a filter
@@ -215,7 +215,7 @@ switch ($mode) {
 					array(getMemberId()), __FILE__, __LINE__);
 			}
 
-			if (SQL_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Load list
 				$OUT  = "<select name=\"to_userid\" size=\"1\" class=\"member_select\">
 	<option value=\"0\">{--SELECT_NONE--}</option>\n";
@@ -299,7 +299,7 @@ switch ($mode) {
 		$result = SQL_QUERY_ESC($sql, array(getMemberId()), __FILE__, __LINE__);
 
 		// Do we have entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			$OUT = '';
 			// @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
 			while (list($tid, $userid, $points, $reason, $stamp) = SQL_FETCHROW($result)) {
@@ -385,7 +385,7 @@ KEY (`party_userid`)
 		SQL_FREERESULT($result);
 
 		$total = '0';
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Search for entries
 			$result = SQL_QUERY("SELECT `party_userid`, `trans_id`, `points`, `reason`, `time_trans`, `trans_type` FROM `{?_MYSQL_PREFIX?}_transfers_tmp` ORDER BY `time_trans` DESC",
 				__FILE__, __LINE__);
diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 48178e2cfe..bb59e8151c 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -133,7 +133,7 @@ if (isExtensionActive('bonus')) {
 }
 
 // Mails left for confirmation?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Please confirm these mails!
 	$sum = '0'; $OUT = '';
 
diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 1bdd5295ac..c74ea9f6c5 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -57,7 +57,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
 	$whereStatement1 = '';
 
 	// Shall we exclude webmaster's own userid?
-	if ((getConfig('beg_include_own') != 'Y') && (getConfig('beg_userid') > 0)) {
+	if ((getConfig('beg_include_own') != 'Y') && (isValidUserId(getConfig('beg_userid')))) {
 		// Exclude it
 		$whereStatement1 = " AND `userid` != {?beg_userid?}";
 	} // END - if
@@ -84,7 +84,7 @@ ORDER BY
 	`userid` ASC
 LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Load our winners...
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Add points to user's account directly
diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 7ad2c9fdd6..516e43a0d2 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -90,7 +90,7 @@ ORDER BY
 LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
 
 	// Some entries were found?
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Load our winners...
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Make sure zero points are not mailed
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 322626c01f..283fd4b02d 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -208,7 +208,7 @@ ORDER BY
 		array($mode), __FUNCTION__, __LINE__);
 
 	//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// There are menus available, so we simply display them... :)
 		$GLOBALS['rows'] = '';
 		while ($content = SQL_FETCHARRAY($result_main)) {
@@ -237,7 +237,7 @@ ORDER BY
 				array($mode, $content['action']), __FUNCTION__, __LINE__);
 
 			// Do we have some entries?
-			if (SQL_NUMROWS($result_sub) > 0) {
+			if (!SQL_HASZERONUMS($result_sub)) {
 				// Init counter
 				$cnt = '0';
 
@@ -601,7 +601,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 	}
 
 	// Some entries are found?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			$OUT .= '      <option value="' . $content['value'] . '"';
@@ -1075,7 +1075,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 			} // END - if
 
 			// Points updated, maybe I shall send him an email?
-			if (($sendNotify === true) && (getUserData('refid') > 0) && ($locked === false)) {
+			if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
 				// Prepare content
 				$content = array(
 					'percents' => $per,
@@ -1104,7 +1104,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 			}
 
 			// Maybe there's another ref?
-			if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
+			if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
 				// Then let's credit him here...
 				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
 				addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
@@ -1405,7 +1405,7 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
 			), __FUNCTION__, __LINE__);
 
 		// Do we have rows?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
 			// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 			while (list($value, $title, $add) = SQL_FETCHROW($result)) {
@@ -1620,7 +1620,7 @@ function generateCategoryOptionsList ($mode) {
 		__FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// ... and begin loading stuff
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Transfer some data
@@ -1827,7 +1827,7 @@ ORDER BY
 		), __FUNCTION__, __LINE__);
 
 	// Are there some entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Fetch all entries
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Get total points of this user
@@ -1879,7 +1879,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 		array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
 
 	// Are there entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Now load all userids for one big query!
 		$userids = array();
 		while ($data = SQL_FETCHARRAY($result)) {
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index c9bee512e0..b9fffa4cf1 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -63,7 +63,7 @@ if (isExtensionActive('html_mail')) {
 
 // Reset variables
 $cnt2 = '0'; $lastSentId = '0'; $cnt_back = array(0); $pointsBack = array(0);
-if (SQL_NUMROWS($result_main) > 0) {
+if (!SQL_HASZERONUMS($result_main)) {
 	// Parse all mails
 	while ($DATA = SQL_FETCHARRAY($result_main, 0, false)) {
 		// Set mail order as 'active'. That means it will be sent out
diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 6e7116e2c1..e19ca6dc54 100644
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -62,7 +62,7 @@ ORDER BY
 __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result_main) > 0) {
+if (!SQL_HASZERONUMS($result_main)) {
 	// Init SQLs
 	initSqls();
 
diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index 5cfe43e12e..16001ed856 100644
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -64,7 +64,7 @@ ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
 	// Do we have some notifications to sent?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// We need to send-out notifications...
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Translate timestamp
diff --git a/inc/template-functions.php b/inc/template-functions.php
index aea217a7fa..59354c3b2a 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -458,7 +458,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 
 	// Load user's data
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UID={$userid},template={$template},content[]=".gettype($content));
-	if (($userid > 0) && (is_array($content))) {
+	if ((isValidUserId($userid)) && (is_array($content))) {
 		// If nickname extension is installed, fetch nickname as well
 		if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NICKNAME!<br />");
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 1abc3ca5de..6af2c038bd 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -499,23 +499,14 @@ function isConfigLocalLoaded () {
 
 // Checks wether a nickname or userid was entered and caches the result
 function isNicknameUsed ($userid) {
-	// Default is false
-	$isUsed = false;
-
 	// Is the cache there
-	if (isset($GLOBALS['is_nickname_used'][$userid])) {
-		// Then use it
-		$isUsed = $GLOBALS['is_nickname_used'][$userid];
-	} else {
+	if (!isset($GLOBALS['is_nickname_used'][$userid])) {
 		// Determine it
-		$isUsed = (('' . round($userid) . '') != $userid);
-
-		// And write it to the cache
-		$GLOBALS['is_nickname_used'][$userid] = $isUsed;
-	}
+		$GLOBALS['is_nickname_used'][$userid] = (('' . round($userid) . '') != $userid);
+	} // END - if
 
 	// Return the result
-	return $isUsed;
+	return $GLOBALS['is_nickname_used'][$userid];
 }
 
 // Getter for 'what' value
@@ -885,7 +876,7 @@ function getCurrentUserId () {
 
 // Checks if current userid is set
 function isCurrentUserIdSet () {
-	return ((isset($GLOBALS['current_userid'])) && ($GLOBALS['current_userid'] > 0));
+	return ((isset($GLOBALS['current_userid'])) && (isValidUserId($GLOBALS['current_userid'])));
 }
 
 // Checks wether we are debugging template cache
@@ -908,7 +899,7 @@ function getFetchedUserData ($keyColumn, $userid, $valueColumn) {
 		$data = '{--USERNAME_GUEST--}';
 
 		// Can we fetch the user data?
-		if (($userid > 0) && (fetchUserData($userid, $keyColumn))) {
+		if ((isValidUserId($userid)) && (fetchUserData($userid, $keyColumn))) {
 			// Now get the data back
 			$data = getUserData($valueColumn);
 		} // END - if
@@ -1535,5 +1526,29 @@ function getApInactiveSince () {
 	return $GLOBALS['ap_inactive_since'];
 }
 
+// Checks wether proxy configuration is used
+function isProxyUsed () {
+	// Do we have cache?
+	if (!isset($GLOBALS['is_proxy_used'])) {
+		// Determine it
+		$GLOBALS['is_proxy_used'] = ((getExtensionVersion('sql_patches') >= '0.4.3') && (getConfig('proxy_host') != '') && (getConfig('proxy_port') > 0));
+	} // END - if
+
+	// Return cache
+	return $GLOBALS['is_proxy_used'];
+}
+
+// Checks wether POST data contains selections
+function ifPostContainsSelections ($element = 'sel') {
+	// Do we have cache?
+	if (!isset($GLOBALS['post_contains_selections'][$element])) {
+		// Determine it
+		$GLOBALS['post_contains_selections'][$element] = (countPostSelection($element) > 0);
+	} // END - if
+
+	// Return cache
+	return $GLOBALS['post_contains_selections'][$element];
+}
+
 // [EOF]
 ?>
diff --git a/mailid.php b/mailid.php
index 72f107e4e8..d0c4dbf7d7 100644
--- a/mailid.php
+++ b/mailid.php
@@ -68,7 +68,7 @@ if (isGetRequestParameterSet('mailid'))  $url_mid    = bigintval(getRequestParam
 if (isGetRequestParameterSet('bonusid')) $url_bid    = bigintval(getRequestParameter('bonusid'));
 
 // 01           1        12            2    2            21    1                      2210
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
+if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
 	// Init result
 	$result_link = false;
 
diff --git a/mailid_top.php b/mailid_top.php
index d516df02ae..e267d77efa 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -74,7 +74,7 @@ if (isGetRequestParameterSet('code'))    $code       = bigintval(getRequestParam
 if (isGetRequestParameterSet('mode'))    $mode       = getRequestParameter('mode');
 
 // 01           1        12            2    2            21    1                   22     10
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
+if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
 	// No image? Then output header
 	if ($mode != 'img') loadIncludeOnce('inc/header.php');
 
@@ -285,7 +285,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 
 										// Load template
 										loadTemplate($template, false, $content);
-									} elseif ($sender > 0) {
+									} elseif (isValidUserId($sender)) {
 										// Wrong image code! So add points to sender's account
 										addPointsDirectly('mailid_payback', $sender, $payment);
 
diff --git a/ref.php b/ref.php
index 6fd272a009..b4f6950180 100644
--- a/ref.php
+++ b/ref.php
@@ -79,7 +79,7 @@ if (determineReferalId() != 0) {
 	setSession('refid', determineReferalId());
 
 	// Is the refid valid?
-	if (determineReferalId() > 0) {
+	if (isValidUserId(determineReferalId())) {
 		// Update ref counter
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_clicks`=`ref_clicks`+1 WHERE `userid`=%s LIMIT 1",
 			array(determineReferalId()), __FILE__, __LINE__);
diff --git a/show_bonus.php b/show_bonus.php
index a6eb714ec5..cc1ad2af63 100644
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -59,7 +59,7 @@ redirectOnUninstalledExtension('bonus');
 // Include header
 loadIncludeOnce('inc/header.php');
 
-if ((getRequestParameter('userid') > 0) && (getRequestParameter('d') > 0) && (isGetRequestParameterSet('t'))) {
+if ((isValidUserId(getRequestParameter('userid'))) && (getRequestParameter('d') > 0) && (isGetRequestParameterSet('t'))) {
 	// Set row name
 	$t = '';
 	switch (getRequestParameter('t')) {