X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=15f781889d7a8200bde175ae1a342b2735776c67;hb=985561270461045c64719266ca6b3a795f6cd76a;hp=2df52a10460d8baf38e53ebceb958a30d4b3887e;hpb=78fb6abc2b4141d107610f20e75980e1a58ac939;p=mailer.git

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 2df52a1046..15f781889d 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -246,7 +246,7 @@ LIMIT 1",
 					array(
 						$login,
 						$postData['email'][$id],
-						$postData['mode'][$id],
+						$postData['access_mode'][$id],
 						$postData['la_mode'][$id],
 						$id
 					), __FUNCTION__, __LINE__);
@@ -330,10 +330,10 @@ function adminsEditAdminAccount ($postData) {
 			// Shall we allow changing default ACL?
 			if ($currMode == 'allow') {
 				// Allow changing it
-				$content['mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
+				$content['access_mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
 			} else {
 				// Don't allow it
-				$content['mode'] = ' ';
+				$content['access_mode'] = ' ';
 			}
 
 			// Load row template and switch color
@@ -351,7 +351,7 @@ function adminsEditAdminAccount ($postData) {
 // Generate access mode selection box for given admin id
 function generateAdminAccessModeSelectionBox ($adminId = NULL) {
 	// Start the selection box
-	$OUT = '<select name="mode[' . $adminId . ']" size="1" class="form_select">';
+	$OUT = '<select name="access_mode[' . $adminId . ']" size="1" class="form_select">';
 
 	// Add option list
 	$OUT .= generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}', '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'), getAdminDefaultAcl($adminId));
@@ -366,7 +366,7 @@ function generateAdminAccessModeSelectionBox ($adminId = NULL) {
 // Generate menu mode selection box for given admin it
 function generateAdminMenuModeSelectionBox ($adminId = NULL) {
 	// Start the selection box
-	$OUT = '<select name="la_mode[{%pipe,makeNullToZero=' . makeZeroToNull($adminId) . '%}]" size="1" class="form_select">';
+	$OUT = '<select name="la_mode[{%pipe,convertNullToZero=' . convertZeroToNull($adminId) . '%}]" size="1" class="form_select">';
 
 	// Add option list
 	$OUT .= generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMIN_ADMINS_LA_MODE_NEW--}'), getAdminMenuMode($adminId));
@@ -389,15 +389,15 @@ function adminsDeleteAdminAccount ($postData) {
 			$id = bigintval($id);
 
 			// Get the admin's data
-			$result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `access_mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 				array($id), __FUNCTION__, __LINE__);
 
 			// Do we have an entry?
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found, so load data
 				$content = SQL_FETCHARRAY($result);
-				$content['mode']    = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode'])    . '--}';
-				$content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
+				$content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode'])    . '--}';
+				$content['la_mode']     = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
 				// Prepare some more data
 				$content['id'] = $id;
@@ -449,7 +449,7 @@ function adminsListAdminAccounts() {
 	`id`,
 	`login`,
 	`email`,
-	`default_acl` AS `mode`,
+	`default_acl` AS `access_mode`,
 	`la_mode`
 FROM
 	`{?_MYSQL_PREFIX?}_admins`
@@ -458,8 +458,8 @@ ORDER BY
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Compile some variables
-		$content['mode']    = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode'])    . '--}';
-		$content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
+		$content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode'])    . '--}';
+		$content['la_mode']     = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
 		// Load row template and switch color
 		$OUT .= loadTemplate('admin_list_admins_row', true, $content);