X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=505bcc0f82e90b90a9bd1a9ae52b4d4f9834a475;hb=c25f923b9006723f30055e6bd7145d6aaa8cee42;hp=ae6191a043e05021fe8b47ddbc5d7d0f1266c32a;hpb=486544503c2e517dc5c399308fdf43c8e35ff102;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index ae6191a043..505bcc0f82 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -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 *
@@ -52,7 +52,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
 	// Is the entry there?
 	if (SQL_HASZERONUMS($result)) {
 		// Ok, let's create the admin login
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`,`password`,`email`) VALUES ('%s', '%s', '%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
 			array(
 				$adminLogin,
 				$passHash,
@@ -130,38 +130,30 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 	if ($adminHash != '-1') {
 		// Now, we need to encode the password in the same way the one is encoded in database
 		$testHash = encodeHashForCookie($adminHash);
-		//* DEBUG: */ debugOutput('adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
 
 		// If they both match, the login data is valid
-		if ($testHash == $passHash) {
+		if ($testHash != $passHash) {
+			// Passwords don't match
+			$ret = 'password';
+		} elseif (!isAdmin()) {
+			// Is not valid session
+			$ret = 'session';
+		} else {
 			// All fine
 			$ret = 'done';
-		} else {
-			// Set status
-			$ret = 'password';
 		}
 	} // END - if
 
 	// Return status
-	//* DEBUG: */ debugOutput('ret='.$ret);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret='.$ret);
 	return $ret;
 }
 
 // Do an admin action
 function doAdminAction () {
-	// Get default what
-	$what = getWhat();
-
-	//* DEBUG: */ debugOutput(__LINE__.'*'.$what.'/'.getModule().'/'.getAction().'/'.getWhat().'*');
-
-	// Remove any spaces from variable
-	if (empty($what)) {
-		// Default admin action is the overview page
-		$what = 'overview';
-	} else {
-		// Secure it
-		$what = secureString($what);
-	}
+	// Determine correct 'what' value
+	$what = determineWhat();
 
 	// Get action value
 	$action = getActionFromModuleWhat(getModule(), $what);
@@ -169,18 +161,18 @@ function doAdminAction () {
 	// Load welcome template
 	if (isExtensionActive('admins')) {
 		// @TODO This and the next getCurrentAdminId() call might be moved into the templates?
-		$content['welcome'] = loadTemplate('admin_welcome_admins', true, getCurrentAdminId());
+		$content['welcome'] = loadTemplate('admin_welcome_admins', TRUE, getCurrentAdminId());
 	} else {
-		$content['welcome'] = loadTemplate('admin_welcome', true, getCurrentAdminId());
+		$content['welcome'] = loadTemplate('admin_welcome', TRUE, getCurrentAdminId());
 	}
 
 	// Load header, footer, render menu
-	$content['header'] = loadTemplate('admin_header' , true, $content);
-	$content['footer'] = loadTemplate('admin_footer' , true, $content);
+	$content['header'] = loadTemplate('admin_header' , TRUE, $content);
+	$content['footer'] = loadTemplate('admin_footer' , TRUE, $content);
 	$content['menu']   = addAdminMenu($action, $what);
 
 	// Load main template
-	loadTemplate('admin_main', false, $content);
+	loadTemplate('admin_main', FALSE, $content);
 
 	// Check if action/what pair is valid
 	$result_action = SQL_QUERY_ESC("SELECT
@@ -191,12 +183,12 @@ WHERE
 	`action`='%s' AND
 	(
 		(
-			`what`='%s' AND `what` != 'overview'
+			`what`='%s' AND `what` != 'welcome'
 		) OR (
 			(
 				`what`='' OR `what` IS NULL
 			) AND (
-				'%s'='overview'
+				'%s'='welcome'
 			)
 		)
 	)
@@ -207,40 +199,42 @@ 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);
-		if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) {
+		if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === TRUE)) {
 			// Ok, we finally load the admin action module
 			loadInclude($inc);
-		} elseif ($GLOBALS['acl_allow'] === false) {
+		} elseif ($GLOBALS['acl_allow'] === FALSE) {
 			// Access denied
-			loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
+			loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
 		} else {
 			// Include file not found :-(
-			loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
+			loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_404=' . $action . '%}');
 		}
 	} else {
 		// Invalid action/what pair found
-		loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
+		loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
 	}
 
 	// Free memory
 	SQL_FREERESULT($result_action);
 
 	// Tableset footer
-	loadTemplate('admin_main_footer', false, $content);
+	loadTemplate('admin_main_footer', FALSE, $content);
 }
 
-// Checks wether current admin is allowed to access given action/what combination
-// (only one is allowed to be null!)
+/**
+ * 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
@@ -250,7 +244,7 @@ function isAdminAllowedAccessMenu ($action, $what = NULL) {
 // Adds an admin menu
 function addAdminMenu ($action, $what) {
 	// Init variables
-	$SUB = false;
+	$SUB = FALSE;
 	$OUT = '';
 
 	// Menu descriptions
@@ -270,7 +264,7 @@ 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">';
 
@@ -279,12 +273,9 @@ ORDER BY
 			// Filename
 			$inc = sprintf("inc/modules/admin/action-%s.php", $mainContent['main_action']);
 
-			// Is the file readable?
-			$readable = isIncludeReadable($inc);
-
 			// Is the current admin allowed to access this 'action' menu?
 			if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
-				if ($SUB === false) {
+				if ($SUB === FALSE) {
 					// Insert compiled menu title and description
 					$GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
 					$GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
@@ -292,7 +283,8 @@ ORDER BY
 				$OUT .= '<li class="admin_menu"' . addJavaScriptMenuContent('admin', $mainContent['main_action'], $action, $what) . '>
 <div class="nobr"><strong>&middot;</strong>&nbsp;';
 
-				if ($readable === true) {
+				// Is the file readable?
+				if (isIncludeReadable($inc)) {
 					if (($mainContent['main_action'] == $action) && (empty($what))) {
 						$OUT .= '<strong>';
 					} else {
@@ -304,7 +296,8 @@ ORDER BY
 
 				$OUT .= $mainContent['main_title'];
 
-				if ($readable === true) {
+				// Is the file readable?
+				if (isIncludeReadable($inc)) {
 					if (($mainContent['main_action'] == $action) && (empty($what))) {
 						$OUT .= '</strong>';
 					} else {
@@ -360,56 +353,63 @@ ORDER BY
 	// 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) . '>';
 
-	// Do we have entries?
+	// Are there entries?
 	if (ifAdminMenuHasEntries($mainContent['main_action'])) {
 		// Sub menu has been called
-		$SUB = true;
-		$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 file readable?
-			$readable = isIncludeReadable($inc);
-
-			// 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">
+		$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 == $subContent['sub_what']) {
-						$OUT .= '<strong>';
+
+					// 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 .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $subContent['sub_what'] . '%}">';
+						$OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $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'];
+					$OUT .= $subContent['sub_title'];
 
-				if ($readable === true) {
-					if ($what == $subContent['sub_what']) {
-						$OUT .= '</strong>';
+					// Is the file readable?
+					if (isIncludeReadable($inc)) {
+						if ($what == $subContent['sub_what']) {
+							$OUT .= '</strong>';
+						} else {
+							$OUT .= '</a>]';
+						}
 					} else {
-						$OUT .= '</a>]';
+						$OUT .= '</span>';
 					}
-				} else {
-					$OUT .= '</span>';
-				}
-				$OUT .= '</div>
+					$OUT .= '</div>
 </li>';
-			} // END - if
-		} // END - while
+				} // END - if
+			} // END - while
+
+			// Finish HTML output
+			$OUT .= '</ul>';
+		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result_what);
-		$OUT .= '</ul>';
 	} // END - if
 
 	// Close li-tag
@@ -445,8 +445,17 @@ ORDER BY
 
 	// Load all entries
 	while ($content = SQL_FETCHARRAY($result)) {
+		// Default is none
+		$content['default'] = '';
+
+		// Is the id the same?
+		if ($content['id'] == $adminId) {
+			// Set this as default
+			$content['default'] = ' selected="selected"';
+		} // END - if
+
 		// Add the entry
-		$OUT .= loadTemplate('select_admins_option', true, $content);
+		$OUT .= loadTemplate('select_admins_option', TRUE, $content);
 	} // END - if
 
 	// Free memory
@@ -456,16 +465,19 @@ ORDER BY
 	$content['form_selection'] = $OUT;
 
 	// Output form
-	loadTemplate('select_admins_box', false, $content);
+	loadTemplate('select_admins_box', FALSE, $content);
 }
 
 // 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__);
 
@@ -473,29 +485,32 @@ ORDER BY
 	$OUT = '';
 
 	// USe this only for adding points (e.g. adding refs really makes no sence ;-) )
-	if ($add_all === true) {
+	if ($add_all === TRUE) {
 		$OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
-	} elseif ($none === true) {
+	} elseif ($none === TRUE) {
 		$OUT = '      <option value="0">{--SELECT_NONE--}</option>';
 	}
 
 	// 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, FALSE, FALSE) === bigintval($content['userid'])) {
+			$OUT .= ' selected="selected"';
+		} // END - if
 		$OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
-	if ($return === false) {
+	if ($return === FALSE) {
 		// Remeber options in constant
 		$content['form_selection'] = $OUT;
 		$content['what']           = '{%pipe,getWhat%}';
 
 		// Load template
-		loadTemplate('admin_form_selection_box', false, $content);
+		loadTemplate('admin_form_selection_box', FALSE, $content);
 	} else {
 		// Return content in selection frame
 		return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
@@ -509,7 +524,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 	$what = "`what` != '' AND `what` IS NOT NULL";
 	if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` != 'login'";
 
-	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`,`title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
+	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
 	if (!SQL_HASZERONUMS($result)) {
 		// Load menu as selection
@@ -520,7 +535,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
 
@@ -539,7 +556,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 }
 
 // Wrapper for $_POST and adminSaveSettings
-function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
 	// Get the array
 	$postData = postRequestArray();
 
@@ -548,51 +565,60 @@ function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement
 }
 
 // Save settings to the database
-function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
 	// Prepare all arrays, variables
 	$tableData = array();
-	$skip = false;
+	$skip = FALSE;
 
 	// Now, walk through all entries and prepare them for saving
+	//* BUG: */ reportBug(__FUNCTION__, __LINE__, '<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
 	foreach ($postData as $id => $val) {
 		// Process only formular field but not submit buttons ;)
-		if ($id != 'ok') {
-			// Do not save the ok value
-			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 =='save_config') {
+			// Skip this button
+			continue;
+		} // END - if
 
-				// Do not add a config entry twice
-				$GLOBALS['skip_config'][$id] = true;
+		// Do not save the ok value
+		convertSelectionsToEpocheTime($postData, $tableData, $id, $skip);
 
-				// Update current configuration
-				setConfigEntry($id, $val);
+		// Shall we process this id? It muss not be empty, of course
+		if (($skip === FALSE) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
+			// Translate the value? (comma to dot!)
+			if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
+				// Then do it here... :)
+				$val = convertCommaToDot($val);
 			} // END - if
+
+			// Test value on float
+			$test = (float) $val;
+
+			// Debug message
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'test=' . $test . ',val=' . $val . ',id=' . $id);
+
+			// Shall we add numbers or strings?
+			if ('' . $val . '' == '' . $test . '') {
+				// Add numbers
+				array_push($tableData, sprintf("`%s`=%s", $id, $test));
+			} elseif (is_null($val)) {
+				// Add NULL
+				array_push($tableData, sprintf("`%s`=NULL", $id));
+			} else {
+				// Add strings
+				array_push($tableData, sprintf("`%s`='%s'", $id, trim($val)));
+			}
+
+			// Do not add a config entry twice
+			$GLOBALS['skip_config'][$id] = TRUE;
+
+			// Update current configuration
+			setConfigEntry($id, $val);
 		} // END - if
 	} // END - foreach
 
 	// Check if entry does exist
-	$result = false;
-	if ($alwaysAdd === false) {
+	$result = FALSE;
+	if ($alwaysAdd === FALSE) {
 		if (!empty($whereStatement)) {
 			$result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
 		} else {
@@ -616,13 +642,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)",
@@ -645,7 +671,10 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	rebuildCache('config', 'config');
 
 	// Settings saved, so display message?
-	if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
+	if ($displayMessage === TRUE) {
+		// Display a message
+		displayMessage('{--SETTINGS_SAVED--}');
+	} // END - if
 
 	// Return affected rows
 	return $affected;
@@ -654,7 +683,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 // Generate a selection box
 function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 	// Open the requested menu directory
-	$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', false, false);
+	$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', FALSE, FALSE);
 
 	// Init the selection box
 	$OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
@@ -673,9 +702,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
@@ -690,32 +721,47 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 }
 
 // Creates a user-profile link for the admin. This function can also be used for many other purposes
-function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
-	if (($title == '') && (isValidUserId($userid))) {
-		// Set userid as title
-		$title = $userid;
-	} elseif (!isValidUserId($userid)) {
-		// User id zero is invalid
-		return '<strong>' . convertNullToZero($userid) . '</strong>';
-	}
+function generateUserProfileLink ($userid, $title = '', $what = '') {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$userid][$title . '_' . $what])) {
+		// Is title empty and valid userid?
+		if (($title == '') && (isValidUserId($userid))) {
+			// Set userid as title
+			$title = $userid;
+		} elseif (!isValidUserId($userid)) {
+			// User id zero is invalid
+			return '<strong>' . convertNullToZero($userid) . '</strong>';
+		}
 
-	if (($title == '0') && ($what == 'list_refs')) {
-		// Return title again
-		return $title;
-	} elseif (isExtensionActive('nickname')) {
-		// Get nickname
-		$nick = getNickname($userid);
+		// Is what set?
+		if (empty($what)) {
+			// Then get it to 'list_user'
+			$what = 'list_user';
+		} // END - if
 
-		// Is it not empty, use it as title else the userid
-		if (!empty($nick)) {
-			$title = $nick . '(' . $userid . ')';
-		} else {
-			$title = $userid;
+		if (($title == '0') && ($what == 'list_refs')) {
+			// Return title again
+			return $title;
+		} elseif (!empty($title)) {
+			// Not empty, so skip next one
+		} elseif (isExtensionActive('nickname')) {
+			// Get nickname
+			$nick = getNickname($userid);
+
+			// Is it not empty, use it as title else the userid
+			if (!empty($nick)) {
+				$title = $nick . '(' . $userid . ')';
+			} else {
+				$title = $userid;
+			}
 		}
-	}
 
-	// Return link
-	return '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+		// Set it in cache
+		$GLOBALS[__FUNCTION__][$userid][$title . '_' . $what] = '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what];
 }
 
 // Check "logical-area-mode"
@@ -723,7 +769,7 @@ function adminGetMenuMode () {
 	// Set the default menu mode as the mode for all admins
 	$mode = 'global';
 
-	// If sql_patches is up-to-date enough, use the configuration
+	// If ext-sql_patches is up-to-date enough, use the configuration
 	if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
 		$mode = getAdminMenu();
 	} // END - if
@@ -744,7 +790,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);
@@ -818,528 +864,244 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 	}
 }
 
-// Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '', $userIdColumn = array('userid')) {
-	// $tableName must be an array
-	if ((!is_array($tableName)) || (count($tableName) != 1)) {
-		// $tableName is no array
-		debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
-	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
-		// $tableName is no array
-		debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
-	} // END - if
-
-	// Default subject is the subject part
-	$subject = $subjectPart;
-
-	// Is the subject part not set?
-	if (empty($subjectPart)) {
-		// Then use it from the mode
-		$subject = strtoupper($mode);
-	} // END - if
-
-	// Is the raw userid set?
-	if (postRequestElement($userIdColumn[0], $id) > 0) {
-		// Load email template
-		if (!empty($subjectPart)) {
-			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content);
-		} else {
-			$mail = loadEmailTemplate('member_' . $mode . '_' . $tableName[0], $content);
-		}
-
-		// Send email out
-		sendEmail(postRequestElement($userIdColumn[0], $id), strtoupper('{--MEMBER_' . $subject . '_' . $tableName[0] . '_SUBJECT--}'), $mail);
-	} // END - if
-
-	// Generate subject
-	$subject = strtoupper('{--ADMIN_' . $subject . '_' . $tableName[0] . '_SUBJECT--}');
-
-	// Send admin notification out
-	if (!empty($subjectPart)) {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
-	} else {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
-	}
-}
-
 // Build a special template list
-function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
-	// $tableName and $idColumn must bove be arrays!
-	if ((!is_array($tableName)) || (count($tableName) != 1)) {
-		// $tableName is no array
-		debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
-	} elseif (!is_array($idColumn)) {
-		// $idColumn is no array
-		debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
-	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
-		// $tableName is no array
-		debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
-	}
-
-	// 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>');
-	foreach (postRequestElement($idColumn[0]) as $id => $selected) {
-		// Secure id number
-		$id = bigintval($id);
-
-		// Get result from a given column array and table name
-		$result = SQL_RESULT_FROM_ARRAY($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__);
-
-		// Is there one entry?
-		if (SQL_NUMROWS($result) == 1) {
-			// Load all data
-			$content = SQL_FETCHARRAY($result);
-
-			// Filter all data
-			foreach ($content as $key => $value) {
-				// Search index
-				$idx = searchXmlArray($key, $columns, 'column');
-
-				// Skip any missing entries
-				if ($idx === false) {
-					// Skip this one
-					//* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
-					continue;
-				} // END - if
-
-				// Do we have 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]] = 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);
-				if ($key == $idColumn[0]) {
-					// Found, so remember it
-					$GLOBALS['admin_list_builder_id_value'] = $value;
-				} // END - if
-
-				// Do we have 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);
-					$content[$key] = handleExtraValues(
-						$filterFunctions[$idx],
-						$value,
-						$extraValues[$idx]
-					);
-				} elseif ((isset($columns[$idx]['name'])) && (isset($filterFunctions[$columns[$idx]['name']])) && (isset($extraValues[$columns[$idx]['name']]))) {
-					// Handle the call in external function
-					//* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$columns[$idx]['name']] . ',value=' . $value);
-					$content[$key] = handleExtraValues(
-						$filterFunctions[$columns[$idx]['name']],
-						$value,
-						$extraValues[$columns[$idx]['name']]
-					);
-				}
-			} // END - foreach
-
-			// Then list it
-			$OUT .= loadTemplate(sprintf("admin_%s_%s_row",
-				$listType,
-				$tableName[0]
-				), true, $content
-			);
-		} // END - if
-
-		// Free the result
-		SQL_FREERESULT($result);
-	} // END - foreach
-
-	// Load master template
-	loadTemplate(sprintf("admin_%s_%s",
-		$listType,
-		$tableName[0]
-		), false, $OUT
-	);
+// @TODO cacheFiles is not yet supported
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
+	// Call inner (general) function
+	doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
 }
 
 // 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__);
+		// 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);
+		// Fetch the data
+		$content = SQL_FETCHARRAY($result);
 
-			// Free the result
-			SQL_FREERESULT($result);
+		// Free the result
+		SQL_FREERESULT($result);
 
-			// Add all status entries (e.g. status column last_updated or so)
-			$newStatus = 'UNKNOWN';
-			$oldStatus = 'UNKNOWN';
-			$statusColumn = 'unknown';
-			foreach ($statusArray as $column => $statusInfo) {
-				// Does the entry exist?
-				if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
-					// Add these entries for update
-					$sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
-
-					// Remember status
-					if ($statusColumn == 'unknown') {
-						// Always (!!!) change status column first!
-						$oldStatus = $content[$column];
-						$newStatus = $statusInfo[$oldStatus];
-						$statusColumn = $column;
-					} // END - if
-				} elseif (isset($content[$column])) {
-					// Unfinished!
-					debug_report_bug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
-				}
-			} // END - foreach
-
-			// Add other columns as well
-			foreach (postRequestArray() as $key => $entries) {
-				// Debug message
-				logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
-
-				// Skip id, raw userid and 'do_$mode'
-				if (!in_array($key, array($idColumn[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);
+					// Add regular entry
+					$sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+
+					// Add entry
+					$content[$key] = $entries[$id];
 				}
-			} // END - foreach
+			} else {
+				// Skipped entry
+				logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
+			}
+		} // END - foreach
 
-			// Finish SQL statement
-			$sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
-				$idColumn[0],
-				bigintval($id),
-				$statusColumn,
-				$oldStatus
-			);
-
-			// Run the SQL
-			SQL_QUERY($sql, __FUNCTION__, __LINE__);
-
-			// Do we have an URL?
-			if (isset($content['url'])) {
-				// Then add a framekiller test as well
-				$content['frametester'] = generateFrametesterUrl($content['url']);
-			} // END - if
+		// Finish SQL statement
+		$sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
+			$idColumn[0],
+			bigintval($id),
+			$statusColumn,
+			$oldStatus
+		);
 
-			// Send "build mails" out
-			sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
-		} // END - foreach
-	} // END - if
+		// Run the SQL
+		SQL_QUERY($sql, __FUNCTION__, __LINE__);
+
+		// Send "build mails" out
+		sendGenericBuildMails($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(), $content = 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__);
-
-					// Fetch the data
-					$content = SQL_FETCHARRAY($result);
-
-					// Free the result
-					SQL_FREERESULT($result);
-
-					// Send "build mails" out
-					sendAdminBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
-				} // END - if
-
-				// Add id number
-				$idList .= $id . ',';
-			} // END - foreach
-
-			// Run the query
-			SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+	// Shall we delete here or list for deletion?
+	if ($deleteNow[0] === TRUE) {
+		// Call generic function
+		$affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
-			// Was this fine?
-			if (SQL_AFFECTEDROWS() == count(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]))));
-			}
+		// Was this fine?
+		if ($affected == 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, $rawUserId, $content);
+	}
 }
 
 // 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(), $content = 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
-
-					// 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 ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
-							// Filter function set!
-							$entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
-						} // END - if
-
-						// Then add this value
-						$sql .= sprintf(" `%s`='%s',",
-							SQL_ESCAPE($key),
-							SQL_ESCAPE($entries[$id])
-						);
-					} elseif (($key != $idColumn[0]) && (!is_array($entries))) {
-						// Add normal entries as well!
-						$content[$key] =  $entries;
-					}
-
-					// Do we have an URL?
-					if ($key == 'url') {
-						// Then add a framekiller test as well
-						$content['frametester'] = generateFrametesterUrl($content[$key]);
-					} // END - if
-				} // END - foreach
-
-				// Finish SQL command
-				$sql = substr($sql, 0, -1) . " WHERE `" . $idColumn[0] . "`=" . bigintval($id) . " LIMIT 1";
-
-				// Run this query
-				SQL_QUERY($sql, __FUNCTION__, __LINE__);
+	// Shall we change here or list for editing?
+	if ($editNow[0] === TRUE) {
+		// Call generic change method
+		$affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
-				// 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__);
-
-				// Fetch the data and merge it into $content
-				$content = merge_array($content, SQL_FETCHARRAY($result));
-
-				// Free the result
-				SQL_FREERESULT($result);
-
-				// Send "build mails" out
-				sendAdminBuildMails('edit', $tableName, $content, $id, '', $userIdColumn);
-			} // END - foreach
-
-			// 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, $rawUserId, $content);
 	}
 }
 
 // Un-/lock rows by given id numbers
-function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+// @TODO rawUserId/content is not yet supported
+function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
 	// $tableName must be an array
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
-		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
-function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+// @TODO rawUserId/cacheFiles/content is not yet supported
+function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
 	// $tableName must be an array
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
-		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) . "')";
+function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+	// Is the userid set?
+	if (!isPostRequestElementSet('userid')) {
+		// Then set NULL here
+		setPostRequestElement('userid', NULL);
+	} // END - if
 
-	// Run the SQL query
-	SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+	// 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 {
@@ -1348,116 +1110,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
@@ -1479,7 +1131,7 @@ function sendAdminPasswordResetLink ($email) {
 	$OUT = '';
 
 	// Look up administator login
-	$result = SQL_QUERY_ESC("SELECT `id`,`login`,`password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 
 	// Is there an account?
@@ -1514,10 +1166,10 @@ function sendAdminPasswordResetLink ($email) {
 // Validate hash and login for password reset
 function adminResetValidateHashLogin ($hash, $login) {
 	// By default nothing validates... ;)
-	$valid = false;
+	$valid = FALSE;
 
 	// Then try to find that user
-	$result = SQL_QUERY_ESC("SELECT `id`,`password`,`email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
 		array($login), __FUNCTION__, __LINE__);
 
 	// Is an account here?
@@ -1541,7 +1193,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 
 // Reset the password for the login. Do NOT call this function without calling above function first!
 function doResetAdminPassword ($login, $password) {
-	// Generate hash (we already check for sql_patches in generateHash())
+	// Generate hash (we already check for ext-sql_patches in generateHash())
 	$passHash = generateHash($password);
 
 	// Prepare fake POST data
@@ -1551,7 +1203,7 @@ function doResetAdminPassword ($login, $password) {
 	);
 
 	// Update database
-	$message = adminsChangeAdminAccount($postData, '', false);
+	$message = adminsChangeAdminAccount($postData, '', FALSE);
 
 	// Run filters
 	runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash, 'message' => $message));
@@ -1577,10 +1229,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
@@ -1596,7 +1248,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 (
 		((
@@ -1604,7 +1256,7 @@ function ifAdminMenuHasEntries ($action) {
 			isset($GLOBALS['admin_menu_has_entries'][$action])
 		) && (
 			// And do we have a menu for this action?
-			$GLOBALS['admin_menu_has_entries'][$action] === true
+			$GLOBALS['admin_menu_has_entries'][$action] === TRUE
 		)) || (
 			// Login has always a menu
 			$action == 'login'
@@ -1635,7 +1287,7 @@ function generateAdminLink ($adminId) {
 	$adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
 
 	// Zero? = Not assigned
-	if (bigintval($adminId) > 0) {
+	if (isValidUserId($adminId)) {
 		// Load admin's login
 		$login = getAdminLogin($adminId);
 
@@ -1690,9 +1342,6 @@ function doVerifyExpertSettings () {
 
 						// Change it in the admin
 						adminsChangeAdminAccount($postData, 'expert_warning');
-
-						// Clear form
-						unsetPostRequestElement('ok');
 					} // END - if
 
 					// All fine!
@@ -1708,6 +1357,13 @@ function doVerifyExpertSettings () {
 				// Do not display
 				$return = 'agreed';
 			}
+
+			// Is a form sent?
+			if ((isFormSent()) && (isPostRequestElementSet('expert_settings'))) {
+				// Clear form
+				unsetPostRequestElement('ok');
+				unsetPostRequestElement('expert_settings');
+			} // END - if
 		} else {
 			// Forbidden
 			$return = 'forbidden';
@@ -1732,7 +1388,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>';
@@ -1751,7 +1407,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 	} // END - if
 
 	$TOP = '';
-	if ($show_form === false) {
+	if ($show_form === FALSE) {
 		$TOP = ' top';
 	} // END - if
 
@@ -1793,9 +1449,9 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 	$content['top']  = $TOP;
 
 	// Load navigation template
-	$OUT = loadTemplate('admin_email_nav_row', true, $content);
+	$OUT = loadTemplate('admin_email_nav_row', TRUE, $content);
 
-	if ($return === true) {
+	if ($return === TRUE) {
 		// Return generated HTML-Code
 		return $OUT;
 	} else {