Revert "filters: support matching on multiple feeds/categories"

[tt-rss.git] / classes / pref / filters.php

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 427ce79a1571ee88b13ffee6a55851325c5d94e6..e5abf46277990380437cae7f479106adbcb16c95 100755 (executable)
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -44,8 +44,6 @@ class Pref_Filters extends Handler_Protected {
        }
 
        function testFilterDo() {
-               require_once "include/rssfuncs.php";
-
                $offset = (int) db_escape_string($_REQUEST["offset"]);
                $limit = (int) db_escape_string($_REQUEST["limit"]);
 
@@ -129,8 +127,8 @@ class Pref_Filters extends Handler_Protected {
 
                        while ($line = db_fetch_assoc($result)) {
 
-                               $rc = get_article_filters(array($filter), $line['title'], $line['content'], $line['link'],
-                                       false, $line['author'], explode(",", $line['tag_cache']));
+                               $rc = RSSUtils::get_article_filters(array($filter), $line['title'], $line['content'], $line['link'],
+                                       $line['author'], explode(",", $line['tag_cache']));
 
                                if (count($rc) > 0) {
 
@@ -142,14 +140,16 @@ class Pref_Filters extends Handler_Protected {
 
                                        $content_preview = $line["content_preview"];
 
-                                       $tmp = "<tr style='margin-top : 5px'><td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
-                                               checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
+                                       $tmp = "<tr style='margin-top : 5px'>";
+
+                                       #$tmp .= "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
+                                       #       checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
 
                                        $id = $line['id'];
                                        $tmp .= "<td width='5%' align='center'><img style='cursor : pointer' title='".__("Preview article")."'
                                                src='images/information.png' onclick='openArticlePopup($id)'></td><td>";
 
-                                       foreach ($filter['rules'] as $rule) {
+                                       /*foreach ($filter['rules'] as $rule) {
                                                $reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
 
                                                $line["title"] = preg_replace("/($reg_exp)/i",
@@ -157,7 +157,7 @@ class Pref_Filters extends Handler_Protected {
 
                                                $content_preview = preg_replace("/($reg_exp)/i",
                                                        "<span class=\"highlight\">$1</span>", $content_preview);
-                                       }
+                                       }*/
 
                                        $tmp .= "<strong>" . $line["title"] . "</strong><br/>";
                                        $tmp .= $line['feed_title'] . ", " . mb_substr($line["date_entered"], 0, 16);
@@ -214,23 +214,24 @@ class Pref_Filters extends Handler_Protected {
                        FROM
                                ttrss_filters2_rules, ttrss_filter_types
                        WHERE
-                               filter_id = '$filter_id' AND filter_type = ttrss_filter_types.id");
+                               filter_id = '$filter_id' AND filter_type = ttrss_filter_types.id
+                       ORDER BY reg_exp");
 
                $rv = "";
 
                while ($line = $this->dbh->fetch_assoc($result)) {
 
                        $where = sql_bool_to_bool($line["cat_filter"]) ?
-                               getCategoryTitle($line["cat_id"]) :
+                               Feeds::getCategoryTitle($line["cat_id"]) :
                                ($line["feed_id"] ?
-                                       getFeedTitle($line["feed_id"]) : __("All feeds"));
+                                       Feeds::getFeedTitle($line["feed_id"]) : __("All feeds"));
 
 #                      $where = $line["cat_id"] . "/" . $line["feed_id"];
 
                        $inverse = sql_bool_to_bool($line["inverse"]) ? "inverse" : "";
 
                        $rv .= "<span class='$inverse'>" . T_sprintf("%s on %s in %s %s",
-                               strip_tags($line["reg_exp"]),
+                               htmlspecialchars($line["reg_exp"]),
                                $line["field"],
                                $where,
                                sql_bool_to_bool($line["inverse"]) ? __("(inverse)") : "") . "</span>";
@@ -337,10 +338,10 @@ class Pref_Filters extends Handler_Protected {
 
                print "<form id=\"filter_edit_form\" onsubmit='return false'>";
 
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$filter_id\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"editSave\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"csrf_token\" value=\"".$_SESSION['csrf_token']."\">";
+               print_hidden("op", "pref-filters");
+               print_hidden("id", "$filter_id");
+               print_hidden("method", "editSave");
+               print_hidden("csrf_token", $_SESSION['csrf_token']);
 
                print "<div class=\"dlgSec\">".__("Caption")."</div>";
 
@@ -494,12 +495,12 @@ class Pref_Filters extends Handler_Protected {
 
                if (strpos($feed_id, "CAT:") === 0) {
                        $feed_id = (int) substr($feed_id, 4);
-                       $feed = getCategoryTitle($feed_id);
+                       $feed = Feeds::getCategoryTitle($feed_id);
                } else {
                        $feed_id = (int) $feed_id;
 
                        if ($rule["feed_id"])
-                               $feed = getFeedTitle((int)$rule["feed_id"]);
+                               $feed = Feeds::getFeedTitle((int)$rule["feed_id"]);
                        else
                                $feed = __("All feeds");
                }
@@ -511,7 +512,7 @@ class Pref_Filters extends Handler_Protected {
                $inverse = isset($rule["inverse"]) ? "inverse" : "";
 
                return "<span class='filterRule $inverse'>" .
-                       T_sprintf("%s on %s in %s %s", strip_tags($rule["reg_exp"]),
+                       T_sprintf("%s on %s in %s %s", htmlspecialchars($rule["reg_exp"]),
                        $filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "") . "</span>";
        }
 
@@ -616,7 +617,7 @@ class Pref_Filters extends Handler_Protected {
                        foreach ($rules as $rule) {
                                if ($rule) {
 
-                                       $reg_exp = strip_tags($this->dbh->escape_string(trim($rule["reg_exp"])));
+                                       $reg_exp = $this->dbh->escape_string(trim($rule["reg_exp"]), false);
                                        $inverse = isset($rule["inverse"]) ? "true" : "false";
 
                                        $filter_type = (int) $this->dbh->escape_string(trim($rule["filter_type"]));
@@ -813,9 +814,9 @@ class Pref_Filters extends Handler_Protected {
 
                print "<form name='filter_new_form' id='filter_new_form'>";
 
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"add\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"csrf_token\" value=\"".$_SESSION['csrf_token']."\">";
+               print_hidden("op", "pref-filters");
+               print_hidden("method", "add");
+               print_hidden("csrf_token", $_SESSION['csrf_token']);
 
                print "<div class=\"dlgSec\">".__("Caption")."</div>";
 
@@ -1093,7 +1094,7 @@ class Pref_Filters extends Handler_Protected {
 
                if (!$title) $title = __("[No caption]");
 
-               $title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", $num_rules), $title, $num_rules);
+               $title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", (int) $num_rules), $title, $num_rules);
 
 
                $result = $this->dbh->query(
@@ -1111,7 +1112,7 @@ class Pref_Filters extends Handler_Protected {
                if ($match_any_rule) $title .= " (" . __("matches any rule") . ")";
 
                if ($num_actions > 0)
-                       $actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", $num_actions), $actions, $num_actions);
+                       $actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
 
                return array($title, $actions);
        }
@@ -1189,5 +1190,4 @@ class Pref_Filters extends Handler_Protected {
 
                $this->dbh->query("COMMIT");
        }
-}
-?>
+}
\ No newline at end of file