X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_admins.php;h=5d36456f403c3d47398ea4a334e9365e2ede0b1a;hp=14cb4574196860cddf7094554aaa93c5df52134f;hb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;hpb=1355d2c0b29510dbd407f9cde9f41a5ac02d01fa

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 14cb457419..5d36456f40 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,96 +37,91 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 $SEL = 0;
-if (REQUEST_ISSET_POST('sel')) $SEL = countPostSelection();
+if (isPostRequestElementSet('sel')) $SEL = countPostSelection();
 
-if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
+if ((isPostRequestElementSet('edit')) && ($SEL > 0)) {
 	// Edit ACLs
 	$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",
+	foreach (postRequestElement('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__);
-		list($aid, $act, $wht, $mode) = SQL_FETCHROW($result);
+		list($adminId, $action, $what, $mode) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		// Prepare data for the row template
 		$content = array(
 			'sw'               => $SW,
 			'id'               => $id,
-			'admins_selection' => generateOptionList('admins', 'id', 'login', $aid, 'default_acl'),
-			'action_selection' => ADMIN_MENU_SELECTION('action', $act, $id),
-			'what_selection'   => ADMIN_MENU_SELECTION('what', $wht, $id),
+			'admins_selection' => generateOptionList('admins', 'id', 'login', $adminId, 'default_acl'),
+			'action_selection' => adminMenuSelectionBox_DEPRECATED('action', $action, $id),
+			'what_selection'   => adminMenuSelectionBox_DEPRECATED('what', $what, $id),
 			'mode_options'     => generateOptionList(
 				'/ARRAY/',
 				array('allow', 'deny'),
 				array(
-					constant('ADMINS_ALLOW_MODE'),
-					constant('ADMINS_DENY_MODE')
+					getMessage('ADMINS_ALLOW_MODE'),
+					getMessage('ADMINS_DENY_MODE')
 				),
 				$mode
 			),
 		);
 
 		// Load row template
-		$OUT .= LOAD_TEMPLATE('admin_config_admins_edit_row', true, $content);
+		$OUT .= loadTemplate('admin_config_admins_edit_row', true, $content);
 		$SW = 3 - $SW;
 	}
-	define('__ACL_ROWS', $OUT);
 
 	// Load main template
-	LOAD_TEMPLATE('admin_config_admins_edit');
-} elseif ((REQUEST_ISSET_POST('change')) && ($SEL > 0)) {
+	loadTemplate('admin_config_admins_edit', false, $OUT);
+} elseif ((isPostRequestElementSet('change')) && ($SEL > 0)) {
 	// Change entries
-	foreach (REQUEST_POST('sel') as $id => $selected) {
-		// Secure ID
+	foreach (postRequestElement('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",
+		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),
+			postRequestElement('admin', $id),
+			postRequestElement('action_menu', $id),
+			postRequestElement('what_menu', $id),
+			postRequestElement('mode', $id),
 			$id
 		),__FILE__, __LINE__);
 	} // END - foreach
 
 	// Update cache when installed
-	if (EXT_IS_ACTIVE('cache')) {
-		if ($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) $GLOBALS['cache_instance']->destroyCacheFile();
-
-		// Purge menu cache
-		cachePurgeAdminMenu(REQUEST_POST('admin', $id));
+	if (isExtensionActive('cache')) {
+		if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
 	} // END - if
 
 	// Entries changed
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
-} elseif ((REQUEST_ISSET_POST('del')) && ($SEL > 0)) {
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
+} elseif ((isPostRequestElementSet('del')) && ($SEL > 0)) {
 	// Delete ACLs
 	$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",
+	foreach (postRequestElement('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__);
-		list($admin, $act, $wht, $mode) = SQL_FETCHROW($result);
+		list($admin, $action, $what, $mode) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		// Prepare variables
-		if (empty($act)) $act = '---';
-		if (empty($wht)) $wht = '---';
+		if (empty($action)) $action = '---';
+		if (empty($what)) $what = '---';
 
 		// Get admin mode
-		$mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
+		$mode = getMessage('ADMINS_'.strtoupper($mode).'_MODE');
 
 		// Generate link
 		$admin = generateAdminLink($admin);
@@ -136,73 +131,66 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 			'sw'     => $SW,
 			'id'     => $id,
 			'admin'  => $admin,
-			'action' => $act,
-			'what'   => $wht,
+			'action' => $action,
+			'what'   => $what,
 			'mode'   => $mode,
 		);
 
 		// Load row template and switch colors
-		$OUT .= LOAD_TEMPLATE('admin_config_admins_del_row', true, $content);
+		$OUT .= loadTemplate('admin_config_admins_del_row', true, $content);
 		$SW = 3 - $SW;
 	} // END - foreach
-	define('__ACL_ROWS', $OUT);
 
 	// Load main template
-	LOAD_TEMPLATE('admin_config_admins_del');
-} elseif ((REQUEST_ISSET_POST('remove')) && ($SEL > 0)) {
+	loadTemplate('admin_config_admins_del', false, $OUT);
+} elseif ((isPostRequestElementSet('remove')) && ($SEL > 0)) {
 	// Remove entries
 	// @TODO Rewrite this to filter 'run_sqls'
-	foreach (REQUEST_POST('sel') as $id => $selected) {
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE `id`=%s LIMIT 1",
+	foreach (postRequestElement('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__);
 	} // END - foreach
 
 	// Update cache when installed
-	if (EXT_IS_ACTIVE('cache')) {
-		if ($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) $GLOBALS['cache_instance']->destroyCacheFile();
-
-		// @TODO This causes the whole (!) menu cache being rebuild
-		cachePurgeAdminMenu();
+	if (isExtensionActive('cache')) {
+		if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
 	} // END - if
 
 	// Entries deleted
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
-} elseif (REQUEST_ISSET_POST(('add'))) {
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
+} elseif (isPostRequestElementSet('add')) {
 	// Check if everything is fine...
-	$mode = getAdminDefaultAcl(bigintval(REQUEST_POST('admin_id')));
+	$mode = getAdminDefaultAcl(bigintval(postRequestElement('admin_id')));
 
 	// Default ACL is false
 	$ACL = false;
-	if (REQUEST_ISSET_POST('what_menu')) {
+	if (isPostRequestElementSet('what_menu')) {
 		// Check parent ACL
-		$ACL = adminsCheckAdminAcl(getModeAction('admin', REQUEST_POST('what_menu')), '');
+		$ACL = adminsCheckAdminAcl(getModeAction('admin', postRequestElement('what_menu')), '');
 	} // END - if
 
-	if (($mode != REQUEST_POST('mode')) || ($ACL)) {
+	if (($mode != postRequestElement('mode')) || ($ACL)) {
 		// Mode is fine
-		$BOTH = ((REQUEST_ISSET_POST('action_menu')) && (REQUEST_ISSET_POST('what_menu')));
-		if (((REQUEST_ISSET_POST('action_menu')) || (REQUEST_ISSET_POST('what_menu'))) && (!$BOTH)) {
+		$BOTH = ((isPostRequestElementSet('action_menu')) && (isPostRequestElementSet('what_menu')));
+		if (((isPostRequestElementSet('action_menu')) || (isPostRequestElementSet('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(REQUEST_POST('admin_id')), REQUEST_POST('action_menu'), REQUEST_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(postRequestElement('admin_id')), postRequestElement('action_menu'), postRequestElement('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(REQUEST_POST('admin_id')),
-					REQUEST_POST('action_menu'),
-					REQUEST_POST('what_menu'),
-					REQUEST_POST('mode')
+					bigintval(postRequestElement('admin_id')),
+					postRequestElement('action_menu'),
+					postRequestElement('what_menu'),
+					postRequestElement('mode')
 				), __FILE__, __LINE__);
 				$content = getMessage('ADMIN_ADMINS_ACL_SAVED');
 
 				// Update cache when installed
-				if (EXT_IS_ACTIVE('cache')) {
-					if ($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) $GLOBALS['cache_instance']->destroyCacheFile();
-
-					// Purge cache
-					cachePurgeAdminMenu(REQUEST_POST('admin_id'), REQUEST_POST('action_menu'), REQUEST_POST('what_menu'));
+				if (isExtensionActive('cache')) {
+					if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
 				} // END - if
 			} else {
 				// ACL does already exist!
@@ -221,10 +209,10 @@ VALUES ('%s','%s','%s','%s')",
 	}
 
 	// Display message
-	LOAD_TEMPLATE('admin_settings_saved', false, $content);
+	loadTemplate('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` ASC, `id` ASC', __FILE__, __LINE__);
 
 	// Entries found?
 	if (SQL_NUMROWS($result_acls) > 0) {
@@ -236,7 +224,7 @@ VALUES ('%s','%s','%s','%s')",
 			if (empty($content['what_menu']))   $content['what_menu']   = '---';
 
 			// Get mode
-			$content['access_mode'] = constant('ADMINS_'.strtoupper($content['access_mode']).'_MODE');
+			$content['access_mode'] = getMessage('ADMINS_'.strtoupper($content['access_mode']).'_MODE');
 
 			// Prepare data for the row template
 			$content = array(
@@ -249,33 +237,32 @@ VALUES ('%s','%s','%s','%s')",
 			);
 
 			// Load row template and switch colors
-			$OUT .= LOAD_TEMPLATE('admin_config_admins_row', true, $content);
+			$OUT .= loadTemplate('admin_config_admins_row', true, $content);
 			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
-		define('__ACL_ROWS', $OUT);
 
 		// Load main template
-		LOAD_TEMPLATE('admin_config_admins');
+		loadTemplate('admin_config_admins', false, $OUT);
 	} // END - if
 
 	// Prepare some constants for the template
-	define('_ADMINS_SELECTION', generateOptionList('admins', 'id', 'login', '', 'default_acl'));
-	define('_ACTION_SELECTION', ADMIN_MENU_SELECTION('action'));
-	define('_WHAT_SELECTION'  , ADMIN_MENU_SELECTION('what'));
-	define('_MODE_OPTIONS'    , generateOptionList(
+	$content['admins_selection'] = generateOptionList('admins', 'id', 'login', '', 'default_acl');
+	$content['action_selection'] = adminMenuSelectionBox_DEPRECATED('action');
+	$content['what_selection']   = adminMenuSelectionBox_DEPRECATED('what');
+	$content['mode_options']     = generateOptionList(
 		'/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');
+	loadTemplate('admin_admins_add_acl', false, $content);
 }
 
 //