Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[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 19fe918eed2d8b5b6a1037e9e342c4f889755a17..14cb4574196860cddf7094554aaa93c5df52134f 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -54,7 +54,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
        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__);
+                       array(bigintval($id)), __FILE__, __LINE__);
                list($aid, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
@@ -62,25 +62,28 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
                $content = array(
                        'sw'               => $SW,
                        'id'               => $id,
-                       '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),
+                       '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'     => generateOptionList(
                                '/ARRAY/',
-               array("allow", "deny"),
-               array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),
-               $mode
-               ),
+                               array('allow', 'deny'),
+                               array(
+                                       constant('ADMINS_ALLOW_MODE'),
+                                       constant('ADMINS_DENY_MODE')
+                               ),
+                               $mode
+                       ),
                );
 
                // Load row template
-               $OUT .= LOAD_TEMPLATE("admin_config_admins_edit_row", true, $content);
+               $OUT .= LOAD_TEMPLATE('admin_config_admins_edit_row', true, $content);
                $SW = 3 - $SW;
        }
        define('__ACL_ROWS', $OUT);
 
        // Load main template
-       LOAD_TEMPLATE("admin_config_admins_edit");
+       LOAD_TEMPLATE('admin_config_admins_edit');
 } elseif ((REQUEST_ISSET_POST('change')) && ($SEL > 0)) {
        // Change entries
        foreach (REQUEST_POST('sel') as $id => $selected) {
@@ -90,21 +93,21 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
                // 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
+                       REQUEST_POST('admin', $id),
+                       REQUEST_POST('action_menu', $id),
+                       REQUEST_POST('what_menu', $id),
+                       REQUEST_POST('mode', $id),
+                       $id
                ),__FILE__, __LINE__);
-       }
+       } // END - foreach
 
        // Update cache when installed
        if (EXT_IS_ACTIVE('cache')) {
-               if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) $GLOBALS['cache_instance']->destroyCacheFile();
 
                // Purge menu cache
                cachePurgeAdminMenu(REQUEST_POST('admin', $id));
-       }
+       } // END - if
 
        // Entries changed
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
@@ -114,7 +117,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
        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__);
+                       array(bigintval($id)), __FILE__, __LINE__);
                list($admin, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
@@ -139,27 +142,28 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
                );
 
                // Load row template and switch colors
-               $OUT .= LOAD_TEMPLATE("admin_config_admins_del_row", true, $content);
+               $OUT .= LOAD_TEMPLATE('admin_config_admins_del_row', true, $content);
                $SW = 3 - $SW;
-       }
+       } // END - foreach
        define('__ACL_ROWS', $OUT);
 
        // Load main template
-       LOAD_TEMPLATE("admin_config_admins_del");
+       LOAD_TEMPLATE('admin_config_admins_del');
 } elseif ((REQUEST_ISSET_POST('remove')) && ($SEL > 0)) {
        // Remove entries
+       // @TODO Rewrite this to filter 'run_sqls'
        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__);
-       }
+                       array(bigintval($id)),__FILE__, __LINE__);
+       } // END - foreach
 
        // Update cache when installed
        if (EXT_IS_ACTIVE('cache')) {
-               if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) $GLOBALS['cache_instance']->destroyCacheFile();
 
                // @TODO This causes the whole (!) menu cache being rebuild
                cachePurgeAdminMenu();
-       }
+       } // END - if
 
        // Entries deleted
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
@@ -169,33 +173,33 @@ if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
 
        // Default ACL is false
        $ACL = false;
-       if (REQUEST_ISSET_POST(('what_menu'))) {
+       if (REQUEST_ISSET_POST('what_menu')) {
                // Check parent ACL
                $ACL = adminsCheckAdminAcl(getModeAction('admin', REQUEST_POST('what_menu')), '');
-       }
+       } // END - if
 
-       if ($mode != REQUEST_POST('mode') || ($ACL)) {
+       if (($mode != REQUEST_POST('mode')) || ($ACL)) {
                // Mode is fine
-               $BOTH = ((REQUEST_ISSET_POST(('action_menu'))) && (REQUEST_ISSET_POST(('what_menu'))));
-               if (((REQUEST_ISSET_POST(('action_menu'))) || (REQUEST_ISSET_POST(('what_menu')))) && (!$BOTH)) {
+               $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__);
+                               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')
+                                       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 ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
+                                       if ($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) $GLOBALS['cache_instance']->destroyCacheFile();
 
                                        // Purge cache
                                        cachePurgeAdminMenu(REQUEST_POST('admin_id'), REQUEST_POST('action_menu'), REQUEST_POST('what_menu'));
@@ -221,6 +225,8 @@ VALUES ('%s','%s','%s','%s')",
 } 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__);
+
+       // Entries found?
        if (SQL_NUMROWS($result_acls) > 0) {
                // List ACLs
                $OUT = ''; $SW = 2;
@@ -243,35 +249,33 @@ VALUES ('%s','%s','%s','%s')",
                        );
 
                        // Load row template and switch colors
-                       $OUT .= LOAD_TEMPLATE("admin_config_admins_row", true, $content);
+                       $OUT .= LOAD_TEMPLATE('admin_config_admins_row', true, $content);
                        $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
                define('__ACL_ROWS', $OUT);
 
                // Load main template
-               LOAD_TEMPLATE("admin_config_admins");
-       }
+               LOAD_TEMPLATE('admin_config_admins');
+       } // END - if
 
        // Prepare some constants for the template
-       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'    ,
-       generateOptionList(
-                       '/ARRAY/',
-       array("allow", "deny"),
-       array(
-       getMessage('ADMINS_ALLOW_MODE'),
-       getMessage('ADMINS_DENY_MODE')
-       )
-       )
-       );
+       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'    , 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");
+       LOAD_TEMPLATE('admin_admins_add_acl');
 }
 
 //