X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_notifications.php;h=d1c7db19efc4e55f83f251962421202f654b063e;hp=5509489086669858febdddb342415fe0d786fff7;hb=6f9f29d5caee60a2cceae33a7a53e1b4c7319a0c;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 5509489086..d1c7db19ef 100644
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,21 +41,21 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init variables
 $SQL2 = '';
 $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 (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
+if (!isGetRequestElementSet('offset')) setGetRequestElement('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`
+	`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
@@ -69,23 +67,23 @@ 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('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
 }
 
 // Create limitation line
-$add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
+$add = ' LIMIT ' . (bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))) . ', ' . bigintval(getRequestElement('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
-		$numPages = 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,7 +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'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
+		$content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
 
 		// Prepare content
 		$content['rows'] = $OUT;
@@ -111,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, '{--ADMIN_NO_NOTIFICATIONS--}');
+	displayMessage('{--ADMIN_NO_NOTIFICATIONS--}');
 }
 
 // [EOF]