Some cleanups/improvements

[mailer.git] / inc / fix_filters.php

diff --git a/inc/fix_filters.php b/inc/fix_filters.php
index cc3e0cc4d30285ec81be876f2cdde8215fb257b1..2e05a953827b98379f2e4c8981c1db6253698090 100644 (file)
--- a/inc/fix_filters.php
+++ b/inc/fix_filters.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 *
@@ -43,21 +41,23 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Get all filters
-$result = SQL_QUERY('SELECT
-       `filter_name`, `filter_function`
+$result = sqlQuery('SELECT
+       `filter_name`,
+       `filter_function`
 FROM
        `{?_MYSQL_PREFIX?}_filters`
 ORDER BY
-       `filter_name` ASC, `filter_function` ASC', __FILE__, __LINE__);
+       `filter_name` ASC,
+       `filter_function` ASC', __FILE__, __LINE__);
 
-// Do we have entries? (we should have!)
-if (!SQL_HASZERONUMS($result)) {
+// Are there entries? (there should be!)
+if (!ifSqlHasZeroNums($result)) {
        // Load row by row
-       while ($filter = SQL_FETCHARRAY($result)) {
+       while ($filter = sqlFetchArray($result)) {
                // Now search again for this filter and get it's total count
-               $count = countSumTotalData($filter['filter_name'], 'filters', 'filter_id', 'filter_name', true, sprintf(" AND `filter_function`='%s'", SQL_ESCAPE($filter['filter_function'])));
+               $count = countSumTotalData($filter['filter_name'], 'filters', 'filter_id', 'filter_name', TRUE, sprintf(" AND `filter_function`='%s'", sqlEscapeString($filter['filter_function'])));
 
-               // Do we have more than one entry?
+               // Is there more than one entry?
                if ($count > 1) {
                        // Then clean them up, except one
                        addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_filters` WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT %s",
@@ -70,11 +70,11 @@ if (!SQL_HASZERONUMS($result)) {
 } // END - if
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // Now insert our unqiue key
 addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` DROP KEY `name_function`');
-addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` ADD UNIQUE `name_function` (`filter_name` , `filter_function`)');
+addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` ADD UNIQUE INDEX `name_function` (`filter_name`, `filter_function`)');
 
 // [EOF]
 ?>