X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=a35844f01ca28903a527db5e43ddadf31e238588;hb=5d89789720c77e954b2eba28c00ec710dd28900d;hp=22ca7fb20afb36c6be8a91286566656502f3e4a0;hpb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;p=mailer.git

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 22ca7fb20a..a35844f01c 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -14,8 +14,6 @@
  * $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, 2010 by Mailer Developer Team                    *
@@ -50,10 +48,10 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Normal mails ordered by your members
 $sql = "SELECT
@@ -65,36 +63,43 @@ WHERE
 ORDER BY
 	`timestamp` DESC";
 
-$WHO = getMessage('_ALL');
+$WHO = '';
 $SQL2 = '';
 
-if (isGetRequestParameterSet(('mid'))) {
+if (isGetRequestParameterSet('mid')) {
 	// Only a specific mail shall be displayed
-	$sql = "SELECT
+	$sql = sprintf("SELECT
 	`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
-	`id`='".bigintval(getRequestParameter('mid'))."'
-LIMIT 1";
-	$WHO = getMessage('MAIL_ID') . ': ' . getRequestParameter('mid');
+	`id`=%s
+LIMIT 1",
+		bigintval(getRequestParameter('mid'))
+	);
+	$WHO = '{--MAIL_ID--}' . ': ' . getRequestParameter('mid');
 } elseif (isGetRequestParameterSet('userid')) {
 	// All mails by a specific member shall be displayed
-	$sql = "SELECT
+	$sql = sprintf("SELECT
 	`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
-	`sender`='".bigintval(getRequestParameter('userid'))."'
+	`sender`=%s
 ORDER BY
-	`timestamp` DESC";
-	$WHO = getMessage('USER_ID') . ': ' . getRequestParameter('userid');
+	`timestamp` DESC",
+		bigintval(getRequestParameter('userid'))
+	);
+	$WHO = '{--USER_ID--}' . ': ' . getRequestParameter('userid');
 }
 
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+// Init result_bonus
+$result_bonus = false;
+
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
 	// Check for maximum pages
 	$result_bonus = SQL_QUERY("SELECT
-	`id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`
+	`id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`,
 	(`mails_sent` - `clicks`) AS `unconfirmed`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
@@ -121,7 +126,7 @@ if (!isGetRequestParameterSet('offset')) {
 } // END - if
 
 // Add limitation to SQL string
-if (!isGetRequestParameterSet(('mid'))) {
+if (!isGetRequestParameterSet('mid')) {
 	// Create limitation line
 	$add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
 
@@ -134,19 +139,19 @@ if (!isGetRequestParameterSet(('mid'))) {
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
-if ((!empty($SQL2)) && ($WHO == getMessage('_ALL'))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+if ((!empty($SQL2)) && (empty($WHO))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 // Calculate pages
-$PAGES = '0';
+$numPages = '0';
 if (isConfigEntrySet('mails_page')) {
-	$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
+	$numPages = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
 } // END - if
 
 // Free result
 SQL_FREERESULT($result_normal);
 
 $MAIL = false;
-if (SQL_NUMROWS($result_list) > 0) {
+if (!SQL_HASZERONUMS($result_list)) {
 	// Init rows
 	$OUT = '';
 
@@ -176,8 +181,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 	SQL_FREERESULT($result_list);
 
 	// Add navigation (with change box and colspan=3)
-	$content['nav'] = '';
-	if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+	$content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
 
 	// Prepare content
 	$content['rows'] = $OUT;
@@ -187,17 +191,17 @@ if (SQL_NUMROWS($result_list) > 0) {
 	loadTemplate('admin_list_emails', false, $content);
 
 	$MAIL = true;
-	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')) && (empty($WHO))) {
+		// Only check if bonus extension is active
+		if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
 	} // END - if
-}
+} // END - if
 
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
 	// Load bonus mails only when extension is active
-	if (SQL_NUMROWS($result_bonus) > 0) {
+	if (!SQL_HASZERONUMS($result_bonus)) {
 		// Calculate pages
-		$PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
+		$numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
 
 		// List emails
 		$OUT = '';
@@ -213,8 +217,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 		} // END - while
 
 		// Add navigation (without change box but with colspan=3)
-		$content['nav'] = '';
-		if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+		$content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
 
 		// Prepare content
 		$content['rows'] = $OUT;
@@ -227,7 +230,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 
 if ($MAIL === false) {
 	// No mail orders fond
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 } // END - if
 
 // [EOF]