X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=df9eeac2674c86c6f08e0f03b12cc46d9daf16ff;hp=3096cd930e2108f56d2813f79f761ab533971c86;hb=0533bba499e23b91209b91f40737058a36f40ffe;hpb=55c394034c676bf5815d5fbc38555258ba6a59d4

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 3096cd930e..df9eeac267 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -74,8 +72,9 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
 
 // This function will be executed when the admin is not logged in and has submitted his login data
 function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
-	// First of all, no admin login is found
+	// First of all, no admin login is found, so the admin hash is null
 	$ret = '404';
+	$adminHash = null;
 
 	// Get admin id from login
 	$adminId = getAdminId($adminLogin);
@@ -99,7 +98,7 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 				$ret = 'done';
 			} else {
 				// Set status
-				$ret = 'pass';
+				$ret = 'password';
 			}
 		} // END - if
 	} // END - if
@@ -139,7 +138,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 			$ret = 'done';
 		} else {
 			// Set status
-			$ret = 'pass';
+			$ret = 'password';
 		}
 	} // END - if
 
@@ -167,16 +166,16 @@ function doAdminAction () {
 	// Get action value
 	$action = getActionFromModuleWhat(getModule(), $what);
 
-	// Define admin login name and id number
-	$content['login'] = getAdminLogin(getSession('admin_id'));
-	$content['id']    = getCurrentAdminId();
-
-	// Preload templates
+	// Load welcome template
 	if (isExtensionActive('admins')) {
-		$content['welcome'] = loadTemplate('admin_welcome_admins', true, $content);
+		// @TODO This and the next getCurrentAdminId() call might be moved into the templates?
+		$content['welcome'] = loadTemplate('admin_welcome_admins', true, getCurrentAdminId());
 	} else {
-		$content['welcome'] = loadTemplate('admin_welcome', true, $content);
+		$content['welcome'] = loadTemplate('admin_welcome', true, getCurrentAdminId());
 	}
+
+	// Load header, footer, render menu
+	$content['header'] = loadTemplate('admin_header' , true, $content);
 	$content['footer'] = loadTemplate('admin_footer' , true, $content);
 	$content['menu']   = addAdminMenu($action, $what, true);
 
@@ -219,11 +218,11 @@ LIMIT 1",
 			// Access denied
 			loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
 		} else {
-			// Include file not found! :-(
+			// Include file not found :-(
 			loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action));
 		}
 	} else {
-		// Invalid action/what pair found!
+		// Invalid action/what pair found
 		loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
 	}
 
@@ -234,8 +233,22 @@ LIMIT 1",
 	loadTemplate('admin_main_footer', false, $content);
 }
 
+// Checks wether current admin is allowed to access given action/what combination
+// (only one is allowed to be null!)
+function isAdminAllowedAccessMenu ($action, $what = null) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$action][$what])) {
+		// ACL is always 'allow' when no ext-admins is installed
+		// @TODO This can be rewritten into a filter
+		$GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (adminsCheckAdminAcl($action, $what)));
+	} // END - if
+
+	// Return the cached value
+	return $GLOBALS[__FUNCTION__][$action][$what];
+}
+
 // Adds an admin menu
-function addAdminMenu ($action, $what, $return=false) {
+function addAdminMenu ($action, $what, $return = false) {
 	// Init variables
 	$SUB = false;
 	$OUT = '';
@@ -256,29 +269,23 @@ ORDER BY
 	`id` DESC", __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		$OUT .= '<ul class="admin_menu_main">';
 		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 		while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
-			if (isExtensionInstalledAndNewer('admins', '0.2.0')) {
-				$ACL = adminsCheckAdminAcl($menu, '');
-			} else {
-				// @TODO ACL is 'allow'... hmmm
-				$ACL = true;
-			}
-
 			// Filename
 			$inc = sprintf("inc/modules/admin/action-%s.php", $menu);
 
 			// Is the file readable?
 			$readable = isIncludeReadable($inc);
 
-			if ($ACL === true) {
+			// Is the current admin allowed to access this 'action' menu?
+			if (isAdminAllowedAccessMenu($menu)) {
 				if ($SUB === false) {
 					// Insert compiled menu title and description
 					$GLOBALS['menu']['title'][$menu]      = $title;
 					$GLOBALS['menu']['description'][$menu] = $descr;
-				}
+				} // END - if
 				$OUT .= '<li class="admin_menu">
 <div class="nobr"><strong>&middot;</strong>&nbsp;';
 
@@ -289,7 +296,7 @@ ORDER BY
 						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
 					}
 				} else {
-					$OUT .= '<em style="cursor:help" class="admin_note" title="{%message,MENU_ACTION_404=' . $menu . '}">';
+					$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404=' . $menu . '%}">';
 				}
 
 				$OUT .= $title;
@@ -322,31 +329,23 @@ ORDER BY
 					array($menu), __FUNCTION__, __LINE__);
 
 				// Remember the count for later checks
-				setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($action == $menu)));
+				setAdminMenuHasEntries($menu, ((!SQL_HASZERONUMS($result_what)) && ($action == $menu)));
 
 				// Do we have entries?
-				if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
+				if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
 					$GLOBALS['menu']['description'] = array();
 					$GLOBALS['menu']['title'] = array(); $SUB = true;
 					$OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
 					// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 					while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
-						// Check for access level
-						if (isExtensionInstalledAndNewer('admins', '0.2.0')) {
-							$ACL = adminsCheckAdminAcl('', $what_sub);
-						} else {
-							// @TODO ACL is 'allow'... hmmm
-							$ACL = true;
-						}
-
 						// Filename
 						$inc = sprintf("inc/modules/admin/what-%s.php", $what_sub);
 
 						// Is the file readable?
 						$readable = isIncludeReadable($inc);
 
-						// Access allowed?
-						if ($ACL === true) {
+						// Is the current admin allowed to access this 'what' menu?
+						if (isAdminAllowedAccessMenu(null, $what_sub)) {
 							// Insert compiled title and description
 							$GLOBALS['menu']['title'][$what_sub]      = $title_what;
 							$GLOBALS['menu']['description'][$what_sub] = $desc_what;
@@ -359,7 +358,7 @@ ORDER BY
 									$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
 								}
 							} else {
-								$OUT .= '<em style="cursor:help" class="admin_note" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
+								$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $what_sub . '%}">';
 							}
 
 							$OUT .= $title_what;
@@ -423,14 +422,14 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no
 
 	if ($return === false) {
 		// Remeber options in constant
-		$content['member_selection'] = $OUT;
+		$content['form_selection'] = $OUT;
 		$content['what']             = getWhat();
 
 		// Load template
-		loadTemplate('admin_member_selection_box', false, $content);
+		loadTemplate('admin_form_selection_box', false, $content);
 	} else {
 		// Return content in selection frame
-		return '<select class="admin_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
+		return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
 	}
 }
 
@@ -443,11 +442,11 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 
 	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Load menu as selection
 		$OUT = '<select name="' . $mode . '_menu';
 		if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
-		$OUT .= '" size="1" class="admin_select">
+		$OUT .= '" size="1" class="form_select">
 	<option value="">{--SELECT_NONE--}</option>';
 		// Load all entries
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -490,7 +489,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 		// Process only formular field but not submit buttons ;)
 		if ($id != 'ok') {
 			// Do not save the ok value
-			convertSelectionsToTimestamp($postData, $tableData, $id, $skip);
+			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')) {
@@ -501,7 +500,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 				} // END - if
 
 				// Shall we add numbers or strings?
-				$test = (float)$val;
+				$test = (float) $val;
 				if ('' . $val . '' == '' . $test . '') {
 					// Add numbers
 					$tableData[] = sprintf("`%s`=%s", $id, $test);
@@ -577,7 +576,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	rebuildCache('config', 'config');
 
 	// Settings saved, so display message?
-	if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+	if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
 
 	// Return affected rows
 	return $affected;
@@ -586,10 +585,10 @@ 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), '', false, false);
+	$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', false, false);
 
 	// Init the selection box
-	$OUT = '<select name="' . $name . '" class="admin_select" size="1"><option value="">{--IS_TOP_MENU--}</option>';
+	$OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
 
 	// Walk through all files
 	foreach ($menuArray as $file) {
@@ -623,7 +622,7 @@ 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 == '') && ($userid > 0)) {
+	if (($title == '') && (isValidUserId($userid))) {
 		// Set userid as title
 		$title = $userid;
 	} elseif ($userid == 0) {
@@ -639,7 +638,11 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 		$nick = getNickname($userid);
 
 		// Is it not empty, use it as title else the userid
-		if (!empty($nick)) $title = $nick . '(' . $userid . ')'; else $title = $userid;
+		if (!empty($nick)) {
+			$title = $nick . '(' . $userid . ')';
+		} else {
+			$title = $userid;
+		}
 	}
 
 	// Return link
@@ -649,7 +652,14 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 // Check "logical-area-mode"
 function adminGetMenuMode () {
 	// Set the default menu mode as the mode for all admins
-	$mode = getConfig('admin_menu');
+	$mode = 'global';
+
+	// If sql_patches is up-to-date enough, use the configuration
+	if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
+		$mode = getAdminMenu();
+	} // END - if
+
+	// Backup it
 	$adminMode = $mode;
 
 	// Get admin id
@@ -662,7 +672,7 @@ function adminGetMenuMode () {
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionInstalledAndNewer('admins', '0.6.7')) {
 		// Load from database when version of 'admins' is enough
-		$result = SQL_QUERY_ESC("SELECT la_mode FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array($adminId), __FUNCTION__, __LINE__);
 
 		// Do we have an entry?
@@ -676,7 +686,9 @@ function adminGetMenuMode () {
 	}
 
 	// Check what the admin wants and set it when it's not the default mode
-	if ($adminMode != 'global') $mode = $adminMode;
+	if ($adminMode != 'global') {
+		$mode = $adminMode;
+	} // END - if
 
 	// Return admin-menu's mode
 	return $mode;
@@ -684,7 +696,7 @@ function adminGetMenuMode () {
 
 // Change activation status
 function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
-	$cnt = '0'; $newStatus = 'Y';
+	$count = '0'; $newStatus = 'Y';
 	if ((is_array($IDs)) && (count($IDs) > 0)) {
 		// "Walk" all through and count them
 		foreach ($IDs as $id => $selected) {
@@ -710,7 +722,7 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 					array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
 
 					// Count up affected rows
-					$cnt += SQL_AFFECTEDROWS();
+					$count += SQL_AFFECTEDROWS();
 				} // END - if
 
 				// Free the result
@@ -719,10 +731,10 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 		} // END - foreach
 
 		// Output status
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs)));
+		displayMessage(sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
 	} else {
 		// Nothing selected!
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}');
+		displayMessage('{--ADMIN_NOTHING_SELECTED_CHANGE--}');
 	}
 }
 
@@ -739,9 +751,6 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 
 	// Is the raw userid set?
 	if (postRequestParameter($userid, $id) > 0) {
-		// Generate subject
-		$subject = '{--MEMBER_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
-
 		// Load email template
 		if (!empty($subjectPart)) {
 			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
@@ -750,11 +759,11 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 		}
 
 		// Send email out
-		sendEmail(postRequestParameter($userid, $id), $subject, $mail);
+		sendEmail(postRequestParameter($userid, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
 	} // END - if
 
 	// Generate subject
-	$subject = '{--ADMIN_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
+	$subject = strtoupper('{--ADMIN_' . $subject . '_' . $table . '_SUBJECT--}');
 
 	// Send admin notification out
 	if (!empty($subjectPart)) {
@@ -863,7 +872,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 					} // END - if
 				} elseif (isset($content[$column])) {
 					// Unfinished!
-					debug_report_bug(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+					debug_report_bug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
 				}
 			} // END - foreach
 
@@ -943,7 +952,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 					SQL_FREERESULT($result);
 
 					// Send "build mails" out
-					sendAdminBuildMails('del', $table, $content, $id);
+					sendAdminBuildMails('delete', $table, $content, $id);
 				} // END - if
 
 				// Add id number
@@ -956,14 +965,14 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 			// Was this fine?
 			if (SQL_AFFECTEDROWS() == count($IDs)) {
 				// All deleted
-				loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}');
+				displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
 			} else {
 				// Some are still there :(
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
+				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
 			}
 		} else {
 			// List for deletion confirmation
-			adminListBuilder('del', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+			adminListBuilder('delete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
 		}
 	} // END - if
 }
@@ -1045,10 +1054,10 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 			// Was this fine?
 			if ($affected == count($IDs)) {
 				// All deleted
-				loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}');
+				displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
 			} else {
 				// Some are still there :(
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
+				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
 			}
 		} else {
 			// List for editing
@@ -1113,7 +1122,7 @@ function sendAdminPasswordResetLink ($email) {
 
 	// Is there an account?
 	if (SQL_HASZERONUMS($result)) {
-		// No account found!
+		// No account found
 		return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
 	} // END - if
 
@@ -1124,7 +1133,7 @@ function sendAdminPasswordResetLink ($email) {
 	SQL_FREERESULT($result);
 
 	// Generate hash for reset link
-	$content['hash'] = generateHash(getConfig('URL') . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
+	$content['hash'] = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $content['login'] . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
 	// Remove some data
 	unset($content['id']);
@@ -1134,10 +1143,10 @@ function sendAdminPasswordResetLink ($email) {
 	$mailText = loadEmailTemplate('admin_reset_password', $content);
 
 	// Send it out
-	sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
+	sendEmail($email, '{--ADMIN_RESET_PASSWORD_LINK_SUBJECT--}', $mailText);
 
 	// Prepare output
-	return '{--ADMIN_RESET_LINK_SENT--}';
+	return '{--ADMIN_RESET_PASSWORD_LINK_SENT--}';
 }
 
 // Validate hash and login for password reset
@@ -1155,7 +1164,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 		$content = SQL_FETCHARRAY($result);
 
 		// Generate hash again
-		$hashFromData = generateHash(getConfig('URL') . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
+		$hashFromData = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $login . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
 		// Does both match?
 		$valid = ($hash == $hashFromData);
@@ -1178,7 +1187,7 @@ function doResetAdminPassword ($login, $password) {
 		array($passHash, $login), __FUNCTION__, __LINE__);
 
 	// Run filters
-	runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
+	runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash));
 
 	// Return output
 	return '{--ADMIN_PASSWORD_RESET_DONE--}';
@@ -1247,7 +1256,7 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
 // Creates a link to the user's admin-profile
 function adminCreateUserLink ($userid) {
 	// Is the userid set correctly?
-	if ($userid > 0) {
+	if (isValidUserId($userid)) {
 		// Create a link to that profile
 		return '{%url=modules.php?module=admin&amp;what=list_user&amp;userid=' . bigintval($userid) . '%}';
 	} // END - if
@@ -1259,7 +1268,7 @@ function adminCreateUserLink ($userid) {
 // Generate a "link" for the given admin id (admin_id)
 function generateAdminLink ($adminId) {
 	// No assigned admin is default
-	$adminLink = '<span class="admin_note">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>';
+	$adminLink = '<span class="notice">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>';
 
 	// Zero? = Not assigned
 	if (bigintval($adminId) > 0) {
@@ -1274,11 +1283,11 @@ function generateAdminLink ($adminId) {
 				$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
 			} else {
 				// Extension not found
-				$adminLink = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'admins');
+				$adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
 			}
 		} else {
 			// Maybe deleted?
-			$adminLink = '<div class="admin_note">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+			$adminLink = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
 		}
 	} // END - if
 
@@ -1306,13 +1315,13 @@ function doVerifyExpertSettings () {
 		// Is he allowed?
 		if ($expertSettings == 'Y') {
 			// Okay, does he want to see them?
-			if (getAminsExpertWarning() == 'Y') {
+			if (isAdminsExpertWarningEnabled()) {
 				// Ask for them
 				if (isFormSent()) {
 					// Is the element set, then we need to change the admin
 					if (isPostRequestParameterSet('expert_settings')) {
 						// Get it and prepare final post data array
-						$postData['login'][getCurrentAdminId()] = getAdminLogin(getCurrentAdminId());
+						$postData['login'][getCurrentAdminId()] = getCurrentAdminLogin();
 						$postData['expert_warning'][getCurrentAdminId()] = 'N';
 
 						// Change it in the admin
@@ -1347,7 +1356,7 @@ function doVerifyExpertSettings () {
 	// Output message for other status than ask/agreed
 	if (($return != 'ask') && ($return != 'agreed')) {
 		// Output message
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
+		displayMessage('{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
 	} // END - if
 
 	// Return status
@@ -1362,7 +1371,7 @@ function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
 	// Do we have 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 . '%}">' . translateComma($unconfirmed) . '</a>';
+		$OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
 	} // END - if
 
 	// Return it
@@ -1393,7 +1402,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 ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('userid')) > 0)) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
+			if ((isGetRequestParameterSet('userid')) && (isValidUserId(getRequestParameter('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
 
 			// Close open anchor tag
 			$NAV .= '%}">';
@@ -1431,5 +1440,124 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 	}
 }
 
+// Process menu editing form
+function adminProcessMenuEditForm ($type, $subMenu) {
+	// An action is done...
+	foreach (postRequestParameter('sel') as $sel => $menu) {
+		$AND = "(`what` = '' OR `what` IS NULL)";
+
+		$sel = bigintval($sel);
+
+		if (!empty($subMenu)) {
+			$AND = "`action`='" . $subMenu . "'";
+		} // END - if
+
+		switch (postRequestParameter('ok')) {
+			case 'edit': // Edit menu
+				if (postRequestParameter('sel_what', $sel) == '') {
+					// Update with 'what'=null
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
+						array(
+							$type,
+							$menu,
+							postRequestParameter('sel_action', $sel),
+							$sel
+						), __FILE__, __LINE__);
+				} else {
+					// Update with selected 'what'
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+						array(
+							$type,
+							$menu,
+							postRequestParameter('sel_action', $sel),
+							postRequestParameter('sel_what', $sel),
+							$sel
+						), __FILE__, __LINE__);
+				}
+				break;
+
+			case 'delete': // Delete menu
+				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+					array($type, $sel), __FILE__, __LINE__);
+				break;
+
+			case 'status': // Change status of menus
+				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+					array($type, postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
+				break;
+
+			default: // Unexpected action
+				logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
+				displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+				break;
+		} // END - switch
+	} // END - foreach
+
+	// Load template
+	displayMessage('{--SETTINGS_SAVED--}');
+}
+
+// Handle weightning
+function doAdminProcessMenuWeightning ($type, $AND) {
+	// Are there all required (generalized) GET parameter?
+	if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
+		// Init variables
+		$tid = ''; $fid = '';
+
+		// Get ids
+		if (isGetRequestParameterSet('w')) {
+			// Sub menus selected
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+				array(
+					$type,
+					getRequestParameter('act'),
+					bigintval(getRequestParameter('tid'))
+				), __FILE__, __LINE__);
+			list($tid) = SQL_FETCHROW($result);
+			SQL_FREERESULT($result);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+				array(
+					$type,
+					getRequestParameter('act'),
+					bigintval(getRequestParameter('fid'))
+				), __FILE__, __LINE__);
+			list($fid) = SQL_FETCHROW($result);
+			SQL_FREERESULT($result);
+		} else {
+			// Main menu selected
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+				array(
+					$type,
+					bigintval(getRequestParameter('tid'))
+				), __FILE__, __LINE__);
+			list($tid) = SQL_FETCHROW($result);
+			SQL_FREERESULT($result);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+				array(
+					$type,
+					bigintval(getRequestParameter('fid'))
+				), __FILE__, __LINE__);
+			list($fid) = SQL_FETCHROW($result);
+			SQL_FREERESULT($result);
+		}
+
+		if ((!empty($tid)) && (!empty($fid))) {
+			// Sort menu
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+				array(
+					$type,
+					bigintval(getRequestParameter('tid')),
+					bigintval($fid)
+				), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+				array(
+					$type,
+					bigintval(getRequestParameter('fid')),
+					bigintval($tid)
+				), __FILE__, __LINE__);
+		} // END - if
+	} // END - if
+}
+
 // [EOF]
 ?>