|
|
|
@ -105,6 +105,13 @@ class Pref_Filters extends Protected_Handler {
|
|
|
|
|
$root['name'] = __('Filters');
|
|
|
|
|
$root['items'] = array();
|
|
|
|
|
|
|
|
|
|
$search = $_SESSION["prefs_filter_search"];
|
|
|
|
|
|
|
|
|
|
if ($search) $search_qpart = " (LOWER(reg_exp) LIKE LOWER('%$search%')
|
|
|
|
|
OR LOWER(ttrss_feeds.title) LIKE LOWER('%$search%')
|
|
|
|
|
OR LOWER(COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."'))
|
|
|
|
|
LIKE LOWER('%$search%') AND cat_filter = true) AND ";
|
|
|
|
|
|
|
|
|
|
$result = db_query($this->link, "SELECT
|
|
|
|
|
ttrss_filters.id AS id,reg_exp,
|
|
|
|
|
ttrss_filter_types.name AS filter_type_name,
|
|
|
|
@ -119,7 +126,7 @@ class Pref_Filters extends Protected_Handler {
|
|
|
|
|
filter_type,
|
|
|
|
|
ttrss_filter_actions.description AS action_description,
|
|
|
|
|
ttrss_feeds.title AS feed_title,
|
|
|
|
|
ttrss_feed_categories.title AS cat_title,
|
|
|
|
|
COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS cat_title,
|
|
|
|
|
ttrss_filter_actions.name AS action_name,
|
|
|
|
|
ttrss_filters.action_param AS action_param
|
|
|
|
|
FROM
|
|
|
|
@ -129,6 +136,7 @@ class Pref_Filters extends Protected_Handler {
|
|
|
|
|
WHERE
|
|
|
|
|
filter_type = ttrss_filter_types.id AND
|
|
|
|
|
ttrss_filter_actions.id = action_id AND
|
|
|
|
|
$search_qpart
|
|
|
|
|
ttrss_filters.owner_uid = ".$_SESSION["uid"]."
|
|
|
|
|
ORDER by action_description, reg_exp");
|
|
|
|
|
|
|
|
|
@ -580,6 +588,21 @@ class Pref_Filters extends Protected_Handler {
|
|
|
|
|
print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
|
|
|
|
|
print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">";
|
|
|
|
|
|
|
|
|
|
$filter_search = db_escape_string($_REQUEST["search"]);
|
|
|
|
|
|
|
|
|
|
if (array_key_exists("search", $_REQUEST)) {
|
|
|
|
|
$_SESSION["prefs_filter_search"] = $filter_search;
|
|
|
|
|
} else {
|
|
|
|
|
$filter_search = $_SESSION["prefs_filter_search"];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
print "<div style='float : right; padding-right : 4px;'>
|
|
|
|
|
<input dojoType=\"dijit.form.TextBox\" id=\"filter_search\" size=\"20\" type=\"search\"
|
|
|
|
|
value=\"$filter_search\">
|
|
|
|
|
<button dojoType=\"dijit.form.Button\" onclick=\"updateFilterList()\">".
|
|
|
|
|
__('Search')."</button>
|
|
|
|
|
</div>";
|
|
|
|
|
|
|
|
|
|
print "<div dojoType=\"dijit.form.DropDownButton\">".
|
|
|
|
|
"<span>" . __('Select')."</span>";
|
|
|
|
|
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
|
|
|
|
|