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

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

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index a2193ec131550c4fa45cd7ebe5fe8a60d7fe8de4..40161f3807d8cd5e1879c361cf2280c9fbc10609 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -60,22 +60,22 @@ ORDER BY timestamp DESC";
 $WHO = _ALL;
 $SQL2 = "";
 
-if (!empty($_GET['mid'])) {
+if (REQUEST_ISSET_GET(('mid'))) {
        // Only a specific mail shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
         FROM `{!_MYSQL_PREFIX!}_pool`
-        WHERE id='".bigintval($_GET['mid'])."'
+        WHERE id='".bigintval(REQUEST_GET('mid'))."'
         LIMIT 1";
-       $WHO = MAIL_ID.": ".$_GET['mid'];
-} elseif (!empty($_GET['u_id'])) {
+       $WHO = MAIL_ID.": ".REQUEST_GET('mid');
+} elseif (REQUEST_ISSET_GET(('uid'))) {
        // All mails by a specific member shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
 FROM `{!_MYSQL_PREFIX!}_pool`
-WHERE sender='".bigintval($_GET['u_id'])."'
+WHERE sender='".bigintval(REQUEST_GET('uid'))."'
 ORDER by timestamp DESC";
-       $WHO = USER_ID.": ".$_GET['u_id'];
+       $WHO = USER_ID.": ".REQUEST_GET('uid');
 }
 
 if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
@@ -94,13 +94,13 @@ ORDER BY timestamp DESC";
 $result_normal = SQL_QUERY($SQL, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (empty($_GET['page']))   $_GET['page']   = "1";
-if (empty($_GET['offset'])) $_GET['offset'] = getConfig('mails_page');
+if (!REQUEST_ISSET_GET(('page')))   REQUEST_GET('page')   = "1";
+if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-if (empty($_GET['mid'])) {
+if (!REQUEST_ISSET_GET(('mid'))) {
        // Create limitation line
-       $ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
+       $ADD = " LIMIT ".(bigintval(REQUEST_GET('offset')) * bigintval(REQUEST_GET('page')) - bigintval(REQUEST_GET('offset'))).", ".bigintval(REQUEST_GET('offset'));
 
        // For normal mails
        $SQL .= $ADD;