X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=acab810fad0fc551ae35a60835c6c9ca755bdf74;hp=418cfc8ab6cac7c39e643e6a04bca6c5334ae947;hb=c40a41ce0bf7793d417fb7684b9f061e6fc8cf7f;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 418cfc8ab6..acab810fad 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -14,10 +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 - 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 *
@@ -45,9 +44,9 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('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,70 +60,52 @@ 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', getMailsPage());
 
 // 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) / 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']    = '';
-	$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
-
-	$OUT = ''; $SW = 2;
-	// @TODO Rewrite to SQL_FETCHARRAY()
-	while ($pool = SQL_FETCHROW($result)) {
+	$content['top_email_nav']    = addEmailNavigation($numPages, getMailsPage(), true , 3, true);
+	$content['bottom_email_nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+
+	// List all entries
+	$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",
 			array(bigintval($pool['id'])), __FILE__, __LINE__);
-		list($sent, $clicks) = SQL_FETCHROW($result_mails);
+
+		// Load entries
+		$pool = merge_array($pool, SQL_FETCHARRAY($result_mails));
+
+		// Merge result
 		SQL_FREERESULT($result_mails);
 
 		// Unconfirmed mails
-		$unconfirmed = $sent - $clicks;
-		if ($unconfirmed > 0) {
-			// Add link to list_unconfirmed what-file
-			$unconfirmed = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$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'        => $sent,
-			'ruserids'    => convertReceivers($pool['receivers']),
-			'unconfirmed' => $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
@@ -134,7 +115,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'));
+	displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // Free memory