Fixes/rewrites for missing sql_patches and check on admin's default access mode ...
[mailer.git] / inc / mysql-manager.php
index 4e10c8874056bca75b325df90ad6ea0926799ff0..db3015241a05653e8326fa33ccd6c73562a577eb 100644 (file)
  * -------------------------------------------------------------------- *
  * 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                  *
@@ -39,24 +44,23 @@ if (!defined('__SECURITY')) {
 
 // Returns the title for given module
 function ADD_MODULE_TITLE ($mod) {
-       global $cacheArray;
-
        // Init variables
        $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($cacheArray['modules']['module'])) && (in_array($mod, $cacheArray['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 = $cacheArray['modules']['title'][$mod];
+                       $name = $GLOBALS['cache_array']['modules']['title'][$mod];
 
                        // Update cache hits
                        incrementConfigEntry('cache_hits');
                } 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);
                }
@@ -71,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
 
@@ -80,10 +84,7 @@ function ADD_MODULE_TITLE ($mod) {
 }
 
 // Check validity of a given module name (no file extension)
-function CHECK_MODULE ($mod) {
-       // We need them now here...
-       global $cacheArray, $cacheInstance;
-
+function checkModulePermissions ($mod) {
        // Filter module name (names with low chars and underlines are fine!)
        $mod = preg_replace("/[^a-z_]/", "", $mod);
 
@@ -97,25 +98,40 @@ function CHECK_MODULE ($mod) {
                if (EXT_IS_ACTIVE($modSplit[0])) {
                        // The prefix is an extension's name, so let's set it
                        $extension = $modSplit[0]; $mod = $modSplit[1];
-               }
-       }
+               } // END - if
+       } // END - if
 
        // Major error in module registry is the default
        $ret = "major";
 
        // Check if script is installed if not return a "done" to prevent some errors
-       if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!isBooleanConstantAndTrue('admin_registered'))) return "done";
+       if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) {
+               // Not installed or no admin registered or in installation phase
+               return "done";
+       } // END - if
+
+       // Init variables
+       $locked = "Y";
+       $hidden = "N";
+       $admin  = "N";
+       $mem    = "N";
+       $found  = false;
 
        // Check if cache is latest version
-       $locked = "Y"; $hidden = "N"; $admin = "N"; $mem = "N"; $found = false;
        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($cacheArray['modules']['locked'][$mod_chk])) {
+               if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
                        // Check cache
-                       $locked = $cacheArray['modules']['locked'][$mod_chk];
-                       $hidden = $cacheArray['modules']['hidden'][$mod_chk];
-                       $admin  = $cacheArray['modules']['admin_only'][$mod_chk];
-                       $mem    = $cacheArray['modules']['mem_only'][$mod_chk];
+                       $locked = $GLOBALS['cache_array']['modules']['locked'][$mod_chk];
+                       $hidden = $GLOBALS['cache_array']['modules']['hidden'][$mod_chk];
+                       $admin  = $GLOBALS['cache_array']['modules']['admin_only'][$mod_chk];
+                       $mem    = $GLOBALS['cache_array']['modules']['mem_only'][$mod_chk];
 
                        // Update cache hits
                        incrementConfigEntry('cache_hits');
@@ -126,7 +142,8 @@ function CHECK_MODULE ($mod) {
                }
        } 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);
@@ -152,12 +169,20 @@ function CHECK_MODULE ($mod) {
                } elseif (($admin == "Y") && (!IS_ADMIN())) {
                        // Only the Admin is allowed to enter this module!
                        $ret = "admin_only";
+               } else {
+                       // @TODO Nothing helped???
+                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
+                               $ret,
+                               $locked,
+                               $admin,
+                               $mem
+                       ));
                }
        } // END - if
 
        // Still no luck or not found?
        if (($ret == "cache_miss") || (!$found)) {
-               //              ----- Legacy module -----                                   ---- Module in base folder  ----                       --- Module with extension's name ---
+               //              ----- 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") {
@@ -165,12 +190,12 @@ function CHECK_MODULE ($mod) {
                                // 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?
@@ -180,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";
@@ -205,22 +230,21 @@ function CHECK_MODULE ($mod) {
 }
 
 // Add menu description pending on given file name (without path!)
-function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
-       global $NAV_DEPTH;
-
-       // Use only filename of the file ;)
-       $file = basename($file);
+function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
+       // Use only filename of the FQFN...
+       $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-") {
                // This is an action file!
                $type = "action";
                $search = substr($file, 7);
-               switch ($ACC_LVL)
-               {
+               switch ($ACC_LVL) {
                case "admin":
                        $modCheck = "admin";
                        break;
@@ -231,14 +255,13 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
                        $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 = "";
-               switch ($ACC_LVL)
-               {
+               switch ($ACC_LVL) {
                case "admin":
                        $modCheck = "admin";
                        break;
@@ -252,25 +275,27 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
                        break;
                }
                $dummy = substr($search, 0, -4);
-               $AND .= " AND action='".GET_ACTION($ACC_LVL, $dummy)."'";
+               $AND .= " AND `action`='".GET_ACTION($ACC_LVL, $dummy)."'";
        } elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) {
                // Sponsor / engine menu
-               $type = "what";
-               $search = $file;
+               $type     = "what";
+               $search   = $file;
                $modCheck = $GLOBALS['module'];
-               $AND = "";
+               $AND      = "";
        } else {
                // Other
-               $type = "menu";
-               $search = $file;
+               $type     = "menu";
+               $search   = $file;
                $modCheck = $GLOBALS['module'];
-               $AND = "";
+               $AND      = "";
        }
-       if ((!isset($NAV_DEPTH)) && (!$return)) {
-               $NAV_DEPTH = 0;
-               $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>";
+
+       // Begin the navigation line
+       if ((!isset($GLOBALS['nav_depth'])) && (!$return)) {
+               $GLOBALS['nav_depth'] = 0;
+               $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) $NAV_DEPTH++;
+               if (!$return) $GLOBALS['nav_depth']++;
                $prefix = "";
        }
 
@@ -284,7 +309,7 @@ function ADD_DESCR ($ACC_LVL, $file, $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) {
@@ -292,7 +317,7 @@ function ADD_DESCR ($ACC_LVL, $file, $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"))) {
@@ -305,10 +330,10 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
                                //* DEBUG: */ echo __LINE__."+".$type."+<br />\n";
                                // Add closing div and br-tag
                                $OUT .= "</div><br />\n";
-                               $NAV_DEPTH = "0";
+                               $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
                }
@@ -335,74 +360,86 @@ function ADD_MENU ($MODE, $act, $wht) {
        $main_action = "";
        $sub_what = "";
 
-       if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) return getMessage('CODE_MENU_NOT_VALID');
+       // is the menu action 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\">");
                // 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);
 
-                       $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__);
+                       // 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__);
+
+                       // 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?
@@ -414,39 +451,39 @@ function ADD_MENU ($MODE, $act, $wht) {
                                }
                        } 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";
+                                       //* 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>");
        }
 }
 
 // This patched function will reduce many SELECT queries for the specified or current admin login
 function IS_ADMIN ($admin="") {
-       global $cacheArray;
-
        // Init variables
        $ret = false; $passCookie = ""; $valPass = "";
        //* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
@@ -460,22 +497,22 @@ function IS_ADMIN ($admin="") {
        //* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."<br />";
 
        // Search in array for entry
-       if (isset($cacheArray['admin_hash'])) {
+       if (isset($GLOBALS['cache_array']['admin_hash'])) {
                // Use cached string
-               $valPass = $cacheArray['admin_hash'];
-       } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
+               $valPass = $GLOBALS['cache_array']['admin_hash'];
+       } elseif ((!empty($passCookie)) && (isset($GLOBALS['cache_array']['admins']['password'][$admin])) && (!empty($admin))) {
                // Login data is valid or not?
-               $valPass = generatePassString($cacheArray['admins']['password'][$admin]);
+               $valPass = generatePassString($GLOBALS['cache_array']['admins']['password'][$admin]);
 
                // Cache it away
-               $cacheArray['admin_hash'] = $valPass;
+               $GLOBALS['cache_array']['admin_hash'] = $valPass;
 
                // Count cache hits
                incrementConfigEntry('cache_hits');
-       } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($cacheArray['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 = "";
@@ -484,7 +521,7 @@ function IS_ADMIN ($admin="") {
                        list($passDB) = SQL_FETCHROW($result);
 
                        // Temporary cache it
-                       $cacheArray['admins']['password'][$admin] = $passDB;
+                       $GLOBALS['cache_array']['admins']['password'][$admin] = $passDB;
 
                        // Generate password hash
                        $valPass = generatePassString($passDB);
@@ -507,55 +544,50 @@ function IS_ADMIN ($admin="") {
 
 // Generates a list of "max receiveable emails per day"
 function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
-       global $_POST;
        $OUT = "";
+       $result = false;
+
        switch ($MODE) {
-       case "guest":
-               // Guests (in the registration form) are not allowed to select 0 mails per day.
-               $result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value > 0 ORDER BY value", __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) > 0) {
-                       $OUT = "";
-                       while (list($value, $comment) = SQL_FETCHROW($result)) {
-                               $OUT .= "      <option value=\"".$value."\"";
-                               if ($_POST['max_mails'] == $value) $OUT .= " selected=\"selected\"";
-                               $OUT .= ">".$value." ".PER_DAY;
-                               if (!empty($comment)) $OUT .= " (".$comment.")";
-                               $OUT .= "</option>\n";
-                       }
-                       define('__MAX_RECEIVE_OPTIONS', $OUT);
+               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;
 
-                       // 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;
+               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;
 
-       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, NO_MAX_VALUES);
+               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 {
@@ -568,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);
@@ -580,62 +612,27 @@ function SEARCH_EMAIL_USERTAB ($email) {
        return $ret;
 }
 
-// Checks wether 'what' is valid
-// @TODO This cache can be flushed to hard drive
-function WHAT_IS_VALID ($act, $wht, $type="guest") {
-       global $cacheArray;
-
-       // Is admin or cache entry is there?
-       if (IS_ADMIN()) {
-               // Everything is valid to the admin :-)
-               $ret = true;
-       } elseif (isset($cacheArray['what_valid'][$type][$act][$what])) {
-               // Use the cache
-               $ret = $cacheArray['what_valid'][$type][$act][$what];
-
-               // Count the cache hit
-               incrementConfigEntry('cache_hits');
-       } else {
-               // By default is nothing valid
-               $ret = false;
-
-               // Look in database
-               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE action='%s' AND what='%s' AND `locked`='N' LIMIT 1", array($type, $act, $wht), __FILE__, __LINE__);
-
-               // Is "what" valid?
-               $ret = (SQL_NUMROWS($result) == 1);
-
-               // Free the result
-               SQL_FREERESULT($result);
-       }
-
-       // Cache the entry
-       $cacheArray['what_valid'][$type][$act][$what] = $ret;
-
-       // Return the result
-       return $ret;
-}
-
 // Checks wether the current user is a member
 function IS_MEMBER () {
-       global $status, $LAST, $cacheArray;
-       if (!is_array($LAST)) $LAST = array();
+       // @TODO Why is this global??? #100
+       global $status;
+       if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array();
        $ret = false;
 
        // is the cache entry there?
-       if (isset($cacheArray['is_member'])) {
+       if (isset($GLOBALS['cache_array']['is_member'])) {
                // Then return it
-               return $cacheArray['is_member'];
+               return $GLOBALS['cache_array']['is_member'];
        } // END - if
 
        // Fix "deleted" cookies first
        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);
@@ -644,9 +641,9 @@ function IS_MEMBER () {
                        $valPass = generatePassString($password);
 
                        // Transfer last module and online time
-                       if ((!empty($mod)) && (empty($LAST['module']))) {
-                               $LAST['module'] = $mod;
-                               $LAST['online'] = $onl;
+                       if ((!empty($mod)) && (empty($GLOBALS['last']['module']))) {
+                               $GLOBALS['last']['module'] = $mod;
+                               $GLOBALS['last']['online'] = $onl;
                        } // END - if
 
                        // So did we now have valid data and an unlocked user?
@@ -674,7 +671,7 @@ function IS_MEMBER () {
        }
 
        // Cache status
-       $cacheArray['is_member'] = $ret;
+       $GLOBALS['cache_array']['is_member'] = $ret;
 
        // Return status
        return $ret;
@@ -682,31 +679,40 @@ function IS_MEMBER () {
 
 // Validate the given menu action
 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)) {
+               // Count cache hit
+               incrementConfigEntry('cache_hits');
+
+               // Then use this cache
+               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)) {
+       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);
-       } elseif ($wht != "overview") {
+               $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'".$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`='%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__);
-       if ($UPDATE) {
+       $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
+       if ($UPDATE === true) {
                // Check updated/affected rows
                $ret = (SQL_AFFECTEDROWS() == 1);
        } else {
@@ -717,12 +723,15 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) {
        // Free memory
        SQL_FREERESULT($result);
 
+       // Set cache entry
+       $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";
@@ -734,7 +743,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) {
@@ -752,7 +761,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);
@@ -762,10 +771,10 @@ function SEND_MODE_MAILS($mod, $modes) {
 
                // Now let's compare passwords
                $hash = generatePassString($hashDB);
-               if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
+               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);
@@ -789,7 +798,7 @@ function SEND_MODE_MAILS($mod, $modes) {
                                                case "normal": break; // Do not add any special lines
 
                                                case "email": // Email was changed!
-                                                       $content = MEMBER_CHANGED_EMAIL.": ".$_POST['old_addy']."\n";
+                                                       $content = MEMBER_CHANGED_EMAIL.": ".REQUEST_POST('old_addy')."\n";
                                                        break;
 
                                                case "pass": // Password was changed
@@ -805,11 +814,11 @@ function SEND_MODE_MAILS($mod, $modes) {
 
                                        if (EXT_IS_ACTIVE("country")) {
                                                // Replace code with description
-                                               $DATA[4] = COUNTRY_GENERATE_INFO($_POST['country_code']);
+                                               $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") {
                                                // The admin needs to be notified about a profile change
@@ -835,15 +844,15 @@ function SEND_MODE_MAILS($mod, $modes) {
                                } // END - switch
                        } else {
                                // Could not load profile data
-                               $content = "<span class=\"member_failed\">{!MEMBER_CANNOT_LOAD_PROFILE!}</span>";
+                               $content = "<span class=\"member_failed\">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>";
                        }
                } else {
                        // Passwords mismatch
-                       $content = "<span class=\"member_failed\">{!MEMBER_PASSWORD_ERROR!}</span>";
+                       $content = "<span class=\"member_failed\">{--MEMBER_PASSWORD_ERROR--}</span>";
                }
        } else {
                // Could not load profile
-               $content = "<span class=\"member_failed\">{!MEMBER_CANNOT_LOAD_PROFILE!}</span>";
+               $content = "<span class=\"member_failed\">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>";
        }
 
        // Send email to user if required
@@ -856,32 +865,32 @@ 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']);
+                       SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, getUserId());
                } elseif (getConfig('admin_notify') == "Y") {
                        // Cannot send mails to admin!
-                       $content = CANNOT_SEND_ADMIN_MAILS;
+                       $content = getMessage('CANNOT_SEND_ADMIN_MAILS');
                } else {
                        // No mail to admin
-                       $content = "<span class=\"member_done\">".MYDATA_MAIL_SENT."</span>";
+                       $content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
                }
        } // END - if
 
        // Load template
        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) {
-       global $ret;
-
-       // @DEPRECATED Init status
+       // Init status
        $ret = "";
 
        //* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=<br />";
@@ -892,7 +901,10 @@ function GET_ACTION ($MODE, &$wht) {
 
        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']))) {
@@ -917,8 +929,8 @@ function GET_ACTION ($MODE, &$wht) {
                if (empty($ret)) $ret = "main";
 
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE what='%s' LIMIT 1",
-                       array($MODE, $wht), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what`='%s' LIMIT 1",
+                       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);
@@ -927,8 +939,12 @@ 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");
+               // 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
@@ -938,16 +954,16 @@ function GET_ACTION ($MODE, &$wht) {
 // Get category name back
 function GET_CATEGORY ($cid) {
        // Default is not found
-       $ret = _CATEGORY_404;
+       $ret = getMessage('_CATEGORY_404');
 
        // Is the category id set?
        if ($cid == "0") {
                // No category
-               $ret = _CATEGORY_NONE;
+               $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);
@@ -964,11 +980,11 @@ function GET_CATEGORY ($cid) {
 // Get a string of "mail title" and price back
 function GET_PAYMENT ($pid, $full=false) {
        // Default is not found
-       $ret = _PAYMENT_404;
+       $ret = getMessage('_PAYMENT_404');
 
        // 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) {
@@ -977,7 +993,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!}";
                }
        }
 
@@ -989,13 +1005,11 @@ function GET_PAYMENT ($pid, $full=false) {
 }
 
 // Get (basicly) the price of given payment id
-function GET_PAY_POINTS($pid, $lookFor="price")
-{
+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__);
-       if (SQL_NUMROWS($result) == 1)
-       {
+               array($lookFor, $pid), __FUNCTION__, __LINE__);
+       if (SQL_NUMROWS($result) == 1) {
                // Payment type found... :-)
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -1003,32 +1017,33 @@ 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)
-{
+// 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";
-       if ($uid > 0)
-       {
+
+       // 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"; }
+
+                       // 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__);
+                                       array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
                                $ret = "done";
-                       }
-                        else
-                       {
+                       } else {
                                // Already found
                                $ret = "already";
                        }
@@ -1037,24 +1052,36 @@ function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fa
                        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")) {
+       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
@@ -1077,18 +1104,16 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
 }
 // "Getter fro ref level percents
 function GET_REF_LEVEL_PERCENTS ($level) {
-       global $cacheInstance, $cacheArray;
-
        // Default is zero
        $per = 0;
 
        // Do we have cache?
-       if ((isset($cacheArray['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, $cacheArray['ref_depths']['level']);
+               $key = array_search($level, $GLOBALS['cache_array']['ref_depths']['level']);
                if ($key !== false) {
                        // Entry found!
-                       $per = $cacheArray['ref_depths']['percents'][$key];
+                       $per = $GLOBALS['cache_array']['ref_depths']['percents'][$key];
 
                        // Count cache hit
                        incrementConfigEntry('cache_hits');
@@ -1096,7 +1121,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
        } 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) {
@@ -1126,7 +1151,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
  */
 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, $cacheArray;
+       global $DATA;
 
        // Convert mode to lower-case
        $add_mode = strtolower($add_mode);
@@ -1163,13 +1188,13 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 
        // 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) {
                // This is the user and his ref
                list($ref, $email) = SQL_FETCHROW($result_user);
-               $cacheArray['add_uid'][$ref] = $uid;
+               $GLOBALS['cache_array']['add_uid'][$ref] = $uid;
 
                // Get percents
                $per = GET_REF_LEVEL_PERCENTS($GLOBALS['ref_level']);
@@ -1182,22 +1207,22 @@ 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($cacheArray['add_uid'][$uid]))) {
-                               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />\n";
-                               $ref_points = ADD_REFBACK_POINTS($cacheArray['add_uid'][$uid], $uid, $points, $ref_points);
-                               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />\n";
+                       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";
                        } // END - if
 
                        // 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
 
@@ -1227,7 +1252,7 @@ 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)
                                );
 
@@ -1235,8 +1260,8 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
                                $msg = LOAD_EMAIL_TEMPLATE("add-points", $content, $uid);
 
                                // And sent it away
-                               SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
-                               if (!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?
@@ -1254,28 +1279,26 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 }
 //
 function UPDATE_REF_COUNTER ($uid) {
-       global $cacheArray, $cacheInstance;
-
        // Make it sure referal level zero (member him-/herself) is at least selected
-       if (empty($cacheArray['ref_level'][$uid])) $cacheArray['ref_level'][$uid] = 1;
-       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$cacheArray['ref_level'][$uid]}<br />\n";
+       if (empty($GLOBALS['cache_array']['ref_level'][$uid])) $GLOBALS['cache_array']['ref_level'][$uid] = 1;
+       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$GLOBALS['cache_array']['ref_level'][$uid]}<br />\n";
 
        // Update counter
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
-               array(bigintval($uid), $cacheArray['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), $cacheArray['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);
@@ -1288,15 +1311,15 @@ function UPDATE_REF_COUNTER ($uid) {
        if (($ref > 0) && ($ref != $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";
-               $cacheArray['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
+               $GLOBALS['cache_array']['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
        } 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
-       $cacheArray['ref_level'][$uid]--;
+       $GLOBALS['cache_array']['ref_level'][$uid]--;
 
        // Handle refback here if extension is installed
        if (EXT_IS_ACTIVE("refback")) {
@@ -1304,13 +1327,14 @@ function UPDATE_REF_COUNTER ($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
@@ -1321,18 +1345,20 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
 
 // Get ID number from administrator's login name
 function GET_ADMIN_ID ($login) {
-       global $cacheArray;
+       // By default no admin is found
        $ret = "-1";
-       if (isset($cacheArray['admins']['aid'][$login])) {
-               // Check cache
-               $ret = $cacheArray['admins']['aid'][$login];
+
+       // Check cache
+       if (isset($GLOBALS['cache_array']['admins']['aid'][$login])) {
+               // Use it if found to save SQL queries
+               $ret = $GLOBALS['cache_array']['admins']['aid'][$login];
 
                // Update cache hits
                incrementConfigEntry('cache_hits');
        } 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
@@ -1356,26 +1382,26 @@ function GET_CURRENT_ADMIN_ID () {
 }
 
 // Get password hash from administrator's login name
-function GET_ADMIN_HASH ($aid)
-{
-       global $cacheArray;
+function GET_ADMIN_HASH ($aid) {
+       // By default an invalid hash is returned
        $ret = "-1";
-       if (isset($cacheArray['admins']['password'][$aid])) {
+
+       if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
                // Check cache
-               $ret = $cacheArray['admins']['password'][$aid];
+               $ret = $GLOBALS['cache_array']['admins']['password'][$aid];
 
                // Update cache hits
                incrementConfigEntry('cache_hits');
        } 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
-                       $cacheArray['admins']['password'][$aid] = $ret;
+                       $GLOBALS['cache_array']['admins']['password'][$aid] = $ret;
                }
 
                // Free result
@@ -1385,24 +1411,25 @@ function GET_ADMIN_HASH ($aid)
 }
 //
 function GET_ADMIN_LOGIN ($aid) {
-       global $cacheArray;
+       // By default a non-existent login is returned (other functions react on this!)
        $ret = "***";
-       if (isset($cacheArray['admins']['login'][$aid])) {
+
+       if (isset($GLOBALS['cache_array']['admins']['login'][$aid])) {
                // Get cache
-               $ret = $cacheArray['admins']['login'][$aid];
+               $ret = $GLOBALS['cache_array']['admins']['login'][$aid];
 
                // Update cache hits
                incrementConfigEntry('cache_hits');
        } 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);
 
                        // Set cache
-                       $cacheArray['admins']['login'][$aid] = $ret;
+                       $GLOBALS['cache_array']['admins']['login'][$aid] = $ret;
                } // END - if
 
                // Free memory
@@ -1412,25 +1439,25 @@ function GET_ADMIN_LOGIN ($aid) {
 }
 // Get email address of admin id
 function GET_ADMIN_EMAIL ($aid) {
-       global $cacheArray;
-
+       // By default an invalid emails is returned
        $ret = "***";
-       if (isset($cacheArray['admins']['email'][$aid])) {
+
+       if (isset($GLOBALS['cache_array']['admins']['email'][$aid])) {
                // Get cache
-               $ret = $cacheArray['admins']['email'][$aid];
+               $ret = $GLOBALS['cache_array']['admins']['email'][$aid];
 
                // Update cache hits
                incrementConfigEntry('cache_hits');
        } 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);
 
                        // Set cache
-                       $cacheArray['admins']['email'][$aid] = $ret;
+                       $GLOBALS['cache_array']['admins']['email'][$aid] = $ret;
                        } // END - if
 
                // Free result
@@ -1442,25 +1469,29 @@ function GET_ADMIN_EMAIL ($aid) {
 }
 // Get default ACL  of admin id
 function GET_ADMIN_DEFAULT_ACL ($aid) {
-       global $cacheArray;
-
+       // By default an invalid ACL value is returned
        $ret = "***";
-       if (isset($cacheArray['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 = $cacheArray['admins']['def_acl'][$aid];
+               $ret = $GLOBALS['cache_array']['admins']['def_acl'][$aid];
 
                // Update cache hits
                incrementConfigEntry('cache_hits');
        } 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);
 
                        // Set cache
-                       $cacheArray['admins']['def_acl'][$aid] = $ret;
+                       $GLOBALS['cache_array']['admins']['def_acl'][$aid] = $ret;
                }
 
                // Free result
@@ -1475,11 +1506,11 @@ 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 checked";
+                               if ($default == $value) $ret .= " selected=\"selected\"";
                                $ret .= ">".$name[$idx]."</option>\n";
                        } // END - foreach
                } // END - if
@@ -1490,13 +1521,14 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
                $ORDER = $name.$SPEC;
                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 checked";
+                               if ($default == $value) $ret .= " selected=\"selected\"";
                                if (!empty($add)) $add = " (".$add.")";
                                $ret .= ">".$title.$add."</option>\n";
                        } // END - while
@@ -1505,31 +1537,38 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
                        SQL_FREERESULT($result);
                } else {
                        // No data found
-                       $ret = "<option value=\"x\">".SELECT_NONE."</option>\n";
+                       $ret = "<option value=\"x\">{--SELECT_NONE--}</option>\n";
                }
        }
 
        // 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");
 
        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
+               rebuildCacheFiles("config", "config");
+               rebuildCacheFiles("modreg", "modreg");
        } // END - if
 }
 //
@@ -1540,14 +1579,14 @@ function DELETE_USER_ACCOUNT($uid, $reason)
 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") {
@@ -1561,12 +1600,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")) {
                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...
@@ -1574,7 +1613,7 @@ 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__);
 }
 
 //
@@ -1593,17 +1632,17 @@ 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__);
        }
 }
 //
@@ -1612,17 +1651,17 @@ function SUB_JACKPOT($points) {
        $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
        }
@@ -1631,46 +1670,18 @@ function SUB_JACKPOT($points) {
        SQL_FREERESULT($result);
 }
 //
-function IS_DEMO() {
+function IS_DEMO () {
        return ((EXT_IS_ACTIVE("demo")) && (get_session('admin_login') == "demo"));
 }
-//
-function LOAD_CONFIG ($no="0") {
-       global $cacheArray;
-       $CFG_DUMMY = array();
-
-       // Check for cache extension, cache-array and if the requested configuration is in cache
-       if ((is_array($cacheArray)) && (isset($cacheArray['config'][$no])) && (is_array($cacheArray['config'][$no]))) {
-               // Load config from cache
-               //* DEBUG: */ echo gettype($cacheArray['config'][$no])."<br />\n";
-               foreach ($cacheArray['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($cacheArray['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
-               $cacheArray['config'][$no] = $CFG_DUMMY;
-       }
 
-       // Return config array
-       return $CFG_DUMMY;
-}
 // Gets the matching what name from module
-function GET_WHAT($modCheck) {
+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)
@@ -1698,7 +1709,7 @@ 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")) {
@@ -1715,10 +1726,8 @@ function SUB_POINTS ($subject, $uid, $points) {
 
 // Update config entries
 function UPDATE_CONFIG ($entries, $values, $updateMode="") {
-       global $CSS;
-
        // Do not update config in CSS mode
-       if (($CSS == "1") || ($CSS == -1)) {
+       if (($GLOBALS['output_mode'] == "1") || ($GLOBALS['output_mode'] == -1)) {
                return;
        } // END - if
 
@@ -1746,7 +1755,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
 
@@ -1757,7 +1766,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
@@ -1766,14 +1775,14 @@ 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
@@ -1798,7 +1807,7 @@ function GET_TOTAL_RECEIVERS ($mode="normal") {
        $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);
@@ -1824,24 +1833,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
@@ -1853,7 +1865,7 @@ 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);
@@ -1862,8 +1874,8 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
                $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>\n";
+               } // END - foreach
        } else {
                // No cateogries are defined yet
                $OUT = "<option class=\"member_failed\">{!MEMBER_NO_CATS!}</option>\n";
@@ -1916,7 +1928,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`
@@ -1932,7 +1944,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
                                $cat,
                                $target,
                                bigintval($receiver),
-                       ), __FILE__, __LINE__);
+                       ), __FUNCTION__, __LINE__);
        }
 }
 
@@ -1942,6 +1954,7 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
        $CAT_TABS     = "%s";
        $CAT_WHERE    = "";
        $receiverList = "";
+       $result       = false;
 
        // Secure data
        $cat      = bigintval($cat);
@@ -1969,19 +1982,19 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
        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__);
+                       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
@@ -2001,8 +2014,8 @@ 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?
@@ -2016,7 +2029,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) {
@@ -2043,7 +2056,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!");
@@ -2054,16 +2067,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";
+               $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
@@ -2071,7 +2084,7 @@ 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) {
@@ -2120,14 +2133,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;
@@ -2135,12 +2149,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]
 ?>