X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_admins.php;h=f98b503e9ee917c5bd6c1999337234943a257961;hb=34b1f5b69205b08c760d6dcc87ef6a2d1c291261;hp=0536e327e099bf4e2a92997e3ddfbcc47f209bf3;hpb=0b26d5d64d95a8001bc8ba27a2d27ca4888d5d80;p=mailer.git

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 0536e327e0..f98b503e9e 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.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 *
@@ -40,35 +38,37 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit ACLs
 	$OUT = '';
 	foreach (postRequestParameter('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 `id`, `admin_id`, `action_menu, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
 			array(bigintval($id)), __FILE__, __LINE__);
-		list($adminId, $action, $what, $mode) = SQL_FETCHROW($result);
+		$content = SQL_FETCHARRAY($result);
+
+		// Free result
 		SQL_FREERESULT($result);
 
 		// Prepare data for the row template
 		$content = array(
-			'id'               => $id,
-			'admins_selection' => generateOptionList('admins', 'id', 'login', $adminId, 'default_acl'),
-			'action_selection' => adminMenuSelectionBox_DEPRECATED('action', $action, $id),
-			'what_selection'   => adminMenuSelectionBox_DEPRECATED('what', $what, $id),
+			'id'               => $content['id'],
+			'admins_selection' => generateOptionList('admins', 'id', 'login', $content['admin_id'], 'default_acl'),
+			'action_selection' => adminMenuSelectionBox_DEPRECATED('action', $content['action_menu'], $content['id']),
+			'what_selection'   => adminMenuSelectionBox_DEPRECATED('what', $content['what_menu'], $content['id']),
 			'mode_options'     => generateOptionList(
 				'/ARRAY/',
 				array('allow', 'deny'),
 				array(
-					'{--ADMINS_ALLOW_MODE--}',
-					'{--ADMINS_DENY_MODE--}'
+					'{--ADMIN_ADMINS_MODE_ALLOW--}',
+					'{--ADMIN_ADMINS_MODE_DENY--}'
 				),
-				$mode
+				$content['access_mode']
 			),
 		);
 
@@ -85,24 +85,34 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 		$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(
-			postRequestParameter('admin', $id),
-			postRequestParameter('action_menu', $id),
-			postRequestParameter('what_menu', $id),
-			postRequestParameter('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(
+				postRequestParameter('admin', $id),
+				postRequestParameter('action_menu', $id),
+				postRequestParameter('what_menu', $id),
+				postRequestParameter('mode', $id),
+				$id
+			),__FILE__, __LINE__);
 	} // END - foreach
 
 	// Update cache when installed
+	// @TODO Rewrite this to a filter
 	if (isExtensionActive('cache')) {
 		if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
 	} // END - if
 
 	// Entries changed
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
-} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
+	displayMessage('{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
 	// Delete ACLs
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $selected) {
@@ -113,7 +123,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 		SQL_FREERESULT($result);
 
 		// Get admin mode
-		$content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}';
+		$content['access_mode'] = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
 		// Load row template and switch colors
 		$OUT .= loadTemplate('admin_config_admins_del_row', true, $content);
@@ -135,7 +145,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	} // END - if
 
 	// Entries deleted
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ENTRIES_DELETED--}');
+	displayMessage('{--ADMIN_ADMINS_ENTRIES_DELETED--}');
 } elseif (isFormSent('add')) {
 	// Check if everything is fine...
 	$mode = getAdminDefaultAcl(bigintval(postRequestParameter('admin_id')));
@@ -152,11 +162,15 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 		$BOTH = ((isPostRequestParameterSet('action_menu')) && (isPostRequestParameterSet('what_menu')));
 		if (((isPostRequestParameterSet('action_menu')) || (isPostRequestParameterSet('what_menu'))) && ($BOTH === false)) {
 			// 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(postRequestParameter('admin_id')), postRequestParameter('action_menu'), postRequestParameter('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(postRequestParameter('admin_id')),
+					postRequestParameter('action_menu'),
+					postRequestParameter('what_menu')
+				), __FILE__, __LINE__);
 			if (SQL_HASZERONUMS($result)) {
 				// 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(postRequestParameter('admin_id')),
@@ -187,7 +201,7 @@ VALUES ('%s','%s','%s','%s')",
 	}
 
 	// Display message
-	loadTemplate('admin_settings_saved', false, $content);
+	displayMessage($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` ASC, `id` ASC', __FILE__, __LINE__);
@@ -219,8 +233,8 @@ VALUES ('%s','%s','%s','%s')",
 		'/ARRAY/',
 		array('allow', 'deny'),
 		array(
-			'ADMINS_ALLOW_MODE--}',
-			'ADMINS_DENY_MODE--}'
+			'{--ADMIN_ADMINS_MODE_ALLOW--}',
+			'{--ADMIN_ADMINS_MODE_DENY--}'
 		)
 	);