";
+ print __("Complex expressions might not give results while testing due to issues with database server regexp implementation.");
- $found++;
- }
-
- if ($found == 0) {
- print "
" .
- __("No articles matching this filter has been found.") . "
";
- }
- } else {
- print "
" .
- __("Invalid regular expression.") . "
";
+ print "";
}
- print "
";
+ print "
";
+
+ print "
";
+ print "";
print "
";
- } */
+ }
+
function getfiltertree() {
$root = array();
@@ -106,29 +156,87 @@ class Pref_Filters extends Handler_Protected {
$root['name'] = __('Filters');
$root['items'] = array();
- $result = db_query($this->link, "SELECT *,
+ $filter_search = $_SESSION["prefs_filter_search"];
+
+ $result = db_query( "SELECT *,
+ (SELECT action_param FROM ttrss_filters2_actions
+ WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS action_param,
(SELECT action_id FROM ttrss_filters2_actions
WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS action_id,
+ (SELECT description FROM ttrss_filter_actions
+ WHERE id = (SELECT action_id FROM ttrss_filters2_actions
+ WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1)) AS action_name,
(SELECT reg_exp FROM ttrss_filters2_rules
WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS reg_exp
FROM ttrss_filters2 WHERE
- owner_uid = ".$_SESSION["uid"]." ORDER BY action_id,reg_exp");
+ owner_uid = ".$_SESSION["uid"]." ORDER BY order_id, title");
+
+
+ $action_id = -1;
+ $folder = array();
+ $folder['items'] = array();
while ($line = db_fetch_assoc($result)) {
+ /* if ($action_id != $line["action_id"]) {
+ if (count($folder['items']) > 0) {
+ array_push($root['items'], $folder);
+ }
+
+ $folder = array();
+ $folder['id'] = $line["action_id"];
+ $folder['name'] = __($line["action_name"]);
+ $folder['items'] = array();
+ $action_id = $line["action_id"];
+ } */
+
$name = $this->getFilterName($line["id"]);
+ $match_ok = false;
+ if ($filter_search) {
+ $rules_result = db_query(
+ "SELECT reg_exp FROM ttrss_filters2_rules WHERE filter_id = ".$line["id"]);
+
+ while ($rule_line = db_fetch_assoc($rules_result)) {
+ if (mb_strpos($rule_line['reg_exp'], $filter_search) !== false) {
+ $match_ok = true;
+ break;
+ }
+ }
+ }
+
+ if ($line['action_id'] == 7) {
+ $label_result = db_query( "SELECT fg_color, bg_color
+ FROM ttrss_labels2 WHERE caption = '".db_escape_string( $line['action_param'])."' AND
+ owner_uid = " . $_SESSION["uid"]);
+
+ if (db_num_rows($label_result) > 0) {
+ $fg_color = db_fetch_result($label_result, 0, "fg_color");
+ $bg_color = db_fetch_result($label_result, 0, "bg_color");
+
+ $name[1] = "α" . $name[1];
+ }
+ }
+
$filter = array();
$filter['id'] = 'FILTER:' . $line['id'];
$filter['bare_id'] = $line['id'];
$filter['name'] = $name[0];
$filter['param'] = $name[1];
$filter['checkbox'] = false;
- $filter['enabled'] = $line["enabled"];
+ $filter['enabled'] = sql_bool_to_bool($line["enabled"]);
- array_push($root['items'], $filter);
+ if (!$filter_search || $match_ok) {
+ array_push($folder['items'], $filter);
+ }
}
+ /* if (count($folder['items']) > 0) {
+ array_push($root['items'], $folder);
+ } */
+
+ $root['items'] = $folder['items'];
+
$fl = array();
$fl['identifier'] = 'id';
$fl['label'] = 'name';
@@ -140,13 +248,15 @@ class Pref_Filters extends Handler_Protected {
function edit() {
- $filter_id = db_escape_string($_REQUEST["id"]);
+ $filter_id = db_escape_string( $_REQUEST["id"]);
- $result = db_query($this->link,
+ $result = db_query(
"SELECT * FROM ttrss_filters2 WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
$enabled = sql_bool_to_bool(db_fetch_result($result, 0, "enabled"));
$match_any_rule = sql_bool_to_bool(db_fetch_result($result, 0, "match_any_rule"));
+ $inverse = sql_bool_to_bool(db_fetch_result($result, 0, "inverse"));
+ $title = htmlspecialchars(db_fetch_result($result, 0, "title"));
print "