<?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"]);
$result = db_query($link,
"SELECT * FROM ttrss_filters WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
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 "<span id=\"filter_dlg_date_chk_box\" $date_ops_invisible>";
- print " <input class=\"button\"
- type=\"submit\" onclick=\"return filterDlgCheckDate()\"
- value=\"".__('Check it')."\">";
+ print " <button onclick=\"return filterDlgCheckDate()\">".
+ __('Check it')."</button>";
print "</span>";
print "<br/> " . __("on field") . " ";
$reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript
print "<div style=\"float : left\">";
- print "<input type=\"submit\"
- class=\"button\" onclick='return removeFilter($filter_id, \"$reg_exp\")'
- value=\"".__('Remove')."\"> ";
+ print "<button onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
+ __('Remove')."</button>";
print "</div>";
- print "<input type=\"submit\"
- id=\"infobox_submit\"
- class=\"button\" onclick=\"return filterEditSave()\"
- value=\"".__('Save')."\"> ";
+ print "<button onclick=\"return filterEditSave()\">".
+ __('Save')."</button> ";
- print "<input class=\"button\"
- type=\"submit\" onclick=\"return filterEditCancel()\"
- value=\"".__('Cancel')."\">";
+ print "<button onclick=\"return filterEditCancel()\">".
+ __('Cancel')."</button>";
print "</div>";
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"]);
- $action_param_label = db_escape_string($_GET["action_param_label"]);
- $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($_GET["filter_date_modifier"]);
+ $filter_param = db_escape_string($_REQUEST["filter_date_modifier"]);
if (!$feed_id) {
$feed_id = 'NULL';
}
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"]);
- $action_param_label = db_escape_string($_GET["action_param_label"]);
- $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($_GET["filter_date_modifier"]);
+ $filter_param = db_escape_string($_REQUEST["filter_date_modifier"]);
if (!$regexp) return;
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";
}
- $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 = split(' ', db_escape_string($filter_search));
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')\">".__('Match')."</a></td>
- <td width=\"\"><a href=\"javascript:updateFilterList('feed_title')\">".__('Feed')."</a></td>
- <td width=\"20%\"><a href=\"javascript:updateFilterList('filter_type')\">".__('Field')."</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(
$line["action_param"] . "</span>";
}
- $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'";
+ $onclick = "onclick='editFilter($filter_id, event)' title='".__('Click to edit')."'";
$inverse_label = "";
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>";
}
}
- function print_label_select($link, $name, $value, $style = "") {
-
- $result = db_query($link, "SELECT caption FROM ttrss_labels2
- WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
-
- print "<select name=\"$name\" style=\"$style\">";
-
- while ($line = db_fetch_assoc($result)) {
-
- $issel = ($line["caption"] == $value) ? "selected" : "";
-
- print "<option $issel>" . $line["caption"] . "</option>";
-
- }
-
- print "</select>";
-
-
- }
?>