X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=e5f66afc1197cd734ce1e08ef2dce39521eef342;hb=98b92ea5ba992a63304091fa1b57f477befffc22;hp=efc103e29f6d633eb8e158e60607f883a89b1637;hpb=d6c3ea5b9bcab66b9a7f29efb48e4118b126472e;p=mailer.git

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index efc103e29f..e5f66afc11 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,7 +48,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-// Init SQL string
+// Init SQL
 $sql = "SELECT
 	`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
@@ -61,34 +62,30 @@ ORDER BY
 $result_maximum = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestElementSet('page'))   setRequestGetElement('page'  , 1);
-if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', getConfig('mails_page'));
+if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
+if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
+$sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
 
 // Run SQL query for normal mails
 $result = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Calculate pages
-$pages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 0.5);
+$numPages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 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']    = '';
-	$content['bottom_email_nav'] = '';
-	if ($pages > 1) {
-		$content['top_email_nav']    = addEmailNavigation($pages, getConfig('mails_page'), true , 3, true);
-		$content['bottom_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), false, 3, true);
-	} // END - if
+	$content['top_email_nav']    = addEmailNavigation($numPages, getConfig('mails_page'), true , 3, true);
+	$content['bottom_email_nav'] = addEmailNavigation($numPages, getConfig('mails_page'), 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",
@@ -101,34 +98,16 @@ if (SQL_NUMROWS($result) > 0) {
 		SQL_FREERESULT($result_mails);
 
 		// Unconfirmed mails
-		$pool['unconfirmed'] = $pool['max_rec'] - $pool['clicks'];
-		if ($pool['unconfirmed'] > 0) {
-			// Add link to list_unconfirmed what-file
-			$pool['unconfirmed'] = '<strong><a href="{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=' . $pool['id'] . '">' . $pool['unconfirmed'] . '</a></strong>';
-		} // END - if
+		$pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'],  ($pool['max_rec'] - $pool['clicks']), 'mid');
 
 		// Prepare data for the row template
-		$content = array(
-			'sw'          => $SW,
-			'u_link'      => generateUserProfileLink($pool['sender']),
-			'subject'     => $pool['subject'],
-			'text'        => $pool['text'],
-			'pay'         => getPaymentTitlePrice($pool['payment_id']),
-			'cat'         => getCategory($pool['cat_id']),
-			'sent'        => $pool['max_rec'],
-			'ruserids'    => convertReceivers($pool['receivers']),
-			'unconfirmed' => $pool['unconfirmed'],
-			'type'        => translatePoolType($pool['data_type']),
-			'target_send' => $pool['target_send'],
-			'frametester' => generateFrametesterUrl($pool['url']),
-			'url'         => $pool['url'],
-			'timestamp'   => generateDateTime($pool['timestamp'], 0),
-			'mid'         => $pool['id'],
-		);
+		$content['timestamp'] = generateDateTime($pool['timestamp'], 0);
+
+		// Merge pool data with content
+		$content = merge_array($content, $pool);
 
 		// Load row template and switch colors
 		$OUT .= loadTemplate('admin_email_archiv_row', true, $content);
-		$SW = 3 - $SW;
 	} // END - while
 
 	// Remmber generated rows in array
@@ -138,7 +117,7 @@ if (SQL_NUMROWS($result) > 0) {
 	loadTemplate('admin_email_archiv', false, $content);
 } else {
 	// No mail orders fond
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // Free memory