Naming convention applied to language strings, new API function added:

[mailer.git] / inc / modules / admin / what-list_notifications.php

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 5509489086669858febdddb342415fe0d786fff7..8985288b32e4581358a6520bdaa74cfff87c3217 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -57,7 +57,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 +69,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 +78,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);