X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffix_filters.php;h=d3d0b82354910ae325a679364d9225955da5ff4a;hb=1232843002e4525cb72956fc899323625b1f7573;hp=7ff1292b6ce9b9309b8141231fe01a669388755d;hpb=de5910b8e5deb9285a7ac57c26ebd894f4e1afbf;p=mailer.git diff --git a/inc/fix_filters.php b/inc/fix_filters.php index 7ff1292b6c..d3d0b82354 100644 --- a/inc/fix_filters.php +++ b/inc/fix_filters.php @@ -14,11 +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 * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 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,18 +42,20 @@ 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!) -if (SQL_NUMROWS($result) > 0) { +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? if ($count > 1) { @@ -73,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] ?>