From 3930235b1868a10aeefb88e9e860cec0a4a604d3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 25 Jan 2014 23:44:36 +0100
Subject: indexController : Charge les DAO uniquement lorsque nécessaire
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Poursuit le raisonnement de
https://github.com/marienfressinaud/FreshRSS/commit/bd6a7606c0d2364fd472f7903260a72f37b31f3b
Petites corrections
https://github.com/marienfressinaud/FreshRSS/issues/90
---
 app/Controllers/indexController.php | 28 +++++++++++-----------------
 app/i18n/en.php                     |  8 ++++----
 app/i18n/fr.php                     |  4 ++--
 app/views/index/stats.phtml         |  2 +-
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 898f2577c..74883962d 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -1,18 +1,7 @@
 <?php
 
 class FreshRSS_index_Controller extends Minz_ActionController {
-	private $get = false;
 	private $nb_not_read_cat = 0;
-	private $entryDAO;
-	private $feedDAO;
-	private $catDAO;
-
-	function __construct($router) {
-		parent::__construct($router);
-		$this->entryDAO = new FreshRSS_EntryDAO ();
-		$this->feedDAO = new FreshRSS_FeedDAO ();
-		$this->catDAO = new FreshRSS_CategoryDAO ();
-	}
 
 	public function indexAction () {
 		$output = Minz_Request::param ('output');
@@ -50,8 +39,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_View::appendScript (Minz_Url::display ('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
 		}
 
-		$this->view->cat_aside = $this->catDAO->listCategories ();
-		$this->view->nb_favorites = $this->entryDAO->countUnreadReadFavorites ();
+		$catDAO = new FreshRSS_CategoryDAO();
+		$entryDAO = new FreshRSS_EntryDAO();
+
+		$this->view->cat_aside = $catDAO->listCategories ();
+		$this->view->nb_favorites = $entryDAO->countUnreadReadFavorites ();
 		$this->view->currentName = '';
 
 		$this->view->get_c = '';
@@ -125,14 +117,14 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$keepHistoryDefault = $this->view->conf->keep_history_default;
 
 		try {
-			$entries = $this->entryDAO->listWhere($getType, $getId, $state, $order, $nb + 1, $first, $filter, $date_min, $keepHistoryDefault);
+			$entries = $entryDAO->listWhere($getType, $getId, $state, $order, $nb + 1, $first, $filter, $date_min, $keepHistoryDefault);
 
 			// Si on a récupéré aucun article "non lus"
 			// on essaye de récupérer tous les articles
 			if ($state === 'not_read' && empty($entries)) {
 				Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
 				$this->view->state = 'all';
-				$entries = $this->entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, $keepHistoryDefault);
+				$entries = $entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, $keepHistoryDefault);
 			}
 
 			if (count($entries) <= $nb) {
@@ -170,7 +162,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			case 'c':
 				$cat = isset($this->view->cat_aside[$getId]) ? $this->view->cat_aside[$getId] : null;
 				if ($cat === null) {
-					$cat = $this->catDAO->searchById ($getId);
+					$catDAO = new FreshRSS_CategoryDAO();
+					$cat = $catDAO->searchById($getId);
 				}
 				if ($cat) {
 					$this->view->currentName = $cat->name ();
@@ -183,7 +176,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			case 'f':
 				$feed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
 				if (empty($feed)) {
-					$feed = $this->feedDAO->searchById ($getId);
+					$feedDAO = new FreshRSS_FeedDAO();
+					$feed = $feedDAO->searchById($getId);
 				}
 				if ($feed) {
 					$this->view->currentName = $feed->name ();
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 518c14bc8..70fd8a74b 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -305,8 +305,8 @@ return array (
 	'status_unread'			=> 'unread',
 	'status_total'			=> 'total',
 	
-	'stats_entry_repartition'	=> 'Entry repartition',
-	'stats_entry_per_day'		=> 'Entry per day (last 30 days)',
-	'stats_feed_per_category'	=> 'Feed per category',
-	'stats_entry_per_category'	=> 'Entry per category',
+	'stats_entry_repartition'	=> 'Entries repartition',
+	'stats_entry_per_day'		=> 'Entries per day (last 30 days)',
+	'stats_feed_per_category'	=> 'Feeds per category',
+	'stats_entry_per_category'	=> 'Entries per category',
 );
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index efe4a08c4..53645477b 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -307,6 +307,6 @@ return array (
 	
 	'stats_entry_repartition'	=> 'Répartition des articles',
 	'stats_entry_per_day'		=> 'Nombre d’articles par jour (30 derniers jours)',
-	'stats_feed_per_category'	=> 'Flux par categorie',
-	'stats_entry_per_category'	=> 'Article par categorie',
+	'stats_feed_per_category'	=> 'Flux par catégorie',
+	'stats_entry_per_category'	=> 'Articles par catégorie',
 );
diff --git a/app/views/index/stats.phtml b/app/views/index/stats.phtml
index b1f0b8eb3..e531a31dc 100644
--- a/app/views/index/stats.phtml
+++ b/app/views/index/stats.phtml
@@ -8,7 +8,7 @@
 		<table>
 			<thead>
 				<tr>
-					<th>&nbsp;</th>
+					<th> </th>
 					<th><?php echo Minz_Translate::t ('main_stream')?></th>
 					<th><?php echo Minz_Translate::t ('all_feeds')?></th>
 				</tr>
-- 
cgit v1.2.3