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

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 78e1109e10..830c6f778d 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -41,12 +41,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 $SEL = 0;
-if (REQUEST_ISSET_POST(('sel'))) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+if (REQUEST_ISSET_POST('sel')) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 
-if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
+if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 	// Edit ACLs
-	$SW = 2; $OUT = "";
-	foreach (REQUEST_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",
 		 array(bigintval($id)), __FILE__, __LINE__);
@@ -78,7 +78,7 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 	LOAD_TEMPLATE("admin_config_admins_edit");
 } elseif ((REQUEST_ISSET_POST(('change'))) && ($SEL > 0)) {
 	// Change entries
-	foreach (REQUEST_POST('sel') as $id => $sel) {
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		// Secure ID
 		$id = bigintval($id);
 
@@ -103,10 +103,10 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 
 	// Entries changed
 	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
-} elseif ((REQUEST_ISSET_POST(('del'))) && ($SEL > 0)) {
+} elseif ((REQUEST_ISSET_POST('del')) && ($SEL > 0)) {
 	// Delete ACLs
-	$SW = 2; $OUT = "";
-	foreach (REQUEST_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",
 			array(bigintval($id)), __FILE__, __LINE__);
@@ -143,7 +143,7 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 	LOAD_TEMPLATE("admin_config_admins_del");
 } elseif ((REQUEST_ISSET_POST(('remove'))) && ($SEL > 0)) {
 	// Remove entries
-	foreach (REQUEST_POST('sel') as $id => $sel) {
+	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__);
 	}
@@ -186,7 +186,7 @@ VALUES ('%s','%s','%s','%s')",
 	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")) {
@@ -197,18 +197,18 @@ VALUES ('%s','%s','%s','%s')",
 				} // 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
@@ -216,27 +216,25 @@ VALUES ('%s','%s','%s','%s')",
 } 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)
-	{
+	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');
+			$content['access_mode'] = constant('ADMINS_'.strtoupper($content['access_mode']).'_MODE');
 
 			// Prepare data for the row template
 			$content = array(
 				'sw'     => $SW,
-				'id'     => $id,
-				'admin'  => GENERATE_AID_LINK($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
@@ -256,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");