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

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

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index ea6351415fc91d0cc28488230af9b3f7a07cf4ab..6eee1eddf6e93996b89532899bfbb5c77fb54678 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -53,7 +53,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'd
                array($adminLogin), __FUNCTION__, __LINE__);
 
        // Is the entry there?
-       if (ifSqlHasZeroNums($result)) {
+       if (ifSqlHasZeroNumRows($result)) {
                // Is ext-admins installed and version at least 0.3.0?
                if (isExtensionInstalledAndNewer('admins', '0.3.0')) {
                        // Ok, let's create the admin login
@@ -282,7 +282,7 @@ ORDER BY
        `id` DESC", __FUNCTION__, __LINE__);
 
        // Are there entries?
-       if (!ifSqlHasZeroNums($result_main)) {
+       if (!ifSqlHasZeroNumRows($result_main)) {
                $OUT .= '<ul class="admin_menu_main">';
 
                // Load all 'action' menus
@@ -365,7 +365,7 @@ ORDER BY
                array($mainContent['main_action']), __FUNCTION__, __LINE__);
 
        // Remember the count for later checks
-       setAdminMenuHasEntries($mainContent['main_action'], ((!ifSqlHasZeroNums($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+       setAdminMenuHasEntries($mainContent['main_action'], ((!ifSqlHasZeroNumRows($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
 
        // Start li-tag for sub menu content
        $OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
@@ -376,7 +376,7 @@ ORDER BY
                $SUB = TRUE;
 
                // Are there entries?
-               if (!ifSqlHasZeroNums($result_what)) {
+               if (!ifSqlHasZeroNumRows($result_what)) {
                        // Start HTML code
                        $OUT .= '<ul class="admin_menu_sub">';
 
@@ -543,7 +543,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 
        $result = sqlQueryEscaped("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
                array($mode), __FUNCTION__, __LINE__);
-       if (!ifSqlHasZeroNums($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // Load menu as selection
                $OUT = '<select name="' . $mode . '_menu';
                if (!isValidId($defid)) $OUT .= '[' . intval($defid) . ']';
@@ -1152,7 +1152,7 @@ function sendAdminPasswordResetLink ($email) {
                array($email), __FUNCTION__, __LINE__);
 
        // Is there an account?
-       if (ifSqlHasZeroNums($result)) {
+       if (ifSqlHasZeroNumRows($result)) {
                // No account found
                return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
        } // END - if