From 51b069a1ee0017635e6b6639c5a25643c2289c09 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 19 Dec 2018 12:08:06 +0300 Subject: display filter tree rules as a list --- classes/pref/filters.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'classes/pref') diff --git a/classes/pref/filters.php b/classes/pref/filters.php index e802e5879..9c2a7bf54 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -177,7 +177,7 @@ class Pref_Filters extends Handler_Protected { } - private function getfilterrules_concise($filter_id) { + private function getfilterrules_list($filter_id) { $sth = $this->pdo->prepare("SELECT reg_exp, inverse, match_on, @@ -227,11 +227,11 @@ class Pref_Filters extends Handler_Protected { $inverse = $line["inverse"] ? "inverse" : ""; - $rv .= "" . T_sprintf("%s on %s in %s %s", + $rv .= "
  • " . T_sprintf("%s on %s in %s %s", htmlspecialchars($line["reg_exp"]), $line["field"], $where, - $line["inverse"] ? __("(inverse)") : "") . ""; + $line["inverse"] ? __("(inverse)") : "") . "
  • "; } return $rv; @@ -306,7 +306,7 @@ class Pref_Filters extends Handler_Protected { $filter['checkbox'] = false; $filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null; $filter['enabled'] = $line["enabled"]; - $filter['rules'] = $this->getfilterrules_concise($line['id']); + $filter['rules'] = $this->getfilterrules_list($line['id']); if (!$filter_search || $match_ok) { array_push($folder['items'], $filter); -- cgit v1.2.3-54-g00ecf