From 8587efa62189a30e3e47075739382d52ecc34cb6 Mon Sep 17 00:00:00 2001 From: papaschloss <11808509+papaschloss@users.noreply.github.com> Date: Mon, 15 Aug 2022 12:01:18 -0700 Subject: Article css filtering (#4501) * Update feedController.php * Update subscriptionController.php * Update DatabaseDAO.php * Update Entry.php * Update Feed.php * Update FeedDAO.php * Update install.sql.mysql.php * Update install.sql.pgsql.php * Update install.sql.sqlite.php * Update sub.php * Update opml.phtml * Update ImportService.php * Update update.phtml * Update feed.js * Update install.sql.mysql.php * Update install.sql.pgsql.php * Update install.sql.sqlite.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update sub.php * Update FeedDAO.php * Update feedController.php * Update subscriptionController.php * Update Entry.php * Update Feed.php * Update feedController.php * Update subscriptionController.php * Update ImportService.php * Update opml.phtml * Update update.phtml * Update update.phtml * Update update.phtml * Update DatabaseDAO.php * Update app/Models/Entry.php Co-authored-by: Alexandre Alapetite * Update app/i18n/fr/sub.php Co-authored-by: Alexandre Alapetite * Update p/scripts/feed.js Co-authored-by: Alexandre Alapetite * Update app/Controllers/feedController.php * make fix-all * Update documentation * css_path_filter help message * i18n en-us ignore Co-authored-by: Alexandre Alapetite --- app/Controllers/feedController.php | 5 ++++- app/Controllers/subscriptionController.php | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'app/Controllers') diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 31875fa56..c016d3584 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -916,12 +916,15 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { return; } + $attributes = $feed->attributes(); + $attributes['path_entries_filter'] = trim(Minz_Request::param('selector_filter', '')); + //Fetch & select content. try { $fullContent = FreshRSS_Entry::getContentByParsing( htmlspecialchars_decode($entry->link(), ENT_QUOTES), $content_selector, - $feed->attributes() + $attributes ); if ($fullContent != '') { diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index b699e9213..9e4eab8e2 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -209,6 +209,8 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { } } + $feed->_attributes('path_entries_filter', Minz_Request::param('path_entries_filter', '')); + $values = array( 'name' => Minz_Request::param('name', ''), 'kind' => $feed->kind(), -- cgit v1.2.3