X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=e4ef99b7002818d881166f91de7c301e61aa6422;hb=b2fff4de774cc58dfae0b8dd2a291af28f254833;hp=6b244371c278f309b049efa4f6221b62aade5e79;hpb=439a544d74b0f34908b8524777c8c50294c03073;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 6b244371c2..e4ef99b700 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle MySQL-Relevanten Funktionen                 *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,29 +38,29 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Returns the title for given module
 function ADD_MODULE_TITLE ($mod) {
 	// Init variables
-	$name = "";
+	$name = '';
 	$result = false;
 
 	// Is the script installed?
-	if (isBooleanConstantAndTrue('mxchange_installed')) {
+	if (isInstalled()) {
 		// Check if cache is valid
-		if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) {
+		if ((GET_EXT_VERSION('cache') >= '0.1.2') && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) {
 			// Load from cache
 			$name = $GLOBALS['cache_array']['modules']['title'][$mod];
 
 			// Update cache hits
 			incrementConfigEntry('cache_hits');
-		} elseif (!EXT_IS_ACTIVE("cache")) {
+		} elseif (!EXT_IS_ACTIVE('cache')) {
 			// Load from database
-			$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1",
-				array($mod), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1",
+				array($mod), __FUNCTION__, __LINE__);
 			list($name) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		}
@@ -70,7 +75,7 @@ function ADD_MODULE_TITLE ($mod) {
 		$name = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod);
 		if (SQL_NUMROWS($result) == 0) {
 			// Add module to database
-			$dummy = CHECK_MODULE($mod);
+			$dummy = checkModulePermissions($mod);
 		} // END - if
 	} // END - if
 
@@ -79,13 +84,13 @@ function ADD_MODULE_TITLE ($mod) {
 }
 
 // Check validity of a given module name (no file extension)
-function CHECK_MODULE ($mod) {
+function checkModulePermissions ($mod) {
 	// Filter module name (names with low chars and underlines are fine!)
-	$mod = preg_replace("/[^a-z_]/", "", $mod);
+	$mod = preg_replace("/[^a-z_]/", '', $mod);
 
 	// Check for prefix is a extension...
 	$modSplit = explode("_", $mod);
-	$extension = ""; $mod_chk = $mod;
+	$extension = ''; $mod_chk = $mod;
 	//* DEBUG: */ echo __LINE__."*".count($modSplit)."*/".$mod."*<br />";
 	if (count($modSplit) == 2) {
 		// Okay, there is a seperator (_) in the name so is the first part a module?
@@ -100,7 +105,7 @@ function CHECK_MODULE ($mod) {
 	$ret = "major";
 
 	// Check if script is installed if not return a "done" to prevent some errors
-	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling()) || (!isBooleanConstantAndTrue('admin_registered'))) {
+	if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) {
 		// Not installed or no admin registered or in installation phase
 		return "done";
 	} // END - if
@@ -113,7 +118,13 @@ function CHECK_MODULE ($mod) {
 	$found  = false;
 
 	// Check if cache is latest version
-	if (GET_EXT_VERSION("cache") >= "0.1.2") {
+	if (GET_EXT_VERSION('cache') >= '0.1.2') {
+		// Is the cache there?
+		if (!isset($GLOBALS['cache_array']['modules'])) {
+			// This should normally not happen...
+			debug_report_bug("Cache 'modules' is gone.");
+		} // END - if
+
 		// Is the module cached?
 		if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
 			// Check cache
@@ -129,10 +140,10 @@ function CHECK_MODULE ($mod) {
 			// No, then we have to update it!
 			$ret = "cache_miss";
 		}
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Check for module in database
-		$result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1",
-			array($mod_chk), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1",
+			array($mod_chk), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Read data
 			list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
@@ -146,16 +157,16 @@ function CHECK_MODULE ($mod) {
 		// Check returned values against current access permissions
 		//
 		//  Admin access            ----- Guest access -----           --- Guest   or   member? ---
-		if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_MEMBER())))) {
+		if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_MEMBER())))) {
 			// If you are admin you are welcome for everything!
 			$ret = "done";
-		} elseif ($locked == "Y") {
+		} elseif ($locked == 'Y') {
 			// Module is locked
 			$ret = "locked";
-		} elseif (($mem == "Y") && (!IS_MEMBER())) {
+		} elseif (($mem == 'Y') && (!IS_MEMBER())) {
 			// You have to login first!
 			$ret = "mem_only";
-		} elseif (($admin == "Y") && (!IS_ADMIN())) {
+		} elseif (($admin == 'Y') && (!IS_ADMIN())) {
 			// Only the Admin is allowed to enter this module!
 			$ret = "admin_only";
 		} else {
@@ -174,17 +185,17 @@ function CHECK_MODULE ($mod) {
 		//              ----- Legacy module -----                                               ---- Module in base folder  ----                       --- Module with extension's name ---
 		if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
 			// Data is missing so we add it
-			if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
+			if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
 				// Since 0.3.6 we have a has_menu column, this took me a half hour
 				// to find a loop here... *sigh*
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg`
 (module, locked, hidden, mem_only, admin_only, has_menu) VALUES
-('%s','Y','N','N','N','N')", array($mod_chk), __FILE__, __LINE__);
+('%s','Y','N','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
 			} else {
 				// Wrong/missing sql_patches!
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg`
 (module, locked, hidden, mem_only, admin_only) VALUES
-('%s','Y','N','N','N')", array($mod_chk), __FILE__, __LINE__);
+('%s','Y','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
 			}
 
 			// Everthing is fine?
@@ -194,10 +205,10 @@ function CHECK_MODULE ($mod) {
 			} // END - if
 
 			// Destroy cache here
-			REBUILD_CACHE("mod_reg", "modreg");
+			rebuildCacheFiles("modreg", "modreg");
 
 			// And reload data
-			$ret = CHECK_MODULE($mod_chk);
+			$ret = checkModulePermissions($mod_chk);
 		} else {
 			// Module not found we don't add it to the database
 			$ret = "404";
@@ -224,9 +235,9 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 	$file = basename($FQFN);
 
 	// Init variables
-	$LINK_ADD = "";
-	$OUT = "";
-	$AND = "";
+	$LINK_ADD = '';
+	$OUT = '';
+	$AND = '';
 
 	// First we have to do some analysis...
 	if (substr($file, 0, 7) == "action-") {
@@ -234,29 +245,29 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 		$type = "action";
 		$search = substr($file, 7);
 		switch ($ACC_LVL) {
-		case "admin":
-			$modCheck = "admin";
+		case 'admin':
+			$modCheck = 'admin';
 			break;
 
-		case "sponsor":
-		case "guest":
-		case "member":
+		case 'sponsor':
+		case 'guest':
+		case 'member':
 			$modCheck = $GLOBALS['module'];
 			break;
 		}
-		$AND = " AND (what='' OR `what` IS NULL)";
+		$AND = " AND (`what`='' OR `what` IS NULL)";
 	} elseif (substr($file, 0, 5) == "what-") {
 		// This is an admin what file!
 		$type = "what";
 		$search = substr($file, 5);
-		$AND = "";
+		$AND = '';
 		switch ($ACC_LVL) {
-		case "admin":
-			$modCheck = "admin";
+		case 'admin':
+			$modCheck = 'admin';
 			break;
 
-		case "guest":
-		case "member":
+		case 'guest':
+		case 'member':
 			$modCheck = $GLOBALS['module'];
 			if (!IS_ADMIN()) {
 				$AND = " AND `visible`='Y' AND `locked`='N'";
@@ -265,18 +276,18 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 		}
 		$dummy = substr($search, 0, -4);
 		$AND .= " AND `action`='".GET_ACTION($ACC_LVL, $dummy)."'";
-	} elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) {
+	} elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) {
 		// Sponsor / engine menu
 		$type     = "what";
 		$search   = $file;
 		$modCheck = $GLOBALS['module'];
-		$AND      = "";
+		$AND      = '';
 	} else {
 		// Other
 		$type     = "menu";
 		$search   = $file;
 		$modCheck = $GLOBALS['module'];
-		$AND      = "";
+		$AND      = '';
 	}
 
 	// Begin the navigation line
@@ -285,7 +296,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 		$prefix = "<div class=\"you_are_here\">{--YOU_ARE_HERE--}&nbsp;<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</a></strong>";
 	} else {
 		if (!$return) $GLOBALS['nav_depth']++;
-		$prefix = "";
+		$prefix = '';
 	}
 
 	$prefix .= "&nbsp;-&gt;&nbsp;";
@@ -298,7 +309,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 
 	// Get the title from menu
 	$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' ".$AND." LIMIT 1",
-		array($ACC_LVL, $type, $search), __FILE__, __LINE__);
+		array($ACC_LVL, $type, $search), __FUNCTION__, __LINE__);
 
 	// Menu found?
 	if (SQL_NUMROWS($result) == 1) {
@@ -306,10 +317,10 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 		list($ret) = SQL_FETCHROW($result);
 
 		// Shall we return it?
-		if ($return) {
+		if ($return === true) {
 			// Return title
 			return $ret;
-		} elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && (getConfig('youre_here') == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) {
+		} elseif (((GET_EXT_VERSION('sql_patches') >= '0.2.3') && (getConfig('youre_here') == 'Y')) || ((IS_ADMIN()) && ($modCheck == 'admin'))) {
 			// Output HTML code
 			$OUT = $prefix."<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=".$modCheck."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</a></strong>\n";
 
@@ -322,7 +333,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 				$GLOBALS['nav_depth'] = "0";
 
 				// Run the filter chain
-				$ret = RUN_FILTER('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
+				$ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
 				$OUT .= $ret['content'];
 			} // END - if
 		}
@@ -342,120 +353,131 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 }
 
 //
-function ADD_MENU ($MODE, $act, $wht) {
+function ADD_MENU ($mode, $act, $wht) {
 	// Init some variables
 	$main_cnt = 0;
-	$AND = "";
-	$main_action = "";
-	$sub_what = "";
+	$AND = '';
+	$main_action = '';
+	$sub_what = '';
 
 	// is the menu action valid?
-	if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) {
-		return getMessage('CODE_MENU_NOT_VALID');
+	if (!VALIDATE_MENU_ACTION($mode, $act, $wht, true)) {
+		return getCode('MENU_NOT_VALID');
 	} // END - if
 
 	// Non-admin shall not see all menus
 	if (!IS_ADMIN()) {
 		$AND = " AND `visible`='Y' AND `locked`='N'";
-	}
+	} // END - if
 
 	// Load SQL data and add the menu to the output stream...
-	$result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (what='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
-		array($MODE), __FILE__, __LINE__);
+	$result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
+		array($mode), __FUNCTION__, __LINE__);
 	//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
 	if (SQL_NUMROWS($result_main) > 0) {
-		OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$MODE."_menu\">");
+		OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$mode."_menu\">");
 		// There are menus available, so we simply display them... :)
-		while (list($main_title, $main_action) = SQL_FETCHROW($result_main)) {
-			//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
+		while ($content = SQL_FETCHARRAY($result_main)) {
+			//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
 			// Init variables
-			$BLOCK_MODE = false; $act = $main_action;
-
-			// Prepare content
-			$content = array(
-				'action' => $main_action,
-				'title'  => $main_title
-			);
+			$GLOBALS['block_mode'] = false;
+			$act = $content['action'];
 
 			// Load menu header template
-			LOAD_TEMPLATE($MODE."_menu_title", false, $content);
+			LOAD_TEMPLATE($mode."_menu_title", false, $content);
+
+			// Sub menu
+			$result_sub = SQL_QUERY_ESC("SELECT title AS sub_title, what AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
+				array($mode, $content['action']), __FUNCTION__, __LINE__);
 
-			$result_sub = SQL_QUERY_ESC("SELECT title, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
-			 array($MODE, $main_action), __FILE__, __LINE__);
+			// Get number of rows
 			$ctl = SQL_NUMROWS($result_sub);
+
+			// Do we have some entries?
 			if ($ctl > 0) {
-				$cnt=0;
-				while (list($sub_title, $sub_what) = SQL_FETCHROW($result_sub)) {
+				// Init counter
+				$cnt = 0;
+
+				// Load all sub menus
+				while ($content2 = SQL_FETCHARRAY($result_sub)) {
+					// Merge both arrays in one
+					$content = merge_array($content, $content2);
+
 					// Init content
-					$content = "";
+					$OUT = '';
 
 					// Full file name for checking menu
-					//* DEBUG: */ echo __LINE__.":!!!!".$sub_what."!!!<br />\n";
-					$FQFN = sprintf("%sinc/modules/%s/what-%s.php", constant('PATH'), $MODE, $sub_what);
-					if (FILE_READABLE($FQFN)) {
-						if ((!empty($wht)) && (($wht == $sub_what))) {
-							$content = "<strong>";
+					//* DEBUG: */ echo __LINE__.":!!!!".$content['sub_what']."!!!<br />\n";
+					$INC = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
+					if (INCLUDE_READABLE($INC)) {
+						if ((!empty($wht)) && (($wht == $content['sub_what']))) {
+							$OUT = "<strong>";
 						}
 
 						// Navigation link
-						$content .= "<a name=\"menu\" class=\"menu_blur\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module']."&amp;what=".$sub_what.ADD_URL_DATA("")."\" target=\"_self\">";
+						$OUT .= "<a name=\"menu\" class=\"menu_blur\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module']."&amp;what=".$content['sub_what'].ADD_URL_DATA("")."\" target=\"_self\">";
 					} else {
-						$content .= "<em>";
+						$OUT .= "<em>";
 					}
 
 					// Menu title
-					$content .= getConfig('menu_blur_spacer') . $sub_title;
+					$OUT .= getConfig('menu_blur_spacer') . $content['sub_title'];
 
-					if (FILE_READABLE($FQFN)) {
-						$content .= "</a>";
+					if (INCLUDE_READABLE($INC)) {
+						$OUT .= "</a>";
 					} else {
-						$content .= "</em>";
+						$OUT .= "</em>";
 					}
 
-					if ((!empty($wht)) && (($wht == $sub_what))) {
-						$content .= "</strong>";
-					}
-					$wht = $sub_what; $cnt++;
-					// Prepare array
+					if ((!empty($wht)) && (($wht == $content['sub_what']))) {
+						$OUT .= "</strong>";
+					} // END - if
+
+					// Remember 'what' for next round and count it up
+					$wht = $content['sub_what']; $cnt++;
+
+					// Rewrite array
 					$content =  array(
-						'menu' => $content,
-						'what' => $sub_what
+						'menu' => $OUT,
+						'what' => $content['sub_what']
 					);
 
 					// Add regular menu row or bottom row?
 					if ($cnt < $ctl) {
-						LOAD_TEMPLATE($MODE."_menu_row", false, $content);
+						LOAD_TEMPLATE($mode."_menu_row", false, $content);
 					} else {
-						LOAD_TEMPLATE($MODE."_menu_bottom", false, $content);
+						LOAD_TEMPLATE($mode."_menu_bottom", false, $content);
 					}
 				}
 			} else {
 				// This is a menu block... ;-)
-				$BLOCK_MODE = true;
-				$INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $MODE, $main_action);
+				$GLOBALS['block_mode'] = true;
+				$INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
 				if (FILE_READABLE($INC_BLOCK)) {
 					// Load include file
-					if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("<tr>
+					if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML("<tr>
 
-  <td class=\"".$MODE."_menu_whats\">");
-					//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
+  <td class=\"".$mode."_menu_whats\">");
+					//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
 					LOAD_INC($INC_BLOCK);
-					//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
-					if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("  </td>
+					//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
+					if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML("  </td>
 </tr>");
 				}
-				//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
+				//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
 			}
 			$main_cnt++;
-			//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
-			if (SQL_NUMROWS($result_main) > $main_cnt) 	OUTPUT_HTML("<tr><td class=\"".$MODE."_menu_seperator\"></td></tr>");
+			//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
+			if (SQL_NUMROWS($result_main) > $main_cnt) {
+				OUTPUT_HTML("<tr><td class=\"".$mode."_menu_seperator\"></td></tr>");
+			} // END - if
 		}
 
 		// Free memory
 		SQL_FREERESULT($result_main);
 
 		// Close table
-		//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
+		//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
 		OUTPUT_HTML("</table>");
 	}
 }
@@ -463,7 +485,7 @@ function ADD_MENU ($MODE, $act, $wht) {
 // This patched function will reduce many SELECT queries for the specified or current admin login
 function IS_ADMIN ($admin="") {
 	// Init variables
-	$ret = false; $passCookie = ""; $valPass = "";
+	$ret = false; $passCookie = ''; $valPass = '';
 	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
 
 	// If admin login is not given take current from cookies...
@@ -487,13 +509,13 @@ function IS_ADMIN ($admin="") {
 
 		// Count cache hits
 		incrementConfigEntry('cache_hits');
-	} elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($GLOBALS['cache_array']['admins']['password'][$admin]))) {
+	} elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE('cache'))) || (!isset($GLOBALS['cache_array']['admins']['password'][$admin]))) {
 		// Search for admin
 		$result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
-			array($admin), __FILE__, __LINE__);
+			array($admin), __FUNCTION__, __LINE__);
 
 		// Is he admin?
-		$passDB = "";
+		$passDB = '';
 		if (SQL_NUMROWS($result) == 1) {
 			// Admin login was found so let's load password from DB
 			list($passDB) = SQL_FETCHROW($result);
@@ -512,7 +534,7 @@ function IS_ADMIN ($admin="") {
 	if (!empty($valPass)) {
 		// Check if password is valid
 		//* DEBUG: */ print __FUNCTION__."*".$valPass."/".$passCookie."*<br />\n";
-		$ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE("cache"))));
+		$ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE('cache'))));
 	}
 
 	// Return result of comparision
@@ -521,55 +543,51 @@ function IS_ADMIN ($admin="") {
 }
 
 // Generates a list of "max receiveable emails per day"
-function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
-	$OUT = "";
-	switch ($MODE) {
-	case "guest":
-		// Guests (in the registration form) are not allowed to select 0 mails per day.
-		$result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value > 0 ORDER BY value", __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) > 0) {
-			$OUT = "";
-  			while (list($value, $comment) = SQL_FETCHROW($result)) {
-				$OUT .= "      <option value=\"".$value."\"";
-				if (REQUEST_POST('max_mails') == $value) $OUT .= " selected=\"selected\"";
-				$OUT .= ">".$value." {--PER_DAY--}";
-				if (!empty($comment)) $OUT .= " (".$comment.")";
-				$OUT .= "</option>\n";
-			}
-			define('__MAX_RECEIVE_OPTIONS', $OUT);
+function ADD_MAX_RECEIVE_LIST ($mode, $default = "", $return = false) {
+	$OUT = '';
+	$result = false;
 
-			// Free memory
-			SQL_FREERESULT($result);
-			$OUT = LOAD_TEMPLATE("guest_receive_table", true);
-		} else {
-			// Maybe the admin has to setup some maximum values?
-			debug_report_bug("Nothing is being done here?");
-		}
-		break;
+	switch ($mode) {
+		case 'guest':
+			// Guests (in the registration form) are not allowed to select 0 mails per day.
+			$result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value > 0 ORDER BY value",
+				__FUNCTION__, __LINE__);
+			break;
 
-	case "member":
-		// Members are allowed to set to zero mails per day (we will change this soon!)
-		$result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value", __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) > 0) {
-			$OUT = "";
-  			while (list($value, $comment) = SQL_FETCHROW($result)) {
-				$OUT .= "      <option value=\"".$value."\"";
-				if ($default == $value) $OUT .= " selected=\"selected\"";
-				$OUT .= ">".$value." {--PER_DAY--}";
-				if (!empty($comment)) $OUT .= " (".$comment.")";
-				$OUT .= "</option>\n";
-			}
-			define('__MAX_RECEIVE_OPTIONS', $OUT);
-			SQL_FREERESULT($result);
-			$OUT = LOAD_TEMPLATE("member_receive_table", true);
-		} else {
-			// Maybe the admin has to setup some maximum values?
-			$OUT = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('NO_MAX_VALUES'));
+		case 'member':
+			// Members are allowed to set to zero mails per day (we will change this soon!)
+			$result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value",
+				__FUNCTION__, __LINE__);
+			break;
+
+		default: // Invalid!
+			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode));
+			break;
+	}
+
+	// Some entries are found?
+	if (SQL_NUMROWS($result) > 0) {
+		$OUT = '';
+		while ($content = SQL_FETCHARRAY($result)) {
+			$OUT .= "      <option value=\"".$content['value']."\"";
+			if (REQUEST_POST('max_mails') == $content['value']) $OUT .= ' selected="selected"';
+			$OUT .= ">".$content['value']." {--PER_DAY--}";
+			if (!empty($content['comment'])) $OUT .= " (".$content['comment'].")";
+			$OUT .= "</option>\n";
 		}
-		break;
+		define('__MAX_RECEIVE_OPTIONS', $OUT);
+
+		// Load template
+		$OUT = LOAD_TEMPLATE($mode."_receive_table", true);
+	} else {
+		// Maybe the admin has to setup some maximum values?
+		debug_report_bug("Nothing is being done here?");
 	}
 
-	if ($return) {
+	// Free result
+	SQL_FREERESULT($result);
+
+	if ($return === true) {
 		// Return generated HTML code
 		return $OUT;
 	} else {
@@ -582,7 +600,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
 function SEARCH_EMAIL_USERTAB ($email) {
 	// Query the database
 	$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email LIKE '{PER}%s{PER}' LIMIT 1",
-		array($email), __FILE__, __LINE__);
+		array($email), __FUNCTION__, __LINE__);
 
 	// Is the email there?
 	$ret = (SQL_NUMROWS($result) == 1);
@@ -598,6 +616,7 @@ function SEARCH_EMAIL_USERTAB ($email) {
 function IS_MEMBER () {
 	// @TODO Why is this global??? #100
 	global $status;
+
 	if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array();
 	$ret = false;
 
@@ -611,10 +630,10 @@ function IS_MEMBER () {
 	FIX_DELETED_COOKIES(array('userid', 'u_hash'));
 
 	// Are cookies set?
-	if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
+	if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 		// Cookies are set with values, but are they valid?
 		$result = SQL_QUERY_ESC("SELECT password, status, last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-			array($GLOBALS['userid']), __FILE__, __LINE__);
+			array(getUserId()), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data from cookies
 			list($password, $status, $mod, $onl) = SQL_FETCHROW($result);
@@ -660,40 +679,40 @@ function IS_MEMBER () {
 }
 
 // Validate the given menu action
-function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) {
+function VALIDATE_MENU_ACTION ($mode, $act, $wht, $UPDATE=false) {
 	// Is the cache entry there and we shall not update?
-	if ((isset($GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht])) && ($UPDATE === false)) {
+	if ((isset($GLOBALS['cache_array']['action_valid'][$mode][$act][$wht])) && ($UPDATE === false)) {
 		// Count cache hit
 		incrementConfigEntry('cache_hits');
 
 		// Then use this cache
-		return $GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht];
+		return $GLOBALS['cache_array']['action_valid'][$mode][$act][$wht];
 	} // END - if
 
 	// By default nothing is valid
 	$ret = false;
 
 	// Look in all menus or only unlocked
-	$ADD = "";
-	if ((!IS_ADMIN()) && ($MODE != "admin")) $ADD = " AND `locked`='N'";
+	$add = '';
+	if ((!IS_ADMIN()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
-	//* DEBUG: */ echo __LINE__.":".$MODE."/".$act."/".$wht."*<br />\n";
-	if (($MODE != "admin") && ($UPDATE === true)) {
+	//* DEBUG: */ echo __LINE__.":".$mode."/".$act."/".$wht."*<br />\n";
+	if (($mode != 'admin') && ($UPDATE === true)) {
 		// Update guest or member menu
-		$SQL = SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$ADD." LIMIT 1",
-			array($MODE, $act, $wht), __FILE__, __LINE__, false);
+		$sql = SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
+			array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
 	} elseif (($wht != "overview") && (!empty($wht))) {
 		// Other actions
-		$SQL = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$ADD." ORDER BY action DESC LIMIT 1",
-			array($MODE, $act, $wht), __FILE__, __LINE__, false);
+		$sql = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY action DESC LIMIT 1",
+			array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
 	} else {
 		// Admin login overview
-		$SQL = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND (what='' OR `what` IS NULL)".$ADD." ORDER BY action DESC LIMIT 1",
-			array($MODE, $act), __FILE__, __LINE__, false);
+		$sql = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND (`what`='' OR `what` IS NULL)".$add." ORDER BY action DESC LIMIT 1",
+			array($mode, $act), __FUNCTION__, __LINE__, false);
 	}
 
 	// Run SQL command
-	$result = SQL_QUERY($SQL, __FILE__, __LINE__);
+	$result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
 	if ($UPDATE === true) {
 		// Check updated/affected rows
 		$ret = (SQL_AFFECTEDROWS() == 1);
@@ -706,14 +725,14 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) {
 	SQL_FREERESULT($result);
 
 	// Set cache entry
-	$GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht] = $ret;
+	$GLOBALS['cache_array']['action_valid'][$mode][$act][$wht] = $ret;
 
 	// Return result
 	return $ret;
 }
 
 //
-function GET_MOD_DESCR($MODE, $wht, $column="what") {
+function GET_MOD_DESCR($mode, $wht, $column="what") {
 	// Fix empty "what"
 	if (empty($wht)) {
 		$wht = "welcome";
@@ -725,7 +744,7 @@ function GET_MOD_DESCR($MODE, $wht, $column="what") {
 
 	// Look for title
 	$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1",
-		array($MODE, $column, $wht), __FILE__, __LINE__);
+		array($mode, $column, $wht), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
 	if (SQL_NUMROWS($result) == 1) {
@@ -743,7 +762,7 @@ function SEND_MODE_MAILS($mod, $modes) {
 
 	// Load hash
 	$result_main = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-		array($GLOBALS['userid']), __FILE__, __LINE__);
+		array(getUserId()), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result_main) == 1) {
 		// Load hash from database
 		list($hashDB) = SQL_FETCHROW($result_main);
@@ -756,7 +775,7 @@ function SEND_MODE_MAILS($mod, $modes) {
 		if (($hash == get_session('u_hash')) || (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
 			// Load user's data
 			$result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND password='%s' LIMIT 1",
-				array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
+				array(getUserId(), $hashDB), __FUNCTION__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Load the data
 				$DATA = SQL_FETCHROW($result);
@@ -768,22 +787,22 @@ function SEND_MODE_MAILS($mod, $modes) {
 				$DATA[0] = TRANSLATE_GENDER($DATA[0]);
 
 				// Clear/init the content variable
-				$content = "";
-				$DATA['info'] = "";
+				$content = '';
+				$DATA['info'] = '';
 
 				switch ($mod)
 				{
-				case "mydata":
+				case 'mydata':
 					foreach ($modes as $mode) {
 						switch ($mode)
 						{
-						case "normal": break; // Do not add any special lines
+						case 'normal': break; // Do not add any special lines
 
-						case "email": // Email was changed!
+						case 'email': // Email was changed!
 							$content = MEMBER_CHANGED_EMAIL.": ".REQUEST_POST('old_addy')."\n";
 							break;
 
-						case "pass": // Password was changed
+						case 'pass': // Password was changed
 							$content = MEMBER_CHANGED_PASS."\n";
 							break;
 
@@ -794,22 +813,22 @@ function SEND_MODE_MAILS($mod, $modes) {
 						} // END - switch
 					} // END - if
 
-					if (EXT_IS_ACTIVE("country")) {
+					if (EXT_IS_ACTIVE('country')) {
 						// Replace code with description
 						$DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
 					} // END - if
 
 					// Load template
-					$msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, $GLOBALS['userid']);
+					$msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, getUserId());
 
-					if (getConfig('admin_notify') == "Y") {
+					if (getConfig('admin_notify') == 'Y') {
 						// The admin needs to be notified about a profile change
 						$msg_admin = "admin_mydata_notify";
 						$sub_adm   = ADMIN_CHANGED_DATA;
 					} else {
 						// No mail to admin
-						$msg_admin = "";
-						$sub_adm   = "";
+						$msg_admin = '';
+						$sub_adm   = '';
 					}
 
 					// Set subject lines
@@ -847,8 +866,8 @@ function SEND_MODE_MAILS($mod, $modes) {
 	if (empty($content)) {
 		if ((!empty($sub_adm)) && (!empty($msg_admin))) {
 			// Send admin mail
-			SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, $GLOBALS['userid']);
-		} elseif (getConfig('admin_notify') == "Y") {
+			SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, getUserId());
+		} elseif (getConfig('admin_notify') == 'Y') {
 			// Cannot send mails to admin!
 			$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
 		} else {
@@ -858,30 +877,35 @@ function SEND_MODE_MAILS($mod, $modes) {
 	} // END - if
 
 	// Load template
-	LOAD_TEMPLATE("admin_settings_saved", false, $content);
+	LOAD_TEMPLATE('admin_settings_saved', false, $content);
 }
+
 // Update module counter
-function COUNT_MODULE($mod) {
+function countModuleHit($mod) {
 	if ($mod != "css") {
 		// Do count all other modules but not accesses on CSS file css.php!
-		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET clicks=clicks+1 WHERE module='%s' LIMIT 1",
-			array($mod), __FILE__, __LINE__);
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET clicks=clicks+1 WHERE `module`='%s' LIMIT 1",
+			array($mod), __FUNCTION__, __LINE__);
 	} // END - if
 }
+
 // Get action value from mode (admin/guest/member) and what-value
-function GET_ACTION ($MODE, &$wht) {
+function GET_ACTION ($mode, &$wht) {
 	// Init status
-	$ret = "";
+	$ret = '';
 
-	//* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=<br />";
-	if ((empty($wht)) && ($MODE != "admin")) {
+	//* DEBUG: */ echo __LINE__."=".$mode."/".$wht."/".$GLOBALS['action']."=<br />";
+	if ((empty($wht)) && ($mode != 'admin')) {
 		$wht = "welcome";
 		if (getConfig('index_home') != "") $wht = getConfig('index_home');
 	} // END - if
 
-	if ($MODE == "admin") {
+	if ($mode == 'admin') {
 		// Action value for admin area
-		if (!empty($GLOBALS['action'])) {
+		if (REQUEST_ISSET_GET('action')) {
+			// Use from request!
+			return REQUEST_GET('action');
+		} elseif (!empty($GLOBALS['action'])) {
 			// Get it directly from URL
 			return $GLOBALS['action'];
 		} elseif (($wht == "overview") || (empty($GLOBALS['what']))) {
@@ -895,11 +919,11 @@ function GET_ACTION ($MODE, &$wht) {
 	//* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />\n";
 
 	// Does the module have a menu?
-	if (MODULE_HAS_MENU($MODE)) {
+	if (MODULE_HAS_MENU($mode)) {
 		// Rewriting modules to menu
-		switch ($MODE) {
-			case "index": $MODE = "guest";  break;
-			case "login": $MODE = "member"; break;
+		switch ($mode) {
+			case 'index': $mode = 'guest';  break;
+			case "login": $mode = 'member'; break;
 		} // END - switch
 
 		// Guest and member menu is "main" as the default
@@ -907,7 +931,7 @@ function GET_ACTION ($MODE, &$wht) {
 
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what`='%s' LIMIT 1",
-			array($MODE, $wht), __FILE__, __LINE__);
+			array($mode, $wht), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load action value and pray that this one is the right you want... ;-)
 			list($ret) = SQL_FETCHROW($result);
@@ -915,9 +939,13 @@ function GET_ACTION ($MODE, &$wht) {
 
 		// Free memory
 		SQL_FREERESULT($result);
-	} elseif ((GET_EXT_VERSION("sql_patches") == "") && ($MODE != "admin")) {
-		// No sql_patches installed!
-		LOAD_URL("admin.php");
+	} elseif ((GET_EXT_VERSION('sql_patches') == "") && ($mode != 'admin')) {
+		// No sql_patches installed, but maybe we need to register an admin?
+		if (isAdminRegistered()) {
+			// Redirect
+			// @TODO Why does this lead into an endless loop but we still need it???
+			// @TODO Commented out LOAD_URL('admin.php');
+		} // END - if
 	}
 
 	// Return action value
@@ -930,13 +958,13 @@ function GET_CATEGORY ($cid) {
 	$ret = getMessage('_CATEGORY_404');
 
 	// Is the category id set?
-	if ($cid == "0") {
+	if ($cid == '0') {
 		// No category
 		$ret = getMessage('_CATEGORY_NONE');
 	} elseif ($cid > 0) {
 		// Lookup the category in database
 		$result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
-			array(bigintval($cid)), __FILE__, __LINE__);
+			array(bigintval($cid)), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Category found... :-)
 			list($ret) = SQL_FETCHROW($result);
@@ -957,7 +985,7 @@ function GET_PAYMENT ($pid, $full=false) {
 
 	// Load payment data
 	$result = SQL_QUERY_ESC("SELECT mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
-		array(bigintval($pid)), __FILE__, __LINE__);
+		array(bigintval($pid)), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Payment type found... :-)
 		if (!$full) {
@@ -966,7 +994,7 @@ function GET_PAYMENT ($pid, $full=false) {
 		} else {
 			// Return title and price
 			list($t, $p) = SQL_FETCHROW($result);
-			$ret = $t." / ".TRANSLATE_COMMA($p)." {!POINTS!}";
+			$ret = $t.' / '.TRANSLATE_COMMA($p).' {!POINTS!}';
 		}
 	}
 
@@ -978,10 +1006,10 @@ function GET_PAYMENT ($pid, $full=false) {
 }
 
 // Get (basicly) the price of given payment id
-function GET_PAY_POINTS ($pid, $lookFor = "price") {
-	$ret = "-1";
+function GET_PAY_POINTS ($pid, $lookFor = 'price') {
+	$ret = '-1';
 	$result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
-		array($lookFor, $pid), __FILE__, __LINE__);
+		array($lookFor, $pid), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Payment type found... :-)
 		list($ret) = SQL_FETCHROW($result);
@@ -990,57 +1018,71 @@ function GET_PAY_POINTS ($pid, $lookFor = "price") {
 	return $ret;
 }
 
-// Remove a receiver's ID from $ARRAY and add a link for him to confirm
-function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false) {
-	$ret = "failed";
-	if ($uid > 0)
-	{
+// Remove a receiver's ID from $receivers and add a link for him to confirm
+function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus=false) {
+	// Default is not removed
+	$ret = 'failed';
+
+	// Is the userid valid?
+	if ($uid > 0) {
 		// Remove entry from array
-		unset($ARRAY[$key]);
+		unset($receivers[$key]);
 
 		// Is there already a line for this user available?
-		if ($stats_id > 0)
-		{
+		if ($stats_id > 0) {
 			// Only when we got a real stats ID continue searching for the entry
-			$type = "NORMAL"; $rowName = "stats_id";
-			if ($bonus) { $type = "BONUS"; $rowName = "bonus_id"; }
+			$type = 'NORMAL'; $rowName = 'stats_id';
+			if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
+
+			// Try to look the entry up
 			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_links` WHERE %s='%s' AND userid=%s AND link_type='%s' LIMIT 1",
-			 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 0)
-			{
-				// No, so we add one!
+				array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
+
+			// Was it *not* found?
+			if (SQL_NUMROWS($result) == 0) {
+				// So we add one!
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_links` (%s, userid, link_type) VALUES ('%s','%s','%s')",
-				 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
-				$ret = "done";
-			}
-			 else
-			{
+					array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
+				$ret = 'done';
+			} else {
 				// Already found
-				$ret = "already";
+				$ret = 'already';
 			}
 
 			// Free memory
 			SQL_FREERESULT($result);
 		}
 	}
+
 	// Return status for sending routine
 	return $ret;
 }
 
 // Calculate sum (default) or count records of given criteria
-function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false, $add="") {
+function GET_TOTAL_DATA ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
 	$ret = 0;
-	//* DEBUG: */ echo $search."/".$tableName."/".$lookFor."/".$whereStatement."/".$add."<br />\n";
-	if (($onlyRows) || ($lookFor == "userid")) {
+	//* DEBUG: */ echo $search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />\n';
+	if ((empty($search)) && ($search != '0')) {
+		// Count or sum whole table?
+		if ($countRows === true) {
+			// Count whole table
+			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
+				array($lookFor, $tableName), __FUNCTION__, __LINE__);
+		} else {
+			// Sum whole table
+			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
+				array($lookFor, $tableName), __FUNCTION__, __LINE__);
+		}
+	} elseif (($countRows === true) || ($lookFor == 'userid')) {
 		// Count rows
 		//* DEBUG: */ echo "COUNT!<br />\n";
 		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
-			array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
+			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	} else {
 		// Add all rows
 		//* DEBUG: */ echo "SUM!<br />\n";
 		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
-			array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
+			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	}
 
 	// Load row
@@ -1050,24 +1092,24 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
 	SQL_FREERESULT($result);
 
 	// Fix empty values
-	if ((empty($ret)) && ($lookFor != "counter") && ($lookFor != "id") && ($lookFor != "userid")) {
+	if ((empty($ret)) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid')) {
 		// Float number
-		$ret = "0.00000";
-	} elseif ("".$ret."" == "") {
+		$ret = '0.00000';
+	} elseif (''.$ret.'' == '') {
 		// Fix empty result
-		$ret = "0";
+		$ret = '0';
 	}
 
 	// Return value
 	return $ret;
 }
-// "Getter fro ref level percents
+// Getter fro ref level percents
 function GET_REF_LEVEL_PERCENTS ($level) {
 	// Default is zero
 	$per = 0;
 
 	// Do we have cache?
-	if ((isset($GLOBALS['cache_array']['ref_depths']['level'])) && (EXT_IS_ACTIVE("cache"))) {
+	if ((isset($GLOBALS['cache_array']['ref_depths']['level'])) && (EXT_IS_ACTIVE('cache'))) {
 		// First look for level
 		$key = array_search($level, $GLOBALS['cache_array']['ref_depths']['level']);
 		if ($key !== false) {
@@ -1077,10 +1119,10 @@ function GET_REF_LEVEL_PERCENTS ($level) {
 			// Count cache hit
 			incrementConfigEntry('cache_hits');
 		}
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Get referal data
 		$result_lvl = SQL_QUERY_ESC("SELECT percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",
-			array(bigintval($level)), __FILE__, __LINE__);
+			array(bigintval($level)), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result_lvl) == 1) {
@@ -1108,7 +1150,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
  * add_mode    = Add points only to $uid or also refs? (WARNING! Changing "ref" to "direct"
  *               for default value will cause no referal will get points ever!!!)
  */
-function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
+function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid='0', $locked=false, $add_mode='ref') {
 	//* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
 	global $DATA;
 
@@ -1116,16 +1158,16 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 	$add_mode = strtolower($add_mode);
 
 	// When $uid = 0 add points to jackpot
-	if ($uid == "0") {
+	if ($uid == '0') {
 		// Add points to jackpot
 		ADD_JACKPOT($points);
 		return;
 	} // END - if
 
 	// Add booking record if extension is installed
-	if (EXT_IS_ACTIVE("booking")) {
+	if (EXT_IS_ACTIVE('booking')) {
 		// Add record
-		ADD_BOOKING_RECORD($subject, $uid, $points, "add");
+		ADD_BOOKING_RECORD($subject, $uid, $points, 'add');
 	} // END - if
 
 	// Count up referal depth
@@ -1139,15 +1181,15 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />\n";
 	}
 
-	// Default is "normal" points
-	$data = "points";
+	// Default is 'normal' points
+	$data = 'points';
 
 	// Which points, locked or normal?
-	if ($locked) $data = "locked_points";
+	if ($locked) $data = 'locked_points';
 
 	// Check user account
 	$result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-		array(bigintval($uid)), __FILE__, __LINE__);
+		array(bigintval($uid)), __FUNCTION__, __LINE__);
 
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />\n";
 	if (SQL_NUMROWS($result_user) == 1) {
@@ -1166,7 +1208,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 			$ref_points = $points * $per / 100;
 
 			// Pay refback here if level > 0 and in ref-mode
-			if ((EXT_IS_ACTIVE("refback")) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_uid'][$uid]))) {
+			if ((EXT_IS_ACTIVE('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_uid'][$uid]))) {
 				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />\n";
 				$ref_points = ADD_REFBACK_POINTS($GLOBALS['cache_array']['add_uid'][$uid], $uid, $points, $ref_points);
 				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />\n";
@@ -1174,21 +1216,21 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 
 			// Update points...
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET %s=%s+%s WHERE userid=%s AND ref_depth='%s' LIMIT 1",
-				array($data, $data, $ref_points, bigintval($uid), bigintval($GLOBALS['ref_level'])), __FILE__, __LINE__);
+				array($data, $data, $ref_points, bigintval($uid), bigintval($GLOBALS['ref_level'])), __FUNCTION__, __LINE__);
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")<br />\n";
 
 			// No entry updated?
 			if (SQL_AFFECTEDROWS() < 1) {
 				// First ref in this level! :-)
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_points` (userid,ref_depth,%s) VALUES (%s,'%s',%s)",
-					array($data, bigintval($uid), bigintval($GLOBALS['ref_level']), $ref_points), __FILE__, __LINE__);
+					array($data, bigintval($uid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __LINE__);
 				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />\n";
 			} // END - if
 
 			// Update mediadata as well
-			if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+			if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
 				// Update database
-				MEDIA_UPDATE_ENTRY(array("total_points"), "add", $ref_points);
+				MEDIA_UPDATE_ENTRY(array('total_points'), 'add', $ref_points);
 			} // END - if
 
 			// Points updated, maybe I shall send him an email?
@@ -1202,7 +1244,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 				);
 
 				// Load email template
-				$msg = LOAD_EMAIL_TEMPLATE("confirm-referal", $content, bigintval($uid));
+				$msg = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
 
 				SEND_EMAIL($email, THANX_REFERRAL_ONE, $msg);
 			} elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == "direct") && (!defined('__POINTS_VALUE'))) {
@@ -1211,20 +1253,20 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 
 				// Prepare content
 				$content = array(
-					'text'   => REASON_DIRECT_PAYMENT,
+					'text'   => getMessage('REASON_DIRECT_PAYMENT'),
 					'points' => TRANSLATE_COMMA($ref_points)
 				);
 
 				// Load message
-				$msg = LOAD_EMAIL_TEMPLATE("add-points", $content, $uid);
+				$msg = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
 
 				// And sent it away
-				SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
-				if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));
+				SEND_EMAIL($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
+				if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
 			}
 
 			// Maybe there's another ref?
-			if (($ref > 0) && ($points > 0) && ($ref != $uid) && ($add_mode == "ref")) {
+			if (($ref > 0) && ($points > 0) && ($ref != $uid) && ($add_mode == 'ref')) {
 				// Then let's credit him here...
 				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref},points={$points} - ADVANCE!<br />\n";
 				ADD_POINTS_REFSYSTEM(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), $ref, $points, $send_notify, $ref, $locked);
@@ -1244,20 +1286,20 @@ function UPDATE_REF_COUNTER ($uid) {
 
 	// Update counter
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
-		array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FILE__, __LINE__);
+		array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
 
 	// When no entry was updated then we have to create it here
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):updated=".SQL_AFFECTEDROWS()."<br />\n";
 	if (SQL_AFFECTEDROWS() < 1) {
 		// First count!
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refsystem` (userid, level, counter) VALUES (%s,%s,1)",
-			array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FILE__, __LINE__);
+			array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid}<br />\n";
 	} // END - if
 
 	// Check for his referal
 	$result = SQL_QUERY_ESC("SELECT refid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-		array(bigintval($uid)), __FILE__, __LINE__);
+		array(bigintval($uid)), __FUNCTION__, __LINE__);
 
 	// Load refid
 	list($ref) = SQL_FETCHROW($result);
@@ -1271,28 +1313,29 @@ function UPDATE_REF_COUNTER ($uid) {
 		// Move to next referal level and count his counter one up!
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - ADVANCE!<br />\n";
 		$GLOBALS['cache_array']['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
-	} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2")) {
+	} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION('cache') >= '0.1.2')) {
 		// Remove cache here
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - CACHE!<br />\n";
-		REBUILD_CACHE("refsystem", "refsystem");
+		rebuildCacheFiles('refsystem', 'refsystem');
 	}
 
 	// "Walk" back here
 	$GLOBALS['cache_array']['ref_level'][$uid]--;
 
 	// Handle refback here if extension is installed
-	if (EXT_IS_ACTIVE("refback")) {
+	if (EXT_IS_ACTIVE('refback')) {
 		UPDATE_REFBACK_table($uid);
 	} // END - if
 }
 
-// OBSOLETE: Sends out mail to all administrators
+// Sends out mail to all administrators. This function is no longer obsolete
+// because we need it when there is no ext-admins installed
 function SEND_ADMIN_EMAILS ($subj, $msg) {
 	// Load all admin email addresses
-	$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FILE__, __LINE__);
-	while (list($email) = SQL_FETCHROW($result)) {
+	$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Send the email out
-		SEND_EMAIL($email, $subj, $msg);
+		SEND_EMAIL($content['email'], $subj, $msg);
 	} // END - if
 
 	// Free result
@@ -1304,7 +1347,7 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
 // Get ID number from administrator's login name
 function GET_ADMIN_ID ($login) {
 	// By default no admin is found
-	$ret = "-1";
+	$ret = '-1';
 
 	// Check cache
 	if (isset($GLOBALS['cache_array']['admins']['aid'][$login])) {
@@ -1313,10 +1356,10 @@ function GET_ADMIN_ID ($login) {
 
 		// Update cache hits
 		incrementConfigEntry('cache_hits');
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
-			array($login), __FILE__, __LINE__);
+			array($login), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			list($ret) = SQL_FETCHROW($result);
 		} // END - if
@@ -1342,7 +1385,7 @@ function GET_CURRENT_ADMIN_ID () {
 // Get password hash from administrator's login name
 function GET_ADMIN_HASH ($aid) {
 	// By default an invalid hash is returned
-	$ret = "-1";
+	$ret = '-1';
 
 	if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
 		// Check cache
@@ -1350,17 +1393,17 @@ function GET_ADMIN_HASH ($aid) {
 
 		// Update cache hits
 		incrementConfigEntry('cache_hits');
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-		 array($aid), __FILE__, __LINE__);
+		 array($aid), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Fetch data
 			list($ret) = SQL_FETCHROW($result);
 
 			// Set cache
 			$GLOBALS['cache_array']['admins']['password'][$aid] = $ret;
-		}
+		} // END - if
 
 		// Free result
 		SQL_FREERESULT($result);
@@ -1370,7 +1413,7 @@ function GET_ADMIN_HASH ($aid) {
 //
 function GET_ADMIN_LOGIN ($aid) {
 	// By default a non-existent login is returned (other functions react on this!)
-	$ret = "***";
+	$ret = '***';
 
 	if (isset($GLOBALS['cache_array']['admins']['login'][$aid])) {
 		// Get cache
@@ -1378,10 +1421,10 @@ function GET_ADMIN_LOGIN ($aid) {
 
 		// Update cache hits
 		incrementConfigEntry('cache_hits');
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT login FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-			array(bigintval($aid)), __FILE__, __LINE__);
+			array(bigintval($aid)), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Fetch data
 			list($ret) = SQL_FETCHROW($result);
@@ -1398,7 +1441,7 @@ function GET_ADMIN_LOGIN ($aid) {
 // Get email address of admin id
 function GET_ADMIN_EMAIL ($aid) {
 	// By default an invalid emails is returned
-	$ret = "***";
+	$ret = '***';
 
 	if (isset($GLOBALS['cache_array']['admins']['email'][$aid])) {
 		// Get cache
@@ -1406,10 +1449,10 @@ function GET_ADMIN_EMAIL ($aid) {
 
 		// Update cache hits
 		incrementConfigEntry('cache_hits');
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Load from database
 		$result_aid = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-			array(bigintval($aid)), __FILE__, __LINE__);
+			array(bigintval($aid)), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result_aid) == 1) {
 			// Get data
 			list($ret) = SQL_FETCHROW($result_aid);
@@ -1428,18 +1471,22 @@ function GET_ADMIN_EMAIL ($aid) {
 // Get default ACL  of admin id
 function GET_ADMIN_DEFAULT_ACL ($aid) {
 	// By default an invalid ACL value is returned
-	$ret = "***";
+	$ret = '***';
 
-	if (isset($GLOBALS['cache_array']['admins']['def_acl'][$aid])) {
+	// Is sql_patches there and was it found in cache?
+	if (!EXT_IS_ACTIVE('sql_patches')) {
+		// Not found, which is bad, so we need to allow all
+		$ret =  'allow';
+	} elseif (isset($GLOBALS['cache_array']['admins']['def_acl'][$aid])) {
 		// Use cache
 		$ret = $GLOBALS['cache_array']['admins']['def_acl'][$aid];
 
 		// Update cache hits
 		incrementConfigEntry('cache_hits');
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Load from database
 		$result_aid = SQL_QUERY_ESC("SELECT default_acl FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-			array(bigintval($aid)), __FILE__, __LINE__);
+			array(bigintval($aid)), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result_aid) == 1) {
 			// Fetch data
 			list($ret) = SQL_FETCHROW($result_aid);
@@ -1456,88 +1503,97 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
 	return $ret;
 }
 //
-function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where="") {
-	$ret = "";
-	if ($table == "/ARRAY/") {
+function ADD_OPTION_LINES ($table, $id, $name, $default='', $special='', $where='') {
+	$ret = '';
+	if ($table == '/ARRAY/') {
 		// Selection from array
-		if (is_array($id) && is_array($name) && sizeof($id) == sizeof($name)) {
+		if (is_array($id) && is_array($name) && count($id) == count($name)) {
 			// Both are arrays
 			foreach ($id as $idx => $value) {
-				$ret .= "<option value=\"".$value."\"";
-				if ($default == $value) $ret .= " selected=\"selected\"";
-				$ret .= ">".$name[$idx]."</option>\n";
+				$ret .= '<option value="' . $value . '"';
+				if ($default == $value) $ret .= ' selected="selected"';
+				$ret .= '>' . $name[$idx] . '</option>';
 			} // END - foreach
 		} // END - if
 	} else {
 		// Data from database
-		$SPEC = ", ".$id;
-		if (!empty($special)) $SPEC = ", ".$special;
+		$SPEC = ', '.$id;
+		if (!empty($special)) $SPEC = ', '.$special;
 		$ORDER = $name.$SPEC;
-		if ($table == "country") $ORDER = $special;
+		if ($table == 'country') $ORDER = $special;
 		$result = SQL_QUERY_ESC("SELECT %s, %s".$SPEC." FROM `{!_MYSQL_PREFIX!}_%s` ".$where." ORDER BY %s",
-			array($id, $ORDER, $table, $name), __FILE__, __LINE__);
+			array($id, $ORDER, $table, $name), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) > 0) {
 			// 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)) {
-				if (empty($special)) $add = "";
-				$ret .= "<option value=\"".$value."\"";
-				if ($default == $value) $ret .= " selected=\"selected\"";
-				if (!empty($add)) $add = " (".$add.")";
-				$ret .= ">".$title.$add."</option>\n";
+				if (empty($special)) $add = '';
+				$ret .= '<option value="' . $value . '"';
+				if ($default == $value) $ret .= ' selected="selected"';
+				if (!empty($add)) $add = ' ('.$add.')';
+				$ret .= '>' . $title . $add . '</option>';
 			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
 		} else {
 			// No data found
-			$ret = "<option value=\"x\">".SELECT_NONE."</option>\n";
+			$ret = '<option value="x">{--SELECT_NONE--}</option>';
 		}
 	}
 
 	// Return - hopefully - the requested data
 	return $ret;
 }
-// Activate exchange (DEPERECATED???)
-function activateExchange() {
+// Activate exchange
+function activateExchange () {
+	// Is the extension 'user' there?
+	if (!EXT_IS_ACTIVE('user')) {
+		// Silently abort here
+		return false;
+	} // END - if
+
 	// Check total amount of users
-	$totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND max_mails > 0");
+	$totalUsers = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
 
 	if ($totalUsers >= getConfig('activate_xchange')) {
 		// Activate System
-		$SQLs = array(
-			"UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1",
-			"UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2",
+		SET_SQLS(array(
+			"UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",
+			"UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what='order' OR `what`='unconfirmed' LIMIT 2",
 			"UPDATE `{!_MYSQL_PREFIX!}_config` SET activate_xchange='0' WHERE config=0 LIMIT 1"
-		);
+		));
 
 		// Run SQLs
-		RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
+		runFilterChain('run_sqls');
 
-		// Rebuild cache
-		REBUILD_CACHE("config", "config");
+		// Rebuild caches
+		// @TODO Rewrite this to a filter
+		rebuildCacheFiles('config', 'config');
+		rebuildCacheFiles('modreg', 'modreg');
 	} // END - if
 }
+
 //
-function DELETE_USER_ACCOUNT($uid, $reason)
-{
+function DELETE_USER_ACCOUNT ($uid, $reason) {
 	$points = 0;
 	$result = SQL_QUERY_ESC("SELECT (SUM(p.points) - d.used_points) AS points
 FROM `{!_MYSQL_PREFIX!}_user_points` AS p
 LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON p.userid=d.userid
-WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
+WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Save his points to add them to the jackpot
 		list($points) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		// Delete points entries as well
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
 
 		// Update mediadata as well
-		if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+		if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
 			// Update database
-			MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $points);
+			MEDIA_UPDATE_ENTRY(array('total_points'), 'sub', $points);
 		} // END - if
 
 		// Now, when we have all his points adds them do the jackpot!
@@ -1546,12 +1602,12 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 
 	// Delete category selections as well...
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s",
-		array(bigintval($uid)), __FILE__, __LINE__);
+		array(bigintval($uid)), __FUNCTION__, __LINE__);
 
 	// Remove from rallye if found
-	if (EXT_IS_ACTIVE("rallye")) {
+	if (EXT_IS_ACTIVE('rallye')) {
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE userid=%s",
-			array(bigintval($uid)), __FILE__, __LINE__);
+			array(bigintval($uid)), __FUNCTION__, __LINE__);
 	}
 
 	// Now a mail to the user and that's all...
@@ -1559,18 +1615,18 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 	SEND_EMAIL($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg);
 
 	// Ok, delete the account!
-	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
 }
 
 //
 function META_DESCRIPTION ($mod, $wht) {
 	// Exclude admin and member's area
-	if (($mod != "admin") && ($mod != "login")) {
+	if (($mod != 'admin') && ($mod != 'login')) {
 		// Construct dynamic description
-		$DESCR = "{!MAIN_TITLE!} ".trim(getConfig('title_middle'))." ".ADD_DESCR("guest", "what-".$wht, true);
+		$DESCR = '{!MAIN_TITLE!} '.trim(getConfig('title_middle')).' '.ADD_DESCR('guest', 'what-'.$wht, true);
 
 		// Output it directly
-		OUTPUT_HTML("<meta name=\"description\" content=\"".$DESCR."\" />");
+		OUTPUT_HTML('<meta name="description" content="' . $DESCR . '" />');
 	} // END - if
 
 	// Remove depth
@@ -1578,36 +1634,36 @@ function META_DESCRIPTION ($mod, $wht) {
 }
 //
 function ADD_JACKPOT($points) {
-	$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// Create line
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok','%s')", array($points), __FUNCTION__, __LINE__);
 	} else {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Update points
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET points=points+%s WHERE ok='ok' LIMIT 1",
-			array($points), __FILE__, __LINE__);
+			array($points), __FUNCTION__, __LINE__);
 	}
 }
 //
 function SUB_JACKPOT($points) {
 	// First failed
-	$ret = "-1";
+	$ret = '-1';
 
 	// Get current points
-	$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// Create line
-		SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok', 0.00000)", __FILE__, __LINE__);
+		SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok', 0.00000)", __FUNCTION__, __LINE__);
 	} else {
 		// Read points
 		list($jackpot) = SQL_FETCHROW($result);
 		if ($jackpot >= $points) {
 			// Update points when there are enougth points in jackpot
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET points=points-%s WHERE ok='ok' LIMIT 1",
-				array($points), __FILE__, __LINE__);
+				array($points), __FUNCTION__, __LINE__);
 			$ret = $jackpot - $points;
 		} // END - if
 	}
@@ -1615,62 +1671,36 @@ function SUB_JACKPOT($points) {
 	// Free memory
 	SQL_FREERESULT($result);
 }
-//
+
+// Checks wether the extension demo is actuve and the admin login is demo (password needs to be demo, too!)
 function IS_DEMO () {
-	return ((EXT_IS_ACTIVE("demo")) && (get_session('admin_login') == "demo"));
+	return ((EXT_IS_ACTIVE('demo')) && (get_session('admin_login') == 'demo'));
 }
-//
-function LOAD_CONFIG ($no="0") {
-	$CFG_DUMMY = array();
-
-	// Check for cache extension, cache-array and if the requested configuration is in cache
-	if ((is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
-		// Load config from cache
-		//* DEBUG: */ echo gettype($GLOBALS['cache_array']['config'][$no])."<br />\n";
-		foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
-			$CFG_DUMMY[$key] = $value;
-		} // END - foreach
 
-		// Count cache hits if exists
-		if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
-			$CFG_DUMMY['cache_hits']++;
-		} // END - if
-	} elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
-		// Load config from DB
-		$result_config = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1",
-			array(bigintval($no)), __FILE__, __LINE__);
-
-		// Get config from database
-		$CFG_DUMMY = SQL_FETCHARRAY($result_config);
-
-		// Free result
-		SQL_FREERESULT($result_config);
-
-		// Remember this config in the array
-		$GLOBALS['cache_array']['config'][$no] = $CFG_DUMMY;
-	}
-
-	// Return config array
-	return $CFG_DUMMY;
-}
 // Gets the matching what name from module
-function GET_WHAT($modCheck) {
-	$wht = "";
+function GET_WHAT ($modCheck) {
+	// Is the request element set?
+	if (REQUEST_ISSET_GET('what')) {
+		// Then return this!
+		return REQUEST_GET('what');
+	} // END - if
+
+	$wht = '';
 	//* DEBUG: */ echo __LINE__."!".$modCheck."!<br />\n";
 	switch ($modCheck)
 	{
-	case "admin":
-		$wht = "overview";
+	case 'admin':
+		$wht = 'overview';
 		break;
 
-	case "login":
-	case "index":
-		$wht = "welcome";
-		if (($modCheck == "index") && (getConfig('index_home') != "")) $wht = getConfig('index_home');
+	case 'login':
+	case 'index':
+		$wht = 'welcome';
+		if (($modCheck == 'index') && (getConfig('index_home') != '')) $wht = getConfig('index_home');
 		break;
 
 	default:
-		$wht = "";
+		$wht = '';
 		break;
 	}
 
@@ -1682,32 +1712,32 @@ function GET_WHAT($modCheck) {
 function SUB_POINTS ($subject, $uid, $points) {
 	// Add points to used points
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",
-	 array($points, bigintval($uid)), __FILE__, __LINE__);
+	 array($points, bigintval($uid)), __FUNCTION__, __LINE__);
 
 	// Insert booking record
-	if (EXT_IS_ACTIVE("booking")) {
+	if (EXT_IS_ACTIVE('booking')) {
 		// Add record
-		ADD_BOOKING_RECORD($subject, $uid, $points, "sub");
+		ADD_BOOKING_RECORD($subject, $uid, $points, 'sub');
 	} // END - if
 
 	// Update mediadata as well
-	if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+	if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
 		// Update database
-		MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $points);
+		MEDIA_UPDATE_ENTRY(array('total_points'), 'sub', $points);
 	} // END - if
 }
 
 // Update config entries
-function UPDATE_CONFIG ($entries, $values, $updateMode="") {
+function UPDATE_CONFIG ($entries, $values, $updateMode='') {
 	// Do not update config in CSS mode
-	if (($GLOBALS['output_mode'] == "1") || ($GLOBALS['output_mode'] == -1)) {
+	if (($GLOBALS['output_mode'] == '1') || ($GLOBALS['output_mode'] == -1)) {
 		return;
 	} // END - if
 
 	// Do we have multiple entries?
 	if (is_array($entries)) {
 		// Walk through all
-		$all = "";
+		$all = '';
 		foreach ($entries as $idx => $entry) {
 			// Update mode set?
 			if (!empty($updateMode)) {
@@ -1719,7 +1749,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 				if (($values[$idx] + 0) === $values[$idx]) {
 					// Number detected
 					$all .= sprintf("%s=%s,", $entry, (float)$values[$idx]);
-				} elseif ($values[$idx] == "UNIX_TIMESTAMP()") {
+				} elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
 					// Function UNIX_TIMESTAMP() detected
 					$all .= sprintf("%s=%s,", $entry, $values[$idx]);
 				} else {
@@ -1728,7 +1758,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 				}
 			}
 
-			// Set it in $_CONFIG as well
+			// Set it in config as well
 			setConfigEntry($entry, $values[$idx]);
 		} // END - foreach
 
@@ -1739,7 +1769,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 		// @TODO Find a way for updating $_CONFIG here
 		$entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values);
 	} else {
-		// Set it in $_CONFIG first
+		// Set it in config first
 		setConfigEntry($entries, $values);
 
 		// Regular entry to update
@@ -1748,26 +1778,26 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 
 	// Run database update
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");
-	SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_config` SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__);
+	SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_config` SET ".$entries." WHERE config=0 LIMIT 1", __FUNCTION__, __LINE__);
 
 	// Get affected rows
 	$affectedRows = SQL_AFFECTEDROWS();
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />\n";
 
 	// Rebuild cache
-	REBUILD_CACHE("config", "config");
+	rebuildCacheFiles('config', 'config');
 }
 
 // Prepares an SQL statement part for HTML mail and/or holiday depency
 function PREPARE_SQL_HTML_HOLIDAY ($mode) {
 	// Exclude no users by default
-	$MORE = "";
+	$MORE = '';
 
 	// HTML mail?
-	if ($mode == "html") $MORE = " AND html='Y'";
-	if (GET_EXT_VERSION("holiday") >= "0.1.3") {
+	if ($mode == 'html') $MORE = " AND `html`='Y'";
+	if (GET_EXT_VERSION('holiday') >= '0.1.3') {
 		// Add something for the holiday extension
-		$MORE .= " AND holiday_active='N'";
+		$MORE .= " AND `holiday_active`='N'";
 	} // END - if
 
 	// Return result
@@ -1775,12 +1805,12 @@ function PREPARE_SQL_HTML_HOLIDAY ($mode) {
 }
 
 // "Getter" for total available receivers
-function GET_TOTAL_RECEIVERS ($mode="normal") {
+function GET_TOTAL_RECEIVERS ($mode='normal') {
 	// Query database
 	$result_all = SQL_QUERY("SELECT userid
 FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),
-		__FILE__, __LINE__);
+		__FUNCTION__, __LINE__);
 
 	// Get num rows
 	$numRows = SQL_NUMROWS($result_all);
@@ -1796,7 +1826,7 @@ WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mod
 function ADD_CATEGORY_OPTIONS ($mode) {
 	// Prepare WHERE statement
 	$whereStatement = " WHERE `visible`='Y'";
-	if (IS_ADMIN()) $whereStatement = "";
+	if (IS_ADMIN()) $whereStatement = '';
 
 	// Initialize array...
 	$CATS = array(
@@ -1806,24 +1836,27 @@ function ADD_CATEGORY_OPTIONS ($mode) {
 	);
 
 	// Get categories
-	$result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// ... and begin loading stuff
-		while (list($id, $cat) = SQL_FETCHROW($result)) {
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Transfer some data
-			$CATS['id'][]   = $id;
-			$CATS['name'][] = $cat;
+			$CATS['id'][]   = $content['id'];
+			$CATS['name'][] = $content['cat'];
 
 			// Check which users are in this category
 			$result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
-			 array(bigintval($id)), __FILE__, __LINE__);
+				array(bigintval($content['id'])), __FUNCTION__, __LINE__);
 
 			// Start adding all
 			$uid_cnt = 0;
+			// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 			while (list($ucat) = SQL_FETCHROW($result_uids)) {
 				$result_ver = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
- array(bigintval($ucat)), __FILE__, __LINE__);
+					array(bigintval($ucat)), __FUNCTION__, __LINE__);
+
+				// Add user count
 				$uid_cnt += SQL_NUMROWS($result_ver);
 
 				// Free memory
@@ -1835,20 +1868,20 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
 
 			// Add counter
 			$CATS['uids'][] = $uid_cnt;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Generate options
-		$OUT = "";
+		$OUT = '';
 		foreach ($CATS['id'] as $key => $value) {
 			if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."...";
-			$OUT .= "      <option value=\"".$value."\">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</option>\n";
-		}
+			$OUT .= '      <option value="' . $value . '">' . $CATS['name'][$key] . ' (' . $CATS['uids'][$key] . ' {--USER_IN_CAT--})</option>';
+		} // END - foreach
 	} else {
 		// No cateogries are defined yet
-		$OUT = "<option class=\"member_failed\">{!MEMBER_NO_CATS!}</option>\n";
+		$OUT = '<option class="member_failed">{!MEMBER_NO_CATS!}</option>';
 	}
 
 	// Return HTML code
@@ -1856,18 +1889,18 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
 }
 
 // Add bonus mail to queue
-function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode="normal", $receiver=0) {
+function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode='normal', $receiver=0) {
 	// Is admin or bonus extension there?
 	if (!IS_ADMIN()) {
 		// Abort here
 		return false;
-	} elseif (!EXT_IS_ACTIVE("bonus")) {
+	} elseif (!EXT_IS_ACTIVE('bonus')) {
 		// Abort here
 		return false;
 	}
 
 	// Calculcate target sent
-	$target = SELECTION_COUNT(explode(";", $receiverList));
+	$target = SELECTION_COUNT(explode(';', $receiverList));
 
 	// Receiver is zero?
 	if ($receiver == 0) {
@@ -1876,12 +1909,12 @@ function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seco
 	} // END - if
 
 	// HTML extension active?
-	if (EXT_IS_ACTIVE("html")) {
+	if (EXT_IS_ACTIVE('html_mail')) {
 		// No HTML by default
-		$HTML = "N";
+		$HTML = 'N';
 
 		// HTML mode?
-		if ($mode == "html") $HTML = "Y";
+		if ($mode == 'html') $HTML = 'Y';
 
 		// Add HTML mail
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus`
@@ -1898,7 +1931,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s
 				$target,
 				bigintval($receiver),
 				$HTML
-			), __FILE__, __LINE__);
+			), __FUNCTION__, __LINE__);
 	} else {
 		// Add regular mail
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus`
@@ -1914,7 +1947,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
 				$cat,
 				$target,
 				bigintval($receiver),
-			), __FILE__, __LINE__);
+			), __FUNCTION__, __LINE__);
 	}
 }
 
@@ -1922,8 +1955,9 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
 function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
 	// Init variables
 	$CAT_TABS     = "%s";
-	$CAT_WHERE    = "";
-	$receiverList = "";
+	$CAT_WHERE    = '';
+	$receiverList = '';
+	$result       = false;
 
 	// Secure data
 	$cat      = bigintval($cat);
@@ -1943,27 +1977,27 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
 	} // END - if
 
 	// Exclude users in holiday?
-	if (GET_EXT_VERSION("holiday") >= "0.1.3") {
+	if (GET_EXT_VERSION('holiday') >= '0.1.3') {
 		// Add something for the holiday extension
-		$CAT_WHERE .= " AND d.holiday_active='N'";
+		$CAT_WHERE .= " AND d.`holiday_active`='N'";
 	} // END - if
 
-	if ((EXT_IS_ACTIVE("html_mail")) && ($mode == "html")) {
+	if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
 		// Only include HTML receivers
-		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
-		 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
+			array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
 	} else {
 		// Include all
 		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
-		 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
+			array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
 	}
 
 	// Entries found?
 	if ((SQL_NUMROWS($result) >= $receiver) && ($receiver > 0)) {
 		// Load all entries
-		while (list($REC) = SQL_FETCHROW($result)) {
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Add receiver when not empty
-			if (!empty($REC)) $receiverList .= $REC.";";
+			if (!empty($content['userid'])) $receiverList .= $content['userid'] . ';';
 		} // END - while
 
 		// Free memory
@@ -1983,12 +2017,12 @@ function USER_STATS_GET_TIMESTAMP ($type, $data, $uid = 0) {
 	$stamp = 0;
 
 	// User id set?
-	if ((isset($GLOBALS['userid'])) && ($uid == 0)) {
-		$uid = $GLOBALS['userid'];
+	if ((isUserIdSet()) && ($uid == 0)) {
+		$uid = getUserId();
 	} // END - if
 
 	// Is the extension installed and updated?
-	if ((!EXT_IS_ACTIVE("sql_patches")) || (EXT_VERSION_IS_OLDER("sql_patches", "0.5.6"))) {
+	if ((!EXT_IS_ACTIVE('sql_patches')) || (EXT_VERSION_IS_OLDER('sql_patches', '0.5.6'))) {
 		// Return zero here
 		return $stamp;
 	} // END - if
@@ -1998,7 +2032,7 @@ function USER_STATS_GET_TIMESTAMP ($type, $data, $uid = 0) {
 FROM `{!_MYSQL_PREFIX!}_user_stats_data`
 WHERE userid=%s AND stats_type='%s' AND stats_data='%s'
 LIMIT 1",
-		array(bigintval($uid), $type, $data), __FILE__, __LINE__);
+		array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
 	if (SQL_NUMROWS($result) == 1) {
@@ -2016,7 +2050,7 @@ LIMIT 1",
 // Inserts user stats
 function USER_STATS_INSERT_RECORD ($uid, $type, $data) {
 	// Is the extension installed and updated?
-	if ((!EXT_IS_ACTIVE("sql_patches")) || (EXT_VERSION_IS_OLDER("sql_patches", "0.5.6"))) {
+	if ((!EXT_IS_ACTIVE('sql_patches')) || (EXT_VERSION_IS_OLDER('sql_patches', '0.5.6'))) {
 		// Return zero here
 		return false;
 	} // END - if
@@ -2025,7 +2059,7 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) {
 	if ((!USER_STATS_GET_TIMESTAMP($type, $data, $uid)) && (!is_array($data))) {
 		// Then insert it!
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",
-			array(bigintval($uid), $type, $data), __FILE__, __LINE__);
+			array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
 	} elseif (is_array($data)) {
 		// Invalid data!
 		DEBUG_LOG(__FUNCTION__, __LINE__, " uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
@@ -2036,16 +2070,16 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) {
 function GET_USER_REF_POINTS ($uid, $level) {
 	//* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
 	// Default is no refs and no nickname
-	$ADD = "";
+	$add = '';
 	$refs = array();
 
 	// Do we have nickname extension installed?
-	if (EXT_IS_ACTIVE("nickname")) {
-		$ADD = ", ud.nickname";
+	if (EXT_IS_ACTIVE('nickname')) {
+		$add = ', ud.nickname';
 	} // END - if
 
 	// Get refs from database
-	$result = SQL_QUERY_ESC("SELECT ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$ADD."
+	$result = SQL_QUERY_ESC("SELECT ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$add."
 FROM `{!_MYSQL_PREFIX!}_user_refs` AS ur
 LEFT JOIN `{!_MYSQL_PREFIX!}_user_points` AS up
 ON ur.refid=up.userid AND ur.level=0
@@ -2053,17 +2087,17 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS ud
 ON ur.refid=ud.userid
 WHERE ur.userid=%s AND ur.level=%s
 ORDER BY ur.refid ASC",
-		array(bigintval($uid), bigintval($level)), __FILE__, __LINE__);
+		array(bigintval($uid), bigintval($level)), __FUNCTION__, __LINE__);
 
 	// Are there some entries?
 	if (SQL_NUMROWS($result) > 0) {
 		// Fetch all entries
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Get total points of this user
-			$row['points'] = GET_TOTAL_DATA($row['refid'], "user_points", "points") - GET_TOTAL_DATA($row['refid'], "user_data", "used_points");
+			$row['points'] = GET_TOTAL_DATA($row['refid'], 'user_points', 'points') - GET_TOTAL_DATA($row['refid'], 'user_data', 'used_points');
 
 			// Get unconfirmed mails
-			$row['unconfirmed']  = GET_TOTAL_DATA($row['refid'], "user_links", "id", "userid", true);
+			$row['unconfirmed']  = GET_TOTAL_DATA($row['refid'], 'user_links', 'id', 'userid', true);
 
 			// Init clickrate with zero
 			$row['clickrate'] = 0;
@@ -2074,11 +2108,11 @@ ORDER BY ur.refid ASC",
 				$row['clickrate'] = ($row['mails_confirmed'] / $row['emails_received'] * 100);
 			} // END - if
 
-			// Activity is "active" by default because if autopurge is not installed
+			// Activity is 'active' by default because if autopurge is not installed
 			$row['activity'] = MEMBER_ACTIVITY_ACTIVE;
 
 			// Is autopurge installed and the user inactive?
-			if ((EXT_IS_ACTIVE("autopurge")) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online']))  {
+			if ((EXT_IS_ACTIVE('autopurge')) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online']))  {
 				// Inactive user!
 				$row['activity'] = MEMBER_ACTIVITY_INACTIVE;
 			} // END - if
@@ -2102,14 +2136,15 @@ ORDER BY ur.refid ASC",
 }
 
 // Recuced the amount of received emails for the receipients for given email
-function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
+function REDUCED_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
 	// Search for mail in database
 	$result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
-		array($column, bigintval($id), $count), __FILE__, __LINE__);
+		array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
 
 	// Are there entries?
 	if (SQL_NUMROWS($result) > 0) {
 		// Now load all userids for one big query!
+		// @TODO This can be somehow rewritten
 		$UIDs = array();
 		while (list($uid) = SQL_FETCHROW($result)) {
 			$UIDs[$uid] = $uid;
@@ -2117,12 +2152,72 @@ function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
 
 		// Now update all user accounts
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
-			array(implode(",", $UIDs), count($UIDs)), __FILE__, __LINE__);
+			array(implode(",", $UIDs), count($UIDs)), __FUNCTION__, __LINE__);
 	} // END - if
 
 	// Free result
 	SQL_FREERESULT($result);
 }
 
+// Init SQLs array
+function INIT_SQLS () {
+	SET_SQLS(array());
+}
+
+// Checks wether the sqls array is initialized
+function IS_SQLS_INITIALIZED () {
+	return ((isset($GLOBALS['sqls'])) && (is_array($GLOBALS['sqls'])));
+}
+
+// Setter for SQLs array
+function SET_SQLS ($SQLs) {
+	$GLOBALS['sqls'] = (array) $SQLs;
+}
+
+// Remover for SQLs array
+function UNSET_SQLS () {
+	unset($GLOBALS['sqls']);
+}
+
+// Getter for SQLs array
+function GET_SQLS () {
+	return $GLOBALS['sqls'];
+}
+
+// Add an SQL to the list
+function ADD_SQL ($sql) {
+	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("sql=%s, count=%d", $sql, COUNT_SQLS()));
+	$GLOBALS['sqls'][] = (string) $sql;
+}
+
+// Setter for SQLs key
+function SET_SQL_KEY ($key, $value) {
+	$GLOBALS['sqls'][$key] = (string) $value;
+}
+
+// Counter for SQLs array
+function COUNT_SQLS () {
+	// Default is false
+	$count = false;
+
+	// Is the array there?
+	if (IS_SQLS_INITIALIZED()) {
+		// Then count it
+		$count = count($GLOBALS['sqls']);
+		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("count=%d", $count));
+	} // END - if
+
+	// Return it
+	return $count;
+}
+
+// Checks wether the SQLs array is filled
+function IS_SQLS_VALID () {
+	return (
+		(IS_SQLS_INITIALIZED()) &&
+		(COUNT_SQLS() > 0)
+	);
+}
+
 // [EOF]
 ?>