port to internal controller, some routes are still broken

3 files changed, 12 insertions, 11 deletions

diff --git a/businesslayer/feedbusinesslayer.php b/businesslayer/feedbusinesslayer.php
index 76763aae7..1322bc73f 100644
--- a/businesslayer/feedbusinesslayer.php
+++ b/businesslayer/feedbusinesslayer.php
@@ -34,7 +34,8 @@ use \OCA\News\Db\ItemMapper;
 use \OCA\News\Fetcher\Fetcher;
 use \OCA\News\Fetcher\FetcherException;
 use \OCA\News\ArticleEnhancer\Enhancer;
-use \OCA\News\Utility\TimeFactory;
+use \OCA\News\Utility\Config;
+
 
 class FeedBusinessLayer extends BusinessLayer {
 
@@ -48,8 +49,8 @@ class FeedBusinessLayer extends BusinessLayer {
 
 	public function __construct(FeedMapper $feedMapper, Fetcher $feedFetcher,
 		                        ItemMapper $itemMapper, API $api,
-		                        TimeFactory $timeFactory,
-		                        $autoPurgeMinimumInterval,
+		                        $timeFactory,
+		                        Config $config,
 		                        Enhancer $enhancer,
 		                        $purifier){
 		parent::__construct($feedMapper);
@@ -57,7 +58,7 @@ class FeedBusinessLayer extends BusinessLayer {
 		$this->itemMapper = $itemMapper;
 		$this->api = $api;
 		$this->timeFactory = $timeFactory;
-		$this->autoPurgeMinimumInterval = $autoPurgeMinimumInterval;
+		$this->autoPurgeMinimumInterval = $config->getAutoPurgeMinimumInterval();
 		$this->enhancer = $enhancer;
 		$this->purifier = $purifier;
 	}
diff --git a/businesslayer/folderbusinesslayer.php b/businesslayer/folderbusinesslayer.php
index c8611917a..80634abc8 100644
--- a/businesslayer/folderbusinesslayer.php
+++ b/businesslayer/folderbusinesslayer.php
@@ -28,7 +28,7 @@ namespace OCA\News\BusinessLayer;
 use \OCA\News\Core\API;
 use \OCA\News\Db\Folder;
 use \OCA\News\Db\FolderMapper;
-use \OCA\News\Utility\TimeFactory;
+use \OCA\News\Utility\Config;
 
 
 class FolderBusinessLayer extends BusinessLayer {
@@ -39,12 +39,12 @@ class FolderBusinessLayer extends BusinessLayer {
 
 	public function __construct(FolderMapper $folderMapper,
 	                            API $api,
-	                            TimeFactory $timeFactory,
-	                            $autoPurgeMinimumInterval){
+	                            $timeFactory,
+	                            Config $config){
 		parent::__construct($folderMapper);
 		$this->api = $api;
 		$this->timeFactory = $timeFactory;
-		$this->autoPurgeMinimumInterval = $autoPurgeMinimumInterval;
+		$this->autoPurgeMinimumInterval = $config->getAutoPurgeMinimumInterval();
 	}
 
 	/**
diff --git a/businesslayer/itembusinesslayer.php b/businesslayer/itembusinesslayer.php
index 545ed565b..7558667cf 100644
--- a/businesslayer/itembusinesslayer.php
+++ b/businesslayer/itembusinesslayer.php
@@ -30,7 +30,7 @@ use \OCA\News\Db\ItemMapper;
 use \OCA\News\Db\StatusFlag;
 use \OCA\News\Db\FeedType;
 use \OCA\News\Db\DoesNotExistException;
-use \OCA\News\Utility\TimeFactory;
+use \OCA\News\Utility\Config;
 
 
 class ItemBusinessLayer extends BusinessLayer {
@@ -40,10 +40,10 @@ class ItemBusinessLayer extends BusinessLayer {
 	private $timeFactory;
 
 	public function __construct(ItemMapper $itemMapper, StatusFlag $statusFlag,
-								TimeFactory $timeFactory, $autoPurgeCount=0){
+								$timeFactory, Config $config){
 		parent::__construct($itemMapper);
 		$this->statusFlag = $statusFlag;
-		$this->autoPurgeCount = $autoPurgeCount;
+		$this->autoPurgeCount = $config->getAutoPurgeCount();
 		$this->timeFactory = $timeFactory;
 	}