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

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 78e1109e10..19fe918eed 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,23 +38,23 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 $SEL = 0;
-if (REQUEST_ISSET_POST(('sel'))) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+if (REQUEST_ISSET_POST('sel')) $SEL = countPostSelection();
 
-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__);
+		$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);
 
@@ -57,15 +62,15 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 		$content = array(
 			'sw'               => $SW,
 			'id'               => $id,
-			'admins_selection' => ADD_OPTION_LINES("admins", "id", "login", $aid, "default_acl"),
+			'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),
-			'mode_options'     => ADD_OPTION_LINES(
-				"/ARRAY/",
-				array("allow", "deny"),
-				array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),
-				$mode
-			),
+			'mode_options'     => generateOptionList(
+				'/ARRAY/',
+		array("allow", "deny"),
+		array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),
+		$mode
+		),
 		);
 
 		// Load row template
@@ -76,52 +81,52 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 
 	// Load main template
 	LOAD_TEMPLATE("admin_config_admins_edit");
-} elseif ((REQUEST_ISSET_POST(('change'))) && ($SEL > 0)) {
+} 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);
 
 		// 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(
+		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 (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));
+		cachePurgeAdminMenu(REQUEST_POST('admin', $id));
 	}
 
 	// Entries changed
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
-} elseif ((REQUEST_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 (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__);
+		$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($act)) $act = '---';
+		if (empty($wht)) $wht = '---';
 
 		// Get admin mode
 		$mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
 
 		// Generate link
-		$admin = GENERATE_AID_LINK($admin);
+		$admin = generateAdminLink($admin);
 
 		// Prepare data for the row template
 		$content = array(
@@ -141,32 +146,32 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 
 	// Load main template
 	LOAD_TEMPLATE("admin_config_admins_del");
-} elseif ((REQUEST_ISSET_POST(('remove'))) && ($SEL > 0)) {
+} elseif ((REQUEST_ISSET_POST('remove')) && ($SEL > 0)) {
 	// Remove entries
-	foreach (REQUEST_POST('sel') as $id => $sel) {
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
-			array(bigintval($id)),__FILE__, __LINE__);
+	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 (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();
+		cachePurgeAdminMenu();
 	}
 
 	// Entries deleted
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
+	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(REQUEST_POST('admin_id')));
+	$mode = getAdminDefaultAcl(bigintval(REQUEST_POST('admin_id')));
 
 	// Default ACL is false
 	$ACL = false;
 	if (REQUEST_ISSET_POST(('what_menu'))) {
 		// Check parent ACL
-		$ACL = ADMINS_CHECK_ACL(GET_ACTION("admin", REQUEST_POST('what_menu')), "");
+		$ACL = adminsCheckAdminAcl(getModeAction('admin', REQUEST_POST('what_menu')), '');
 	}
 
 	if ($mode != REQUEST_POST('mode') || ($ACL)) {
@@ -174,69 +179,67 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 		$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(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(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)
 VALUES ('%s','%s','%s','%s')",
- array(
-	bigintval(REQUEST_POST('admin_id')),
-	REQUEST_POST('action_menu'),
-	REQUEST_POST('what_menu'),
-	REQUEST_POST('mode')
-), __FILE__, __LINE__);
-				$content = ADMIN_ADMINS_ACL_SAVED;
+				array(
+				bigintval(REQUEST_POST('admin_id')),
+				REQUEST_POST('action_menu'),
+				REQUEST_POST('what_menu'),
+				REQUEST_POST('mode')
+				), __FILE__, __LINE__);
+				$content = getMessage('ADMIN_ADMINS_ACL_SAVED');
 
 				// Update cache when installed
-				if (EXT_IS_ACTIVE("cache")) {
+				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'));
+					cachePurgeAdminMenu(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);
+	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)
-	{
+	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'  => generateAdminLink($content['admin_id']),
+				'action' => $content['action_menu'],
+				'what'   => $content['what_menu'],
+				'mode'   => $content['access_mode'],
 			);
 
 			// Load row template and switch colors
@@ -253,10 +256,19 @@ VALUES ('%s','%s','%s','%s')",
 	}
 
 	// Prepare some constants for the template
-	define('_ADMINS_SELECTION', ADD_OPTION_LINES("admins", "id", "login", "", "default_acl"));
+	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'    , ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE)));
+	define('_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");