X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_notifications.php;h=5f5062bef04d2107c7fff15e5429a07d2ebdbdde;hb=7fb9bf8320c56b536a5cb7658f45823f013848f4;hp=f10a81ac98150f40be9dc229d31f379f7e821212;hpb=648afd5e9ca91e878a755fdb5438ac6103a4ac7e;p=mailer.git diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php index f10a81ac98..5f5062bef0 100644 --- a/inc/modules/admin/what-list_notifications.php +++ b/inc/modules/admin/what-list_notifications.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 * @@ -57,7 +55,7 @@ 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')); + loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus')); } // Create limitation line @@ -78,12 +76,12 @@ $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 $numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5); @@ -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, getMessage('ADMIN_NO_NOTIFICATIONS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NOTIFICATIONS--}'); } // [EOF]