From daaa391e33c5d92e3dd91bb0b81ac420abed7097 Mon Sep 17 00:00:00 2001 From: berumuron Date: Wed, 18 Jan 2023 10:12:21 +0100 Subject: tec: Update the lib_opml (#4403) * fix: Fix undefined GLOB_BRACE on Alpine The manual states that: > Note: The GLOB_BRACE flag is not available on some non GNU systems, > like Solaris or Alpine Linux. This generated an error on Alpine. Reference: https://www.php.net/manual/function.glob.php * fix: List details of feeds for OPML exportation The details are necessary to export the XPath information, the CSS full content path and read actions filters. * Update LibOpml to 0.4.0 * Refactor OPML importation to be more robust First, it fixes two regressions introduced by the update of lib_opml: - title attribute is used when text attribute is missing; - the OPML category attribute is used as a fallback for feeds categories. In a related way, if also fixes a problem when a feed had both a parent category outline and a category attribute. Before, it only considered the attribute as its category, but now it considers the parent outline. Then, it counts category limit correctly by not increasing `$nb_categories` if the category already exists. * Exclude lib_opml from the CodeSniffer * Fix variable names when logging some errors * Fix catch of LibOpml Exception * Make sure to declare the category * Exclude lib_opml from PHPStan analyze * Disable markdownlint for lib_opml * Fix typos * Use auto-loading and allow updates via Composer * Fix broken links to lib_opml * Bring back the ability to import the OPML frss:opmlUrl attribute * Refactor the logs of OPML errors * Update lib_opml to the version 0.5.0 Co-authored-by: Alexandre Alapetite --- app/Controllers/indexController.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/Controllers/indexController.php') diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 7fced48af..968518e3f 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -237,8 +237,6 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { return; } - require_once(LIB_PATH . '/lib_opml.php'); - // No layout for OPML output. $this->view->_layout(false); header('Content-Type: application/xml; charset=utf-8'); -- cgit v1.2.3 From 9b5de54a9c96110b42f71681aa635e2e2c3b8756 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 3 Feb 2023 14:34:47 +0100 Subject: Remove -x on some files not needing it (#5065) --- app/Controllers/configureController.php | 0 app/Controllers/entryController.php | 0 app/Controllers/feedController.php | 0 app/Controllers/indexController.php | 0 app/Controllers/javascriptController.php | 0 app/i18n/es/admin.php | 0 app/i18n/es/conf.php | 0 app/i18n/es/feedback.php | 0 app/i18n/es/gen.php | 0 app/i18n/es/index.php | 0 app/i18n/es/install.php | 0 app/i18n/es/sub.php | 0 lib/SimplePie/SimplePie/Registry.php | 0 p/i/index.php | 0 p/themes/icons/look.svg | 0 15 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 app/Controllers/configureController.php mode change 100755 => 100644 app/Controllers/entryController.php mode change 100755 => 100644 app/Controllers/feedController.php mode change 100755 => 100644 app/Controllers/indexController.php mode change 100755 => 100644 app/Controllers/javascriptController.php mode change 100755 => 100644 app/i18n/es/admin.php mode change 100755 => 100644 app/i18n/es/conf.php mode change 100755 => 100644 app/i18n/es/feedback.php mode change 100755 => 100644 app/i18n/es/gen.php mode change 100755 => 100644 app/i18n/es/index.php mode change 100755 => 100644 app/i18n/es/install.php mode change 100755 => 100644 app/i18n/es/sub.php mode change 100755 => 100644 lib/SimplePie/SimplePie/Registry.php mode change 100755 => 100644 p/i/index.php mode change 100755 => 100644 p/themes/icons/look.svg (limited to 'app/Controllers/indexController.php') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php old mode 100755 new mode 100644 diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php old mode 100755 new mode 100644 diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php old mode 100755 new mode 100644 diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php old mode 100755 new mode 100644 diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php old mode 100755 new mode 100644 diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php old mode 100755 new mode 100644 diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php old mode 100755 new mode 100644 diff --git a/app/i18n/es/feedback.php b/app/i18n/es/feedback.php old mode 100755 new mode 100644 diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php old mode 100755 new mode 100644 diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php old mode 100755 new mode 100644 diff --git a/app/i18n/es/install.php b/app/i18n/es/install.php old mode 100755 new mode 100644 diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php old mode 100755 new mode 100644 diff --git a/lib/SimplePie/SimplePie/Registry.php b/lib/SimplePie/SimplePie/Registry.php old mode 100755 new mode 100644 diff --git a/p/i/index.php b/p/i/index.php old mode 100755 new mode 100644 diff --git a/p/themes/icons/look.svg b/p/themes/icons/look.svg old mode 100755 new mode 100644 -- cgit v1.2.3