Previous fix fixed, a lot constants rewritten (unfinished)

[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 8f3db7d3fce7b93b3b182bf0c0020b04fe83e570..6c646830e709b9a5784175862524825234a1821b 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -48,7 +48,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // 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 admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
                 array(bigintval($id)), __FILE__, __LINE__);
                list($aid, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -63,7 +63,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                        'mode_options'     => ADD_OPTION_LINES(
                                "/ARRAY/",
                                array("allow", "deny"),
-                               array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE),
+                               array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),
                                $mode
                        ),
                );
@@ -83,7 +83,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                $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",
+               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__);
        }
 
@@ -96,13 +96,13 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
        }
 
        // Entries changed
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ENTRIES_CHANGED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
 } elseif ((isset($_POST['del'])) && ($SEL > 0)) {
        // Delete ACLs
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // 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 admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
                list($admin, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -118,7 +118,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                $login = GET_ADMIN_LOGIN($admin);
                if ($login != "***") {
                        // Admin found
-                       $admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
+                       $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
                } else {
                        // Maybe deleted?
                        $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
@@ -145,7 +145,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 } elseif ((isset($_POST['remove'])) && ($SEL > 0)) {
        // Remove entries
        foreach ($_POST['sel'] as $id => $sel) {
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
                        array(bigintval($id)),__FILE__, __LINE__);
        }
 
@@ -158,7 +158,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
        }
 
        // Entries deleted
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ENTRIES_DELETED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
 } elseif (isset($_POST['add'])) {
        // Check if everything is fine...
        $mode = GET_ADMIN_DEFAULT_ACL(bigintval($_POST['admin_id']));
@@ -175,11 +175,11 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                $BOTH = ((!empty($_POST['action_menu'])) && (!empty($_POST['what_menu'])));
                if (((!empty($_POST['action_menu'])) || (!empty($_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",
+                       $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__);
                        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)
+                               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']),
@@ -216,12 +216,12 @@ VALUES ('%s','%s','%s','%s')",
        LOAD_TEMPLATE("admin_settings_saved", false, $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, id", __FILE__, __LINE__);
+       $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)
        {
                // List ACLs
                $SW = 2; $OUT = "";
-               while(list($id, $admin, $act, $wht, $mode) = SQL_FETCHROW($result_acls))
+               while (list($id, $admin, $act, $wht, $mode) = SQL_FETCHROW($result_acls))
                {
                        // Prepare variables
                        if (empty($act)) $act = "---";
@@ -232,13 +232,10 @@ VALUES ('%s','%s','%s','%s')",
 
                        // Load admin's data
                        $login = GET_ADMIN_LOGIN($admin);
-                       if ($login != "***")
-                       {
+                       if ($login != "***") {
                                // Admin found
-                               $admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
-                       }
-                        else
-                       {
+                               $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
+                       } else {
                                // Maybe deleted?
                                $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
                        }