Some more cleanups/improvements:

[mailer.git] / inc / modules / admin / what-config_admins.php

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 0536e327e099bf4e2a92997e3ddfbcc47f209bf3..5c73970d35253dc59983d5a79a07fd275b9d3527 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -50,17 +50,19 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
        $OUT = '';
        foreach (postRequestParameter('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 `id`, `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);
+               $content = SQL_FETCHARRAY($result);
+
+               // Free result
                SQL_FREERESULT($result);
 
                // Prepare data for the row template
                $content = array(
-                       'id'               => $id,
-                       'admins_selection' => generateOptionList('admins', 'id', 'login', $adminId, 'default_acl'),
-                       'action_selection' => adminMenuSelectionBox_DEPRECATED('action', $action, $id),
-                       'what_selection'   => adminMenuSelectionBox_DEPRECATED('what', $what, $id),
+                       'id'               => $content['id'],
+                       'admins_selection' => generateOptionList('admins', 'id', 'login', $content['admin_id'], 'default_acl'),
+                       'action_selection' => adminMenuSelectionBox_DEPRECATED('action', $content['action_menu'], $content['id']),
+                       'what_selection'   => adminMenuSelectionBox_DEPRECATED('what', $content['what_menu'], $content['id']),
                        'mode_options'     => generateOptionList(
                                '/ARRAY/',
                                array('allow', 'deny'),
@@ -68,7 +70,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                                        '{--ADMINS_ALLOW_MODE--}',
                                        '{--ADMINS_DENY_MODE--}'
                                ),
-                               $mode
+                               $content['access_mode']
                        ),
                );
 
@@ -219,8 +221,8 @@ VALUES ('%s','%s','%s','%s')",
                '/ARRAY/',
                array('allow', 'deny'),
                array(
-                       'ADMINS_ALLOW_MODE--}',
-                       'ADMINS_DENY_MODE--}'
+                       '{--ADMINS_ALLOW_MODE--}',
+                       '{--ADMINS_DENY_MODE--}'
                )
        );