Some more code-cleanups:

[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 74845c013bc57ca33e4498e19afb8443e55b2cf2..f98b503e9ee917c5bd6c1999337234943a257961 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -65,8 +65,8 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                                '/ARRAY/',
                                array('allow', 'deny'),
                                array(
-                                       '{--ADMINS_ALLOW_MODE--}',
-                                       '{--ADMINS_DENY_MODE--}'
+                                       '{--ADMIN_ADMINS_MODE_ALLOW--}',
+                                       '{--ADMIN_ADMINS_MODE_DENY--}'
                                ),
                                $content['access_mode']
                        ),
@@ -85,23 +85,33 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                $id = bigintval($id);
 
                // 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(
-                       postRequestParameter('admin', $id),
-                       postRequestParameter('action_menu', $id),
-                       postRequestParameter('what_menu', $id),
-                       postRequestParameter('mode', $id),
-                       $id
-               ),__FILE__, __LINE__);
+               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(
+                               postRequestParameter('admin', $id),
+                               postRequestParameter('action_menu', $id),
+                               postRequestParameter('what_menu', $id),
+                               postRequestParameter('mode', $id),
+                               $id
+                       ),__FILE__, __LINE__);
        } // 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
 
        // Entries changed
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
+       displayMessage('{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
        // Delete ACLs
        $OUT = '';
@@ -113,7 +123,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                SQL_FREERESULT($result);
 
                // Get admin mode
-               $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}';
+               $content['access_mode'] = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_config_admins_del_row', true, $content);
@@ -135,7 +145,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
        } // END - if
 
        // Entries deleted
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ENTRIES_DELETED--}');
+       displayMessage('{--ADMIN_ADMINS_ENTRIES_DELETED--}');
 } elseif (isFormSent('add')) {
        // Check if everything is fine...
        $mode = getAdminDefaultAcl(bigintval(postRequestParameter('admin_id')));
@@ -191,7 +201,7 @@ VALUES ('%s','%s','%s','%s')",
        }
 
        // Display message
-       loadTemplate('admin_settings_saved', false, $content);
+       displayMessage($content);
 } 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` ASC, `id` ASC', __FILE__, __LINE__);
@@ -223,8 +233,8 @@ VALUES ('%s','%s','%s','%s')",
                '/ARRAY/',
                array('allow', 'deny'),
                array(
-                       '{--ADMINS_ALLOW_MODE--}',
-                       '{--ADMINS_DENY_MODE--}'
+                       '{--ADMIN_ADMINS_MODE_ALLOW--}',
+                       '{--ADMIN_ADMINS_MODE_DENY--}'
                )
        );