Complete rewrite of and , wrapper functions added, see bug #101

[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 754f36912f8fb3a297293f1ae253cd83d0eea341..7048cd0a8f1650afdca780f04e94a77283893b09 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -41,20 +41,20 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Remove empty array index
 ADD_DESCR("admin", __FILE__);
 
 // Remove empty array index

-if (empty($_POST['max'])) unset($_POST['add_max']);
+if (!REQUEST_ISSET_POST(('max'))) REQUEST_UNSET_POST(('add_max'));

 
 

-if (isset($_POST['add_max'])) {
+if (REQUEST_ISSET_POST(('add_max'))) {

        // Save all settings
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='%s' LIMIT 1",
        // Save all settings
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='%s' LIMIT 1",

-        array(bigintval($_POST['max'])), __FILE__, __LINE__);
+        array(bigintval(REQUEST_POST('max'))), __FILE__, __LINE__);

        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('%s','%s')",
        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('%s','%s')",

-                       array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__);
+                       array(bigintval(REQUEST_POST('max')), REQUEST_POST('comment')),__FILE__, __LINE__);

                $content = MAX_VALUE_SAVED;
        } else {
                // Value does alread exists!
                $content = MAX_VALUE_SAVED;
        } else {
                // Value does alread exists!

-               $content = "<span class=\"admin_failed\">".MAX_VALUE_ALREADY."</span>";
+               $content = "<span class=\"admin_failed\">{--MAX_VALUE_ALREADY--}</span>";

        }
 
        // Free memory
        }
 
        // Free memory


@@ -62,18 +62,22 @@ if (isset($_POST['add_max'])) {
 
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
 
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, $content);

-} elseif ((isset($_POST['ok'])) && (isset($_GET['do']))) {
+} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('do')))) {

        // Change or delete entries...
        $TEXT = "";
        // Change or delete entries...
        $TEXT = "";

-       foreach ($_POST['id'] as $id => $value) {
+       foreach (REQUEST_POST('id') as $id => $value) {

                // Secure ID
                $id = bigintval($id);
 
                // Secure ID
                $id = bigintval($id);
 

-               switch ($_GET['do'])
+               switch (REQUEST_GET('do'))

                {
                case "edit": // Change entries
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_max_receive` SET value='%s', comment='%s' WHERE id=%s LIMIT 1",
                {
                case "edit": // Change entries
                        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__);
+                               array(
+                                       bigintval(REQUEST_POST('val', $id)),
+                                       REQUEST_POST('comm', $id),
+                                       $id
+                               ),__FILE__, __LINE__);

                        $TEXT = MRECEIVE_SAVED;
                        break;
 
                        $TEXT = MRECEIVE_SAVED;
                        break;
 


@@ -89,10 +93,10 @@ if (isset($_POST['add_max'])) {
                // Display message
                LOAD_TEMPLATE("admin_settings_saved", false, $TEXT);
        }
                // Display message
                LOAD_TEMPLATE("admin_settings_saved", false, $TEXT);
        }

-} elseif ((isset($_POST['del'])) && ((SELECTION_COUNT($_POST['sel']) > 0) || (isset($_POST['sel'][0])))) {
+} elseif ((REQUEST_ISSET_POST(('del'))) && ((SELECTION_COUNT(REQUEST_POST('sel')) > 0) || (REQUEST_ISSET_POST(('sel', 0))))) {

        // Delete entries
        $SW = 2; $OUT = "";
        // Delete entries
        $SW = 2; $OUT = "";

-       foreach ($_POST['sel'] as $id => $value)
+       foreach (REQUEST_POST('sel') as $id => $value)

        {
                // Load data
                $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
        {
                // Load data
                $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",


@@ -116,10 +120,10 @@ if (isset($_POST['add_max'])) {
 
        // Load main template
        LOAD_TEMPLATE("admin_config_email_del");
 
        // Load main template
        LOAD_TEMPLATE("admin_config_email_del");

-} elseif ((isset($_POST['edit'])) && ((SELECTION_COUNT($_POST['sel']) > 0) || (isset($_POST['sel'][0])))) {
+} elseif ((REQUEST_ISSET_POST(('edit'))) && ((SELECTION_COUNT(REQUEST_POST('sel')) > 0) || (REQUEST_ISSET_POST(('sel', 0))))) {

        // Edit entries
        $SW = 2; $OUT = "";
        // Edit entries
        $SW = 2; $OUT = "";

-       foreach ($_POST['sel'] as $id => $value) {
+       foreach (REQUEST_POST('sel') as $id => $value) {

                // Load data
                $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
                 array(bigintval($id)), __FILE__, __LINE__);
                // Load data
                $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
                 array(bigintval($id)), __FILE__, __LINE__);