X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=5d655b2f74b4fac3935630f250db0f6b54d4a08f;hp=2bee0b51c1c7216adeb15c9c83f20c2ec575655f;hb=8da353fa4bb729bb3299d247803c23833a52a327;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 2bee0b51c1..5d655b2f74 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Register an administrator account
-function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
+function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'deny') {
 	// Login does already exist
 	$ret = 'already';
 
@@ -51,13 +51,25 @@ 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')",
-			array(
-				$adminLogin,
-				$passHash,
-				$adminEmail
-			), __FUNCTION__, __LINE__);
+		// Is ext-admins installed and version at least 0.3.0?
+		if (isExtensionInstalledAndNewer('admins', '0.3.0')) {
+			// Ok, let's create the admin login
+			SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`, `default_acl`) VALUES ('%s', '%s', '%s', '%s')",
+				array(
+					$adminLogin,
+					$passHash,
+					$adminEmail,
+					$accessLevel
+				), __FUNCTION__, __LINE__);
+		} else {
+			// Ok, let's create the admin login
+			SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
+				array(
+					$adminLogin,
+					$passHash,
+					$adminEmail
+				), __FUNCTION__, __LINE__);
+		}
 
 		// All done
 		$ret = 'done';
@@ -80,7 +92,7 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 	$adminId = getAdminId($adminLogin);
 
 	// Continue only with found admin ids
-	if ($adminId > 0) {
+	if (isValidId($adminId)) {
 		// Then we need to lookup the login name by getting the admin hash
 		$adminHash = getAdminHash($adminId);
 
@@ -133,12 +145,15 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 		//* 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
 
@@ -158,18 +173,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
@@ -196,30 +211,30 @@ 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);
 }
 
 /**
@@ -227,7 +242,7 @@ LIMIT 1",
  * 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
@@ -241,7 +256,7 @@ function isAdminAllowedAccessMenu ($action, $what = NULL) {
 // Adds an admin menu
 function addAdminMenu ($action, $what) {
 	// Init variables
-	$SUB = false;
+	$SUB = FALSE;
 	$OUT = '';
 
 	// Menu descriptions
@@ -261,7 +276,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">';
 
@@ -272,7 +287,7 @@ ORDER BY
 
 			// 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'];
@@ -350,12 +365,12 @@ 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;
+		$SUB = TRUE;
 
-		// Do we have entries?
+		// Are there entries?
 		if (!SQL_HASZERONUMS($result_what)) {
 			// Start HTML code
 			$OUT .= '<ul class="admin_menu_sub">';
@@ -442,8 +457,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
@@ -453,11 +477,11 @@ 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', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
+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`,
@@ -473,9 +497,9 @@ 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>';
 	}
 
@@ -483,7 +507,7 @@ ORDER BY
 	while ($content = SQL_FETCHARRAY($result)) {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . intval($userid) . '/' . $content['userid']);
 		$OUT .= '<option value="' . bigintval($content['userid']) . '"';
-		if (bigintval($userid) === bigintval($content['userid'])) {
+		if (bigintval($userid, FALSE, FALSE) === bigintval($content['userid'])) {
 			$OUT .= ' selected="selected"';
 		} // END - if
 		$OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';
@@ -492,13 +516,13 @@ ORDER BY
 	// 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>';
@@ -512,12 +536,12 @@ 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
 		$OUT = '<select name="' . $mode . '_menu';
-		if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
+		if (!isValidId($defid)) $OUT .= '[' . intval($defid) . ']';
 		$OUT .= '" size="1" class="form_select">
 	<option value="">{--SELECT_NONE--}</option>';
 		// Load all entries
@@ -544,7 +568,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();
 
@@ -553,15 +577,16 @@ 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') {
+		if ($id == 'save_config') {
 			// Skip this button
 			continue;
 		} // END - if
@@ -570,15 +595,20 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 		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')) {
+		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 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));
@@ -591,7 +621,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 			}
 
 			// Do not add a config entry twice
-			$GLOBALS['skip_config'][$id] = true;
+			$GLOBALS['skip_config'][$id] = TRUE;
 
 			// Update current configuration
 			setConfigEntry($id, $val);
@@ -599,8 +629,8 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	} // 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 {
@@ -629,8 +659,8 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 		} // 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)",
@@ -653,7 +683,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;
@@ -662,7 +695,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>';
@@ -700,34 +733,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>';
-	}
-
-	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 {
+function generateUserProfileLink ($userid, $title = '', $what = '') {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$userid][$title . '_' . $what])) {
+		// Is title empty and valid userid?
+		if (($title == '') && (isValidId($userid))) {
+			// Set userid as title
 			$title = $userid;
+		} elseif (!isValidId($userid)) {
+			// User id zero is invalid
+			return '<strong>' . convertNullToZero($userid) . '</strong>';
 		}
-	}
 
-	// Return link
-	return '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+		// Is what set?
+		if (empty($what)) {
+			// Then get it to 'list_user'
+			$what = 'list_user';
+		} // END - if
+
+		if (($title == '0') && ($what == 'list_refs')) {
+			// Return title again
+			return $title;
+		} elseif (!empty($title)) {
+			// Not empty, so skip next one
+		} elseif (isExtensionActive('nickname')) {
+			// Get nickname
+			$nick = getNickname($userid);
+
+			// Is it not empty, use it as title else the userid
+			if (!empty($nick)) {
+				$title = $nick . '(' . $userid . ')';
+			} else {
+				$title = $userid;
+			}
+		}
+
+		// Set it in cache
+		$GLOBALS[__FUNCTION__][$userid][$title . '_' . $what] = '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what];
 }
 
 // Check "logical-area-mode"
@@ -735,7 +781,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
@@ -756,7 +802,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);
@@ -830,151 +876,11 @@ 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
-		reportBug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
-	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
-		// $tableName is no array
-		reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
-	} // END - if
-
-	// Default subject is the subject part
-	$subject = $subjectPart;
-
-	// 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
-		reportBug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
-	} elseif (!is_array($idColumn)) {
-		// $idColumn is no array
-		reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
-	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
-		// $tableName is no array
-		reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
-	}
-
-	// Init row output
-	$OUT = '';
-
-	// "Walk" through all entries
-	//* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,idColumn=<pre>'.print_r($idColumn,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
-	foreach (postRequestElement($idColumn[0]) as $id => $selected) {
-		// Secure id number
-		$id = bigintval($id);
-
-		// Get result from a given column array and table name
-		$result = SQL_RESULT_FROM_ARRAY($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: */ reportBug(__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: */ 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: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn=' . $idColumn[0] . ',value=' . $value);
-				if ($key == $idColumn[0]) {
-					/*
-					 * Found, so remember it securely (to make sure only id
-					 * numbers can pass, don't use alpha-numerical values!)
-					 */
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' - set as admin_list_builder_id_value!');
-					$GLOBALS['admin_list_builder_id_value'] = bigintval($value);
-				} // END - if
-
-				// 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: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
-					$content[$key] = handleExtraValues(
-						$filterFunctions[$idx],
-						$value,
-						$extraValues[$idx]
-					);
-				} elseif ((isset($columns[$idx]['name'])) && (isset($filterFunctions[$columns[$idx]['name']])) && (isset($extraValues[$columns[$idx]['name']]))) {
-					// Handle the call in external function
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$columns[$idx]['name']] . ',value=' . $value);
-					$content[$key] = handleExtraValues(
-						$filterFunctions[$columns[$idx]['name']],
-						$value,
-						$extraValues[$columns[$idx]['name']]
-					);
-				}
-			} // END - foreach
-
-			// Then list it
-			$OUT .= 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
@@ -1036,7 +942,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 		// Add other columns as well
 		foreach (postRequestArray() as $key => $entries) {
 			// Debug message
-			logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
+			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
 
 			// Skip id, raw userid and 'do_$mode'
 			if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
@@ -1051,7 +957,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 					// Add entry
 					$content[$key] = $entries[$id];
 				}
-			} else {
+			} elseif (isDebugModeEnabled()) {
 				// Skipped entry
 				logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
 			}
@@ -1069,12 +975,12 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 		SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
 		// Send "build mails" out
-		sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+		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'), $cacheFiles = array()) {
+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
@@ -1091,42 +997,12 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
 	} // END - if
 
 	// 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__);
+	if ($deleteNow[0] === TRUE) {
+		// Call generic function
+		$affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
 		// Was this fine?
-		if (SQL_AFFECTEDROWS() == countPostSelection($idColumn[0])) {
+		if ($affected == countPostSelection($idColumn[0])) {
 			// All deleted
 			displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
 		} else {
@@ -1135,12 +1011,12 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
 		}
 	} else {
 		// List for deletion confirmation
-		adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+		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(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+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
@@ -1157,107 +1033,9 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 	} // END - if
 
 	// Shall we change here or list for editing?
-	if ($editNow[0] === true) {
-		// Change them all
-		$affected = '0';
-		foreach (postRequestElement($idColumn[0]) as $id => $sel) {
-			// Prepare content array (new values)
-			$content = array();
-
-			// Prepare SQL for this row
-			$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
-				SQL_ESCAPE($tableName[0])
-			);
-
-			// "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
-
-				// 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;
-				}
-			} // END - foreach
-
-			// Finish SQL command
-			$sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id) . " LIMIT 1";
-
-			// Run this query
-			SQL_QUERY($sql, __FUNCTION__, __LINE__);
-
-			// Add affected rows
-			$affected += SQL_AFFECTEDROWS();
-
-			// Load all data from that id
-			$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
-				array(
-					$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
-
-		// Delete cache?
-		if ((count($cacheFiles) > 0) && (!empty($cacheFiles[0]))) {
-			// Delete cache file(s)
-			foreach ($cacheFiles as $cacheFile) {
-				// Skip any empty entries
-				if (empty($cacheFile)) {
-					// This may cause trouble in loadCacheFile()
-					continue;
-				} // END - if
-
-				// Is the cache file loadable?
-				if ($GLOBALS['cache_instance']->loadCacheFile($cacheFile)) {
-					// Then remove it
-					$GLOBALS['cache_instance']->removeCacheFile();
-				} // END - if
-			} // END - if
-		} // END - if
+	if ($editNow[0] === TRUE) {
+		// Call generic change method
+		$affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
 		// Was this fine?
 		if ($affected == countPostSelection($idColumn[0])) {
@@ -1269,12 +1047,13 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 		}
 	} else {
 		// List for editing
-		adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+		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
@@ -1288,7 +1067,7 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 	} // END - if
 
 	// Shall we un-/lock here or list for locking?
-	if ($lockNow[0] === true) {
+	if ($lockNow[0] === TRUE) {
 		// Un-/lock entries
 		adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
 	} else {
@@ -1298,7 +1077,8 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 }
 
 // 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
@@ -1312,7 +1092,7 @@ function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFun
 	} // END - if
 
 	// Shall we un-/lock here or list for locking?
-	if ($undeleteNow[0] === true) {
+	if ($undeleteNow[0] === TRUE) {
 		// Undelete entries
 		adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
 	} else {
@@ -1323,78 +1103,17 @@ function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFun
 
 // Adds a given entry to the database
 function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
-	//* 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
-		reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
-	} elseif (count($columns) == 0) {
-		// No columns specified
-		reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.');
-	}
-
-	// Init columns and value elements
-	$sqlColumns = array();
-	$sqlValues  = array();
-
-	// Do we have "time columns"?
-	if (count($timeColumns) > 0) {
-		// Then "walk" through all entries
-		foreach ($timeColumns as $column) {
-			// Convert all (possible) selections
-			convertSelectionsToEpocheTimeInPostData($column . '_ye');
-		} // END - foreach
+	// Is the userid set?
+	if (!isPostRequestElementSet('userid')) {
+		// Then set NULL here
+		setPostRequestElement('userid', NULL);
 	} // END - if
 
-	// Add columns and values
-	foreach ($columns as $key => $columnName) {
-		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName=' . $columnName);
-		// Is columnIndex set?
-		if (!is_null($columnIndex)) {
-			// Check conditions
-			//* DEBUG: */ die('columnIndex=<pre>'.print_r($columnIndex,true).'</pre>'.debug_get_printable_backtrace());
-			assert((is_array($columnName)) && (isset($columnName[$columnIndex])));
-
-			// Then use that index "blindly"
-			$columnName = $columnName[$columnIndex];
-		} // END - if
-
-		// Debug message
-		/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])) . '<br />');
-
-		// Copy entry securely to the final arrays
-		$sqlColumns[$key] = SQL_ESCAPE($columnName);
-		$sqlValues[$key]  = SQL_ESCAPE(postRequestElement($columnName));
-
-		// Send data through the filter function if found
-		if ((isset($filterFunctions[$key])) && (isset($extraValues[$key . '_list']))) {
-			// Filter function set!
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
-			$sqlValues[$key] = call_user_func_array($filterFunctions[$key], merge_array(array($columnName), $extraValues[$key . '_list']));
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
-		} elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key]))) {
-			// Run through an extra filter
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
-			$sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], '');
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
-		}
-
-		// Is the value not a number?
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key]);
-		if (($sqlValues[$key] != 'NULL') && (is_string($sqlValues[$key]))) {
-			// Add quotes around it
-			$sqlValues[$key] = chr(39) . $sqlValues[$key] . chr(39);
-		} // 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__);
+	// 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 {
@@ -1403,147 +1122,13 @@ 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(), $conditions = array()) {
-	// Verify that tableName and columns are not empty
-	if ((!is_array($tableName)) || (count($tableName) != 1)) {
-		// No tableName specified
-		reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
-	} elseif (count($columns) == 0) {
-		// No columns specified
-		reportBug(__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'] . chr(39) . $whereColumns[0]['look_for'] . chr(39);
-		} elseif ((count($whereColumns > 1)) && (count($conditions) > 0)) {
-			// More than one "WHERE" + condition found
-			foreach ($whereColumns as $idx => $columnArray) {
-				// Default is WHERE
-				$condition = 'WHERE';
-
-				// Is the condition element there?
-				if (isset($conditions[$columnArray['column']])) {
-					// Assume the condition
-					$condition = $conditions[$columnArray['column']];
-				} // END - if
-
-				// Add to SQL query
-				$SQL .= ' ' . $condition;
-
-				// Table/alias included?
-				if (!empty($whereColumns[$idx]['table'])) {
-					// Add it as well
-					$SQL .= $whereColumns[$idx]['table'] . '.';
-				} // END - if
-
-				// Add the rest
-				$SQL .= '`' . $whereColumns[$idx]['column'] . '`' . $whereColumns[$idx]['condition'] . chr(39) . convertDollarDataToGetElement($whereColumns[$idx]['look_for']) . chr(39);
-			} // END - foreach
-		} else {
-			// Did not set $conditions
-			reportBug(__FUNCTION__, __LINE__, 'Supplied more than &quot;whereColumns&quot; entries but no conditions! Please fix your XML template.');
-		}
-	} // 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 => $callbackName) {
-				// 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=' . $callbackName . ',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($callbackName, $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
 	mergeConfig($settingsArray);
 
 	// Now get the test URL
-	$content = sendGetRequest('check-updates3.php');
+	$content = sendHttpGetRequest('check-updates3.php');
 
 	// Is the first line with "200 OK"?
 	$valid = isInString('200 OK', $content[0]);
@@ -1558,7 +1143,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?
@@ -1593,10 +1178,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?
@@ -1620,7 +1205,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
@@ -1630,7 +1215,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));
@@ -1683,7 +1268,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'
@@ -1699,7 +1284,7 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
 // Creates a link to the user's admin-profile
 function adminCreateUserLink ($userid) {
 	// Is the userid set correctly?
-	if (isValidUserId($userid)) {
+	if (isValidId($userid)) {
 		// Create a link to that profile
 		return '{%url=modules.php?module=admin&amp;what=list_user&amp;userid=' . bigintval($userid) . '%}';
 	} // END - if
@@ -1714,7 +1299,7 @@ function generateAdminLink ($adminId) {
 	$adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
 
 	// Zero? = Not assigned
-	if (isValidUserId($adminId)) {
+	if (isValidId($adminId)) {
 		// Load admin's login
 		$login = getAdminLogin($adminId);
 
@@ -1760,7 +1345,7 @@ function doVerifyExpertSettings () {
 			// Okay, does he want to see them?
 			if (isAdminsExpertWarningEnabled()) {
 				// Ask for them
-				if (isFormSent()) {
+				if (isFormSent('save_expert')) {
 					// Is the element set, then we need to change the admin
 					if (isPostRequestElementSet('expert_settings')) {
 						// Get it and prepare final post data array
@@ -1769,9 +1354,6 @@ function doVerifyExpertSettings () {
 
 						// Change it in the admin
 						adminsChangeAdminAccount($postData, 'expert_warning');
-
-						// Clear form
-						unsetPostRequestElement('ok');
 					} // END - if
 
 					// All fine!
@@ -1787,6 +1369,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';
@@ -1807,14 +1396,14 @@ function doVerifyExpertSettings () {
 }
 
 // Generate link to unconfirmed mails for admin
-function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
+function generateUnconfirmedAdminLink ($id, $unconfirmed, $type) {
 	// Init output
 	$OUT = $unconfirmed;
 
-	// Do we have unconfirmed mails?
+	// Is there unconfirmed mails?
 	if ($unconfirmed > 0) {
 		// Add link to list_unconfirmed what-file
-		$OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
+		$OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;type=' . $type . '&amp;id=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
 	} // END - if
 
 	// Return it
@@ -1830,7 +1419,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
 
@@ -1845,7 +1434,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 			$NAV .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
 
 			// Add userid when we shall show all mails from a single member
-			if ((isGetRequestElementSet('userid')) && (isValidUserId(getRequestElement('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
+			if ((isGetRequestElementSet('userid')) && (isValidId(getRequestElement('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
 
 			// Close open anchor tag
 			$NAV .= '%}">';
@@ -1872,9 +1461,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 {
@@ -2011,5 +1600,141 @@ function doAdminProcessMenuWeightning ($type, $AND) {
 	} // END - if
 }
 
+// Function to register first admin
+function registerFirstAdmin () {
+	// Make sure that no admin is registered
+	assert(!isAdminRegistered());
+
+	// Admin is not registered so we have to inform the user
+	if ((isFormSent('add_first_admin')) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password1')) || (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestElementSet('admin_password2')) || (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) || (postRequestElement('admin_password1') != postRequestElement('admin_password2')))) {
+		setPostRequestElement('add_first_admin', '***');
+	} // END - if
+
+	// Clear error message
+	$errorMessage = '';
+	$ret = 'init';
+
+	// Is form for first admin sent?
+	if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') != '***')) {
+		// Hash the password with the old function because we are here in install mode
+		$hashedPass = md5(postRequestElement('admin_password1'));
+
+		// Kill maybe existing session variables
+		destroyAdminSession();
+
+		// Do registration
+		$ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster(), 'allow');
+
+		// Check if registration wents fine
+		switch ($ret) {
+			case 'done':
+				// Change ADMIN_REGISTERED entry
+				$done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+
+				// Was it successfull?
+				if ($done === TRUE) {
+					// Registering is done
+					redirectToUrl('modules.php?module=admin&amp;register=done');
+				} else {
+					// Registration incomplete
+					$errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
+
+					// Set this to have our error message displayed
+					setPostRequestElement('add_first_admin', '***');
+				}
+				break;
+
+			case 'failed': // Registration has failed
+				$errorMessage = '{--ADMIN_REGISTER_FAILED--}';
+
+				// Set this to have our error message displayed
+				setPostRequestElement('add_first_admin', '***');
+				break;
+
+			case 'already': // Admin does already exists!
+				$errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
+
+				// Set this to have our error message displayed
+				setPostRequestElement('add_first_admin', '***');
+				break;
+
+			default:
+				// Any other kind will be logged
+				$errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+				logDebugMessage(__FUNCTION__, __LINE__, $errorMessage);
+
+				// Set this to have our error message displayed
+				setPostRequestElement('add_first_admin', '***');
+				break;
+		} // END - switch
+	} // END - if
+
+	// Whas that action okay?
+	if ($ret != 'done') {
+		// Init login name
+		$content['admin_login'] = '';
+		if (isPostRequestElementSet('admin_login')) {
+			$content['admin_login'] = postRequestElement('admin_login');
+		} // END - if
+
+		// Init array elements
+		$content['login_message'] = '';
+		$content['password1_message'] = '';
+		$content['password2_message'] = '';
+		$content['error_message'] = '';
+
+		// Yet-another notice-fix
+		if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') == '***')) {
+			// Init variables
+			$loginMessage = '';
+			$password1Message = '';
+			$password2Message = '';
+
+			// No login entered?
+			if (empty($content['admin_login'])) {
+				$loginMessage = '{--ADMIN_NO_LOGIN--}';
+			} // END - if
+
+			// An error comes back from registration?
+			if ((!empty($ret)) && ($ret != 'init')) {
+				$loginMessage = $errorMessage;
+			} // END - if
+
+			// No password 1 entered or to short?
+			if (!isPostRequestElementSet('admin_password1')) {
+				$password1Message = '{--ADMIN_NO_PASSWORD1--}';
+			} elseif (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) {
+				$password1Message = '{--ADMIN_SHORT_PASSWORD1--}';
+			}
+
+			// No password 2 entered or to short?
+			if (!isPostRequestElementSet('admin_password2')) {
+				$password2Message = '{--ADMIN_NO_PASSWORD2--}';
+			} elseif (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) {
+				$password2Message = '{--ADMIN_SHORT_PASSWORD2--}';
+			}
+
+			// Both didn't match?
+			if (postRequestElement('admin_password1') != postRequestElement('admin_password2')) {
+				// No match
+				if (empty($password1Message)) $password1Message = '{--ADMIN_PASSWORD1_MISMATCH--}';
+				if (empty($password2Message)) $password2Message = '{--ADMIN_PASSWORD2_MISMATCH--}';
+			} // END - if
+
+			// Output error messages
+			$content['login_message']     = loadTemplate('admin_login_msg', TRUE, $loginMessage);
+			$content['password1_message'] = loadTemplate('admin_login_msg', TRUE, $password1Message);
+			$content['password2_message'] = loadTemplate('admin_login_msg', TRUE, $password2Message);
+			$content['error_message']     = loadTemplate('admin_login_msg', TRUE, $errorMessage);
+		} // END - if
+
+		// Output message in seperate template
+		displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
+
+		// Load register template
+		loadTemplate('admin_reg_form', FALSE, $content);
+	} // END - if
+}
+
 // [EOF]
 ?>