X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=87e534fbc12397202916f9ba0218380d3fc40c68;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hp=d08304294ec56b80d9107e6d12a3ba0270130866;hpb=cf3765c38cf0a76f396aca291f71858936e92956;p=mailer.git

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index d08304294e..87e534fbc1 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -14,12 +14,10 @@
  * $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                    *
- * 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 *
@@ -35,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...
@@ -46,11 +41,21 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+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
@@ -62,27 +67,27 @@ 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', getConfig('mails_page'));
+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__);
 
 // 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 = '';
@@ -98,7 +103,7 @@ 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['timestamp'] = generateDateTime($pool['timestamp'], 0);
@@ -107,17 +112,17 @@ if (SQL_NUMROWS($result) > 0) {
 		$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
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+	displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // Free memory