X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_notifications.php;h=73ef864cd12e5a39df68ebfaf40ed832b770a9f9;hb=101e5f161c0c367c022c9288398226a57f3919d7;hp=625df8f4d9540a6c9d8c636bd6cdd98f3987bdb2;hpb=4bd3e0bc483e982bc2e000337372a0e3fd4ca212;p=mailer.git

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 625df8f4d9..73ef864cd1 100644
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init variables
 $SQL2 = '';
@@ -51,13 +49,13 @@ $result_max = false;
 
 // Set offset an current page to default values
 if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
-if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('mails_page'));
+if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getMailsPage());
 
 if (isExtensionActive('bonus')) {
 	// Bonus mails sent by you
 	$SQL2 = "SELECT
 	`id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`,
-	`mails_sent`, `clicks`, (`mails_sent` - `clicks) AS `unconfirmed`
+	`mails_sent`, `clicks`, (`mails_sent` - `clicks`) AS `unconfirmed`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
@@ -69,7 +67,7 @@ ORDER BY
 	$result_max = SQL_QUERY($SQL2, __FILE__, __LINE__);
 } else {
 	// Bonus extension required!
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'bonus'));
+	displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
 }
 
 // Create limitation line
@@ -78,14 +76,14 @@ $add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequ
 // 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) / getMailsPage() + 0.5);
 
 		// List emails
 		$OUT = ''; $content = array();
@@ -101,8 +99,7 @@ if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($S
 		} // 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, getMailsPage(), false, 3, true);
 
 		// Prepare content
 		$content['rows'] = $OUT;
@@ -112,7 +109,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'));
+	displayMessage('{--ADMIN_NO_NOTIFICATIONS--}');
 }
 
 // [EOF]