Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...
[mailer.git] / inc / modules / admin / admin-inc.php
index a361b092f1c78d79a946ed36d4ba68cd568a8c32..38a180263d479516d47596ad8aa042dd61ee3e2e 100644 (file)
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -130,7 +130,7 @@ 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) {
@@ -143,25 +143,14 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
        } // END - if
 
        // Return status
-       //* DEBUG: */ debugOutput('ret='.$ret);
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret='.$ret);
        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);
@@ -177,10 +166,10 @@ function doAdminAction () {
        // 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['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
@@ -191,12 +180,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,7 +196,7 @@ LIMIT 1",
                        $what
                ), __FUNCTION__, __LINE__);
 
-       // Do we have an entry?
+       // Is there an entry?
        if (SQL_NUMROWS($result_action) == 1) {
                // Is valid but does the inlcude file exists?
                $inc = sprintf("inc/modules/admin/action-%s.php", $action);
@@ -233,14 +222,16 @@ LIMIT 1",
        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!)
+/**
+ * Checks whether 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?
+       // 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')) || (isAdminsAllowedByAcl($action, $what)));
+               $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || ((isExtensionActive('admins')) && (isAdminsAllowedByAcl($action, $what))));
        } // END - if
 
        // Return the cached value
@@ -248,18 +239,20 @@ function isAdminAllowedAccessMenu ($action, $what = NULL) {
 }
 
 // Adds an admin menu
-function addAdminMenu ($action, $what, $return = false) {
+function addAdminMenu ($action, $what) {
        // Init variables
        $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`
+       `action` AS `main_action`,
+       `title` AS `main_title`,
+       `descr` AS `main_descr`
 FROM
        `{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -268,55 +261,78 @@ ORDER BY
        `sort` ASC,
        `id` DESC", __FUNCTION__, __LINE__);
 
-       // Do we have entries?
+       // Are there entries?
        if (!SQL_HASZERONUMS($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 = SQL_FETCHARRAY($result_main)) {
+                       // Filename
+                       $inc = sprintf("inc/modules/admin/action-%s.php", $mainContent['main_action']);
 
                        // Is the current admin allowed to access this 'action' menu?
-                       if (isAdminAllowedAccessMenu($menu)) {
+                       if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
                                if ($SUB === false) {
                                        // Insert compiled menu title and description
-                                       $GLOBALS['menu']['title'][$menu]      = $title;
-                                       $GLOBALS['menu']['description'][$menu] = $descr;
+                                       $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,ADMIN_MENU_ACTION_404_TITLE=' . $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
+               SQL_FREERESULT($result_main);
+       } // END - if
+
+       // Return content
+       return $OUT;
+}
+
+// Add admin sub menu
+function addAdminSubMenu ($mainContent, $action, $what) {
+       // Init content
+       $OUT = '';
+
+       // Check for menu entries
+       $result_what = SQL_QUERY_ESC("SELECT
+       `what` AS `sub_what`,
+       `title` AS `sub_title`,
+       `descr` AS `sub_descr`
 FROM
        `{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -326,78 +342,78 @@ 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'], ((!SQL_HASZERONUMS($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+
+       // Start li-tag for sub menu content
+       $OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
+
+       // Are there entries?
+       if (ifAdminMenuHasEntries($mainContent['main_action'])) {
+               // Sub menu has been called
+               $SUB = true;
+
+               // Are there entries?
+               if (!SQL_HASZERONUMS($result_what)) {
+                       // Start HTML code
+                       $OUT .= '<ul class="admin_menu_sub">';
+
+                       // Load all entries
+                       while ($subContent = SQL_FETCHARRAY($result_what)) {
+                               // Filename
+                               $inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
+
+                               // Is the current admin allowed to access this 'what' menu?
+                               if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
+                                       // Insert compiled title and description
+                                       $GLOBALS['menu']['title'][$subContent['sub_what']]       = $subContent['sub_title'];
+                                       $GLOBALS['menu']['description'][$subContent['sub_what']] = $subContent['sub_descr'];
+                                       $OUT .= '<li class="admin_menu">
 <div class="nobr"><strong>--&gt;</strong>&nbsp;';
-                                                       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,ADMIN_MENU_WHAT_404_TITLE=' . $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>';
+               SQL_FREERESULT($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 an admin selection box form
@@ -413,7 +429,9 @@ function addAdminSelectionBox ($adminId = NULL, $special = '') {
 
        // Query all entries
        $result = SQL_QUERY('SELECT
-       `id`,`login`' . $ADD . '
+       `id`,
+       `login`
+       ' . $ADD . '
 FROM
        `{?_MYSQL_PREFIX?}_admins`
 ORDER BY
@@ -439,12 +457,15 @@ ORDER BY
 }
 
 // Create a member selection box
-function addMemberSelectionBox ($userid = NULL, $add_all = false, $return = false, $none = false, $field = 'userid') {
+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`
+       `userid`,
+       `surname`,
+       `family`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
+' . $whereStatement . '
 ORDER BY
        `userid` ASC', __FUNCTION__, __LINE__);
 
@@ -460,8 +481,11 @@ ORDER BY
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . intval($userid) . '/' . $content['userid']);
                $OUT .= '<option value="' . bigintval($content['userid']) . '"';
-               if ($userid == $content['userid']) $OUT .= ' selected="selected"';
+               if (bigintval($userid) === bigintval($content['userid'])) {
+                       $OUT .= ' selected="selected"';
+               } // END - if
                $OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';
        } // END - while
 
@@ -499,7 +523,9 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
                // Load all entries
                while ($content = SQL_FETCHARRAY($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
 
@@ -535,37 +561,40 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
        // Now, walk through all entries and prepare them for saving
        foreach ($postData as $id => $val) {
                // Process only formular field but not submit buttons ;)
-               if ($id != 'ok') {
-                       // Do not save the ok value
-                       convertSelectionsToEpocheTime($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 == 'ok') {
+                       // 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
+
+                       // Shall we add numbers or strings?
+                       $test = (float) $val;
+                       if ('' . $val . '' == '' . $test . '') {
+                               // Add numbers
+                               array_push($tableData, sprintf("`%s`=%s", $id, $test));
+                       } elseif (is_null($val)) {
+                               // Add NULL
+                               array_push($tableData, sprintf("`%s`=NULL", $id));
+                       } else {
+                               // Add strings
+                               array_push($tableData, sprintf("`%s`='%s'", $id, trim($val)));
+                       }
+
+                       // Do not add a config entry twice
+                       $GLOBALS['skip_config'][$id] = true;
+
+                       // Update current configuration
+                       setConfigEntry($id, $val);
                } // END - if
        } // END - foreach
 
@@ -595,13 +624,13 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
                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)",
@@ -652,9 +681,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
@@ -675,12 +706,14 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
                $title = $userid;
        } elseif (!isValidUserId($userid)) {
                // User id zero is invalid
-               return '<strong>' . makeNullToZero($userid) . '</strong>';
+               return '<strong>' . convertNullToZero($userid) . '</strong>';
        }
 
        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);
@@ -723,7 +756,7 @@ function adminGetMenuMode () {
                $result = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
                        array($adminId), __FUNCTION__, __LINE__);
 
-               // Do we have an entry?
+               // Is there an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
                        list($adminMode) = SQL_FETCHROW($result);
@@ -802,10 +835,10 @@ function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // $tableName is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
                // $tableName is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
 
        // Default subject is the subject part
@@ -846,20 +879,20 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
        // $tableName and $idColumn must bove be arrays!
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // $tableName is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif (!is_array($idColumn)) {
                // $idColumn is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
                // $tableName is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
        }
 
        // Init row output
        $OUT = '';
 
        // "Walk" through all entries
-       //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,idColumn=<pre>'.print_r($idColumn,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
+       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,idColumn=<pre>'.print_r($idColumn,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
        foreach (postRequestElement($idColumn[0]) as $id => $selected) {
                // Secure id number
                $id = bigintval($id);
@@ -880,30 +913,34 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
                                // Skip any missing entries
                                if ($idx === false) {
                                        // Skip this one
-                                       //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
+                                       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
                                        continue;
                                } // END - if
 
-                               // Do we have a userid?
+                               // Is there a userid?
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
                                if ($key == $userIdColumn[0]) {
                                        // Add it again as raw id
-                                       //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
-                                       $content[$userIdColumn[0]] = makeZeroToNull($value);
+                                       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
+                                       $content[$userIdColumn[0]] = convertZeroToNull($value);
                                        $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
                                } // END - if
 
                                // If the key matches the idColumn variable, we need to temporary remember it
-                               //* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn[0] . ',value=' . $value);
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn=' . $idColumn[0] . ',value=' . $value);
                                if ($key == $idColumn[0]) {
-                                       // Found, so remember it
-                                       $GLOBALS['admin_list_builder_id_value'] = $value;
+                                       /*
+                                        * Found, so remember it securely (to make sure only id
+                                        * numbers can pass, don't use alpha-numerical values!)
+                                        */
+                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' - set as admin_list_builder_id_value!');
+                                       $GLOBALS['admin_list_builder_id_value'] = bigintval($value);
                                } // END - if
 
-                               // Do we have a call-back function and extra-value pair?
+                               // Is there a call-back function and extra-value pair?
                                if ((isset($filterFunctions[$idx])) && (isset($extraValues[$idx]))) {
                                        // Handle the call in external function
-                                       //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
+                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
                                        $content[$key] = handleExtraValues(
                                                $filterFunctions[$idx],
                                                $value,
@@ -911,7 +948,7 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
                                        );
                                } elseif ((isset($columns[$idx]['name'])) && (isset($filterFunctions[$columns[$idx]['name']])) && (isset($extraValues[$columns[$idx]['name']]))) {
                                        // Handle the call in external function
-                                       //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$columns[$idx]['name']] . ',value=' . $value);
+                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$columns[$idx]['name']] . ',value=' . $value);
                                        $content[$key] = handleExtraValues(
                                                $filterFunctions[$columns[$idx]['name']],
                                                $value,
@@ -941,289 +978,298 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
 }
 
 // Change status of "build" list
-function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $rawUserId = array('userid')) {
+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
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+               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
-               debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
                // $tableName is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
 
-       // All valid entries? (We hope so here!)
-       if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
-               // "Walk" through all entries
-               foreach (postRequestElement($idColumn[0]) as $id => $sel) {
-                       // Construct SQL query
-                       $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
+       // "Walk" through all entries
+       foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+               // Construct SQL query
+               $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
 
-                       // Load data of entry
-                       $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
-                               array(
-                                       $tableName[0],
-                                       $idColumn[0],
-                                       $id
-                               ), __FUNCTION__, __LINE__);
-
-                       // Fetch the data
-                       $content = SQL_FETCHARRAY($result);
+               // Load data of entry
+               $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+                       array(
+                               $tableName[0],
+                               $idColumn[0],
+                               $id
+                       ), __FUNCTION__, __LINE__);
 
-                       // Free the result
-                       SQL_FREERESULT($result);
+               // Fetch the data
+               $content = SQL_FETCHARRAY($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
+               // Free the result
+               SQL_FREERESULT($result);
 
-                       // Add other columns as well
-                       foreach (postRequestArray() as $key => $entries) {
-                               // Debug message
-                               logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
-
-                               // Skip id, raw userid and 'do_$mode'
-                               if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
-                                       // Are there brackets () at the end?
-                                       if (substr($entries[$id], -2, 2) == '()') {
-                                               // Direct SQL command found
-                                               $sql .= sprintf(" `%s`=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
-                                       } else {
-                                               // Add regular entry
-                                               $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+               // 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!
+                               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
+                       logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
+
+                       // Skip id, raw userid and 'do_$mode'
+                       if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
+                               // Are there brackets () at the end?
+                               if (substr($entries[$id], -2, 2) == '()') {
+                                       // Direct SQL command found
+                                       $sql .= sprintf(" `%s`=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
                                } else {
-                                       // Skipped entry
-                                       logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
-                               }
-                       } // END - foreach
+                                       // Add regular entry
+                                       $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
 
-                       // Finish SQL statement
-                       $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
-                               $idColumn[0],
-                               bigintval($id),
-                               $statusColumn,
-                               $oldStatus
-                       );
+                                       // Add entry
+                                       $content[$key] = $entries[$id];
+                               }
+                       } else {
+                               // Skipped entry
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
+                       }
+               } // END - foreach
 
-                       // Run the SQL
-                       SQL_QUERY($sql, __FUNCTION__, __LINE__);
+               // Finish SQL statement
+               $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
+                       $idColumn[0],
+                       bigintval($id),
+                       $statusColumn,
+                       $oldStatus
+               );
 
-                       // Do we have an URL?
-                       if (isset($content['url'])) {
-                               // Then add a framekiller test as well
-                               $content['frametester'] = generateFrametesterUrl($content['url']);
-                       } // END - if
+               // Run the SQL
+               SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
-                       // Send "build mails" out
-                       sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
-               } // END - foreach
-       } // END - if
+               // Send "build mails" out
+               sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+       } // 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')) {
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+               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
-               debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif (!is_array($userIdColumn)) {
                // $userIdColumn is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif (!is_array($deleteNow)) {
                // $deleteNow is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'deleteNow[]=' . gettype($deleteNow) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'deleteNow[]=' . gettype($deleteNow) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
 
-       // All valid entries? (We hope so here!)
-       if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
-               // Shall we delete here or list for deletion?
-               if ($deleteNow[0] === true) {
-                       // The base SQL command:
-                       $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
-
-                       // Delete them all
-                       $idList = '';
-                       foreach (postRequestElement($idColumn[0]) as $id => $sel) {
-                               // Is there a userid?
-                               if (isPostRequestElementSet($rawUserId[0], $id)) {
-                                       // Load all data from that id
-                                       $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
-                                               array(
-                                                       $tableName[0],
-                                                       $idColumn[0],
-                                                       $id
-                                               ), __FUNCTION__, __LINE__);
+       // Shall we delete here or list for deletion?
+       if ($deleteNow[0] === true) {
+               // The base SQL command:
+               $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
 
-                                       // Fetch the data
-                                       $content = SQL_FETCHARRAY($result);
+               // Delete them all
+               $idList = '';
+               foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+                       // Is there a userid?
+                       if (isPostRequestElementSet($rawUserId[0], $id)) {
+                               // Load all data from that id
+                               $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+                                       array(
+                                               $tableName[0],
+                                               $idColumn[0],
+                                               $id
+                                       ), __FUNCTION__, __LINE__);
 
-                                       // Free the result
-                                       SQL_FREERESULT($result);
+                               // Fetch the data
+                               $content = SQL_FETCHARRAY($result);
 
-                                       // Send "build mails" out
-                                       sendAdminBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
-                               } // END - if
+                               // Free the result
+                               SQL_FREERESULT($result);
 
-                               // Add id number
-                               $idList .= $id . ',';
-                       } // END - foreach
+                               // Send "build mails" out
+                               sendAdminBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
+                       } // END - if
 
-                       // Run the query
-                       SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+                       // Add id number
+                       $idList .= $id . ',';
+               } // END - foreach
 
-                       // Was this fine?
-                       if (SQL_AFFECTEDROWS() == count(postRequestElement($idColumn[0]))) {
-                               // All deleted
-                               displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
-                       } else {
-                               // Some are still there :(
-                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count(postRequestElement($idColumn[0]))));
-                       }
+               // Run the query
+               SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+
+               // Was this fine?
+               if (SQL_AFFECTEDROWS() == countPostSelection($idColumn[0])) {
+                       // All deleted
+                       displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
                } else {
-                       // List for deletion confirmation
-                       adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+                       // Some are still there :(
+                       displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), countPostSelection($idColumn[0])));
                }
-       } // END - if
+       } else {
+               // List for deletion confirmation
+               adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+       }
 }
 
 // Edit rows by given id numbers
-function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid')) {
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+               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
-               debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif (!is_array($userIdColumn)) {
                // $userIdColumn is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif (!is_array($editNow)) {
                // $editNow is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'editNow[]=' . gettype($editNow) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'editNow[]=' . gettype($editNow) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
 
-       // All valid entries? (We hope so here!)
-       //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn=<pre>'.print_r($idColumn,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,editNow=<pre>'.print_r($editNow,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
-       //if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
-       if (true) {
-               // Shall we change here or list for editing?
-               if ($editNow[0] === true) {
-                       // Change them all
-                       $affected = '0';
-                       foreach (postRequestElement($idColumn[0]) as $id => $sel) {
-                               // Prepare content array (new values)
-                               $content = array();
-
-                               // Prepare SQL for this row
-                               $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
-                                       SQL_ESCAPE($tableName[0])
-                               );
-                               foreach (postRequestArray() as $key => $entries) {
-                                       // Skip raw userid which is always invalid
-                                       if ($key == $rawUserId[0]) {
-                                               // Continue with next field
-                                               continue;
-                                       } // END - if
+       // Shall we change here or list for editing?
+       if ($editNow[0] === true) {
+               // Change them all
+               $affected = '0';
+               foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+                       // Prepare content array (new values)
+                       $content = array();
 
-                                       // Is entries an array?
-                                       if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
-                                               // Add this entry to content
-                                               $content[$key] = $entries[$id];
+                       // Prepare SQL for this row
+                       $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
+                               SQL_ESCAPE($tableName[0])
+                       );
 
-                                               // 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
+                       // "Walk" through all entries
+                       foreach (postRequestArray() as $key => $entries) {
+                               // Skip raw userid which is always invalid
+                               if ($key == $rawUserId[0]) {
+                                       // Continue with next field
+                                       //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',rawUserId=' . $rawUserId[0]);
+                                       continue;
+                               } // END - if
 
-                                               // Then add this value
+                               // Debug message
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,true).'</pre>');
+
+                               // Is entries an array?
+                               if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
+                                       // Add this entry to content
+                                       $content[$key] = $entries[$id];
+
+                                       // Send data through the filter function if found
+                                       if ($key == $userIdColumn[0]) {
+                                               // Is the userid, we have to process it with convertZeroToNull()
+                                               $entries[$id] = convertZeroToNull($entries[$id]);
+                                       } elseif ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
+                                               // Filter function set!
+                                               $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
+                                       }
+
+                                       // Is the value NULL?
+                                       if ($entries[$id] == 'NULL') {
+                                               // Add it directly
+                                               $sql .= sprintf(' `%s`=NULL,',
+                                                       SQL_ESCAPE($key)
+                                               );
+                                       } else {
+                                               // Else add the value covered
                                                $sql .= sprintf(" `%s`='%s',",
                                                        SQL_ESCAPE($key),
                                                        SQL_ESCAPE($entries[$id])
                                                );
-                                       } elseif (($key != $idColumn[0]) && (!is_array($entries))) {
-                                               // Add normal entries as well!
-                                               $content[$key] =  $entries;
                                        }
+                               } elseif (($key != $idColumn[0]) && (!is_array($entries))) {
+                                       // Add normal entries as well!
+                                       $content[$key] =  $entries;
+                               }
+                       } // END - foreach
 
-                                       // Do we have an URL?
-                                       if ($key == 'url') {
-                                               // Then add a framekiller test as well
-                                               $content['frametester'] = generateFrametesterUrl($content[$key]);
-                                       } // END - if
-                               } // END - foreach
+                       // Finish SQL command
+                       $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id) . " LIMIT 1";
 
-                               // Finish SQL command
-                               $sql = substr($sql, 0, -1) . " WHERE `" . $idColumn[0] . "`=" . bigintval($id) . " LIMIT 1";
+                       // Run this query
+                       SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
-                               // Run this query
-                               SQL_QUERY($sql, __FUNCTION__, __LINE__);
+                       // Add affected rows
+                       $affected += SQL_AFFECTEDROWS();
 
-                               // Add affected rows
-                               $affected += SQL_AFFECTEDROWS();
+                       // Load all data from that id
+                       $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+                               array(
+                                       $tableName[0],
+                                       $idColumn[0],
+                                       $id
+                               ), __FUNCTION__, __LINE__);
 
-                               // Load all data from that id
-                               $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
-                                       array(
-                                               $tableName[0],
-                                               $idColumn[0],
-                                               $id
-                                       ), __FUNCTION__, __LINE__);
+                       // Fetch the data and merge it into $content
+                       $content = merge_array($content, SQL_FETCHARRAY($result));
 
-                               // Fetch the data and merge it into $content
-                               $content = merge_array($content, SQL_FETCHARRAY($result));
+                       // Free the result
+                       SQL_FREERESULT($result);
 
-                               // Free the result
-                               SQL_FREERESULT($result);
+                       // Send "build mails" out
+                       sendAdminBuildMails('edit', $tableName, $content, $id, '', $userIdColumn);
+               } // END - foreach
 
-                               // Send "build mails" out
-                               sendAdminBuildMails('edit', $tableName, $content, $id, '', $userIdColumn);
+               // Delete cache?
+               if ((count($cacheFiles) > 0) && (!empty($cacheFiles[0]))) {
+                       // Delete cache file(s)
+                       foreach ($cacheFiles as $cacheF) {
+                               // Skip any empty entries
+                               if (empty($cache)) {
+                                       // This may cause trouble in loadCacheFile()
+                                       continue;
+                               } // END - if
+
+                               // Is the cache file loadable?
+                               if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
+                                       // Then remove it
+                                       $GLOBALS['cache_instance']->removeCacheFile();
+                               } // END - if
                        } // END - foreach
+               } // END - if
 
-                       // Was this fine?
-                       if ($affected == count(postRequestElement($idColumn[0]))) {
-                               // All deleted
-                               displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
-                       } else {
-                               // Some are still there :(
-                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count(postRequestElement($idColumn[0]))));
-                       }
+               // Was this fine?
+               if ($affected == countPostSelection($idColumn[0])) {
+                       // All deleted
+                       displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
                } else {
-                       // List for editing
-                       adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+                       // Some are still there :(
+                       displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, countPostSelection($idColumn[0])));
                }
        } else {
-               // Maybe some invalid parameters
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName=' . $tableName[0] . ',columns[]=' . gettype($columns) . ',filterFunctions[]=' . gettype($filterFunctions) . ',extraValues[]=' . gettype($extraValues) . ',idColumn=' . $idColumn[0] . ',userIdColumn=' . $userIdColumn[0] . ' - INVALID!');
+               // List for editing
+               adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
        }
 }
 
@@ -1232,26 +1278,23 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+               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
-               debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif (!is_array($lockNow)) {
                // $lockNow is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'lockNow[]=' . gettype($lockNow) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'lockNow[]=' . gettype($lockNow) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
 
-       // All valid entries? (We hope so here!)
-       if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($lockNow[0] === false) || (count($statusArray) == 1))) {
-               // 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);
-               }
-       } // 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
@@ -1259,66 +1302,32 @@ function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFun
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+               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
-               debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
        } elseif (!is_array($undeleteNow)) {
                // $undeleteNow is no array
-               debug_report_bug(__FUNCTION__, __LINE__, 'undeleteNow[]=' . gettype($undeleteNow) . '!=array');
+               reportBug(__FUNCTION__, __LINE__, 'undeleteNow[]=' . gettype($undeleteNow) . '!=array: userIdColumn=' . $userIdColumn);
        } // END - if
 
-       // All valid entries? (We hope so here!)
-       if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($undeleteNow[0] === false) || (count($statusArray) == 1))) {
-               // 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);
-               }
-       } // 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()) {
-       //* DEBUG: */ die('columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,POST=<pre>'.print_r($_POST,true).'</pre>');
-       // Verify that tableName and columns are not empty
-       if ((!is_array($tableName)) || (count($tableName) != 1)) {
-               // No tableName specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
-       } elseif (count($columns) == 0) {
-               // No columns specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.');
-       }
-
-       // Init columns and value elements
-       $sqlColumns = array();
-       $sqlValues  = array();
-
-       // Add columns and values
-       foreach ($columns as $key=>$columnName) {
-               // Copy entry to final arrays
-               $sqlColumns[$key] = $columnName;
-               $sqlValues[$key]  = postRequestElement($columnName);
-               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key='.$key.',columnName='.$columnName.',filterFunctions='.$filterFunctions[$key].',extraValues='.intval(isset($extraValues[$key])).',extraValuesName='.intval(isset($extraValues[$columnName . '_list'])).'<br />');
-
-               // Send data through the filter function if found
-               if ((isset($filterFunctions[$key])) && (isset($extraValues[$key . '_list']))) {
-                       // Filter function set!
-                       $sqlValues[$key] = call_user_func_array($filterFunctions[$key], merge_array(array($columnName), $extraValues[$key . '_list']));
-               } // END - if
-       } // END - foreach
-
-       // Build the SQL query
-       $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES ('" . implode("','", $sqlValues) . "')";
-
-       // Run the SQL query
-       SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+       // Call inner function
+       doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
        // Entry has been added?
-       if (!SQL_HASZEROAFFECTED()) {
+       if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
                // Display success message
                displayMessage('{--ADMIN_ENTRY_ADDED--}');
        } else {
@@ -1327,116 +1336,6 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr
        }
 }
 
-// List all given rows (callback function from XML)
-function adminListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array()) {
-       // Verify that tableName and columns are not empty
-       if ((!is_array($tableName)) || (count($tableName) != 1)) {
-               // No tableName specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
-       } elseif (count($columns) == 0) {
-               // No columns specified
-               debug_report_bug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
-       }
-
-       // This is the minimum query, so at least columns and tableName must have entries
-       $SQL = 'SELECT ';
-
-       // Get the sql part back from given array
-       $SQL .= getSqlPartFromXmlArray($columns);
-
-       // Remove last commata and add FROM statement
-       $SQL .= ' FROM `{?_MYSQL_PREFIX?}_' . $tableName[0] . '`';
-
-       // Do we have entries from whereColumns to add?
-       if (count($whereColumns) > 0) {
-               // Then add these as well
-               if (count($whereColumns) == 1) {
-                       // One entry found
-                       $SQL .= ' WHERE ';
-
-                       // Table/alias included?
-                       if (!empty($whereColumns[0]['table'])) {
-                               // Add it as well
-                               $SQL .= $whereColumns[0]['table'] . '.';
-                       } // END - if
-
-                       // Add the rest
-                       $SQL .= '`' . $whereColumns[0]['column'] . '`' . $whereColumns[0]['condition'] . "'" . $whereColumns[0]['look_for'] . "'";
-               } else {
-                       // More than one entry -> Unsupported
-                       debug_report_bug(__FUNCTION__, __LINE__, 'More than one WHERE statement found. This is currently not supported.');
-               }
-       } // END - if
-
-       // Do we have entries from orderByColumns to add?
-       if (count($orderByColumns) > 0) {
-               // Add them as well
-               $SQL .= ' ORDER BY ';
-               foreach ($orderByColumns as $orderByColumn=>$array) {
-                       // Get keys (table/alias) and values (sorting itself)
-                       $table   = trim(implode('', array_keys($array)));
-                       $sorting = trim(implode('', array_keys($array)));
-
-                       // table/alias can be omitted
-                       if (!empty($table)) {
-                               // table/alias is given
-                               $SQL .= $table . '.';
-                       } // END - if
-
-                       // Add order-by column
-                       $SQL .= '`' . $orderByColumn . '` ' . $sorting . ',';
-               } // END - foreach
-
-               // Remove last column
-               $SQL = substr($SQL, 0, -1);
-       } // END - if
-
-       // Now handle all over to the inner function which will execute the listing
-       doAdminListEntries($SQL, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters);
-}
-
-// Do the listing of entries
-function doAdminListEntries ($SQL, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) {
-       // Run the SQL query
-       $result = SQL_QUERY($SQL, __FUNCTION__, __LINE__);
-
-       // Do we have some URLs left?
-       if (!SQL_HASZERONUMS($result)) {
-               // List all URLs
-               $OUT = '';
-               while ($content = SQL_FETCHARRAY($result)) {
-                       // "Translate" content
-                       foreach ($callbackColumns as $columnName=>$callbackFunction) {
-                               // Fill the callback arguments
-                               $args = array($content[$columnName]);
-
-                               // Do we have more to add?
-                               if (isset($extraParameters[$columnName])) {
-                                       // Add them as well
-                                       $args = merge_array($args, $extraParameters[$columnName]);
-                               } // END - if
-
-                               // Call the callback-function
-                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackFunction . ',args=<pre>'.print_r($args, true).'</pre>');
-                               // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-                               $content[$columnName] = call_user_func_array($callbackFunction, $args);
-                       } // END - foreach
-
-                       // Load row template
-                       $OUT .= loadTemplate(trim($rowTemplate[0]), true, $content);
-               } // END - while
-
-               // Load main template
-               loadTemplate(trim($tableTemplate[0]), false, $OUT);
-       } else {
-               // No URLs in surfbar
-               displayMessage('{--' .$noEntryMessageId[0] . '--}');
-       }
-
-       // Free result
-       SQL_FREERESULT($result);
-}
-
 // Checks proxy settins by fetching check-updates3.php from mxchange.org
 function adminTestProxySettings ($settingsArray) {
        // Set temporary the new settings
@@ -1556,10 +1455,10 @@ function adminUpdateTaskData ($id, $row, $data) {
        // Should be admin and valid id
        if (!isAdmin()) {
                // Not an admin so redirect better
-               debug_report_bug(__FUNCTION__, __LINE__, 'id=' . $id . ',row=' . $row . ',data=' . $data . ' - isAdmin()=false');
+               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
@@ -1575,7 +1474,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 (
                ((
@@ -1611,10 +1510,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 (isValidUserId($adminId)) {
                // Load admin's login
                $login = getAdminLogin($adminId);
 
@@ -1630,7 +1529,7 @@ function generateAdminLink ($adminId) {
                        }
                } else {
                        // Maybe deleted?
-                       $adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
+                       $adminLink = '<div class="bad">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
                }
        } // END - if
 
@@ -1711,7 +1610,7 @@ function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
        // 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>';
@@ -1759,7 +1658,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 we have not yet reached total pages
                if ($page < $numPages) {
                        // Add it
                        $NAV .= '|';
@@ -1797,40 +1696,49 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
                switch (postRequestElement('ok')) {
                        case 'edit': // Edit menu
-                               if (postRequestElement('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",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
                                                array(
                                                        $type,
                                                        $menu,
                                                        postRequestElement('sel_action', $sel),
                                                        $sel
-                                               ), __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",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
                                                array(
                                                        $type,
                                                        $menu,
                                                        postRequestElement('sel_action', $sel),
                                                        postRequestElement('sel_what', $sel),
                                                        $sel
-                                               ), __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__);
+                                       array(
+                                               $type,
+                                               $sel
+                                       ), __FUNCTION__, __LINE__);
                                break;
 
                        case 'status': // Change status of menus
-                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-                                       array($type, postRequestElement('visible', $sel), postRequestElement('locked', $sel), $sel), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s',`locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                       array(
+                                               $type,
+                                               postRequestElement('visible', $sel),
+                                               postRequestElement('locked', $sel),
+                                               $sel
+                                       ), __FUNCTION__, __LINE__);
                                break;
 
                        default: // Unexpected action
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+                               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
                                displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
                                break;
                } // END - switch
@@ -1855,7 +1763,7 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                        $type,
                                        getRequestElement('act'),
                                        bigintval(getRequestElement('tid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
@@ -1863,7 +1771,7 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                        $type,
                                        getRequestElement('act'),
                                        bigintval(getRequestElement('fid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
@@ -1872,14 +1780,14 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                array(
                                        $type,
                                        bigintval(getRequestElement('tid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
                                        bigintval(getRequestElement('fid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
@@ -1891,13 +1799,13 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                        $type,
                                        bigintval(getRequestElement('tid')),
                                        bigintval($fid)
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(
                                        $type,
                                        bigintval(getRequestElement('fid')),
                                        bigintval($tid)
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                } // END - if
        } // END - if
 }