X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_notifications.php;h=a5283734b975cc2ab929e1d0c863b3787e9ca9b9;hb=3e3d42e0bfae0d293a27aabe15d20489dd592964;hp=07d001c71e11a62b517db514682e1ba4c8fff267;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 07d001c71e..a5283734b9 100644
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -55,62 +55,53 @@ if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getCon
 
 if (isExtensionActive('bonus')) {
 	// 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
-FROM `{?_MYSQL_PREFIX?}_bonus`
-WHERE is_notify='Y'
-ORDER BY timestamp DESC";
+	$SQL2 = "SELECT
+	`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`
+WHERE
+	`is_notify`='Y'
+ORDER BY
+	`timestamp` DESC";
 
 	// Check for maximum pages
 	$result_max = SQL_QUERY($SQL2, __FILE__, __LINE__);
 } else {
 	// Bonus extension required!
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', 'bonus'));
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'bonus'));
 }
 
 // Create limitation line
-$add = " LIMIT ".(bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))).", ".bigintval(getRequestParameter('offset'));
+$add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
 
 // Add limitation
 if (!empty($SQL2)) $SQL2 .= $add;
 
-if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2))) {
+if ((isExtensionActive('bonus')) && (!SQL_HASZERONUMS($result_max)) && (!empty($SQL2))) {
 	// Run SQL query for notification mails
 	$result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 	// 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 = ''; $content = array();
-		while ($bonus = SQL_FETCHARRAY($result_bonus)) {
-			// Calculate unconfirmed emails
-			$bonus['unconfirmed'] = $bonus['mails_sent'] - $bonus['clicks'];
-
-			// 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>";
-			} // END - if
+		while ($content = SQL_FETCHARRAY($result_bonus)) {
+			// Add "unconfirmed-link"
+			$content['unconfirmed_content'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed']);
 
 			// Prepare content
-			$content = $bonus;
-			$content['time']        = createFancyTime($content['time']);
-			$content['category']    = getCategory($content['cat_id']);
-			$content['receivers']   = convertReceivers($content['receivers']);
-			$content['type']        = translatePoolType($content['data_type']);
-			$content['frametester'] = generateFrametesterUrl($content['url']);
 			$content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
 			// Load row template
 			$OUT .= loadTemplate('admin_list_notify_emails_row', true, $content);
-		}
+		} // END - if
 
 		// 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;
@@ -120,7 +111,7 @@ if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($S
 	}
 } elseif ((SQL_NUMROWS($result_max) === 0) && (is_resource($result_max))) {
 	// No notifications found
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_NOTIFICATIONS'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NOTIFICATIONS--}');
 }
 
 // [EOF]