projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...
[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 9f1a9fac6a045d212330d533b78619b49c090786..830c6f778db0882742f7573226df15def8d64249 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -41,12 +41,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 $SEL = 0;
 ADD_DESCR("admin", __FILE__);
 
 $SEL = 0;
-if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST('sel')) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 
 
-if ((isset($_POST['edit'])) && ($SEL > 0)) {
+if ((REQUEST_ISSET_POST('edit')) && ($SEL > 0)) {
        // Edit ACLs
        // Edit ACLs
-       $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $id => $sel) {
+       $OUT = ""; $SW = 2;
+       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__);
                // 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__);
@@ -76,31 +76,37 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 
        // Load main template
        LOAD_TEMPLATE("admin_config_admins_edit");
 
        // Load main template
        LOAD_TEMPLATE("admin_config_admins_edit");
-} elseif ((isset($_POST['change'])) && ($SEL > 0)) {
+} elseif ((REQUEST_ISSET_POST(('change'))) && ($SEL > 0)) {
        // Change entries
        // Change entries
-       foreach ($_POST['sel'] as $id => $sel) {
+       foreach (REQUEST_POST('sel') as $id => $selected) {
                // Secure ID
                $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",
                // Secure ID
                $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($_POST['admin'][$id], $_POST['action_menu'][$id], $_POST['what_menu'][$id], $_POST['mode'][$id], $id),__FILE__, __LINE__);
+                       array(
+                               REQUEST_POST('admin', $id),
+                               REQUEST_POST('action_menu', $id),
+                               REQUEST_POST('what_menu', $id),
+                               REQUEST_POST('mode', $id),
+                               $id
+                       ),__FILE__, __LINE__);
        }
 
        // Update cache when installed
        if (EXT_IS_ACTIVE("cache")) {
        }
 
        // Update cache when installed
        if (EXT_IS_ACTIVE("cache")) {
-               if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
 
                // Purge menu cache
 
                // Purge menu cache
-               CACHE_PURGE_ADMIN_MENU($_POST['admin'][$id]);
+               CACHE_PURGE_ADMIN_MENU(REQUEST_POST('admin', $id));
        }
 
        // Entries changed
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
        }
 
        // Entries changed
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
-} elseif ((isset($_POST['del'])) && ($SEL > 0)) {
+} elseif ((REQUEST_ISSET_POST('del')) && ($SEL > 0)) {
        // Delete ACLs
        // Delete ACLs
-       $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $id => $sel) {
+       $OUT = ""; $SW = 2;
+       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__);
                // 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__);
@@ -135,16 +141,16 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 
        // Load main template
        LOAD_TEMPLATE("admin_config_admins_del");
 
        // Load main template
        LOAD_TEMPLATE("admin_config_admins_del");
-} elseif ((isset($_POST['remove'])) && ($SEL > 0)) {
+} elseif ((REQUEST_ISSET_POST(('remove'))) && ($SEL > 0)) {
        // Remove entries
        // Remove entries
-       foreach ($_POST['sel'] as $id => $sel) {
+       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__);
        }
 
        // Update cache when installed
        if (EXT_IS_ACTIVE("cache")) {
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
                        array(bigintval($id)),__FILE__, __LINE__);
        }
 
        // Update cache when installed
        if (EXT_IS_ACTIVE("cache")) {
-               if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
 
                // @TODO This causes the whole (!) menu cache being rebuild
                CACHE_PURGE_ADMIN_MENU();
 
                // @TODO This causes the whole (!) menu cache being rebuild
                CACHE_PURGE_ADMIN_MENU();
@@ -152,57 +158,57 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 
        // Entries deleted
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
 
        // Entries deleted
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
-} elseif (isset($_POST['add'])) {
+} elseif (REQUEST_ISSET_POST(('add'))) {
        // Check if everything is fine...
        // Check if everything is fine...
-       $mode = GET_ADMIN_DEFAULT_ACL(bigintval($_POST['admin_id']));
+       $mode = GET_ADMIN_DEFAULT_ACL(bigintval(REQUEST_POST('admin_id')));
 
        // Default ACL is false
        $ACL = false;
 
        // Default ACL is false
        $ACL = false;
-       if (!empty($_POST['what_menu'])) {
+       if (REQUEST_ISSET_POST(('what_menu'))) {
                // Check parent ACL
                // Check parent ACL
-               $ACL = ADMINS_CHECK_ACL(GET_ACTION("admin", $_POST['what_menu']), "");
+               $ACL = ADMINS_CHECK_ACL(GET_ACTION("admin", REQUEST_POST('what_menu')), "");
        }
 
        }
 
-       if ($mode != $_POST['mode'] || ($ACL)) {
+       if ($mode != REQUEST_POST('mode') || ($ACL)) {
                // Mode is fine
                // Mode is fine
-               $BOTH = ((!empty($_POST['action_menu'])) && (!empty($_POST['what_menu'])));
-               if (((!empty($_POST['action_menu'])) || (!empty($_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",
                        // 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($_POST['admin_id']), $_POST['action_menu'], $_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(
                        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($_POST['admin_id']),
-       $_POST['action_menu'],
-       $_POST['what_menu'],
-       $_POST['mode']
+       bigintval(REQUEST_POST('admin_id')),
+       REQUEST_POST('action_menu'),
+       REQUEST_POST('what_menu'),
+       REQUEST_POST('mode')
 ), __FILE__, __LINE__);
 ), __FILE__, __LINE__);
-                               $content = ADMIN_ADMINS_ACL_SAVED;
+                               $content = getMessage('ADMIN_ADMINS_ACL_SAVED');
 
                                // Update cache when installed
                                if (EXT_IS_ACTIVE("cache")) {
 
                                // Update cache when installed
                                if (EXT_IS_ACTIVE("cache")) {
-                                       if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+                                       if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
 
                                        // Purge cache
 
                                        // Purge cache
-                                       CACHE_PURGE_ADMIN_MENU($_POST['admin_id'], $_POST['action_menu'], $_POST['what_menu']);
+                                       CACHE_PURGE_ADMIN_MENU(REQUEST_POST('admin_id'), REQUEST_POST('action_menu'), REQUEST_POST('what_menu'));
                                } // END - if
                        } else {
                                // ACL does already exist!
                                } // END - if
                        } else {
                                // ACL does already exist!
-                               $content = ADMIN_ADMINS_ACL_ALREADY_ADDED;
+                               $content = getMessage('ADMIN_ADMINS_ACL_ALREADY_ADDED');
                        }
 
                        // Free memory
                        SQL_FREERESULT($result);
                } else {
                        // No menu selected makes also no sence...
                        }
 
                        // Free memory
                        SQL_FREERESULT($result);
                } else {
                        // No menu selected makes also no sence...
-                       $content = ADMIN_ADMINS_SELECT_ACTION_WHAT;
+                       $content = getMessage('ADMIN_ADMINS_SELECT_ACTION_WHAT');
                }
        } else {
                // Same mode makes no sence...
                }
        } else {
                // Same mode makes no sence...
-               $content = ADMIN_ADMINS_SAME_MODE_SELECTED;
+               $content = getMessage('ADMIN_ADMINS_SAME_MODE_SELECTED');
        }
 
        // Display message
        }
 
        // Display message
@@ -210,27 +216,25 @@ 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__);
 } 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__);
-       if (SQL_NUMROWS($result_acls) > 0)
-       {
+       if (SQL_NUMROWS($result_acls) > 0) {
                // List ACLs
                // List ACLs
-               $SW = 2; $OUT = "";
-               while (list($id, $admin, $act, $wht, $mode) = SQL_FETCHROW($result_acls))
-               {
+               $OUT = ""; $SW = 2;
+               while ($content = SQL_FETCHARRAY($result_acls)) {
                        // Prepare variables
                        // Prepare variables
-                       if (empty($act)) $act = "---";
-                       if (empty($wht))   $wht   = "---";
+                       if (empty($content['action_menu'])) $content['action_menu'] = "---";
+                       if (empty($content['what_menu']))   $content['what_menu']   = "---";
 
                        // Get mode
 
                        // Get mode
-                       $mode = constant('ADMINS_'.strtoupper($mode).'_MODE');
+                       $content['access_mode'] = constant('ADMINS_'.strtoupper($content['access_mode']).'_MODE');
 
                        // Prepare data for the row template
                        $content = array(
                                'sw'     => $SW,
 
                        // Prepare data for the row template
                        $content = array(
                                'sw'     => $SW,
-                               'id'     => $id,
-                               'admin'  => GENERATE_AID_LINK($admin),
-                               'action' => $act,
-                               'what'   => $wht,
-                               'mode'   => $mode,
+                               'id'     => $content['id'],
+                               'admin'  => GENERATE_AID_LINK($content['admin_id']),
+                               'action' => $content['action_menu'],
+                               'what'   => $content['what_menu'],
+                               'mode'   => $content['access_mode'],
                        );
 
                        // Load row template and switch colors
                        );
 
                        // Load row template and switch colors
@@ -250,7 +254,16 @@ VALUES ('%s','%s','%s','%s')",
        define('_ADMINS_SELECTION', ADD_OPTION_LINES("admins", "id", "login", "", "default_acl"));
        define('_ACTION_SELECTION', ADMIN_MENU_SELECTION("action"));
        define('_WHAT_SELECTION'  , ADMIN_MENU_SELECTION("what"));
        define('_ADMINS_SELECTION', ADD_OPTION_LINES("admins", "id", "login", "", "default_acl"));
        define('_ACTION_SELECTION', ADMIN_MENU_SELECTION("action"));
        define('_WHAT_SELECTION'  , ADMIN_MENU_SELECTION("what"));
-       define('_MODE_OPTIONS'    , ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE)));
+       define('_MODE_OPTIONS'    ,
+               ADD_OPTION_LINES(
+                       "/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 for adding new ACL
        LOAD_TEMPLATE("admin_admins_add_acl");
Mailer-Project repository