X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_admins.php;h=9f1a9fac6a045d212330d533b78619b49c090786;hb=4e828541f3977c085ef54d3490b3e0069eb09a06;hp=bd5c7a93e09c96842d278416c2a58e3e4d10a691;hpb=b73c135350d7ed266c0cac680105707139bd892d;p=mailer.git

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index bd5c7a93e0..9f1a9fac6a 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 $SEL = 0;
 if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
@@ -48,7 +48,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 	$SW = 2; $OUT = "";
 	foreach ($_POST['sel'] as $id => $sel) {
 		// Load data for the ID
-		$result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM "._MYSQL_PREFIX."_admins_acls WHERE id=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
 		 array(bigintval($id)), __FILE__, __LINE__);
 		list($aid, $act, $wht, $mode) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
@@ -63,7 +63,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 			'mode_options'     => ADD_OPTION_LINES(
 				"/ARRAY/",
 				array("allow", "deny"),
-				array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE),
+				array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),
 				$mode
 			),
 		);
@@ -83,45 +83,39 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 		$id = bigintval($id);
 
 		// Update entries
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins_acls SET admin_id=%s, action_menu='%s', what_menu='%s', access_mode='%s' WHERE id=%s LIMIT 1",
-		 array($_POST['admin'][$id], $_POST['action_menu'][$id], $_POST['what_menu'][$id], $_POST['mode'][$id], $id),__FILE__, __LINE__);
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins_acls` SET admin_id=%s, action_menu='%s', what_menu='%s', access_mode='%s' WHERE id=%s LIMIT 1",
+			array($_POST['admin'][$id], $_POST['action_menu'][$id], $_POST['what_menu'][$id], $_POST['mode'][$id], $id),__FILE__, __LINE__);
 	}
 
 	// Update cache when installed
 	if (EXT_IS_ACTIVE("cache")) {
-		if ($cacheInstance->cache_file("admins_acls", true) == true) $cacheInstance->cache_destroy();
+		if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
 
 		// Purge menu cache
 		CACHE_PURGE_ADMIN_MENU($_POST['admin'][$id]);
 	}
 
 	// Entries changed
-	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ENTRIES_CHANGED);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
 } elseif ((isset($_POST['del'])) && ($SEL > 0)) {
 	// Delete ACLs
 	$SW = 2; $OUT = "";
 	foreach ($_POST['sel'] as $id => $sel) {
 		// Load data for the ID
-		$result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM "._MYSQL_PREFIX."_admins_acls WHERE id=%s LIMIT 1",
-		 array(bigintval($id)), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
+			array(bigintval($id)), __FILE__, __LINE__);
 		list($admin, $act, $wht, $mode) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		// Prepare variables
 		if (empty($act)) $act = "---";
-		if (empty($wht)) $wht   = "---";
-		$eval = "\$mode = ADMINS_".strtoupper($mode)."_MODE;";
-		eval($eval);
-
-		// Load admin's data
-		$login = GET_ADMIN_LOGIN($admin);
-		if ($login != "***") {
-			// Admin found
-			$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
-		} else {
-			// Maybe deleted?
-			$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
-		}
+		if (empty($wht)) $wht = "---";
+
+		// Get admin mode
+		$mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
+
+		// Generate link
+		$admin = GENERATE_AID_LINK($admin);
 
 		// Prepare data for the row template
 		$content = array(
@@ -144,26 +138,23 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 } elseif ((isset($_POST['remove'])) && ($SEL > 0)) {
 	// Remove entries
 	foreach ($_POST['sel'] as $id => $sel) {
-		$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins_acls WHERE id=%s LIMIT 1",
-		 array(bigintval($id)),__FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
+			array(bigintval($id)),__FILE__, __LINE__);
 	}
 
 	// Update cache when installed
 	if (EXT_IS_ACTIVE("cache")) {
-		if ($cacheInstance->cache_file("admins_acls", true) == true) $cacheInstance->cache_destroy();
+		if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
 
 		// @TODO This causes the whole (!) menu cache being rebuild
 		CACHE_PURGE_ADMIN_MENU();
 	}
 
 	// Entries deleted
-	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ENTRIES_DELETED);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
 } elseif (isset($_POST['add'])) {
 	// Check if everything is fine...
-	$result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
-	 array(bigintval($_POST['admin_id'])), __FILE__, __LINE__);
-	list($mode) = SQL_FETCHROW($result);
-	SQL_FREERESULT($result);
+	$mode = GET_ADMIN_DEFAULT_ACL(bigintval($_POST['admin_id']));
 
 	// Default ACL is false
 	$ACL = false;
@@ -177,12 +168,12 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 		$BOTH = ((!empty($_POST['action_menu'])) && (!empty($_POST['what_menu'])));
 		if (((!empty($_POST['action_menu'])) || (!empty($_POST['what_menu']))) && (!$BOTH)) {
 			// Main or sub menu selected
-			$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins_acls WHERE admin_id=%s AND action_menu='%s' AND what_menu='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' AND what_menu='%s' LIMIT 1",
 			 array(bigintval($_POST['admin_id']), $_POST['action_menu'], $_POST['what_menu']), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 0) {
 				// Finally add the new ACL
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_acls (admin_id, action_menu, what_menu, access_mode)
-VALUES ('%s', '%s', '%s', '%s')",
+				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_acls` (admin_id, action_menu, what_menu, access_mode)
+VALUES ('%s','%s','%s','%s')",
  array(
 	bigintval($_POST['admin_id']),
 	$_POST['action_menu'],
@@ -193,7 +184,7 @@ VALUES ('%s', '%s', '%s', '%s')",
 
 				// Update cache when installed
 				if (EXT_IS_ACTIVE("cache")) {
-					if ($cacheInstance->cache_file("admins_acls", true) == true) $cacheInstance->cache_destroy();
+					if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
 
 					// Purge cache
 					CACHE_PURGE_ADMIN_MENU($_POST['admin_id'], $_POST['action_menu'], $_POST['what_menu']);
@@ -218,37 +209,25 @@ VALUES ('%s', '%s', '%s', '%s')",
 	LOAD_TEMPLATE("admin_settings_saved", false, $content);
 } else {
 	// List all ACLs
-	$result_acls = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM "._MYSQL_PREFIX."_admins_acls ORDER BY admin_id, id", __FILE__, __LINE__);
+	$result_acls = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, id", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_acls) > 0)
 	{
 		// List ACLs
 		$SW = 2; $OUT = "";
-		while(list($id, $admin, $act, $wht, $mode) = SQL_FETCHROW($result_acls))
+		while (list($id, $admin, $act, $wht, $mode) = SQL_FETCHROW($result_acls))
 		{
 			// Prepare variables
 			if (empty($act)) $act = "---";
 			if (empty($wht))   $wht   = "---";
-			$eval = "\$mode = ADMINS_".strtoupper($mode)."_MODE;";
-			eval($eval);
-
-			// Load admin's data
-			$login = GET_ADMIN_LOGIN($admin);
-			if ($login != "***")
-			{
-				// Admin found
-				$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
-			}
-			 else
-			{
-				// Maybe deleted?
-				$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
-			}
+
+			// Get mode
+			$mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
 
 			// Prepare data for the row template
 			$content = array(
 				'sw'     => $SW,
 				'id'     => $id,
-				'admin'  => $admin,
+				'admin'  => GENERATE_AID_LINK($admin),
 				'action' => $act,
 				'what'   => $wht,
 				'mode'   => $mode,