Fixes and cleanups

[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 24aa58332c9fafa37e7f562963d7b54ad30f486f..428a6be1e112d9a70f0f98d2f62f7a9741923763 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -63,31 +63,31 @@ ORDER BY
 $WHO = '';
 $SQL2 = '';
 
-if (isGetRequestParameterSet('mid')) {
+if (isGetRequestElementSet('mid')) {
        // Only a specific mail shall be displayed
        $sql = sprintf("SELECT
-       `id`,`sender`,`subject`,`text`,`receivers`,`payment_id`,`data_type`,`timestamp`,`url`,`target_send`,`cat_id`
+       `id`,`sender`,`subject`,`text`,`receivers`,`payment_id`,`data_type`,`timestamp`,`url`,`target_send`,`mails_sent`,`cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
        `id`=%s
 LIMIT 1",
-               bigintval(getRequestParameter('mid'))
+               bigintval(getRequestElement('mid'))
        );
-       $WHO = '{--MAIL_ID--}' . ': ' . getRequestParameter('mid');
-} elseif (isGetRequestParameterSet('userid')) {
+       $WHO = '{--MAIL_ID--}' . ': ' . getRequestElement('mid');
+} elseif (isGetRequestElementSet('userid')) {
        // All mails by a specific member shall be displayed
        $sql = sprintf("SELECT
-       `id`,`sender`,`subject`,`text`,`receivers`,`payment_id`,`data_type`,`timestamp`,`url`,`target_send`,`cat_id`
+       `id`,`sender`,`subject`,`text`,`receivers`,`payment_id`,`data_type`,`timestamp`,`url`,`target_send`,`mails_sent`,`cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
        `sender`=%s
 ORDER BY
        `timestamp` DESC",
-               bigintval(getRequestParameter('userid'))
+               bigintval(getRequestElement('userid'))
        );
-       $WHO = '{--USER_ID--}' . ': ' . getRequestParameter('userid');
+       $WHO = '{--USER_ID--}' . ': ' . getRequestElement('userid');
 }
 
 // Init result_bonus
@@ -110,22 +110,22 @@ ORDER BY
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestParameterSet('page')) setGetRequestParameter('page', 1);
+if (!isGetRequestElementSet('page')) setGetRequestElement('page', 1);
 
-if (!isGetRequestParameterSet('offset')) {
+if (!isGetRequestElementSet('offset')) {
        if (isConfigEntrySet('mails_page')) {
                // Set config entry
-               setGetRequestParameter('offset', getMailsPage());
+               setGetRequestElement('offset', getMailsPage());
        } else {
                // Set default one
-               setGetRequestParameter('offset', 10);
+               setGetRequestElement('offset', 10);
        }
 } // END - if
 
 // Add limitation to SQL string
-if (!isGetRequestParameterSet('mid')) {
+if (!isGetRequestElementSet('mid')) {
        // Create limitation line
-       $add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
+       $add = ' LIMIT ' . (bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))) . ', ' . bigintval(getRequestElement('offset'));
 
        // For normal mails
        $sql .= $add;