Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.
[mailer.git] / inc / modules / admin / admin-inc.php
index 28859baee029559b8414b2c2355d22c96cc21e37..6eee1eddf6e93996b89532899bfbb5c77fb54678 100644 (file)
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 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 *
@@ -41,30 +41,45 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Register an administrator account
-function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
+function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'deny') {
+       // Only let valid data pass
+       assert(in_array($accessLevel, array('allow', 'deny')));
+
        // Login does already exist
        $ret = 'already';
 
        // Lookup the admin
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
                array($adminLogin), __FUNCTION__, __LINE__);
 
        // Is the entry there?
-       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(
-                               $adminLogin,
-                               $passHash,
-                               $adminEmail
-                       ), __FUNCTION__, __LINE__);
+       if (ifSqlHasZeroNumRows($result)) {
+               // Is ext-admins installed and version at least 0.3.0?
+               if (isExtensionInstalledAndNewer('admins', '0.3.0')) {
+                       // Ok, let's create the admin login
+                       sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`, `default_acl`) VALUES ('%s', '%s', '%s', '%s')",
+                               array(
+                                       $adminLogin,
+                                       $passHash,
+                                       $adminEmail,
+                                       $accessLevel
+                               ), __FUNCTION__, __LINE__);
+               } else {
+                       // Ok, let's create the admin login
+                       sqlQueryEscaped("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
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Return result
        return $ret;
@@ -74,13 +89,13 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
 function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
        // First of all, no admin login is found, so the admin hash is null
        $ret = '404';
-       $adminHash = null;
+       $adminHash = NULL;
 
        // Get admin id from login
        $adminId = getAdminId($adminLogin);
 
        // Continue only with found admin ids
-       if ($adminId > 0) {
+       if (isValidId($adminId)) {
                // Then we need to lookup the login name by getting the admin hash
                $adminHash = getAdminHash($adminId);
 
@@ -97,7 +112,7 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
                                // All fine
                                $ret = 'done';
                        } else {
-                               // Set status
+                               // Did not match!
                                $ret = 'password';
                        }
                } // END - if
@@ -120,6 +135,8 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 
 // Only be executed on cookie checking
 function ifAdminCookiesAreValid ($adminLogin, $passHash) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLogin=' . $adminLogin . ',passHash=' . $passHash . ' - CALLED!');
+
        // First of all, no admin login is found
        $ret = '404';
 
@@ -130,38 +147,30 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
        if ($adminHash != '-1') {
                // Now, we need to encode the password in the same way the one is encoded in database
                $testHash = encodeHashForCookie($adminHash);
-               //* DEBUG: */ debugOutput('adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
 
                // If they both match, the login data is valid
-               if ($testHash == $passHash) {
+               if ($testHash != $passHash) {
+                       // Passwords don't match
+                       $ret = 'password';
+               } elseif (!isAdmin()) {
+                       // Is not valid session
+                       $ret = 'session';
+               } else {
                        // All fine
                        $ret = 'done';
-               } else {
-                       // Set status
-                       $ret = 'password';
                }
        } // END - if
 
        // Return status
-       //* DEBUG: */ debugOutput('ret='.$ret);
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret . ' - EXIT!');
        return $ret;
 }
 
 // Do an admin action
 function doAdminAction () {
-       // Get default what
-       $what = getWhat();
-
-       //* DEBUG: */ debugOutput(__LINE__.'*'.$what.'/'.getModule().'/'.getAction().'/'.getWhat().'*');
-
-       // Remove any spaces from variable
-       if (empty($what)) {
-               // Default admin action is the overview page
-               $what = 'overview';
-       } else {
-               // Secure it
-               $what = secureString($what);
-       }
+       // Determine correct 'what' value
+       $what = determineWhat();
 
        // Get action value
        $action = getActionFromModuleWhat(getModule(), $what);
@@ -169,21 +178,21 @@ function doAdminAction () {
        // 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());
+               $content['welcome'] = loadTemplate('admin_welcome_admins', TRUE, getCurrentAdminId());
        } else {
-               $content['welcome'] = loadTemplate('admin_welcome', true, getCurrentAdminId());
+               $content['welcome'] = loadTemplate('admin_welcome', TRUE, getCurrentAdminId());
        }
 
        // Load header, footer, render menu
-       $content['header'] = loadTemplate('admin_header' , true, $content);
-       $content['footer'] = loadTemplate('admin_footer' , true, $content);
-       $content['menu']   = addAdminMenu($action, $what, true);
+       $content['header'] = loadTemplate('admin_header' , TRUE, $content);
+       $content['footer'] = loadTemplate('admin_footer' , TRUE, $content);
+       $content['menu']   = addAdminMenu($action, $what);
 
-       // Tableset header
-       loadTemplate('admin_main_header', false, $content);
+       // Load main template
+       loadTemplate('admin_main', FALSE, $content);
 
        // Check if action/what pair is valid
-       $result_action = SQL_QUERY_ESC("SELECT
+       $result_action = sqlQueryEscaped("SELECT
        `id`
 FROM
        `{?_MYSQL_PREFIX?}_admin_menu`
@@ -191,12 +200,12 @@ WHERE
        `action`='%s' AND
        (
                (
-                       `what`='%s' AND `what` != 'overview'
+                       `what`='%s' AND `what` != 'welcome'
                ) OR (
                        (
                                `what`='' OR `what` IS NULL
                        ) AND (
-                               '%s'='overview'
+                               '%s'='welcome'
                        )
                )
        )
@@ -207,40 +216,42 @@ LIMIT 1",
                        $what
                ), __FUNCTION__, __LINE__);
 
-       // Do we have an entry?
-       if (SQL_NUMROWS($result_action) == 1) {
+       // Is there an entry?
+       if (sqlNumRows($result_action) == 1) {
                // Is valid but does the inlcude file exists?
-               $inc = sprintf("inc/modules/admin/action-%s.php", $action);
-               if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($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
                        loadInclude($inc);
-               } elseif ($GLOBALS['acl_allow'] === false) {
+               } elseif ($GLOBALS['acl_allow'] === FALSE) {
                        // Access denied
-                       loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
+                       loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
                } else {
                        // Include file not found :-(
-                       loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action));
+                       loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_404=' . $action . '%}');
                }
        } else {
                // Invalid action/what pair found
-               loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
+               loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
        }
 
        // Free memory
-       SQL_FREERESULT($result_action);
+       sqlFreeResult($result_action);
 
        // Tableset footer
-       loadTemplate('admin_main_footer', false, $content);
+       loadTemplate('admin_main_footer', FALSE, $content);
 }
 
-// Checks wether current admin is allowed to access given action/what combination
-// (only one is allowed to be null!)
-function isAdminAllowedAccessMenu ($action, $what = null) {
-       // Do we have cache?
+/**
+ * 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')) || (adminsCheckAdminAcl($action, $what)));
+               $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || ((isExtensionActive('admins')) && (isAdminsAllowedByAcl($action, $what))));
        } // END - if
 
        // Return the cached value
@@ -248,18 +259,20 @@ function isAdminAllowedAccessMenu ($action, $what = null) {
 }
 
 // Adds an admin menu
-function addAdminMenu ($action, $what, $return = false) {
+function addAdminMenu ($action, $what) {
        // Init variables
-       $SUB = false;
+       $SUB = FALSE;
        $OUT = '';
 
        // Menu descriptions
        $GLOBALS['menu']['description'] = array();
-       $GLOBALS['menu']['title'] = array();
+       $GLOBALS['menu']['title']       = array();
 
        // Build main menu
-       $result_main = SQL_QUERY("SELECT
-       `action`, `title`, `descr`
+       $result_main = sqlQuery("SELECT
+       `action` AS `main_action`,
+       `title` AS `main_title`,
+       `descr` AS `main_descr`
 FROM
        `{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -268,55 +281,78 @@ ORDER BY
        `sort` ASC,
        `id` DESC", __FUNCTION__, __LINE__);
 
-       // Do we have entries?
-       if (!SQL_HASZERONUMS($result_main)) {
+       // Are there entries?
+       if (!ifSqlHasZeroNumRows($result_main)) {
                $OUT .= '<ul class="admin_menu_main">';
-               // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-               while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
-                       // Filename
-                       $inc = sprintf("inc/modules/admin/action-%s.php", $menu);
 
-                       // Is the file readable?
-                       $readable = isIncludeReadable($inc);
+               // Load all 'action' menus
+               while ($mainContent = sqlFetchArray($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($menu)) {
-                               if ($SUB === false) {
+                       if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
+                               if ($SUB === FALSE) {
                                        // Insert compiled menu title and description
-                                       $GLOBALS['menu']['title'][$menu]      = $title;
-                                       $GLOBALS['menu']['description'][$menu] = $descr;
+                                       $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">
+                               $OUT .= '<li class="admin_menu"' . addJavaScriptMenuContent('admin', $mainContent['main_action'], $action, $what) . '>
 <div class="nobr"><strong>&middot;</strong>&nbsp;';
 
-                               if ($readable === true) {
-                                       if (($menu == $action) && (empty($what))) {
+                               // 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=' . $menu . '%}">';
+                                               $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $mainContent['main_action'] . '%}">';
                                        }
                                } else {
-                                       $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_ACTION_404=' . $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 ($readable === true) {
-                                       if (($menu == $action) && (empty($what))) {
+                               // Is the file readable?
+                               if (isIncludeReadable($inc)) {
+                                       if (($mainContent['main_action'] == $action) && (empty($what))) {
                                                $OUT .= '</strong>';
                                        } else {
                                                $OUT .= '</a>]';
                                        }
                                } else {
-                                       $OUT .= '</em>';
+                                       $OUT .= '</span>';
                                }
 
                                $OUT .= '</div>
 </li>';
 
-                               // Check for menu entries
-                               $result_what = SQL_QUERY_ESC("SELECT
-       `what`, `title`, `descr`
+                               // Add sub menu
+                               $OUT .= addAdminSubMenu($mainContent, $action, $what);
+                       } // END - if
+               } // END - while
+
+               // Close ul-tag
+               $OUT .= '</ul>';
+
+               // Free memory
+               sqlFreeResult($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 = sqlQueryEscaped("SELECT
+       `what` AS `sub_what`,
+       `title` AS `sub_title`,
+       `descr` AS `sub_descr`
 FROM
        `{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -326,107 +362,172 @@ WHERE
 ORDER BY
        `sort` ASC,
        `id` DESC",
-                                       array($menu), __FUNCTION__, __LINE__);
-
-                               // Remember the count for later checks
-                               setAdminMenuHasEntries($menu, ((!SQL_HASZERONUMS($result_what)) && ($action == $menu)));
-
-                               // Do we have entries?
-                               if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
-                                       $GLOBALS['menu']['description'] = array();
-                                       $GLOBALS['menu']['title'] = array(); $SUB = true;
-                                       $OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
-                                       // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-                                       while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
-                                               // Filename
-                                               $inc = sprintf("inc/modules/admin/what-%s.php", $what_sub);
-
-                                               // Is the file readable?
-                                               $readable = isIncludeReadable($inc);
-
-                                               // Is the current admin allowed to access this 'what' menu?
-                                               if (isAdminAllowedAccessMenu(null, $what_sub)) {
-                                                       // Insert compiled title and description
-                                                       $GLOBALS['menu']['title'][$what_sub]      = $title_what;
-                                                       $GLOBALS['menu']['description'][$what_sub] = $desc_what;
-                                                       $OUT .= '<li class="admin_menu">
+               array($mainContent['main_action']), __FUNCTION__, __LINE__);
+
+       // Remember the count for later checks
+       setAdminMenuHasEntries($mainContent['main_action'], ((!ifSqlHasZeroNumRows($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 (!ifSqlHasZeroNumRows($result_what)) {
+                       // Start HTML code
+                       $OUT .= '<ul class="admin_menu_sub">';
+
+                       // Load all entries
+                       while ($subContent = sqlFetchArray($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;';
-                                                       if ($readable === true) {
-                                                               if ($what == $what_sub) {
-                                                                       $OUT .= '<strong>';
-                                                               } else {
-                                                                       $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
-                                                               }
-                                                       } else {
-                                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
-                                                       }
-
-                                                       $OUT .= $title_what;
-
-                                                       if ($readable === true) {
-                                                               if ($what == $what_sub) {
-                                                                       $OUT .= '</strong>';
-                                                               } else {
-                                                                       $OUT .= '</a>]';
-                                                               }
-                                                       } else {
-                                                               $OUT .= '</em>';
-                                                       }
-                                                       $OUT .= '</div>
-</li>';
-                                               } // END - if
-                                       } // END - while
 
-                                       // Free memory
-                                       SQL_FREERESULT($result_what);
-                                       $OUT .= '</ul>
+                                       // Is the file readable?
+                                       if (isIncludeReadable($inc)) {
+                                               if ($what == $subContent['sub_what']) {
+                                                       $OUT .= '<strong>';
+                                               } else {
+                                                       $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?
+                                       if (isIncludeReadable($inc)) {
+                                               if ($what == $subContent['sub_what']) {
+                                                       $OUT .= '</strong>';
+                                               } else {
+                                                       $OUT .= '</a>]';
+                                               }
+                                       } else {
+                                               $OUT .= '</span>';
+                                       }
+                                       $OUT .= '</div>
 </li>';
                                } // END - if
-                       } // END - if
-               } // END - while
+                       } // END - while
+
+                       // Finish HTML output
+                       $OUT .= '</ul>';
+               } // END - if
 
                // Free memory
-               SQL_FREERESULT($result_main);
-               $OUT .= '</ul>';
-       }
+               sqlFreeResult($result_what);
+       } // END - if
 
-       // Is there a cache instance again?
-       // Return or output content?
-       if ($return === true) {
-               return $OUT;
-       } else {
-               outputHtml($OUT);
-       }
+       // Close li-tag
+       $OUT .= '</li>';
+
+       // Return content
+       return $OUT;
 }
 
-// Create member selection box
-function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $none = false, $field = 'userid') {
+// Create an admin selection box form
+function addAdminSelectionBox ($adminId = NULL, $special = '') {
+       // Default is email as "special column"
+       $ADD = ',`email` AS `special`';
+
+       // Is a special column given?
+       if (!empty($special)) {
+               // Additional column for SQL query
+               $ADD = ',`' . $special . '` AS `special`';
+       } // END - if
+
+       // Query all entries
+       $result = sqlQuery('SELECT
+       `id`,
+       `login`
+       ' . $ADD . '
+FROM
+       `{?_MYSQL_PREFIX?}_admins`
+ORDER BY
+       `login` ASC', __FUNCTION__, __LINE__);
+
+       // Init output
+       $OUT = '';
+
+       // Load all entries
+       while ($content = sqlFetchArray($result)) {
+               // Default is none
+               $content['default'] = '';
+
+               // Is the id the same?
+               if ($content['id'] == $adminId) {
+                       // Set this as default
+                       $content['default'] = ' selected="selected"';
+               } // END - if
+
+               // Add the entry
+               $OUT .= loadTemplate('select_admins_option', TRUE, $content);
+       } // END - if
+
+       // Free memory
+       sqlFreeResult($result);
+
+       // Add form to content
+       $content['form_selection'] = $OUT;
+
+       // Output form
+       loadTemplate('select_admins_box', FALSE, $content);
+}
+
+// Create a 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` ASC", __FUNCTION__, __LINE__);
+       $result = sqlQuery('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>';
-        elseif ($none === true) $OUT = '      <option value="0">{--SELECT_NONE--}</option>';
+       if ($add_all === TRUE) {
+               $OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
+       } elseif ($none === TRUE) {
+               $OUT = '      <option value="0">{--SELECT_NONE--}</option>';
+       }
 
-       while ($content = SQL_FETCHARRAY($result)) {
+       // Load all entries
+       while ($content = sqlFetchArray($result)) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . intval($userid) . '/' . $content['userid']);
                $OUT .= '<option value="' . bigintval($content['userid']) . '"';
-               if ($def == $content['userid']) $OUT .= ' selected="selected"';
-               $OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';
+               if ($userid === $content['userid']) {
+                       $OUT .= ' selected="selected"';
+               } // END - if
+               $OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . $content['userid'] . ')</option>';
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
-       if ($return === false) {
+       if ($return === FALSE) {
                // Remeber options in constant
                $content['form_selection'] = $OUT;
-               $content['what']             = getWhat();
+               $content['what']           = '{%pipe,getWhat%}';
 
                // Load template
-               loadTemplate('admin_form_selection_box', false, $content);
+               loadTemplate('admin_form_selection_box', FALSE, $content);
        } else {
                // Return content in selection frame
                return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
@@ -437,26 +538,28 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no
 // @TODO Try to rewrite this to adminAddMenuSelectionBox()
 // @DEPRECATED
 function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
-       $what = "`what` != ''";
-       if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` !='login'";
+       $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",
+       $result = sqlQueryEscaped("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
                array($mode), __FUNCTION__, __LINE__);
-       if (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // Load menu as selection
                $OUT = '<select name="' . $mode . '_menu';
-               if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
+               if (!isValidId($defid)) $OUT .= '[' . intval($defid) . ']';
                $OUT .= '" size="1" class="form_select">
        <option value="">{--SELECT_NONE--}</option>';
                // Load all entries
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        $OUT .= '<option value="' . $content['menu'] . '"';
-                       if ((!empty($default)) && ($default == $content['menu'])) $OUT .= ' selected="selected"';
+                       if ((!empty($default)) && ($default == $content['menu'])) {
+                               $OUT .= ' selected="selected"';
+                       } // END - if
                        $OUT .= '>' . $content['title'] . '</option>';
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
 
                // Add closing select-tag
                $OUT .= '</select>';
@@ -470,7 +573,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 }
 
 // Wrapper for $_POST and adminSaveSettings
-function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
        // Get the array
        $postData = postRequestArray();
 
@@ -479,84 +582,93 @@ function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement
 }
 
 // Save settings to the database
-function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
        // Prepare all arrays, variables
        $tableData = array();
-       $skip = false;
+       $skip = FALSE;
 
        // Now, walk through all entries and prepare them for saving
+       //* BUG: */ reportBug(__FUNCTION__, __LINE__, '<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
        foreach ($postData as $id => $val) {
                // Process only formular field but not submit buttons ;)
-               if ($id != 'ok') {
-                       // Do not save the ok value
-                       convertSelectionsToTimestamp($postData, $tableData, $id, $skip);
-
-                       // 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
-                                       $tableData[] = sprintf("`%s`=%s", $id, $test);
-                               } elseif (is_null($val)) {
-                                       // Add NULL
-                                       $tableData[] = sprintf("`%s`=NULL", $id);
-                               } else {
-                                       // Add strings
-                                       $tableData[] = sprintf("`%s`='%s'", $id, trim($val));
-                               }
+               if ($id == 'save_config') {
+                       // Skip this button
+                       continue;
+               } // END - if
 
-                               // Do not add a config entry twice
-                               $GLOBALS['skip_config'][$id] = true;
+               // 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
+
+                       // Test value on float
+                       $test = (float) $val;
+
+                       // Debug message
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'test=' . $test . ',val=' . $val . ',id=' . $id);
+
+                       // Shall we add numbers or strings?
+                       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 === false) {
+       $result = FALSE;
+       if ($alwaysAdd === FALSE) {
                if (!empty($whereStatement)) {
-                       $result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
+                       $result = sqlQuery('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 = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}' . $tableName . '` LIMIT 1', __FUNCTION__, __LINE__);
                }
        } // END - if
 
-       if (SQL_NUMROWS($result) == 1) {
+       if (sqlNumRows($result) == 1) {
                // "Implode" all data to single string
                $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,
                        $updatedData,
                        $whereStatement
                );
        } else {
-               // Add Line (does only work with auto_increment!
+               // 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];
+                       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
@@ -564,19 +676,22 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
        }
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Simply run generated SQL string
-       SQL_QUERY($sql, __FUNCTION__, __LINE__);
+       sqlQuery($sql, __FUNCTION__, __LINE__);
 
        // Remember affected rows
-       $affected = SQL_AFFECTEDROWS();
+       $affected = sqlAffectedRows();
 
        // Rebuild cache
        rebuildCache('config', 'config');
 
        // Settings saved, so display message?
-       if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+       if ($displayMessage === TRUE) {
+               // Display a message
+               displayMessage('{--SETTINGS_SAVED--}');
+       } // END - if
 
        // Return affected rows
        return $affected;
@@ -585,7 +700,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 // Generate a selection box
 function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
        // Open the requested menu directory
-       $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', false, false);
+       $menuArray = getArrayFromDirectory(sprintf('inc/modules/%s/', $menu), $type . '-', FALSE, FALSE);
 
        // Init the selection box
        $OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
@@ -593,9 +708,9 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
        // Walk through all files
        foreach ($menuArray as $file) {
                // Is this a PHP script?
-               if ((!isDirectory($file)) && (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("inc/modules/%s/%s", $menu, $file);
+                       $test = sprintf('inc/modules/%s/%s', $menu, $file);
 
                        // Is the file there?
                        if (isIncludeReadable($test)) {
@@ -604,9 +719,11 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
                                $part = substr($part, 0, -4);
 
                                // Is that part different from the overview?
-                               if ($part != 'overview') {
+                               if ($part != 'welcome') {
                                        $OUT .= '<option value="' . $part . '"';
-                                       if ($part == $default) $OUT .= ' selected="selected"';
+                                       if ($part == $default) {
+                                               $OUT .= ' selected="selected"';
+                                       } // END - if
                                        $OUT .= '>' . $part . '</option>';
                                } // END - if
                        } // END - if
@@ -621,28 +738,47 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 }
 
 // Creates a user-profile link for the admin. This function can also be used for many other purposes
-function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
-       if (($title == '') && (isValidUserId($userid))) {
-               // Set userid as title
-               $title = $userid;
-       } elseif ($userid == 0) {
-               // User id zero is invalid
-               return '<strong>' . $userid . '</strong>';
-       }
+function generateUserProfileLink ($userid, $title = '', $what = '') {
+       // Is there cache?
+       if (!isset($GLOBALS[__FUNCTION__][$userid][$title . '_' . $what])) {
+               // Is title empty and valid userid?
+               if (($title == '') && (isValidId($userid))) {
+                       // Set userid as title
+                       $title = $userid;
+               } elseif (!isValidId($userid)) {
+                       // User id zero is invalid
+                       return '<strong>' . convertNullToZero($userid) . '</strong>';
+               }
 
-       if (($title == '0') && ($what == 'list_refs')) {
-               // Return title again
-               return $title;
-       } elseif (isExtensionActive('nickname')) {
-               // Get nickname
-               $nick = getNickname($userid);
+               // Is what set?
+               if (empty($what)) {
+                       // Then get it to 'list_user'
+                       $what = 'list_user';
+               } // END - if
 
-               // Is it not empty, use it as title else the userid
-               if (!empty($nick)) $title = $nick . '(' . $userid . ')'; else $title = $userid;
-       }
+               if (($title == '0') && ($what == 'list_refs')) {
+                       // Return title again
+                       return $title;
+               } 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;
+                       }
+               }
+
+               // Set it in cache
+               $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what] = '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+       } // END - if
 
-       // Return link
-       return '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what];
 }
 
 // Check "logical-area-mode"
@@ -650,7 +786,7 @@ 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 ext-sql_patches is up-to-date enough, use the configuration
        if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
                $mode = getAdminMenu();
        } // END - if
@@ -668,17 +804,17 @@ function adminGetMenuMode () {
                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",
+               $result = sqlQueryEscaped('SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1',
                        array($adminId), __FUNCTION__, __LINE__);
 
-               // Do we have an entry?
-               if (SQL_NUMROWS($result) == 1) {
+               // Is there an entry?
+               if (sqlNumRows($result) == 1) {
                        // Load data
-                       list($adminMode) = SQL_FETCHROW($result);
+                       list($adminMode) = sqlFetchRow($result);
                } // END - if
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
        }
 
        // Check what the admin wants and set it when it's not the default mode
@@ -692,7 +828,7 @@ function adminGetMenuMode () {
 
 // Change activation status
 function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
-       $count = '0'; $newStatus = 'Y';
+       $count = '0';
        if ((is_array($IDs)) && (count($IDs) > 0)) {
                // "Walk" all through and count them
                foreach ($IDs as $id => $selected) {
@@ -702,406 +838,305 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = '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 = sqlQueryEscaped('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) {
+                               if (sqlNumRows($result) == 1) {
                                        // Load the status
-                                       list($currStatus) = SQL_FETCHROW($result);
+                                       list($currStatus) = sqlFetchRow($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__);
+                                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s` SET `%s`='%s' WHERE `%s`=%s LIMIT 1",
+                                               array(
+                                                       $table,
+                                                       $row,
+                                                       $newStatus,
+                                                       $idRow,
+                                                       $id
+                                               ), __FUNCTION__, __LINE__);
 
                                        // Count up affected rows
-                                       $count += SQL_AFFECTEDROWS();
+                                       $count += sqlAffectedRows();
                                } // END - if
 
                                // Free the result
-                               SQL_FREERESULT($result);
+                               sqlFreeResult($result);
                        } // END - if
                } // END - foreach
 
                // Output status
-               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
+               displayMessage(sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
        } else {
                // Nothing selected!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}');
+               displayMessage('{--ADMIN_NOTHING_SELECTED_CHANGE--}');
        }
 }
 
-// Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userid = 'userid') {
-       // Default subject is the subject part
-       $subject = $subjectPart;
-
-       // Is the subject part not set?
-       if (empty($subjectPart)) {
-               // Then use it from the mode
-               $subject = strtoupper($mode);
-       } // END - if
-
-       // Is the raw userid set?
-       if (postRequestParameter($userid, $id) > 0) {
-               // Load email template
-               if (!empty($subjectPart)) {
-                       $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
-               } else {
-                       $mail = loadEmailTemplate('member_' . $mode . '_' . $table, $content);
-               }
-
-               // Send email out
-               sendEmail(postRequestParameter($userid, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
-       } // END - if
-
-       // Generate subject
-       $subject = strtoupper('{--ADMIN_' . $subject . '_' . $table . '_SUBJECT--}');
-
-       // Send admin notification out
-       if (!empty($subjectPart)) {
-               sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
-       } else {
-               sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
-       }
+// Build a special template list
+// @TODO cacheFiles is not yet supported
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
+       // Call inner (general) function
+       doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
 }
 
-// Build a special template list
-function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid') {
-       $OUT = '';
+// Change status of "build" list
+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
 
-       // "Walk" through all entries
-       foreach ($IDs 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__);
-
-               // Is there one entry?
-               if (SQL_NUMROWS($result) == 1) {
-                       // Load all data
-                       $content = SQL_FETCHARRAY($result);
-
-                       // Filter all data
-                       foreach ($content as $key => $value) {
-                               // Search index
-                               $idx = array_search($key, $columns, true);
-
-                               // Do we have a userid?
-                               if ($key == $userIdColumn) {
-                                       // Add it again as raw id
-                                       $content[$userIdColumn] = bigintval($value);
-                                       $content[$userIdColumn . '_raw'] = $content[$userIdColumn];
-                               } // END - if
+       // "Walk" through all entries
+       foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+               // Construct SQL query
+               $sql = sprintf('UPDATE `{?_MYSQL_PREFIX?}_%s` SET', sqlEscapeString($tableName[0]));
 
-                               // If the key matches the idColumn variable, we need to temporary remember it
-                               //* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn . ',value=' . $value);
-                               if ($key == $idColumn) {
-                                       // Found, so remember it
-                                       $GLOBALS['admin_list_builder_id_value'] = $value;
-                               } // END - if
+               // Load data of entry
+               $result = sqlQueryEscaped('SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1',
+                       array(
+                               $tableName[0],
+                               $idColumn[0],
+                               $id
+                       ), __FUNCTION__, __LINE__);
 
-                               // Handle the call in external function
-                               //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
-                               $content[$key] = handleExtraValues($filterFunctions[$idx], $value, $extraValues[$idx]);
-                       } // END - foreach
-
-                       // Then list it
-                       $OUT .= loadTemplate(sprintf("admin_%s_%s_row",
-                               $listType,
-                               $table
-                               ), true, $content
-                       );
-               } // END - if
+               // Fetch the data
+               $content = sqlFetchArray($result);
 
                // Free the result
-               SQL_FREERESULT($result);
-       } // END - foreach
-
-       // Load master template
-       loadTemplate(sprintf("admin_%s_%s",
-               $listType,
-               $table
-               ), false, $OUT
-       );
-}
-
-// Change status of "build" list
-function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $userid = 'userid') {
-       // 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__);
-
-                       // Fetch the data
-                       $content = SQL_FETCHARRAY($result);
-
-                       // Free the result
-                       SQL_FREERESULT($result);
-
-                       // 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!
-                                       debug_report_bug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
-                               }
-                       } // END - foreach
-
-                       // 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, $userid, ('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]));
+               sqlFreeResult($result);
+
+               // 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',", sqlEscapeString($column), sqlEscapeString($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!
+                               reportBug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
+                       }
+               } // END - foreach
 
-                                               // Add entry
-                                               $content[$key] = $entries[$id];
-                                       }
+               // Add other columns as well
+               foreach (postRequestArray() as $key => $entries) {
+                       // Debug message
+                       /* DEBUG: */ 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,', sqlEscapeString($key), sqlEscapeString($entries[$id]));
                                } else {
-                                       // Skipped entry
-                                       logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
-                               }
-                       } // END - foreach
-
-                       // Finish SQL statement
-                       $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
-                               $idColumn,
-                               bigintval($id),
-                               $statusColumn,
-                               $oldStatus
-                       );
-
-                       // Run the SQL
-                       SQL_QUERY($sql, __FUNCTION__, __LINE__);
-
-                       // Do we have an URL?
-                       if (isset($content['url'])) {
-                               // Then add a framekiller test as well
-                               $content['frametester'] = generateFrametesterUrl($content['url']);
-                       } // END - if
+                                       // Add regular entry
+                                       $sql .= sprintf(" `%s`='%s',", sqlEscapeString($key), sqlEscapeString($entries[$id]));
 
-                       // Send "build mails" out
-                       sendAdminBuildMails($mode, $table, $content, $id, $statusInfo[$content[$column]]);
+                                       // Add entry
+                                       $content[$key] = $entries[$id];
+                               }
+                       } elseif (isDebugModeEnabled()) {
+                               // Skipped entry
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
+                       }
                } // END - foreach
-       } // END - if
-}
 
-// Delete rows by given id numbers
-function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = '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 === true) {
-                       // 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 (isPostRequestParameterSet($userid, $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);
+               // Finish SQL statement
+               $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
+                       $idColumn[0],
+                       bigintval($id),
+                       $statusColumn,
+                       $oldStatus
+               );
 
-                                       // Free the result
-                                       SQL_FREERESULT($result);
+               // Run the SQL
+               sqlQuery($sql, __FUNCTION__, __LINE__);
 
-                                       // Send "build mails" out
-                                       sendAdminBuildMails('delete', $table, $content, $id);
-                               } // END - if
+               // Send "build mails" out
+               sendGenericBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+       } // END - foreach
+}
 
-                               // Add id number
-                               $idList .= $id . ',';
-                       } // END - foreach
+// 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(), $content = 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
 
-                       // Run the query
-                       SQL_QUERY_ESC($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+       // Shall we delete here or list for deletion?
+       if ($deleteNow[0] === TRUE) {
+               // Call generic function
+               $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
-                       // Was this fine?
-                       if (SQL_AFFECTEDROWS() == count($IDs)) {
-                               // All deleted
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}');
-                       } else {
-                               // Some are still there :(
-                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
-                       }
+               // Was this fine?
+               if ($affected == countPostSelection($idColumn[0])) {
+                       // All deleted
+                       displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
                } else {
-                       // List for deletion confirmation
-                       adminListBuilder('delete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+                       // Some are still there :(
+                       displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), sqlAffectedRows(), countPostSelection($idColumn[0])));
                }
-       } // END - if
+       } else {
+               // List for deletion confirmation
+               adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
+       }
 }
 
 // Edit rows by given id numbers
-function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = '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 === true) {
-                       // 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?}_%s` SET",
-                                       SQL_ESCAPE($table)
-                               );
-                               foreach (postRequestArray() as $key => $entries) {
-                                       // Skip raw userid which is always invalid
-                                       if ($key == $userid) {
-                                               // Continue with next field
-                                               continue;
-                                       } // END - if
-
-                                       // Is entries an array?
-                                       if (($key != $idColumn) && (is_array($entries)) && (isset($entries[$id]))) {
-                                               // Add this entry to content
-                                               $content[$key] = $entries[$id];
-
-                                               // Send data through the filter function if found
-                                               if ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
-                                                       // Filter function set!
-                                                       $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
-                                               } // END - if
-
-                                               // Then add this value
-                                               $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;
-                                       }
-
-                                       // Do we have an URL?
-                                       if ($key == 'url') {
-                                               // Then add a framekiller test as well
-                                               $content['frametester'] = generateFrametesterUrl($content[$key]);
-                                       } // END - if
-                               } // END - foreach
-
-                               // Finish SQL command
-                               $sql = substr($sql, 0, -1) . " WHERE `" . $idColumn . "`=" . bigintval($id) . " LIMIT 1";
-
-                               // Run this query
-                               SQL_QUERY($sql, __FUNCTION__, __LINE__);
-
-                               // 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($table, $idColumn, $id), __FUNCTION__, __LINE__);
-
-                               // Fetch the data and merge it into $content
-                               $content = merge_array($content, SQL_FETCHARRAY($result));
-
-                               // Free the result
-                               SQL_FREERESULT($result);
+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(), $content = 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
 
-                               // Send "build mails" out
-                               sendAdminBuildMails('edit', $table, $content, $id);
-                       } // END - foreach
+       // Shall we change here or list for editing?
+       if ($editNow[0] === TRUE) {
+               // Call generic change method
+               $affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
-                       // Was this fine?
-                       if ($affected == count($IDs)) {
-                               // All deleted
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}');
-                       } else {
-                               // Some are still there :(
-                               loadTemplate('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
-                       adminListBuilder('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, $rawUserId, $content);
+       }
 }
 
 // Un-/lock rows by given id numbers
-function adminLockEntriesConfirm ($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 === false) || (count($statusArray) == 1))) {
-               // Shall we un-/lock here or list for locking?
-               if ($lockNow === true) {
-                       // Un-/lock entries
-                       adminBuilderStatusHandler('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
-               } else {
-                       // List for editing
-                       adminListBuilder('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
-               }
+// @TODO rawUserId/content is not yet supported
+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 adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $undeleteNow=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)) && (($undeleteNow === false) || (count($statusArray) == 1))) {
-               // Shall we un-/lock here or list for locking?
-               if ($undeleteNow === true) {
-                       // Undelete entries
-                       adminBuilderStatusHandler('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
-               } else {
-                       // List for editing
-                       adminListBuilder('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
-               }
+// @TODO rawUserId/cacheFiles/content is not yet supported
+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);
+       }
+}
+
+// Adds a given entry to the database
+function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+       // Is the userid set?
+       if (!isPostRequestElementSet('userid')) {
+               // Then set NULL here
+               setPostRequestElement('userid', NULL);
+       } // END - if
+
+       // Call inner function
+       doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
+
+       // Entry has been added?
+       if ((!ifSqlHasZeroAffectedRows()) && ($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 www.mxchange.org
+// 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 = sendGetRequest('check-updates3.php');
+       $content = sendHttpGetRequest('check-updates3.php');
 
        // Is the first line with "200 OK"?
-       $valid = (strpos($content[0], '200 OK') !== false);
+       $valid = isInString('200 OK', $content[0]);
 
        // Return result
        return $valid;
@@ -1113,23 +1148,23 @@ function sendAdminPasswordResetLink ($email) {
        $OUT = '';
 
        // Look up administator login
-       $result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `email`='%s' LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
                array($email), __FUNCTION__, __LINE__);
 
        // Is there an account?
-       if (SQL_HASZERONUMS($result)) {
+       if (ifSqlHasZeroNumRows($result)) {
                // No account found
                return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
        } // END - if
 
        // Load all data
-       $content = SQL_FETCHARRAY($result);
+       $content = sqlFetchArray($result);
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Generate hash for reset link
-       $content['hash'] = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $content['login'] . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
+       $content['hash'] = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $content['login'] . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
 
        // Remove some data
        unset($content['id']);
@@ -1148,26 +1183,26 @@ function sendAdminPasswordResetLink ($email) {
 // Validate hash and login for password reset
 function adminResetValidateHashLogin ($hash, $login) {
        // By default nothing validates... ;)
-       $valid = false;
+       $valid = FALSE;
 
        // Then try to find that user
-       $result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
                array($login), __FUNCTION__, __LINE__);
 
        // Is an account here?
-       if (SQL_NUMROWS($result) == 1) {
+       if (sqlNumRows($result) == 1) {
                // Load all data
-               $content = SQL_FETCHARRAY($result);
+               $content = sqlFetchArray($result);
 
                // Generate hash again
-               $hashFromData = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $login . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
+               $hashFromData = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $login . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
 
                // Does both match?
                $valid = ($hash == $hashFromData);
        } // END - if
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Return result
        return $valid;
@@ -1175,15 +1210,20 @@ function adminResetValidateHashLogin ($hash, $login) {
 
 // Reset the password for the login. Do NOT call this function without calling above function first!
 function doResetAdminPassword ($login, $password) {
-       // Generate hash (we already check for sql_patches in generateHash())
+       // Generate hash (we already check for ext-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_form_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--}';
@@ -1203,16 +1243,13 @@ function adminDeleteTask ($id) {
 
 // Function to update task data
 function adminUpdateTaskData ($id, $row, $data) {
-       // Should be admin!
+       // Should be admin and valid id
        if (!isAdmin()) {
                // Not an admin so redirect better
-               redirectToUrl('modules.php?module=index');
-       } // END - if
-
-       // Is the id not set, then we need a backtrace here... :(
-       if ($id <= 0) {
+               reportBug(__FUNCTION__, __LINE__, 'id=' . $id . ',row=' . $row . ',data=' . $data . ' - isAdmin()=false');
+       } elseif ($id <= 0) {
                // Initiate backtrace
-               debug_report_bug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
+               reportBug(__FUNCTION__, __LINE__, sprintf('id is invalid: %s. row=%s, data=%s',
                        $id,
                        $row,
                        $data
@@ -1220,7 +1257,7 @@ function adminUpdateTaskData ($id, $row, $data) {
        } // END - if
 
        // Update the task
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
+       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
                array(
                        $row,
                        $data,
@@ -1228,7 +1265,7 @@ function adminUpdateTaskData ($id, $row, $data) {
                ), __FUNCTION__, __LINE__);
 }
 
-// Checks wether if the admin menu has entries
+// Checks whether if the admin menu has entries
 function ifAdminMenuHasEntries ($action) {
        return (
                ((
@@ -1236,7 +1273,7 @@ function ifAdminMenuHasEntries ($action) {
                        isset($GLOBALS['admin_menu_has_entries'][$action])
                ) && (
                        // And do we have a menu for this action?
-                       $GLOBALS['admin_menu_has_entries'][$action] === true
+                       $GLOBALS['admin_menu_has_entries'][$action] === TRUE
                )) || (
                        // Login has always a menu
                        $action == 'login'
@@ -1252,7 +1289,7 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
 // Creates a link to the user's admin-profile
 function adminCreateUserLink ($userid) {
        // Is the userid set correctly?
-       if (isValidUserId($userid)) {
+       if (isValidId($userid)) {
                // Create a link to that profile
                return '{%url=modules.php?module=admin&amp;what=list_user&amp;userid=' . bigintval($userid) . '%}';
        } // END - if
@@ -1264,10 +1301,10 @@ function adminCreateUserLink ($userid) {
 // Generate a "link" for the given admin id (admin_id)
 function generateAdminLink ($adminId) {
        // No assigned admin is default
-       $adminLink = '<span class="notice">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>';
+       $adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
 
        // Zero? = Not assigned
-       if (bigintval($adminId) > 0) {
+       if (isValidId($adminId)) {
                // Load admin's login
                $login = getAdminLogin($adminId);
 
@@ -1279,11 +1316,11 @@ function generateAdminLink ($adminId) {
                                $adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
                        } else {
                                // Extension not found
-                               $adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
+                               $adminLink = '{%message,ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED=admins%}';
                        }
                } else {
                        // Maybe deleted?
-                       $adminLink = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+                       $adminLink = '<div class="bad">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
                }
        } // END - if
 
@@ -1311,20 +1348,17 @@ function doVerifyExpertSettings () {
                // Is he allowed?
                if ($expertSettings == 'Y') {
                        // Okay, does he want to see them?
-                       if (getAminsExpertWarning() == 'Y') {
+                       if (isAdminsExpertWarningEnabled()) {
                                // Ask for them
-                               if (isFormSent()) {
+                               if (isFormSent('save_expert')) {
                                        // Is the element set, then we need to change the admin
-                                       if (isPostRequestParameterSet('expert_settings')) {
+                                       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
-                                               unsetPostRequestParameter('ok');
                                        } // END - if
 
                                        // All fine!
@@ -1340,6 +1374,13 @@ function doVerifyExpertSettings () {
                                // Do not display
                                $return = 'agreed';
                        }
+
+                       // Is a form sent?
+                       if ((isFormSent()) && (isPostRequestElementSet('expert_settings'))) {
+                               // Clear form
+                               unsetPostRequestElement('ok');
+                               unsetPostRequestElement('expert_settings');
+                       } // END - if
                } else {
                        // Forbidden
                        $return = 'forbidden';
@@ -1352,7 +1393,7 @@ function doVerifyExpertSettings () {
        // Output message for other status than ask/agreed
        if (($return != 'ask') && ($return != 'agreed')) {
                // Output message
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
+               displayMessage('{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
        } // END - if
 
        // Return status
@@ -1360,14 +1401,14 @@ function doVerifyExpertSettings () {
 }
 
 // Generate link to unconfirmed mails for admin
-function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
+function generateUnconfirmedAdminLink ($id, $unconfirmed, $type) {
        // Init output
        $OUT = $unconfirmed;
 
-       // Do we have unconfirmed mails?
+       // 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>';
+               $OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;type=' . $type . '&amp;id=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
        } // END - if
 
        // Return it
@@ -1383,14 +1424,14 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
        } // END - if
 
        $TOP = '';
-       if ($show_form === false) {
+       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 == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                        // Is currently selected, so only highlight it
                        $NAV .= '<strong>-';
                } else {
@@ -1398,13 +1439,13 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
                        $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 ((isGetRequestParameterSet('userid')) && (isValidUserId(getRequestParameter('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
+                       if ((isGetRequestElementSet('userid')) && (isValidId(getRequestElement('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
 
                        // Close open anchor tag
                        $NAV .= '%}">';
                }
                $NAV .= $page;
-               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                        // Is currently selected, so only highlight it
                        $NAV .= '-</strong>';
                } else {
@@ -1412,7 +1453,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
                        $NAV .= '</a>';
                }
 
-               // Add seperator if we have not yet reached total pages
+               // Add separator if total pages has not been reached
                if ($page < $numPages) {
                        // Add it
                        $NAV .= '|';
@@ -1425,9 +1466,9 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
        $content['top']  = $TOP;
 
        // Load navigation template
-       $OUT = loadTemplate('admin_email_nav_row', true, $content);
+       $OUT = loadTemplate('admin_email_nav_row', TRUE, $content);
 
-       if ($return === true) {
+       if ($return === TRUE) {
                // Return generated HTML-Code
                return $OUT;
        } else {
@@ -1439,7 +1480,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 // Process menu editing form
 function adminProcessMenuEditForm ($type, $subMenu) {
        // An action is done...
-       foreach (postRequestParameter('sel') as $sel => $menu) {
+       foreach (postRequestElement('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";
 
                $sel = bigintval($sel);
@@ -1448,112 +1489,257 @@ function adminProcessMenuEditForm ($type, $subMenu) {
                        $AND = "`action`='" . $subMenu . "'";
                } // END - if
 
-               switch (postRequestParameter('ok')) {
+               switch (postRequestElement('ok')) {
                        case 'edit': // Edit menu
-                               if (postRequestParameter('sel_what', $sel) == '') {
+                               // 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",
+                                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
                                                array(
                                                        $type,
                                                        $menu,
-                                                       postRequestParameter('sel_action', $sel),
+                                                       postRequestElement('sel_action', $sel),
                                                        $sel
-                                               ), __FILE__, __LINE__);
+                                               ), __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",
+                                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
                                                array(
                                                        $type,
                                                        $menu,
-                                                       postRequestParameter('sel_action', $sel),
-                                                       postRequestParameter('sel_what', $sel),
+                                                       postRequestElement('sel_action', $sel),
+                                                       postRequestElement('sel_what', $sel),
                                                        $sel
-                                               ), __FILE__, __LINE__);
+                                               ), __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), __FILE__, __LINE__);
+                               sqlQueryEscaped("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, postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
+                               sqlQueryEscaped("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(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+                               logDebugMessage(__FUNCTION__, __LINE__, sprintf('Unsupported action %s detected.', postRequestElement('ok')));
+                               displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
                                break;
                } // END - switch
        } // END - foreach
 
        // Load template
-       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+       displayMessage('{--SETTINGS_SAVED--}');
 }
 
 // Handle weightning
-function doAdminProcessMenuWeightning ($type) {
+function doAdminProcessMenuWeightning ($type, $AND) {
        // Are there all required (generalized) GET parameter?
-       if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
+       if ((isGetRequestElementSet('act')) && (isGetRequestElementSet('tid')) && (isGetRequestElementSet('fid'))) {
                // Init variables
                $tid = ''; $fid = '';
 
                // Get ids
-               if (isGetRequestParameterSet('w')) {
+               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",
+                       $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       getRequestParameter('act'),
-                                       bigintval(getRequestParameter('tid'))
-                               ), __FILE__, __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",
+                                       getRequestElement('act'),
+                                       bigintval(getRequestElement('tid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($tid) = sqlFetchRow($result);
+                       sqlFreeResult($result);
+                       $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       getRequestParameter('act'),
-                                       bigintval(getRequestParameter('fid'))
-                               ), __FILE__, __LINE__);
-                       list($fid) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);
+                                       getRequestElement('act'),
+                                       bigintval(getRequestElement('fid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($fid) = sqlFetchRow($result);
+                       sqlFreeResult($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",
+                       $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('tid'))
-                               ), __FILE__, __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",
+                                       bigintval(getRequestElement('tid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($tid) = sqlFetchRow($result);
+                       sqlFreeResult($result);
+                       $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('fid'))
-                               ), __FILE__, __LINE__);
-                       list($fid) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);
+                                       bigintval(getRequestElement('fid'))
+                               ), __FUNCTION__, __LINE__);
+                       list($fid) = sqlFetchRow($result);
+                       sqlFreeResult($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",
+                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('tid')),
+                                       bigintval(getRequestElement('tid')),
                                        bigintval($fid)
-                               ), __FILE__, __LINE__);
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+                               ), __FUNCTION__, __LINE__);
+                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('fid')),
+                                       bigintval(getRequestElement('fid')),
                                        bigintval($tid)
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                } // END - if
        } // END - if
 }
 
+// Function to register first admin
+function registerFirstAdmin () {
+       // Make sure that no admin is registered
+       assert(!isAdminRegistered());
+
+       // Admin is not registered so we have to inform the user
+       if ((isFormSent('add_first_admin')) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password1')) || (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestElementSet('admin_password2')) || (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) || (postRequestElement('admin_password1') != postRequestElement('admin_password2')))) {
+               setPostRequestElement('add_first_admin', '***');
+       } // END - if
+
+       // Clear error message
+       $errorMessage = '';
+       $ret = 'init';
+
+       // Is form for first admin sent?
+       if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') != '***')) {
+               // Hash the password with the old function because we are here in install mode
+               $hashedPass = md5(postRequestElement('admin_password1'));
+
+               // Kill maybe existing session variables
+               destroyAdminSession();
+
+               // Do registration
+               $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster(), 'allow');
+
+               // Check if registration wents fine
+               switch ($ret) {
+                       case 'done':
+                               // Change ADMIN_REGISTERED entry
+                               $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+
+                               // Was it successfull?
+                               if ($done === TRUE) {
+                                       // Registering is done
+                                       redirectToUrl('modules.php?module=admin&amp;register=done');
+                               } else {
+                                       // Registration incomplete
+                                       $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
+
+                                       // Set this to have our error message displayed
+                                       setPostRequestElement('add_first_admin', '***');
+                               }
+                               break;
+
+                       case 'failed': // Registration has failed
+                               $errorMessage = '{--ADMIN_REGISTER_FAILED--}';
+
+                               // Set this to have our error message displayed
+                               setPostRequestElement('add_first_admin', '***');
+                               break;
+
+                       case 'already': // Admin does already exists!
+                               $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
+
+                               // Set this to have our error message displayed
+                               setPostRequestElement('add_first_admin', '***');
+                               break;
+
+                       default:
+                               // Any other kind will be logged
+                               $errorMessage = sprintf('Unknown return code %s from ifAdminLoginDataIsValid().', $ret);
+                               logDebugMessage(__FUNCTION__, __LINE__, $errorMessage);
+
+                               // Set this to have our error message displayed
+                               setPostRequestElement('add_first_admin', '***');
+                               break;
+               } // END - switch
+       } // END - if
+
+       // Whas that action okay?
+       if ($ret != 'done') {
+               // Init login name
+               $content['admin_login'] = '';
+               if (isPostRequestElementSet('admin_login')) {
+                       $content['admin_login'] = postRequestElement('admin_login');
+               } // END - if
+
+               // Init array elements
+               $content['login_message'] = '';
+               $content['password1_message'] = '';
+               $content['password2_message'] = '';
+               $content['error_message'] = '';
+
+               // Yet-another notice-fix
+               if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') == '***')) {
+                       // Init variables
+                       $loginMessage = '';
+                       $password1Message = '';
+                       $password2Message = '';
+
+                       // No login entered?
+                       if (empty($content['admin_login'])) {
+                               $loginMessage = '{--ADMIN_NO_LOGIN--}';
+                       } // END - if
+
+                       // An error comes back from registration?
+                       if ((!empty($ret)) && ($ret != 'init')) {
+                               $loginMessage = $errorMessage;
+                       } // END - if
+
+                       // No password 1 entered or to short?
+                       if (!isPostRequestElementSet('admin_password1')) {
+                               $password1Message = '{--ADMIN_NO_PASSWORD1--}';
+                       } elseif (!isStrongPassword(postRequestElement('admin_password1'))) {
+                               $password1Message = '{--ADMIN_WEAK_PASSWORD1--}';
+                       }
+
+                       // No password 2 entered or to short?
+                       if (!isPostRequestElementSet('admin_password2')) {
+                               $password2Message = '{--ADMIN_NO_PASSWORD2--}';
+                       } elseif (!isStrongPassword(postRequestElement('admin_password2'))) {
+                               $password2Message = '{--ADMIN_WEAK_PASSWORD2--}';
+                       }
+
+                       // Both didn't match?
+                       if (postRequestElement('admin_password1') != postRequestElement('admin_password2')) {
+                               // No match
+                               if (empty($password1Message)) $password1Message = '{--ADMIN_PASSWORD1_MISMATCH--}';
+                               if (empty($password2Message)) $password2Message = '{--ADMIN_PASSWORD2_MISMATCH--}';
+                       } // END - if
+
+                       // Output error messages
+                       $content['login_message']     = loadTemplate('admin_login_msg', TRUE, $loginMessage);
+                       $content['password1_message'] = loadTemplate('admin_login_msg', TRUE, $password1Message);
+                       $content['password2_message'] = loadTemplate('admin_login_msg', TRUE, $password2Message);
+                       $content['error_message']     = loadTemplate('admin_login_msg', TRUE, $errorMessage);
+               } // END - if
+
+               // Output message in seperate template
+               displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
+
+               // Load register template
+               loadTemplate('admin_reg_form', FALSE, $content);
+       } // END - if
+}
+
 // [EOF]
 ?>