Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[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 c3fc6ae4868020754c0f09de0d136c074b334d3b..40e4f6fd8244b50a36c6ca0c1675b6efcd06dc32 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -64,7 +64,7 @@ ORDER BY
        `timestamp` DESC";
 
        // Check for maximum pages
-       $result_max = SQL_QUERY($SQL2, __FILE__, __LINE__);
+       $result_max = sqlQuery($SQL2, __FILE__, __LINE__);
 } else {
        // Bonus extension required!
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
@@ -76,18 +76,18 @@ $add = ' LIMIT ' . (bigintval(getRequestElement('offset')) * bigintval(getReques
 // Add limitation
 if (!empty($SQL2)) $SQL2 .= $add;
 
-if ((isExtensionActive('bonus')) && (!SQL_HASZERONUMS($result_max)) && (!empty($SQL2))) {
+if ((isExtensionActive('bonus')) && (!ifSqlHasZeroNumRows($result_max)) && (!empty($SQL2))) {
        // Run SQL query for notification mails
-       $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+       $result_bonus = sqlQuery($SQL2, __FILE__, __LINE__);
 
        // Load bonus mails only when extension is active
-       if (!SQL_HASZERONUMS($result_bonus)) {
+       if (!ifSqlHasZeroNumRows($result_bonus)) {
                // Calculate pages
-               $numPages = round(SQL_NUMROWS($result_bonus) / getMailsPage() + 0.5);
+               $numPages = round(sqlNumRows($result_bonus) / getMailsPage() + 0.5);
 
                // List emails
                $OUT = ''; $content = array();
-               while ($content = SQL_FETCHARRAY($result_bonus)) {
+               while ($content = sqlFetchArray($result_bonus)) {
                        // Add "unconfirmed-link"
                        $content['unconfirmed_content'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed'], 'bonus');
 
@@ -107,7 +107,7 @@ if ((isExtensionActive('bonus')) && (!SQL_HASZERONUMS($result_max)) && (!empty($
                // Load main template
                loadTemplate('admin_list_notify_emails', FALSE, $content);
        }
-} elseif ((SQL_NUMROWS($result_max) === 0) && (is_resource($result_max))) {
+} elseif ((sqlNumRows($result_max) === 0) && (is_resource($result_max))) {
        // No notifications found
        displayMessage('{--ADMIN_NO_NOTIFICATIONS--}');
 }