X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_admins.php;h=71e05e601e913002beeb72983a954551a81873d0;hp=89a973b41a448e40402111cc62a12ff8a6bf5968;hb=8268379f7f0f38f5cd605714ecd5cbfacff0e282;hpb=c78089215285d52d483760699d07a96dfbbe0671

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 89a973b41a..71e05e601e 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Admin-ACLs einstellen                            *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 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 *
@@ -32,168 +37,160 @@
  ************************************************************************/
 
 // 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 = SELECTION_COUNT(REQUEST_POST('sel'));
+if (isPostRequestElementSet('sel')) $SEL = countPostSelection();
 
-if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
+if ((isPostRequestElementSet('edit')) && ($SEL > 0)) {
 	// Edit ACLs
-	$SW = 2; $OUT = "";
-	foreach (REQUEST_POST('sel') as $id => $selected) {
+	$OUT = ''; $SW = 2;
+	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);
+		$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($adminId, $action, $what, $mode) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		// Prepare data for the row template
 		$content = array(
 			'sw'               => $SW,
 			'id'               => $id,
-			'admins_selection' => ADD_OPTION_LINES("admins", "id", "login", $aid, "default_acl"),
-			'action_selection' => ADMIN_MENU_SELECTION("action", $act, $id),
-			'what_selection'   => ADMIN_MENU_SELECTION("what", $wht, $id),
-			'mode_options'     => ADD_OPTION_LINES(
-				"/ARRAY/",
-				array("allow", "deny"),
-				array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),
+			'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(
+					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) {
+	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",
-			array(
-				REQUEST_POST('admin', $id),
-				REQUEST_POST('action_menu', $id),
-				REQUEST_POST('what_menu', $id),
-				REQUEST_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(
+			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
-		CACHE_PURGE_ADMIN_MENU(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
-	$SW = 2; $OUT = "";
-	foreach (REQUEST_POST('sel') as $id => $selected) {
+	$OUT = ''; $SW = 2;
+	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",
+		$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 = GENERATE_AID_LINK($admin);
+		$admin = generateAdminLink($admin);
 
 		// Prepare data for the row template
 		$content = array(
 			'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;
-	}
-	define('__ACL_ROWS', $OUT);
+	} // END - foreach
 
 	// 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
-	foreach (REQUEST_POST('sel') as $id => $selected) {
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
+	// @TODO Rewrite this to filter 'run_sqls'
+	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
-		CACHE_PURGE_ADMIN_MENU();
-	}
+	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 = GET_ADMIN_DEFAULT_ACL(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 = ADMINS_CHECK_ACL(GET_ACTION("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')
-), __FILE__, __LINE__);
+				array(
+					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
-					CACHE_PURGE_ADMIN_MENU(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!
@@ -212,63 +209,60 @@ 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__);
-	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` ASC, `id` ASC', __FILE__, __LINE__);
+
+	// Entries found?
+	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'] = getMessage('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'  => generateAdminLink($content['admin_id']),
+				'action' => $content['action_menu'],
+				'what'   => $content['what_menu'],
+				'mode'   => $content['access_mode'],
 			);
 
 			// 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', 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(
-				getMessage('ADMINS_ALLOW_MODE'),
-				getMessage('ADMINS_DENY_MODE')
-			)
+	$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);
 }
 
 //