Code style changed, ext-user continued:

[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 d6338d6fe1e7413983e847d6bf5a9afcc6ec6243..87e534fbc12397202916f9ba0218380d3fc40c68 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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,17 @@ 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 +67,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__);
@@ -79,8 +86,8 @@ if (!SQL_HASZERONUMS($result)) {
        // Mail orders are in pool so we can display them
 
        // Add navigation table rows
-       $content['top_email_nav']    = addEmailNavigation($numPages, getMailsPage(), true , 3, true);
-       $content['bottom_email_nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+       $content['top_email_nav']    = addEmailNavigation($numPages, getMailsPage(), TRUE , 3, TRUE);
+       $content['bottom_email_nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);
 
        // List all entries
        $OUT = '';
@@ -96,7 +103,7 @@ if (!SQL_HASZERONUMS($result)) {
                SQL_FREERESULT($result_mails);
 
                // Unconfirmed mails
-               $pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'],  ($pool['max_rec'] - $pool['clicks']), 'mid');
+               $pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'], ($pool['max_rec'] - $pool['clicks']), 'mid');
 
                // Prepare data for the row template
                $content['timestamp'] = generateDateTime($pool['timestamp'], 0);
@@ -105,14 +112,14 @@ if (!SQL_HASZERONUMS($result)) {
                $content = merge_array($content, $pool);
 
                // Load row template and switch colors
-               $OUT .= loadTemplate('admin_email_archiv_row', true, $content);
+               $OUT .= loadTemplate('admin_email_archiv_row', TRUE, $content);
        } // END - while
 
        // Remmber generated rows in array
        $content['rows'] = $OUT;
 
        // Load main template
-       loadTemplate('admin_email_archiv', false, $content);
+       loadTemplate('admin_email_archiv', FALSE, $content);
 } else {
        // No mail orders fond
        displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');