<?php
function module_pref_filters($link) {
- $subop = $_GET["subop"];
- $quiet = $_GET["quiet"];
+ $subop = $_REQUEST["subop"];
+ $quiet = $_REQUEST["quiet"];
if ($subop == "edit") {
- $filter_id = db_escape_string($_GET["id"]);
+ $filter_id = db_escape_string($_REQUEST["id"]);
+
+ header("Content-Type: text/xml");
+ print "<dlg id=\"$subop\">";
+ print "<title>".__('Filter Editor')."</title>";
+ print "<content><![CDATA[";
$result = db_query($link,
"SELECT * FROM ttrss_filters WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
$feed_id = db_fetch_result($result, 0, "feed_id");
$action_id = db_fetch_result($result, 0, "action_id");
$action_param = db_fetch_result($result, 0, "action_param");
+ $filter_param = db_fetch_result($result, 0, "filter_param");
$enabled = sql_bool_to_bool(db_fetch_result($result, 0, "enabled"));
$inverse = sql_bool_to_bool(db_fetch_result($result, 0, "inverse"));
- print "<div id=\"infoBoxTitle\">".__('Filter Editor')."</div>";
- print "<div class=\"infoBoxContents\">";
-
print "<form id=\"filter_edit_form\" onsubmit='return false'>";
print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
$filter_types[$line["id"]] = __($line["description"]);
}
-/* print "<table width='100%'>";
-
- print "<tr><td>".__('Match:')."</td>
- <td><input onkeypress=\"return filterCR(event, filterEditSave)\"
- onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
- onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
- name=\"reg_exp\" class=\"iedit\" value=\"$reg_exp\">";
-
- print "</td></tr><tr><td>".__('On field:')."</td><td>";
-
- print_select_hash("filter_type", $filter_type, $filter_types, "class=\"_iedit\"");
-
- print "</td></tr>";
- print "<tr><td>".__('Feed:')."</td><td colspan='2'>";
-
- print_feed_select($link, "feed_id", $feed_id);
-
- print "</td></tr>";
-
- print "<tr><td>".__('Action:')."</td>";
-
- print "<td colspan='2'><select name=\"action_id\"
- onchange=\"filterDlgCheckAction(this)\">";
-
- $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
- ORDER BY name");
-
- while ($line = db_fetch_assoc($result)) {
- $is_sel = ($line["id"] == $action_id) ? "selected" : "";
- printf("<option value='%d' $is_sel>%s</option>", $line["id"], __($line["description"]));
- }
-
- print "</select>";
-
- print "</td></tr>";
-
- print "<tr><td>".__('Params:')."</td>";
-
- $param_disabled = ($action_id == 4 || $action_id == 6) ? "" : "disabled";
-
- print "<td><input $param_disabled class='iedit'
- name=\"action_param\" value=\"$action_param\"></td></tr>";
-
- if ($enabled) {
- $checked = "checked";
- } else {
- $checked = "";
- }
+ print "<div class=\"dlgSec\">".__("Match")."</div>";
- print "<tr><td valign='top'>Options:</td><td>
- <input type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
- <label for=\"enabled\">".__('Enabled')."</label><br/>";
+ print "<div class=\"dlgSecCont\">";
- if ($inverse) {
- $checked = "checked";
- } else {
- $checked = "";
+ if ($filter_type != 5) {
+ $date_ops_invisible = 'style="display : none"';
}
- print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\" $checked>
- <label for=\"inverse\">".__('Inverse match')."</label>";
-
- print "</td></tr></table>";
+ print "<span id=\"filter_dlg_date_mod_box\" $date_ops_invisible>";
+ print __("Date") . " ";
- print "</form>";
+ $filter_params = array(
+ "before" => __("before"),
+ "after" => __("after"));
- print "<hr>"; */
+ print_select_hash("filter_date_modifier", $filter_param,
+ $filter_params);
- print "<div class=\"dlgSec\">".__("Match")."</div>";
-
- print "<div class=\"dlgSecCont\">";
+ print " </span>";
print "<input onkeypress=\"return filterCR(event, filterEditSave)\"
- onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
- onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
- print " " . __("on field") . " ";
- print_select_hash("filter_type", $filter_type, $filter_types);
+ print "<span id=\"filter_dlg_date_chk_box\" $date_ops_invisible>";
+ print " <button onclick=\"return filterDlgCheckDate()\">".
+ __('Check it')."</button>";
+ print "</span>";
+
+ print "<br/> " . __("on field") . " ";
+ print_select_hash("filter_type", $filter_type, $filter_types,
+ 'onchange="filterDlgCheckType(this)"');
print "<br/>";
print "</select>";
- print " " . __("with params") . " ";
+ $param_hidden = ($action_id == 4 || $action_id == 6 || $action_id == 7) ? "" : "display : none";
+
+ print "<span id=\"filter_dlg_param_box\" style=\"$param_hidden\">";
+ print " " . __("with parameters:") . " ";
- $param_disabled = ($action_id == 4 || $action_id == 6) ? "" : "disabled";
+ $param_int_hidden = ($action_id != 7) ? "" : "display : none";
- print "<input $param_disabled size=\"20\"
- name=\"action_param\" value=\"$action_param\">";
+ print "<input size=\"20\" style=\"$param_int_hidden\"
+ onkeypress=\"return filterCR(event, filterEditSave)\"
+ name=\"action_param\" value=\"$action_param\">";
+
+ $param_int_hidden = ($action_id == 7) ? "" : "display : none";
+
+ print_label_select($link, "action_param_label", $action_param,
+ $param_int_hidden);
+
+ print "</span>";
+
+ print " "; // tiny layout hack
print "</div>";
print "<div class=\"dlgButtons\">";
- print "<input type=\"submit\"
- id=\"infobox_submit\"
- class=\"button\" onclick=\"return filterEditSave()\"
- value=\"".__('Save')."\"> ";
-
- print "<input class=\"button\"
- type=\"submit\" onclick=\"return filterEditCancel()\"
- value=\"".__('Cancel')."\">";
+ $reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript
+ print "<div style=\"float : left\">";
+ print "<button onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
+ __('Remove')."</button>";
print "</div>";
+ print "<button onclick=\"return filterEditSave()\">".
+ __('Save')."</button> ";
+
+ print "<button onclick=\"return filterEditCancel()\">".
+ __('Cancel')."</button>";
+
+ print "]]></content></dlg>";
+
return;
}
if ($subop == "editSave") {
- $reg_exp = db_escape_string(trim($_GET["reg_exp"]));
- $filter_type = db_escape_string(trim($_GET["filter_type"]));
- $filter_id = db_escape_string($_GET["id"]);
- $feed_id = db_escape_string($_GET["feed_id"]);
- $action_id = db_escape_string($_GET["action_id"]);
- $action_param = db_escape_string($_GET["action_param"]);
- $enabled = checkbox_to_sql_bool(db_escape_string($_GET["enabled"]));
- $inverse = checkbox_to_sql_bool(db_escape_string($_GET["inverse"]));
+ global $memcache;
+
+ if ($memcache) $memcache->flush();
+
+ $reg_exp = db_escape_string(trim($_REQUEST["reg_exp"]));
+ $filter_type = db_escape_string(trim($_REQUEST["filter_type"]));
+ $filter_id = db_escape_string($_REQUEST["id"]);
+ $feed_id = db_escape_string($_REQUEST["feed_id"]);
+ $action_id = db_escape_string($_REQUEST["action_id"]);
+ $action_param = db_escape_string($_REQUEST["action_param"]);
+ $action_param_label = db_escape_string($_REQUEST["action_param_label"]);
+ $enabled = checkbox_to_sql_bool(db_escape_string($_REQUEST["enabled"]));
+ $inverse = checkbox_to_sql_bool(db_escape_string($_REQUEST["inverse"]));
+
+ # for the time being, no other filters use params anyway...
+ $filter_param = db_escape_string($_REQUEST["filter_date_modifier"]);
if (!$feed_id) {
$feed_id = 'NULL';
} else {
$feed_id = sprintf("'%s'", db_escape_string($feed_id));
}
-
+
+ /* When processing 'assign label' filters, action_param_label dropbox
+ * overrides action_param */
+
+ if ($action_id == 7) {
+ $action_param = $action_param_label;
+ }
+
$result = db_query($link, "UPDATE ttrss_filters SET
reg_exp = '$reg_exp',
feed_id = $feed_id,
filter_type = '$filter_type',
enabled = $enabled,
inverse = $inverse,
- action_param = '$action_param'
+ action_param = '$action_param',
+ filter_param = '$filter_param'
WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
if (db_affected_rows($link, $result) != 0) {
}
if ($subop == "remove") {
+
+ if ($memcache) $memcache->flush();
- $ids = split(",", db_escape_string($_GET["ids"]));
+ $ids = split(",", db_escape_string($_REQUEST["ids"]));
foreach ($ids as $id) {
db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
}
if ($subop == "add") {
-
- $regexp = db_escape_string(trim($_GET["reg_exp"]));
- $filter_type = db_escape_string(trim($_GET["filter_type"]));
- $feed_id = db_escape_string($_GET["feed_id"]);
- $action_id = db_escape_string($_GET["action_id"]);
- $action_param = db_escape_string($_GET["action_param"]);
- $inverse = checkbox_to_sql_bool(db_escape_string($_GET["inverse"]));
+ if ($memcache) $memcache->flush();
+
+ $regexp = db_escape_string(trim($_REQUEST["reg_exp"]));
+ $filter_type = db_escape_string(trim($_REQUEST["filter_type"]));
+ $feed_id = db_escape_string($_REQUEST["feed_id"]);
+ $action_id = db_escape_string($_REQUEST["action_id"]);
+ $action_param = db_escape_string($_REQUEST["action_param"]);
+ $action_param_label = db_escape_string($_REQUEST["action_param_label"]);
+ $inverse = checkbox_to_sql_bool(db_escape_string($_REQUEST["inverse"]));
+
+ # for the time being, no other filters use params anyway...
+ $filter_param = db_escape_string($_REQUEST["filter_date_modifier"]);
if (!$regexp) return;
$feed_id = sprintf("'%s'", db_escape_string($feed_id));
}
+ /* When processing 'assign label' filters, action_param_label dropbox
+ * overrides action_param */
+
+ if ($action_id == 7) {
+ $action_param = $action_param_label;
+ }
+
$result = db_query($link,
"INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id,
- action_id, action_param, inverse)
+ action_id, action_param, inverse, filter_param)
VALUES
('$regexp', '$filter_type','".$_SESSION["uid"]."',
- $feed_id, '$action_id', '$action_param', $inverse)");
+ $feed_id, '$action_id', '$action_param', $inverse, '$filter_param')");
if (db_affected_rows($link, $result) != 0) {
print T_sprintf("Created filter <b>%s</b>", htmlspecialchars($regexp));
set_pref($link, "_PREFS_ACTIVE_TAB", "filterConfig");
- $sort = db_escape_string($_GET["sort"]);
+ $sort = db_escape_string($_REQUEST["sort"]);
if (!$sort || $sort == "undefined") {
$sort = "reg_exp";
}
-// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
-
$result = db_query($link, "SELECT id,description
FROM ttrss_filter_types ORDER BY description");
}
- $filter_search = db_escape_string($_GET["search"]);
+ $filter_search = db_escape_string($_REQUEST["search"]);
- if (array_key_exists("search", $_GET)) {
+ if (array_key_exists("search", $_REQUEST)) {
$_SESSION["prefs_filter_search"] = $filter_search;
} else {
$filter_search = $_SESSION["prefs_filter_search"];
}
- print "<div class=\"feedEditSearch\">
+ print "<div style='float : right'>
<input id=\"filter_search\" size=\"20\" type=\"search\"
onfocus=\"javascript:disableHotkeys();\"
onblur=\"javascript:enableHotkeys();\"
onchange=\"javascript:updateFilterList()\" value=\"$filter_search\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:updateFilterList()\" value=\"".__('Search')."\">
- <p<a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\">
- <img src='images/sign_quest.gif'></a></p>
- </div>";
+ <button onclick=\"javascript:updateFilterList()\">".__('Search')."</button>
+
+ <a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\">
+ <img style='vertical-align : top;' src='".theme_image($link, "images/sign_quest.png")."'></a>
+ </div>";
+ print "<button onclick=\"return quickAddFilter()\">".
+ __('Create filter')."</button> ";
- print "<input type=\"submit\"
- class=\"button\"
- onclick=\"return displayDlg('quickAddFilter', false)\"
- id=\"create_filter_btn\"
- value=\"".__('Create filter')."\">";
+ print "<button onclick=\"return editSelectedFilter()\">".
+ __('Edit')."</button> ";
- print " ";
+ print "<button onclick=\"return removeSelectedFilters()\">".
+ __('Remove')."</button> ";
- print "<input type=\"submit\"
- class=\"button\"
- onclick=\"rescore_all_feeds()\"
- value=\"".__('Rescore articles')."\">";
+ if (defined('_ENABLE_FEED_DEBUGGING')) {
+ print "<button onclick=\"rescore_all_feeds()\">".
+ __('Rescore articles')."</button> ";
+ }
if ($filter_search) {
- $filter_search = db_escape_string($filter_search);
- $filter_search_query = "(
- UPPER(ttrss_filter_actions.description) LIKE UPPER('%$filter_search%') OR
- UPPER(reg_exp) LIKE UPPER('%$filter_search%') OR
- UPPER(ttrss_feeds.title) LIKE UPPER('%$filter_search%') OR
- UPPER(ttrss_filter_types.description) LIKE UPPER('%$filter_search%')) AND";
+ $filter_search = split(' ', db_escape_string($filter_search));
+
+ $tokens = array();
+
+ foreach ($filter_search as $token) {
+ $token = trim($token);
+
+ array_push($tokens, "(
+ UPPER(ttrss_filter_actions.description) LIKE UPPER('%$token%') OR
+ UPPER(reg_exp) LIKE UPPER('%$token%') OR
+ UPPER(action_param) LIKE UPPER('%$token%') OR
+ UPPER(ttrss_feeds.title) LIKE UPPER('%$token%') OR
+ UPPER(ttrss_filter_types.description) LIKE UPPER('%$token%'))");
+ }
+
+ $filter_search_query = "(" . join($tokens, " AND ") . ") AND ";
+
} else {
$filter_search_query = "";
}
enabled,
inverse,
feed_id,
+ filter_param,
+ filter_type,
ttrss_filter_actions.description AS action_description,
ttrss_feeds.title AS feed_title,
ttrss_filter_actions.name AS action_name,
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
".__('Select:')."
- <a href=\"javascript:selectPrefRows('filter', true)\">".__('All')."</a>,
- <a href=\"javascript:selectPrefRows('filter', false)\">".__('None')."</a>
+ <a href=\"#\" onclick=\"selectTableRows('prefFilterList', 'all')\">".__('All')."</a>,
+ <a href=\"#\" onclick=\"selectTableRows('prefFilterList', 'none')\">".__('None')."</a>
</td</tr>";
$lnum = 0;
while ($line = db_fetch_assoc($result)) {
- $class = ($lnum % 2) ? "even" : "odd";
-
$filter_id = $line["id"];
- $edit_filter_id = $_GET["id"];
+ $edit_filter_id = $_REQUEST["id"];
$enabled = sql_bool_to_bool($line["enabled"]);
$inverse = sql_bool_to_bool($line["inverse"]);
- if ($subop == "edit" && $filter_id != $edit_filter_id) {
- $class .= "Grayed";
- $this_row_id = "";
- } else {
- $this_row_id = "id=\"FILRR-$filter_id\"";
- }
+ $this_row_id = "id=\"FILRR-$filter_id\"";
$line["filter_type_descr"] = __($line["filter_type_descr"]);
$line["action_description"] = __($line["action_description"]);
print "<tr class=\"title\">
<td align='center' width=\"5%\"> </td>
- <td width=\"20%\"><a href=\"javascript:updateFilterList('reg_exp')\">".__('Filter expression')."</a></td>
- <td width=\"\"><a href=\"javascript:updateFilterList('feed_title')\">".__('Feed')."</a></td>
- <td width=\"20%\"><a href=\"javascript:updateFilterList('filter_type')\">".__('Match')."</a></td>
- <!-- <td width=\"15%\"><a href=\"javascript:updateFilterList('action_description')\">".__('Action')."</a></td> -->
- <td width=\"20%\"><a href=\"javascript:updateFilterList('action_param')\">".__('Params')."</a></td>";
+ <td width=\"20%\"><a href=\"#\" onclick=\"updateFilterList('reg_exp')\">".__('Match')."</a></td>
+ <td width=\"\"><a href=\"#\" onclick=\"updateFilterList('feed_title')\">".__('Feed')."</a></td>
+ <td width=\"20%\"><a href=\"#\" onclick=\"updateFilterList('filter_type')\">".__('Field')."</a></td>
+ <td width=\"20%\"><a href=\"#\" onclick=\"updateFilterList('action_param')\">".__('Params')."</a></td>";
+ $lnum = 0;
}
+ $class = ($lnum % 2) ? "even" : "odd";
+
print "<tr class=\"$class\" $this_row_id>";
$line["reg_exp"] = htmlspecialchars($line["reg_exp"]);
if (!$line["feed_title"]) $line["feed_title"] = __("All feeds");
+ if (array_search($line["action_name"],
+ array("score", "tag", "label")) === false) {
+
+ $line["action_param"] = false;
+ }
+
if (!$line["action_param"]) {
$line["action_param"] = "—";
} else if ($line["action_name"] == "score") {
- $score_pic = get_score_pic($line["action_param"]);
+ $score_pic = theme_image($link,
+ "images/" . get_score_pic($line["action_param"]));
- $score_pic = "<img class='hlScorePic' src=\"images/$score_pic\">";
+ $score_pic = "<img class='hlScorePic' src=\"$score_pic\">";
$line["action_param"] = "$score_pic " . $line["action_param"];
$line["feed_title"] = htmlspecialchars($line["feed_title"]);
- print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"filter\");'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
+ $filter_params = array(
+ "before" => __("before"),
+ "after" => __("after"));
+
+ if ($line["action_name"] == 'label') {
+
+ $tmp_result = db_query($link, "SELECT fg_color, bg_color
+ FROM ttrss_labels2 WHERE caption = '".
+ db_escape_string($line["action_param"])."' AND
+ owner_uid = " . $_SESSION["uid"]);
+
+ $fg_color = db_fetch_result($tmp_result, 0, "fg_color");
+ $bg_color = db_fetch_result($tmp_result, 0, "bg_color");
+
+ $tmp = "<div class='labelColorIndicator' id='LICID-$id'
+ style='color : $fg_color; background-color : $bg_color'>
+ α";
+ $tmp .= "</div>";
+
+ $line["action_param"] = "$tmp " . $line["action_param"];
+ }
+
+ if ($line["filter_type"] == 5) {
+
+ if (!strtotime($line["reg_exp"])) {
+ $line["reg_exp"] = "<span class=\"filterDateError\">" .
+ $line["reg_exp"] . "</span>";
+ }
+
+ $line["reg_exp"] = __("Date") . " " .
+ $filter_params[$line['filter_param']] . " " .
+ $line["reg_exp"];
+ }
+
if (!$enabled) {
$line["reg_exp"] = "<span class=\"insensitive\">" .
$line["reg_exp"] . " " . __("(Disabled)")."</span>";
$line["action_param"] . "</span>";
}
- $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'";
-
- print "<td $onclick>" . $line["reg_exp"] . "</td>";
- print "<td $onclick>" . $line["feed_title"] . "</td>";
+ $onclick = "onclick='editFilter($filter_id, event)' title='".__('Click to edit')."'";
$inverse_label = "";
if ($inverse) {
$inverse_label = " <span class='insensitive'>".__('(Inverse)')."</span>";
}
+
+ print "<td $onclick>" . $line["reg_exp"] . "$inverse_label</td>";
+ print "<td $onclick>" . $line["feed_title"] . "</td>";
- print "<td $onclick>" . $line["filter_type_descr"] . "$inverse_label</td>";
+ print "<td $onclick>" . $line["filter_type_descr"] . "</td>";
print "<td $onclick>" . $line["action_param"] . "</td>";
print "</tr>";
print "</table>";
- print "<p id=\"filterOpToolbar\">";
-
- print "<input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"return editSelectedFilter()\" value=\"".__('Edit')."\">
- <input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"return removeSelectedFilters()\" value=\"".__('Remove')."\">";
-
- print "</p>";
-
} else {
print "<p>";
if (!$filter_search) {
- print __('No filters defined.');
+ print_warning(__('No filters defined.'));
} else {
- print __('No matching filters found.');
+ print_warning(__('No matching filters found.'));
}
print "</p>";
}
}
+
?>
git.wh0rd.org / tt-rss.git / blobdiff