Return a value ... :)

[mailer.git] / inc / libs / admins_functions.php

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 0fad9b6657952468158c087573f4c07313a7635f..15f781889d7a8200bde175ae1a342b2735776c67 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -201,7 +201,7 @@ function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = t
 
                                // Save password when set
                                if (!empty($postData['pass1'][$id])) {
-                                       $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash));
+                                       $add = sprintf(",`password`='%s'", SQL_ESCAPE($hash));
                                } // END - if
 
                                // Get admin's id
@@ -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;
@@ -445,12 +445,21 @@ function adminsRemoveAdminAccount ($postData) {
 // List all admin accounts
 function adminsListAdminAccounts() {
        // Select all admin accounts
-       $result = SQL_QUERY('SELECT `id`,`login`,`email`,`default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__);
+       $result = SQL_QUERY('SELECT
+       `id`,
+       `login`,
+       `email`,
+       `default_acl` AS `access_mode`,
+       `la_mode`
+FROM
+       `{?_MYSQL_PREFIX?}_admins`
+ORDER BY
+       `login` ASC', __FUNCTION__, __LINE__);
        $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);