return;
}
+ function testFilterDo() {
+ $offset = (int) db_escape_string($_REQUEST["offset"]);
+ $limit = (int) db_escape_string($_REQUEST["limit"]);
- function testFilter() {
$filter = array();
$filter["enabled"] = true;
}
}
- $found = 0;
- $offset = 0;
- $limit = 30;
- $started = time();
-
- print __("Articles matching this filter:");
-
- require_once "include/rssfuncs.php";
-
- print "<div class=\"filterTestHolder\">";
- print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
-
$glue = $filter['match_any_rule'] ? " OR " : " AND ";
$scope_qpart = join($glue, $scope_qparts);
if (!$scope_qpart) $scope_qpart = "true";
- while ($found < $limit && $offset < $limit * 10 && time() - $started < ini_get("max_execution_time") * 0.7) {
+ $rv = array();
+
+ //while ($found < $limit && $offset < $limit * 1000 && time() - $started < ini_get("max_execution_time") * 0.7) {
$result = db_query("SELECT ttrss_entries.id,
ttrss_entries.title,
ttrss_feeds.title AS feed_title,
ttrss_feed_categories.id AS cat_id,
content,
+ date_entered,
link,
author,
tag_cache
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) {
- $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
+ $line["content_preview"] = truncate_string(strip_tags($line["content"]), 200, '…');
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
$line = $p->hook_query_headlines($line, 100);
$content_preview = $line["content_preview"];
- if ($line["feed_title"]) $feed_title = "(" . $line["feed_title"] . ")";
+ $tmp = "<tr style='margin-top : 5px'>";
- print "<tr>";
+ #$tmp .= "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
+ # checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
- print "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
- checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
- print "<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) {
- $reg_exp = $rule['reg_exp'];
$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
$line["title"] = preg_replace("/($reg_exp)/i",
"<span class=\"highlight\">$1</span>", $content_preview);
}*/
- print $line["title"];
- print "<div class='small' style='float : right'>" . $feed_title . "</div>";
- print "<div class=\"insensitive\">" . $content_preview . "</div>";
- print " " . mb_substr($line["date_entered"], 0, 16);
+ $tmp .= "<strong>" . $line["title"] . "</strong><br/>";
+ $tmp .= $line['feed_title'] . ", " . mb_substr($line["date_entered"], 0, 16);
+ $tmp .= "<div class='insensitive'>" . $content_preview . "</div>";
+ $tmp .= "</td></tr>";
+
+ array_push($rv, $tmp);
- print "</td></tr>";
+ /*array_push($rv, array("title" => $line["title"],
+ "content" => $content_preview,
+ "date" => $line["date_entered"],
+ "feed" => $line["feed_title"])); */
- $found++;
}
}
- $offset += $limit;
- }
+ //$offset += $limit;
+ //}
- if ($found == 0) {
+ /*if ($found == 0) {
print "<tr><td align='center'>" .
__("No recent articles matching this filter have been found.");
- }
+ }*/
+ print json_encode($rv);
+ }
+
+ function testFilter() {
+
+ if (isset($_REQUEST["offset"])) return $this->testFilterDo();
+
+ //print __("Articles matching this filter:");
+
+ print "<div><img id='prefFilterLoadingIndicator' 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'>";
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>";
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>";
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");
}
$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>";
}
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"]));
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>";
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);
+ $title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", (int) $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);
+ $actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
return array($title, $actions);
}
$this->dbh->query("COMMIT");
}
-}
-?>
+}
\ No newline at end of file
git.wh0rd.org / tt-rss.git / blobdiff