X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_admins.php;h=24b9126b76f63ab4ce7dea31ec16cca845e09da4;hp=6b203e594fdcee3fdee497e553bd778e26e36a08;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=aea4f2a51ffa6f483056c6ce167c8c6fd8ca6129;ds=sidebyside

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 6b203e594f..24b9126b76 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -46,14 +46,14 @@ 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 = countPostSelection();
 
 if ((REQUEST_ISSET_POST('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",
+		$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);
@@ -62,10 +62,10 @@ 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(
+			'mode_options'     => generateOptionList(
 				"/ARRAY/",
 				array("allow", "deny"),
 				array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),
@@ -88,7 +88,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 		$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),
@@ -103,7 +103,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 		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
@@ -113,7 +113,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 	$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",
+		$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);
@@ -126,7 +126,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 		$mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
 
 		// Generate link
-		$admin = GENERATE_AID_LINK($admin);
+		$admin = generateAdminLink($admin);
 
 		// Prepare data for the row template
 		$content = array(
@@ -149,7 +149,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 } elseif ((REQUEST_ISSET_POST('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",
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE `id`=%s LIMIT 1",
 			array(bigintval($id)),__FILE__, __LINE__);
 	}
 
@@ -158,20 +158,20 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 		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'));
 } 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)) {
@@ -179,8 +179,8 @@ 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)
@@ -198,7 +198,7 @@ VALUES ('%s','%s','%s','%s')",
 					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!
@@ -236,7 +236,7 @@ VALUES ('%s','%s','%s','%s')",
 			$content = array(
 				'sw'     => $SW,
 				'id'     => $content['id'],
-				'admin'  => GENERATE_AID_LINK($content['admin_id']),
+				'admin'  => generateAdminLink($content['admin_id']),
 				'action' => $content['action_menu'],
 				'what'   => $content['what_menu'],
 				'mode'   => $content['access_mode'],
@@ -256,11 +256,11 @@ 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(
+		generateOptionList(
 			"/ARRAY/",
 			array("allow", "deny"),
 			array(