Renamed function so it might be more understandable
[mailer.git] / inc / mysql-manager.php
index 9c0e40109c51376d3086e06529441b1641349167..f7238a64a85a8d71b6d5670f1b29f697dcfe2e94 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                                *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 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 *
@@ -41,318 +40,103 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
-// "Getter" for module title
-function getModuleTitle ($mod) {
-       // Init variables
-       $title = '';
-       $result = false;
-
-       // Is the script installed?
-       if (isInstalled()) {
-               // Check if cache is valid
-               if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) {
-                       // Load from cache
-                       $title = $GLOBALS['cache_array']['modules']['title'][$mod];
-
-                       // Update cache hits
-                       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__);
-
-                       // Is the entry there?
-                       if (SQL_NUMROWS($result)) {
-                               // Get the title from database
-                               list($title) = SQL_FETCHROW($result);
-                       } // END - if
-
-                       // Free the result
-                       SQL_FREERESULT($result);
-               }
-       } // END - if
-
-       // Trim name
-       $title = trim($title);
-
-       // Still no luck or empty title?
-       if (empty($title)) {
-               // No name found
-               $title = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod);
-               if (SQL_NUMROWS($result) == 0) {
-                       // Add module to database
-                       $dummy = checkModulePermissions($mod);
-               } // END - if
-       } // END - if
-
-       // Return name
-       return $title;
-}
-
 // "Getter" for module description
 // @TODO Can we cache this?
-function getModuleDescription ($mode, $what, $column = 'what') {
+function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
        // Fix empty 'what'
        if (empty($what)) {
-               $what = getConfig('index_home');
+               $what = getIndexHome();
        } // END - if
 
        // Default is not found
-       $ret = '??? (' . $what . ')';
+       $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, $what), __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 it
-       return $ret;
+       return $data['title'];
 }
 
-// Check validity of a given module name (no file extension)
-function checkModulePermissions ($mod = '') {
-       // Is it empty (default), then take the current one
-       if (empty($mod)) $mod = getModule();
-
-       // Do we have cache?
-       if (isset($GLOBALS['module_status'][$mod])) {
-               // Then use it
-               return $GLOBALS['module_status'][$mod];
-       } // END - if
-
-       // Filter module name (names with low chars and underlines are fine!)
-       $mod = preg_replace('/[^a-z_]/', '', $mod);
-
-       // Check for prefix is a extension...
-       $modSplit = explode('_', $mod);
-       $extension = ''; $mod_chk = $mod;
-       //* DEBUG: */ print(__LINE__."*".count($modSplit)."*/".$mod."*<br />");
-       if (count($modSplit) == 2) {
-               // Okay, there is a seperator (_) in the name so is the first part a module?
-               //* 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];
-               } // END - if
-       } // END - if
-
-       // Major error in module registry is the default
-       $ret = 'major';
-
-       // Check if script is installed if not return a 'done' to prevent some errors
-       if ((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';
-       $found  = false;
-
-       // Check if cache is latest version
-       if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
-               // Is the cache there?
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using cache.');
-               if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
-                       // Check cache
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache found.');
-                       $locked = $GLOBALS['cache_array']['modules']['locked'][$mod_chk];
-                       $hidden = $GLOBALS['cache_array']['modules']['hidden'][$mod_chk];
-                       $admin  = $GLOBALS['cache_array']['modules']['admin_only'][$mod_chk];
-                       $mem    = $GLOBALS['cache_array']['modules']['mem_only'][$mod_chk];
-
-                       // Update cache hits
-                       incrementStatsEntry('cache_hits');
-                       $found = true;
-               } else {
-                       // No, then we have to update it!
-                       $ret = 'cache_miss';
-               }
-       } elseif (!isExtensionActive('cache')) {
-               // Check for module in database
-               //* 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($mod_chk), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result) == 1) {
-                       // Read data
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Entry found.');
-                       list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
-                       $found = true;
-               } elseif (isDebugModeEnabled()) {
-                       // Debug message only in debug-mode...
-                       logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $mod_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 ((isAdmin()) || (($locked != 'Y') && ($admin != 'Y') && (($mem != 'Y') || (isMember())))) {
-                       // If you are admin you are welcome for everything!
-                       $ret = 'done';
-               } elseif ($locked == 'Y') {
-                       // Module is locked
-                       $ret = 'locked';
-               } elseif (($mem == 'Y') && (!isMember())) {
-                       // You have to login first!
-                       $ret = 'mem_only';
-               } elseif (($admin == 'Y') && (!isAdmin())) {
-                       // Only the Admin is allowed to enter this module!
-                       $ret = 'admin_only';
-               } else {
-                       // @TODO Nothing helped???
-                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
-                               $ret,
-                               $locked,
-                               $admin,
-                               $mem
-                       ));
-               }
-       } // END - if
-
-       // Still no luck or not found?
-       if (($found === false) && (!isExtensionActive('cache')) && ($ret != 'done'))  {
-               //              ----- Legacy module -----                                               ---- Module in base folder  ----                       --- Module with extension's name ---
-               if ((isIncludeReadable(sprintf("inc/modules/%s.php", $mod))) || (isIncludeReadable(sprintf("%s.php", $mod))) || (isIncludeReadable(sprintf("%s/%s.php", $extension, $mod)))) {
-                       // Data is missing so we add it
-                       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__);
-                       } 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__);
-                       }
-
-                       // Everthing is fine?
-                       if (SQL_AFFECTEDROWS() < 1) {
-                               // Something bad happend!
-                               return 'major';
-                       } // END - if
-
-                       // Destroy cache here
-                       // @TODO Rewrite this to a filter
-                       if ((getOutputMode() == 0) || (getOutputMode() == -1)) rebuildCacheFile('modules', 'modules');
-
-                       // And reload data
-                       unset($GLOBALS['module_status'][$mod]);
-                       $ret = checkModulePermissions($mod_chk);
-               } else {
-                       // Module not found we don't add it to the database
-                       $ret = '404';
-               }
-       } elseif (($ret == 'cache_miss') && (getOutputMode() == 0)) {
-               // Rebuild the cache files
-               rebuildCacheFile('modules', 'modules');
-       } elseif ($found === false) {
-               // Problem with module detected
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s, output_mode=%s",
-                       $mod,
-                       $ret,
-                       $locked,
-                       $hidden,
-                       $mem,
-                       $admin,
-                       getOutputMode()
-               ));
-       }
-
-       // Return the value
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
-       $GLOBALS['module_status'][$mod] = $ret;
-       return $ret;
-}
-
-// Add menu description pending on given file name (without path!)
-function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = true) {
+// Add link into output stream (or return it) for 'You Are Here' navigation
+function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
        // Use only filename of the FQFN...
        $file = basename($FQFN);
 
        // Init variables
        $LINK_ADD = '';
        $OUT = '';
-       $AND = '';
+       $ADD = '';
+       $prefix = '';
 
        // First we have to do some analysis...
        if (substr($file, 0, 7) == 'action-') {
                // This is an action file!
                $type = 'action';
                $search = substr($file, 7);
-               switch ($accessLevel) {
-                       case 'admin':
-                               $modCheck = 'admin';
-                               break;
-
-                       case 'sponsor':
-                       case 'guest':
-                       case 'member':
-                               $modCheck = getModule();
-                               break;
-               }
-               $AND = " AND (`what`='' OR `what` IS NULL)";
+
+               // 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 an admin what file!
+               // This is a 'what file'!
                $type = 'what';
                $search = substr($file, 5);
-               $AND = '';
-               switch ($accessLevel) {
-                       case 'admin':
-                               $modCheck = 'admin';
-                               break;
-
-                       case 'guest':
-                       case 'member':
-                               $modCheck = getModule();
-                               if (!isAdmin()) {
-                                       $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($accessLevel, $dummy)."'";
-       } elseif (($accessLevel == 'sponsor') || ($accessLevel == "engine")) {
+               $ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
+       } elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
                // Sponsor / engine menu
                $type     = 'what';
                $search   = $file;
                $modCheck = getModule();
-               $AND      = '';
+               $ADD      = '';
        } else {
                // Other
                $type     = 'menu';
                $search   = $file;
                $modCheck = getModule();
-               $AND      = '';
+               $ADD      = '';
        }
 
        // Begin the navigation line
-       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 === false) $GLOBALS['nav_depth']++;
-               $prefix = '';
+       if (!isset($GLOBALS['nav_depth'])) {
+               // Init nav_depth
+               $GLOBALS['nav_depth'] = '0';
+
+               // Run the pre-filter chain
+               $ret = runFilterChain('pre_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+
+               // Add pre-content
+               $prefix = $ret['content'];
+
+               $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>';
+       } elseif ($return === false) {
+               // Count depth
+               $GLOBALS['nav_depth']++;
        }
 
        $prefix .= '&nbsp;-&gt;&nbsp;';
@@ -361,58 +145,43 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
        if (substr($search, -4, 4) == '.php') {
                // Remove the .php
                $search = substr($search, 0, -4);
-       } // END - i
+       } // END - if
 
-       // Get the title from menu
-       $result = SQL_QUERY_ESC("SELECT title FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE %s='%s' ".$AND." LIMIT 1",
-       array($accessLevel, $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 (((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 . "\">" . $ret . "</a></strong>\n";
-
-                       // 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 />\n";
-                               $GLOBALS['nav_depth'] = 0;
-
-                               // Run the filter chain
-                               $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ""));
-                               $OUT .= $ret['content'];
-                       } // END - if
-               }
-       } // END - if
+               // Can we close the you-are-here navigation?
+               //* DEBUG: */ debugOutput(__LINE__.'*'.$type.'/'.getWhat().'*');
+               if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
+                       //* DEBUG: */ debugOutput(__LINE__.'+'.$type.'+');
+                       // Add closing div and br-tag
+                       $OUT .= '</div>';
+                       $GLOBALS['nav_depth'] = '0';
 
-       // Free result
-       SQL_FREERESULT($result);
+                       // Run the post-filter chain
+                       $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+
+                       // Add additional content
+                       $OUT .= $ret['content'];
+               } // END - if
+       } // END - if
 
        // Return or output HTML code?
-       if ($output) {
-               // Output HTML code here
-               outputHtml($OUT);
-       } else {
+       if ($return === true) {
                // Return HTML code
                return $OUT;
+       } else {
+               // Output HTML code here
+               outputHtml($OUT);
        }
 }
 
 // Adds a menu (mode = guest/member/admin/sponsor) to output
 function addMenu ($mode, $action, $what) {
        // Init some variables
-       $main_cnt = 0;
-       $AND = '';
+       $main_cnt = '0';
+       $ADD = '';
 
        // is the menu action valid?
        if (!isMenuActionValid($mode, $action, $what, true)) {
@@ -421,37 +190,54 @@ function addMenu ($mode, $action, $what) {
 
        // Non-admin shall not see all menus
        if (!isAdmin()) {
-               $AND = " AND `visible`='Y' AND `locked`='N'";
+               $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` ASC",
+       $result_main = SQL_QUERY_ESC("SELECT
+       `title`, `what`, `action`, `visible`, `locked`
+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) {
+       //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
+       if (!SQL_HASZERONUMS($result_main)) {
                // There are menus available, so we simply display them... :)
                $GLOBALS['rows'] = '';
                while ($content = SQL_FETCHARRAY($result_main)) {
-                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].':'.getWhat()."*<br />");
-                       // Init variables
+                       //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . ':' . getWhat() . '*');
+                       // Disable the block-mode
                        enableBlockMode(false);
-                       $action = $content['action'];
 
                        // Load menu header template
                        $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`",
+                       $result_sub = SQL_QUERY_ESC("SELECT
+       `title` AS `sub_title`,
+       `what` AS `sub_what`,
+       `visible` AS `sub_visible`,
+       `locked` AS `sub_locked`
+FROM
+       `{?_MYSQL_PREFIX?}_%s_menu`
+WHERE
+       `action`='%s' AND
+       `what` != '' AND
+       `what` IS NOT NULL
+       ".$ADD."
+ORDER BY
+       `sort` ASC",
                                array($mode, $content['action']), __FUNCTION__, __LINE__);
 
-                       // Get number of rows
-                       $totalWhats = SQL_NUMROWS($result_sub);
-
                        // Do we have some entries?
-                       if ($totalWhats > 0) {
+                       if (!SQL_HASZERONUMS($result_sub)) {
                                // Init counter
-                               $cnt = 0;
+                               $count = '0';
 
                                // Load all sub menus
                                while ($content2 = SQL_FETCHARRAY($result_sub)) {
@@ -462,52 +248,54 @@ function addMenu ($mode, $action, $what) {
                                        $OUT = '';
 
                                        // Full file name for checking menu
-                                       //* DEBUG: */ print(__LINE__.":!!!!".$content['sub_what']."!!!<br />");
+                                       //* DEBUG: */ debugOutput(__LINE__ . ':!!!!' . $content['sub_what'] . '!!!');
                                        $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>";
+                                                       $OUT = '<strong>';
                                                } // END - if
 
                                                // Navigation link
-                                               $OUT .= "<a name=\"menu\" class=\"menu_blur\" href=\"{?URL?}/modules.php?module=".getModule()."&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 {
                                                // Not found! - open
-                                               $OUT .= "<em style=\"cursor:help\" class=\"admin_note\" title=\"{--MENU_WHAT_404--}\">";
+                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $content['sub_what'] . '%}">';
                                        }
 
                                        // Menu title
-                                       $OUT .= getConfig('menu_blur_spacer') . $content['sub_title'];
+                                       $OUT .= '{?menu_blur_spacer?}' . $content['sub_title'];
 
                                        if (isIncludeReadable($inc)) {
-                                               $OUT .= "</a>";
+                                               $OUT .= '</a>';
 
                                                // Mark currently selected menu - close
                                                if ((!empty($what)) && (($what == $content['sub_what']))) {
-                                                       $OUT .= "</strong>";
+                                                       $OUT .= '</strong>';
                                                } // END - if
                                        } else {
                                                // Not found! - close
-                                               $OUT .= "</em>";
+                                               $OUT .= '</em>';
                                        }
 
                                        // Cunt it up
-                                       $cnt++;
+                                       $count++;
 
                                        // Rewrite array
-                                       $content =  array(
-                                               'menu' => $OUT,
-                                               'what' => $content['sub_what']
+                                       $content = array(
+                                               'menu'    => $OUT,
+                                               'what'    => $content['sub_what'],
+                                               'visible' => $content['sub_visible'],
+                                               'locked'  => $content['locked'],
                                        );
 
                                        // Add regular menu row or bottom row?
-                                       if ($cnt < $totalWhats) {
+                                       if ($count < SQL_NUMROWS($result_sub)) {
                                                $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
                                        } else {
                                                $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
                                        }
-                               }
+                               } // END - while
                        } else {
                                // This is a menu block... ;-)
                                enableBlockMode();
@@ -517,17 +305,21 @@ function addMenu ($mode, $action, $what) {
                                if (isFileReadable($INC)) {
                                        // Load include file
                                        if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
-                                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat()."*<br />");
+                                       //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
                                        loadInclude($INC);
-                                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat()."*<br />");
+                                       //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
                                        if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
                                }
-                               //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
+                               //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
                        }
 
+                       // Free result
+                       SQL_FREERESULT($result_sub);
+
+                       // Count one up
                        $main_cnt++;
 
-                       //* DEBUG: */ print(__LINE__.'/'.$main_cnt.':'.getWhat()."*<br />");
+                       //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
                        if (SQL_NUMROWS($result_main) > $main_cnt) {
                                // Add seperator
                                $GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
@@ -562,7 +354,7 @@ function addMenu ($mode, $action, $what) {
                );
 
                // Load main template
-               //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
+               //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
                loadTemplate('menu_table', false, $content);
        } // END - if
 }
@@ -576,68 +368,80 @@ function isMember () {
        // @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['is_member'])) {
+       // Is the cache entry there?
+       if (isset($GLOBALS[__FUNCTION__])) {
                // Then return it
-               return $GLOBALS['is_member'];
-       } elseif (getMemberId() == 0) {
-               // No member
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS[__FUNCTION__]) . ')');
+               return $GLOBALS[__FUNCTION__];
+       } elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
+               // Destroy any existing user session data
+               destroyMemberSession();
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
+
+               // Abort further processing
                return false;
-       } else {
-               // Transfer userid=>current
-               setCurrentUserid(getMemberId());
        }
 
-       // Init global user data array
+       // Get userid secured from session
+       setMemberId(getSession('userid'));
+
+       // ... and set it as currently handled user id
+       setCurrentUserId(getMemberId());
+
+       // Init user data array
        initUserData();
 
        // Fix "deleted" cookies first
        fixDeletedCookies(array('userid', 'u_hash'));
 
-       // Are cookies set?
-       if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
-               // Cookies are set with values, but are they valid?
-               if (fetchUserData(getMemberId()) === true) {
-                       // Validate password by created the difference of it and the secret key
-                       $valPass = generatePassString(getUserData('password'));
+       // Are cookies set and can the member data be loaded?
+       if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+               // Validate password by created the difference of it and the secret key
+               $valPass = encodeHashForCookie(getUserData('password'));
 
+               // So did we now have valid data and an unlocked user?
+               if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
                        // Transfer last module and online time
                        $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?
-                       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: */ print(__LINE__."!!!<br />");
-                               destroyMemberSession();
-                       }
-               } else {
-                       // Cookie data is invalid!
-                       //* DEBUG: */ print(__LINE__."***<br />");
-                       destroyMemberSession();
-               }
-       } else {
-               // Cookie data is invalid!
-               //* DEBUG: */ print(__LINE__."///<br />");
+                       // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
+                       $ret = true;
+               } // END - if
+       } // END - if
+
+       // Is $ret still false?
+       if ($ret === false) {
+               // Yes, so destroy the session
                destroyMemberSession();
-       }
+       } // END - if
 
        // Cache status
-       $GLOBALS['is_member'] = $ret;
+       $GLOBALS[__FUNCTION__] = $ret;
 
        // Return status
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
        return $ret;
 }
 
 // Fetch user data for given user id
-function fetchUserData ($userid, $column='userid') {
-       // Don't look for invalid userids...
-       if ($userid < 1) {
-               // Invalid, so abort here
-               debug_report_bug('User id ' . $userid . ' is invalid.');
+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 (!isValidUserId($userid)) {
+                       // Invalid, so abort here
+                       debug_report_bug(__FUNCTION__, __LINE__, '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;
@@ -646,14 +450,12 @@ function fetchUserData ($userid, $column='userid') {
        // By default none was found
        $found = false;
 
-       // Do we have userid/refid?
-       if (($column == 'userid') || ($column == 'refid')) {
-               // Then secure the id
-               $userid = bigintval($userid);
-       } // END - if
+       // 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 * FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
+       $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?
@@ -669,12 +471,12 @@ function fetchUserData ($userid, $column='userid') {
                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;
+                       $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']);
+                               $array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw']);
 
                                // Seperate data and time again
                                $array['date'] = explode('-', $array[0]);
@@ -704,68 +506,67 @@ function fetchUserData ($userid, $column='userid') {
 }
 
 // This patched function will reduce many SELECT queries for the specified or current admin login
-function isAdmin ($admin = '') {
+function isAdmin () {
+       // No admin in installation phase!
+       if ((isInstallationPhase()) || (!isAdminRegistered())) {
+               return false;
+       } // END - if
+
        // Init variables
-       $ret = false; $passCookie = ''; $valPass = '';
-       //* DEBUG: */ print(__FUNCTION__.':'.$admin.'<br />');
+       $ret = false;
+       $adminId = '0';
+       $passCookie = '';
+       $valPass = '';
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId);
 
        // If admin login is not given take current from cookies...
-       if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
+       if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) {
                // Get admin login and password from session/cookies
-               $admin = getSession('admin_login');
+               $adminId    = getSession('admin_id');
                $passCookie = getSession('admin_md5');
        } // END - if
-       //* DEBUG: */ print(__FUNCTION__.':'.$admin.'/'.$passCookie.'<br />');
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId.'/'.$passCookie);
+
+       // Abort if admin id is zero
+       if ($adminId == '0') {
+               return false;
+       } // END - if
 
        // Do we have cache?
-       if (!isset($GLOBALS['is_admin'][$admin])) {
+       if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
                // Init it with failed
-               $GLOBALS['is_admin'][$admin] = false;
+               $GLOBALS[__FUNCTION__][$adminId] = false;
 
                // Search in array for entry
                if (isset($GLOBALS['admin_hash'])) {
                        // Use cached string
                        $valPass = $GLOBALS['admin_hash'];
-               } elseif ((!empty($passCookie)) && (isAdminHashSet($admin) === true) && (!empty($admin))) {
+               } elseif ((!empty($passCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) {
                        // Login data is valid or not?
-                       $valPass = generatePassString(getAdminHash($admin));
+                       $valPass = encodeHashForCookie(getAdminHash($adminId));
 
                        // Cache it away
                        $GLOBALS['admin_hash'] = $valPass;
 
                        // Count cache hits
                        incrementStatsEntry('cache_hits');
-               } elseif ((!empty($admin)) && ((!isExtensionActive('cache'))) || (isAdminHashSet($admin) === false)) {
-                       // 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);
-
-                               // Temporary cache it
-                               setAdminHash($admin, $passDB);
-
-                               // Generate password hash
-                               $valPass = generatePassString($passDB);
-                       } // END - if
+               } elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === false))) {
+                       // Get admin hash and hash it
+                       $valPass = encodeHashForCookie(getAdminHash($adminId));
 
-                       // Free memory
-                       SQL_FREERESULT($result);
+                       // Cache it away
+                       $GLOBALS['admin_hash'] = $valPass;
                }
 
                if (!empty($valPass)) {
                        // Check if password is valid
-                       //* DEBUG: */ print(__FUNCTION__ . ':(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie).'<br />');
-                       $GLOBALS['is_admin'][$admin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
+                       $GLOBALS[__FUNCTION__][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
                } // END - if
        } // END - if
 
        // Return result of comparision
-       return $GLOBALS['is_admin'][$admin];
+       return $GLOBALS[__FUNCTION__][$adminId];
 }
 
 // Generates a list of "max receiveable emails per day"
@@ -776,13 +577,13 @@ 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;
 
@@ -792,21 +593,21 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
        }
 
        // Some entries are found?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
-                       $OUT .= "      <option value=\"".$content['value']."\"";
-                       if (postRequestElement('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>';
                }
 
                // Load template
                $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?');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Nothing is being done here?');
        }
 
        // Free result
@@ -824,8 +625,8 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 // 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 '%%%s%%' OR `email` LIKE '%%%s%%' LIMIT 1",
+               array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__);
 
        // Is the email there?
        $ret = (SQL_NUMROWS($result) == 1);
@@ -855,19 +656,30 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
        $add = '';
        if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
-       //* DEBUG: */ print(__LINE__.':'.$mode.'/'.$action.'/'.$what."*<br />");
+       //* DEBUG: */ debugOutput(__LINE__.':'.$mode.'/'.$action.'/'.$what.'*');
        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, $action, $what), __FUNCTION__, __LINE__, false);
+                       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, $action, $what), __FUNCTION__, __LINE__, false);
+                       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, $action), __FUNCTION__, __LINE__, false);
+                       array(
+                               $mode,
+                               $action
+                       ), __FUNCTION__, __LINE__, false);
        }
 
        // Run SQL command
@@ -876,10 +688,10 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
        // Should we look for affected rows (only update) or found rows?
        if ($updateEntry === true) {
                // Check updated/affected rows
-               $ret = (SQL_AFFECTEDROWS() == 1);
+               $ret = (!SQL_HASZEROAFFECTED());
        } else {
                // Check found rows
-               $ret = (SQL_NUMROWS($result) == 1);
+               $ret = (!SQL_HASZERONUMS($result));
        }
 
        // Free memory
@@ -892,172 +704,66 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
        return $ret;
 }
 
-// Send out mails depending on the 'mod/modes' combination
-// @TODO Lame description for this function
-function sendModeMails ($mod, $modes) {
-       // Load hash
-       if (fetchUserData(getMemberId())) {
-               // Extract salt from cookie
-               $salt = substr(getSession('u_hash'), 0, -40);
-
-               // Now let's compare passwords
-               $hash = generatePassString(getUserData('password'));
-
-               // Does the hash match or should we change it?
-               if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) {
-                       // Load user's data               0        1        2         3        4      5    6      7
-                       $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(getMemberId(), getUserData('password')), __FUNCTION__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1) {
-                               // Load the data
-                               $content = SQL_FETCHARRAY($result, 0, false);
-
-                               // Free result
-                               SQL_FREERESULT($result);
-
-                               // Translate gender
-                               $content['gender'] = translateGender($content['gender']);
-
-                               // Clear/init the content variable
-                               $content['message'] = '';
-
-                               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['message'] = getMessage('MEMBER_CHANGED_EMAIL').": ".postRequestElement('old_email')."\n";
-                                                                       break;
-
-                                                               case 'pass': // Password was changed
-                                                                       $content['message'] = getMessage('MEMBER_CHANGED_PASS')."\n";
-                                                                       break;
-
-                                                               default:
-                                                                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
-                                                                       $content['message'] = getMessage('MEMBER_UNKNOWN_MODE') . ': ' . $mode . "\n\n";
-                                                                       break;
-                                                       } // END - switch
-                                               } // END - foreach
-
-                                               if (isExtensionActive('country')) {
-                                                       // Replace code with description
-                                                       $content['country'] = generateCountryInfo(postRequestElement('country_code'));
-                                               } // END - if
-
-                                               // Merge content with data from POST
-                                               $content = merge_array($content, postRequestArray());
-
-                                               // Load template
-                                               $message = loadEmailTemplate('member_mydata_notify', $content, getMemberId());
-
-                                               if (getConfig('admin_notify') == 'Y') {
-                                                       // The admin needs to be notified about a profile change
-                                                       $message_admin = 'admin_mydata_notify';
-                                                       $sub_adm   = getMessage('ADMIN_CHANGED_DATA');
-                                               } else {
-                                                       // No mail to admin
-                                                       $message_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!
-                                               logDebugMessage(__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($message))) {
-               // Send member mail
-               sendEmail($content['email'], $sub_mem, $message);
-       } // END - if
-
-       // Send only if no other error has occured
-       if (empty($content)) {
-               if ((!empty($sub_adm)) && (!empty($message_admin))) {
-                       // Send admin mail
-                       sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
-               } 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
-       loadTemplate('admin_settings_saved', false, $content);
-}
-
 // Get action value from mode (admin/guest/member) and what-value
-function getModeAction ($mode, $what) {
+function getActionFromModuleWhat ($module, $what) {
        // Init status
-       $ret = '';
-
-       //* DEBUG: */ print(__LINE__.'='.$mode.'/'.$what.'/'.getAction()."=<br />");
-       if ((empty($what)) && ($mode != 'admin')) {
-               $what = getConfig('index_home');
+       $data['action'] = '';
+
+       //* DEBUG: */ debugOutput(__LINE__ . '=' . $module . '/'.$what . '/' . getAction() . '=');
+       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 = getIndexHome();
        } // END - if
 
-       if ($mode == 'admin') {
+       if ($module == 'admin') {
                // Action value for admin area
-               if (isGetRequestElementSet('action')) {
+               if (isGetRequestParameterSet('action')) {
                        // Use from request!
-                       return getRequestElement('action');
+                       return getRequestParameter('action');
                } elseif (isActionSet()) {
                        // Get it directly from URL
                        return getAction();
                } elseif (($what == 'overview') || (!isWhatSet())) {
                        // Default value for admin area
-                       $ret = 'login';
+                       $data['action'] = 'login';
                }
        } elseif (isActionSet()) {
                // Get it directly from URL
                return getAction();
        }
-       //* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret.'<br />');
+       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): ret=' . $data['action']);
 
        // Does the module have a menu?
-       if (ifModuleHasMenu($mode)) {
+       if (ifModuleHasMenu($module)) {
                // Rewriting modules to menu
-               $mode = mapModuleToTable($mode);
+               $module = mapModuleToTable($module);
 
                // Guest and member menu is 'main' as the default
-               if (empty($ret)) $ret = 'main';
+               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, $what), __FUNCTION__, __LINE__);
+                       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 ((!isExtensionInstalled('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 to admin area
@@ -1066,25 +772,25 @@ function getModeAction ($mode, $what) {
        }
 
        // 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'] = '{--_CATEGORY_404--}';
 
        // Is the category id set?
-       if ($cid == 0) {
+       if ($cid == '0') {
                // No category
-               $ret = getMessage('_CATEGORY_NONE');
+               $data['cat'] = '{--_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
@@ -1092,26 +798,26 @@ function getCategory ($cid) {
        } // END - if
 
        // Return result
-       return $ret;
+       return $data['cat'];
 }
 
 // Get a string of "mail title" and price back
 function getPaymentTitlePrice ($pid, $full=false) {
        // Default is not found
-       $ret = getMessage('_PAYMENT_404');
+       $ret = '{--_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... :-)
+               $data = SQL_FETCHARRAY($result);
+
+               // Only title or also including price?
                if ($full === false) {
-                       // Return only title
-                       list($ret) = SQL_FETCHROW($result);
+                       $ret = $data['mail_title'];
                } else {
-                       // Return title and price
-                       list($t, $p) = SQL_FETCHROW($result);
-                       $ret = $t.' / '.translateComma($p).' {?POINTS?}';
+                       $ret = $data['mail_title'] . ' / {%pipe,translateComma=' . $data['price'] . '%} {?POINTS?}';
                }
        }
 
@@ -1125,23 +831,23 @@ 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
@@ -1150,7 +856,7 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
        $ret = 'failed';
 
        // Is the userid valid?
-       if ($userid > 0) {
+       if (isValidUserId($userid)) {
                // Remove entry from array
                unset($receivers[$key]);
 
@@ -1158,14 +864,17 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
                if ($stats_id > 0) {
                        // Only when we got a real stats id continue searching for the entry
                        $type = 'NORMAL'; $rowName = 'stats_id';
-                       if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
+                       if ($bonus) {
+                               $type = 'BONUS';
+                               $rowName = 'bonus_id';
+                       } // END - if
 
                        // 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($userid), $type), __FUNCTION__, __LINE__);
 
                        // Was it *not* found?
-                       if (SQL_NUMROWS($result) == 0) {
+                       if (SQL_HASZERONUMS($result)) {
                                // 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($userid), $type), __FUNCTION__, __LINE__);
@@ -1177,8 +886,8 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
 
                        // Free memory
                        SQL_FREERESULT($result);
-               }
-       }
+               } // END - if
+       } // END - if
 
        // Return status for sending routine
        return $ret;
@@ -1186,54 +895,56 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
 
 // Calculate sum (default) or count records of given criteria
 function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
-       $ret = 0;
-       //* DEBUG: */ print($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />');
+       // Init count/sum
+       $data['res'] = '0';
+
+       //* DEBUG: */ debugOutput($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add);
        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,
+                       $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,
+                       $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: */ print("COUNT!<br />");
-               $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+               //* DEBUG: */ debugOutput('COUNT!');
+               $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: */ print("SUM!<br />");
-               $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+               //* DEBUG: */ debugOutput('SUM!');
+               $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
-       //* DEBUG: */ print 'ret='.$ret.'<br />';
-       return $ret;
+       //* DEBUG: */ debugOutput('ret=' . $data['res']);
+       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']['refdepths']['level'])) && (isExtensionActive('cache'))) {
@@ -1241,7 +952,7 @@ function getReferalLevelPercents ($level) {
                $key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
                if ($key !== false) {
                        // Entry found!
-                       $per = $GLOBALS['cache_array']['refdepths']['percents'][$key];
+                       $data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
 
                        // Count cache hit
                        incrementStatsEntry('cache_hits');
@@ -1254,7 +965,7 @@ function getReferalLevelPercents ($level) {
                // Entry found?
                if (SQL_NUMROWS($result_level) == 1) {
                        // Get percents
-                       list($per) = SQL_FETCHROW($result_level);
+                       $data = SQL_FETCHARRAY($result_level);
                } // END - if
 
                // Free result
@@ -1262,7 +973,7 @@ function getReferalLevelPercents ($level) {
        }
 
        // Return percent
-       return $per;
+       return $data['percents'];
 }
 
 /**
@@ -1270,156 +981,180 @@ function getReferalLevelPercents ($level) {
  * Dynamic referal system, can also send mails!
  *
  * subject     = Subject line, write in lower-case letters and underscore is allowed
- * userid         = Referal id wich should receive...
+ * userid      = Referal id wich should receive...
  * points      = ... xxx points
  * sendNotify  = shall I send the referal an email or not?
- * rid         = inc/modules/guest/what-confirm.php need this
+ * refid       = 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 $userid or also refs? (WARNING! Changing 'ref' to 'direct'
  *               for default value will cause no referal will get points ever!!!)
  */
-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");
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $add_mode = 'ref') {
+       // By default nothing has been added
+       $added = false;
+
+       //* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">' . __FUNCTION__ . ' - ENTRY</font> ------------------------<ul><li>');
        // Convert mode to lower-case
        $add_mode = strtolower($add_mode);
 
-       // When $userid = 0 add points to jackpot
-       if (($userid == 0) && (isExtensionActive('jackpot'))) {
+       // When $userid = '0' add points to jackpot
+       if (($userid == '0') && (isExtensionActive('jackpot'))) {
                // Add points to jackpot
                addPointsToJackpot($points);
                return;
        } // 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 />");
-               $GLOBALS['ref_level'] = 0;
+               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): Referal system initialized!');
+               $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 />");
+               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): Referal level increased. DEPTH='.$GLOBALS['ref_level']);
        }
 
-       // Default is 'normal' points
-       $data = 'points';
-
-       // Which points, locked or normal?
-       if ($locked === true) $data = 'locked_points';
-
        // Check user account
-       //* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},points={$points}<br />");
+       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points);
        if (fetchUserData($userid)) {
+               // Determine wether the user has some mails to click before he/she gets the points
+               $locked = ifUserPointsLocked($userid);
+
+               // Default is 'normal' points
+               $data = 'points';
+
+               // Which points, locked or normal?
+               if ($locked === true) {
+                       $data = 'locked_points';
+               } // END - if
+
                // This is the user and his ref
                $GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
 
                // Get percents
                $per = getReferalLevelPercents($GLOBALS['ref_level']);
-               //* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}<br />");
+               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$add_mode);
 
                // Some percents found?
                if ($per > 0) {
                        // Calculate new points
-                       //* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />");
+                       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points.',per='.$per.',depth='.$GLOBALS['ref_level']);
                        $ref_points = $points * $per / 100;
 
                        // Pay refback here if level > 0 and in ref-mode
-                       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 />");
+                       if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == 'ref') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
+                               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - BEFORE!');
                                $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 />");
+                               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - AFTER!');
                        } // 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",
+                       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 />");
+                       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):data='.$data.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$add_mode.' - UPDATE! ('.SQL_AFFECTEDROWS().')');
 
                        // No entry updated?
-                       if (SQL_AFFECTEDROWS() < 1) {
+                       if (SQL_HASZEROAFFECTED()) {
                                // First ref in this level! :-)
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES (%s,'%s',%s)",
+                               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 />");
+                               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):data='.$data.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$add_mode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
                        } // END - if
 
+                       // Check affected rows
+                       $added = SQL_AFFECTEDROWS();
+                       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):added='.intval($added));
+
+                       // Prepare data for the filter
+                       $filterData = array(
+                               'subject'  => $subject,
+                               'userid'   => $userid,
+                               'points'   => $points,
+                               'notify'   => $sendNotify,
+                               'refid'    => $refid,
+                               'locked'   => $locked,
+                               'mode'     => 'add',
+                               'sub_mode' => $add_mode,
+                               'added'    => $added
+                       );
+
+                       // Filter it now
+                       $filterData = runFilterChain('add_points', $filterData);
+
+                       // Extract $added
+                       $added = $filterData['added'];
+                       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):added='.intval($added));
+
                        // Points updated, maybe I shall send him an email?
-                       if (($sendNotify === true) && (getUserData('refid') > 0) && ($locked === false)) {
+                       if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
                                // Prepare content
                                $content = array(
                                        'percents' => $per,
                                        'level'    => bigintval($GLOBALS['ref_level']),
                                        'points'   => $ref_points,
-                                       'refid'    => getUserData('refid')
                                );
 
                                // Load email template
                                $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
 
-                               sendEmail(getUserData('email'), THANX_REFERAL_ONE, $message);
-                       } elseif (($sendNotify) && (getUserData('refid') == 0) && ($locked === false) && ($add_mode == 'direct')) {
+                               // Send email
+                               sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
+                       } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($add_mode == 'direct')) {
                                // Prepare content
                                $content = array(
-                                       'text'   => getMessage('REASON_DIRECT_PAYMENT'),
-                                       'points' => translateComma($ref_points)
+                                       'reason' => '{--REASON_DIRECT_PAYMENT--}',
+                                       'points' => $ref_points
                                );
 
                                // Load message
                                $message = loadEmailTemplate('add-points', $content, $userid);
 
                                // And sent it away
-                               sendEmail(getUserData('email'), getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
-                               if (!isGetRequestElementSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+                               sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
+                               if (!isGetRequestParameterSet('mid')) {
+                                       // Output message to admin
+                                       loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+                               } // END - if
                        }
 
                        // Maybe there's another ref?
-                       if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
+                       if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
                                // Then let's credit him here...
-                               //* DEBUG: */ 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);
+                               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
+                               $added = ($added && addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid')));
                        } // END - if
                } // END - if
        } // END - if
 
-       //* DEBUG: */ print("</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />");
+       //* DEBUG: */ debugOutput('</li></ul>----------------------- <font color="#aa0000">'.__FUNCTION__.': added=' . intval($added) . ' - EXIT</font> ------------------------<br />');
+       return $added;
 }
 
 // Updates the referal counter
 function updateReferalCounter ($userid) {
        // Make it sure referal level zero (member him-/herself) is at least selected
        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 />");
+       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',level='.$GLOBALS['cache_array']['ref_level'][$userid]);
 
        // Update counter
        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 />');
-       if (SQL_AFFECTEDROWS() < 1) {
+       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):updated=' . SQL_AFFECTEDROWS());
+       if (SQL_HASZEROAFFECTED()) {
                // First count!
                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 />");
+                       array(
+                               bigintval($userid),
+                               $GLOBALS['cache_array']['ref_level'][$userid]
+                       ), __FUNCTION__, __LINE__);
+               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid);
        } // END - if
 
        // Init referal id
-       $ref = 0;
+       $ref = '0';
 
        // Check for his referal
        if (fetchUserData($userid)) {
@@ -1427,24 +1162,25 @@ function updateReferalCounter ($userid) {
                $ref = getUserData('refid');
        } // END - if
 
-       //* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},ref={$ref}<br />");
+       //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.$ref);
 
        // When he has a referal...
        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 />");
+               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):ref='.$ref.' - ADVANCE!');
                $GLOBALS['cache_array']['ref_level'][$userid]++;
                updateReferalCounter($ref);
-       } elseif ((($ref == $userid) || ($ref == 0)) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
+       } 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 />");
-               rebuildCacheFile('refsystem', 'refsystem');
+               //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):ref='.$ref.' - CACHE!');
+               rebuildCache('refsystem', 'refsystem');
        }
 
        // "Walk" back here
        $GLOBALS['cache_array']['ref_level'][$userid]--;
 
        // Handle refback here if extension is installed
+       // @TODO Rewrite this to a filter
        if (isExtensionActive('refback')) {
                updateRefbackTable($userid);
        } // END - if
@@ -1454,7 +1190,7 @@ function updateReferalCounter ($userid) {
 // because we need it when there is no ext-admins installed
 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, $message);
@@ -1467,29 +1203,34 @@ function sendAdminEmails ($subj, $message) {
 }
 
 // Get id number from administrator's login name
-function getAdminId ($login) {
+function getAdminId ($adminLogin) {
        // By default no admin is found
-       $ret = '-1';
+       $data['id'] = '-1';
 
        // Check cache
-       if (isset($GLOBALS['cache_array']['admin']['admin_id'][$login])) {
+       if (isset($GLOBALS['cache_array']['admin']['admin_id'][$adminLogin])) {
                // Use it if found to save SQL queries
-               $ret = $GLOBALS['cache_array']['admin']['admin_id'][$login];
+               $data['id'] = $GLOBALS['cache_array']['admin']['admin_id'][$adminLogin];
 
                // Update cache hits
                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__);
+                       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
@@ -1497,98 +1238,111 @@ function getCurrentAdminId () {
        // 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 = getAdminId($adminLogin);
+               $adminId = getSession('admin_id');
 
                // Remember in cache securely
-               $GLOBALS['current_admin_id'] = bigintval($adminId);
+               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 getAdminHash ($admin) {
+function getAdminHash ($adminId) {
        // By default an invalid hash is returned
-       $ret = '-1';
+       $data['password'] = '-1';
 
-       if (isAdminHashSet($admin)) {
+       if (isAdminHashSet($adminId)) {
                // Check cache
-               $ret = $GLOBALS['cache_array']['admin']['password'][$admin];
+               $data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminId];
 
                // Update cache hits
                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($admin), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($adminId)), __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
-                       setAdminHash($admin, $ret);
+                       setAdminHash($adminId, $data['password']);
                } // END - if
 
                // Free result
                SQL_FREERESULT($result);
        }
-       return $ret;
+
+       // Return password hash
+       return $data['password'];
 }
 
 // "Getter" for admin login
 function getAdminLogin ($adminId) {
        // By default a non-existent login is returned (other functions react on this!)
-       $ret = '***';
+       $data['login'] = '***';
 
        if (isset($GLOBALS['cache_array']['admin']['login'][$adminId])) {
                // Get cache
-               $ret = $GLOBALS['cache_array']['admin']['login'][$adminId];
+               $data['login'] = $GLOBALS['cache_array']['admin']['login'][$adminId];
 
                // Update cache hits
                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($adminId)), __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']['admin']['login'][$adminId] = $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 ($adminId) {
        // By default an invalid emails is returned
-       $ret = '***';
+       $data['email'] = '***';
 
        if (isset($GLOBALS['cache_array']['admin']['email'][$adminId])) {
                // Get cache
-               $ret = $GLOBALS['cache_array']['admin']['email'][$adminId];
+               $data['email'] = $GLOBALS['cache_array']['admin']['email'][$adminId];
 
                // Update cache hits
                incrementStatsEntry('cache_hits');
        } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result_admin_id = SQL_QUERY_ESC("SELECT email FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 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_admin_id);
+                       $data = SQL_FETCHARRAY($result_admin_id);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admin']['email'][$adminId] = $ret;
+                       $GLOBALS['cache_array']['admin']['email'][$adminId] = $data['email'];
                } // END - if
 
                // Free result
@@ -1596,21 +1350,21 @@ function getAdminEmail ($adminId) {
        }
 
        // Return email
-       return $ret;
+       return $data['email'];
 }
 
 // Get default ACL  of admin id
 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 (!isExtensionActive('sql_patches')) {
                // Not found, which is bad, so we need to allow all
-               $ret =  'allow';
+               $data['default_acl'] =  'allow';
        } elseif (isset($GLOBALS['cache_array']['admin']['def_acl'][$adminId])) {
                // Use cache
-               $ret = $GLOBALS['cache_array']['admin']['def_acl'][$adminId];
+               $data['default_acl'] = $GLOBALS['cache_array']['admin']['def_acl'][$adminId];
 
                // Update cache hits
                incrementStatsEntry('cache_hits');
@@ -1620,58 +1374,98 @@ function getAdminDefaultAcl ($adminId) {
                        array(bigintval($adminId)), __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result_admin_id) == 1) {
                        // Fetch data
-                       list($ret) = SQL_FETCHROW($result_admin_id);
+                       $data = SQL_FETCHARRAY($result_admin_id);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admin']['def_acl'][$adminId] = $ret;
+                       $GLOBALS['cache_array']['admin']['def_acl'][$adminId] = $data['default_acl'];
                }
 
                // Free result
                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(), $callback = '') {
        $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)) || (!empty($callback)))) {
                        // 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"';
+                               }
+
+                               // Is the call-back function set?
+                               if (!empty($callback)) {
+                                       // Call it
+                                       $name[$idx] = call_user_func_array($callback, array($id[$idx]));
+                               } // END - if
+
+                               // Finish option tag
                                $ret .= '>' . $name[$idx] . '</option>';
                        } // END - foreach
-               } // END - if
+               } else {
+                       // Problem in request
+                       debug_report_bug(__FUNCTION__, __LINE__, 'Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name) . ',callback=' . $callback);
+               }
        } 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__);
-               if (SQL_NUMROWS($result) > 0) {
+               $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_HASZERONUMS($result)) {
                        // Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
                        // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
                        while (list($value, $title, $add) = SQL_FETCHROW($result)) {
                                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"';
+                               }
+
+                               // Add it, if set
                                if (!empty($add)) $add = ' ('.$add.')';
+
+                               // Is the call-back function set?
+                               if (!empty($callback)) {
+                                       // Call it
+                                       $title = call_user_func_array($callback, array($title));
+                               } // END - if
+
+                               // Finish option list
                                $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
@@ -1680,20 +1474,16 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
 // Activate exchange
 function FILTER_ACTIVATE_EXCHANGE () {
        // Is the extension 'user' there?
-       if ((!isExtensionActive('user')) || (getConfig('activate_xchange') == 0)) {
+       if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) {
                // Silently abort here
                return false;
        } // END - if
 
        // Check total amount of users
-       $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
-
-       if ($totalUsers >= getConfig('activate_xchange')) {
+       if (getTotalConfirmedUser() >= getActivateXchange()) {
                // Activate System
-               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",
-               ));
+               addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1");
+               addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2");
 
                // Run SQLs
                runFilterChain('run_sqls');
@@ -1702,39 +1492,45 @@ function FILTER_ACTIVATE_EXCHANGE () {
                updateConfiguration('activate_xchange' ,0);
 
                // Rebuild cache
-               rebuildCacheFile('modules', 'modules');
+               rebuildCache('modules', 'modules');
        } // END - if
 }
 
 // Deletes a user account with given reason
 function deleteUserAccount ($userid, $reason) {
-       $points = 0;
+       // Init points
+       $data['points'] = '0';
+
        $result = SQL_QUERY_ESC("SELECT
-       (SUM(p.points) - d.used_points) AS points
+       (SUM(p.`points`) - d.`used_points`) AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_points` AS p
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-       p.userid=d.userid
+       p.`userid`=d.`userid`
 WHERE
-       p.userid=%s",
+       p.`userid`=%s
+LIMIT 1",
                array(bigintval($userid)), __FUNCTION__, __LINE__);
+
+       // 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($userid)), __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 (getExtensionVersion('mediadata') >= '0.0.4') {
+               if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
                        // Update database
-                       updateMediadataEntry(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!
-               if (isExtensionActive('jackpot')) addPointsToJackpot($points);
+               if (isExtensionActive('jackpot')) addPointsToJackpot($data['points']);
        } // END - if
 
        // Free the result
@@ -1745,46 +1541,35 @@ WHERE
                array(bigintval($userid)), __FUNCTION__, __LINE__);
 
        // Remove from rallye if found
+       // @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;
+
        // Now a mail to the user and that's all...
-       $message = loadEmailTemplate('del-user', array('text' => $reason), $userid);
-       sendEmail($userid, getMessage('ADMIN_DEL_ACCOUNT'), $message);
+       $message = loadEmailTemplate('del-user', $data, $userid);
+       sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message);
 
        // Ok, delete the account!
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
 }
 
-// Generates meta description for given module and 'what' value
-function generateMetaDescriptionCode ($mod, $what) {
-       // Exclude admin and member's area
-       if (($mod != 'admin') && ($mod != 'login')) {
-               // Construct dynamic description
-               $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . addMenuDescription('guest', 'what-'.$what, true);
-
-               // Output it directly
-               outputHtml('<meta name="description" content="' . $DESCR . '" />');
-       } // END - if
-
-       // Remove depth
-       unset($GLOBALS['ref_level']);
-}
-
 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
        // Is the request element set?
-       if (isGetRequestElementSet('what')) {
+       if (isGetRequestParameterSet('what')) {
                // Then return this!
-               return getRequestElement('what');
+               return getRequestParameter('what');
        } // END - if
 
        // Default is empty
        $what = '';
 
-       //* DEBUG: */ print(__LINE__.'!'.$modCheck."!<br />");
+       //* DEBUG: */ debugOutput(__LINE__.'!'.$modCheck.'!');
        switch ($modCheck) {
                case 'admin':
                        $what = 'overview';
@@ -1795,7 +1580,7 @@ function getWhatFromModule ($modCheck) {
                        // 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');
+                               $what = getIndexHome();
                        } else {
                                // Use default 'welcome'
                                $what = 'welcome';
@@ -1822,35 +1607,27 @@ function subtractPoints ($subject, $userid, $points) {
                'subject' => $subject,
                'userid'  => $userid,
                'points'  => $points,
-               'mode'    => 'sub'
+               'mode'    => 'sub',
+               'added'   => (!SQL_HASZEROAFFECTED())
        );
 
        // Insert booking record
-       runFilterChain('sub_points', $filterData);
+       $filterData = runFilterChain('sub_points', $filterData);
+
+       // Return result
+       return $filterData['added'];
 }
 
 // "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 ".runFilterChain('exclude_users', $mode),
-       __FUNCTION__, __LINE__);
-
+function getTotalReceivers ($mode = 'normal') {
        // Get num rows
-       $numRows = SQL_NUMROWS($result_all);
-
-       // Free result
-       SQL_FREERESULT($result_all);
+       $numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode));
 
        // Return value
        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'";
@@ -1864,8 +1641,11 @@ function generateCategoryOptionsList ($mode) {
        );
 
        // Get categories
-       $result = SQL_QUERY("SELECT id, cat FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort`", __FUNCTION__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       $result = SQL_QUERY('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC',
+               __FUNCTION__, __LINE__);
+
+       // Do we have entries?
+       if (!SQL_HASZERONUMS($result)) {
                // ... and begin loading stuff
                while ($content = SQL_FETCHARRAY($result)) {
                        // Transfer some data
@@ -1873,27 +1653,16 @@ function generateCategoryOptionsList ($mode) {
                        $CATS['name'][] = $content['cat'];
 
                        // Check which users are in this category
-                       $result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s",
+                       $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
-                       $userid_cnt = 0;
-                       // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-                       while (list($ucat) = SQL_FETCHROW($result_userids)) {
-                               $result_ver = SQL_QUERY_ESC("SELECT
-       `userid`
-FROM
-       `{?_MYSQL_PREFIX?}_user_data`
-WHERE
-       `userid`=%s AND `status`='CONFIRMED' AND `receive_mails` > 0".runFilterChain('exclude_users', $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
-                               $userid_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
@@ -1914,7 +1683,7 @@ LIMIT 1",
                } // END - foreach
        } else {
                // No cateogries are defined yet
-               $OUT = '<option class="member_failed">{--MEMBER_NO_CATS--}</option>';
+               $OUT = '<option class="notice">{--MEMBER_NO_CATEGORIES--}</option>';
        }
 
        // Return HTML code
@@ -1936,7 +1705,7 @@ 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
@@ -1997,7 +1766,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
@@ -2005,12 +1774,12 @@ 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 = sprintf(" AND c.cat_id=%s", $cat);
+               $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 (getExtensionVersion('holiday') >= '0.1.3') {
+       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                // Add something for the holiday extension
                $CAT_WHERE .= " AND d.`holiday_active`='N'";
        } // END - if
@@ -2048,71 +1817,9 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
        return $receiverList;
 }
 
-// Get timestamp for given stats type and data
-function getTimestampFromUserStats ($type, $data, $userid = 0) {
-       // Default timestamp is zero
-       $stamp = 0;
-
-       // User id set?
-       if ((isMemberIdSet()) && ($userid == 0)) {
-               $userid = getMemberId();
-       } // END - if
-
-       // Is the extension installed and updated?
-       if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('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($userid),
-                       $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 ($userid, $type, $data) {
-       // Is the extension installed and updated?
-       if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('sql_patches', '0.5.6'))) {
-               // Return zero here
-               return false;
-       } // END - if
-
-       // Does it exist?
-       if ((!getTimestampFromUserStats($type, $data, $userid)) && (!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($userid), $type, $data), __FUNCTION__, __LINE__);
-       } elseif (is_array($data)) {
-               // Invalid data!
-               logDebugMessage(__FUNCTION__, __LINE__, "userid={$userid},type={$type},data={".gettype($data).": Invalid statistics data type!");
-       }
-}
-
 // "Getter" for array for user refs and points in given level
 function getUserReferalPoints ($userid, $level) {
-       //* DEBUG: */ print("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
+       //* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">'.__FUNCTION__.' - ENTRY</font> ------------------------<ul><li>');
        // Default is no refs and no nickname
        $add = '';
        $refs = array();
@@ -2137,24 +1844,25 @@ ON
        ur.refid=ud.userid
 WHERE
        ur.userid=%s AND ur.level=%s
-ORDER BY ur.refid ASC",
+ORDER BY
+       ur.refid ASC",
                array(
                        bigintval($userid),
                        bigintval($level)
                ), __FUNCTION__, __LINE__);
 
        // Are there some entries?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Fetch all entries
                while ($row = SQL_FETCHARRAY($result)) {
                        // Get total points of this user
-                       $row['points'] = countSumTotalData($row['refid'], 'user_points', 'points') - countSumTotalData($row['refid'], 'user_data', 'used_points');
+                       $row['points'] = getTotalPoints($row['refid']);
 
                        // Get unconfirmed mails
                        $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) {
@@ -2163,12 +1871,12 @@ ORDER BY ur.refid ASC",
                        } // END - if
 
                        // Activity is 'active' by default because if autopurge is not installed
-                       $row['activity'] = getMessage('MEMBER_ACTIVITY_ACTIVE');
+                       $row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}';
 
                        // Is autopurge installed and the user inactive?
-                       if ((isExtensionActive('autopurge')) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online']))  {
+                       if ((isExtensionActive('autopurge')) && ((time() - getApInactiveSince()) >= $row['last_online']))  {
                                // Inactive user!
-                               $row['activity'] = getMessage('MEMBER_ACTIVITY_INACTIVE');
+                               $row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}';
                        } // END - if
 
                        // Remove some entries
@@ -2185,28 +1893,46 @@ ORDER BY ur.refid ASC",
        SQL_FREERESULT($result);
 
        // Return result
-       //* DEBUG: */ print("</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />");
+       //* DEBUG: */ debugOutput('</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",
+       $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) {
+       if (!SQL_HASZERONUMS($result)) {
                // Now load all userids for one big query!
-               // @TODO This can be somehow rewritten
-               $UIDs = array();
-               while (list($userid) = SQL_FETCHROW($result)) {
-                       $UIDs[$userid] = $userid;
+               $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
@@ -2214,10 +1940,31 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 }
 
 // Creates a new task
-function createNewTask ($subject, $notes, $taskType, $userid = 0, $adminId = 0, $strip = true) {
+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, smartAddSlashes($notes)), __FUNCTION__, __LINE__, true, $strip);
+               array(
+                       $adminId,
+                       $userid,
+                       $taskType,
+                       $subject,
+                       $notes
+               ), __FUNCTION__, __LINE__, true, $strip);
+
+       // Return insert id which is the task id
+       return SQL_INSERTID();
+}
+
+// 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]