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

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

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index 210812d70877ef4e67d0d14b646b31fc23dac819..24f58d4c6a2218b60f8048a2cfda5198c9117964 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -40,19 +40,17 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (empty($_GET['do'])) unset($_GET['do']);
-
-if (((empty($_POST['t_wait'])) || (empty($_POST['payment']))) && (!empty($_GET['do'])) && ($_GET['do'] == "add")) {
-       unset($_POST['ok']);
+if (((!REQUEST_ISSET_POST(('t_wait'))) || (!REQUEST_ISSET_POST(('payment')))) && (REQUEST_ISSET_GET(('do'))) && (REQUEST_GET('do') == "add")) {
+       REQUEST_UNSET_POST('ok');
 }
 
-if (isset($_POST['ok'])) {
+if (IS_FORM_SENT()) {
        $SQL = array();
-       switch ($_GET['do']) {
+       switch (REQUEST_GET('do')) {
        case "add":
-               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_payments` (time, payment, mail_title, price) VALUES ('".$_POST['t_wait']."','".$_POST['payment']."','".$_POST['title']."','".$_POST['price']."')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_payments` (time, payment, mail_title, price) VALUES ('".REQUEST_POST('t_wait')."','".REQUEST_POST('payment')."','".REQUEST_POST('title')."','".REQUEST_POST('price')."')";
                $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_payments` WHERE time='%s' LIMIT 1",
-                array($_POST['t_wait']), __FILE__, __LINE__);
+                array(REQUEST_POST('t_wait')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Free memory
                        $SQLs[0] = "";
@@ -61,13 +59,13 @@ if (isset($_POST['ok'])) {
                break;
 
        case "edit":
-               foreach ($_POST['time'] as $id => $value) {
-                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_payments` SET time='".$value."', payment='".$_POST['pay'][$id]."', price='".$_POST['price'][$id]."', mail_title='".$_POST['title'][$id]."' WHERE id='".$id."' LIMIT 1";
+               foreach (REQUEST_POST('time') as $id => $value) {
+                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_payments` SET time='".$value."', payment='".REQUEST_POST('pay', $id)."', price='".REQUEST_POST('price', $id)."', mail_title='".REQUEST_POST('title', $id)."' WHERE id='".$id."' LIMIT 1";
                }
                break;
 
        case "del":
-               foreach ($_POST['id'] as $id => $value) {
+               foreach (REQUEST_POST('id') as $id => $value) {
                        $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_payments` WHERE id='".$id."' LIMIT 1";
                }
                break;
@@ -85,10 +83,10 @@ if (isset($_POST['ok'])) {
 
        // Output template
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
-} elseif ((isset($_POST['del'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {
+} elseif ((REQUEST_ISSET_POST(('del'))) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
        // Delete entries here
        $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $id => $value) {
+       foreach (REQUEST_POST('sel') as $id => $value) {
                $result = SQL_QUERY_ESC("SELECT time, mail_title FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
                list($time, $title) = SQL_FETCHROW($result);
@@ -110,10 +108,10 @@ if (isset($_POST['ok'])) {
 
        // Load main template
        LOAD_TEMPLATE("admin_del_payments");
-} elseif ((isset($_POST['edit'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {
+} elseif ((REQUEST_ISSET_POST(('edit'))) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
        // Edit entries
        $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $id => $value) {
+       foreach (REQUEST_POST('sel') as $id => $value) {
                $result = SQL_QUERY_ESC("SELECT time, payment, mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
                 array(bigintval($id)), __FILE__, __LINE__);
                list($time, $pay, $title, $price) = SQL_FETCHROW($result);