]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/admin-inc.php
Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...
[mailer.git] / inc / modules / admin / admin-inc.php
index 82b3c4202c8faf5a543e4200dbb8ccbb03c41e81..38a180263d479516d47596ad8aa042dd61ee3e2e 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/31/2003 *
- * ===============                              Last change: 11/23/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/31/2003 *
+ * ===================                          Last change: 11/23/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : admin-inc.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 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-}
+       die();
+} // END - if
 
 // Register an administrator account
-function REGISTER_ADMIN ($user, $md5, $email) {
+function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
        // Login does already exist
-       $ret = "already";
+       $ret = 'already';
 
        // Lookup the admin
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
-               array($user), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+               array($adminLogin), __FUNCTION__, __LINE__);
 
        // Is the entry there?
-       if (SQL_NUMROWS($result) == 0) {
+       if (SQL_HASZERONUMS($result)) {
                // Ok, let's create the admin login
-               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')",
-                       array($user, $md5, $email), __FUNCTION__, __LINE__);
-               $ret = "done";
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`,`password`,`email`) VALUES ('%s', '%s', '%s')",
+                       array(
+                               $adminLogin,
+                               $passHash,
+                               $adminEmail
+                       ), __FUNCTION__, __LINE__);
+
+               // All done
+               $ret = 'done';
        } // END - if
 
        // Free memory
@@ -66,577 +70,573 @@ function REGISTER_ADMIN ($user, $md5, $email) {
        return $ret;
 }
 
-// Only be executed on login procedure!
-function CHECK_ADMIN_LOGIN ($admin_login, $password) {
-       // By default no admin is found
-       $ret = "404";
+// This function will be executed when the admin is not logged in and has submitted his login data
+function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
+       // First of all, no admin login is found, so the admin hash is null
+       $ret = '404';
+       $adminHash = NULL;
 
-       // Get admin id
-       $aid = GET_ADMIN_ID($admin_login);
-
-       // Init array with admin id by default
-       $data = array('aid' => $aid);
-
-       // Is the cache valid?
-       if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
-               // Get password from cache
-               $data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid];
-               $ret = 'pass';
-               incrementConfigEntry('cache_hits');
-
-               // Include more admins data?
-               if (GET_EXT_VERSION('admins') >= '0.7.2') {
-                       // Load them here
-                       $data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid];
-                       $data['last_failure']   = $GLOBALS['cache_array']['admins']['last_failure'][$aid];
-               } // END - if
-       } elseif (!EXT_IS_ACTIVE('cache')) {
-               // Add extra data via filter now
-               $add = runFilterChain('sql_admin_extra_data');
+       // Get admin id from login
+       $adminId = getAdminId($adminLogin);
 
-               // Get password from DB
-               $result = SQL_QUERY_ESC("SELECT password".$add." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                       array($aid), __FUNCTION__, __LINE__);
+       // Continue only with found admin ids
+       if ($adminId > 0) {
+               // Then we need to lookup the login name by getting the admin hash
+               $adminHash = getAdminHash($adminId);
 
-               // Entry found?
-               if (SQL_NUMROWS($result) == 1) {
-                       // Login password found
-                       $ret = 'pass';
+               // If this is fine, we can continue
+               if ($adminHash != '-1') {
+                       // Get admin id and set it as current
+                       setCurrentAdminId($adminId);
 
-                       // Fetch data
-                       $data = SQL_FETCHARRAY($result);
-               } // END - if
+                       // Now, we need to encode the password in the same way the one is encoded in database
+                       $testHash = generateHash($adminPassword, $adminHash);
 
-               // Free result
-               SQL_FREERESULT($result);
-       }
-
-       //* DEBUG: */ echo "*".$data['password']."/".md5($password)."/".$ret."<br />";
-       if ((isset($data['password'])) && (strlen($data['password']) == 32) && ($data['password'] == md5($password))) {
-               // Generate new hash
-               $data['password'] = generateHash($password);
-
-               // Is the sql_patches not installed, than we cannot have a valid hashed password here!
-               if (($ret == 'pass') && ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == ""))) $ret = "done";
-       } elseif ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == "")) {
-               // Old hashing way
-               return $ret;
-       } elseif (!isset($data['password'])) {
-               // Password not found, so no valid login!
-               return $ret;
-       }
-
-       // Generate salt of password
-       define('__SALT', substr($data['password'], 0, -40));
-       $salt = __SALT;
-
-       // Check if password is same
-       //* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*<br >\n";
-       if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) {
-               // Re-hash the plain passord with new random salt
-               $data['password'] = generateHash($password);
-
-               // Do we have 0.7.0 of admins or later?
-               // Remmeber login failures if available
-               if (GET_EXT_VERSION('admins') >= '0.7.2') {
-                       // Store it in session
-                       set_session('mxchange_admin_failures', $data['login_failures']);
-                       set_session('mxchange_admin_last_fail', $data['last_failure']);
-
-                       // Update password and reset login failures
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",
-                               array($data['password'], $aid), __FUNCTION__, __LINE__);
-               } else {
-                       // Update password
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1",
-                               array($data['password'], $aid), __FUNCTION__, __LINE__);
-               }
-
-               // Rebuild cache
-               rebuildCacheFiles('admins', 'admin');
-
-               // Login has failed by default... ;-)
-               $ret = "failed";
-
-               // Password matches so login here
-               if (LOGIN_ADMIN($admin_login, $data['password'])) {
-                       // All done now
-                       $ret = "done";
-               } // END - if
-       } elseif ((empty($salt)) && ($ret == 'pass')) {
-               // Something bad went wrong
-               $ret = "failed";
-       } elseif ($ret == "done") {
-               // Try to login here if we have the old hashing way (sql_patches not installed?)
-               if (!LOGIN_ADMIN($admin_login, $data['password'])) {
-                       // Something went wrong
-                       $ret = "failed";
+                       // If they both match, the login data is valid
+                       if ($testHash == $adminHash) {
+                               // All fine
+                               $ret = 'done';
+                       } else {
+                               // Did not match!
+                               $ret = 'password';
+                       }
                } // END - if
-       }
-
-       // Count login failure if admins extension version is 0.7.0+
-       if (($ret == 'pass') && (GET_EXT_VERSION('admins') >= '0.7.0')) {
-               // Update counter
-               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",
-                       array($aid), __FUNCTION__, __LINE__);
-
-               // Rebuild cache
-               rebuildCacheFiles('admins', 'admin');
        } // END - if
 
-       // Return the result
-       //* DEBUG: */ die("RETURN=".$ret);
-       return $ret;
-}
-
-// Try to login the admin by setting some session/cookie variables
-function LOGIN_ADMIN ($adminLogin, $passHash) {
-       // Reset failure counter on matching admins version
-       if ((GET_EXT_VERSION('admins') >= '0.7.0') && ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == ""))) {
-               // Reset counter on out-dated sql_patches version
-               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
-                       array($adminLogin), __FUNCTION__, __LINE__);
+       // Prepare data array
+       $data = array(
+               'id'         => $adminId,
+               'login'      => $adminLogin,
+               'plain_pass' => $adminPassword,
+               'pass_hash'  => $adminHash
+       );
 
-               // Rebuild cache
-               rebuildCacheFiles('admins', 'admin');
-       } // END - if
+       // Run a special filter
+       runFilterChain('do_admin_login_' . $ret, $data);
 
-       // Now set all session variables and return the result
-       return (
-               (
-                       set_session('admin_md5', generatePassString($passHash))
-               ) && (
-                       set_session('admin_login', $adminLogin)
-               ) && (
-                       set_session('admin_last', time())
-               ) && (
-                       set_session('admin_to', bigintval(REQUEST_POST('timeout')))
-               )
-       );
+       // Return status
+       return $ret;
 }
 
 // Only be executed on cookie checking
-function CHECK_ADMIN_COOKIES ($admin_login, $password) {
-       // By default no admin cookies are found
-       $ret = "404"; $pass = '';
-
-       // Get hash
-       $pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login));
-       if ($pass != "-1") $ret = 'pass';
-
-       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
-
-       // Check if password matches
-       if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
-               // Passwords matches!
-               $ret = "done";
-       }
+function ifAdminCookiesAreValid ($adminLogin, $passHash) {
+       // First of all, no admin login is found
+       $ret = '404';
+
+       // Then we need to lookup the login name by getting the admin hash
+       $adminHash = getAdminHash($adminLogin);
+
+       // If this is fine, we can continue
+       if ($adminHash != '-1') {
+               // Now, we need to encode the password in the same way the one is encoded in database
+               $testHash = encodeHashForCookie($adminHash);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
+
+               // If they both match, the login data is valid
+               if ($testHash == $passHash) {
+                       // All fine
+                       $ret = 'done';
+               } else {
+                       // Set status
+                       $ret = 'password';
+               }
+       } // END - if
 
-       // Return result
+       // Return status
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret='.$ret);
        return $ret;
 }
 
-//
-function ADMIN_DO_ACTION ($wht) {
-       global $DATA;
-       //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
-
-       // Remove any spaces from variable
-       if (empty($wht)) {
-               // Default admin action is the overview page
-               $wht = "overview";
-       } else {
-               // Compile out some chars
-               $wht = COMPILE_CODE($wht, false, false, false);
-       }
+// Do an admin action
+function doAdminAction () {
+       // Determine correct 'what' value
+       $what = determineWhat();
 
        // Get action value
-       $act = GET_ACTION($GLOBALS['module'], $wht);
+       $action = getActionFromModuleWhat(getModule(), $what);
 
-       // Define admin login name and ID number
-       define('__ADMIN_LOGIN', get_session('admin_login'));
-       define('__ADMIN_ID'   , GET_CURRENT_ADMIN_ID());
-
-       // Preload templates
-       if (EXT_IS_ACTIVE('admins')) {
-               define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome_admins", true));
+       // Load welcome template
+       if (isExtensionActive('admins')) {
+               // @TODO This and the next getCurrentAdminId() call might be moved into the templates?
+               $content['welcome'] = loadTemplate('admin_welcome_admins', true, getCurrentAdminId());
        } else {
-               define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome", true));
+               $content['welcome'] = loadTemplate('admin_welcome', true, getCurrentAdminId());
        }
-       define('__ADMIN_FOOTER' , LOAD_TEMPLATE("admin_footer" , true));
-       define('__ADMIN_MENU'   , ADD_ADMIN_MENU($act, $wht, true));
 
-       // Tableset header
-       LOAD_TEMPLATE("admin_main_header");
+       // Load header, footer, render menu
+       $content['header'] = loadTemplate('admin_header' , true, $content);
+       $content['footer'] = loadTemplate('admin_footer' , true, $content);
+       $content['menu']   = addAdminMenu($action, $what);
+
+       // Load main template
+       loadTemplate('admin_main', false, $content);
 
        // Check if action/what pair is valid
-       $result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu`
-WHERE `action`='%s' AND ((`what`='%s' AND what != 'overview') OR ((`what`='' OR `what` IS NULL) AND '%s'='overview'))
-LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__);
+       $result_action = SQL_QUERY_ESC("SELECT
+       `id`
+FROM
+       `{?_MYSQL_PREFIX?}_admin_menu`
+WHERE
+       `action`='%s' AND
+       (
+               (
+                       `what`='%s' AND `what` != 'welcome'
+               ) OR (
+                       (
+                               `what`='' OR `what` IS NULL
+                       ) AND (
+                               '%s'='welcome'
+                       )
+               )
+       )
+LIMIT 1",
+               array(
+                       $action,
+                       $what,
+                       $what
+               ), __FUNCTION__, __LINE__);
+
+       // Is there an entry?
        if (SQL_NUMROWS($result_action) == 1) {
                // Is valid but does the inlcude file exists?
-               $INC = sprintf("inc/modules/admin/action-%s.php", $act);
-               if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION('admin', $act, $wht)) && ($GLOBALS['acl_allow'] === true)) {
+               $inc = sprintf("inc/modules/admin/action-%s.php", $action);
+               if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) {
                        // Ok, we finally load the admin action module
-                       LOAD_INC($INC);
+                       loadInclude($inc);
                } elseif ($GLOBALS['acl_allow'] === false) {
                        // Access denied
-                       LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED'));
-                       addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACCESS_DENIED'));
+                       loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
                } else {
-                       // Include file not found! :-(
-                       LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act));
-                       addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_404'), $act);
+                       // Include file not found :-(
+                       loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
                }
        } else {
-               // Invalid action/what pair found!
-               LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht));
-               addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht);
+               // Invalid action/what pair found
+               loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
        }
 
        // Free memory
        SQL_FREERESULT($result_action);
 
        // Tableset footer
-       LOAD_TEMPLATE("admin_main_footer");
+       loadTemplate('admin_main_footer', false, $content);
 }
 
-//
-function ADD_ADMIN_MENU ($act, $wht, $return=false) {
+/**
+ * Checks whether current admin is allowed to access given action/what
+ * combination (only one is allowed to be null!).
+ */
+function isAdminAllowedAccessMenu ($action, $what = NULL) {
+       // Is there cache?
+       if (!isset($GLOBALS[__FUNCTION__][$action][$what])) {
+               // ACL is always 'allow' when no ext-admins is installed
+               // @TODO This can be rewritten into a filter
+               $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || ((isExtensionActive('admins')) && (isAdminsAllowedByAcl($action, $what))));
+       } // END - if
+
+       // Return the cached value
+       return $GLOBALS[__FUNCTION__][$action][$what];
+}
+
+// Adds an admin menu
+function addAdminMenu ($action, $what) {
        // Init variables
        $SUB = false;
        $OUT = '';
 
        // Menu descriptions
        $GLOBALS['menu']['description'] = array();
-       $GLOBALS['menu']['title'] = array();
-
-       // Is there a cache instance?
-       if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) {
-               // Create cache name
-               $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
-
-               // Is that cache there?
-               if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) {
-                       // Then load it
-                       $data = $GLOBALS['cache_instance']->getArrayFromCache();
-
-                       // Extract all parts
-                       $OUT = base64_decode($data['output'][0]);
-                       $GLOBALS['menu']['title'] = unserialize(base64_decode($data['title'][0]));
-                       $GLOBALS['menu']['description'] = unserialize(base64_decode($data['descr'][0]));
-
-                       // Return or output content?
-                       if ($return === true) {
-                               return $OUT;
-                       } else {
-                               OUTPUT_HTML($OUT);
-                       }
-               } // END - if
-       } // END - if
+       $GLOBALS['menu']['title']       = array();
 
        // Build main menu
-       $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
-       if (SQL_NUMROWS($result_main) > 0) {
-               $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
-<tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
-               // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-               while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
-                       if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) {
-                               $ACL = ADMINS_CHECK_ACL($menu, '');
-                       } else {
-                               // ACL is "allow"... hmmm
-                               $ACL = true;
-                       }
-
-                       if ($ACL === true) {
-                               if (!$SUB) {
+       $result_main = SQL_QUERY("SELECT
+       `action` AS `main_action`,
+       `title` AS `main_title`,
+       `descr` AS `main_descr`
+FROM
+       `{?_MYSQL_PREFIX?}_admin_menu`
+WHERE
+       (`what`='' OR `what` IS NULL)
+ORDER BY
+       `sort` ASC,
+       `id` DESC", __FUNCTION__, __LINE__);
+
+       // Are there entries?
+       if (!SQL_HASZERONUMS($result_main)) {
+               $OUT .= '<ul class="admin_menu_main">';
+
+               // Load all 'action' menus
+               while ($mainContent = SQL_FETCHARRAY($result_main)) {
+                       // Filename
+                       $inc = sprintf("inc/modules/admin/action-%s.php", $mainContent['main_action']);
+
+                       // Is the current admin allowed to access this 'action' menu?
+                       if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
+                               if ($SUB === false) {
                                        // Insert compiled menu title and description
-                                       $GLOBALS['menu']['title'][$menu]      = $title;
-                                       $GLOBALS['menu']['description'][$menu] = $descr;
-                               }
-                               $OUT .= "<tr>
-       <td class=\"admin_menu\" colspan=\"2\">
-               <div class=\"nobr\">&nbsp;<strong>&middot;</strong>&nbsp;";
+                                       $GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
+                                       $GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
+                               } // END - if
+                               $OUT .= '<li class="admin_menu"' . addJavaScriptMenuContent('admin', $mainContent['main_action'], $action, $what) . '>
+<div class="nobr"><strong>&middot;</strong>&nbsp;';
 
-                               if (($menu == $act) && (empty($wht))) {
-                                       $OUT .= "<strong>";
+                               // Is the file readable?
+                               if (isIncludeReadable($inc)) {
+                                       if (($mainContent['main_action'] == $action) && (empty($what))) {
+                                               $OUT .= '<strong>';
+                                       } else {
+                                               $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $mainContent['main_action'] . '%}">';
+                                       }
                                } else {
-                                       $OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;action=".$menu."\">";
+                                       $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $mainContent['main_action'] . '%}">';
                                }
 
-                               $OUT .= $title;
+                               $OUT .= $mainContent['main_title'];
 
-                               if (($menu == $act) && (empty($wht))) {
-                                       $OUT .= "</strong>";
+                               // Is the file readable?
+                               if (isIncludeReadable($inc)) {
+                                       if (($mainContent['main_action'] == $action) && (empty($what))) {
+                                               $OUT .= '</strong>';
+                                       } else {
+                                               $OUT .= '</a>]';
+                                       }
                                } else {
-                                       $OUT .= "</a>]";
+                                       $OUT .= '</span>';
                                }
 
-                               $OUT .= "</div></td>
-</tr>\n";
-
-                               // Check for menu entries
-                               $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC",
-                                       array($menu), __FUNCTION__, __LINE__);
-
-                               // Remember the count for later checks
-                               setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)));
-
-                               // Do we have entries?
-                               if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
-                                       $GLOBALS['menu']['description'] = array();
-                                       $GLOBALS['menu']['title'] = array(); $SUB = true;
-                                       $OUT .= "<tr>
-       <td width=\"10\" class=\"seperator\">&nbsp;</td>
-       <td class=\"admin_menu\">
-               <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
-                                       // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-                                       while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
-                                               // Filename
-                                               $INC = sprintf("inc/modules/admin/what-%s.php", $wht_sub);
-                                               if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) {
-                                                       $ACL = ADMINS_CHECK_ACL("", $wht_sub);
+                               $OUT .= '</div>
+</li>';
+
+                               // Add sub menu
+                               $OUT .= addAdminSubMenu($mainContent, $action, $what);
+                       } // END - if
+               } // END - while
+
+               // Close ul-tag
+               $OUT .= '</ul>';
+
+               // Free memory
+               SQL_FREERESULT($result_main);
+       } // END - if
+
+       // Return content
+       return $OUT;
+}
+
+// Add admin sub menu
+function addAdminSubMenu ($mainContent, $action, $what) {
+       // Init content
+       $OUT = '';
+
+       // Check for menu entries
+       $result_what = SQL_QUERY_ESC("SELECT
+       `what` AS `sub_what`,
+       `title` AS `sub_title`,
+       `descr` AS `sub_descr`
+FROM
+       `{?_MYSQL_PREFIX?}_admin_menu`
+WHERE
+       `action`='%s' AND
+       `what` != '' AND
+       `what` IS NOT NULL
+ORDER BY
+       `sort` ASC,
+       `id` DESC",
+               array($mainContent['main_action']), __FUNCTION__, __LINE__);
+
+       // Remember the count for later checks
+       setAdminMenuHasEntries($mainContent['main_action'], ((!SQL_HASZERONUMS($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+
+       // Start li-tag for sub menu content
+       $OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
+
+       // Are there entries?
+       if (ifAdminMenuHasEntries($mainContent['main_action'])) {
+               // Sub menu has been called
+               $SUB = true;
+
+               // Are there entries?
+               if (!SQL_HASZERONUMS($result_what)) {
+                       // Start HTML code
+                       $OUT .= '<ul class="admin_menu_sub">';
+
+                       // Load all entries
+                       while ($subContent = SQL_FETCHARRAY($result_what)) {
+                               // Filename
+                               $inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
+
+                               // Is the current admin allowed to access this 'what' menu?
+                               if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
+                                       // Insert compiled title and description
+                                       $GLOBALS['menu']['title'][$subContent['sub_what']]       = $subContent['sub_title'];
+                                       $GLOBALS['menu']['description'][$subContent['sub_what']] = $subContent['sub_descr'];
+                                       $OUT .= '<li class="admin_menu">
+<div class="nobr"><strong>--&gt;</strong>&nbsp;';
+
+                                       // Is the file readable?
+                                       if (isIncludeReadable($inc)) {
+                                               if ($what == $subContent['sub_what']) {
+                                                       $OUT .= '<strong>';
                                                } else {
-                                                       // ACL is "allow"... hmmm
-                                                       $ACL = true;
+                                                       $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $subContent['sub_what'] . '%}">';
                                                }
+                                       } else {
+                                               $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $subContent['sub_what'] . '%}">';
+                                       }
+
+                                       $OUT .= $subContent['sub_title'];
 
-                                               // Is the file readable?
-                                               $readable = INCLUDE_READABLE($INC);
-
-                                               // Access allowed?
-                                               if ($ACL === true) {
-                                                       // Insert compiled title and description
-                                                       $GLOBALS['menu']['title'][$wht_sub]      = $title_what;
-                                                       $GLOBALS['menu']['description'][$wht_sub] = $desc_what;
-                                                       $OUT .= "<tr>
-       <td class=\"admin_menu\" colspan=\"2\">
-               <div class=\"nobr\">&nbsp;<strong>--&gt;</strong>&nbsp;";
-                                                       if ($readable === true) {
-                                                               if ($wht == $wht_sub) {
-                                                                       $OUT .= "<strong>";
-                                                               } else {
-                                                                       $OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht_sub."\">";
-                                                               }
-                                                       } else {
-                                                               $OUT .= "<i class=\"admin_note\">";
-                                                       }
-
-                                                       $OUT .= $title_what;
-
-                                                       if ($readable === true) {
-                                                               if ($wht == $wht_sub) {
-                                                                       $OUT .= "</strong>";
-                                                               } else {
-                                                                       $OUT .= "</a>]";
-                                                               }
-                                                       } else {
-                                                               $OUT .= "</em>";
-                                                       }
-                                                       $OUT .= "</div></td>
-</tr>\n";
+                                       // Is the file readable?
+                                       if (isIncludeReadable($inc)) {
+                                               if ($what == $subContent['sub_what']) {
+                                                       $OUT .= '</strong>';
+                                               } else {
+                                                       $OUT .= '</a>]';
                                                }
+                                       } else {
+                                               $OUT .= '</span>';
                                        }
+                                       $OUT .= '</div>
+</li>';
+                               } // END - if
+                       } // END - while
 
-                                       // Free memory
-                                       SQL_FREERESULT($result_what);
-                                       $OUT .= "    </table>
-       </td>
-</tr>\n";
-                               }
-
-                               $OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
-                       }
-               }
+                       // Finish HTML output
+                       $OUT .= '</ul>';
+               } // END - if
 
                // Free memory
-               SQL_FREERESULT($result_main);
-               $OUT .= "</table>\n";
-       }
+               SQL_FREERESULT($result_what);
+       } // END - if
 
-       // Is there a cache instance again?
-       if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) {
-               // Init cache
-               $GLOBALS['cache_instance']->init($cacheName);
+       // Close li-tag
+       $OUT .= '</li>';
 
-               // Prepare cache data
-               $data = array(
-                       'output' => base64_encode($OUT),
-                       'title'  => $GLOBALS['menu']['title'],
-                       'descr'  => $GLOBALS['menu']['description']
-               );
+       // Return content
+       return $OUT;
+}
 
-               // Write the data away
-               $GLOBALS['cache_instance']->addRow($data);
+// Create an admin selection box form
+function addAdminSelectionBox ($adminId = NULL, $special = '') {
+       // Default is email as "special column"
+       $ADD = ',`email` AS `special`';
 
-               // Close cache
-               $GLOBALS['cache_instance']->finalize();
+       // Is a special column given?
+       if (!empty($special)) {
+               // Additional column for SQL query
+               $ADD = ',`' . $special . '` AS `special`';
        } // END - if
 
-       // Return or output content?
-       if ($return === true) {
-               return $OUT;
-       } else {
-               OUTPUT_HTML($OUT);
-       }
+       // Query all entries
+       $result = SQL_QUERY('SELECT
+       `id`,
+       `login`
+       ' . $ADD . '
+FROM
+       `{?_MYSQL_PREFIX?}_admins`
+ORDER BY
+       `login` ASC', __FUNCTION__, __LINE__);
+
+       // Init output
+       $OUT = '';
+
+       // Load all entries
+       while ($content = SQL_FETCHARRAY($result)) {
+               // Add the entry
+               $OUT .= loadTemplate('select_admins_option', true, $content);
+       } // END - if
+
+       // Free memory
+       SQL_FREERESULT($result);
+
+       // Add form to content
+       $content['form_selection'] = $OUT;
+
+       // Output form
+       loadTemplate('select_admins_box', false, $content);
 }
 
-// Create member selection box
-function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field='userid') {
+// Create member selection box
+function addMemberSelectionBox ($userid = NULL, $add_all = false, $return = false, $none = false, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
        // Output selection form with all confirmed user accounts listed
-       $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY userid", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY('SELECT
+       `userid`,
+       `surname`,
+       `family`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+' . $whereStatement . '
+ORDER BY
+       `userid` ASC', __FUNCTION__, __LINE__);
 
        // Default output
        $OUT = '';
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )
-       if ($add_all === true)   $OUT = "      <option value=\"all\">{--ALL_MEMBERS--}</option>\n";
-        elseif ($none === true) $OUT = "      <option value=\"0\">{--SELECT_NONE--}</option>\n";
+       if ($add_all === true) {
+               $OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
+       } elseif ($none === true) {
+               $OUT = '      <option value="0">{--SELECT_NONE--}</option>';
+       }
 
+       // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
-               $OUT .= "      <option value=\"".bigintval($content['userid'])."\"";
-               if ($def == $content['userid']) $OUT .= ' selected="selected"';
-               $OUT .= ">".$content['surname']." ".$content['family']." (".bigintval($content['userid']).")</option>\n";
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . intval($userid) . '/' . $content['userid']);
+               $OUT .= '<option value="' . bigintval($content['userid']) . '"';
+               if (bigintval($userid) === bigintval($content['userid'])) {
+                       $OUT .= ' selected="selected"';
+               } // END - if
+               $OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
-       if (!$return) {
+       if ($return === false) {
                // Remeber options in constant
-               // @TODO Rewrite these both constants
-               define('_MEMBER_SELECTION', $OUT);
-
-               // Display selection box
-               define('__LANG_VALUE', GET_LANGUAGE());
+               $content['form_selection'] = $OUT;
+               $content['what']           = '{%pipe,getWhat%}';
 
                // Load template
-               LOAD_TEMPLATE("admin_member_selection_box", false, $GLOBALS['what']);
+               loadTemplate('admin_form_selection_box', false, $content);
        } else {
                // Return content in selection frame
-               return "<select class=\"admin_select\" name=\"".$field."\" size=\"1\">\n".$OUT."</select>\n";
+               return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
        }
 }
 
 // Create a menu selection box for given menu system
-function ADMIN_MENU_SELECTION ($mode, $default="", $defid="") {
-       $wht = "`what` != ''";
-       if ($mode == "action") $wht = "(`what`='' OR `what` IS NULL) AND action !='login'";
-       $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`",
+// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+// @DEPRECATED
+function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
+       $what = "`what` != '' AND `what` IS NOT NULL";
+       if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` != 'login'";
+
+       $result = SQL_QUERY_ESC("SELECT `%s` AS `menu`,`title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
                array($mode), __FUNCTION__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Load menu as selection
-               $OUT = "<select name=\"".$mode."_menu";
-               if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
-               $OUT .= "\" size=\"1\" class=\"admin_select\">
-       <option value=\"\">{--SELECT_NONE--}</option>\n";
-               // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
-               while (list($menu, $title) = SQL_FETCHROW($result)) {
-                       $OUT .= "  <option value=\"".$menu."\"";
-                       if ((!empty($default)) && ($default == $menu)) $OUT .= ' selected="selected"';
-                       $OUT .= ">".$title."</option>\n";
+               $OUT = '<select name="' . $mode . '_menu';
+               if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
+               $OUT .= '" size="1" class="form_select">
+       <option value="">{--SELECT_NONE--}</option>';
+               // Load all entries
+               while ($content = SQL_FETCHARRAY($result)) {
+                       $OUT .= '<option value="' . $content['menu'] . '"';
+                       if ((!empty($default)) && ($default == $content['menu'])) {
+                               $OUT .= ' selected="selected"';
+                       } // END - if
+                       $OUT .= '>' . $content['title'] . '</option>';
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
-               $OUT .= "</select>\n";
+
+               // Add closing select-tag
+               $OUT .= '</select>';
        } else {
                // No menus???
-               $OUT = getMessage('ADMIN_PROBLEM_NO_MENU');
+               $OUT = '{--ADMIN_PROBLEM_NO_MENU--}';
        }
 
        // Return output
        return $OUT;
 }
 
-// Wrapper for $_POST and ADMIN_SAVE_SETTINGS
-function ADMIN_SAVE_SETTINGS_POST () {
+// Wrapper for $_POST and adminSaveSettings
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
        // Get the array
-       $POST = REQUEST_POST_ARRAY();
+       $postData = postRequestArray();
 
        // Call the lower function
-       ADMIN_SAVE_SETTINGS($POST);
+       adminSaveSettings($postData, $tableName, $whereStatement, $translateComma, $alwaysAdd, $displayMessage);
 }
 
 // Save settings to the database
-function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement = "config=0", $translateComma = array(), $alwaysAdd = false) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
        // Prepare all arrays, variables
-       $DATA = array();
+       $tableData = array();
        $skip = false;
 
        // Now, walk through all entries and prepare them for saving
-       foreach ($POST as $id => $val) {
+       foreach ($postData as $id => $val) {
                // Process only formular field but not submit buttons ;)
-               if ($id != "ok") {
-                       // Do not save the ok value
-                       CONVERT_SELECTIONS_TO_TIMESTAMP($POST, $DATA, $id, $skip);
-
-                       // Shall we process this ID? It muss not be empty, of course
-                       if ((!$skip) && (!empty($id))) {
-                               // Save this entry
-                               $val = COMPILE_CODE($val);
-
-                               // Translate the value? (comma to dot!)
-                               if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
-                                       // Then do it here... :)
-                                       $val = REVERT_COMMA($val);
-                               } // END - if
+               if ($id == 'ok') {
+                       // Skip this button
+                       continue;
+               } // END - if
 
-                               // Shall we add numbers or strings?
-                               $test = (float)$val;
-                               if ("".$val."" == "".$test."") {
-                                       // Add numbers
-                                       $DATA[] = sprintf("`%s`=%s", $id, $test);
-                               } else {
-                                       // Add strings
-                                       $DATA[] = sprintf("`%s`='%s'", $id, trim($val));
-                               }
+               // Do not save the ok value
+               convertSelectionsToEpocheTime($postData, $tableData, $id, $skip);
 
-                               // Update current configuration
-                               setConfigEntry($id, $val);
+               // Shall we process this id? It muss not be empty, of course
+               if (($skip === false) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
+                       // Translate the value? (comma to dot!)
+                       if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
+                               // Then do it here... :)
+                               $val = convertCommaToDot($val);
                        } // END - if
+
+                       // Shall we add numbers or strings?
+                       $test = (float) $val;
+                       if ('' . $val . '' == '' . $test . '') {
+                               // Add numbers
+                               array_push($tableData, sprintf("`%s`=%s", $id, $test));
+                       } elseif (is_null($val)) {
+                               // Add NULL
+                               array_push($tableData, sprintf("`%s`=NULL", $id));
+                       } else {
+                               // Add strings
+                               array_push($tableData, sprintf("`%s`='%s'", $id, trim($val)));
+                       }
+
+                       // Do not add a config entry twice
+                       $GLOBALS['skip_config'][$id] = true;
+
+                       // Update current configuration
+                       setConfigEntry($id, $val);
                } // END - if
        } // END - foreach
 
        // Check if entry does exist
        $result = false;
-       if (!$alwaysAdd) {
+       if ($alwaysAdd === false) {
                if (!empty($whereStatement)) {
-                       $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` WHERE ".$whereStatement." LIMIT 1", __FUNCTION__, __LINE__);
+                       $result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
                } else {
-                       $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` LIMIT 1", __FUNCTION__, __LINE__);
+                       $result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` LIMIT 1", __FUNCTION__, __LINE__);
                }
        } // END - if
 
        if (SQL_NUMROWS($result) == 1) {
                // "Implode" all data to single string
-               $DATA_UPDATE = implode(", ", $DATA);
+               $updatedData = implode(', ', $tableData);
 
                // Generate SQL string
-               $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}%s` SET %s WHERE %s LIMIT 1",
+               $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}%s` SET %s WHERE %s LIMIT 1",
                        $tableName,
-                       $DATA_UPDATE,
+                       $updatedData,
                        $whereStatement
                );
        } else {
-               // Add Line (does only work with auto_increment!
-               $KEYs = array(); $VALUEs = array();
-               foreach ($DATA as $entry) {
+               // Add Line (does only work with AUTO_INCREMENT!
+               $keys = array(); $values = array();
+               foreach ($tableData as $entry) {
                        // Split up
-                       $line = explode("=", $entry);
-                       $KEYs[] = $line[0]; $VALUEs[] = $line[1];
+                       $line = explode('=', $entry);
+                       array_push($keys  , $line[0]);
+                       array_push($values, $line[1]);
                } // END - foreach
 
                // Add both in one line
-               $KEYs = implode(", ", $KEYs);
-               $VALUEs = implode(", ", $VALUEs);
+               $keys   = implode('`,`', $keys);
+               $values = implode(', ' , $values);
 
                // Generate SQL string
-               $sql = sprintf("INSERT INTO {!_MYSQL_PREFIX!}%s (%s) VALUES (%s)",
+               $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}%s` (%s) VALUES (%s)",
                        $tableName,
-                       $KEYs,
-                       $VALUEs
+                       $keys,
+                       $values
                );
        }
 
@@ -646,117 +646,154 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
        // Simply run generated SQL string
        SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
+       // Remember affected rows
+       $affected = SQL_AFFECTEDROWS();
+
        // Rebuild cache
-       rebuildCacheFiles("config", "config");
+       rebuildCache('config', 'config');
 
-       // Settings saved
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+       // Settings saved, so display message?
+       if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
+
+       // Return affected rows
+       return $affected;
 }
 
 // Generate a selection box
-function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
+function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
        // Open the requested menu directory
-       $menuArray = GET_DIR_AS_ARRAY(sprintf("inc/modules/%s/", $menu), '', false, false);
+       $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', false, false);
 
        // Init the selection box
-       $OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">
-       <option value=\"\">{--IS_TOP_MENU--}</option>\n";
+       $OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
 
        // Walk through all files
        foreach ($menuArray as $file) {
                // Is this a PHP script?
-               if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) {
+               if ((!isDirectory($file)) && (isInString('' . $type . '-', $file)) && (isInString('.php', $file))) {
                        // Then test if the file is readable
-                       $test = sprintf("%sinc/modules/%s/%s", constant('PATH'), $menu, $file);
+                       $test = sprintf("inc/modules/%s/%s", $menu, $file);
 
                        // Is the file there?
-                       if (FILE_READABLE($test)) {
+                       if (isIncludeReadable($test)) {
                                // Extract the value for what=xxx
                                $part = substr($file, (strlen($type) + 1));
                                $part = substr($part, 0, -4);
 
                                // Is that part different from the overview?
-                               if ($part != "overview") {
-                                       $OUT .= "       <option value=\"".$part."\"";
-                                       if ($part == $default) $OUT .= ' selected="selected"';
-                                       $OUT .= ">".$part."</option>\n";
+                               if ($part != 'welcome') {
+                                       $OUT .= '<option value="' . $part . '"';
+                                       if ($part == $default) {
+                                               $OUT .= ' selected="selected"';
+                                       } // END - if
+                                       $OUT .= '>' . $part . '</option>';
                                } // END - if
                        } // END - if
                } // END - if
        } // END - foreach
 
        // Close selection box
-       $OUT .= "</select>\n";
-       
+       $OUT .= '</select>';
+
        // Return contents
        return $OUT;
 }
 
 // Creates a user-profile link for the admin. This function can also be used for many other purposes
-function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
-       if (($title == "") && ($title != "0")) {
+function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
+       if (($title == '') && (isValidUserId($userid))) {
                // Set userid as title
-               $title = $uid;
-       } // END - if
+               $title = $userid;
+       } elseif (!isValidUserId($userid)) {
+               // User id zero is invalid
+               return '<strong>' . convertNullToZero($userid) . '</strong>';
+       }
 
-       if (($title == "0") && ($wht == "list_refs")) {
+       if (($title == '0') && ($what == 'list_refs')) {
                // Return title again
                return $title;
-       } // END - if
+       } elseif (!empty($title)) {
+               // Not empty, so skip next one
+       } elseif (isExtensionActive('nickname')) {
+               // Get nickname
+               $nick = getNickname($userid);
+
+               // Is it not empty, use it as title else the userid
+               if (!empty($nick)) {
+                       $title = $nick . '(' . $userid . ')';
+               } else {
+                       $title = $userid;
+               }
+       }
 
-       //* DEBUG: */ echo "a:".$title."<br />";
        // Return link
-       return "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht."&amp;uid=".$uid."\" title=\"{--ADMIN_USER_PROFILE_TITLE--}\">".$title."</a>";
+       return '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
 }
 
 // Check "logical-area-mode"
-function ADMIN_CHECK_MENU_MODE () {
-       // Set the global mode as the mode for all admins
-       $mode = getConfig('admin_menu');
-       $ADMIN = $mode;
+function adminGetMenuMode () {
+       // Set the default menu mode as the mode for all admins
+       $mode = 'global';
+
+       // If sql_patches is up-to-date enough, use the configuration
+       if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
+               $mode = getAdminMenu();
+       } // END - if
+
+       // Backup it
+       $adminMode = $mode;
 
        // Get admin id
-       $aid = GET_CURRENT_ADMIN_ID();
+       $adminId = getCurrentAdminId();
 
        // Check individual settings of current admin
-       if (isset($GLOBALS['cache_array']['admins']['la_mode'][$aid])) {
+       if (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) {
                // Load from cache
-               $ADMIN = $GLOBALS['cache_array']['admins']['la_mode'][$aid];
-               incrementConfigEntry('cache_hits');
-       } elseif (GET_EXT_VERSION('admins') >= '0.6.7') {
+               $adminMode = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
+               incrementStatsEntry('cache_hits');
+       } elseif (isExtensionInstalledAndNewer('admins', '0.6.7')) {
                // Load from database when version of 'admins' is enough
-               $result = SQL_QUERY_ESC("SELECT la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                       array($aid), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       array($adminId), __FUNCTION__, __LINE__);
+
+               // Is there an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
-                       list($ADMIN) = SQL_FETCHROW($result);
-               }
+                       list($adminMode) = SQL_FETCHROW($result);
+               } // END - if
 
                // Free memory
                SQL_FREERESULT($result);
        }
 
-       // Check what the admin wants and set it when it's not the global mode
-       if ($ADMIN != "global") $mode = $ADMIN;
+       // Check what the admin wants and set it when it's not the default mode
+       if ($adminMode != 'global') {
+               $mode = $adminMode;
+       } // END - if
 
        // Return admin-menu's mode
        return $mode;
 }
 
 // Change activation status
-function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
-       $cnt = 0; $newStatus = "Y";
+function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
+       $count = '0';
        if ((is_array($IDs)) && (count($IDs) > 0)) {
                // "Walk" all through and count them
                foreach ($IDs as $id => $selected) {
-                       // Secure the ID number
+                       // Secure the id number
                        $id = bigintval($id);
 
                        // Should always be set... ;-)
                        if (!empty($selected)) {
                                // Determine new status
-                               $result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
-                                       array($row, $table, $idRow, $id), __FUNCTION__, __LINE__);
+                               $result = SQL_QUERY_ESC("SELECT %s FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
+                                       array(
+                                               $row,
+                                               $table,
+                                               $idRow,
+                                               $id
+                                       ), __FUNCTION__, __LINE__);
 
                                // Row found?
                                if (SQL_NUMROWS($result) == 1) {
@@ -764,14 +801,20 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                                        list($currStatus) = SQL_FETCHROW($result);
 
                                        // And switch it N<->Y
-                                       if ($currStatus == 'Y') $newStatus = "N"; else $newStatus = "Y";
+                                       $newStatus = convertBooleanToYesNo(!($currStatus == 'Y'));
 
                                        // Change this status
-                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
-                                               array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
+                                               array(
+                                                       $table,
+                                                       $row,
+                                                       $newStatus,
+                                                       $idRow,
+                                                       $id
+                                               ), __FUNCTION__, __LINE__);
 
                                        // Count up affected rows
-                                       $cnt += SQL_AFFECTEDROWS();
+                                       $count += SQL_AFFECTEDROWS();
                                } // END - if
 
                                // Free the result
@@ -780,15 +823,24 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                } // END - foreach
 
                // Output status
-               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs)));
+               displayMessage(sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
        } else {
                // Nothing selected!
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE'));
+               displayMessage('{--ADMIN_NOTHING_SELECTED_CHANGE--}');
        }
 }
 
 // Send mails for del/edit/lock build modes
-function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="") {
+function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '', $userIdColumn = array('userid')) {
+       // $tableName must be an array
+       if ((!is_array($tableName)) || (count($tableName) != 1)) {
+               // $tableName is no array
+               reportBug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+               // $tableName is no array
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } // END - if
+
        // Default subject is the subject part
        $subject = $subjectPart;
 
@@ -799,43 +851,54 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="")
        } // END - if
 
        // Is the raw userid set?
-       if (REQUEST_POST('uid_raw', $id) > 0) {
-               // Generate subject
-               $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
-
+       if (postRequestElement($userIdColumn[0], $id) > 0) {
                // Load email template
                if (!empty($subjectPart)) {
-                       $mail = LOAD_EMAIL_TEMPLATE("member_".$mode."_".strtolower($subjectPart)."_".$table, $content);
+                       $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content);
                } else {
-                       $mail = LOAD_EMAIL_TEMPLATE("member_".$mode."_".$table, $content);
+                       $mail = loadEmailTemplate('member_' . $mode . '_' . $tableName[0], $content);
                }
 
                // Send email out
-               SEND_EMAIL(REQUEST_POST('uid_raw', $id), $subjectLine, $mail);
+               sendEmail(postRequestElement($userIdColumn[0], $id), strtoupper('{--MEMBER_' . $subject . '_' . $tableName[0] . '_SUBJECT--}'), $mail);
        } // END - if
 
        // Generate subject
-       $subjectLine = getMessage('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+       $subject = strtoupper('{--ADMIN_' . $subject . '_' . $tableName[0] . '_SUBJECT--}');
 
        // Send admin notification out
        if (!empty($subjectPart)) {
-               SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".strtolower($subjectPart)."_".$table, $content, REQUEST_POST('uid_raw', $id));
+               sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
        } else {
-               SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".$table, $content, REQUEST_POST('uid_raw', $id));
+               sendAdminNotification($subject, 'admin_' . $mode . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
        }
 }
 
 // Build a special template list
-function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
-       $OUT = ''; $SW = 2;
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+       // $tableName and $idColumn must bove be arrays!
+       if ((!is_array($tableName)) || (count($tableName) != 1)) {
+               // $tableName is no array
+               reportBug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($idColumn)) {
+               // $idColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+               // $tableName is no array
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       }
+
+       // Init row output
+       $OUT = '';
 
        // "Walk" through all entries
-       foreach ($IDs as $id => $selected) {
-               // Secure ID number
+       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,idColumn=<pre>'.print_r($idColumn,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
+       foreach (postRequestElement($idColumn[0]) as $id => $selected) {
+               // Secure id number
                $id = bigintval($id);
 
                // Get result from a given column array and table name
-               $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idColumn, $id, __FUNCTION__, __LINE__);
+               $result = SQL_RESULT_FROM_ARRAY($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__);
 
                // Is there one entry?
                if (SQL_NUMROWS($result) == 1) {
@@ -845,30 +908,61 @@ function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions,
                        // Filter all data
                        foreach ($content as $key => $value) {
                                // Search index
-                               $idx = array_search($key, $columns, true);
+                               $idx = searchXmlArray($key, $columns, 'column');
+
+                               // Skip any missing entries
+                               if ($idx === false) {
+                                       // Skip this one
+                                       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
+                                       continue;
+                               } // END - if
 
-                               // Do we have a userid?
-                               if ($key == 'userid') {
+                               // Is there a userid?
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
+                               if ($key == $userIdColumn[0]) {
                                        // Add it again as raw id
-                                       $content['uid'] = bigintval($value);
+                                       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
+                                       $content[$userIdColumn[0]] = convertZeroToNull($value);
+                                       $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
                                } // END - if
 
-                               // Handle the call in external function
-                               $content[$key] = HANDLE_EXTRA_VALUES($filterFunctions[$idx], $value, $extraValues[$idx]);
-                       } // END - foreach
+                               // If the key matches the idColumn variable, we need to temporary remember it
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn=' . $idColumn[0] . ',value=' . $value);
+                               if ($key == $idColumn[0]) {
+                                       /*
+                                        * Found, so remember it securely (to make sure only id
+                                        * numbers can pass, don't use alpha-numerical values!)
+                                        */
+                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' - set as admin_list_builder_id_value!');
+                                       $GLOBALS['admin_list_builder_id_value'] = bigintval($value);
+                               } // END - if
 
-                       // Add color switching
-                       $content['sw'] = $SW;
+                               // Is there a call-back function and extra-value pair?
+                               if ((isset($filterFunctions[$idx])) && (isset($extraValues[$idx]))) {
+                                       // Handle the call in external function
+                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
+                                       $content[$key] = handleExtraValues(
+                                               $filterFunctions[$idx],
+                                               $value,
+                                               $extraValues[$idx]
+                                       );
+                               } elseif ((isset($columns[$idx]['name'])) && (isset($filterFunctions[$columns[$idx]['name']])) && (isset($extraValues[$columns[$idx]['name']]))) {
+                                       // Handle the call in external function
+                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$columns[$idx]['name']] . ',value=' . $value);
+                                       $content[$key] = handleExtraValues(
+                                               $filterFunctions[$columns[$idx]['name']],
+                                               $value,
+                                               $extraValues[$columns[$idx]['name']]
+                                       );
+                               }
+                       } // END - foreach
 
                        // Then list it
-                       $OUT .= LOAD_TEMPLATE(sprintf("admin_%s_%s_row",
-                                       $listType,
-                                       $table
+                       $OUT .= loadTemplate(sprintf("admin_%s_%s_row",
+                               $listType,
+                               $tableName[0]
                                ), true, $content
                        );
-
-                       // Switch color
-                       $SW = 3 - $SW;
                } // END - if
 
                // Free the result
@@ -876,299 +970,400 @@ function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions,
        } // END - foreach
 
        // Load master template
-       LOAD_TEMPLATE(sprintf("admin_%s_%s",
-                       $listType,
-                       $table
+       loadTemplate(sprintf("admin_%s_%s",
+               $listType,
+               $tableName[0]
                ), false, $OUT
        );
 }
 
 // Change status of "build" list
-function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray) {
-       // All valid entries? (We hope so here!)
-       if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
-               // "Walk" through all entries
-               foreach ($IDs as $id => $sel) {
-                       // Construct SQL query
-                       $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_%s` SET",
-                               SQL_ESCAPE($table)
-                       );
-
-                       // Load data of entry
-                       $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
-                               array($table, $idColumn, $id), __FUNCTION__, __LINE__);
+function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $rawUserId = array('userid'), $cacheFiles = array()) {
+       // $tableName must be an array
+       if ((!is_array($tableName)) || (count($tableName) != 1)) {
+               // No tableName specified
+               reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($idColumn)) {
+               // $idColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+               // $tableName is no array
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } // END - if
 
-                       // Fetch the data
-                       $content = SQL_FETCHARRAY($result);
+       // "Walk" through all entries
+       foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+               // Construct SQL query
+               $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
 
-                       // Free the result
-                       SQL_FREERESULT($result);
+               // Load data of entry
+               $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+                       array(
+                               $tableName[0],
+                               $idColumn[0],
+                               $id
+                       ), __FUNCTION__, __LINE__);
 
-                       // Add all status entries (e.g. status column last_updated or so)
-                       $newStatus = "UNKNOWN";
-                       $oldStatus = "UNKNOWN";
-                       $statusColumn = "unknown";
-                       foreach ($statusArray as $column => $statusInfo) {
-                               // Does the entry exist?
-                               if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
-                                       // Add these entries for update
-                                       $sql .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
-
-                                       // Remember status
-                                       if ($statusColumn == "unknown") {
-                                               // Always (!!!) change status column first!
-                                               $oldStatus = $content[$column];
-                                               $newStatus = $statusInfo[$oldStatus];
-                                               $statusColumn = $column;
-                                       } // END - if
-                               } elseif (isset($content[$column])) {
-                                       // Unfinished!
-                                       app_die(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
-                               }
-                       } // END - foreach
+               // Fetch the data
+               $content = SQL_FETCHARRAY($result);
 
-                       // Add other columns as well
-                       foreach (REQUEST_POST_ARRAY() as $key => $entries) {
-                               // Skip id, raw userid and 'do_$mode'
-                               if (!in_array($key, array($idColumn, 'uid_raw', ('do_'.$mode)))) {
-                                       // Are there brackets () at the end?
-                                       if (substr($entries[$id], -2, 2) == "()") {
-                                               // Direct SQL command found
-                                               $sql .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
-                                       } else {
-                                               // Add regular entry
-                                               $sql .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+               // Free the result
+               SQL_FREERESULT($result);
 
-                                               // Add entry
-                                               $content[$key] = $entries[$id];
-                                       }
+               // Add all status entries (e.g. status column last_updated or so)
+               $newStatus = 'UNKNOWN';
+               $oldStatus = 'UNKNOWN';
+               $statusColumn = 'unknown';
+               foreach ($statusArray as $column => $statusInfo) {
+                       // Does the entry exist?
+                       if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
+                               // Add these entries for update
+                               $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
+
+                               // Remember status
+                               if ($statusColumn == 'unknown') {
+                                       // Always (!!!) change status column first!
+                                       $oldStatus = $content[$column];
+                                       $newStatus = $statusInfo[$oldStatus];
+                                       $statusColumn = $column;
                                } // END - if
-                       } // END - foreach
+                       } elseif (isset($content[$column])) {
+                               // Unfinished!
+                               reportBug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
+                       }
+               } // END - foreach
 
-                       // Finish SQL statement
-                       $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
-                               $idColumn,
-                               bigintval($id),
-                               $statusColumn,
-                               $oldStatus
-                       );
+               // Add other columns as well
+               foreach (postRequestArray() as $key => $entries) {
+                       // Debug message
+                       logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
+
+                       // Skip id, raw userid and 'do_$mode'
+                       if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
+                               // Are there brackets () at the end?
+                               if (substr($entries[$id], -2, 2) == '()') {
+                                       // Direct SQL command found
+                                       $sql .= sprintf(" `%s`=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+                               } else {
+                                       // Add regular entry
+                                       $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
 
-                       // Run the SQL
-                       SQL_QUERY($sql, __FUNCTION__, __LINE__);
+                                       // Add entry
+                                       $content[$key] = $entries[$id];
+                               }
+                       } else {
+                               // Skipped entry
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
+                       }
+               } // END - foreach
 
-                       // Do we have an URL?
-                       if (isset($content['url'])) {
-                               // Then add a framekiller test as well
-                               $content['frametester'] = FRAMETESTER($content['url']);
-                       } // END - if
+               // Finish SQL statement
+               $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
+                       $idColumn[0],
+                       bigintval($id),
+                       $statusColumn,
+                       $oldStatus
+               );
 
-                       // Send "build mails" out
-                       ADMIN_SEND_BUILD_MAILS($mode, $table, $content, $id, $statusInfo[$content[$column]]);
-               } // END - foreach
-       } // END - if
+               // Run the SQL
+               SQL_QUERY($sql, __FUNCTION__, __LINE__);
+
+               // Send "build mails" out
+               sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+       } // END - foreach
 }
 
-// Delete rows by given ID numbers
-function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn="id", $userIdColumn='userid') {
-       // All valid entries? (We hope so here!)
-       if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
-               // Shall we delete here or list for deletion?
-               if ($deleteNow) {
-                       // The base SQL command:
-                       $sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s IN (%s)";
-
-                       // Delete them all
-                       $idList = '';
-                       foreach ($IDs as $id => $sel) {
-                               // Is there a userid?
-                               if (REQUEST_ISSET_POST('uid_raw', $id)) {
-                                       // Load all data from that id
-                                       $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
-                                               array($table, $idColumn, $id), __FUNCTION__, __LINE__);
-
-                                       // Fetch the data
-                                       $content = SQL_FETCHARRAY($result);
-
-                                       // Free the result
-                                       SQL_FREERESULT($result);
-
-                                       // Send "build mails" out
-                                       ADMIN_SEND_BUILD_MAILS("del", $table, $content, $id);
-                               } // END - if
+// Delete rows by given id numbers
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+       // $tableName must be an array
+       if ((!is_array($tableName)) || (count($tableName) != 1)) {
+               // No tableName specified
+               reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($idColumn)) {
+               // $idColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($userIdColumn)) {
+               // $userIdColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($deleteNow)) {
+               // $deleteNow is no array
+               reportBug(__FUNCTION__, __LINE__, 'deleteNow[]=' . gettype($deleteNow) . '!=array: userIdColumn=' . $userIdColumn);
+       } // END - if
 
-                               // Add id number
-                               $idList .= $id.",";
-                       } // END - foreach
+       // Shall we delete here or list for deletion?
+       if ($deleteNow[0] === true) {
+               // The base SQL command:
+               $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
 
-                       // Run the query
-                       SQL_QUERY($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+               // Delete them all
+               $idList = '';
+               foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+                       // Is there a userid?
+                       if (isPostRequestElementSet($rawUserId[0], $id)) {
+                               // Load all data from that id
+                               $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+                                       array(
+                                               $tableName[0],
+                                               $idColumn[0],
+                                               $id
+                                       ), __FUNCTION__, __LINE__);
 
-                       // Was this fine?
-                       if (SQL_AFFECTEDROWS() == count($IDs)) {
-                               // All deleted
-                               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_REMOVED'));
-                       } else {
-                               // Some are still there :(
-                               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
-                       }
+                               // Fetch the data
+                               $content = SQL_FETCHARRAY($result);
+
+                               // Free the result
+                               SQL_FREERESULT($result);
+
+                               // Send "build mails" out
+                               sendAdminBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
+                       } // END - if
+
+                       // Add id number
+                       $idList .= $id . ',';
+               } // END - foreach
+
+               // Run the query
+               SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+
+               // Was this fine?
+               if (SQL_AFFECTEDROWS() == countPostSelection($idColumn[0])) {
+                       // All deleted
+                       displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
                } else {
-                       // List for deletion confirmation
-                       ADMIN_BUILD_LIST("del", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+                       // Some are still there :(
+                       displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), countPostSelection($idColumn[0])));
                }
-       } // END - if
+       } else {
+               // List for deletion confirmation
+               adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+       }
 }
 
-// Edit rows by given ID numbers
-function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn="id", $userIdColumn='userid') {
-       // All valid entries? (We hope so here!)
-       if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
-               // Shall we change here or list for editing?
-               if ($editNow) {
-                       // Change them all
-                       $affected = 0;
-                       foreach ($IDs as $id => $sel) {
-                               // Prepare content array (new values)
-                               $content = array();
-
-                               // Prepare SQL for this row
-                               $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_ SET",
-                                       SQL_ESCAPE($table)
-                               );
-                               foreach (REQUEST_POST_ARRAY() as $key => $entries) {
-                                       // Skip raw userid which is always invalid
-                                       if ($key == "uid_raw") {
-                                               // Continue with next field
-                                               continue;
-                                       } // END - if
+// Edit rows by given id numbers
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+       // $tableName must be an array
+       if ((!is_array($tableName)) || (count($tableName) != 1)) {
+               // No tableName specified
+               reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($idColumn)) {
+               // $idColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($userIdColumn)) {
+               // $userIdColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($editNow)) {
+               // $editNow is no array
+               reportBug(__FUNCTION__, __LINE__, 'editNow[]=' . gettype($editNow) . '!=array: userIdColumn=' . $userIdColumn);
+       } // END - if
+
+       // Shall we change here or list for editing?
+       if ($editNow[0] === true) {
+               // Change them all
+               $affected = '0';
+               foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+                       // Prepare content array (new values)
+                       $content = array();
+
+                       // Prepare SQL for this row
+                       $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
+                               SQL_ESCAPE($tableName[0])
+                       );
 
-                                       // Is entries an array?
-                                       if (($key != $idColumn) && (is_array($entries)) && (isset($entries[$id]))) {
-                                               // Add this entry to content
-                                               $content[$key] = $entries[$id];
+                       // "Walk" through all entries
+                       foreach (postRequestArray() as $key => $entries) {
+                               // Skip raw userid which is always invalid
+                               if ($key == $rawUserId[0]) {
+                                       // Continue with next field
+                                       //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',rawUserId=' . $rawUserId[0]);
+                                       continue;
+                               } // END - if
 
-                                               // Send data through the filter function if found
-                                               if ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
-                                                       // Filter function set!
-                                                       $entries[$id] = HANDLE_EXTRA_VALUES($filterFunctions[$key], $entries[$id], $extraValues[$key]);
-                                               } // END - if
+                               // Debug message
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,true).'</pre>');
+
+                               // Is entries an array?
+                               if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
+                                       // Add this entry to content
+                                       $content[$key] = $entries[$id];
+
+                                       // Send data through the filter function if found
+                                       if ($key == $userIdColumn[0]) {
+                                               // Is the userid, we have to process it with convertZeroToNull()
+                                               $entries[$id] = convertZeroToNull($entries[$id]);
+                                       } elseif ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
+                                               // Filter function set!
+                                               $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
+                                       }
 
-                                               // Then add this value
-                                               $sql .= sprintf(" %s='%s',",
+                                       // Is the value NULL?
+                                       if ($entries[$id] == 'NULL') {
+                                               // Add it directly
+                                               $sql .= sprintf(' `%s`=NULL,',
+                                                       SQL_ESCAPE($key)
+                                               );
+                                       } else {
+                                               // Else add the value covered
+                                               $sql .= sprintf(" `%s`='%s',",
                                                        SQL_ESCAPE($key),
                                                        SQL_ESCAPE($entries[$id])
                                                );
-                                       } elseif (($key != $idColumn) && (!is_array($entries))) {
-                                               // Add normal entries as well!
-                                               $content[$key] =  $entries;
                                        }
+                               } elseif (($key != $idColumn[0]) && (!is_array($entries))) {
+                                       // Add normal entries as well!
+                                       $content[$key] =  $entries;
+                               }
+                       } // END - foreach
 
-                                       // Do we have an URL?
-                                       if ($key == "url") {
-                                               // Then add a framekiller test as well
-                                               $content['frametester'] = FRAMETESTER($content[$key]);
-                                       } // END - if
-                               } // END - foreach
+                       // Finish SQL command
+                       $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id) . " LIMIT 1";
 
-                               // Finish SQL command
-                               $sql = substr($sql, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." LIMIT 1";
+                       // Run this query
+                       SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
-                               // Run this query
-                               SQL_QUERY($sql, __FUNCTION__, __LINE__);
+                       // Add affected rows
+                       $affected += SQL_AFFECTEDROWS();
 
-                               // Add affected rows
-                               $affected += SQL_AFFECTEDROWS();
+                       // Load all data from that id
+                       $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+                               array(
+                                       $tableName[0],
+                                       $idColumn[0],
+                                       $id
+                               ), __FUNCTION__, __LINE__);
 
-                               // Load all data from that id
-                               $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
-                                       array($table, $idColumn, $id), __FUNCTION__, __LINE__);
+                       // Fetch the data and merge it into $content
+                       $content = merge_array($content, SQL_FETCHARRAY($result));
 
-                               // Fetch the data
-                               global $DATA;
-                               $DATA = SQL_FETCHARRAY($result);
+                       // Free the result
+                       SQL_FREERESULT($result);
 
-                               // Free the result
-                               SQL_FREERESULT($result);
+                       // Send "build mails" out
+                       sendAdminBuildMails('edit', $tableName, $content, $id, '', $userIdColumn);
+               } // END - foreach
 
-                               // Send "build mails" out
-                               ADMIN_SEND_BUILD_MAILS("edit", $table, $content, $id);
+               // Delete cache?
+               if ((count($cacheFiles) > 0) && (!empty($cacheFiles[0]))) {
+                       // Delete cache file(s)
+                       foreach ($cacheFiles as $cacheF) {
+                               // Skip any empty entries
+                               if (empty($cache)) {
+                                       // This may cause trouble in loadCacheFile()
+                                       continue;
+                               } // END - if
+
+                               // Is the cache file loadable?
+                               if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
+                                       // Then remove it
+                                       $GLOBALS['cache_instance']->removeCacheFile();
+                               } // END - if
                        } // END - foreach
+               } // END - if
 
-                       // Was this fine?
-                       if ($affected == count($IDs)) {
-                               // All deleted
-                               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_EDITED'));
-                       } else {
-                               // Some are still there :(
-                               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
-                       }
+               // Was this fine?
+               if ($affected == countPostSelection($idColumn[0])) {
+                       // All deleted
+                       displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
                } else {
-                       // List for editing
-                       ADMIN_BUILD_LIST("edit", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+                       // Some are still there :(
+                       displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, countPostSelection($idColumn[0])));
                }
-       } // END - if
+       } else {
+               // List for editing
+               adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+       }
 }
 
-// Un-/lock rows by given ID numbers
-function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn='userid') {
-       // All valid entries? (We hope so here!)
-       if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && ((!$lockNow) || (count($statusArray) == 1))) {
-               // Shall we un-/lock here or list for locking?
-               if ($lockNow) {
-                       // Un-/lock entries
-                       ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
-               } else {
-                       // List for editing
-                       ADMIN_BUILD_LIST("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
-               }
+// Un-/lock rows by given id numbers
+function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+       // $tableName must be an array
+       if ((!is_array($tableName)) || (count($tableName) != 1)) {
+               // No tableName specified
+               reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($idColumn)) {
+               // $idColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($lockNow)) {
+               // $lockNow is no array
+               reportBug(__FUNCTION__, __LINE__, 'lockNow[]=' . gettype($lockNow) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
+
+       // Shall we un-/lock here or list for locking?
+       if ($lockNow[0] === true) {
+               // Un-/lock entries
+               adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+       } else {
+               // List for editing
+               adminListBuilder('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+       }
 }
 
-// Undelete rows by given ID numbers
-function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn='userid') {
-       // All valid entries? (We hope so here!)
-       if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && ((!$lockNow) || (count($statusArray) == 1))) {
-               // Shall we un-/lock here or list for locking?
-               if ($lockNow) {
-                       // Undelete entries
-                       ADMIN_BUILD_STATUS_HANDLER("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
-               } else {
-                       // List for editing
-                       ADMIN_BUILD_LIST("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
-               }
+// Undelete rows by given id numbers
+function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+       // $tableName must be an array
+       if ((!is_array($tableName)) || (count($tableName) != 1)) {
+               // No tableName specified
+               reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($idColumn)) {
+               // $idColumn is no array
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+       } elseif (!is_array($undeleteNow)) {
+               // $undeleteNow is no array
+               reportBug(__FUNCTION__, __LINE__, 'undeleteNow[]=' . gettype($undeleteNow) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
+
+       // Shall we un-/lock here or list for locking?
+       if ($undeleteNow[0] === true) {
+               // Undelete entries
+               adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+       } else {
+               // List for editing
+               adminListBuilder('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+       }
 }
 
-// Checks proxy settins by fetching check-updates3.php from www.mxchange.org
-function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
+// Adds a given entry to the database
+function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+       // Call inner function
+       doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
+
+       // Entry has been added?
+       if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
+               // Display success message
+               displayMessage('{--ADMIN_ENTRY_ADDED--}');
+       } else {
+               // Display failed message
+               displayMessage('{--ADMIN_ENTRY_NOT_ADDED--}');
+       }
+}
+
+// Checks proxy settins by fetching check-updates3.php from mxchange.org
+function adminTestProxySettings ($settingsArray) {
        // Set temporary the new settings
        mergeConfig($settingsArray);
 
        // Now get the test URL
-       $content = GET_URL("check-updates3.php");
+       $content = sendGetRequest('check-updates3.php');
 
        // Is the first line with "200 OK"?
-       $valid = eregi("200 OK", $content[0]);
+       $valid = isInString('200 OK', $content[0]);
 
        // Return result
        return $valid;
 }
 
 // Sends out a link to the given email adress so the admin can reset his/her password
-function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
+function sendAdminPasswordResetLink ($email) {
        // Init output
        $OUT = '';
 
-       // Compile out security characters (must be for looking up!)
-       $email = COMPILE_CODE($email);
-
        // Look up administator login
-       $result = SQL_QUERY_ESC("SELECT id, login, password FROM `{!_MYSQL_PREFIX!}_admins` WHERE email='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`,`login`,`password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
                array($email), __FUNCTION__, __LINE__);
 
        // Is there an account?
-       if (SQL_NUMROWS($result) == 0) {
-               // No account found!
-               return getMessage('ADMIN_NO_LOGIN_WITH_EMAIL');
+       if (SQL_HASZERONUMS($result)) {
+               // No account found
+               return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
        } // END - if
 
        // Load all data
@@ -1178,32 +1373,29 @@ function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
        SQL_FREERESULT($result);
 
        // Generate hash for reset link
-       $content['hash'] = generateHash(URL.":".$content['id'].":".$content['login'].":".$content['password'], substr($content['password'], 10));
+       $content['hash'] = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $content['login'] . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
 
        // Remove some data
        unset($content['id']);
        unset($content['password']);
 
        // Prepare email
-       $mailText = LOAD_EMAIL_TEMPLATE("admin_reset_password", $content);
+       $mailText = loadEmailTemplate('admin_reset_password', $content);
 
        // Send it out
-       SEND_EMAIL($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);
+       sendEmail($email, '{--ADMIN_RESET_PASSWORD_LINK_SUBJECT--}', $mailText);
 
        // Prepare output
-       return getMessage('ADMIN_RESET_LINK_SENT');
+       return '{--ADMIN_RESET_PASSWORD_LINK_SENT--}';
 }
 
 // Validate hash and login for password reset
-function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
+function adminResetValidateHashLogin ($hash, $login) {
        // By default nothing validates... ;)
        $valid = false;
 
-       // Compile the login for lookup
-       $login = COMPILE_CODE($login);
-
        // Then try to find that user
-       $result = SQL_QUERY_ESC("SELECT id, password, email FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`,`password`,`email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
                array($login), __FUNCTION__, __LINE__);
 
        // Is an account here?
@@ -1212,7 +1404,7 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
                $content = SQL_FETCHARRAY($result);
 
                // Generate hash again
-               $hashFromData = generateHash(URL.":".$content['id'].":".$login.":".$content['password'], substr($content['password'], 10));
+               $hashFromData = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $login . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
 
                // Does both match?
                $valid = ($hash == $hashFromData);
@@ -1226,48 +1418,47 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
 }
 
 // Reset the password for the login. Do NOT call this function without calling above function first!
-function ADMIN_RESET_PASSWORD ($login, $password) {
-       // Init hash
-       $passHash = '';
-
-       // Now check if we have sql_patches installed
-       if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
-               // Use new way of hashing
-               $passHash = generateHash($password);
-       } else {
-               // Old MD5 method
-               $passHash = md5($password);
-       }
+function doResetAdminPassword ($login, $password) {
+       // Generate hash (we already check for sql_patches in generateHash())
+       $passHash = generateHash($password);
+
+       // Prepare fake POST data
+       $postData = array(
+               'login'    => array(getAdminId($login) => $login),
+               'password' => array(getAdminId($login) => $passHash),
+       );
 
        // Update database
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE login='%s' LIMIT 1",
-               array($passHash, $login), __FUNCTION__, __LINE__);
+       $message = adminsChangeAdminAccount($postData, '', false);
 
        // Run filters
-       runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
+       runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash, 'message' => $message));
 
        // Return output
-       return ADMIN_PASSWORD_RESET_DONE;
+       return '{--ADMIN_PASSWORD_RESET_DONE--}';
 }
 
 // Solves a task by given id number
-function ADMIN_SOLVE_TASK ($id) {
+function adminSolveTask ($id) {
        // Update the task data
-       ADMIN_UPDATE_TASK_DATA($id, "status", "SOLVED");
+       adminUpdateTaskData($id, 'status', 'SOLVED');
 }
 
 // Marks a given task as deleted
-function ADMIN_DELETE_TASK ($id) {
+function adminDeleteTask ($id) {
        // Update the task data
-       ADMIN_UPDATE_TASK_DATA($id, "status", "DELETED");
+       adminUpdateTaskData($id, 'status', 'DELETED');
 }
 
 // Function to update task data
-function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
-       // Is the id not set, then we need a backtrace here... :(
-       if ($id <= 0) {
+function adminUpdateTaskData ($id, $row, $data) {
+       // Should be admin and valid id
+       if (!isAdmin()) {
+               // Not an admin so redirect better
+               reportBug(__FUNCTION__, __LINE__, 'id=' . $id . ',row=' . $row . ',data=' . $data . ' - isAdmin()=false');
+       } elseif ($id <= 0) {
                // Initiate backtrace
-               debug_report_bug(sprintf("id is invalid: %s. row=%s, data=%s",
+               reportBug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
                        $id,
                        $row,
                        $data
@@ -1275,19 +1466,26 @@ function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
        } // END - if
 
        // Update the task
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE id=%s LIMIT 1",
-               array($row, $data, bigintval($id)), __FUNCTION__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
+               array(
+                       $row,
+                       $data,
+                       bigintval($id)
+               ), __FUNCTION__, __LINE__);
 }
 
-// Checks wether if the admin menu has entries
+// Checks whether if the admin menu has entries
 function ifAdminMenuHasEntries ($action) {
        return (
                ((
+                       // Is the entry set?
                        isset($GLOBALS['admin_menu_has_entries'][$action])
                ) && (
+                       // And do we have a menu for this action?
                        $GLOBALS['admin_menu_has_entries'][$action] === true
                )) || (
-                       $action == "login"
+                       // Login has always a menu
+                       $action == 'login'
                )
        );
 }
@@ -1298,16 +1496,319 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
 }
 
 // Creates a link to the user's admin-profile
-function ADMIN_CREATE_USERID_LINK ($uid) {
+function adminCreateUserLink ($userid) {
        // Is the userid set correctly?
-       if ($uid > 0) {
+       if (isValidUserId($userid)) {
                // Create a link to that profile
-               return "{!URL!}/modules.php?module=admin&amp;what=list_user&amp;uid=".bigintval($uid);
+               return '{%url=modules.php?module=admin&amp;what=list_user&amp;userid=' . bigintval($userid) . '%}';
        } // END - if
 
        // Return a link to the user list
-       return "{!URL!}/modules.php?module=admin&amp;what=list_user";
+       return '{%url=modules.php?module=admin&amp;what=list_user%}';
 }
 
+// Generate a "link" for the given admin id (admin_id)
+function generateAdminLink ($adminId) {
+       // No assigned admin is default
+       $adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
+
+       // Zero? = Not assigned
+       if (isValidUserId($adminId)) {
+               // Load admin's login
+               $login = getAdminLogin($adminId);
+
+               // Is the login valid?
+               if ($login != '***') {
+                       // Is the extension there?
+                       if (isExtensionActive('admins')) {
+                               // Admin found
+                               $adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
+                       } else {
+                               // Extension not found
+                               $adminLink = '{%message,ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED=admins%}';
+                       }
+               } else {
+                       // Maybe deleted?
+                       $adminLink = '<div class="bad">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
+               }
+       } // END - if
+
+       // Return result
+       return $adminLink;
+}
+
+// Verifies if the current admin has confirmed to alter expert settings
 //
+// Return values:
+// 'failed'    = Something goes wrong (default)
+// 'agreed'    = Has verified and and confirmed it to see them
+// 'forbidden' = Has not the proper right to alter them
+// 'update'    = Need to update extension 'admins'
+// 'ask'       = A form was send to the admin
+function doVerifyExpertSettings () {
+       // Default return status is failed
+       $return = 'failed';
+
+       // Is the extension installed and recent?
+       if (isExtensionInstalledAndNewer('admins', '0.7.3')) {
+               // Okay, load the status
+               $expertSettings = getAminsExpertSettings();
+
+               // Is he allowed?
+               if ($expertSettings == 'Y') {
+                       // Okay, does he want to see them?
+                       if (isAdminsExpertWarningEnabled()) {
+                               // Ask for them
+                               if (isFormSent()) {
+                                       // Is the element set, then we need to change the admin
+                                       if (isPostRequestElementSet('expert_settings')) {
+                                               // Get it and prepare final post data array
+                                               $postData['login'][getCurrentAdminId()] = getCurrentAdminLogin();
+                                               $postData['expert_warning'][getCurrentAdminId()] = 'N';
+
+                                               // Change it in the admin
+                                               adminsChangeAdminAccount($postData, 'expert_warning');
+
+                                               // Clear form
+                                               unsetPostRequestElement('ok');
+                                       } // END - if
+
+                                       // All fine!
+                                       $return = 'agreed';
+                               } else {
+                                       // Send form
+                                       loadTemplate('admin_expert_settings_form');
+
+                                       // Asked for it
+                                       $return = 'ask';
+                               }
+                       } else {
+                               // Do not display
+                               $return = 'agreed';
+                       }
+               } else {
+                       // Forbidden
+                       $return = 'forbidden';
+               }
+       } else {
+               // Out-dated extension or not installed
+               $return = 'update';
+       }
+
+       // Output message for other status than ask/agreed
+       if (($return != 'ask') && ($return != 'agreed')) {
+               // Output message
+               displayMessage('{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
+       } // END - if
+
+       // Return status
+       return $return;
+}
+
+// Generate link to unconfirmed mails for admin
+function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
+       // Init output
+       $OUT = $unconfirmed;
+
+       // Is there unconfirmed mails?
+       if ($unconfirmed > 0) {
+               // Add link to list_unconfirmed what-file
+               $OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
+       } // END - if
+
+       // Return it
+       return $OUT;
+}
+
+// Generates a navigation row for listing emails
+function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=false) {
+       // Don't do anything if $numPages is 1
+       if ($numPages == 1) {
+               // Abort here with empty content
+               return '';
+       } // END - if
+
+       $TOP = '';
+       if ($show_form === false) {
+               $TOP = ' top';
+       } // END - if
+
+       $NAV = '';
+       for ($page = 1; $page <= $numPages; $page++) {
+               // Is the page currently selected or shall we generate a link to it?
+               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+                       // Is currently selected, so only highlight it
+                       $NAV .= '<strong>-';
+               } else {
+                       // Open anchor tag and add base URL
+                       $NAV .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
+
+                       // Add userid when we shall show all mails from a single member
+                       if ((isGetRequestElementSet('userid')) && (isValidUserId(getRequestElement('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
+
+                       // Close open anchor tag
+                       $NAV .= '%}">';
+               }
+               $NAV .= $page;
+               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+                       // Is currently selected, so only highlight it
+                       $NAV .= '-</strong>';
+               } else {
+                       // Close anchor tag
+                       $NAV .= '</a>';
+               }
+
+               // Add separator if we have not yet reached total pages
+               if ($page < $numPages) {
+                       // Add it
+                       $NAV .= '|';
+               } // END - if
+       } // END - for
+
+       // Define constants only once
+       $content['nav']  = $NAV;
+       $content['span'] = $colspan;
+       $content['top']  = $TOP;
+
+       // Load navigation template
+       $OUT = loadTemplate('admin_email_nav_row', true, $content);
+
+       if ($return === true) {
+               // Return generated HTML-Code
+               return $OUT;
+       } else {
+               // Output HTML-Code
+               outputHtml($OUT);
+       }
+}
+
+// Process menu editing form
+function adminProcessMenuEditForm ($type, $subMenu) {
+       // An action is done...
+       foreach (postRequestElement('sel') as $sel => $menu) {
+               $AND = "(`what` = '' OR `what` IS NULL)";
+
+               $sel = bigintval($sel);
+
+               if (!empty($subMenu)) {
+                       $AND = "`action`='" . $subMenu . "'";
+               } // END - if
+
+               switch (postRequestElement('ok')) {
+                       case 'edit': // Edit menu
+                               // Shall we update a menu or sub menu?
+                               if (!isGetRequestElementSet('sub')) {
+                                       // Update with 'what'=null
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                               array(
+                                                       $type,
+                                                       $menu,
+                                                       postRequestElement('sel_action', $sel),
+                                                       $sel
+                                               ), __FUNCTION__, __LINE__);
+                               } else {
+                                       // Update with selected 'what'
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                               array(
+                                                       $type,
+                                                       $menu,
+                                                       postRequestElement('sel_action', $sel),
+                                                       postRequestElement('sel_what', $sel),
+                                                       $sel
+                                               ), __FUNCTION__, __LINE__);
+                               }
+                               break;
+
+                       case 'delete': // Delete menu
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                       array(
+                                               $type,
+                                               $sel
+                                       ), __FUNCTION__, __LINE__);
+                               break;
+
+                       case 'status': // Change status of menus
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s',`locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                       array(
+                                               $type,
+                                               postRequestElement('visible', $sel),
+                                               postRequestElement('locked', $sel),
+                                               $sel
+                                       ), __FUNCTION__, __LINE__);
+                               break;
+
+                       default: // Unexpected action
+                               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+                               displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
+                               break;
+               } // END - switch
+       } // END - foreach
+
+       // Load template
+       displayMessage('{--SETTINGS_SAVED--}');
+}
+
+// Handle weightning
+function doAdminProcessMenuWeightning ($type, $AND) {
+       // Are there all required (generalized) GET parameter?
+       if ((isGetRequestElementSet('act')) && (isGetRequestElementSet('tid')) && (isGetRequestElementSet('fid'))) {
+               // Init variables
+               $tid = ''; $fid = '';
+
+               // Get ids
+               if (isGetRequestElementSet('w')) {
+                       // Sub menus selected
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+                               array(
+                                       $type,
+                                       getRequestElement('act'),
+                                       bigintval(getRequestElement('tid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($tid) = SQL_FETCHROW($result);
+                       SQL_FREERESULT($result);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+                               array(
+                                       $type,
+                                       getRequestElement('act'),
+                                       bigintval(getRequestElement('fid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($fid) = SQL_FETCHROW($result);
+                       SQL_FREERESULT($result);
+               } else {
+                       // Main menu selected
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+                               array(
+                                       $type,
+                                       bigintval(getRequestElement('tid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($tid) = SQL_FETCHROW($result);
+                       SQL_FREERESULT($result);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+                               array(
+                                       $type,
+                                       bigintval(getRequestElement('fid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($fid) = SQL_FETCHROW($result);
+                       SQL_FREERESULT($result);
+               }
+
+               if ((!empty($tid)) && (!empty($fid))) {
+                       // Sort menu
+                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+                               array(
+                                       $type,
+                                       bigintval(getRequestElement('tid')),
+                                       bigintval($fid)
+                               ), __FUNCTION__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+                               array(
+                                       $type,
+                                       bigintval(getRequestElement('fid')),
+                                       bigintval($tid)
+                               ), __FUNCTION__, __LINE__);
+               } // END - if
+       } // END - if
+}
+
+// [EOF]
 ?>