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

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

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index 51b98f72e9f93f6423732025c7073f44fe5b5f75..dca9ca67de8e79c6619dfd51213fbc443c3c0cbe 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -40,13 +40,13 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (!empty($_GET['id'])) {
+if (REQUEST_ISSET_GET(('id'))) {
        // Check for selected sponsor
        $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
-               array(bigintval($_GET['id'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
-               if (isset($_POST['ok'])) {
+               if (IS_FORM_SENT()) {
                        // Load data and remember it in constants
                        list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
 
@@ -59,22 +59,22 @@ if (!empty($_GET['id'])) {
                        define('__FAMILY' , $family);
 
                        // Prepare message and send it away
-                       $msg = LOAD_EMAIL_TEMPLATE("del_sponsor", $_POST['reason'], bigintval($_GET['id']));
+                       $msg = LOAD_EMAIL_TEMPLATE("del_sponsor", REQUEST_POST('reason'), bigintval(REQUEST_GET('id')));
                        SEND_EMAIL($email, getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $msg);
 
                        // Remove account
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
-                               array(bigintval($_GET['id'])), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
                        // Remove orders
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_orders` WHERE sponsorid='%s' LIMIT 1",
-                               array(bigintval($_GET['id'])), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
                        // Output message
-                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_DELETED'), bigintval($_GET['id'])));
-               } elseif (!empty($_POST['no'])) {
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_DELETED'), bigintval(REQUEST_GET('id'))));
+               } elseif (REQUEST_ISSET_POST(('no'))) {
                        // Do not delete him...
-                       LOAD_URL("modules.php?module=admin&what=list_sponsor&id=".bigintval($_GET['id']));
+                       LOAD_URL("modules.php?module=admin&what=list_sponsor&id=".bigintval(REQUEST_GET('id')));
                } else {
                        // Load data
                        list ($email, $gender, $sname, $fname) = SQL_FETCHROW($result);
@@ -84,14 +84,14 @@ if (!empty($_GET['id'])) {
                        define('__SNAME' , $sname);
                        define('__FNAME' , $fname);
                        define('__GENDER', TRANSLATE_GENDER($gender));
-                       define('__UID'   , bigintval($_GET['id']));
+                       define('__UID'   , bigintval(REQUEST_GET('id')));
 
                        // Display form
                        LOAD_TEMPLATE("admin_del_sponsor");
                }
        } else {
                // Sponsor not found!
-               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval($_GET['id'])));
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval(REQUEST_GET('id'))));
        }
 } else {
        // Not called by what-list_sponsor.php