ext-admins must be checked here, first admin had never 'allow'

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

diff --git a/inc/modules/admin/what-list_admins_acls.php b/inc/modules/admin/what-list_admins_acls.php
index c1de42d5fab37a1dbf941e80daa78546bb2a75c1..904b458c087d6cc7b20ae124c3f6770419e98464 100644 (file)
--- a/inc/modules/admin/what-list_admins_acls.php
+++ b/inc/modules/admin/what-list_admins_acls.php
@@ -48,7 +48,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
        $OUT = '';
        foreach (postRequestElement('sel') as $id => $selected) {
                // Load data for the id
-               $result = SQL_QUERY_ESC("SELECT `id`,`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__);
 
                // Load all data
@@ -66,11 +66,11 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                );
 
                // Load row template
-               $OUT .= loadTemplate('admin_edit_admins_acls_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_admins_acls_row', TRUE, $content);
        } // END - foreach
 
        // Load main template
-       loadTemplate('admin_edit_admins_acls', false, $OUT);
+       loadTemplate('admin_edit_admins_acls', FALSE, $OUT);
 } elseif ((isFormSent('do_edit')) && (ifPostContainsSelections())) {
        // Change entries
        foreach (postRequestElement('sel') as $id => $selected) {
@@ -98,10 +98,7 @@ LIMIT 1",
        } // END - foreach
 
        // Update cache when installed
-       // @TODO Rewrite this to a filter
-       if (isExtensionActive('cache')) {
-               if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-       } // END - if
+       rebuildCache('admin_acls', 'admin_acls');
 
        // Entries changed
        displayMessage('{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
@@ -110,7 +107,7 @@ LIMIT 1",
        $OUT = '';
        foreach (postRequestElement('sel') as $id => $selected) {
                // Load data for the id
-               $result = SQL_QUERY_ESC("SELECT `id`,`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__);
                $content = SQL_FETCHARRAY($result);
                SQL_FREERESULT($result);
@@ -119,11 +116,11 @@ LIMIT 1",
                $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                // Load row template and switch colors
-               $OUT .= loadTemplate('admin_delete_admins_acls_row', true, $content);
+               $OUT .= loadTemplate('admin_delete_admins_acls_row', TRUE, $content);
        } // END - foreach
 
        // Load main template
-       loadTemplate('admin_delete_admins_acls', false, $OUT);
+       loadTemplate('admin_delete_admins_acls', FALSE, $OUT);
 } elseif ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
        // Remove entries
        // @TODO Rewrite this to filter 'run_sqls'
@@ -133,9 +130,7 @@ LIMIT 1",
        } // END - foreach
 
        // Update cache when installed
-       if (isExtensionActive('cache')) {
-               if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-       } // END - if
+       rebuildCache('admin_acls', 'admin_acls');
 
        // Entries deleted
        displayMessage('{--ADMIN_ADMINS_ENTRIES_DELETED--}');
@@ -144,18 +139,18 @@ LIMIT 1",
        $mode = getAdminDefaultAcl(bigintval(postRequestElement('admin_id')));
 
        // Default ACL is false
-       $ACL = false;
+       $ACL = FALSE;
        if (isPostRequestElementSet('what_menu')) {
                // Check parent ACL
                $ACL = isAdminsAllowedByAcl(getActionFromModuleWhat('admin', postRequestElement('what_menu')), '');
        } // END - if
 
-       if (($mode != postRequestElement('do')) || (($ACL === true) && (postRequestElement('do') == 'deny'))) {
+       if (($mode != postRequestElement('do')) || (($ACL === TRUE) && (postRequestElement('do') == 'deny'))) {
                // Mode is fine
                $BOTH = ((isPostRequestElementSet('action_menu')) && (isPostRequestElementSet('what_menu')) && (postRequestElement('action_menu') != '') && (postRequestElement('what_menu') != ''));
 
                // Check if one has been selected
-               if ((((isPostRequestElementSet('action_menu')) && (postRequestElement('action_menu') != '')) || ((isPostRequestElementSet('what_menu')) && (postRequestElement('what_menu') != ''))) && ($BOTH === false)) {
+               if ((((isPostRequestElementSet('action_menu')) && (postRequestElement('action_menu') != '')) || ((isPostRequestElementSet('what_menu')) && (postRequestElement('what_menu') != ''))) && ($BOTH === FALSE)) {
                        // 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(
@@ -165,8 +160,17 @@ LIMIT 1",
                                ), __FILE__, __LINE__);
                        if (SQL_HASZERONUMS($result)) {
                                // 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')",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_acls` (
+       `admin_id`,
+       `action_menu`,
+       `what_menu`,
+       `access_mode`
+) VALUES (
+       %s,
+       '%s',
+       '%s',
+       '%s'
+)",
                                array(
                                        bigintval(postRequestElement('admin_id')),
                                        postRequestElement('action_menu'),
@@ -176,9 +180,7 @@ VALUES (%s,'%s','%s','%s')",
                                $content = '{--ADMIN_ADMINS_ACL_SAVED--}';
 
                                // Update cache when installed
-                               if (isExtensionActive('cache')) {
-                                       if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-                               } // END - if
+                               rebuildCache('admin_acls', 'admin_acls');
                        } else {
                                // ACL does already exist!
                                $content = '{--ADMIN_ADMINS_ACL_ALREADY_ADDED--}';
@@ -199,7 +201,17 @@ VALUES (%s,'%s','%s','%s')",
        displayMessage($content);
 } else {
        // List all ACLs
-       $result = SQL_QUERY('SELECT `id`,`admin_id`,`action_menu`,`what_menu`,`access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC,`id` ASC', __FILE__, __LINE__);
+       $result = SQL_QUERY('SELECT
+       `id`,
+       `admin_id`,
+       `action_menu`,
+       `what_menu`,
+       `access_mode`
+FROM
+       `{?_MYSQL_PREFIX?}_admins_acls`
+ORDER BY
+       `admin_id` ASC,
+       `id` ASC', __FILE__, __LINE__);
 
        // Entries found?
        if (!SQL_HASZERONUMS($result)) {
@@ -210,14 +222,14 @@ VALUES (%s,'%s','%s','%s')",
                        $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                        // Load row template and switch colors
-                       $OUT .= loadTemplate('admin_list_admins_acls_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_admins_acls_row', TRUE, $content);
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
-               loadTemplate('admin_list_admins_acls', false, $OUT);
+               loadTemplate('admin_list_admins_acls', FALSE, $OUT);
        } // END - if
 
        // Prepare some constants for the template
@@ -226,7 +238,7 @@ VALUES (%s,'%s','%s','%s')",
        $content['what_selection']   = adminMenuSelectionBox_DEPRECATED('what');
 
        // Load template for adding new ACL
-       loadTemplate('admin_add_admins_acl', false, $content);
+       loadTemplate('admin_add_admins_acl', FALSE, $content);
 }
 
 // [EOF]