Code moved because it depends on tables created by ext-user
[mailer.git] / inc / mysql-manager.php
index 9fc243f21403d3acd2326267c07def46c4101a92..2aedbdb8cf4a184929ffdf4ff3e81035af6b5c4e 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/26/2003 *
- * ===============                              Last change: 11/29/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/26/2003 *
+ * ===================                          Last change: 11/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : mysql-manager.php                                *
@@ -17,7 +17,8 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-}
+       die();
+} // END - if
 
 // "Getter" for module title
-function getModuleTitle ($mod) {
+function getModuleTitle ($module) {
        // Init variables
-       $name = '';
+       $data['title'] = '';
        $result = false;
 
        // Is the script installed?
        if (isInstalled()) {
                // Check if cache is valid
-               if ((GET_EXT_VERSION('cache') >= '0.1.2') && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) {
+               if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($module, $GLOBALS['cache_array']['modules']['module']))) {
                        // Load from cache
-                       $name = $GLOBALS['cache_array']['modules']['title'][$mod];
+                       $data['title'] = $GLOBALS['cache_array']['modules']['title'][$module];
 
                        // Update cache hits
-                       incrementConfigEntry('cache_hits');
-               } elseif (!EXT_IS_ACTIVE('cache')) {
+                       incrementStatsEntry('cache_hits');
+               } elseif (!isExtensionActive('cache')) {
                        // Load from database
-                       $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);
+                       $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
+                               array($module), __FUNCTION__, __LINE__);
+
+                       // Is the entry there?
+                       if (SQL_NUMROWS($result)) {
+                               // Get the title from database
+                               $data = SQL_FETCHARRAY($result);
+                       } // END - if
+
+                       // Free the result
                        SQL_FREERESULT($result);
                }
        } // END - if
 
        // Trim name
-       $name = trim($name);
+       $data['title'] = trim($data['title']);
 
        // Still no luck or empty title?
-       if (empty($name)) {
+       if (empty($data['title'])) {
                // No name found
-               $name = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod);
-               if (SQL_NUMROWS($result) == 0) {
+               $data['title'] = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $module);
+               if (SQL_NUMROWS($result) == '0') {
                        // Add module to database
-                       $dummy = checkModulePermissions($mod);
+                       $dummy = checkModulePermissions($module);
                } // END - if
        } // END - if
 
        // Return name
-       return $name;
+       return $data['title'];
 }
 
 // "Getter" for module description
-function getModuleDescription ($mode, $wht, $column = 'what') {
+// @TODO Can we cache this?
+function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
        // Fix empty 'what'
-       if (empty($wht)) {
-               $wht = "welcome";
-               if (getConfig('index_home') != '') $wht = getConfig('index_home');
+       if (empty($what)) {
+               $what = getConfig('index_home');
        } // END - if
 
        // Default is not found
-       $ret = "??? (".$wht.')';
+       $data['title'] = '??? (' . $what . ')';
 
        // Look for title
-       $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1",
-       array($mode, $column, $wht), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `%s`='%s'" . $ADD . " LIMIT 1",
+               array(
+                       $mode,
+                       $column,
+                       $what
+               ), __FUNCTION__, __LINE__);
 
        // Is there an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Fetch the title
-               list($ret) = SQL_FETCHROW($result);
+               $data = SQL_FETCHARRAY($result);
        } // END - if
 
        // Free result
        SQL_FREERESULT($result);
-       return $ret;
+
+       // Return it
+       return $data['title'];
 }
 
 // Check validity of a given module name (no file extension)
-function checkModulePermissions ($mod) {
+function checkModulePermissions ($module = '') {
+       // Is it empty (default), then take the current one
+       if (empty($module)) $module = getModule();
+
+       // Do we have cache?
+       if (isset($GLOBALS['module_status'][$module])) {
+               // Then use it
+               return $GLOBALS['module_status'][$module];
+       } // END - if
+
        // Filter module name (names with low chars and underlines are fine!)
-       $mod = preg_replace("/[^a-z_]/", '', $mod);
+       $module = preg_replace('/[^a-z_]/', '', $module);
 
        // Check for prefix is a extension...
-       $modSplit = explode("_", $mod);
-       $extension = ''; $mod_chk = $mod;
-       //* DEBUG: */ echo __LINE__."*".count($modSplit)."*/".$mod."*<br />";
+       $modSplit = explode('_', $module);
+       $extension = ''; $module_chk = $module;
+       //* DEBUG: */ print(__LINE__."*".count($modSplit)."*/".$module."*<br />");
        if (count($modSplit) == 2) {
                // Okay, there is a seperator (_) in the name so is the first part a module?
-               //* DEBUG: */ echo __LINE__."*".$modSplit[0]."*<br />";
-               if (EXT_IS_ACTIVE($modSplit[0])) {
+               //* DEBUG: */ print(__LINE__."*".$modSplit[0]."*<br />");
+               if (isExtensionActive($modSplit[0])) {
                        // The prefix is an extension's name, so let's set it
-                       $extension = $modSplit[0]; $mod = $modSplit[1];
+                       $extension = $modSplit[0]; $module = $modSplit[1];
                } // END - if
        } // END - if
 
        // Major error in module registry is the default
-       $ret = "major";
+       $ret = 'major';
 
        // Check if script is installed if not return a 'done' to prevent some errors
-       if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) {
+       if ((isInstallationPhase()) || (!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';
+       // Init data array
+       $data = array(
+               'locked'     => 'Y',
+               'hidden'     => 'N',
+               'admin_only' => 'N',
+               'mem_only'   => 'N'
+       );
+
+       // By default nothing is found
        $found  = false;
 
        // Check if cache is latest version
-       if (GET_EXT_VERSION('cache') >= '0.1.2') {
+       if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
                // Is the cache there?
-               if (!isset($GLOBALS['cache_array']['modules'])) {
-                       // This should normally not happen...
-                       debug_report_bug("Cache 'modules' is gone.");
-               } // END - if
-
-               // Is the module cached?
-               if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using cache.');
+               if (isset($GLOBALS['cache_array']['modules']['locked'][$module_chk])) {
                        // Check cache
-                       $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];
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache found.');
+                       $data['locked']     = $GLOBALS['cache_array']['modules']['locked'][$module_chk];
+                       $data['hidden']     = $GLOBALS['cache_array']['modules']['hidden'][$module_chk];
+                       $data['admin_only'] = $GLOBALS['cache_array']['modules']['admin_only'][$module_chk];
+                       $data['mem_only']   = $GLOBALS['cache_array']['modules']['mem_only'][$module_chk];
 
                        // Update cache hits
-                       incrementConfigEntry('cache_hits');
+                       incrementStatsEntry('cache_hits');
                        $found = true;
                } else {
                        // No, then we have to update it!
-                       $ret = "cache_miss";
+                       $ret = 'cache_miss';
                }
-       } elseif (!EXT_IS_ACTIVE('cache')) {
+       } elseif (!isExtensionActive('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), __FUNCTION__, __LINE__);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using database.');
+               $result = SQL_QUERY_ESC("SELECT `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
+                       array($module_chk), __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Read data
-                       list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Entry found.');
+                       $data = SQL_FETCHARRAY($result);
                        $found = true;
+               } elseif (isDebugModeEnabled()) {
+                       // Debug message only in debug-mode...
+                       logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module_chk . ' not found!');
                }
+
+               // Free result
+               SQL_FREERESULT($result);
        }
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
 
        // Is the module found?
        if ($found === true) {
                // Check returned values against current access permissions
                //
-               //  Admin access            ----- Guest access -----           --- Guest   or   member? ---
-               if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_MEMBER())))) {
+               //  Admin access                   ----- Guest access -----                                     --- Guest   or   member? ---
+               if ((isAdmin()) || (($data['locked'] != 'Y') && ($data['admin_only'] != 'Y') && (($data['mem_only'] != 'Y') || (isMember())))) {
                        // If you are admin you are welcome for everything!
                        $ret = 'done';
-               } elseif ($locked == 'Y') {
+               } elseif ($data['locked'] == 'Y') {
                        // Module is locked
-                       $ret = "locked";
-               } elseif (($mem == 'Y') && (!IS_MEMBER())) {
+                       $ret = 'locked';
+               } elseif (($data['mem_only'] == 'Y') && (!isMember())) {
                        // You have to login first!
-                       $ret = "mem_only";
-               } elseif (($admin == 'Y') && (!IS_ADMIN())) {
+                       $ret = 'mem_only';
+               } elseif (($data['admin_only'] == 'Y') && (!isAdmin())) {
                        // Only the Admin is allowed to enter this module!
-                       $ret = "admin_only";
+                       $ret = 'admin_only';
                } else {
                        // @TODO Nothing helped???
-                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
-                       $ret,
-                       $locked,
-                       $admin,
-                       $mem
+                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
+                               $ret,
+                               $data['locked'],
+                               $data['admin_only'],
+                               $data['mem_only']
                        ));
                }
        } // END - if
 
        // Still no luck or not found?
-       if (($ret == "cache_miss") || (!$found)) {
+       if (($found === false) && (!isExtensionActive('cache')) && ($ret != 'done'))  {
                //              ----- Legacy module -----                                               ---- Module in base folder  ----                       --- Module with extension's name ---
-               if ((isFileReadable(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
+               if ((isIncludeReadable(sprintf("inc/modules/%s.php", $module))) || (isIncludeReadable(sprintf("%s.php", $module))) || (isIncludeReadable(sprintf("%s/%s.php", $extension, $module)))) {
                        // Data is missing so we add it
-                       if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
+                       if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
                                // Since 0.3.6 we have a has_menu column, this took me a half hour
                                // to find a loop here... *sigh*
-                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg`
-(module, locked, hidden, mem_only, admin_only, has_menu) VALUES
-('%s','Y','N','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
+                               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($module_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), __FUNCTION__, __LINE__);
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
+(`module`, `locked`, `hidden`, `mem_only`, `admin_only`) VALUES
+('%s','Y','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
                        }
 
                        // Everthing is fine?
                        if (SQL_AFFECTEDROWS() < 1) {
                                // Something bad happend!
-                               return "major";
+                               return 'major';
                        } // END - if
 
                        // Destroy cache here
-                       rebuildCacheFiles("modreg", "modreg");
+                       // @TODO Rewrite this to a filter
+                       if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCache('modules', 'modules');
 
                        // And reload data
-                       $ret = checkModulePermissions($mod_chk);
+                       unset($GLOBALS['module_status'][$module]);
+                       $ret = checkModulePermissions($module_chk);
                } else {
                        // Module not found we don't add it to the database
                        $ret = '404';
                }
-       } elseif (!$found) {
+       } elseif (($ret == 'cache_miss') && (getOutputMode() == '0')) {
+               // Rebuild the cache files
+               rebuildCache('modules', 'modules');
+       } elseif ($found === false) {
                // Problem with module detected
-               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s",
-               $mod,
-               $ret,
-               $locked,
-               $hidden,
-               $mem,
-               $admin
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s, output_mode=%s",
+                       $module,
+                       $ret,
+                       $data['locked'],
+                       $data['hidden'],
+                       $data['mem_only'],
+                       $data['admin_only'],
+                       getOutputMode()
                ));
        }
 
        // Return the value
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
+       $GLOBALS['module_status'][$module] = $ret;
        return $ret;
 }
 
 // Add menu description pending on given file name (without path!)
-function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
+function addMenuDescription ($accessLevel, $FQFN, $return = false) {
        // Use only filename of the FQFN...
        $file = basename($FQFN);
 
        // Init variables
        $LINK_ADD = '';
        $OUT = '';
-       $AND = '';
+       $ADD = '';
 
        // First we have to do some analysis...
-       if (substr($file, 0, 7) == "action-") {
+       if (substr($file, 0, 7) == 'action-') {
                // This is an action file!
                $type = 'action';
                $search = substr($file, 7);
-               switch ($ACC_LVL) {
-                       case 'admin':
-                               $modCheck = 'admin';
-                               break;
-
-                       case 'sponsor':
-                       case 'guest':
-                       case 'member':
-                               $modCheck = $GLOBALS['module'];
-                               break;
-               }
-               $AND = " AND (`what`='' OR `what` IS NULL)";
-       } elseif (substr($file, 0, 5) == "what-") {
-               // This is an admin what file!
+
+               // Get access level from it
+               $modCheck = getModuleFromFileName($file, $accessLevel);
+
+               // Add what
+               $ADD = " AND (`what`='' OR `what` IS NULL)";
+       } elseif (substr($file, 0, 5) == 'what-') {
+               // This is a 'what file'!
                $type = 'what';
                $search = substr($file, 5);
-               $AND = '';
-               switch ($ACC_LVL) {
-                       case 'admin':
-                               $modCheck = 'admin';
-                               break;
-
-                       case 'guest':
-                       case 'member':
-                               $modCheck = $GLOBALS['module'];
-                               if (!IS_ADMIN()) {
-                                       $AND = " AND `visible`='Y' AND `locked`='N'";
-                               }
-                               break;
-               }
+               $ADD = " AND `visible`='Y' AND `locked`='N'";
+
+               // Get access level from it
+               $modCheck = getModuleFromFileName($file, $accessLevel);
+
+               // Do we have admin? Then display all
+               if (isAdmin()) $ADD = '';
+
                $dummy = substr($search, 0, -4);
-               $AND .= " AND `action`='".getModeAction($ACC_LVL, $dummy)."'";
-       } elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) {
+               $ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
+       } elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
                // Sponsor / engine menu
                $type     = 'what';
                $search   = $file;
-               $modCheck = $GLOBALS['module'];
-               $AND      = '';
+               $modCheck = getModule();
+               $ADD      = '';
        } else {
                // Other
-               $type     = "menu";
+               $type     = 'menu';
                $search   = $file;
-               $modCheck = $GLOBALS['module'];
-               $AND      = '';
+               $modCheck = getModule();
+               $ADD      = '';
        }
 
        // 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>";
+       if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
+               $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=' . getModule() . $LINK_ADD . '%}">Home</a></strong>';
        } else {
-               if (!$return) $GLOBALS['nav_depth']++;
+               if ($return === false) $GLOBALS['nav_depth']++;
                $prefix = '';
        }
 
-       $prefix .= "&nbsp;-&gt;&nbsp;";
+       $prefix .= '&nbsp;-&gt;&nbsp;';
 
        // We need to remove .php and the end
        if (substr($search, -4, 4) == '.php') {
@@ -333,96 +359,80 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
                $search = substr($search, 0, -4);
        } // END - i
 
-       // 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), __FUNCTION__, __LINE__);
+       if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
+               // Output HTML code
+               $OUT = $prefix . '<strong><a class="you_are_here" href="{%url=modules.php?module=' . $modCheck . '&amp;' . $type . '=' . $search . $LINK_ADD . '%}">' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . '</a></strong>';
 
-       // Menu found?
-       if (SQL_NUMROWS($result) == 1) {
-               // Load title
-               list($ret) = SQL_FETCHROW($result);
-
-               // Shall we return it?
-               if ($return === true) {
-                       // Return title
-                       return $ret;
-               } elseif (((GET_EXT_VERSION('sql_patches') >= '0.2.3') && (getConfig('youre_here') == 'Y')) || ((IS_ADMIN()) && ($modCheck == 'admin'))) {
-                       // Output HTML code
-                       $OUT = $prefix."<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=".$modCheck.'&amp;'.$type.'='.$search.$LINK_ADD."\">".$ret."</a></strong>\n";
-
-                       // Can we close the you-are-here navigation?
-                       //* DEBUG: */ echo __LINE__."*".$type.'/'.$GLOBALS['what']."*<br />\n";
-                       if (($type == 'what') || (($type == 'action') && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
-                               //* DEBUG: */ echo __LINE__.'+'.$type."+<br />\n";
-                               // Add closing div and br-tag
-                               $OUT .= "</div><br />\n";
-                               $GLOBALS['nav_depth'] = '0';
-
-                               // Run the filter chain
-                               $ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
-                               $OUT .= $ret['content'];
-                       } // END - if
-               }
-       } // END - if
+               // Can we close the you-are-here navigation?
+               //* DEBUG: */ print(__LINE__."*".$type.'/'.getWhat()."*<br />");
+               if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
+                       //* DEBUG: */ print(__LINE__.'+'.$type."+<br />");
+                       // Add closing div and br-tag
+                       $OUT .= '</div><br />';
+                       $GLOBALS['nav_depth'] = '0';
 
-       // Free result
-       SQL_FREERESULT($result);
+                       // Run the filter chain
+                       $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+
+                       // Add additional content
+                       $OUT .= $ret['content'];
+               } // END - if
+       }
 
        // Return or output HTML code?
-       if ($output) {
-               // Output HTML code here
-               OUTPUT_HTML($OUT);
-       } else {
+       if ($return === true) {
                // Return HTML code
                return $OUT;
+       } else {
+               // Output HTML code here
+               outputHtml($OUT);
        }
 }
 
-//
-function ADD_MENU ($mode, $act, $wht) {
+// Adds a menu (mode = guest/member/admin/sponsor) to output
+function addMenu ($mode, $action, $what) {
        // Init some variables
-       $main_cnt = 0;
-       $AND = '';
-       $main_action = '';
-       $sub_what = '';
+       $main_cnt = '0';
+       $ADD = '';
 
        // is the menu action valid?
-       if (!isMenuActionValid($mode, $act, $wht, true)) {
+       if (!isMenuActionValid($mode, $action, $what, 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'";
+       if (!isAdmin()) {
+               $ADD = " 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), __FUNCTION__, __LINE__);
-       //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.$GLOBALS['what']."*<br />\n";
+       $result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$ADD." ORDER BY `sort` ASC",
+               array($mode), __FUNCTION__, __LINE__);
+
+       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.':'.getWhat()."*<br />");
        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... :)
+               $GLOBALS['rows'] = '';
                while ($content = SQL_FETCHARRAY($result_main)) {
-                       //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$sub_what.':'.$GLOBALS['what']."*<br />\n";
+                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].':'.getWhat()."*<br />");
                        // Init variables
-                       $GLOBALS['block_mode'] = false;
-                       $act = $content['action'];
+                       enableBlockMode(false);
+                       $action = $content['action'];
 
                        // Load menu header template
-                       LOAD_TEMPLATE($mode."_menu_title", false, $content);
+                       $GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', true, $content);
 
                        // Sub menu
-                       $result_sub = SQL_QUERY_ESC("SELECT title AS sub_title, what AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
-                       array($mode, $content['action']), __FUNCTION__, __LINE__);
+                       $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$ADD." ORDER BY `sort`",
+                               array($mode, $content['action']), __FUNCTION__, __LINE__);
 
                        // Get number of rows
-                       $ctl = SQL_NUMROWS($result_sub);
+                       $totalWhats = SQL_NUMROWS($result_sub);
 
                        // Do we have some entries?
-                       if ($ctl > 0) {
+                       if ($totalWhats > 0) {
                                // Init counter
-                               $cnt = 0;
+                               $cnt = '0';
 
                                // Load all sub menus
                                while ($content2 = SQL_FETCHARRAY($result_sub)) {
@@ -433,34 +443,38 @@ function ADD_MENU ($mode, $act, $wht) {
                                        $OUT = '';
 
                                        // Full file name for checking menu
-                                       //* DEBUG: */ echo __LINE__.":!!!!".$content['sub_what']."!!!<br />\n";
-                                       $INC = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
-                                       if (isIncludeReadable($INC)) {
-                                               if ((!empty($wht)) && (($wht == $content['sub_what']))) {
-                                                       $OUT = "<strong>";
-                                               }
+                                       //* DEBUG: */ print(__LINE__.":!!!!".$content['sub_what']."!!!<br />");
+                                       $inc = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
+                                       if (isIncludeReadable($inc)) {
+                                               // Mark currently selected menu - open
+                                               if ((!empty($what)) && (($what == $content['sub_what']))) {
+                                                       $OUT = '<strong>';
+                                               } // END - if
 
                                                // Navigation link
-                                               $OUT .= "<a name=\"menu\" class=\"menu_blur\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module']."&amp;what=".$content['sub_what']."\" target=\"_self\">";
+                                               $OUT .= '<a name="menu" class="menu_blur" href="{%url=modules.php?module=' . getModule() . '&amp;what=' . $content['sub_what'] . '%}" target="_self">';
                                        } else {
-                                               $OUT .= "<em>";
+                                               // Not found! - open
+                                               $OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_WHAT_404--}">';
                                        }
 
                                        // Menu title
                                        $OUT .= getConfig('menu_blur_spacer') . $content['sub_title'];
 
-                                       if (isIncludeReadable($INC)) {
-                                               $OUT .= "</a>";
+                                       if (isIncludeReadable($inc)) {
+                                               $OUT .= '</a>';
+
+                                               // Mark currently selected menu - close
+                                               if ((!empty($what)) && (($what == $content['sub_what']))) {
+                                                       $OUT .= '</strong>';
+                                               } // END - if
                                        } else {
-                                               $OUT .= "</em>";
+                                               // Not found! - close
+                                               $OUT .= '</em>';
                                        }
 
-                                       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++;
+                                       // Cunt it up
+                                       $cnt++;
 
                                        // Rewrite array
                                        $content =  array(
@@ -469,169 +483,274 @@ function ADD_MENU ($mode, $act, $wht) {
                                        );
 
                                        // Add regular menu row or bottom row?
-                                       if ($cnt < $ctl) {
-                                               LOAD_TEMPLATE($mode."_menu_row", false, $content);
+                                       if ($cnt < $totalWhats) {
+                                               $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
                                        } else {
-                                               LOAD_TEMPLATE($mode."_menu_bottom", false, $content);
+                                               $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
                                        }
                                }
                        } else {
                                // This is a menu block... ;-)
-                               $GLOBALS['block_mode'] = true;
-                               $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
-                               if (isFileReadable($INC_BLOCK)) {
+                               enableBlockMode();
+
+                               // Load menu block
+                               $INC = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
+                               if (isFileReadable($INC)) {
                                        // Load include file
-                                       if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML("<tr>
-
-  <td class=\"".$mode."_menu_whats\">");
-                                       //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
-                                       loadInclude($INC_BLOCK);
-                                       //* 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>");
+                                       if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
+                                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat()."*<br />");
+                                       loadInclude($INC);
+                                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat()."*<br />");
+                                       if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
                                }
-                               //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
+                               //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
                        }
+
                        $main_cnt++;
-                       //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
+
+                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.':'.getWhat()."*<br />");
                        if (SQL_NUMROWS($result_main) > $main_cnt) {
-                               OUTPUT_HTML("<tr><td class=\"".$mode."_menu_seperator\"></td></tr>");
+                               // Add seperator
+                               $GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
+
+                               // Should we display adverts in this menu?
+                               if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y') && ($action != 'admin')) {
+                                       // Display advert template
+                                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_' . $action, true);
+
+                                       // Add seperator again
+                                       $GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
+                               } // END - if
                        } // END - if
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
-               // Close table
-               //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
-               OUTPUT_HTML("</table>");
-       }
+               // Should we display adverts in this menu?
+               if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) {
+                       // Add seperator again
+                       $GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
+
+                       // Display advert template
+                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', true);
+               } // END - if
+
+               // Prepare data
+               $content = array(
+                       'rows' => $GLOBALS['rows'],
+                       'mode' => $mode
+               );
+
+               // Load main template
+               //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
+               loadTemplate('menu_table', false, $content);
+       } // END - if
 }
 
 // Checks wether the current user is a member
-function IS_MEMBER () {
-       // @TODO Why is this global??? #100
-       global $status;
-
-       if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array();
+function isMember () {
+       // By default no member
        $ret = false;
 
+       // Fix missing 'last_online' array, damn stupid code :(((
+       // @TODO Try to rewrite this to one or more functions
+       if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
+
        // is the cache entry there?
-       if (isset($GLOBALS['cache_array']['is_member'])) {
+       if (isset($GLOBALS['is_member'])) {
                // Then return it
-               return $GLOBALS['cache_array']['is_member'];
-       } // END - if
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
+               return $GLOBALS['is_member'];
+       } elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
+               // No member
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
+               return false;
+       } else {
+               // Get it secured from session
+               setMemberId(getSession('userid'));
+               setCurrentUserId(getMemberId());
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
+       }
+
+       // Init user data array
+       initUserData();
 
        // Fix "deleted" cookies first
        fixDeletedCookies(array('userid', 'u_hash'));
 
        // Are cookies set?
-       if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
+       if ((isMemberIdSet()) && (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(getUserId()), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result) == 1) {
-                       // Load data from cookies
-                       list($password, $status, $mod, $onl) = SQL_FETCHROW($result);
-
+               if (fetchUserData(getMemberId()) === true) {
                        // Validate password by created the difference of it and the secret key
-                       $valPass = generatePassString($password);
+                       $valPass = encodeHashForCookie(getUserData('password'));
 
                        // Transfer last module and online time
-                       if ((!empty($mod)) && (empty($GLOBALS['last']['module']))) {
-                               $GLOBALS['last']['module'] = $mod;
-                               $GLOBALS['last']['online'] = $onl;
-                       } // END - if
+                       $GLOBALS['last_online']['module'] = getUserData('last_module');
+                       $GLOBALS['last_online']['online'] = getUserData('last_online');
 
                        // So did we now have valid data and an unlocked user?
-                       //* DEBUG: */ echo $valPass."<br />".getSession('u_hash')."<br />";
-                       if (($status == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
+                       if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
                                // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
                                $ret = true;
                        } else {
                                // Maybe got locked etc.
-                               //* DEBUG: */ echo __LINE__."!!!<br />";
-                               destroyUserSession();
+                               //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status') . ',' . $valPass . '(' . strlen($valPass) . ')/' . getSession('u_hash') . '(' . strlen(getSession('u_hash')) . ')/' . getUserData('password') . '(' . strlen(getUserData('password')) . ')');
+                               destroyMemberSession();
                        }
                } else {
                        // Cookie data is invalid!
-                       //* DEBUG: */ echo __LINE__."***<br />";
-                       destroyUserSession();
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data invalid or user not found.');
+                       destroyMemberSession();
                }
-
-               // Free memory
-               SQL_FREERESULT($result);
        } else {
                // Cookie data is invalid!
-               //* DEBUG: */ echo __LINE__."///<br />";
-               destroyUserSession();
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data not complete.');
+               destroyMemberSession();
        }
 
        // Cache status
-       $GLOBALS['cache_array']['is_member'] = $ret;
+       $GLOBALS['is_member'] = $ret;
 
        // Return status
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
        return $ret;
 }
 
+// Fetch user data for given user id
+function fetchUserData ($userid, $column = 'userid') {
+       // If we should look for userid secure&set it here
+       if (substr($column, -2, 2) == 'id') {
+               // Secure userid
+               $userid = bigintval($userid);
+
+               // Set it here
+               setCurrentUserId($userid);
+
+               // Don't look for invalid userids...
+               if ($userid < 1) {
+                       // Invalid, so abort here
+                       debug_report_bug('User id ' . $userid . ' is invalid.');
+               } elseif (isUserDataValid()) {
+                       // Use cache, so it is fine
+                       return true;
+               }
+       } elseif (isUserDataValid()) {
+               // Use cache, so it is fine
+               return true;
+       }
+
+
+       // By default none was found
+       $found = false;
+
+       // Extra statements
+       $ADD = '';
+       if (isExtensionInstalledAndNewer('user', '0.3.5')) $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+
+       // Query for the user
+       $result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
+               array($column, $userid), __FUNCTION__, __LINE__);
+
+       // Do we have a record?
+       if (SQL_NUMROWS($result) == 1) {
+               // Load data from cookies
+               $data = SQL_FETCHARRAY($result);
+
+               // Set the userid for later use
+               setCurrentUserId($data['userid']);
+               $GLOBALS['user_data'][getCurrentUserId()] = $data;
+
+               // Rewrite 'last_failure' if found
+               if (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure'])) {
+                       // Backup the raw one and zero it
+                       $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] = $GLOBALS['user_data'][getCurrentUserId()]['last_failure'];
+                       $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = '0';
+
+                       // Is it not zero?
+                       if ($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] != '0000-00-00 00:00:00') {
+                               // Seperate data/time
+                               $array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw']);
+
+                               // Seperate data and time again
+                               $array['date'] = explode('-', $array[0]);
+                               $array['time'] = explode(':', $array[1]);
+
+                               // Now pass it to mktime()
+                               $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = mktime(
+                                       $array['time'][0],
+                                       $array['time'][1],
+                                       $array['time'][2],
+                                       $array['date'][1],
+                                       $array['date'][2],
+                                       $array['date'][0]
+                               );
+                       } // END - if
+               } // END - if
+
+               // Found, but valid?
+               $found = isUserDataValid();
+       } // END - if
+
+       // Free memory
+       SQL_FREERESULT($result);
+
+       // Return result
+       return $found;
+}
+
 // This patched function will reduce many SELECT queries for the specified or current admin login
-function IS_ADMIN ($admin = '') {
+function isAdmin ($adminLogin = '') {
        // Init variables
-       $ret = false; $passCookie = ''; $valPass = '';
-       //* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
+       $ret = false;
+       $passCookie = '';
+       $valPass = '';
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'<br />');
 
        // If admin login is not given take current from cookies...
-       if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
+       if ((empty($adminLogin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
                // Get admin login and password from session/cookies
-               $admin = getSession('admin_login');
+               $adminLogin = getSession('admin_login');
                $passCookie = getSession('admin_md5');
-       }
-       //* DEBUG: */ echo __LINE__."ADMIN:".$admin.'/'.$passCookie."<br />";
-
-       // Search in array for entry
-       if (isset($GLOBALS['cache_array']['admin_hash'])) {
-               // Use cached string
-               $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($GLOBALS['cache_array']['admins']['password'][$admin]);
-
-               // Cache it away
-               $GLOBALS['cache_array']['admin_hash'] = $valPass;
-
-               // Count cache hits
-               incrementConfigEntry('cache_hits');
-       } 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), __FUNCTION__, __LINE__);
-
-               // Is he admin?
-               $passDB = '';
-               if (SQL_NUMROWS($result) == 1) {
-                       // Admin login was found so let's load password from DB
-                       list($passDB) = SQL_FETCHROW($result);
+       } // END - if
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'/'.$passCookie.'<br />');
 
-                       // Temporary cache it
-                       $GLOBALS['cache_array']['admins']['password'][$admin] = $passDB;
+       // Do we have cache?
+       if (!isset($GLOBALS['is_admin'][$adminLogin])) {
+               // Init it with failed
+               $GLOBALS['is_admin'][$adminLogin] = false;
+
+               // Search in array for entry
+               if (isset($GLOBALS['admin_hash'])) {
+                       // Use cached string
+                       $valPass = $GLOBALS['admin_hash'];
+               } elseif ((!empty($passCookie)) && (isAdminHashSet($adminLogin) === true) && (!empty($adminLogin))) {
+                       // Login data is valid or not?
+                       $valPass = encodeHashForCookie(getAdminHash($adminLogin));
+
+                       // Cache it away
+                       $GLOBALS['admin_hash'] = $valPass;
+
+                       // Count cache hits
+                       incrementStatsEntry('cache_hits');
+               } elseif ((!empty($adminLogin)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminLogin) === false))) {
+                       // Get admin hash and hash it
+                       $valPass = encodeHashForCookie(getAdminHash($adminLogin));
+
+                       // Cache it away
+                       $GLOBALS['admin_hash'] = $valPass;
+               }
 
-                       // Generate password hash
-                       $valPass = generatePassString($passDB);
+               if (!empty($valPass)) {
+                       // Check if password is valid
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
+                       $GLOBALS['is_admin'][$adminLogin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
                } // END - if
-
-               // Free memory
-               SQL_FREERESULT($result);
-       }
-
-       if (!empty($valPass)) {
-               // Check if password is valid
-               //* DEBUG: */ print __FUNCTION__."*".$valPass.'/'.$passCookie."*<br />\n";
-               $ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE('cache'))));
        } // END - if
 
        // Return result of comparision
-       //* DEBUG: */ if (!$ret) echo __LINE__."OK!<br />";
-       return $ret;
+       return $GLOBALS['is_admin'][$adminLogin];
 }
 
 // Generates a list of "max receiveable emails per day"
@@ -642,18 +761,18 @@ function addMaxReceiveList ($mode, $default = '', $return = 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",
+                       $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC",
                        __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",
+                       $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
                        __FUNCTION__, __LINE__);
                        break;
 
                default: // Invalid!
-                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode));
+                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode));
                        break;
        }
 
@@ -661,16 +780,15 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
        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";
+                       $OUT .= '      <option value="' . $content['value'] . '"';
+                       if (postRequestParameter('max_mails') == $content['value']) $OUT .= ' selected="selected"';
+                       $OUT .= '>' . $content['value'] . ' {--PER_DAY--}';
+                       if (!empty($content['comment'])) $OUT .= '(' . $content['comment'] . ')';
+                       $OUT .= '</option>';
                }
-               define('__MAX_RECEIVE_OPTIONS', $OUT);
 
                // Load template
-               $OUT = LOAD_TEMPLATE($mode . '_receive_table', true);
+               $OUT = loadTemplate(($mode . '_receive_table'), true, $OUT);
        } else {
                // Maybe the admin has to setup some maximum values?
                debug_report_bug('Nothing is being done here?');
@@ -684,15 +802,15 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
                return $OUT;
        } else {
                // Output directly (default)
-               OUTPUT_HTML($OUT);
+               outputHtml($OUT);
        }
 }
 
 // Checks wether the given email address is used.
 function isEmailTaken ($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), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email` LIKE '{PER}%s{PER}' OR `email` LIKE '{PER}%s{PER}' LIMIT 1",
+               array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__);
 
        // Is the email there?
        $ret = (SQL_NUMROWS($result) == 1);
@@ -705,14 +823,14 @@ function isEmailTaken ($email) {
 }
 
 // Validate the given menu action
-function isMenuActionValid ($mode, $act, $wht, $UPDATE=false) {
+function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
        // Is the cache entry there and we shall not update?
-       if ((isset($GLOBALS['cache_array']['action_valid'][$mode][$act][$wht])) && ($UPDATE === false)) {
+       if ((isset($GLOBALS['action_valid'][$mode][$action][$what])) && ($updateEntry === false)) {
                // Count cache hit
-               incrementConfigEntry('cache_hits');
+               incrementStatsEntry('cache_hits');
 
                // Then use this cache
-               return $GLOBALS['cache_array']['action_valid'][$mode][$act][$wht];
+               return $GLOBALS['action_valid'][$mode][$action][$what];
        } // END - if
 
        // By default nothing is valid
@@ -720,26 +838,28 @@ function isMenuActionValid ($mode, $act, $wht, $UPDATE=false) {
 
        // Look in all menus or only unlocked
        $add = '';
-       if ((!IS_ADMIN()) && ($mode != 'admin')) $add = " AND `locked`='N'";
+       if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
-       //* DEBUG: */ echo __LINE__.':'.$mode.'/'.$act.'/'.$wht."*<br />\n";
-       if (($mode != 'admin') && ($UPDATE === true)) {
+       //* DEBUG: */ print(__LINE__.':'.$mode.'/'.$action.'/'.$what."*<br />");
+       if (($mode != 'admin') && ($updateEntry === true)) {
                // Update guest or member menu
-               $sql = SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
-               array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
-       } elseif (($wht != "overview") && (!empty($wht))) {
+               $sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
+                       array($mode, $action, $what), __FUNCTION__, __LINE__, false);
+       } elseif (($what != 'overview') && (!empty($what))) {
                // Other actions
-               $sql = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY action DESC LIMIT 1",
-               array($mode, $act, $wht), __FUNCTION__, __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, $action, $what), __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), __FUNCTION__, __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, $action), __FUNCTION__, __LINE__, false);
        }
 
        // Run SQL command
        $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
-       if ($UPDATE === true) {
+
+       // Should we look for affected rows (only update) or found rows?
+       if ($updateEntry === true) {
                // Check updated/affected rows
                $ret = (SQL_AFFECTEDROWS() == 1);
        } else {
@@ -751,227 +871,99 @@ function isMenuActionValid ($mode, $act, $wht, $UPDATE=false) {
        SQL_FREERESULT($result);
 
        // Set cache entry
-       $GLOBALS['cache_array']['action_valid'][$mode][$act][$wht] = $ret;
+       $GLOBALS['action_valid'][$mode][$action][$what] = $ret;
 
        // Return result
        return $ret;
 }
 
-//
-function sendModeMails ($mod, $modes) {
-       global $DATA;
-
-       // Load hash
-       $result_main = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-       array(getUserId()), __FUNCTION__, __LINE__);
-       if (SQL_NUMROWS($result_main) == 1) {
-               // Load hash from database
-               list($hashDB) = SQL_FETCHROW($result_main);
-
-               // Extract salt from cookie
-               $salt = substr(getSession('u_hash'), 0, -40);
-
-               // Now let's compare passwords
-               $hash = generatePassString($hashDB);
-               if (($hash == getSession('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(getUserId(), $hashDB), __FUNCTION__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1) {
-                               // Load the data
-                               $DATA = SQL_FETCHROW($result);
-
-                               // Free result
-                               SQL_FREERESULT($result);
-
-                               // Translate gender
-                               $DATA[0] = translateGender($DATA[0]);
-
-                               // Clear/init the content variable
-                               $content = '';
-                               $DATA['info'] = '';
-
-                               switch ($mod)
-                               {
-                                       case 'mydata':
-                                               foreach ($modes as $mode) {
-                                                       switch ($mode)
-                                                       {
-                                                               case 'normal': break; // Do not add any special lines
-
-                                                               case 'email': // Email was changed!
-                                                                       $content = getMessage('MEMBER_CHANGED_EMAIL').": ".REQUEST_POST('old_addy')."\n";
-                                                                       break;
-
-                                                               case 'pass': // Password was changed
-                                                                       $content = getMessage('MEMBER_CHANGED_PASS')."\n";
-                                                                       break;
-
-                                                               default:
-                                                                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
-                                                                       $content = getMessage('MEMBER_UNKNOWN_MODE').": ".$mode."\n\n";
-                                                                       break;
-                                                       } // END - switch
-                                               } // END - if
-
-                                               if (EXT_IS_ACTIVE('country')) {
-                                                       // Replace code with description
-                                                       $DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
-                                               } // END - if
-
-                                               // Merge content with data from POST
-                                               $content = merge_array($content, REQUEST_POST_ARRAY());
-
-                                               // Load template
-                                               $msg = LOAD_EMAIL_TEMPLATE('member_mydata_notify', $content, getUserId());
-
-                                               if (getConfig('admin_notify') == 'Y') {
-                                                       // The admin needs to be notified about a profile change
-                                                       $msg_admin = 'admin_mydata_notify';
-                                                       $sub_adm   = getMessage('ADMIN_CHANGED_DATA');
-                                               } else {
-                                                       // No mail to admin
-                                                       $msg_admin = '';
-                                                       $sub_adm   = '';
-                                               }
-
-                                               // Set subject lines
-                                               $sub_mem = getMessage('MEMBER_CHANGED_DATA');
-
-                                               // Output success message
-                                               $content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
-                                               break;
-
-                                       default: // Unsupported module!
-                                               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-                                               $content = "<span class=\"member_failed\">{--UNKNOWN_MODULE--}</span>";
-                                               break;
-                               } // END - switch
-                       } else {
-                               // Could not load profile data
-                               $content = "<span class=\"member_failed\">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>";
-                       }
-               } else {
-                       // Passwords mismatch
-                       $content = "<span class=\"member_failed\">{--MEMBER_PASSWORD_ERROR--}</span>";
-               }
-       } else {
-               // Could not load profile
-               $content = "<span class=\"member_failed\">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>";
-       }
-
-       // Send email to user if required
-       if ((!empty($sub_mem)) && (!empty($msg))) {
-               // Send member mail
-               sendEmail($DATA[7], $sub_mem, $msg);
-       } // END - if
-
-       // Send only if no other error has occured
-       if (empty($content)) {
-               if ((!empty($sub_adm)) && (!empty($msg_admin))) {
-                       // Send admin mail
-                       sendAdminNotification($sub_adm, $msg_admin, $content, getUserId());
-               } elseif (getConfig('admin_notify') == 'Y') {
-                       // Cannot send mails to admin!
-                       $content = getMessage('CANNOT_SEND_ADMIN_MAILS');
-               } else {
-                       // No mail to admin
-                       $content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
-               }
-       } // END - if
-
-       // Load template
-       LOAD_TEMPLATE('admin_settings_saved', false, $content);
-}
-
-// Update module counter
-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), __FUNCTION__, __LINE__);
-       } // END - if
-}
-
 // Get action value from mode (admin/guest/member) and what-value
-function getModeAction ($mode, &$wht) {
+function getActionFromModuleWhat ($module, $what) {
        // Init status
-       $ret = '';
-
-       //* DEBUG: */ echo __LINE__.'='.$mode.'/'.$wht.'/'.$GLOBALS['action']."=<br />";
-       if ((empty($wht)) && ($mode != 'admin')) {
-               $wht = "welcome";
-               if (getConfig('index_home') != '') $wht = getConfig('index_home');
+       $data['action'] = '';
+
+       //* DEBUG: */ print(__LINE__.'='.$module.'/'.$what.'/'.getAction()."=<br />");
+       if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
+               // sql_patches is missing so choose depending on mode
+               if (isWhatSet()) {
+                       // Use setted what
+                       $what = getWhat();
+               } elseif ($module == 'admin') {
+                       // Admin area
+                       $what = 'overview';
+               } else {
+                       // Everywhere else
+                       $what = 'welcome';
+               }
+       } elseif ((empty($what)) && ($module != 'admin')) {
+               // Use configured 'home'
+               $what = getConfig('index_home');
        } // END - if
 
-       if ($mode == 'admin') {
+       if ($module == 'admin') {
                // Action value for admin area
-               if (REQUEST_ISSET_GET('action')) {
+               if (isGetRequestParameterSet('action')) {
                        // Use from request!
-                       return REQUEST_GET('action');
-               } elseif (!empty($GLOBALS['action'])) {
+                       return getRequestParameter('action');
+               } elseif (isActionSet()) {
                        // Get it directly from URL
-                       return $GLOBALS['action'];
-               } elseif (($wht == "overview") || (empty($GLOBALS['what']))) {
+                       return getAction();
+               } elseif (($what == 'overview') || (!isWhatSet())) {
                        // Default value for admin area
-                       $ret = "login";
+                       $data['action'] = 'login';
                }
-       } elseif (!empty($GLOBALS['action'])) {
+       } elseif (isActionSet()) {
                // Get it directly from URL
-               return $GLOBALS['action'];
+               return getAction();
        }
-       //* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />\n";
+       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): ret=' . $data['action'] . '<br />');
 
        // Does the module have a menu?
-       if (MODULE_HAS_MENU($mode)) {
+       if (ifModuleHasMenu($module)) {
                // Rewriting modules to menu
-               switch ($mode) {
-                       case 'index': $mode = 'guest';  break;
-                       case "login": $mode = 'member'; break;
-               } // END - switch
+               $module = mapModuleToTable($module);
 
-               // Guest and member menu is "main" as the default
-               if (empty($ret)) $ret = "main";
+               // Guest and member menu is 'main' as the default
+               if (empty($data['action'])) $data['action'] = 'main';
 
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what`='%s' LIMIT 1",
-               array($mode, $wht), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
+                       array($module, $what), __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);
+                       $data = SQL_FETCHARRAY($result);
                } // END - if
 
                // Free memory
                SQL_FREERESULT($result);
-       } elseif ((GET_EXT_VERSION('sql_patches') == '') && ($mode != 'admin')) {
+       } elseif ((!isExtensionInstalled('sql_patches')) && ($module != 'admin') && ($module != 'unknown')) {
                // 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 redirectToUrl('admin.php');
+                       // Redirect to admin area
+                       redirectToUrl('admin.php');
                } // END - if
        }
 
        // Return action value
-       return $ret;
+       return $data['action'];
 }
 
 // Get category name back
 function getCategory ($cid) {
        // Default is not found
-       $ret = getMessage('_CATEGORY_404');
+       $data['cat'] = getMessage('_CATEGORY_404');
 
        // Is the category id set?
        if ($cid == '0') {
                // No category
-               $ret = getMessage('_CATEGORY_NONE');
+               $data['cat'] = 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)), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($cid)), __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Category found... :-)
-                       list($ret) = SQL_FETCHROW($result);
+                       $data = SQL_FETCHARRAY($result);
                } // END - if
 
                // Free result
@@ -979,7 +971,7 @@ function getCategory ($cid) {
        } // END - if
 
        // Return result
-       return $ret;
+       return $data['cat'];
 }
 
 // Get a string of "mail title" and price back
@@ -988,17 +980,17 @@ function getPaymentTitlePrice ($pid, $full=false) {
        $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)), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
+               array(bigintval($pid)), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Payment type found... :-)
-               if (!$full) {
-                       // Return only title
-                       list($ret) = SQL_FETCHROW($result);
+               $data = SQL_FETCHARRAY($result);
+
+               // Only title or also including price?
+               if ($full === false) {
+                       $ret = $data['mail_title'];
                } else {
-                       // Return title and price
-                       list($t, $p) = SQL_FETCHROW($result);
-                       $ret = $t.' / '.translateComma($p).' {!POINTS!}';
+                       $ret = $data['mail_title'] . ' / ' . translateComma($data['price']) . ' {?POINTS?}';
                }
        }
 
@@ -1012,50 +1004,50 @@ function getPaymentTitlePrice ($pid, $full=false) {
 // Get (basicly) the price of given payment id
 function getPaymentPoints ($pid, $lookFor = 'price') {
        // Default value...
-       $ret = '-1';
+       $data[$lookFor] = '-1';
 
        // Search for it in database
-       $result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_payments` WHERE `id`=%s LIMIT 1",
-       array($lookFor, $pid), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `%s` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
+               array($lookFor, $pid), __FUNCTION__, __LINE__);
 
        // Is the entry there?
        if (SQL_NUMROWS($result) == 1) {
                // Payment type found... :-)
-               list($ret) = SQL_FETCHROW($result);
+               $data = SQL_FETCHARRAY($result);
        } // END - if
 
        // Free result
        SQL_FREERESULT($result);
 
        // Return value
-       return $ret;
+       return $data[$lookFor];
 }
 
-// Remove a receiver's ID from $receivers and add a link for him to confirm
-function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus=false) {
+// Remove a receiver's id from $receivers and add a link for him to confirm
+function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $bonus = false) {
        // Default is not removed
        $ret = 'failed';
 
        // Is the userid valid?
-       if ($uid > 0) {
+       if ($userid > 0) {
                // Remove entry from array
                unset($receivers[$key]);
 
                // Is there already a line for this user available?
                if ($stats_id > 0) {
-                       // Only when we got a real stats ID continue searching for the entry
+                       // 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), __FUNCTION__, __LINE__);
+                       $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($userid), $type), __FUNCTION__, __LINE__);
 
                        // Was it *not* found?
-                       if (SQL_NUMROWS($result) == 0) {
+                       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), __FUNCTION__, __LINE__);
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_links` (`%s`, `userid`, `link_type`) VALUES ('%s','%s','%s')",
+                                       array($rowName, $stats_id, bigintval($userid), $type), __FUNCTION__, __LINE__);
                                $ret = 'done';
                        } else {
                                // Already found
@@ -1072,83 +1064,86 @@ function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus
 }
 
 // Calculate sum (default) or count records of given criteria
-function GET_TOTAL_DATA ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
-       $ret = 0;
-       //* DEBUG: */ echo $search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />\n';
+function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
+       // Init count/sum
+       $data['res'] = '0';
+
+       //* DEBUG: */ print($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />');
        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__);
+                       $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res 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__);
+                       $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res 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), __FUNCTION__, __LINE__);
+               //* DEBUG: */ print("COUNT!<br />");
+               $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+                       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), __FUNCTION__, __LINE__);
+               //* DEBUG: */ print("SUM!<br />");
+               $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+                       array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
        }
 
        // Load row
-       list($ret) = SQL_FETCHROW($result);
+       $data = SQL_FETCHARRAY($result);
 
        // Free result
        SQL_FREERESULT($result);
 
        // Fix empty values
-       if ((empty($ret)) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid')) {
+       if ((empty($data['res'])) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid')) {
                // Float number
-               $ret = '0.00000';
-       } elseif (''.$ret.'' == '') {
+               $data['res'] = '0.00000';
+       } elseif (''.$data['res'].'' == '') {
                // Fix empty result
-               $ret = '0';
+               $data['res'] = '0';
        }
 
        // Return value
-       return $ret;
+       //* DEBUG: */ print 'ret=' . $data['res'] . '<br />';
+       return $data['res'];
 }
 // Getter fro ref level percents
 function getReferalLevelPercents ($level) {
        // Default is zero
-       $per = 0;
+       $data['percents'] = '0';
 
        // Do we have cache?
-       if ((isset($GLOBALS['cache_array']['ref_depths']['level'])) && (EXT_IS_ACTIVE('cache'))) {
+       if ((isset($GLOBALS['cache_array']['refdepths']['level'])) && (isExtensionActive('cache'))) {
                // First look for level
-               $key = array_search($level, $GLOBALS['cache_array']['ref_depths']['level']);
+               $key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
                if ($key !== false) {
                        // Entry found!
-                       $per = $GLOBALS['cache_array']['ref_depths']['percents'][$key];
+                       $data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
 
                        // Count cache hit
-                       incrementConfigEntry('cache_hits');
-               }
-       } elseif (!EXT_IS_ACTIVE('cache')) {
+                       incrementStatsEntry('cache_hits');
+               } // END - if
+       } elseif (!isExtensionActive('cache')) {
                // Get referal data
-               $result_lvl = SQL_QUERY_ESC("SELECT percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",
-               array(bigintval($level)), __FUNCTION__, __LINE__);
+               $result_level = SQL_QUERY_ESC("SELECT `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level`='%s' LIMIT 1",
+                       array(bigintval($level)), __FUNCTION__, __LINE__);
 
                // Entry found?
-               if (SQL_NUMROWS($result_lvl) == 1) {
+               if (SQL_NUMROWS($result_level) == 1) {
                        // Get percents
-                       list($per) = SQL_FETCHROW($result_lvl);
+                       $data = SQL_FETCHARRAY($result_level);
                } // END - if
 
                // Free result
-               SQL_FREERESULT($result_lvl);
+               SQL_FREERESULT($result_level);
        }
 
        // Return percent
-       return $per;
+       return $data['percents'];
 }
 
 /**
@@ -1156,115 +1151,110 @@ function getReferalLevelPercents ($level) {
  * Dynamic referal system, can also send mails!
  *
  * subject     = Subject line, write in lower-case letters and underscore is allowed
- * uid         = Referal ID wich should receive...
+ * userid         = Referal id wich should receive...
  * points      = ... xxx points
- * send_notify = shall I send the referal an email or not?
- * rid         = inc/modules/guest/what-confirm.php need this (DEPRECATED???)
+ * sendNotify  = shall I send the referal an email or not?
+ * rid         = inc/modules/guest/what-confirm.php need this
  * locked      = Shall I pay it to normal (false) or locked (true) points ammount?
- * add_mode    = Add points only to $uid or also refs? (WARNING! Changing 'ref' to 'direct'
+ * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
  *               for default value will cause no referal will get points ever!!!)
  */
-function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $rid = '0', $locked = false, $add_mode = 'ref') {
-       //* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
-       global $DATA;
-
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $rid = '0', $locked = false, $add_mode = 'ref') {
+       //* DEBUG: */ print("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
        // Convert mode to lower-case
        $add_mode = strtolower($add_mode);
 
-       // When $uid = 0 add points to jackpot
-       if ($uid == '0') {
+       // When $userid = '0' add points to jackpot
+       if (($userid == '0') && (isExtensionActive('jackpot'))) {
                // Add points to jackpot
-               ADD_JACKPOT($points);
+               addPointsToJackpot($points);
                return;
        } // END - if
 
-       // Add booking record if extension is installed
-       if (EXT_IS_ACTIVE('booking')) {
-               // Add record
-               ADD_BOOKING_RECORD($subject, $uid, $points, 'add');
-       } // END - if
+       // Prepare data for the filter
+       $filterData = array(
+               'subject'  => $subject,
+               'userid'   => $userid,
+               'points'   => $points,
+               'notify'   => $sendNotify,
+               'rid'      => $rid,
+               'locked'   => $locked,
+               'mode'     => 'add',
+               'sub_mode' => $add_mode,
+       );
+
+       // Filter it now
+       runFilterChain('add_points', $filterData);
 
        // Count up referal depth
        if (!isset($GLOBALS['ref_level'])) {
                // Initialialize referal system
-               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal system initialized!<br />\n";
-               $GLOBALS['ref_level'] = 0;
+               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>): Referal system initialized!<br />");
+               $GLOBALS['ref_level'] = '0';
        } else {
                // Increase referal level
                $GLOBALS['ref_level']++;
-               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />\n";
+               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />");
        }
 
        // Default is 'normal' points
        $data = 'points';
 
        // Which points, locked or normal?
-       if ($locked) $data = 'locked_points';
+       if ($locked === true) $data = 'locked_points';
 
        // Check user account
-       $result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-       array(bigintval($uid)), __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) {
+       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},points={$points}<br />");
+       if (fetchUserData($userid)) {
                // This is the user and his ref
-               list($ref, $email) = SQL_FETCHROW($result_user);
-               $GLOBALS['cache_array']['add_uid'][$ref] = $uid;
+               $GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
 
                // Get percents
                $per = getReferalLevelPercents($GLOBALS['ref_level']);
-               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}<br />\n";
+               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}<br />");
 
                // Some percents found?
                if ($per > 0) {
                        // Calculate new points
-                       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />\n";
+                       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />");
                        $ref_points = $points * $per / 100;
 
                        // Pay refback here if level > 0 and in ref-mode
-                       if ((EXT_IS_ACTIVE('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_uid'][$uid]))) {
-                               //* 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";
+                       if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
+                               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />");
+                               $ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
+                               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />");
                        } // 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'])), __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";
+                       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($userid), bigintval($GLOBALS['ref_level'])), __FUNCTION__, __LINE__);
+                       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")<br />");
 
                        // 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), __FUNCTION__, __LINE__);
-                               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />\n";
-                       } // END - if
-
-                       // Update mediadata as well
-                       if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
-                               // Update database
-                               MEDIA_UPDATE_ENTRY(array('total_points'), 'add', $ref_points);
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES (%s,'%s',%s)",
+                                       array($data, bigintval($userid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __LINE__);
+                               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />");
                        } // END - if
 
                        // Points updated, maybe I shall send him an email?
-                       if (($send_notify) && ($ref > 0) && (!$locked)) {
+                       if (($sendNotify === true) && (getUserData('refid') > 0) && ($locked === false)) {
                                // Prepare content
                                $content = array(
-                                       'percent' => $per,
-                                       'level'   => bigintval($GLOBALS['ref_level']),
-                                       'points'  => $ref_points,
-                                       'refid'   => bigintval($ref)
+                                       'percents' => $per,
+                                       'level'    => bigintval($GLOBALS['ref_level']),
+                                       'points'   => $ref_points,
+                                       'refid'    => getUserData('refid')
                                );
 
                                // Load email template
-                               $msg = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
-
-                               sendEmail($email, THANX_REFERRAL_ONE, $msg);
-                       } elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == 'direct') && (!defined('__POINTS_VALUE'))) {
-                               // Direct payment shall be notified about
-                               define('__POINTS_VALUE', $ref_points);
+                               $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
 
+                               // Send email
+                               sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message);
+                       } elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
                                // Prepare content
                                $content = array(
                                        'text'   => getMessage('REASON_DIRECT_PAYMENT'),
@@ -1272,90 +1262,84 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
                                );
 
                                // Load message
-                               $msg = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
+                               $message = loadEmailTemplate('add-points', $content, $userid);
 
                                // And sent it away
-                               sendEmail($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
-                               if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+                               sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+                               if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
                        }
 
                        // Maybe there's another ref?
-                       if (($ref > 0) && ($points > 0) && ($ref != $uid) && ($add_mode == 'ref')) {
+                       if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
                                // Then let's credit him here...
-                               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref},points={$points} - ADVANCE!<br />\n";
-                               ADD_POINTS_REFSYSTEM(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), $ref, $points, $send_notify, $ref, $locked);
+                               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},ref=".getUserData('refid').",points={$points} - ADVANCE!<br />");
+                               addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
                        } // END - if
                } // END - if
        } // END - if
 
-       // Free result
-       SQL_FREERESULT($result_user);
-       //* DEBUG: */ print "</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />\n";
-}
-
-// Wrapper function for ADD_POINTS_REFSYSTEM()
-function ADD_POINTS_REFSYSTEM_DIRECT ($subject, $uid, $points) {
-       return ADD_POINTS_REFSYSTEM($subject, $uid, $points, false, 0, false, 'direct');
+       //* DEBUG: */ print("</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />");
 }
 
 // Updates the referal counter
-function updateReferalCounter ($uid) {
+function updateReferalCounter ($userid) {
        // Make it sure referal level zero (member him-/herself) is at least selected
-       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";
+       if (empty($GLOBALS['cache_array']['ref_level'][$userid])) $GLOBALS['cache_array']['ref_level'][$userid] = 1;
+       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},level={$GLOBALS['cache_array']['ref_level'][$userid]}<br />");
 
        // Update counter
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
-       array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`='%s' LIMIT 1",
+               array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __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";
+       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):updated=".SQL_AFFECTEDROWS().'<br />');
        if (SQL_AFFECTEDROWS() < 1) {
                // First count!
-               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refsystem` (userid, level, counter) VALUES (%s,%s,1)",
-               array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
-               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid}<br />\n";
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
+                       array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
+               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid}<br />");
        } // 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)), __FUNCTION__, __LINE__);
+       // Init referal id
+       $ref = '0';
 
-       // Load refid
-       list($ref) = SQL_FETCHROW($result);
+       // Check for his referal
+       if (fetchUserData($userid)) {
+               // Get it
+               $ref = getUserData('refid');
+       } // END - if
 
-       // Free memory
-       SQL_FREERESULT($result);
-       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref}<br />\n";
+       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},ref={$ref}<br />");
 
        // When he has a referal...
-       if (($ref > 0) && ($ref != $uid)) {
+       if (($ref > 0) && ($ref != $userid)) {
                // Move to next referal level and count his counter one up!
-               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - ADVANCE!<br />\n";
-               $GLOBALS['cache_array']['ref_level'][$uid]++; updateReferalCounter($ref);
-       } elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION('cache') >= '0.1.2')) {
+               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):ref={$ref} - ADVANCE!<br />");
+               $GLOBALS['cache_array']['ref_level'][$userid]++;
+               updateReferalCounter($ref);
+       } elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
                // Remove cache here
-               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - CACHE!<br />\n";
-               rebuildCacheFiles('refsystem', 'refsystem');
+               //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):ref={$ref} - CACHE!<br />");
+               rebuildCache('refsystem', 'refsystem');
        }
 
        // "Walk" back here
-       $GLOBALS['cache_array']['ref_level'][$uid]--;
+       $GLOBALS['cache_array']['ref_level'][$userid]--;
 
        // Handle refback here if extension is installed
-       if (EXT_IS_ACTIVE('refback')) {
-               updateRefbackTable($uid);
+       if (isExtensionActive('refback')) {
+               updateRefbackTable($userid);
        } // END - if
 }
 
 // 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) {
+function sendAdminEmails ($subj, $message) {
        // Load all admin email addresses
-       $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
        while ($content = SQL_FETCHARRAY($result)) {
                // Send the email out
-               sendEmail($content['email'], $subj, $msg);
+               sendEmail($content['email'], $subj, $message);
        } // END - if
 
        // Free result
@@ -1364,481 +1348,415 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
        // Really simple... ;-)
 }
 
-// Get ID number from administrator's login name
-function GET_ADMIN_ID ($login) {
+// Get id number from administrator's login name
+function getAdminId ($adminLogin) {
        // By default no admin is found
-       $ret = '-1';
+       $data['id'] = '-1';
 
        // Check cache
-       if (isset($GLOBALS['cache_array']['admins']['aid'][$login])) {
+       if (isset($GLOBALS['cache_array']['admin']['admin_id'][$adminLogin])) {
                // Use it if found to save SQL queries
-               $ret = $GLOBALS['cache_array']['admins']['aid'][$login];
+               $data['id'] = $GLOBALS['cache_array']['admin']['admin_id'][$adminLogin];
 
                // Update cache hits
-               incrementConfigEntry('cache_hits');
-       } elseif (!EXT_IS_ACTIVE('cache')) {
+               incrementStatsEntry('cache_hits');
+       } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
-               array($login), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+                       array($adminLogin), __FUNCTION__, __LINE__);
+
+               // Do we have an entry?
                if (SQL_NUMROWS($result) == 1) {
-                       list($ret) = SQL_FETCHROW($result);
+                       // Get it
+                       $data = SQL_FETCHARRAY($result);
                } // END - if
 
                // Free result
                SQL_FREERESULT($result);
        }
-       return $ret;
+
+       // Return the id
+       return $data['id'];
 }
 
 // "Getter" for current admin id
 function getCurrentAdminId () {
-       // Get the admin login from session
-       $adminLogin = getSession('admin_login');
+       // Do we have cache?
+       if (!isset($GLOBALS['current_admin_id'])) {
+               // Get the admin login from session
+               $adminLogin = getSession('admin_login');
 
-       // "Solve" it into an id
-       $adminId = GET_ADMIN_ID($adminLogin);
+               // "Solve" it into an id
+               $adminId = getAdminId($adminLogin);
 
-       // Secure and return it
-       return bigintval($adminId);
+               // Remember in cache securely
+               setCurrentAdminId(bigintval($adminId));
+       } // END - if
+
+       // Return it
+       return $GLOBALS['current_admin_id'];
+}
+
+// Setter for current admin id
+function setCurrentAdminId ($currentAdminId) {
+       // Set it secured
+       $GLOBALS['current_admin_id'] = bigintval($currentAdminId);
 }
 
 // Get password hash from administrator's login name
-function GET_ADMIN_HASH ($aid) {
+function getAdminHash ($adminLogin) {
        // By default an invalid hash is returned
-       $ret = '-1';
+       $data['password'] = '-1';
 
-       if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
+       if (isAdminHashSet($adminLogin)) {
                // Check cache
-               $ret = $GLOBALS['cache_array']['admins']['password'][$aid];
+               $data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminLogin];
 
                // Update cache hits
-               incrementConfigEntry('cache_hits');
-       } elseif (!EXT_IS_ACTIVE('cache')) {
+               incrementStatsEntry('cache_hits');
+       } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
-               array($aid), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+                       array($adminLogin), __FUNCTION__, __LINE__);
+
+               // Do we have an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Fetch data
-                       list($ret) = SQL_FETCHROW($result);
+                       $data = SQL_FETCHARRAY($result);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admins']['password'][$aid] = $ret;
+                       setAdminHash($adminLogin, $data['password']);
                } // END - if
 
                // Free result
                SQL_FREERESULT($result);
        }
-       return $ret;
+
+       // Return password hash
+       return $data['password'];
 }
 
 // "Getter" for admin login
-function getAdminLogin ($aid) {
+function getAdminLogin ($adminId) {
        // By default a non-existent login is returned (other functions react on this!)
-       $ret = '***';
+       $data['login'] = '***';
 
-       if (isset($GLOBALS['cache_array']['admins']['login'][$aid])) {
+       if (isset($GLOBALS['cache_array']['admin']['login'][$adminId])) {
                // Get cache
-               $ret = $GLOBALS['cache_array']['admins']['login'][$aid];
+               $data['login'] = $GLOBALS['cache_array']['admin']['login'][$adminId];
 
                // Update cache hits
-               incrementConfigEntry('cache_hits');
-       } elseif (!EXT_IS_ACTIVE('cache')) {
+               incrementStatsEntry('cache_hits');
+       } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT login FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
-               array(bigintval($aid)), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `login` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+               // Entry found?
                if (SQL_NUMROWS($result) == 1) {
                        // Fetch data
-                       list($ret) = SQL_FETCHROW($result);
+                       $data = SQL_FETCHARRAY($result);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admins']['login'][$aid] = $ret;
+                       $GLOBALS['cache_array']['admin']['login'][$adminId] = $data['login'];
                } // END - if
 
                // Free memory
                SQL_FREERESULT($result);
        }
-       return $ret;
+
+       // Return the result
+       return $data['login'];
 }
 
 // Get email address of admin id
-function getAdminEmail ($aid) {
+function getAdminEmail ($adminId) {
        // By default an invalid emails is returned
-       $ret = '***';
+       $data['email'] = '***';
 
-       if (isset($GLOBALS['cache_array']['admins']['email'][$aid])) {
+       if (isset($GLOBALS['cache_array']['admin']['email'][$adminId])) {
                // Get cache
-               $ret = $GLOBALS['cache_array']['admins']['email'][$aid];
+               $data['email'] = $GLOBALS['cache_array']['admin']['email'][$adminId];
 
                // Update cache hits
-               incrementConfigEntry('cache_hits');
-       } elseif (!EXT_IS_ACTIVE('cache')) {
+               incrementStatsEntry('cache_hits');
+       } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result_aid = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
-               array(bigintval($aid)), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result_aid) == 1) {
+               $result_admin_id = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+               // Entry found?
+               if (SQL_NUMROWS($result_admin_id) == 1) {
                        // Get data
-                       list($ret) = SQL_FETCHROW($result_aid);
+                       $data = SQL_FETCHARRAY($result_admin_id);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admins']['email'][$aid] = $ret;
+                       $GLOBALS['cache_array']['admin']['email'][$adminId] = $data['email'];
                } // END - if
 
                // Free result
-               SQL_FREERESULT($result_aid);
+               SQL_FREERESULT($result_admin_id);
        }
 
        // Return email
-       return $ret;
+       return $data['email'];
 }
 
 // Get default ACL  of admin id
-function getAdminDefaultAcl ($aid) {
+function getAdminDefaultAcl ($adminId) {
        // By default an invalid ACL value is returned
-       $ret = '***';
+       $data['default_acl'] = '***';
 
        // Is sql_patches there and was it found in cache?
-       if (!EXT_IS_ACTIVE('sql_patches')) {
+       if (!isExtensionActive('sql_patches')) {
                // Not found, which is bad, so we need to allow all
-               $ret =  'allow';
-       } elseif (isset($GLOBALS['cache_array']['admins']['def_acl'][$aid])) {
+               $data['default_acl'] =  'allow';
+       } elseif (isset($GLOBALS['cache_array']['admin']['def_acl'][$adminId])) {
                // Use cache
-               $ret = $GLOBALS['cache_array']['admins']['def_acl'][$aid];
+               $data['default_acl'] = $GLOBALS['cache_array']['admin']['def_acl'][$adminId];
 
                // Update cache hits
-               incrementConfigEntry('cache_hits');
-       } elseif (!EXT_IS_ACTIVE('cache')) {
+               incrementStatsEntry('cache_hits');
+       } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
-               array(bigintval($aid)), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result_aid) == 1) {
+               $result_admin_id = SQL_QUERY_ESC("SELECT `default_acl` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($adminId)), __FUNCTION__, __LINE__);
+               if (SQL_NUMROWS($result_admin_id) == 1) {
                        // Fetch data
-                       list($ret) = SQL_FETCHROW($result_aid);
+                       $data = SQL_FETCHARRAY($result_admin_id);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admins']['def_acl'][$aid] = $ret;
+                       $GLOBALS['cache_array']['admin']['def_acl'][$adminId] = $data['default_acl'];
                }
 
                // Free result
-               SQL_FREERESULT($result_aid);
+               SQL_FREERESULT($result_admin_id);
        }
 
-       // Return email
-       return $ret;
+       // Return default ACL
+       return $data['default_acl'];
 }
 
 // Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default='', $special='', $where='') {
+function generateOptionList ($table, $id, $name, $default='', $special='', $where='', $disabled=array()) {
        $ret = '';
        if ($table == '/ARRAY/') {
                // Selection from array
-               if (is_array($id) && is_array($name) && count($id) == count($name)) {
+               if ((is_array($id)) && (is_array($name)) && (count($id)) == (count($name))) {
                        // Both are arrays
                        foreach ($id as $idx => $value) {
                                $ret .= '<option value="' . $value . '"';
-                               if ($default == $value) $ret .= ' selected="selected"';
+                               if ($default == $value) {
+                                       // Selected by default
+                                       $ret .= ' selected="selected"';
+                               } elseif (isset($disabled[$value])) {
+                                       // Disabled!
+                                       $ret .= ' disabled="disabled"';
+                               }
                                $ret .= '>' . $name[$idx] . '</option>';
                        } // END - foreach
-               } // END - if
+               } else {
+                       // Problem in request
+                       debug_report_bug('Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name));
+               }
        } else {
                // Data from database
-               $SPEC = ', '.$id;
-               if (!empty($special)) $SPEC = ', ' . $special;
-               $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), __FUNCTION__, __LINE__);
+               $SPEC = ', `' . $id . '`';
+               if (!empty($special)) $SPEC = ', `' . $special . '`';
+
+               // Query the database
+               $result = SQL_QUERY_ESC("SELECT `%s`, `%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY `%s` ASC",
+                       array(
+                               $id,
+                               $name,
+                               $table,
+                               $name
+                       ), __FUNCTION__, __LINE__);
+
+               // Do we have rows?
                if (SQL_NUMROWS($result) > 0) {
                        // Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
                        // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
                        while (list($value, $title, $add) = SQL_FETCHROW($result)) {
                                if (empty($special)) $add = '';
                                $ret .= '<option value="' . $value . '"';
-                               if ($default == $value) $ret .= ' selected="selected"';
+                               if ($default == $value) {
+                                       // Selected by default
+                                       $ret .= ' selected="selected"';
+                               } elseif (isset($disabled[$value])) {
+                                       // Disabled!
+                                       $ret .= ' disabled="disabled"';
+                               }
                                if (!empty($add)) $add = ' ('.$add.')';
                                $ret .= '>' . $title . $add . '</option>';
                        } // END - while
-
-                       // Free memory
-                       SQL_FREERESULT($result);
                } else {
                        // No data found
                        $ret = '<option value="x">{--SELECT_NONE--}</option>';
                }
+
+               // Free memory
+               SQL_FREERESULT($result);
        }
 
        // Return - hopefully - the requested data
        return $ret;
 }
 // Activate exchange
-function activateExchange () {
+function FILTER_ACTIVATE_EXCHANGE () {
        // Is the extension 'user' there?
-       if (!EXT_IS_ACTIVE('user')) {
+       if ((!isExtensionActive('user')) || (getConfig('activate_xchange') == '0')) {
                // Silently abort here
                return false;
        } // END - if
 
        // Check total amount of users
-       $totalUsers = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
+       $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
 
        if ($totalUsers >= getConfig('activate_xchange')) {
                // Activate System
-               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"
-                       ));
+               setSqlsArray(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",
+               ));
 
-                       // Run SQLs
-                       runFilterChain('run_sqls');
+               // Run SQLs
+               runFilterChain('run_sqls');
 
-                       // Rebuild caches
-                       // @TODO Rewrite this to a filter
-                       rebuildCacheFiles('config', 'config');
-                       rebuildCacheFiles('modreg', 'modreg');
+               // Update configuration
+               updateConfiguration('activate_xchange' ,0);
+
+               // Rebuild cache
+               rebuildCache('modules', 'modules');
        } // END - if
 }
 
 // Deletes a user account with given reason
-function deleteUserAccount ($uid, $reason) {
-       $points = 0;
-       $result = SQL_QUERY_ESC("SELECT (SUM(p.points) - d.used_points) AS points
-FROM `{!_MYSQL_PREFIX!}_user_points` AS p
-LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
-ON p.userid=d.userid
-WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
+function deleteUserAccount ($userid, $reason) {
+       // Init points
+       $data['points'] = '0';
+
+       $result = SQL_QUERY_ESC("SELECT
+       (SUM(p.points) - d.used_points) AS points
+FROM
+       `{?_MYSQL_PREFIX?}_user_points` AS p
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_user_data` AS d
+ON
+       p.userid=d.userid
+WHERE
+       p.userid=%s",
+               array(bigintval($userid)), __FUNCTION__, __LINE__);
+
+       // Do we have an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Save his points to add them to the jackpot
-               list($points) = SQL_FETCHROW($result);
+               $data = SQL_FETCHARRAY($result);
 
                // Delete points entries as well
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__);
 
                // Update mediadata as well
-               if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
+               if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
                        // Update database
-                       MEDIA_UPDATE_ENTRY(array('total_points'), 'sub', $points);
+                       updateMediadataEntry(array('total_points'), 'sub', $data['points']);
                } // END - if
 
                // Now, when we have all his points adds them do the jackpot!
-               ADD_JACKPOT($points);
+               if (isExtensionActive('jackpot')) addPointsToJackpot($data['points']);
        } // END - if
 
        // Free the result
        SQL_FREERESULT($result);
 
        // Delete category selections as well...
-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s",
-       array(bigintval($uid)), __FUNCTION__, __LINE__);
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s",
+               array(bigintval($userid)), __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)), __FUNCTION__, __LINE__);
+       // @TODO Rewrite this to a filter
+       if (isExtensionActive('rallye')) {
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `userid`=%s",
+                       array(bigintval($userid)), __FUNCTION__, __LINE__);
        } // END - if
 
+       // Add reason and translate points
+       $data['text']   = $reason;
+       $data['points'] = translateComma($data['points']);
+
        // Now a mail to the user and that's all...
-       $msg = LOAD_EMAIL_TEMPLATE('del-user', array('text' => $reason), $uid);
-       sendEmail($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg);
+       $message = loadEmailTemplate('del-user', $data, $userid);
+       sendEmail($userid, getMessage('ADMIN_DEL_ACCOUNT'), $message);
 
        // Ok, delete the account!
-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
-}
-
-// Generates meta description for given module and 'what' value
-function generateMetaDescriptionCode ($mod, $wht) {
-       // Exclude admin and member's area
-       if (($mod != 'admin') && ($mod != 'login')) {
-               // Construct dynamic description
-               $DESCR = '{!MAIN_TITLE!} '.trim(getConfig('title_middle')) . ' ' . ADD_DESCR('guest', 'what-'.$wht, true);
-
-               // Output it directly
-               OUTPUT_HTML('<meta name="description" content="' . $DESCR . '" />');
-       } // END - if
-
-       // Remove depth
-       unset($GLOBALS['ref_level']);
-}
-
-// Adds points to the jackpot
-function ADD_JACKPOT ($points) {
-       $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), __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), __FUNCTION__, __LINE__);
-       }
-}
-
-// Subtracts points from the jackpot
-function SUB_JACKPOT ($points) {
-       // First failed
-       $ret = '-1';
-
-       // Get current points
-       $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)", __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), __FUNCTION__, __LINE__);
-                       $ret = $jackpot - $points;
-               } // END - if
-       }
-
-       // Free memory
-       SQL_FREERESULT($result);
-}
-
-// Checks wether the extension demo is actuve and the admin login is demo (password needs to be demo, too!)
-function IS_DEMO () {
-       return ((EXT_IS_ACTIVE('demo')) && (getSession('admin_login') == 'demo'));
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
 }
 
 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
        // Is the request element set?
-       if (REQUEST_ISSET_GET('what')) {
+       if (isGetRequestParameterSet('what')) {
                // Then return this!
-               return REQUEST_GET('what');
+               return getRequestParameter('what');
        } // END - if
 
-       $wht = '';
-       //* DEBUG: */ echo __LINE__.'!'.$modCheck."!<br />\n";
-       switch ($modCheck)
-       {
+       // Default is empty
+       $what = '';
+
+       //* DEBUG: */ print(__LINE__.'!'.$modCheck."!<br />");
+       switch ($modCheck) {
                case 'admin':
-                       $wht = 'overview';
+                       $what = 'overview';
                        break;
 
                case 'login':
                case 'index':
-                       $wht = 'welcome';
-                       if (($modCheck == 'index') && (getConfig('index_home') != '')) $wht = getConfig('index_home');
+                       // Is ext-sql_patches installed and newer than 0.0.5?
+                       if (isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
+                               // Use it from config
+                               $what = getConfig('index_home');
+                       } else {
+                               // Use default 'welcome'
+                               $what = 'welcome';
+                       }
                        break;
 
                default:
-                       $wht = '';
+                       $what = '';
                        break;
-       }
+       } // END - switch
 
        // Return what value
-       return $wht;
+       return $what;
 }
 
 // Subtract points from database and mediadata cache
-function SUB_POINTS ($subject, $uid, $points) {
+function subtractPoints ($subject, $userid, $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)), __FUNCTION__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `used_points`=`used_points`+%s WHERE `userid`=%s LIMIT 1",
+               array($points, bigintval($userid)), __FUNCTION__, __LINE__);
+
+       // Prepare filter data
+       $filterData = array(
+               'subject' => $subject,
+               'userid'  => $userid,
+               'points'  => $points,
+               'mode'    => 'sub'
+       );
 
        // Insert booking record
-       if (EXT_IS_ACTIVE('booking')) {
-               // Add record
-               ADD_BOOKING_RECORD($subject, $uid, $points, 'sub');
-       } // END - if
-
-       // Update mediadata as well
-       if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
-               // Update database
-               MEDIA_UPDATE_ENTRY(array('total_points'), 'sub', $points);
-       } // END - if
-}
-
-// Update config entries
-function updateConfiguration ($entries, $values, $updateMode='') {
-       // Do not update config in CSS mode
-       if (($GLOBALS['output_mode'] == '1') || ($GLOBALS['output_mode'] == -1)) {
-               return;
-       } // END - if
-
-       // Do we have multiple entries?
-       if (is_array($entries)) {
-               // Walk through all
-               $all = '';
-               foreach ($entries as $idx => $entry) {
-                       // Update mode set?
-                       if (!empty($updateMode)) {
-                               // Update entry
-                               // @TODO Find a way for updating $_CONFIG here
-                               $all .= sprintf("%s=%s%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]);
-                       } else {
-                               // Check if string or number
-                               if (($values[$idx] + 0) === $values[$idx]) {
-                                       // Number detected
-                                       $all .= sprintf("%s=%s,", $entry, (float)$values[$idx]);
-                               } elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
-                                       // Function UNIX_TIMESTAMP() detected
-                                       $all .= sprintf("%s=%s,", $entry, $values[$idx]);
-                               } else {
-                                       // String detected
-                                       $all .= sprintf("%s='%s',", $entry, SQL_ESCAPE($values[$idx]));
-                               }
-                       }
-
-                       // Set it in config as well
-                       setConfigEntry($entry, $values[$idx]);
-               } // END - foreach
-
-               // Remove last comma
-               $entries = substr($all, 0, -1);
-       } elseif (!empty($updateMode)) {
-               // Update mode set
-               // @TODO Find a way for updating $_CONFIG here
-               $entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values);
-       } else {
-               // Set it in config first
-               setConfigEntry($entries, $values);
-
-               // Regular entry to update
-               $entries .= sprintf("='%s'", SQL_ESCAPE($values));
-       }
-
-       // Run database update
-       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");
-       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
-       rebuildCacheFiles('config', 'config');
-}
-
-// Prepares an SQL statement part for HTML mail and/or holiday depency
-// @TODO Can this be rewritten to a filter?
-function PREPARE_SQL_HTML_HOLIDAY ($mode) {
-       // Exclude no users by default
-       $MORE = '';
-
-       // HTML mail?
-       if ($mode == 'html') $MORE = " AND `html`='Y'";
-       if (GET_EXT_VERSION('holiday') >= '0.1.3') {
-               // Add something for the holiday extension
-               $MORE .= " AND `holiday_active`='N'";
-       } // END - if
-
-       // Return result
-       return $MORE;
+       runFilterChain('sub_points', $filterData);
 }
 
 // "Getter" for total available receivers
 function getTotalReceivers ($mode='normal') {
        // Query database
-       $result_all = SQL_QUERY("SELECT userid
-FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),
+       $result_all = SQL_QUERY("SELECT
+       `userid`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `status`='CONFIRMED' AND `receive_mails` > 0 ".runFilterChain('exclude_users', $mode),
        __FUNCTION__, __LINE__);
 
        // Get num rows
@@ -1851,21 +1769,24 @@ WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mod
        return $numRows;
 }
 
-// Returns HTML code with an "<option> list" of all categories
+// Returns HTML code with an option list of all categories
 function generateCategoryOptionsList ($mode) {
        // Prepare WHERE statement
        $whereStatement = " WHERE `visible`='Y'";
-       if (IS_ADMIN()) $whereStatement = '';
+       if (isAdmin()) $whereStatement = '';
 
        // Initialize array...
        $CATS = array(
                'id'   => array(),
                'name' => array(),
-               'uids' => array()
+               'userids' => array()
        );
 
        // Get categories
-       $result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC",
+               __FUNCTION__, __LINE__);
+
+       // Do we have entries?
        if (SQL_NUMROWS($result) > 0) {
                // ... and begin loading stuff
                while ($content = SQL_FETCHARRAY($result)) {
@@ -1874,29 +1795,23 @@ function generateCategoryOptionsList ($mode) {
                        $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($content['id'])), __FUNCTION__, __LINE__);
+                       $result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s ORDER BY `userid` ASC",
+                               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)), __FUNCTION__, __LINE__);
+                       // Init count
+                       $userid_cnt = '0';
 
+                       // Start adding all
+                       while ($data = SQL_FETCHARRAY($result_userids)) {
                                // Add user count
-                               $uid_cnt += SQL_NUMROWS($result_ver);
-
-                               // Free memory
-                               SQL_FREERESULT($result_ver);
+                               $userid_cnt += countSumTotalData($data['userid'], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED' AND `receive_mails` > 0");
                        } // END - while
 
                        // Free memory
-                       SQL_FREERESULT($result_uids);
+                       SQL_FREERESULT($result_userids);
 
                        // Add counter
-                       $CATS['uids'][] = $uid_cnt;
+                       $CATS['userids'][] = $userid_cnt;
                } // END - while
 
                // Free memory
@@ -1906,11 +1821,11 @@ 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>';
+                       $OUT .= '      <option value="' . $value . '">' . $CATS['name'][$key] . ' (' . $CATS['userids'][$key] . ' {--USER_IN_CAT--})</option>';
                } // END - foreach
        } else {
                // No cateogries are defined yet
-               $OUT = '<option class="member_failed">{!MEMBER_NO_CATS!}</option>';
+               $OUT = '<option class="member_failed">{--MEMBER_NO_CATS--}</option>';
        }
 
        // Return HTML code
@@ -1920,10 +1835,10 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
 // Add bonus mail to queue
 function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode='normal', $receiver=0) {
        // Is admin or bonus extension there?
-       if (!IS_ADMIN()) {
+       if (!isAdmin()) {
                // Abort here
                return false;
-       } elseif (!EXT_IS_ACTIVE('bonus')) {
+       } elseif (!isExtensionActive('bonus')) {
                // Abort here
                return false;
        }
@@ -1932,13 +1847,13 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
        $target = countSelection(explode(';', $receiverList));
 
        // Receiver is zero?
-       if ($receiver == 0) {
+       if ($receiver == '0') {
                // Then auto-fix it
                $receiver = $target;
        } // END - if
 
        // HTML extension active?
-       if (EXT_IS_ACTIVE('html_mail')) {
+       if (isExtensionActive('html_mail')) {
                // No HTML by default
                $HTML = 'N';
 
@@ -1946,36 +1861,36 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
                if ($mode == 'html') $HTML = 'Y';
 
                // Add HTML mail
-               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus`
-(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
+(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `html_msg`)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
                array(
-               $subject,
-               $text,
-               $receiverList,
-               $points,
-               $seconds,
-               $url,
-               $cat,
-               $target,
-               bigintval($receiver),
-               $HTML
+                       $subject,
+                       $text,
+                       $receiverList,
+                       $points,
+                       $seconds,
+                       $url,
+                       $cat,
+                       $target,
+                       bigintval($receiver),
+                       $HTML
                ), __FUNCTION__, __LINE__);
        } else {
                // Add regular mail
-               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus`
-(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent)
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
+(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
                array(
-               $subject,
-               $text,
-               $receiverList,
-               $points,
-               $seconds,
-               $url,
-               $cat,
-               $target,
-               bigintval($receiver),
+                       $subject,
+                       $text,
+                       $receiverList,
+                       $points,
+                       $seconds,
+                       $url,
+                       $cat,
+                       $target,
+                       bigintval($receiver),
                ), __FUNCTION__, __LINE__);
        }
 }
@@ -1983,7 +1898,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
 // Generate a receiver list for given category and maximum receivers
 function generateReceiverList ($cat, $receiver, $mode = '') {
        // Init variables
-       $CAT_TABS     = "%s";
+       $CAT_TABS     = '';
        $CAT_WHERE    = '';
        $receiverList = '';
        $result       = false;
@@ -1993,7 +1908,7 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
        $receiver = bigintval($receiver);
 
        // Is the receiver zero and mode set?
-       if (($receiver == 0) && (!empty($mode))) {
+       if (($receiver == '0') && (!empty($mode))) {
                // Auto-fix receiver maximum
                $receiver = getTotalReceivers($mode);
        } // END - if
@@ -2001,24 +1916,28 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
        // Category given?
        if ($cat > 0) {
                // Select category
-               $CAT_TABS  = "LEFT JOIN `{!_MYSQL_PREFIX!}_user_cats` AS c ON d.userid=c.userid";
-               $CAT_WHERE = " AND c.cat_id=%s";
+               $CAT_TABS  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.userid=c.userid";
+               $CAT_WHERE = sprintf(" AND c.cat_id=%s", $cat);
        } // END - if
 
        // Exclude users in holiday?
-       if (GET_EXT_VERSION('holiday') >= '0.1.3') {
+       if (getExtensionVersion('holiday') >= '0.1.3') {
                // Add something for the holiday extension
                $CAT_WHERE .= " AND d.`holiday_active`='N'";
        } // END - if
 
-       if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
+       if ((isExtensionActive('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), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s",
+                       array(
+                               $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), __FUNCTION__, __LINE__);
+               $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.{?order_select?} {?order_mode?} LIMIT %s",
+                       array(
+                               $receiver
+                       ), __FUNCTION__, __LINE__);
        }
 
        // Entries found?
@@ -2040,96 +1959,52 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
        return $receiverList;
 }
 
-// Get timestamp for given stats type and data
-function getTimestampFromUserStats ($type, $data, $uid = 0) {
-       // Default timestamp is zero
-       $stamp = 0;
-
-       // User id set?
-       if ((isUserIdSet()) && ($uid == 0)) {
-               $uid = getUserId();
-       } // END - if
-
-       // Is the extension installed and updated?
-       if ((!EXT_IS_ACTIVE('sql_patches')) || (EXT_VERSION_IS_OLDER('sql_patches', '0.5.6'))) {
-               // Return zero here
-               return $stamp;
-       } // END - if
-
-       // Try to find the entry
-       $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`inserted`) AS `stamp`
-FROM `{!_MYSQL_PREFIX!}_user_stats_data`
-WHERE userid=%s AND stats_type='%s' AND stats_data='%s'
-LIMIT 1",
-       array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
-
-       // Is the entry there?
-       if (SQL_NUMROWS($result) == 1) {
-               // Get this stamp
-               list($stamp) = SQL_FETCHROW($result);
-       } // END - if
-
-       // Free result
-       SQL_FREERESULT($result);
-
-       // Return stamp
-       return $stamp;
-}
-
-// Inserts user stats
-function insertUserStatsRecord ($uid, $type, $data) {
-       // Is the extension installed and updated?
-       if ((!EXT_IS_ACTIVE('sql_patches')) || (EXT_VERSION_IS_OLDER('sql_patches', '0.5.6'))) {
-               // Return zero here
-               return false;
-       } // END - if
-
-       // Does it exist?
-       if ((!getTimestampFromUserStats($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), __FUNCTION__, __LINE__);
-       } elseif (is_array($data)) {
-               // Invalid data!
-               DEBUG_LOG(__FUNCTION__, __LINE__, " uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
-       }
-}
-
 // "Getter" for array for user refs and points in given level
-function getUserReferalPoints ($uid, $level) {
-       //* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
+function getUserReferalPoints ($userid, $level) {
+       //* DEBUG: */ print("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
        // Default is no refs and no nickname
        $add = '';
        $refs = array();
 
        // Do we have nickname extension installed?
-       if (EXT_IS_ACTIVE('nickname')) {
+       if (isExtensionActive('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."
-FROM `{!_MYSQL_PREFIX!}_user_refs` AS ur
-LEFT JOIN `{!_MYSQL_PREFIX!}_user_points` AS up
-ON ur.refid=up.userid AND ur.level=0
-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)), __FUNCTION__, __LINE__);
+       $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
+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($userid),
+                       bigintval($level)
+               ), __FUNCTION__, __LINE__);
 
        // Are there some entries?
        if (SQL_NUMROWS($result) > 0) {
                // Fetch all entries
                while ($row = SQL_FETCHARRAY($result)) {
                        // Get total points of this user
-                       $row['points'] = GET_TOTAL_DATA($row['refid'], 'user_points', 'points') - GET_TOTAL_DATA($row['refid'], 'user_data', 'used_points');
+                       $row['points'] = countSumTotalData($row['refid'], 'user_points', 'points') - countSumTotalData($row['refid'], 'user_data', 'used_points');
 
                        // Get unconfirmed mails
-                       $row['unconfirmed']  = GET_TOTAL_DATA($row['refid'], 'user_links', 'id', 'userid', true);
+                       $row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);
 
                        // Init clickrate with zero
-                       $row['clickrate'] = 0;
+                       $row['clickrate'] = '0';
 
                        // Is at least one mail received?
                        if ($row['emails_received'] > 0) {
@@ -2141,7 +2016,7 @@ ORDER BY ur.refid ASC",
                        $row['activity'] = getMessage('MEMBER_ACTIVITY_ACTIVE');
 
                        // Is autopurge installed and the user inactive?
-                       if ((EXT_IS_ACTIVE('autopurge')) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online']))  {
+                       if ((isExtensionActive('autopurge')) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online']))  {
                                // Inactive user!
                                $row['activity'] = getMessage('MEMBER_ACTIVITY_INACTIVE');
                        } // END - if
@@ -2160,97 +2035,75 @@ ORDER BY ur.refid ASC",
        SQL_FREERESULT($result);
 
        // Return result
-       //* DEBUG: */ print "</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />\n";
+       //* DEBUG: */ print("</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />");
        return $refs;
 }
 
 // Recuce the amount of received emails for the receipients for given email
 function reduceRecipientReceivedMails ($column, $id, $count) {
        // Search for mail in database
-       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
-       array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
+               array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
 
        // 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;
+               $userids = array();
+               while ($data = SQL_FETCHARRAY($result)) {
+                       // By default we want to reduce and have no mails found
+                       $num = 0;
+
+                       // We must now look if he has already confirmed this mail, so might sound double, but it may resolve problems
+                       // @TODO Rewrite this to a filter
+                       if ((isset($data['stats_id'])) && ($data['stats_id'] > 0)) {
+                               // User email
+                               $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', true, sprintf(" AND `stats_type`='mailid' AND `stats_data`=%s", bigintval($data['stats_id'])));
+                       } elseif ((isset($data['bonus_id'])) && ($data['bonus_id'] > 0)) {
+                               // Bonus mail
+                               $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', true, sprintf(" AND `stats_type`='bonusid' AND `stats_data`=%s", bigintval($data['bonus_id'])));
+                       }
+
+                       // Reduce this users total received emails?
+                       if ($num === 0) $userids[$data['userid']] = $data['userid'];
                } // END - while
 
-               // 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)), __FUNCTION__, __LINE__);
+               if (count($userids) > 0) {
+                       // 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(',', $userids), count($userids)), __FUNCTION__, __LINE__);
+               } else {
+                       // Nothing deleted
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MAIL_NOTHING_DELETED', $id));
+               }
        } // 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;
-}
-
-// Merge SQLs together
-function MERGE_SQLS ($SQLs) {
-       SET_SQLS(merge_array(GET_SQLS(), $SQLs));
-}
-
-// 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;
+// Creates a new task
+function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '0', $strip = true) {
+       // Insert the task data into the database
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
+               array(
+                       $adminId,
+                       $userid,
+                       $taskType,
+                       $subject,
+                       $notes
+               ), __FUNCTION__, __LINE__, true, $strip);
 }
 
-// Checks wether the SQLs array is filled
-function IS_SQLS_VALID () {
-       return (
-       (IS_SQLS_INITIALIZED()) &&
-       (COUNT_SQLS() > 0)
-       );
+// Updates last module / online time
+// @TODO Fix inconsistency between last_module and getWhat()
+function updateLastActivity($userid) {
+       // Run the update query
+       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1",
+               array(
+                       getWhat(),
+                       detectRemoteAddr(),
+                       bigintval($userid)
+               ), __FUNCTION__, __LINE__);
 }
 
 // [EOF]