return;
}
+ function testFilterDo() {
+ require_once "include/rssfuncs.php";
+
+ $offset = (int) db_escape_string($_REQUEST["offset"]);
- function testFilter() {
$filter = array();
$filter["enabled"] = true;
checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["inverse"])));
$filter["rules"] = array();
+ $filter["actions"] = array("dummy-action");
$result = $this->dbh->query("SELECT id,name FROM ttrss_filter_types");
$filter_types[$line["id"]] = $line["name"];
}
+ $scope_qparts = array();
+
$rctr = 0;
foreach ($_REQUEST["rule"] AS $r) {
$rule = json_decode($r, true);
unset($rule["feed_id"]);
}
+ if (isset($rule["feed_id"]) && $rule['feed_id'] > 0) {
+ array_push($scope_qparts, "feed_id = " . $rule["feed_id"]);
+ } else if (isset($rule["cat_id"])) {
+ array_push($scope_qparts, "cat_id = " . $rule["cat_id"]);
+ } else {
+ array_push($scope_qparts, "true");
+ }
+
array_push($filter["rules"], $rule);
++$rctr;
}
}
- $qfh_ret = queryFeedHeadlines(-4, 30, "", false, false, false,
- "date_entered DESC", 0, $_SESSION["uid"], $filter);
+ $glue = $filter['match_any_rule'] ? " OR " : " AND ";
+ $scope_qpart = join($glue, $scope_qparts);
- $result = $qfh_ret[0];
+ if (!$scope_qpart) $scope_qpart = "true";
- $articles = array();
- $found = 0;
+ $rv = array();
- print __("Articles matching this filter:");
+ //while ($found < $limit && $offset < $limit * 1000 && time() - $started < ini_get("max_execution_time") * 0.7) {
- print "<div class=\"filterTestHolder\">";
- print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
+ $result = db_query("SELECT ttrss_entries.id,
+ ttrss_entries.title,
+ ttrss_feeds.id AS feed_id,
+ ttrss_feeds.title AS feed_title,
+ ttrss_feed_categories.id AS cat_id,
+ content,
+ link,
+ author,
+ tag_cache
+ FROM
+ ttrss_entries, ttrss_user_entries
+ LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)
+ LEFT JOIN ttrss_feed_categories ON (ttrss_feeds.cat_id = ttrss_feed_categories.id)
+ WHERE
+ ref_id = ttrss_entries.id AND
+ ($scope_qpart) AND
+ ttrss_user_entries.owner_uid = " . $_SESSION["uid"] . "
+ ORDER BY date_entered DESC LIMIT 30 OFFSET $offset");
- while ($line = $this->dbh->fetch_assoc($result)) {
- $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+ while ($line = db_fetch_assoc($result)) {
- foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
- $line = $p->hook_query_headlines($line, 100);
- }
+ $rc = get_article_filters(array($filter), $line['title'], $line['content'], $line['link'],
+ false, $line['author'], explode(",", $line['tag_cache']));
- $entry_timestamp = strtotime($line["updated"]);
- $entry_tags = get_article_tags($line["id"], $_SESSION["uid"]);
+ if (count($rc) > 0) {
- $content_preview = $line["content_preview"];
+ $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
- if ($line["feed_title"])
- $feed_title = $line["feed_title"];
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+ $line = $p->hook_query_headlines($line, 100);
+ }
- print "<tr>";
+ $content_preview = $line["content_preview"];
- print "<td width='5%' align='center'><input
- dojoType=\"dijit.form.CheckBox\" checked=\"1\"
- disabled=\"1\" type=\"checkbox\"></td>";
- print "<td>";
+ if ($line["feed_title"]) $feed_title = "(" . $line["feed_title"] . ")";
- print $line["title"];
- print " (";
- print "<b>" . $feed_title . "</b>";
- print "): ";
- print "<span class=\"insensitive\">" . $content_preview . "</span>";
- print " " . mb_substr($line["date_entered"], 0, 16);
+ $line = "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
+ checked=\"1\" disabled=\"1\" type=\"checkbox\"></td><td>";
- print "</td></tr>";
+ /*foreach ($filter['rules'] as $rule) {
+ $reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
- $found++;
- }
+ $line["title"] = preg_replace("/($reg_exp)/i",
+ "<span class=\"highlight\">$1</span>", $line["title"]);
+
+ $content_preview = preg_replace("/($reg_exp)/i",
+ "<span class=\"highlight\">$1</span>", $content_preview);
+ }*/
+
+ $line .= $line["title"];
+ $line .= "<div class='small' style='float : right'>" . $feed_title . "</div>";
+ $line .= "<div class=\"insensitive\">" . $content_preview . "</div>";
+ $line .= " " . mb_substr($line["date_entered"], 0, 16);
+
+ $line .= "</td></tr>";
+
+ array_push($rv, $line);
+ }
+ }
+
+ //$offset += $limit;
+ //}
- if ($found == 0) {
+ /*if ($found == 0) {
print "<tr><td align='center'>" .
__("No recent articles matching this filter have been found.");
+ }*/
- print "</td></tr><tr><td class='insensitive' align='center'>";
+ print json_encode($rv);
+ }
- print __("Complex expressions might not give results while testing due to issues with database server regexp implementation.");
+ function testFilter() {
- print "</td></tr>";
+ if (isset($_REQUEST["offset"])) return $this->testFilterDo();
- }
+ //print __("Articles matching this filter:");
+
+ print "<div><img src='images/indicator_tiny.gif'> <span id='prefFilterProgressMsg'>Looking for articles...</span></div>";
+ print "<br/><div class=\"filterTestHolder\">";
+ print "<table width=\"100%\" cellspacing=\"0\" id=\"prefFilterTestResultList\">";
print "</table></div>";
print "<div style='text-align : center'>";
}
+ private function getfilterrules_concise($filter_id) {
+ $result = $this->dbh->query("SELECT reg_exp,
+ inverse,
+ feed_id,
+ cat_id,
+ cat_filter,
+ ttrss_filter_types.description AS field
+ FROM
+ ttrss_filters2_rules, ttrss_filter_types
+ WHERE
+ filter_id = '$filter_id' AND filter_type = ttrss_filter_types.id");
+
+ $rv = "";
+
+ while ($line = $this->dbh->fetch_assoc($result)) {
+
+ $where = sql_bool_to_bool($line["cat_filter"]) ?
+ getCategoryTitle($line["cat_id"]) :
+ ($line["feed_id"] ?
+ 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"]),
+ $line["field"],
+ $where,
+ sql_bool_to_bool($line["inverse"]) ? __("(inverse)") : "") . "</span>";
+ }
+
+ return $rv;
+ }
function getfiltertree() {
$root = array();
owner_uid = ".$_SESSION["uid"]." ORDER BY order_id, title");
- $action_id = -1;
$folder = array();
$folder['items'] = array();
while ($line = $this->dbh->fetch_assoc($result)) {
- /* if ($action_id != $line["action_id"]) {
- if (count($folder['items']) > 0) {
- array_push($root['items'], $folder);
- }
-
- $folder = array();
- $folder['id'] = $line["action_id"];
- $folder['name'] = __($line["action_name"]);
- $folder['items'] = array();
- $action_id = $line["action_id"];
- } */
-
$name = $this->getFilterName($line["id"]);
$match_ok = false;
$filter['param'] = $name[1];
$filter['checkbox'] = false;
$filter['enabled'] = sql_bool_to_bool($line["enabled"]);
+ $filter['rules'] = $this->getfilterrules_concise($line['id']);
if (!$filter_search || $match_ok) {
array_push($folder['items'], $filter);
WHERE id = ".(int)$rule["filter_type"]);
$filter_type = $this->dbh->fetch_result($result, 0, "description");
- return T_sprintf("%s on %s in %s %s", strip_tags($rule["reg_exp"]),
- $filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "");
+ $inverse = isset($rule["inverse"]) ? "inverse" : "";
+
+ return "<span class='filterRule $inverse'>" .
+ T_sprintf("%s on %s in %s %s", strip_tags($rule["reg_exp"]),
+ $filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "") . "</span>";
}
function printRuleName() {
$action["action_id"] == 7)
$title .= ": " . $action["action_param"];
+ if ($action["action_id"] == 9) {
+ list ($pfclass, $pfaction) = explode(":", $action["action_param"]);
+
+ $filter_actions = PluginHost::getInstance()->get_filter_actions();
+
+ foreach ($filter_actions as $fclass => $factions) {
+ foreach ($factions as $faction) {
+ if ($pfaction == $faction["action"] && $pfclass == $fclass) {
+ $title .= ": " . $fclass . ": " . $faction["description"];
+ break;
+ }
+ }
+ }
+ }
+
return $title;
}
$inverse = checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["inverse"]));
$title = $this->dbh->escape_string($_REQUEST["title"]);
- $result = $this->dbh->query("UPDATE ttrss_filters2 SET enabled = $enabled,
+ $this->dbh->query("UPDATE ttrss_filters2 SET enabled = $enabled,
match_any_rule = $match_any_rule,
inverse = $inverse,
title = '$title'
print "</select>";
- $param_box_hidden = ($action_id == 7 || $action_id == 4 || $action_id == 6) ?
+ $param_box_hidden = ($action_id == 7 || $action_id == 4 || $action_id == 6 || $action_id == 9) ?
"" : "display : none";
$param_hidden = ($action_id == 4 || $action_id == 6) ?
"" : "display : none";
$label_param_hidden = ($action_id == 7) ? "" : "display : none";
+ $plugin_param_hidden = ($action_id == 9) ? "" : "display : none";
print "<span id=\"filterDlg_paramBox\" style=\"$param_box_hidden\">";
- print " " . __("with parameters:") . " ";
+ print " ";
+ //print " " . __("with parameters:") . " ";
print "<input dojoType=\"dijit.form.TextBox\"
id=\"filterDlg_actionParam\" style=\"$param_hidden\"
name=\"action_param\" value=\"$action_param\">";
"id=\"filterDlg_actionParamLabel\" style=\"$label_param_hidden\"
dojoType=\"dijit.form.Select\"");
+ $filter_actions = PluginHost::getInstance()->get_filter_actions();
+ $filter_action_hash = array();
+
+ foreach ($filter_actions as $fclass => $factions) {
+ foreach ($factions as $faction) {
+
+ $filter_action_hash[$fclass . ":" . $faction["action"]] =
+ $fclass . ": " . $faction["description"];
+ }
+ }
+
+ if (count($filter_action_hash) == 0) {
+ $filter_plugin_disabled = "disabled";
+
+ $filter_action_hash["no-data"] = __("No actions available");
+
+ } else {
+ $filter_plugin_disabled = "";
+ }
+
+ print_select_hash("filterDlg_actionParamPlugin", $action_param, $filter_action_hash,
+ "style=\"$plugin_param_hidden\" dojoType=\"dijit.form.Select\" $filter_plugin_disabled",
+ "action_param_plugin");
+
print "</span>";
print " "; // tiny layout hack
private function getFilterName($id) {
$result = $this->dbh->query(
- "SELECT title,COUNT(DISTINCT r.id) AS num_rules,COUNT(DISTINCT a.id) AS num_actions
+ "SELECT title,match_any_rule,COUNT(DISTINCT r.id) AS num_rules,COUNT(DISTINCT a.id) AS num_actions
FROM ttrss_filters2 AS f LEFT JOIN ttrss_filters2_rules AS r
ON (r.filter_id = f.id)
LEFT JOIN ttrss_filters2_actions AS a
- ON (a.filter_id = f.id) WHERE f.id = '$id' GROUP BY f.title");
+ ON (a.filter_id = f.id) WHERE f.id = '$id' GROUP BY f.title, f.match_any_rule");
$title = $this->dbh->fetch_result($result, 0, "title");
$num_rules = $this->dbh->fetch_result($result, 0, "num_rules");
$num_actions = $this->dbh->fetch_result($result, 0, "num_actions");
+ $match_any_rule = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "match_any_rule"));
if (!$title) $title = __("[No caption]");
$title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", $num_rules), $title, $num_rules);
+
$result = $this->dbh->query(
"SELECT * FROM ttrss_filters2_actions WHERE filter_id = '$id' ORDER BY id LIMIT 1");
$num_actions -= 1;
}
+ 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);
git.wh0rd.org / tt-rss.git / blobdiff