Option pour marquer les articles comme lus dès la réception

https://github.com/marienfressinaud/FreshRSS/issues/237
https://github.com/marienfressinaud/FreshRSS/issues/309

2 files changed, 8 insertions, 0 deletions

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 68d798581..deec54a2b 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -171,6 +171,7 @@ class configureController extends ActionController {
 			$openArticle = Request::param ('mark_open_article', 'no');
 			$openSite = Request::param ('mark_open_site', 'no');
 			$scroll = Request::param ('mark_scroll', 'no');
+			$reception = Request::param ('mark_upon_reception', 'no');
 			$theme = Request::param ('theme', 'default');
 			$topline_read = Request::param ('topline_read', 'no');
 			$topline_favorite = Request::param ('topline_favorite', 'no');
@@ -200,6 +201,7 @@ class configureController extends ActionController {
 				'article' => $openArticle,
 				'site' => $openSite,
 				'scroll' => $scroll,
+				'reception' => $reception,
 			));
 			$this->view->conf->_theme ($theme);
 			$this->view->conf->_topline_read ($topline_read);
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index dc0a0ef54..c978857b2 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -88,6 +88,8 @@ class feedController extends ActionController {
 						$feed->_id ($id);
 						$feed->faviconPrepare();
 
+						$is_read = $this->view->conf->markUponReception() === 'yes' ? 1 : 0;
+
 						$entryDAO = new EntryDAO ();
 						$entries = $feed->entries ();
 						usort($entries, 'self::entryDateComparer');
@@ -105,6 +107,7 @@ class feedController extends ActionController {
 								$values = $entry->toArray ();
 								$values['id_feed'] = $feed->id ();
 								$values['id'] = min(time(), $entry->date (true)) . '.' . rand(0, 999999);
+								$values['is_read'] = $is_read;
 								$entryDAO->addEntry ($values);
 							}
 						}
@@ -197,6 +200,8 @@ class feedController extends ActionController {
 				$entries = $feed->entries ();
 				usort($entries, 'self::entryDateComparer');
 
+				$is_read = $this->view->conf->markUponReception() === 'yes' ? 1 : 0;
+
 				//For this feed, check last n entry GUIDs already in database
 				$existingGuids = array_fill_keys ($entryDAO->listLastGuidsByFeed ($feed->id (), count($entries) + 10), 1);
 
@@ -210,6 +215,7 @@ class feedController extends ActionController {
 						$values = $entry->toArray ();
 						//Use declared date at first import, otherwise use discovery date
 						$values['id'] = empty($existingGuids) ? min(time(), $entry->date (true)) . '.' . rand(0, 999999) : microtime(true);
+						$values['is_read'] = $is_read;
 						$entryDAO->addEntry ($values);
 					}
 				}