X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffix_filters.php;h=2e05a953827b98379f2e4c8981c1db6253698090;hb=ec3907de5b6c1ca85da82232707c85d22e197c11;hp=d3d0b82354910ae325a679364d9225955da5ff4a;hpb=a18efdcd57ba91893f0958a457b5c58639b135c3;p=mailer.git

diff --git a/inc/fix_filters.php b/inc/fix_filters.php
index d3d0b82354..2e05a95382 100644
--- a/inc/fix_filters.php
+++ b/inc/fix_filters.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Get all filters
-$result = SQL_QUERY('SELECT
+$result = sqlQuery('SELECT
 	`filter_name`,
 	`filter_function`
 FROM
@@ -50,14 +50,14 @@ ORDER BY
 	`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 INDEX `name_function` (`filter_name`,`filter_function`)');
+addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` ADD UNIQUE INDEX `name_function` (`filter_name`, `filter_function`)');
 
 // [EOF]
 ?>