More bugs resolved, thanks to profi-concept

[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 cb306c5d5a20e5d0ed0875f467d8620e3dad32ae..bd9d47eebb5b80a3825518c3fb24008901f05f44 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // 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']);
@@ -49,17 +49,17 @@ if (isset($_POST['add_max'])) {
         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;
                }