X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffix_filters.php;h=f4f95a55d6450e9ab673afa8c9e46e11e65ce2c7;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hp=f18079a787b0b6d5923b9e21edb8f90f6d7c3d48;hpb=30ae22f62ae87c53a56baf0d134569ba91011111;p=mailer.git diff --git a/inc/fix_filters.php b/inc/fix_filters.php index f18079a787..f4f95a55d6 100644 --- 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 - 2012 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,20 +42,22 @@ if (!defined('__SECURITY')) { // Get all filters $result = SQL_QUERY('SELECT - `filter_name`, `filter_function` + `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!) +// Are there entries? (there should be!) if (!SQL_HASZERONUMS($result)) { // Load row by row while ($filter = SQL_FETCHARRAY($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'", $filter['filter_function'])); + $count = countSumTotalData($filter['filter_name'], 'filters', 'filter_id', 'filter_name', true, sprintf(" AND `filter_function`='%s'", SQL_ESCAPE($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", @@ -74,7 +74,7 @@ SQL_FREERESULT($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] ?>