More globals rewritten, see #100

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

diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index e36c9f5bb6396ac87b83498ce90de303655babb5..754f36912f8fb3a297293f1ae253cd83d0eea341 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -38,28 +38,28 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Remove empty array index
 if (empty($_POST['max'])) unset($_POST['add_max']);
 
 if (isset($_POST['add_max'])) {
        // Save all settings
-       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_max_receive WHERE value='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='%s' LIMIT 1",
         array(bigintval($_POST['max'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)
-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES ('%s', '%s')",
-                array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__);
-               $content = "<SPAN class=\"admin_done\">".MAX_VALUE_SAVED."</SPAN>";
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('%s','%s')",
+                       array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__);
+               $content = MAX_VALUE_SAVED;
        } else {
-               // Free memory
-               SQL_FREERESULT($result);
-
                // Value does alread exists!
-               $content = "<SPAN class=\"admin_failed\">".MAX_VALUE_ALREADY."</SPAN>";
+               $content = "<span class=\"admin_failed\">".MAX_VALUE_ALREADY."</span>";
        }
 
+       // Free memory
+       SQL_FREERESULT($result);
+
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
 } elseif ((isset($_POST['ok'])) && (isset($_GET['do']))) {
@@ -72,14 +72,14 @@ if (isset($_POST['add_max'])) {
                switch ($_GET['do'])
                {
                case "edit": // Change entries
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_max_receive SET value='%s', comment='%s' WHERE id=%s LIMIT 1",
-                        array(bigintval($_POST['val'][$id]), $_POST['comm'][$id], $id),__FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_max_receive` SET value='%s', comment='%s' WHERE id=%s LIMIT 1",
+                               array(bigintval($_POST['val'][$id]), $_POST['comm'][$id], $id),__FILE__, __LINE__);
                        $TEXT = MRECEIVE_SAVED;
                        break;
 
                case "del":
-                       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_max_receive WHERE id=%s LIMIT 1",
-                        array($id), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
+                               array($id), __FILE__, __LINE__);
                        $TEXT = MRECEIVE_DELETED;
                        break;
                }
@@ -95,7 +95,7 @@ if (isset($_POST['add_max'])) {
        foreach ($_POST['sel'] as $id => $value)
        {
                // Load data
-               $result = SQL_QUERY_ESC("SELECT value, comment FROM "._MYSQL_PREFIX."_max_receive WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
                 array(bigintval($id)), __FILE__, __LINE__);
                list($value, $comment) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -121,7 +121,7 @@ if (isset($_POST['add_max'])) {
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {
                // Load data
-               $result = SQL_QUERY_ESC("SELECT value, comment FROM "._MYSQL_PREFIX."_max_receive WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
                 array(bigintval($id)), __FILE__, __LINE__);
                list($value, $comment) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -143,7 +143,7 @@ if (isset($_POST['add_max'])) {
        // Load main template
        LOAD_TEMPLATE("admin_config_email_edit");
 } else {
-       $result = SQL_QUERY("SELECT id, value, comment FROM "._MYSQL_PREFIX."_max_receive ORDER BY value", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // List already existing entries for editing
                $SW = 2; $OUT = "";