return;
}
+ function testFilterDo() {
+ require_once "include/rssfuncs.php";
+
+ $offset = (int) db_escape_string($_REQUEST["offset"]);
- function testFilter() {
$filter = array();
$filter["enabled"] = true;
if (isset($rule["feed_id"]) && $rule['feed_id'] > 0) {
array_push($scope_qparts, "feed_id = " . $rule["feed_id"]);
- }
-
- if (isset($rule["cat_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);
}
}
- $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'] ? " AND " : "OR ";
+ $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,
ref_id = ttrss_entries.id AND
($scope_qpart) AND
ttrss_user_entries.owner_uid = " . $_SESSION["uid"] . "
- ORDER BY date_entered DESC LIMIT $limit OFFSET $offset");
+ ORDER BY date_entered DESC LIMIT 30 OFFSET $offset");
while ($line = db_fetch_assoc($result)) {
if ($line["feed_title"]) $feed_title = "(" . $line["feed_title"] . ")";
- print "<tr>";
-
- print "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
- checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
- print "<td>";
+ $line = "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
+ checked=\"1\" disabled=\"1\" type=\"checkbox\"></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);
+ $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);
- print "</td></tr>";
+ $line .= "</td></tr>";
- $found++;
+ array_push($rv, $line);
}
}
- $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 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'>";
$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;
}
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