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

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

diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php
index f08dafe1c1180bf0862c041fa15e2782a2fd9a89..e72df0959f09c3b342d8ad7de36eab5003705039 100644 (file)
--- a/inc/modules/admin/what-repair_cats.php
+++ b/inc/modules/admin/what-repair_cats.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 - 2015 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 *
@@ -44,25 +44,26 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Go through all categories
-$result = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` GROUP BY `userid` ORDER BY `userid` ASC", __FILE__, __LINE__);
-if (!SQL_HASZERONUMS($result)) {
+$result = sqlQuery("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` GROUP BY `userid` ORDER BY `userid` ASC", __FILE__, __LINE__);
+
+if (!ifSqlHasZeroNumRows($result)) {
         // Nothing is removed for now... ;-)
-       $REMOVED = '0';
+       $removedRows = '0';
 
        // Check if found userid is also found in user_data table
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Is the account not there?
                if (!fetchUserData($content['userid'])) {
                        // Ok, we found something to remove
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s",
+                       sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s",
                                array(bigintval($content['userid'])), __FILE__, __LINE__);
-                       $REMOVED += SQL_AFFECTEDROWS();
+                       $removedRows += sqlAffectedRows();
                } // END - if
        } // END - while
 
-       if ($REMOVED > 0) {
+       if ($removedRows > 0) {
                // Entries repaired
-               $content = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $REMOVED);
+               $content = '{%message,ADMIN_REPAIR_ENTRIES_FIXED=' . $removedRows . '%}';
        } else {
                // Nothing repaired
                $content = '<div class="notice">{--ADMIN_REPAIR_NOTHING_FIXED--}</div>';
@@ -73,7 +74,7 @@ if (!SQL_HASZERONUMS($result)) {
 }
 
 // Load template
-loadTemplate('admin_settings_saved', false, $content);
+displayMessage($content);
 
 // [EOF]
 ?>