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

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index cc64a19bff..efc103e29f 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                           *
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,98 +40,109 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
-
-//             0     1        2      3        4          5           6          7      8         9        10
-$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";
+addMenuDescription('admin', __FILE__);
+
+// Init SQL string
+$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";
 
 // Check for maximum pages
-$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
+$result_maximum = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!REQUEST_ISSET_GET('page'))   REQUEST_SET_GET('page'  , '1');
-if (!REQUEST_ISSET_GET('offset')) REQUEST_SET_GET('offset', getConfig('mails_page'));
+if (!isGetRequestElementSet('page'))   setRequestGetElement('page'  , 1);
+if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$sql .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('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
-$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.5);
-SQL_FREERESULT($result_normal);
+$pages = 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) {
 	// Mail orders are in pool so we can display them
 
 	// Add navigation table rows
-	if ($PAGES > 1) {
-		define('__TOP_EMAIL_NAV'   , ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), true , '3', true));
-		define('__BOTTOM_EMAIL_NAV', ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, '3', true));
-	} else {
-		define('__TOP_EMAIL_NAV'   , '');
-		define('__BOTTOM_EMAIL_NAV', '');
-	}
-
+	$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
+
+	// List all entries
 	$OUT = ''; $SW = 2;
-	while ($pool = SQL_FETCHROW($result)) {
+	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[0])), __FILE__, __LINE__);
-		list($sent, $clicks) = SQL_FETCHROW($result_mails);
+		$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
+		$pool = merge_array($pool, SQL_FETCHARRAY($result_mails));
+
+		// Merge result
 		SQL_FREERESULT($result_mails);
 
 		// Unconfirmed mails
-		$unconfirmed = $sent - $clicks;
-		if ($unconfirmed > 0) {
+		$pool['unconfirmed'] = $pool['max_rec'] - $pool['clicks'];
+		if ($pool['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>";
-		}
+			$pool['unconfirmed'] = '<strong><a href="{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=' . $pool['id'] . '">' . $pool['unconfirmed'] . '</a></strong>';
+		} // END - if
 
 		// Prepare data for the row template
 		$content = array(
 			'sw'          => $SW,
-			'u_link'      => generateUserProfileLink($pool[1]),
-			'subj'        => COMPILE_CODE($pool[2]),
-			'text'        => COMPILE_CODE($pool[3]),
-			'pay'         => getPaymentTitlePrice($pool[5]),
-			'cat'         => getCategory($pool[10]),
-			'sent'        => $sent,
-			'ruids'       => str_replace(';', ", ", $pool[4]),
-			'unconfirmed' => $unconfirmed,
-			'type'        => translatePoolType($pool[6]),
-			'tsend'       => $pool[9],
-			'frametester' => FRAMETESTER($pool[8]),
-			'url'         => COMPILE_CODE($pool[8]),
-			'stamp'       => generateDateTime($pool[7], '0'),
-			'mid'         => $pool[0],
+			'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'],
 		);
 
 		// Load row template and switch colors
-		$OUT .= LOAD_TEMPLATE("admin_email_archiv_row", true, $content);
+		$OUT .= loadTemplate('admin_email_archiv_row', true, $content);
 		$SW = 3 - $SW;
-	}
+	} // END - while
 
-	// Free memory
-	SQL_FREERESULT($result);
-	define('__EMAIL_ROWS', $OUT);
+	// Remmber generated rows in array
+	$content['rows'] = $OUT;
 
 	// Load main template
-	LOAD_TEMPLATE("admin_email_archiv");
+	loadTemplate('admin_email_archiv', false, $content);
 } else {
 	// No mail orders fond
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
 }
 
-//
+// Free memory
+SQL_FREERESULT($result);
+
+// [EOF]
 ?>