Refactor statistics

I made a new controller to handle statistics. The old statistics have been moved in that controller and a new action has been added to display idle feeds. I also added a menu in the left panel to navigate between the statistics pages.
See #90

2 files changed, 73 insertions, 19 deletions

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 4fcc3176f..daf9fb95a 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -198,25 +198,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 	}
 	
-	public function statsAction () {
-		if (!$this->view->loginOk) {
-			Minz_Error::error (
-				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
-			);
-		}
-
-		Minz_View::prependTitle (Minz_Translate::t ('stats') . ' · ');
-
-		$statsDAO = new FreshRSS_StatsDAO ();
-		Minz_View::appendScript (Minz_Url::display ('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js')));
-		$this->view->repartition = $statsDAO->calculateEntryRepartition();
-		$this->view->count = ($statsDAO->calculateEntryCount());
-		$this->view->feedByCategory = $statsDAO->calculateFeedByCategory();
-		$this->view->entryByCategory = $statsDAO->calculateEntryByCategory();
-		$this->view->topFeed = $statsDAO->calculateTopFeed();
-	}
-
 	public function aboutAction () {
 		Minz_View::prependTitle (Minz_Translate::t ('about') . ' · ');
 	}
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
new file mode 100644
index 000000000..cb8870fa9
--- /dev/null
+++ b/app/Controllers/statsController.php
@@ -0,0 +1,73 @@
+<?php
+
+class FreshRSS_stats_Controller extends Minz_ActionController {
+
+        public function mainAction() {
+                if (!$this->view->loginOk) {
+                        Minz_Error::error(
+                            403, array('error' => array(Minz_Translate::t('access_denied')))
+                        );
+                }
+
+                Minz_View::prependTitle(Minz_Translate::t('stats') . ' · ');
+                
+                $statsDAO = new FreshRSS_StatsDAO ();
+		Minz_View::appendScript (Minz_Url::display ('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js')));
+		$this->view->repartition = $statsDAO->calculateEntryRepartition();
+		$this->view->count = ($statsDAO->calculateEntryCount());
+		$this->view->feedByCategory = $statsDAO->calculateFeedByCategory();
+		$this->view->entryByCategory = $statsDAO->calculateEntryByCategory();
+		$this->view->topFeed = $statsDAO->calculateTopFeed();
+        }
+
+        public function idleAction() {
+                if (!$this->view->loginOk) {
+                        Minz_Error::error(
+                            403, array('error' => array(Minz_Translate::t('access_denied')))
+                        );
+                }
+
+                Minz_View::prependTitle(Minz_Translate::t('stats') . ' · ');
+
+                $statsDAO = new FreshRSS_StatsDAO ();
+                $feeds = $statsDAO->calculateFeedLastDate();
+                $idleFeeds = array();
+                $now = new \DateTime();
+                $feedDate = clone $now;
+                $lastWeek = clone $now;
+                $lastWeek->modify('-1 week');
+                $lastMonth = clone $now;
+                $lastMonth->modify('-1 month');
+                $last3Month = clone $now;
+                $last3Month->modify('-3 month');
+                $last6Month = clone $now;
+                $last6Month->modify('-6 month');
+                $lastYear = clone $now;
+                $lastYear->modify('-1 year');
+
+                foreach ($feeds as $feed) {
+                        $feedDate->setTimestamp($feed['last_date']);
+                        if ($feedDate >= $lastWeek) {
+                                continue;
+                        }
+                        if ($feedDate < $lastWeek) {
+                                $idleFeeds['lastWeek'][] = $feed['name'];
+                        }
+                        if ($feedDate < $lastMonth) {
+                                $idleFeeds['lastMonth'][] = $feed['name'];
+                        }
+                        if ($feedDate < $last3Month) {
+                                $idleFeeds['last3Month'][] = $feed['name'];
+                        }
+                        if ($feedDate < $last6Month) {
+                                $idleFeeds['last6Month'][] = $feed['name'];
+                        }
+                        if ($feedDate < $lastYear) {
+                                $idleFeeds['lastYear'][] = $feed['name'];
+                        }
+                }
+
+                $this->view->idleFeeds = $idleFeeds;
+        }
+
+}