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

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index a71abbac3a..1edcfd6c27 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/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,7 +124,7 @@ 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;
@@ -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);
@@ -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 />');
 	}
 }
 
-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
@@ -215,10 +215,10 @@ if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
 			$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;