diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-07-04 09:53:26 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-07-04 09:53:26 +0200 |
| commit | 509c8cae6381ec46af7c8303eb92fda6ce496a4a (patch) | |
| tree | 653f7f44df842f9d7135decd89467879a0098c50 /app/Controllers/importExportController.php | |
| parent | 57d571230eeb2d3ede57e640b640f17c7a2298a2 (diff) | |
Dynamic OPML (#4407)
* Dynamic OPML draft
#fix https://github.com/FreshRSS/FreshRSS/issues/4191
* Export dynamic OPML
http://opml.org/spec2.opml#1629043127000
* Restart with simpler approach
* Minor revert
* Export dynamic OPML also for single feeds
* Special category type for importing dynamic OPML
* Parameter for excludeMutedFeeds
* Details
* More draft
* i18n
* Fix update
* Draft manual import working
* Working manual refresh
* Draft automatic update
* Working Web refresh + fixes
* Import/export dynamic OPML settings
* Annoying numerous lines in SQL logs
* Fix minor JavaScript error
* Fix auto adding new columns
* Add require
* Add missing 🗲
* Missing space
* Disable adding new feeds to dynamic categories
* Link from import
* i18n typo
* Improve theme icon function
* Fix pink-dark
Diffstat (limited to 'app/Controllers/importExportController.php')
| -rw-r--r-- | app/Controllers/importExportController.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 8b2b9cf27..c7b2d579f 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -5,7 +5,10 @@ */ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { + /** @var FreshRSS_EntryDAO */ private $entryDAO; + + /** @var FreshRSS_FeedDAO */ private $feedDAO; /** @@ -96,7 +99,8 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { $importService = new FreshRSS_Import_Service($username); foreach ($list_files['opml'] as $opml_file) { - if (!$importService->importOpml($opml_file)) { + $importService->importOpml($opml_file); + if (!$importService->lastStatus()) { $ok = false; if (FreshRSS_Context::$isCli) { fwrite(STDERR, 'FreshRSS error during OPML import' . "\n"); @@ -520,7 +524,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { $feed->_name($name); $feed->_website($website); if (!empty($origin['disable'])) { - $feed->_ttl(-1 * FreshRSS_Context::$user_conf->ttl_default); + $feed->_mute(true); } // Call the extension hook |