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

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

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index c8a623047f5b0333b82a9718d830b0df0c1c46bf..c6600aec5c06a4408327df22efe7e415dcdfdcf7 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -40,15 +40,15 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (!empty($_GET['pid'])) {
+if (REQUEST_ISSET_GET(('pid'))) {
        // First let's get the member's ID
        $result = SQL_QUERY_ESC("SELECT userid, target_account, payout_total, payout_timestamp, password FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",
-               array($_GET['pid']), __FILE__, __LINE__);
+               array(REQUEST_GET('pid')), __FILE__, __LINE__);
        list($uid, $tuid, $points, $tstamp, $tpass) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        // Obtain some data
-       if (empty($_GET['task']) && (!empty($uid)) && ($uid > 0)) {
+       if (!REQUEST_ISSET_GET(('task')) && (!empty($uid)) && ($uid > 0)) {
                // Get task ID from database
                $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE userid=%s AND task_type='PAYOUT_REQUEST' AND task_created='".$tstamp."' LIMIT 1",
                        array(bigintval($uid)), __FILE__, __LINE__);
@@ -60,7 +60,7 @@ if (!empty($_GET['pid'])) {
                LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_FAILED_OBTAIN_USERID);
        } else {
                // Get task ID from URL
-               $task = $_GET['task'];
+               $task = REQUEST_GET('task');
        }
 
        if ((!empty($task)) && (!empty($uid)) && ($uid > 0)) {
@@ -73,12 +73,12 @@ if (!empty($_GET['pid'])) {
                // Konstante bauen
                define('PAYOUT_USERDATA_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$surname." ".$family."</a>");
 
-               if (($_GET['do'] == "accept") && (!empty($email))) {
+               if ((REQUEST_GET('do') == "accept") && (!empty($email))) {
                        // Ok, now we can output the form or execute accepting
-                       if (isset($_POST['ok'])) {
+                       if (IS_FORM_SENT()) {
                                // Obtain payout type and other data
                                $result = SQL_QUERY_ESC("SELECT payout_id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",
-                                array(bigintval($_GET['pid'])), __FILE__, __LINE__);
+                                array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
                                list($ptype) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
@@ -107,7 +107,7 @@ if (!empty($_GET['pid'])) {
 
                                                // Transfer variables...
                                                $eval = "\$URL = \"".$eurl."\";";
-                                               $reason = urlencode(base64_encode(PAYOUT_REASON_PAYOUT));
+                                               $reason = encodeString(getMessage('PAYOUT_REASON_PAYOUT'), false);
 
                                                // Run code...
                                                eval($eval);
@@ -126,11 +126,11 @@ if (!empty($_GET['pid'])) {
                                                }
 
                                                // Clear payout request
-                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET status='ACCEPTED' WHERE id=%s LIMIT 1",
-                                                       array(bigintval($_GET['pid'])), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET `status`='ACCEPTED' WHERE id=%s LIMIT 1",
+                                                       array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
 
                                                // Send out mail
-                                               $msg = LOAD_EMAIL_TEMPLATE("member_payout_accepted", $_POST['text'], $uid);
+                                               $msg = LOAD_EMAIL_TEMPLATE("member_payout_accepted", REQUEST_POST('text'), $uid);
 
                                                // Output message
                                                if ($allow == "Y") {
@@ -156,20 +156,20 @@ if (!empty($_GET['pid'])) {
                                // Load template
                                LOAD_TEMPLATE("admin_payout_accept_form", false, $task);
                        }
-               } elseif (($_GET['do'] == "reject") && (!empty($email))) {
+               } elseif ((REQUEST_GET('do') == "reject") && (!empty($email))) {
                        // Ok, now we can output the form or execute rejecting
-                       if (isset($_POST['ok'])) {
+                       if (IS_FORM_SENT()) {
                                if ($task > 0) {
                                        // Clear task
                                        RUN_FILTER('solve_task', $task);
                                }
 
                                // Clear payout request
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET status='REJECTED' WHERE id=%s LIMIT 1",
-                                array(bigintval($_GET['pid'])), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET `status`='REJECTED' WHERE id=%s LIMIT 1",
+                                array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
 
                                // Send out mail
-                               $msg = LOAD_EMAIL_TEMPLATE("member_payout_rejected", $_POST['text'], $uid);
+                               $msg = LOAD_EMAIL_TEMPLATE("member_payout_rejected", REQUEST_POST('text'), $uid);
 
                                // Output message
                                LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_REJECTED_NOTIFIED);
@@ -186,11 +186,12 @@ if (!empty($_GET['pid'])) {
                }
        } elseif ((empty($task)) || ($task == "0")) {
                // Failed loading task ID
-               LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_FAILED_OBTAIN_TASK_ID);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PAYOUT_FAILED_OBTAIN_TASK_ID'));
        }
 } else {
-       if (empty($_GET['do'])) $_GET['do'] = "";
-       if ($_GET['do'] == "delete") {
+       if (!REQUEST_ISSET_GET(('do'))) REQUEST_SET_GET('do', "");
+
+       if (REQUEST_GET('do') == "delete") {
                // Delete all requests
                $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_payouts`", __FILE__, __LINE__);
        }