Tried to fix installer a bit + added missing language string.

[mailer.git] / inc / fix_filters.php

diff --git a/inc/fix_filters.php b/inc/fix_filters.php
index 9b87c77513b9cfc1cff7a3ed793c4a41a4fbca70..3e71feb7f18cf9d9d47e923e339763b67327a58e 100644 (file)
--- a/inc/fix_filters.php
+++ b/inc/fix_filters.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Repariert doppelte Eintraege in filters-Tabelle  *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 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 *
@@ -41,7 +36,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Get all filters
-$result = SQL_QUERY('SELECT
+$result = sqlQuery('SELECT
        `filter_name`,
        `filter_function`
 FROM
@@ -51,11 +46,11 @@ ORDER BY
        `filter_function` ASC', __FILE__, __LINE__);
 
 // Are there entries? (there should be!)
-if (!SQL_HASZERONUMS($result)) {
+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'])));
 
                // Is there more than one entry?
                if ($count > 1) {
@@ -70,7 +65,7 @@ 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`');