X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=8a1a30c8c9584bc5d0f8c652f70b6e3190f1fa7e;hb=b6cf467cb0598f96529e46a9de5377f8218ff0dd;hp=a71abbac3a4310215734e548f823e6821402a4b8;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index a71abbac3a..8a1a30c8c9 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 10/29/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 10/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-email_details.php                           *
@@ -82,7 +82,7 @@ ORDER by timestamp DESC";
 	$WHO = getMessage('USER_ID').": ".getRequestElement('userid');
 }
 
-if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
+if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 	// Bonus mails sent by you
 	//               0     1       2        3        4      5       6          7       8      9         10          11        12
 	$SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
@@ -98,7 +98,7 @@ ORDER BY timestamp DESC";
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestElementSet('page')) setRequestGetElement('page', '1');
+if (!isGetRequestElementSet('page')) setRequestGetElement('page', 1);
 
 if (!isGetRequestElementSet('offset')) {
 	if (isConfigEntrySet('mails_page')) {
@@ -124,10 +124,10 @@ if (!isGetRequestElementSet(('mid'))) {
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
-if ((!empty($SQL2)) && ($WHO == _ALL)) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+if ((!empty($SQL2)) && ($WHO == getMessage('_ALL'))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 // Calculate pages
-$PAGES = 0;
+$PAGES = '0';
 if (isConfigEntrySet('mails_page')) {
 	$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
 } // END - if
@@ -143,7 +143,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 	// Walk through all entries
 	while ($pool = SQL_FETCHARRAY($result_list)) {
 		// Unconfirmed mails and sent mails
-		$result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE pool_id=%s LIMIT 1",
+		$result_uncon = 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($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
 		SQL_FREERESULT($result_uncon);
@@ -152,10 +152,10 @@ if (SQL_NUMROWS($result_list) > 0) {
 		$pool['unconfirmed'] = $pool['sent_email'] - $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>";
+			$pool['unconfirmed'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=" . $pool['id'] . "%}\">" . $pool['unconfirmed'] . "</a></strong>";
 		} elseif ($pool['unconfirmed'] < 0) {
 			// Sometimes rarely displayed minus values will be "fixed" to zero
-			$pool['unconfirmed'] = 0;
+			$pool['unconfirmed'] = '0';
 		}
 
 		// Prepare content
@@ -163,10 +163,10 @@ if (SQL_NUMROWS($result_list) > 0) {
 		$content['sender_link'] = generateUserProfileLink($pool['sender']);
 		$content['payment']     = getPaymentTitlePrice($pool['payment_id']);
 		$content['category']    = getCategory($pool['cat_id']);
-		$content['receivers']   = str_replace(';', ", ", $pool['receivers']);
+		$content['receivers']   = convertReceivers($pool['receivers']);
 		$content['type']        = translatePoolType($pool['data_type']);
 		$content['frametester'] = generateFrametesterUrl($pool['url']);
-		$content['timestamp']   = generateDateTime($pool['timestamp'], '0');
+		$content['timestamp']   = generateDateTime($pool['timestamp'], 0);
 
 		// Load row template
 		$OUT .= loadTemplate('admin_list_emails_row', true, $content);
@@ -177,7 +177,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 
 	// Add navigation (with change box and colspan=3)
 	$content['nav'] = '';
-	if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, '3', true);
+	if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
 
 	// Prepare content
 	$content['rows'] = $OUT;
@@ -187,13 +187,13 @@ if (SQL_NUMROWS($result_list) > 0) {
 	loadTemplate('admin_list_emails', false, $content);
 
 	$MAIL = true;
-	if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
+	if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 		// Check only if bonus extension is active
 		if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
-	}
+	} // END - if
 }
 
-if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
+if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 	// Load bonus mails only when extension is active
 	if (SQL_NUMROWS($result_bonus) > 0) {
 		// Calculate pages
@@ -208,17 +208,17 @@ if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
 			// Add link?
 			if ($bonus['unconfirmed'] > 0) {
 				// Add link to list_unconfirmed what-file
-				$bonus['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
+				$bonus['unconfirmed'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=" . $bonus['id'] . "%}\">" . $bonus['unconfirmed'] . "</a></strong>";
 			} // END - if
 
 			// Prepare content
 			$content = $bonus;
 			$content['time']        = createFancyTime($content['time']);
 			$content['category']    = getCategory($content['cat_id']);
-			$content['receivers']   = str_replace(';', ", ", $content['receivers']);
+			$content['receivers']   = convertReceivers($content['receivers']);
 			$content['type']        = translatePoolType($content['data_type']);
 			$content['frametester'] = generateFrametesterUrl($content['url']);
-			$content['timestamp']   = generateDateTime($content['timestamp'], '0');
+			$content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
 			// Load row template
 			$OUT .= loadTemplate('admin_list_bonus_emails_row', true, $content);
@@ -226,7 +226,7 @@ if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
 
 		// Add navigation (without change box but with colspan=3)
 		$content['nav'] = '';
-		if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, '3', true);
+		if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
 
 		// Prepare content
 		$content['rows'] = $OUT;