'what' files should be loaded only once

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

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index acab810fad0fc551ae35a60835c6c9ca755bdf74..043bfdd40f488dfdc3908c94c0015192adc3a7f7 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.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 *
@@ -33,9 +33,6 @@
  * along with this program; if not, write to the Free Software          *
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
  * MA  02110-1301  USA                                                  *
- * -------------------------------------------------------------------- *
- * Mod-Copyright (c) 2004 by Robert Niedziela                           *
- * www.megacomputing.de                                                 *
  ************************************************************************/
 
 // Some security stuff...
@@ -48,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 // Init SQL
 $sql = "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`,`cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -60,11 +57,11 @@ ORDER BY
 $result_maximum = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
-if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getMailsPage());
+if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
+if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getMailsPage());
 
 // Add limitation to SQL string
-$sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
+$sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
 
 // Run SQL query for normal mails
 $result = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -86,7 +83,7 @@ if (!SQL_HASZERONUMS($result)) {
        $OUT = '';
        while ($pool = SQL_FETCHARRAY($result)) {
                // Check sent mails and clicks
-               $result_mails = SQL_QUERY_ESC("SELECT `max_rec`, `clicks` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+               $result_mails = SQL_QUERY_ESC("SELECT `max_rec`,`clicks` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
                        array(bigintval($pool['id'])), __FILE__, __LINE__);
 
                // Load entries