X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=82b3c4202c8faf5a543e4200dbb8ccbb03c41e81;hb=6fc9548b2a0b5bef38ed406ceb3b68981f3d5e48;hp=d668fbaacd7d4447dedffe3820c367fc7cff8fe4;hpb=9d527cf8f2d95f7f58a42cb159f0ffc732f49d39;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index d668fbaacd..82b3c4202c 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
@@ -81,27 +81,27 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 	if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
 		// Get password from cache
 		$data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid];
-		$ret = "pass";
+		$ret = 'pass';
 		incrementConfigEntry('cache_hits');
 
 		// Include more admins data?
-		if (GET_EXT_VERSION("admins") >= "0.7.0") {
+		if (GET_EXT_VERSION('admins') >= '0.7.2') {
 			// Load them here
 			$data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid];
 			$data['last_failure']   = $GLOBALS['cache_array']['admins']['last_failure'][$aid];
 		} // END - if
-	} elseif (!EXT_IS_ACTIVE("cache")) {
+	} elseif (!EXT_IS_ACTIVE('cache')) {
 		// Add extra data via filter now
-		$ADD = runFilterChain('sql_admin_extra_data');
+		$add = runFilterChain('sql_admin_extra_data');
 
 		// Get password from DB
-		$result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT password".$add." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
 			array($aid), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
 			// Login password found
-			$ret = "pass";
+			$ret = 'pass';
 
 			// Fetch data
 			$data = SQL_FETCHARRAY($result);
@@ -117,8 +117,8 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 		$data['password'] = generateHash($password);
 
 		// Is the sql_patches not installed, than we cannot have a valid hashed password here!
-		if (($ret == "pass") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) $ret = "done";
-	} elseif ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == "")) {
+		if (($ret == 'pass') && ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == ""))) $ret = "done";
+	} elseif ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == "")) {
 		// Old hashing way
 		return $ret;
 	} elseif (!isset($data['password'])) {
@@ -132,13 +132,13 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 
 	// Check if password is same
 	//* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*<br >\n";
-	if (($ret == "pass") && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) {
+	if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) {
 		// Re-hash the plain passord with new random salt
 		$data['password'] = generateHash($password);
 
 		// Do we have 0.7.0 of admins or later?
 		// Remmeber login failures if available
-		if (GET_EXT_VERSION("admins") >= "0.7.2") {
+		if (GET_EXT_VERSION('admins') >= '0.7.2') {
 			// Store it in session
 			set_session('mxchange_admin_failures', $data['login_failures']);
 			set_session('mxchange_admin_last_fail', $data['last_failure']);
@@ -153,7 +153,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 		}
 
 		// Rebuild cache
-		rebuildCacheFiles("admins", "admin");
+		rebuildCacheFiles('admins', 'admin');
 
 		// Login has failed by default... ;-)
 		$ret = "failed";
@@ -163,7 +163,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 			// All done now
 			$ret = "done";
 		} // END - if
-	} elseif ((empty($salt)) && ($ret == "pass")) {
+	} elseif ((empty($salt)) && ($ret == 'pass')) {
 		// Something bad went wrong
 		$ret = "failed";
 	} elseif ($ret == "done") {
@@ -175,13 +175,13 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 	}
 
 	// Count login failure if admins extension version is 0.7.0+
-	if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) {
+	if (($ret == 'pass') && (GET_EXT_VERSION('admins') >= '0.7.0')) {
 		// Update counter
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",
 			array($aid), __FUNCTION__, __LINE__);
 
 		// Rebuild cache
-		rebuildCacheFiles("admins", "admin");
+		rebuildCacheFiles('admins', 'admin');
 	} // END - if
 
 	// Return the result
@@ -192,13 +192,13 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 // Try to login the admin by setting some session/cookie variables
 function LOGIN_ADMIN ($adminLogin, $passHash) {
 	// Reset failure counter on matching admins version
-	if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) {
+	if ((GET_EXT_VERSION('admins') >= '0.7.0') && ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == ""))) {
 		// Reset counter on out-dated sql_patches version
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
 			array($adminLogin), __FUNCTION__, __LINE__);
 
 		// Rebuild cache
-		rebuildCacheFiles("admins", "admin");
+		rebuildCacheFiles('admins', 'admin');
 	} // END - if
 
 	// Now set all session variables and return the result
@@ -218,16 +218,16 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
 // Only be executed on cookie checking
 function CHECK_ADMIN_COOKIES ($admin_login, $password) {
 	// By default no admin cookies are found
-	$ret = "404"; $pass = "";
+	$ret = "404"; $pass = '';
 
 	// Get hash
 	$pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login));
-	if ($pass != "-1") $ret = "pass";
+	if ($pass != "-1") $ret = 'pass';
 
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
 
 	// Check if password matches
-	if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
+	if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
 		// Passwords matches!
 		$ret = "done";
 	}
@@ -258,7 +258,7 @@ function ADMIN_DO_ACTION ($wht) {
 	define('__ADMIN_ID'   , GET_CURRENT_ADMIN_ID());
 
 	// Preload templates
-	if (EXT_IS_ACTIVE("admins")) {
+	if (EXT_IS_ACTIVE('admins')) {
 		define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome_admins", true));
 	} else {
 		define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome", true));
@@ -271,12 +271,12 @@ function ADMIN_DO_ACTION ($wht) {
 
 	// Check if action/what pair is valid
 	$result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu`
-WHERE `action`='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))
+WHERE `action`='%s' AND ((`what`='%s' AND what != 'overview') OR ((`what`='' OR `what` IS NULL) AND '%s'='overview'))
 LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result_action) == 1) {
 		// Is valid but does the inlcude file exists?
 		$INC = sprintf("inc/modules/admin/action-%s.php", $act);
-		if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && ($GLOBALS['acl_allow'] === true)) {
+		if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION('admin', $act, $wht)) && ($GLOBALS['acl_allow'] === true)) {
 			// Ok, we finally load the admin action module
 			LOAD_INC($INC);
 		} elseif ($GLOBALS['acl_allow'] === false) {
@@ -305,14 +305,14 @@ LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__);
 function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 	// Init variables
 	$SUB = false;
-	$OUT = "";
+	$OUT = '';
 
 	// Menu descriptions
 	$GLOBALS['menu']['description'] = array();
 	$GLOBALS['menu']['title'] = array();
 
 	// Is there a cache instance?
-	if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) {
+	if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) {
 		// Create cache name
 		$cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
 
@@ -336,14 +336,14 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 	} // END - if
 
 	// Build main menu
-	$result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
+	$result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result_main) > 0) {
 		$OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
 <tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
 		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 		while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
-			if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
-				$ACL = ADMINS_CHECK_ACL($menu, "");
+			if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) {
+				$ACL = ADMINS_CHECK_ACL($menu, '');
 			} else {
 				// ACL is "allow"... hmmm
 				$ACL = true;
@@ -357,7 +357,8 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 				}
 				$OUT .= "<tr>
 	<td class=\"admin_menu\" colspan=\"2\">
-		<nobr>&nbsp;<strong>&middot;</strong>&nbsp;";
+		<div class=\"nobr\">&nbsp;<strong>&middot;</strong>&nbsp;";
+
 				if (($menu == $act) && (empty($wht))) {
 					$OUT .= "<strong>";
 				} else {
@@ -371,12 +372,19 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 				} else {
 					$OUT .= "</a>]";
 				}
-				$OUT .= "</nobr></td>
+
+				$OUT .= "</div></td>
 </tr>\n";
+
+				// Check for menu entries
 				$result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC",
 					array($menu), __FUNCTION__, __LINE__);
-				if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
-				{
+
+				// Remember the count for later checks
+				setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)));
+
+				// Do we have entries?
+				if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
 					$GLOBALS['menu']['description'] = array();
 					$GLOBALS['menu']['title'] = array(); $SUB = true;
 					$OUT .= "<tr>
@@ -387,7 +395,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 					while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
 						// Filename
 						$INC = sprintf("inc/modules/admin/what-%s.php", $wht_sub);
-						if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
+						if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) {
 							$ACL = ADMINS_CHECK_ACL("", $wht_sub);
 						} else {
 							// ACL is "allow"... hmmm
@@ -404,7 +412,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 							$GLOBALS['menu']['description'][$wht_sub] = $desc_what;
 							$OUT .= "<tr>
 	<td class=\"admin_menu\" colspan=\"2\">
-		<nobr>&nbsp;<strong>--&gt;</strong>&nbsp;";
+		<div class=\"nobr\">&nbsp;<strong>--&gt;</strong>&nbsp;";
 							if ($readable === true) {
 								if ($wht == $wht_sub) {
 									$OUT .= "<strong>";
@@ -426,7 +434,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 							} else {
 								$OUT .= "</em>";
 							}
-							$OUT .= "</nobr></td>
+							$OUT .= "</div></td>
 </tr>\n";
 						}
 					}
@@ -437,6 +445,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 	</td>
 </tr>\n";
 				}
+
 				$OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
 			}
 		}
@@ -447,7 +456,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 	}
 
 	// Is there a cache instance again?
-	if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) {
+	if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) {
 		// Init cache
 		$GLOBALS['cache_instance']->init($cacheName);
 
@@ -474,12 +483,12 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 }
 
 // Create member selection box
-function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid") {
+function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field='userid') {
 	// Output selection form with all confirmed user accounts listed
 	$result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY userid", __FUNCTION__, __LINE__);
 
 	// Default output
-	$OUT = "";
+	$OUT = '';
 
 	// USe this only for adding points (e.g. adding refs really makes no sence ;-) )
 	if ($add_all === true)   $OUT = "      <option value=\"all\">{--ALL_MEMBERS--}</option>\n";
@@ -487,7 +496,7 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non
 
 	while ($content = SQL_FETCHARRAY($result)) {
 		$OUT .= "      <option value=\"".bigintval($content['userid'])."\"";
-		if ($def == $content['userid']) $OUT .= " selected=\"selected\"";
+		if ($def == $content['userid']) $OUT .= ' selected="selected"';
 		$OUT .= ">".$content['surname']." ".$content['family']." (".bigintval($content['userid']).")</option>\n";
 	} // END - while
 
@@ -511,21 +520,21 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non
 }
 
 // Create a menu selection box for given menu system
-function ADMIN_MENU_SELECTION ($MODE, $default="", $defid="") {
+function ADMIN_MENU_SELECTION ($mode, $default="", $defid="") {
 	$wht = "`what` != ''";
-	if ($MODE == "action") $wht = "(what='' OR `what` IS NULL) AND action !='login'";
+	if ($mode == "action") $wht = "(`what`='' OR `what` IS NULL) AND action !='login'";
 	$result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`",
-		array($MODE), __FUNCTION__, __LINE__);
+		array($mode), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Load menu as selection
-		$OUT = "<select name=\"".$MODE."_menu";
+		$OUT = "<select name=\"".$mode."_menu";
 		if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
 		$OUT .= "\" size=\"1\" class=\"admin_select\">
 	<option value=\"\">{--SELECT_NONE--}</option>\n";
 		// @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
 		while (list($menu, $title) = SQL_FETCHROW($result)) {
 			$OUT .= "  <option value=\"".$menu."\"";
-			if ((!empty($default)) && ($default == $menu)) $OUT .= " selected=\"selected\"";
+			if ((!empty($default)) && ($default == $menu)) $OUT .= ' selected="selected"';
 			$OUT .= ">".$title."</option>\n";
 		} // END - while
 
@@ -641,20 +650,20 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
 	rebuildCacheFiles("config", "config");
 
 	// Settings saved
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
+	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 }
 
 // Generate a selection box
 function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
 	// Open the requested menu directory
-	$handle = opendir(sprintf("%sinc/modules/%s/", constant('PATH'), $menu)) or mxchange_die("Cannot load menu ".$menu."!");
+	$menuArray = GET_DIR_AS_ARRAY(sprintf("inc/modules/%s/", $menu), '', false, false);
 
 	// Init the selection box
 	$OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">
 	<option value=\"\">{--IS_TOP_MENU--}</option>\n";
 
 	// Walk through all files
-	while ($file = readdir($handle)) {
+	foreach ($menuArray as $file) {
 		// Is this a PHP script?
 		if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) {
 			// Then test if the file is readable
@@ -669,21 +678,21 @@ function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
 				// Is that part different from the overview?
 				if ($part != "overview") {
 					$OUT .= "	<option value=\"".$part."\"";
-					if ($part == $default) $OUT .= " selected=\"selected\"";
+					if ($part == $default) $OUT .= ' selected="selected"';
 					$OUT .= ">".$part."</option>\n";
 				} // END - if
 			} // END - if
 		} // END - if
-	} // END - while
+	} // END - foreach
 
-	// Close dir and selection box
-	closedir($handle);
+	// Close selection box
 	$OUT .= "</select>\n";
 	
 	// Return contents
 	return $OUT;
 }
-//
+
+// Creates a user-profile link for the admin. This function can also be used for many other purposes
 function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
 	if (($title == "") && ($title != "0")) {
 		// Set userid as title
@@ -703,8 +712,8 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
 // Check "logical-area-mode"
 function ADMIN_CHECK_MENU_MODE () {
 	// Set the global mode as the mode for all admins
-	$MODE = getConfig('admin_menu');
-	$ADMIN = $MODE;
+	$mode = getConfig('admin_menu');
+	$ADMIN = $mode;
 
 	// Get admin id
 	$aid = GET_CURRENT_ADMIN_ID();
@@ -714,8 +723,8 @@ function ADMIN_CHECK_MENU_MODE () {
 		// Load from cache
 		$ADMIN = $GLOBALS['cache_array']['admins']['la_mode'][$aid];
 		incrementConfigEntry('cache_hits');
-	} elseif (GET_EXT_VERSION("admins") >= "0.6.7") {
-		// Load from database when version of "admins" is enough
+	} elseif (GET_EXT_VERSION('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",
 			array($aid), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
@@ -728,10 +737,10 @@ function ADMIN_CHECK_MENU_MODE () {
 	}
 
 	// Check what the admin wants and set it when it's not the global mode
-	if ($ADMIN != "global") $MODE = $ADMIN;
+	if ($ADMIN != "global") $mode = $ADMIN;
 
 	// Return admin-menu's mode
-	return $MODE;
+	return $mode;
 }
 
 // Change activation status
@@ -755,7 +764,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
 					list($currStatus) = SQL_FETCHROW($result);
 
 					// And switch it N<->Y
-					if ($currStatus == "Y") $newStatus = "N"; else $newStatus = "Y";
+					if ($currStatus == 'Y') $newStatus = "N"; else $newStatus = "Y";
 
 					// Change this status
 					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
@@ -771,10 +780,10 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
 		} // END - foreach
 
 		// Output status
-		LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs)));
+		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs)));
 	} else {
 		// Nothing selected!
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE'));
 	}
 }
 
@@ -818,7 +827,7 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="")
 
 // Build a special template list
 function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
-	$OUT = ""; $SW = 2;
+	$OUT = ''; $SW = 2;
 
 	// "Walk" through all entries
 	foreach ($IDs as $id => $selected) {
@@ -839,7 +848,7 @@ function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions,
 				$idx = array_search($key, $columns, true);
 
 				// Do we have a userid?
-				if ($key == "userid") {
+				if ($key == 'userid') {
 					// Add it again as raw id
 					$content['uid'] = bigintval($value);
 				} // END - if
@@ -914,7 +923,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
 					} // END - if
 				} elseif (isset($content[$column])) {
 					// Unfinished!
-					mxchange_die("{--".__FUNCTION__."--}:".__LINE__.":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+					app_die(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
 				}
 			} // END - foreach
 
@@ -937,7 +946,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
 			} // END - foreach
 
 			// Finish SQL statement
-			$sql = substr($sql, 0, -1) . sprintf(" WHERE %s=%s AND %s='%s' LIMIT 1",
+			$sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
 				$idColumn,
 				bigintval($id),
 				$statusColumn,
@@ -960,7 +969,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
 }
 
 // Delete rows by given ID numbers
-function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn="id", $userIdColumn="userid") {
+function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn="id", $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
 		// Shall we delete here or list for deletion?
@@ -969,7 +978,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
 			$sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s IN (%s)";
 
 			// Delete them all
-			$idList = "";
+			$idList = '';
 			foreach ($IDs as $id => $sel) {
 				// Is there a userid?
 				if (REQUEST_ISSET_POST('uid_raw', $id)) {
@@ -997,10 +1006,10 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
 			// Was this fine?
 			if (SQL_AFFECTEDROWS() == count($IDs)) {
 				// All deleted
-				LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_REMOVED'));
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_REMOVED'));
 			} else {
 				// Some are still there :(
-				LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
+				LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
 			}
 		} else {
 			// List for deletion confirmation
@@ -1010,7 +1019,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
 }
 
 // Edit rows by given ID numbers
-function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn="id", $userIdColumn="userid") {
+function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn="id", $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
 		// Shall we change here or list for editing?
@@ -1087,10 +1096,10 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
 			// Was this fine?
 			if ($affected == count($IDs)) {
 				// All deleted
-				LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_EDITED'));
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_EDITED'));
 			} else {
 				// Some are still there :(
-				LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
+				LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
 			}
 		} else {
 			// List for editing
@@ -1100,7 +1109,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
 }
 
 // Un-/lock rows by given ID numbers
-function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn="userid") {
+function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && ((!$lockNow) || (count($statusArray) == 1))) {
 		// Shall we un-/lock here or list for locking?
@@ -1115,7 +1124,7 @@ function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
 }
 
 // Undelete rows by given ID numbers
-function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn="userid") {
+function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && ((!$lockNow) || (count($statusArray) == 1))) {
 		// Shall we un-/lock here or list for locking?
@@ -1147,7 +1156,7 @@ function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
 // Sends out a link to the given email adress so the admin can reset his/her password
 function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
 	// Init output
-	$OUT = "";
+	$OUT = '';
 
 	// Compile out security characters (must be for looking up!)
 	$email = COMPILE_CODE($email);
@@ -1215,13 +1224,14 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
 	// Return result
 	return $valid;
 }
+
 // Reset the password for the login. Do NOT call this function without calling above function first!
 function ADMIN_RESET_PASSWORD ($login, $password) {
 	// Init hash
-	$passHash = "";
+	$passHash = '';
 
 	// Now check if we have sql_patches installed
-	if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
+	if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
 		// Use new way of hashing
 		$passHash = generateHash($password);
 	} else {
@@ -1239,16 +1249,19 @@ function ADMIN_RESET_PASSWORD ($login, $password) {
 	// Return output
 	return ADMIN_PASSWORD_RESET_DONE;
 }
+
 // Solves a task by given id number
 function ADMIN_SOLVE_TASK ($id) {
 	// Update the task data
 	ADMIN_UPDATE_TASK_DATA($id, "status", "SOLVED");
 }
+
 // Marks a given task as deleted
 function ADMIN_DELETE_TASK ($id) {
 	// Update the task data
 	ADMIN_UPDATE_TASK_DATA($id, "status", "DELETED");
 }
+
 // Function to update task data
 function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
 	// Is the id not set, then we need a backtrace here... :(
@@ -1265,5 +1278,36 @@ function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE id=%s LIMIT 1",
 		array($row, $data, bigintval($id)), __FUNCTION__, __LINE__);
 }
+
+// Checks wether if the admin menu has entries
+function ifAdminMenuHasEntries ($action) {
+	return (
+		((
+			isset($GLOBALS['admin_menu_has_entries'][$action])
+		) && (
+			$GLOBALS['admin_menu_has_entries'][$action] === true
+		)) || (
+			$action == "login"
+		)
+	);
+}
+
+// Setter for 'admin_menu_has_entries'
+function setAdminMenuHasEntries ($action, $hasEntries) {
+	$GLOBALS['admin_menu_has_entries'][$action] = (bool) $hasEntries;
+}
+
+// Creates a link to the user's admin-profile
+function ADMIN_CREATE_USERID_LINK ($uid) {
+	// Is the userid set correctly?
+	if ($uid > 0) {
+		// Create a link to that profile
+		return "{!URL!}/modules.php?module=admin&amp;what=list_user&amp;uid=".bigintval($uid);
+	} // END - if
+
+	// Return a link to the user list
+	return "{!URL!}/modules.php?module=admin&amp;what=list_user";
+}
+
 //
 ?>