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

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

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index 1866e42f987fc2fde0cbe2ea9d9edb7735127259..f17446b43ee3ef30b7ddc35bca7a33f35f64d3b1 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -44,28 +44,28 @@ ADD_DESCR("admin", __FILE__);
 $SEL = 0;
 
 // Some sanity-check
-if ((empty($_POST['url'])) || (empty($_POST['alternate']))) {
-       unset($_POST['ok']);
+if ((!REQUEST_ISSET_POST(('url'))) || (!REQUEST_ISSET_POST(('alternate')))) {
+       REQUEST_UNSET_POST('ok');
 }
 
 // Check selection count
-if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST(('sel'))) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 
-if (isset($_POST['ok'])) {
+if (IS_FORM_SENT()) {
        // Fix older calls from add-new-banner-form
-       if (empty($_GET['mode'])) $_GET['mode'] = "add";
+       if (!REQUEST_ISSET_GET(('mode'))) REQUEST_SET_GET('mode', "add");
        $SQL = "";
-       switch ($_GET['mode'])
+       switch (REQUEST_GET('mode'))
        {
        case "add":
                // Check if banner is already added
                $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE url='%s' LIMIT 1",
-                       array($_POST['url']), __FILE__, __LINE__);
+                       array(REQUEST_POST('url')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 0) {
                        // Add banner
                        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refbanner` (url, alternate, visible)
 VALUES ('%s','%s','%s')",
-                               array($_POST['url'], $_POST['alternate'], $_POST['visible']), __FILE__, __LINE__);
+                               array(REQUEST_POST('url'), REQUEST_POST('alternate'), REQUEST_POST('visible')), __FILE__, __LINE__);
                } else {
                        // Free memory
                        SQL_FREERESULT($result);
@@ -73,13 +73,18 @@ VALUES ('%s','%s','%s')",
                break;
 
        case "edit": // Update banner
-               foreach ($_POST['sel'] as $id => $sel) {
+               foreach (REQUEST_POST('sel') as $id => $sel) {
                        // Secure ID
                        $id = bigintval($id);
 
                        // Update entry
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refbanner` SET url='%s', alternate='%s', `visible`='%s' WHERE id=%s LIMIT 1",
-                               array($_POST['url'][$id], $_POST['alternate'][$id], $_POST['visible'], $id), __FILE__, __LINE__);
+                               array(
+                                       REQUEST_POST('url', $id),
+                                       REQUEST_POST('alternate', $id),
+                                       REQUEST_POST('visible'),
+                                       $id
+                               ), __FILE__, __LINE__);
                }
                break;
        }
@@ -90,10 +95,10 @@ VALUES ('%s','%s','%s')",
                $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
        }
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
-} elseif (($SEL > 0) && (isset($_POST['edit']))) {
+} elseif (($SEL > 0) && (REQUEST_ISSET_POST(('edit')))) {
        // Edit banner
        $SW = ""; $OUT = "";
-       foreach ($_POST['sel'] as $id => $sel) {
+       foreach (REQUEST_POST('sel') as $id => $sel) {
                // Load data
                $result = SQL_QUERY_ESC("SELECT url, alternate, visible FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",
                 array(bigintval($id)), __FILE__, __LINE__);
@@ -118,10 +123,10 @@ VALUES ('%s','%s','%s')",
        // Load main template
        LOAD_TEMPLATE("admin_refbanner_edit");
 } else {
-       if (($SEL > 0) && (isset($_POST['del'])))
+       if (($SEL > 0) && (REQUEST_ISSET_POST(('del'))))
        {
                // Delete banner
-               foreach ($_POST['sel'] as $id => $sel) {
+               foreach (REQUEST_POST('sel') as $id => $sel) {
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                }