X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_admins.php;h=830c6f778db0882742f7573226df15def8d64249;hp=d9f518f01d07837c2e2f026517867af1cca3e332;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index d9f518f01d..830c6f778d 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -41,14 +41,14 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 $SEL = 0;
-if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST('sel')) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 
-if ((isset($_POST['edit'])) && ($SEL > 0)) {
+if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 	// Edit ACLs
-	$SW = 2; $OUT = "";
-	foreach ($_POST['sel'] as $id => $sel) {
+	$OUT = ""; $SW = 2;
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		// 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
 			),
 		);
@@ -76,53 +76,52 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 
 	// Load main template
 	LOAD_TEMPLATE("admin_config_admins_edit");
-} elseif ((isset($_POST['change'])) && ($SEL > 0)) {
+} elseif ((REQUEST_ISSET_POST(('change'))) && ($SEL > 0)) {
 	// Change entries
-	foreach ($_POST['sel'] as $id => $sel) {
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		// Secure ID
 		$id = bigintval($id);
 
 		// Update entries
-		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(
+				REQUEST_POST('admin', $id),
+				REQUEST_POST('action_menu', $id),
+				REQUEST_POST('what_menu', $id),
+				REQUEST_POST('mode', $id),
+				$id
+			),__FILE__, __LINE__);
 	}
 
 	// Update cache when installed
 	if (EXT_IS_ACTIVE("cache")) {
-		if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+		if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
 
 		// Purge menu cache
-		CACHE_PURGE_ADMIN_MENU($_POST['admin'][$id]);
+		CACHE_PURGE_ADMIN_MENU(REQUEST_POST('admin', $id));
 	}
 
 	// Entries changed
-	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ENTRIES_CHANGED);
-} elseif ((isset($_POST['del'])) && ($SEL > 0)) {
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
+} elseif ((REQUEST_ISSET_POST('del')) && ($SEL > 0)) {
 	// Delete ACLs
-	$SW = 2; $OUT = "";
-	foreach ($_POST['sel'] as $id => $sel) {
+	$OUT = ""; $SW = 2;
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		// 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($admin, $act, $wht, $mode) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		// Prepare variables
 		if (empty($act)) $act = "---";
-		if (empty($wht)) $wht   = "---";
+		if (empty($wht)) $wht = "---";
 
 		// Get admin mode
 		$mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
 
-		// 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 = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
-		}
+		// Generate link
+		$admin = GENERATE_AID_LINK($admin);
 
 		// Prepare data for the row template
 		$content = array(
@@ -142,115 +141,100 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 
 	// Load main template
 	LOAD_TEMPLATE("admin_config_admins_del");
-} elseif ((isset($_POST['remove'])) && ($SEL > 0)) {
+} elseif ((REQUEST_ISSET_POST(('remove'))) && ($SEL > 0)) {
 	// Remove entries
-	foreach ($_POST['sel'] as $id => $sel) {
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins_acls WHERE id=%s LIMIT 1",
+	foreach (REQUEST_POST('sel') as $id => $selected) {
+		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->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+		if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->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);
-} elseif (isset($_POST['add'])) {
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
+} elseif (REQUEST_ISSET_POST(('add'))) {
 	// Check if everything is fine...
-	$mode = GET_ADMIN_DEFAULT_ACL(bigintval($_POST['admin_id']));
+	$mode = GET_ADMIN_DEFAULT_ACL(bigintval(REQUEST_POST('admin_id')));
 
 	// Default ACL is false
 	$ACL = false;
-	if (!empty($_POST['what_menu'])) {
+	if (REQUEST_ISSET_POST(('what_menu'))) {
 		// Check parent ACL
-		$ACL = ADMINS_CHECK_ACL(GET_ACTION("admin", $_POST['what_menu']), "");
+		$ACL = ADMINS_CHECK_ACL(GET_ACTION("admin", REQUEST_POST('what_menu')), "");
 	}
 
-	if ($mode != $_POST['mode'] || ($ACL)) {
+	if ($mode != REQUEST_POST('mode') || ($ACL)) {
 		// Mode is fine
-		$BOTH = ((!empty($_POST['action_menu'])) && (!empty($_POST['what_menu'])));
-		if (((!empty($_POST['action_menu'])) || (!empty($_POST['what_menu']))) && (!$BOTH)) {
+		$BOTH = ((REQUEST_ISSET_POST(('action_menu'))) && (REQUEST_ISSET_POST(('what_menu'))));
+		if (((REQUEST_ISSET_POST(('action_menu'))) || (REQUEST_ISSET_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",
-			 array(bigintval($_POST['admin_id']), $_POST['action_menu'], $_POST['what_menu']), __FILE__, __LINE__);
+			$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(REQUEST_POST('admin_id')), REQUEST_POST('action_menu'), REQUEST_POST('what_menu')), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 0) {
 				// Finally add the new ACL
-				SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_acls (admin_id, action_menu, what_menu, access_mode)
+				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'],
-	$_POST['what_menu'],
-	$_POST['mode']
+	bigintval(REQUEST_POST('admin_id')),
+	REQUEST_POST('action_menu'),
+	REQUEST_POST('what_menu'),
+	REQUEST_POST('mode')
 ), __FILE__, __LINE__);
-				$content = ADMIN_ADMINS_ACL_SAVED;
+				$content = getMessage('ADMIN_ADMINS_ACL_SAVED');
 
 				// Update cache when installed
 				if (EXT_IS_ACTIVE("cache")) {
-					if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+					if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
 
 					// Purge cache
-					CACHE_PURGE_ADMIN_MENU($_POST['admin_id'], $_POST['action_menu'], $_POST['what_menu']);
+					CACHE_PURGE_ADMIN_MENU(REQUEST_POST('admin_id'), REQUEST_POST('action_menu'), REQUEST_POST('what_menu'));
 				} // END - if
 			} else {
 				// ACL does already exist!
-				$content = ADMIN_ADMINS_ACL_ALREADY_ADDED;
+				$content = getMessage('ADMIN_ADMINS_ACL_ALREADY_ADDED');
 			}
 
 			// Free memory
 			SQL_FREERESULT($result);
 		} else {
 			// No menu selected makes also no sence...
-			$content = ADMIN_ADMINS_SELECT_ACTION_WHAT;
+			$content = getMessage('ADMIN_ADMINS_SELECT_ACTION_WHAT');
 		}
 	} else {
 		// Same mode makes no sence...
-		$content = ADMIN_ADMINS_SAME_MODE_SELECTED;
+		$content = getMessage('ADMIN_ADMINS_SAME_MODE_SELECTED');
 	}
 
 	// Display message
 	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__);
-	if (SQL_NUMROWS($result_acls) > 0)
-	{
+	$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))
-		{
+		$OUT = ""; $SW = 2;
+		while ($content = SQL_FETCHARRAY($result_acls)) {
 			// Prepare variables
-			if (empty($act)) $act = "---";
-			if (empty($wht))   $wht   = "---";
+			if (empty($content['action_menu'])) $content['action_menu'] = "---";
+			if (empty($content['what_menu']))   $content['what_menu']   = "---";
 
 			// Get mode
-			$mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
-
-			// 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 = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
-			}
+			$content['access_mode'] = constant('ADMINS_'.strtoupper($content['access_mode']).'_MODE');
 
 			// Prepare data for the row template
 			$content = array(
 				'sw'     => $SW,
-				'id'     => $id,
-				'admin'  => $admin,
-				'action' => $act,
-				'what'   => $wht,
-				'mode'   => $mode,
+				'id'     => $content['id'],
+				'admin'  => GENERATE_AID_LINK($content['admin_id']),
+				'action' => $content['action_menu'],
+				'what'   => $content['what_menu'],
+				'mode'   => $content['access_mode'],
 			);
 
 			// Load row template and switch colors
@@ -270,7 +254,16 @@ VALUES ('%s','%s','%s','%s')",
 	define('_ADMINS_SELECTION', ADD_OPTION_LINES("admins", "id", "login", "", "default_acl"));
 	define('_ACTION_SELECTION', ADMIN_MENU_SELECTION("action"));
 	define('_WHAT_SELECTION'  , ADMIN_MENU_SELECTION("what"));
-	define('_MODE_OPTIONS'    , ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE)));
+	define('_MODE_OPTIONS'    ,
+		ADD_OPTION_LINES(
+			"/ARRAY/",
+			array("allow", "deny"),
+			array(
+				getMessage('ADMINS_ALLOW_MODE'),
+				getMessage('ADMINS_DENY_MODE')
+			)
+		)
+	);
 
 	// Load template for adding new ACL
 	LOAD_TEMPLATE("admin_admins_add_acl");