A lot has been rewritten, ext-teams added, ext-forced 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 978a0a71f63b693173847d4c1482611b5c90d27f..df2f81324e3da856b18fe65772680971faeb9bb9 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,21 +44,24 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
-// Check for maximum pages
-$result_maximum = SQL_QUERY("SELECT
-       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+// Init SQL
+$sql = "SELECT
+       `id`,`sender`,`subject`,`text`,`receivers`,`payment_id`,`data_type`,`timestamp`,`url`,`target_send`,`cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
        `data_type`='SEND' OR `data_type`='DELETED'
 ORDER BY
-       `timestamp` DESC", __FILE__, __LINE__);
+       `timestamp` DESC";
+
+// Check for maximum pages
+$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', getConfig('mails_page'));
+if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getMailsPage());
 
 // Add limitation to SQL string
 $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
@@ -69,23 +70,23 @@ $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page')
 $result = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Calculate pages
-$numPages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 0.5);
+$numPages = round(SQL_NUMROWS($result_maximum) / getMailsPage() + 0.5);
 
 // Free the result which we don't need
 SQL_FREERESULT($result_maximum);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // Mail orders are in pool so we can display them
 
        // Add navigation table rows
-       $content['top_email_nav']    = addEmailNavigation($numPages, getConfig('mails_page'), true , 3, true);
-       $content['bottom_email_nav'] = addEmailNavigation($numPages, getConfig('mails_page'), 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 = ''; $SW = 2;
+       $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
@@ -95,10 +96,9 @@ if (SQL_NUMROWS($result) > 0) {
                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['sw'] = $SW;
                $content['timestamp'] = generateDateTime($pool['timestamp'], 0);
 
                // Merge pool data with content
@@ -106,7 +106,6 @@ if (SQL_NUMROWS($result) > 0) {
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_email_archiv_row', true, $content);
-               $SW = 3 - $SW;
        } // END - while
 
        // Remmber generated rows in array
@@ -116,7 +115,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_email_archiv', false, $content);
 } else {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+       displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // Free memory