X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=895a8d8d2aa223810436046a343bc48c11ae8fa5;hb=754861aaacc51a871b8b91f382c3e0b57726f692;hp=8456d5e1ef705478e77e808d7887b2c2265e9127;hpb=d49fe31440f5946f23cd2b4044c6e0256640dde4;p=mailer.git

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 8456d5e1ef..895a8d8d2a 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 04/03/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 04/03/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-email_archiv .php                           *
@@ -14,11 +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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 *
@@ -34,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...
@@ -45,11 +41,21 @@ 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`
+	`id`,
+	`sender`,
+	`subject`,
+	`text`,
+	`receivers`,
+	`payment_id`,
+	`data_type`,
+	`timestamp`,
+	`url`,
+	`target_send`,
+	`cat_id`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -58,87 +64,69 @@ ORDER BY
 	`timestamp` DESC";
 
 // Check for maximum pages
-$result_maximum = SQL_QUERY($sql, __FILE__, __LINE__);
+$result_maximum = sqlQuery($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 (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
+if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getMailsPage());
 
 // Add limitation to SQL string
-$sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')).", ".getRequestElement('offset');
+$sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
 
 // Run SQL query for normal mails
-$result = SQL_QUERY($sql, __FILE__, __LINE__);
+$result = sqlQuery($sql, __FILE__, __LINE__);
 
 // Calculate pages
-$pages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 0.5);
+$numPages = round(sqlNumRows($result_maximum) / getMailsPage() + 0.5);
 
 // Free the result which we don't need
-SQL_FREERESULT($result_maximum);
+sqlFreeResult($result_maximum);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!ifSqlHasZeroNums($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 = sqlFetchArray($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[0])), __FILE__, __LINE__);
-		list($sent, $clicks) = SQL_FETCHROW($result_mails);
-		SQL_FREERESULT($result_mails);
+		$result_mails = sqlQueryEscaped("SELECT `max_rec`, `clicks` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+			array(bigintval($pool['id'])), __FILE__, __LINE__);
+
+		// Load entries
+		$pool = merge_array($pool, sqlFetchArray($result_mails));
+
+		// Merge result
+		sqlFreeResult($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[0]."\">".$unconfirmed."</a></strong>";
-		} // END - if
+		$pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'], ($pool['max_rec'] - $pool['clicks']), 'normal');
 
 		// Prepare data for the row template
-		$row = array(
-			'sw'          => $SW,
-			'u_link'      => generateUserProfileLink($pool[1]),
-			'subject'     => $pool[2],
-			'text'        => $pool[3],
-			'pay'         => getPaymentTitlePrice($pool[5]),
-			'cat'         => getCategory($pool[10]),
-			'sent'        => $sent,
-			'ruserids'    => str_replace(';', ", ", $pool[4]),
-			'unconfirmed' => $unconfirmed,
-			'type'        => translatePoolType($pool[6]),
-			'target_send' => $pool[9],
-			'frametester' => generateFrametesterUrl($pool[8]),
-			'url'         => $pool[8],
-			'stamp'       => generateDateTime($pool[7], '0'),
-			'mid'         => $pool[0],
-		);
+		$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, $row);
-		$SW = 3 - $SW;
+		$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, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+	displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // Free memory
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // [EOF]
 ?>