From b55571de8f19fab15202826950184cfcb90d364c Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Tue, 8 Apr 2014 23:26:41 -0400
Subject: Split reading configuration page

I splitted the reading configuration page in 2 pages. The display configuration page
to prepare for #265 and the reading configuration page.
It is just a test, feel free to discard that.

I also change some wording to be consistent through out the application.
---
 app/layout/header.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/layout/header.phtml')

diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index d20f7487f..08aa7715d 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -67,7 +67,8 @@ if (Minz_Configuration::canLogIn()) {
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 				<li class="dropdown-header"><?php echo Minz_Translate::t ('configuration'); ?></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('display_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url ('configure', 'reading'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a></li>
-- 
cgit v1.2.3


From 8521c876d4b2ce69ff5d4313493017f26aa2cd6b Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 4 May 2014 08:57:19 -0400
Subject: Add user queries

It's an intermediary step to remove the favorite button.
I add a button to store the current query as a favorite query. It redirects automatically to the configuration page where it is possible to name and remove user queries.
To make the queries more straigtforward, I removed the default behavior when searching for a string. This way, when we search for a string, the filter is not defaulted to all articles.
---
 app/Controllers/configureController.php | 54 +++++++++++++++++++++++++++++++++
 app/Controllers/indexController.php     |  3 --
 app/Models/Configuration.php            |  7 +++++
 app/Models/Themes.php                   |  1 +
 app/i18n/en.php                         | 22 ++++++++++++++
 app/i18n/fr.php                         | 22 ++++++++++++++
 app/layout/aside_configure.phtml        |  3 ++
 app/layout/aside_flux.phtml             | 17 +++++++++++
 app/layout/header.phtml                 |  1 +
 app/layout/nav_menu.phtml               |  8 +++++
 app/views/configure/queries.phtml       | 45 +++++++++++++++++++++++++++
 p/scripts/main.js                       |  8 +++++
 p/themes/icons/bookmark-add.svg         |  6 ++++
 13 files changed, 194 insertions(+), 3 deletions(-)
 create mode 100644 app/views/configure/queries.phtml
 create mode 100644 p/themes/icons/bookmark-add.svg

(limited to 'app/layout/header.phtml')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index df5212041..573c42d64 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -298,4 +298,58 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->size_total = $entryDAO->size(true);
 		}
 	}
+	
+	public function queriesAction () {
+		if (Minz_Request::isPost ()) {
+			$params = Minz_Request::params();
+			$this->view->conf->_queries ($params['queries']);
+			$this->view->conf->save();
+
+			$notif = array (
+				'type' => 'good',
+				'content' => Minz_Translate::t ('configuration_updated')
+			);
+			Minz_Session::_param ('notification', $notif);
+
+			Minz_Request::forward (array ('c' => 'configure', 'a' => 'queries'), true);
+		} else {
+			$this->view->query_get = array();
+			foreach ($this->view->conf->queries as $key => $query) {
+				if (isset($query['get'])) {
+					switch ($query['get'][0]) {
+						case 'c':
+							$dao = new FreshRSS_CategoryDAO();
+							$category = $dao->searchById(substr($query['get'], 2));
+							$this->view->query_get[$key] = array(
+								'type' => 'category',
+								'name' => $category->name(),
+							);
+							break;
+						case 'f':
+							$dao = new FreshRSS_FeedDAO();
+							$feed = $dao->searchById(substr($query['get'], 2));
+							$this->view->query_get[$key] = array(
+								'type' => 'feed',
+								'name' => $feed->name(),
+							);
+							break;
+					}
+				}
+			}
+		}
+
+		Minz_View::prependTitle (Minz_Translate::t ('queries') . ' · ');
+	}
+	
+	public function addQueryAction () {
+		$queries = $this->view->conf->queries;
+		$query = Minz_Request::params();
+		unset($query['output']);
+		unset($query['token']);
+		$queries[] = $query;
+		$this->view->conf->_queries($queries);
+		$this->view->conf->save();
+		
+		Minz_Request::forward(array('c' => 'configure', 'a' => 'queries'), true);
+	}
 }
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 3445c0bd4..d45ce5510 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -84,9 +84,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->state = $state = Minz_Request::param ('state', $this->view->conf->default_view);
 		$state_param = Minz_Request::param ('state', null);
 		$filter = Minz_Request::param ('search', '');
-		if (!empty($filter)) {
-			$state = FreshRSS_Entry::STATE_ALL;	//Search always in read and unread articles
-		}
 		$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
 		$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
 		$first = Minz_Request::param ('next', '');
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 8d3e69a1c..deeae0826 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -52,6 +52,7 @@ class FreshRSS_Configuration {
 		'bottomline_date' => true,
 		'bottomline_link' => true,
 		'sharing' => array(),
+		'queries' => array(),
 	);
 
 	private $available_languages = array(
@@ -218,6 +219,12 @@ class FreshRSS_Configuration {
 			$this->data['sharing'][] = $value;
 		}
 	}
+	public function _queries ($values) {
+		$this->data['queries'] = array();
+		foreach ($values as $value) {
+			$this->data['queries'][] = array_filter($value);
+		}
+	}
 	public function _theme($value) {
 		$this->data['theme'] = $value;
 	}
diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index 17b95bb9e..5fcbe78e0 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -70,6 +70,7 @@ class FreshRSS_Themes extends Minz_Model {
 			'add' => '✚',
 			'all' => '☰',
 			'bookmark' => '★',
+			'bookmark-add' => '✚',
 			'category' => '☷',
 			'category-white' => '☷',
 			'close' => '❌',
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 21d37f475..57ca0985d 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -15,6 +15,28 @@ return array (
 	'feed'				=> 'Feed',
 	'feeds'				=> 'Feeds',
 	'shortcuts'			=> 'Shortcuts',
+	'queries'			=> 'User queries',
+	'query-search'		=> 'Search for "%s"',
+	'query-order-asc'   => 'Display oldest articles first',
+	'query-order-desc'  => 'Display newest articles first',
+	'query-get-category'=> 'Display "%s" category',
+	'query-get-feed'    => 'Display "%s" feed',
+	'query-state-0'		=> 'Display all articles',
+	'query-state-1'		=> 'Display read articles',
+	'query-state-2'		=> 'Display unread articles',
+	'query-state-3'		=> 'Display all articles',
+	'query-state-4'		=> 'Display favorite articles',
+	'query-state-5'		=> 'Display read favorite articles',
+	'query-state-6'		=> 'Display unread favorite articles',
+	'query-state-7'		=> 'Display favorite articles',
+	'query-state-8'		=> 'Display not favorite articles',
+	'query-state-9'		=> 'Display read not favorite articles',
+	'query-state-10'	=> 'Display unread not favorite articles',
+	'query-state-11'	=> 'Display not favorite articles',
+	'query-state-12'	=> 'Display all articles',
+	'query-state-13'	=> 'Display read articles',
+	'query-state-14'	=> 'Display unread articles',
+	'query-state-15'	=> 'Display all articles',
 	'about'				=> 'About',
 	'stats'				=> 'Statistics',
 
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index f42115fcd..d99b8eb1d 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -15,6 +15,28 @@ return array (
 	'feed'				=> 'Flux',
 	'feeds'				=> 'Flux',
 	'shortcuts'			=> 'Raccourcis',
+	'queries'			=> 'Filtres utilisateurs',
+	'query-search'		=> 'Chercher "%s"',
+	'query-order-asc'   => 'Afficher les articles les plus anciens en premier',
+	'query-order-desc'  => 'Afficher les articles les plus récents en premier',
+	'query-get-category'=> 'Afficher la catégorie "%s"',
+	'query-get-feed'    => 'Afficher le flux "%s"',
+	'query-state-0'		=> 'Afficher tous les articles',
+	'query-state-1'		=> 'Afficher les articles lus',
+	'query-state-2'		=> 'Afficher les articles non lus',
+	'query-state-3'		=> 'Afficher tous les articles',
+	'query-state-4'		=> 'Afficher les articles favoris',
+	'query-state-5'		=> 'Afficher les articles lus et favoris',
+	'query-state-6'		=> 'Afficher les articles non lus et favoris',
+	'query-state-7'		=> 'Afficher les articles favoris',
+	'query-state-8'		=> 'Afficher les articles non favoris',
+	'query-state-9'		=> 'Afficher les articles lus et non favoris',
+	'query-state-10'	=> 'Afficher les articles non lus et non favoris',
+	'query-state-11'	=> 'Afficher les articles non favoris',
+	'query-state-12'	=> 'Afficher tous les articles',
+	'query-state-13'	=> 'Afficher les articles lus',
+	'query-state-14'	=> 'Afficher les articles non lus',
+	'query-state-15'	=> 'Afficher tous les articles',
 	'about'				=> 'À propos',
 	'stats'				=> 'Statistiques',
 
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 43adeb3c6..e66f2f64c 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -15,6 +15,9 @@
 	<li class="item<?php echo Minz_Request::actionName () == 'shortcut' ? ' active' : ''; ?>">
 		<a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a>
 	</li>
+	<li class="item<?php echo Minz_Request::actionName () == 'queries' ? ' active' : ''; ?>">
+		<a href="<?php echo _url ('configure', 'queries'); ?>"><?php echo Minz_Translate::t ('queries'); ?></a>
+	</li>
 	<li class="separator"></li>
 	<li class="item<?php echo Minz_Request::actionName () == 'users' ? ' active' : ''; ?>">
 		<a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 817dae676..8f8d436e1 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -36,6 +36,23 @@
 				</a>
 			</div>
 		</li>
+		
+		<?php 
+		$count = 0;
+		foreach ($this->conf->queries as $query_conf):
+			$count++;
+			$name = $count;
+			if (isset($query_conf['name'])) {
+				$name = $query_conf['name'];
+				unset($query_conf['name']);
+			}
+			$url_user_query = array('c' => 'index', 'a' => 'index', 'params' => $query_conf); ?>
+		<li>
+			<div class="category">
+				<a  data-unread="0" class="btn" href="<?php echo Minz_Url::display($url_user_query)?>"><?php echo $name?></a>
+			</div>
+		</li>
+		<?php endforeach; ?>
 
 		<?php
 		foreach ($this->cat_aside as $cat) {
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 08aa7715d..3eedc8ea7 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -72,6 +72,7 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="item"><a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a></li>
+				<li class="item"><a href="<?php echo _url ('configure', 'queries'); ?>"><?php echo Minz_Translate::t ('queries'); ?></a></li>
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li>
 				<li class="separator"></li>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 9990448ba..6db172904 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -241,6 +241,14 @@
 		<?php echo FreshRSS_Themes::icon($icon); ?>
 	</a>
 
+	<?php if ($this->loginOk): 
+		$url_query = $this->url;
+		$url_query['c'] = 'configure';
+		$url_query['a'] = 'addQuery';
+	?>
+	<a id="save_query" class="btn" href="<?php echo Minz_Url::display ($url_query); ?>"><?php echo FreshRSS_Themes::icon('bookmark-add'); ?></a>
+	<?php endif; ?>
+
 	<?php $url_output['params']['output'] = 'rss'; ?>
 	<a class="btn view_rss" target="_blank" href="<?php echo Minz_Url::display ($url_output); ?>" title="<?php echo Minz_Translate::t ('rss_view'); ?>">
 		<?php echo FreshRSS_Themes::icon('rss'); ?>
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
new file mode 100644
index 000000000..38755edc5
--- /dev/null
+++ b/app/views/configure/queries.phtml
@@ -0,0 +1,45 @@
+<?php $this->partial ('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+
+	<form method="post" action="<?php echo _url ('configure', 'queries'); ?>">
+		<legend><?php echo Minz_Translate::t ('queries'); ?></legend>
+
+		<?php foreach ($this->conf->queries as $key => $query):?>
+			<div class="form-group">
+				<label class="group-name"><?php echo $key + 1?></label>
+				<div class="group-controls">
+					<input type="hidden" id="queries_<?php echo $key; ?>_search" name="queries[<?php echo $key; ?>][search]" value="<?php echo $query['search']; ?>"/>
+					<input type="hidden" id="queries_<?php echo $key; ?>_state" name="queries[<?php echo $key; ?>][state]" value="<?php echo $query['state']; ?>"/>
+					<input type="hidden" id="queries_<?php echo $key; ?>_order" name="queries[<?php echo $key; ?>][order]" value="<?php echo $query['order']; ?>"/>
+					<input type="hidden" id="queries_<?php echo $key; ?>_get" name="queries[<?php echo $key; ?>][get]" value="<?php echo $query['get']; ?>"/>
+					<input type="text" id="queries_<?php echo $key; ?>_name" name="queries[<?php echo $key; ?>][name]" value="<?php echo $query['name']; ?>"/>
+					<a href='#' class='query remove'><?php echo FreshRSS_Themes::icon('close'); ?></a>
+					<ul>
+						<?php if (isset($query['search'])):?>
+							<li><?php echo Minz_Translate::t ('query-search', $query['search']); ?></li>
+						<?php endif; ?>
+						<?php if (isset($query['state'])):?>
+							<li><?php echo Minz_Translate::t ('query-state-' . $query['state']); ?></li>
+						<?php endif; ?>
+						<?php if (isset($query['order'])):?>
+							<li><?php echo Minz_Translate::t ('query-order-' . strtolower($query['order'])); ?></li>
+						<?php endif; ?>
+						<?php if (isset($query['get'])):?>
+							<li><?php echo Minz_Translate::t ('query-get-' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
+						<?php endif; ?>
+					</ul>
+				</div>
+			</div>
+		<?php endforeach; ?>
+		
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+			</div>
+		</div>
+	</form>
+
+</div>
\ No newline at end of file
diff --git a/p/scripts/main.js b/p/scripts/main.js
index aeb044e88..0b3ebf735 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -992,6 +992,13 @@ function init_share_observers() {
 	});
 }
 
+function init_queries_observers() {
+	$('.post').on('click', '.query.remove', function(e) {
+		e.preventDefault();
+		$(this).parents('.form-group').remove();
+	});
+}
+
 function init_feed_observers() {
 	$('select[id="category"]').on('change', function() {
 		var detail = $('#new_category_name').parent();
@@ -1046,6 +1053,7 @@ function init_all() {
 		window.setInterval(refreshUnreads, 120000);
 	} else {
 		init_share_observers();
+		init_queries_observers();
 		init_feed_observers();
 		init_password_observers();
 	}
diff --git a/p/themes/icons/bookmark-add.svg b/p/themes/icons/bookmark-add.svg
new file mode 100644
index 000000000..51db9c498
--- /dev/null
+++ b/p/themes/icons/bookmark-add.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
+<g transform="translate(-141.0002,-807)" fill="#bebebe">
+<path d="m143,807,0,13,4-4,4,4,0-4,0-1-2,0,0-4,2,0,0-4z"/>
+<path d="m152,810,0,2-2,0,0,2,2,0,0,2,2,0,0-2,2,0,0-2-2,0,0-2-2,0z"/>
+</g>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 181fcd98893f65a2c5159158fbfc022b4661ea13 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 13 Jun 2014 01:00:27 -0400
Subject: 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
---
 app/Controllers/indexController.php |  19 ------
 app/Controllers/statsController.php |  73 +++++++++++++++++++++
 app/Models/StatsDAO.php             |  20 ++++++
 app/i18n/en.php                     |   8 +++
 app/i18n/fr.php                     |   8 +++
 app/layout/aside_stats.phtml        |   9 +++
 app/layout/header.phtml             |   2 +-
 app/views/index/stats.phtml         | 125 -----------------------------------
 app/views/stats/idle.phtml          |  57 ++++++++++++++++
 app/views/stats/main.phtml          | 127 ++++++++++++++++++++++++++++++++++++
 10 files changed, 303 insertions(+), 145 deletions(-)
 create mode 100644 app/Controllers/statsController.php
 create mode 100644 app/layout/aside_stats.phtml
 delete mode 100644 app/views/index/stats.phtml
 create mode 100644 app/views/stats/idle.phtml
 create mode 100644 app/views/stats/main.phtml

(limited to 'app/layout/header.phtml')

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;
+        }
+
+}
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 60cec7847..f9f4740fd 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -180,6 +180,26 @@ SQL;
 		$stm->execute();
 		return $stm->fetchAll(PDO::FETCH_ASSOC);
 	}
+        
+        /**
+         * Calculates the last publication date for each feed
+         * 
+         * @return array
+         */
+        public function calculateFeedLastDate() {
+                $sql = <<<SQL
+SELECT MAX(f.name) AS name
+, MAX(date) AS last_date
+FROM {$this->prefix}feed AS f,
+{$this->prefix}entry AS e
+WHERE f.id = e.id_feed
+GROUP BY f.id
+ORDER BY name
+SQL;
+                $stm = $this->bd->prepare($sql);
+                $stm->execute();
+                return $stm->fetchAll(PDO::FETCH_ASSOC);
+        }
 
 	private function convertToSerie($data) {
 		$serie = array();
diff --git a/app/i18n/en.php b/app/i18n/en.php
index c0eb5a2bf..8d5f305c0 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -46,6 +46,14 @@ return array (
 	'no_query_filter'		=> 'No filter',
 	'about'				=> 'About',
 	'stats'				=> 'Statistics',
+        'stats_idle'                    => 'Idle feeds',
+        'stats_main'                    => 'Main statistics',
+    
+        'last_week'                     => 'Last week',
+        'last_month'                    => 'Last month',
+        'last_3_month'                  => 'Last three months',
+        'last_6_month'                  => 'Last six months',
+        'last_year'                     => 'Last year',
 
 	'your_rss_feeds'		=> 'Your RSS feeds',
 	'add_rss_feed'			=> 'Add a RSS feed',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 0cabf02c1..3441425df 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -46,6 +46,14 @@ return array (
 	'no_query_filter'		=> 'Aucun filtre appliqué',
 	'about'				=> 'À propos',
 	'stats'				=> 'Statistiques',
+        'stats_idle'                    => 'Flux inactifs',
+        'stats_main'                    => 'Statistiques principales',
+
+        'last_week'                     => 'La dernière semaine',
+        'last_month'                    => 'Le dernier mois',
+        'last_3_month'                  => 'Les derniers trois mois',
+        'last_6_month'                  => 'Les derniers six mois',
+        'last_year'                     => 'La dernière année',
 
 	'your_rss_feeds'		=> 'Vos flux RSS',
 	'add_rss_feed'			=> 'Ajouter un flux RSS',
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
new file mode 100644
index 000000000..bc1e85592
--- /dev/null
+++ b/app/layout/aside_stats.phtml
@@ -0,0 +1,9 @@
+<ul class="nav nav-list aside">
+	<li class="nav-header"><?php echo Minz_Translate::t ('stats'); ?></li>
+	<li class="item<?php echo Minz_Request::actionName () == 'main' ? ' active' : ''; ?>">
+		<a href="<?php echo _url ('stats', 'main'); ?>"><?php echo Minz_Translate::t ('stats_main'); ?></a>
+	</li>
+	<li class="item<?php echo Minz_Request::actionName () == 'idle' ? ' active' : ''; ?>">
+		<a href="<?php echo _url ('stats', 'idle'); ?>"><?php echo Minz_Translate::t ('stats_idle'); ?></a>
+	</li>
+</ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 3eedc8ea7..3be3e496d 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -76,7 +76,7 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url ('index', 'stats'); ?>"><?php echo Minz_Translate::t ('stats'); ?></a></li>
+				<li class="item"><a href="<?php echo _url ('stats', 'main'); ?>"><?php echo Minz_Translate::t ('stats'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Minz_Translate::t ('logs'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about'); ?></a></li>
 				<?php
diff --git a/app/views/index/stats.phtml b/app/views/index/stats.phtml
deleted file mode 100644
index b5c18813d..000000000
--- a/app/views/index/stats.phtml
+++ /dev/null
@@ -1,125 +0,0 @@
-<div class="post content">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
-	
-	<h1><?php echo Minz_Translate::t ('stats'); ?></h1>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_entry_repartition'); ?></h2>
-		<table>
-			<thead>
-				<tr>
-					<th> </th>
-					<th><?php echo Minz_Translate::t ('main_stream'); ?></th>
-					<th><?php echo Minz_Translate::t ('all_feeds'); ?></th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_total'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['total']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['total']); ?></td>
-				</tr>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_read'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['read']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['read']); ?></td>
-				</tr>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_unread'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['unread']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['unread']); ?></td>
-				</tr>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_favorites'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['favorite']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['favorite']); ?></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_entry_per_day'); ?></h2>
-		<div id="statsEntryPerDay" style="height: 300px"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_feed_per_category'); ?></h2>
-		<div id="statsFeedPerCategory" style="height: 300px"></div>
-		<div id="statsFeedPerCategoryLegend"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_entry_per_category'); ?></h2>
-		<div id="statsEntryPerCategory" style="height: 300px"></div>
-		<div id="statsEntryPerCategoryLegend"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_top_feed'); ?></h2>
-		<table>
-			<thead>
-				<tr>
-					<th><?php echo Minz_Translate::t ('feed'); ?></th>
-					<th><?php echo Minz_Translate::t ('category'); ?></th>
-					<th><?php echo Minz_Translate::t ('stats_entry_count'); ?></th>
-				</tr>
-			</thead>
-			<tbody>
-				<?php foreach ($this->topFeed as $feed): ?>
-					<tr>
-						<td><?php echo $feed['name']; ?></td>
-						<td><?php echo $feed['category']; ?></td>
-						<td class="numeric"><?php echo formatNumber($feed['count']); ?></td>
-					</tr>
-				<?php endforeach;?>
-			</tbody>
-		</table>
-	</div>
-</div>
-
-<script>
-"use strict";
-function initStats() {
-	if (!window.Flotr) {
-		if (window.console) {
-			console.log('FreshRSS waiting for Flotr…');
-		}
-		window.setTimeout(initStats, 50);
-		return;
-	}
-	// Entry per day
-	Flotr.draw(document.getElementById('statsEntryPerDay'),
-		[<?php echo $this->count ?>],
-		{
-			grid: {verticalLines: false},
-			bars: {horizontal: false, show: true},
-			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-	// Feed per category
-	Flotr.draw(document.getElementById('statsFeedPerCategory'),
-		<?php echo $this->feedByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
-		});
-	// Entry per category
-	Flotr.draw(document.getElementById('statsEntryPerCategory'),
-		<?php echo $this->entryByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
-		});
-}
-initStats();
-</script>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
new file mode 100644
index 000000000..5c11b3f86
--- /dev/null
+++ b/app/views/stats/idle.phtml
@@ -0,0 +1,57 @@
+<?php $this->partial('aside_stats'); ?>
+
+<div class="post content">
+        <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+        
+        <h1><?php echo Minz_Translate::t ('stats_idle'); ?></h1>
+        
+        <div class="stat">
+                <h2><?php echo Minz_Translate::t ('last_week'); ?></h2>
+
+                <ul>
+                        <?php foreach ($this->idleFeeds['lastWeek'] as $feed): ?>
+                                <li><?php echo $feed; ?></li>
+                        <?php endforeach; ?>
+                </ul>
+        </div>
+
+        <div class="stat">
+                <h2><?php echo Minz_Translate::t ('last_month'); ?></h2>
+
+                <ul>
+                        <?php foreach ($this->idleFeeds['lastMonth'] as $feed): ?>
+                                <li><?php echo $feed; ?></li>
+                        <?php endforeach; ?>
+                </ul>
+        </div>
+
+        <div class="stat">
+                <h2><?php echo Minz_Translate::t ('last_3_month'); ?></h2>
+
+                <ul>
+                        <?php foreach ($this->idleFeeds['last3Month'] as $feed): ?>
+                                <li><?php echo $feed; ?></li>
+                        <?php endforeach; ?>
+                </ul>
+        </div>
+
+        <div class="stat">
+                <h2><?php echo Minz_Translate::t ('last_6_month'); ?></h2>
+
+                <ul>
+                        <?php foreach ($this->idleFeeds['last6Month'] as $feed): ?>
+                                <li><?php echo $feed; ?></li>
+                        <?php endforeach; ?>
+                </ul>
+        </div>
+
+        <div class="stat">
+                <h2><?php echo Minz_Translate::t ('last_year'); ?></h2>
+
+                <ul>
+                        <?php foreach ($this->idleFeeds['lastYear'] as $feed): ?>
+                                <li><?php echo $feed; ?></li>
+                        <?php endforeach; ?>
+                </ul>
+        </div>
+</div>
\ No newline at end of file
diff --git a/app/views/stats/main.phtml b/app/views/stats/main.phtml
new file mode 100644
index 000000000..fe372e221
--- /dev/null
+++ b/app/views/stats/main.phtml
@@ -0,0 +1,127 @@
+<?php $this->partial('aside_stats'); ?>
+
+<div class="post content">
+        <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+        
+        <h1><?php echo Minz_Translate::t ('stats_main'); ?></h1>
+
+        <div class="stat">
+		<h2><?php echo Minz_Translate::t ('stats_entry_repartition'); ?></h2>
+		<table>
+			<thead>
+				<tr>
+					<th> </th>
+					<th><?php echo Minz_Translate::t ('main_stream'); ?></th>
+					<th><?php echo Minz_Translate::t ('all_feeds'); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<th><?php echo Minz_Translate::t ('status_total'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['total']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['total']); ?></td>
+				</tr>
+				<tr>
+					<th><?php echo Minz_Translate::t ('status_read'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['read']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['read']); ?></td>
+				</tr>
+				<tr>
+					<th><?php echo Minz_Translate::t ('status_unread'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['unread']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['unread']); ?></td>
+				</tr>
+				<tr>
+					<th><?php echo Minz_Translate::t ('status_favorites'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['favorite']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['favorite']); ?></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo Minz_Translate::t ('stats_entry_per_day'); ?></h2>
+		<div id="statsEntryPerDay" style="height: 300px"></div>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo Minz_Translate::t ('stats_feed_per_category'); ?></h2>
+		<div id="statsFeedPerCategory" style="height: 300px"></div>
+		<div id="statsFeedPerCategoryLegend"></div>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo Minz_Translate::t ('stats_entry_per_category'); ?></h2>
+		<div id="statsEntryPerCategory" style="height: 300px"></div>
+		<div id="statsEntryPerCategoryLegend"></div>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo Minz_Translate::t ('stats_top_feed'); ?></h2>
+		<table>
+			<thead>
+				<tr>
+					<th><?php echo Minz_Translate::t ('feed'); ?></th>
+					<th><?php echo Minz_Translate::t ('category'); ?></th>
+					<th><?php echo Minz_Translate::t ('stats_entry_count'); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php foreach ($this->topFeed as $feed): ?>
+					<tr>
+						<td><?php echo $feed['name']; ?></td>
+						<td><?php echo $feed['category']; ?></td>
+						<td class="numeric"><?php echo formatNumber($feed['count']); ?></td>
+					</tr>
+				<?php endforeach;?>
+			</tbody>
+		</table>
+	</div>
+</div>
+
+<script>
+"use strict";
+function initStats() {
+	if (!window.Flotr) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Flotr…');
+		}
+		window.setTimeout(initStats, 50);
+		return;
+	}
+	// Entry per day
+	Flotr.draw(document.getElementById('statsEntryPerDay'),
+		[<?php echo $this->count ?>],
+		{
+			grid: {verticalLines: false},
+			bars: {horizontal: false, show: true},
+			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+	// Feed per category
+	Flotr.draw(document.getElementById('statsFeedPerCategory'),
+		<?php echo $this->feedByCategory ?>,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
+		});
+	// Entry per category
+	Flotr.draw(document.getElementById('statsEntryPerCategory'),
+		<?php echo $this->entryByCategory ?>,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
+		});
+}
+initStats();
+</script>
-- 
cgit v1.2.3


From 60fe99344e1d87850f1a44791c1f0a675d13c756 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 15 Jun 2014 12:13:33 -0400
Subject: Refactor and formatting

---
 app/Controllers/statsController.php | 100 ++++++++++++++--------------
 app/Models/StatsDAO.php             |  24 +++----
 app/i18n/en.php                     |  14 ++--
 app/i18n/fr.php                     |  14 ++--
 app/layout/aside_stats.phtml        |   4 +-
 app/layout/header.phtml             |   2 +-
 app/views/stats/idle.phtml          |  24 +++----
 app/views/stats/index.phtml         | 127 ++++++++++++++++++++++++++++++++++++
 app/views/stats/main.phtml          | 127 ------------------------------------
 9 files changed, 216 insertions(+), 220 deletions(-)
 create mode 100644 app/views/stats/index.phtml
 delete mode 100644 app/views/stats/main.phtml

(limited to 'app/layout/header.phtml')

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index cbc67cac3..fb5609cb4 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -2,70 +2,66 @@
 
 class FreshRSS_stats_Controller extends Minz_ActionController {
 
-        public function mainAction() {
-		$this->initAction();
-                
-                $statsDAO = new FreshRSS_StatsDAO ();
+	public function indexAction() {
+		$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() {
-		$this->initAction();
+	}
 
-                $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');
+	public function idleAction() {
+		$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['last_week'][] = $feed['name'];
-                        }
-                        if ($feedDate < $lastMonth) {
-                                $idleFeeds['last_month'][] = $feed['name'];
-                        }
-                        if ($feedDate < $last3Month) {
-                                $idleFeeds['last_3_month'][] = $feed['name'];
-                        }
-                        if ($feedDate < $last6Month) {
-                                $idleFeeds['last_6_month'][] = $feed['name'];
-                        }
-                        if ($feedDate < $lastYear) {
-                                $idleFeeds['last_year'][] = $feed['name'];
-                        }
-                }
+		foreach ($feeds as $feed) {
+			$feedDate->setTimestamp($feed['last_date']);
+			if ($feedDate >= $lastWeek) {
+				continue;
+			}
+			if ($feedDate < $lastWeek) {
+				$idleFeeds['last_week'][] = $feed['name'];
+			}
+			if ($feedDate < $lastMonth) {
+				$idleFeeds['last_month'][] = $feed['name'];
+			}
+			if ($feedDate < $last3Month) {
+				$idleFeeds['last_3_month'][] = $feed['name'];
+			}
+			if ($feedDate < $last6Month) {
+				$idleFeeds['last_6_month'][] = $feed['name'];
+			}
+			if ($feedDate < $lastYear) {
+				$idleFeeds['last_year'][] = $feed['name'];
+			}
+		}
 
-                $this->view->idleFeeds = array_reverse($idleFeeds);
-        }
+		$this->view->idleFeeds = array_reverse($idleFeeds);
+	}
 	
-	private function initAction() {
+	public function firstAction() {
 		if (!$this->view->loginOk) {
-                        Minz_Error::error(
-                            403, array('error' => array(Minz_Translate::t('access_denied')))
-                        );
-                }
+			Minz_Error::error(
+			    403, array('error' => array(Minz_Translate::t('access_denied')))
+			);
+		}
 
-                Minz_View::prependTitle(Minz_Translate::t('stats') . ' · ');
+		Minz_View::prependTitle(Minz_Translate::t('stats') . ' · ');
 	}
 
 }
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index f9f4740fd..eafe86407 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -180,14 +180,14 @@ SQL;
 		$stm->execute();
 		return $stm->fetchAll(PDO::FETCH_ASSOC);
 	}
-        
-        /**
-         * Calculates the last publication date for each feed
-         * 
-         * @return array
-         */
-        public function calculateFeedLastDate() {
-                $sql = <<<SQL
+	
+	/**
+	 * Calculates the last publication date for each feed
+	 * 
+	 * @return array
+	 */
+	public function calculateFeedLastDate() {
+		$sql = <<<SQL
 SELECT MAX(f.name) AS name
 , MAX(date) AS last_date
 FROM {$this->prefix}feed AS f,
@@ -196,10 +196,10 @@ WHERE f.id = e.id_feed
 GROUP BY f.id
 ORDER BY name
 SQL;
-                $stm = $this->bd->prepare($sql);
-                $stm->execute();
-                return $stm->fetchAll(PDO::FETCH_ASSOC);
-        }
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		return $stm->fetchAll(PDO::FETCH_ASSOC);
+	}
 
 	private function convertToSerie($data) {
 		$serie = array();
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 8d5f305c0..19cf4a06d 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -46,14 +46,14 @@ return array (
 	'no_query_filter'		=> 'No filter',
 	'about'				=> 'About',
 	'stats'				=> 'Statistics',
-        'stats_idle'                    => 'Idle feeds',
-        'stats_main'                    => 'Main statistics',
+	'stats_idle'			=> 'Idle feeds',
+	'stats_main'			=> 'Main statistics',
     
-        'last_week'                     => 'Last week',
-        'last_month'                    => 'Last month',
-        'last_3_month'                  => 'Last three months',
-        'last_6_month'                  => 'Last six months',
-        'last_year'                     => 'Last year',
+	'last_week'			=> 'Last week',
+	'last_month'			=> 'Last month',
+	'last_3_month'			=> 'Last three months',
+	'last_6_month'			=> 'Last six months',
+	'last_year'			=> 'Last year',
 
 	'your_rss_feeds'		=> 'Your RSS feeds',
 	'add_rss_feed'			=> 'Add a RSS feed',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 3441425df..54fe55ea0 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -46,14 +46,14 @@ return array (
 	'no_query_filter'		=> 'Aucun filtre appliqué',
 	'about'				=> 'À propos',
 	'stats'				=> 'Statistiques',
-        'stats_idle'                    => 'Flux inactifs',
-        'stats_main'                    => 'Statistiques principales',
+	'stats_idle'			=> 'Flux inactifs',
+	'stats_main'			=> 'Statistiques principales',
 
-        'last_week'                     => 'La dernière semaine',
-        'last_month'                    => 'Le dernier mois',
-        'last_3_month'                  => 'Les derniers trois mois',
-        'last_6_month'                  => 'Les derniers six mois',
-        'last_year'                     => 'La dernière année',
+	'last_week'			=> 'La dernière semaine',
+	'last_month'			=> 'Le dernier mois',
+	'last_3_month'			=> 'Les derniers trois mois',
+	'last_6_month'			=> 'Les derniers six mois',
+	'last_year'			=> 'La dernière année',
 
 	'your_rss_feeds'		=> 'Vos flux RSS',
 	'add_rss_feed'			=> 'Ajouter un flux RSS',
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
index bc1e85592..32a3f5dee 100644
--- a/app/layout/aside_stats.phtml
+++ b/app/layout/aside_stats.phtml
@@ -1,7 +1,7 @@
 <ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo Minz_Translate::t ('stats'); ?></li>
-	<li class="item<?php echo Minz_Request::actionName () == 'main' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'main'); ?>"><?php echo Minz_Translate::t ('stats_main'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName () == 'index' ? ' active' : ''; ?>">
+		<a href="<?php echo _url ('stats', 'index'); ?>"><?php echo Minz_Translate::t ('stats_main'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName () == 'idle' ? ' active' : ''; ?>">
 		<a href="<?php echo _url ('stats', 'idle'); ?>"><?php echo Minz_Translate::t ('stats_idle'); ?></a>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 3be3e496d..46e248ac8 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -76,7 +76,7 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url ('stats', 'main'); ?>"><?php echo Minz_Translate::t ('stats'); ?></a></li>
+				<li class="item"><a href="<?php echo _url ('stats', 'index'); ?>"><?php echo Minz_Translate::t ('stats'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Minz_Translate::t ('logs'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about'); ?></a></li>
 				<?php
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 26806bb0e..3ea70624a 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -1,19 +1,19 @@
 <?php $this->partial('aside_stats'); ?>
 
 <div class="post content">
-        <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
-        
-        <h1><?php echo Minz_Translate::t ('stats_idle'); ?></h1>
-        
-        <?php foreach ($this->idleFeeds as $period => $feeds){ ?>
-                <div class="stat">
-                        <h2><?php echo Minz_Translate::t ($period); ?></h2>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t ('back_to_rss_feeds'); ?></a>
+	
+	<h1><?php echo _t ('stats_idle'); ?></h1>
+	
+	<?php foreach ($this->idleFeeds as $period => $feeds){ ?>
+		<div class="stat">
+			<h2><?php echo _t ($period); ?></h2>
 
-                        <ul>
-                                <?php foreach ($feeds as $feed){ ?>
-                                        <li><?php echo $feed; ?></li>
+			<ul>
+				<?php foreach ($feeds as $feed){ ?>
+					<li><?php echo $feed; ?></li>
 				<?php } ?>
-                        </ul>
-                </div>
+			</ul>
+		</div>
 	<?php } ?>
 </div>
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
new file mode 100644
index 000000000..a48181fe4
--- /dev/null
+++ b/app/views/stats/index.phtml
@@ -0,0 +1,127 @@
+<?php $this->partial('aside_stats'); ?>
+
+<div class="post content">
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t ('back_to_rss_feeds'); ?></a>
+	
+	<h1><?php echo _t ('stats_main'); ?></h1>
+
+	<div class="stat">
+		<h2><?php echo _t ('stats_entry_repartition'); ?></h2>
+		<table>
+			<thead>
+				<tr>
+					<th> </th>
+					<th><?php echo _t ('main_stream'); ?></th>
+					<th><?php echo _t ('all_feeds'); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<th><?php echo _t ('status_total'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['total']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['total']); ?></td>
+				</tr>
+				<tr>
+					<th><?php echo _t ('status_read'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['read']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['read']); ?></td>
+				</tr>
+				<tr>
+					<th><?php echo _t ('status_unread'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['unread']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['unread']); ?></td>
+				</tr>
+				<tr>
+					<th><?php echo _t ('status_favorites'); ?></th>
+					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['favorite']); ?></td>
+					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['favorite']); ?></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo _t ('stats_entry_per_day'); ?></h2>
+		<div id="statsEntryPerDay" style="height: 300px"></div>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo _t ('stats_feed_per_category'); ?></h2>
+		<div id="statsFeedPerCategory" style="height: 300px"></div>
+		<div id="statsFeedPerCategoryLegend"></div>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo _t ('stats_entry_per_category'); ?></h2>
+		<div id="statsEntryPerCategory" style="height: 300px"></div>
+		<div id="statsEntryPerCategoryLegend"></div>
+	</div>
+	
+	<div class="stat">
+		<h2><?php echo _t ('stats_top_feed'); ?></h2>
+		<table>
+			<thead>
+				<tr>
+					<th><?php echo _t ('feed'); ?></th>
+					<th><?php echo _t ('category'); ?></th>
+					<th><?php echo _t ('stats_entry_count'); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php foreach ($this->topFeed as $feed): ?>
+					<tr>
+						<td><?php echo $feed['name']; ?></td>
+						<td><?php echo $feed['category']; ?></td>
+						<td class="numeric"><?php echo formatNumber($feed['count']); ?></td>
+					</tr>
+				<?php endforeach;?>
+			</tbody>
+		</table>
+	</div>
+</div>
+
+<script>
+"use strict";
+function initStats() {
+	if (!window.Flotr) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Flotr…');
+		}
+		window.setTimeout(initStats, 50);
+		return;
+	}
+	// Entry per day
+	Flotr.draw(document.getElementById('statsEntryPerDay'),
+		[<?php echo $this->count ?>],
+		{
+			grid: {verticalLines: false},
+			bars: {horizontal: false, show: true},
+			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+	// Feed per category
+	Flotr.draw(document.getElementById('statsFeedPerCategory'),
+		<?php echo $this->feedByCategory ?>,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
+		});
+	// Entry per category
+	Flotr.draw(document.getElementById('statsEntryPerCategory'),
+		<?php echo $this->entryByCategory ?>,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
+		});
+}
+initStats();
+</script>
diff --git a/app/views/stats/main.phtml b/app/views/stats/main.phtml
deleted file mode 100644
index fe372e221..000000000
--- a/app/views/stats/main.phtml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php $this->partial('aside_stats'); ?>
-
-<div class="post content">
-        <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
-        
-        <h1><?php echo Minz_Translate::t ('stats_main'); ?></h1>
-
-        <div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_entry_repartition'); ?></h2>
-		<table>
-			<thead>
-				<tr>
-					<th> </th>
-					<th><?php echo Minz_Translate::t ('main_stream'); ?></th>
-					<th><?php echo Minz_Translate::t ('all_feeds'); ?></th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_total'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['total']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['total']); ?></td>
-				</tr>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_read'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['read']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['read']); ?></td>
-				</tr>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_unread'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['unread']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['unread']); ?></td>
-				</tr>
-				<tr>
-					<th><?php echo Minz_Translate::t ('status_favorites'); ?></th>
-					<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['favorite']); ?></td>
-					<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['favorite']); ?></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_entry_per_day'); ?></h2>
-		<div id="statsEntryPerDay" style="height: 300px"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_feed_per_category'); ?></h2>
-		<div id="statsFeedPerCategory" style="height: 300px"></div>
-		<div id="statsFeedPerCategoryLegend"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_entry_per_category'); ?></h2>
-		<div id="statsEntryPerCategory" style="height: 300px"></div>
-		<div id="statsEntryPerCategoryLegend"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo Minz_Translate::t ('stats_top_feed'); ?></h2>
-		<table>
-			<thead>
-				<tr>
-					<th><?php echo Minz_Translate::t ('feed'); ?></th>
-					<th><?php echo Minz_Translate::t ('category'); ?></th>
-					<th><?php echo Minz_Translate::t ('stats_entry_count'); ?></th>
-				</tr>
-			</thead>
-			<tbody>
-				<?php foreach ($this->topFeed as $feed): ?>
-					<tr>
-						<td><?php echo $feed['name']; ?></td>
-						<td><?php echo $feed['category']; ?></td>
-						<td class="numeric"><?php echo formatNumber($feed['count']); ?></td>
-					</tr>
-				<?php endforeach;?>
-			</tbody>
-		</table>
-	</div>
-</div>
-
-<script>
-"use strict";
-function initStats() {
-	if (!window.Flotr) {
-		if (window.console) {
-			console.log('FreshRSS waiting for Flotr…');
-		}
-		window.setTimeout(initStats, 50);
-		return;
-	}
-	// Entry per day
-	Flotr.draw(document.getElementById('statsEntryPerDay'),
-		[<?php echo $this->count ?>],
-		{
-			grid: {verticalLines: false},
-			bars: {horizontal: false, show: true},
-			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-	// Feed per category
-	Flotr.draw(document.getElementById('statsFeedPerCategory'),
-		<?php echo $this->feedByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
-		});
-	// Entry per category
-	Flotr.draw(document.getElementById('statsEntryPerCategory'),
-		<?php echo $this->entryByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
-		});
-}
-initStats();
-</script>
-- 
cgit v1.2.3


From c1728fe0d776ccdedc20efd3120da599ac4157ed Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 9 Jul 2014 19:39:21 +0200
Subject: Coding style header.phtml + possibility to change logo

See https://github.com/marienfressinaud/FreshRSS/issues/532
---
 app/Models/Themes.php        |   1 +
 app/layout/header.phtml      | 102 +++++++++++++++++++++----------------------
 p/themes/Dark/icons/icon.svg |  12 +++++
 3 files changed, 64 insertions(+), 51 deletions(-)
 create mode 100644 p/themes/Dark/icons/icon.svg

(limited to 'app/layout/header.phtml')

diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index b4e8f4ccc..da2bc9f90 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -78,6 +78,7 @@ class FreshRSS_Themes extends Minz_Model {
 			'down' => '▽',
 			'favorite' => '★',
 			'help' => 'ⓘ',
+			'icon' => '⊚',
 			'key' => '⚿',
 			'link' => '↗',
 			'login' => '🔒',
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 46e248ac8..2e42bfdea 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -2,20 +2,20 @@
 if (Minz_Configuration::canLogIn()) {
 	?><ul class="nav nav-head nav-login"><?php
 	switch (Minz_Configuration::authType()) {
-		case 'form':
-			if ($this->loginOk) {
-				?><li class="item"><?php echo FreshRSS_Themes::icon('logout'); ?> <a class="signout" href="<?php echo _url ('index', 'formLogout'); ?>"><?php echo Minz_Translate::t ('logout'); ?></a></li><?php
-			} else {
-				?><li class="item"><?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="<?php echo _url ('index', 'formLogin'); ?>"><?php echo Minz_Translate::t ('login'); ?></a></li><?php
-			}
-			break;
-		case 'persona':
-			if ($this->loginOk) {
-				?><li class="item"><?php echo FreshRSS_Themes::icon('logout'); ?> <a class="signout" href="#"><?php echo Minz_Translate::t ('logout'); ?></a></li><?php
-			} else {
-				?><li class="item"><?php echo FreshRSS_Themes::icon('login'); ?> <a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a></li><?php
-			}
-			break;
+	case 'form':
+		if ($this->loginOk) {
+			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('index', 'formLogout'); ?>"><?php echo _t('logout'); ?></a></li><?php
+		} else {
+			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('index', 'formLogin'); ?>"><?php echo _t('login'); ?></a></li><?php
+		}
+		break;
+	case 'persona':
+		if ($this->loginOk) {
+			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="#"><?php echo _t('logout'); ?></a></li><?php
+		} else {
+			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="#"><?php echo _t('login'); ?></a></li><?php
+		}
+		break;
 	}
 	?></ul><?php
 }
@@ -24,36 +24,36 @@ if (Minz_Configuration::canLogIn()) {
 <div class="header">
 	<div class="item title">
 		<h1>
-			<a href="<?php echo _url ('index', 'index'); ?>">
-				<img class="logo" src="<?php echo Minz_Url::display ('/themes/icons/icon.svg'); ?>" alt="⊚" />
-				<?php echo Minz_Configuration::title (); ?>
+			<a href="<?php echo _url('index', 'index'); ?>">
+				<img class="logo" src="<?php echo _i('icon', true); ?>" alt="⊚" />
+				<?php echo Minz_Configuration::title(); ?>
 			</a>
 		</h1>
 	</div>
 
 	<div class="item search">
 		<?php if ($this->loginOk || Minz_Configuration::allowAnonymous()) { ?>
-		<form action="<?php echo _url ('index', 'index'); ?>" method="get">
+		<form action="<?php echo _url('index', 'index'); ?>" method="get">
 			<div class="stick">
-				<?php $search = Minz_Request::param ('search', ''); ?>
-				<input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo Minz_Translate::t ('search'); ?>" />
+				<?php $search = Minz_Request::param('search', ''); ?>
+				<input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search'); ?>" />
 
-				<?php $get = Minz_Request::param ('get', ''); ?>
-				<?php if($get != '') { ?>
+				<?php $get = Minz_Request::param('get', ''); ?>
+				<?php if ($get != '') { ?>
 				<input type="hidden" name="get" value="<?php echo $get; ?>" />
 				<?php } ?>
 
-				<?php $order = Minz_Request::param ('order', ''); ?>
-				<?php if($order != '') { ?>
+				<?php $order = Minz_Request::param('order', ''); ?>
+				<?php if ($order != '') { ?>
 				<input type="hidden" name="order" value="<?php echo $order; ?>" />
 				<?php } ?>
 
-				<?php $state = Minz_Request::param ('state', ''); ?>
-				<?php if($state != '') { ?>
+				<?php $state = Minz_Request::param('state', ''); ?>
+				<?php if ($state != '') { ?>
 				<input type="hidden" name="state" value="<?php echo $state; ?>" />
 				<?php } ?>
 
-				<button class="btn" type="submit"><?php echo FreshRSS_Themes::icon('search'); ?></button>
+				<button class="btn" type="submit"><?php echo _i('search'); ?></button>
 			</div>
 		</form>
 		<?php } ?>
@@ -63,32 +63,32 @@ if (Minz_Configuration::canLogIn()) {
 	<div class="item configure">
 		<div class="dropdown">
 			<div id="dropdown-configure" class="dropdown-target"></div>
-			<a class="btn dropdown-toggle" href="#dropdown-configure"><?php echo FreshRSS_Themes::icon('configure'); ?></a>
+			<a class="btn dropdown-toggle" href="#dropdown-configure"><?php echo _i('configure'); ?></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
-				<li class="dropdown-header"><?php echo Minz_Translate::t ('configuration'); ?></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('display_configuration'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'reading'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'queries'); ?>"><?php echo Minz_Translate::t ('queries'); ?></a></li>
+				<li class="dropdown-header"><?php echo _t('configuration'); ?></li>
+				<li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a></li>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a></li>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url ('stats', 'index'); ?>"><?php echo Minz_Translate::t ('stats'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Minz_Translate::t ('logs'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('stats'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('logs'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about'); ?></a></li>
 				<?php
 				if (Minz_Configuration::canLogIn()) {
 					?><li class="separator"></li><?php
 					switch (Minz_Configuration::authType()) {
-						case 'form':
-							?><li class="item"><a class="signout" href="<?php echo _url ('index', 'formLogout'); ?>"><?php echo FreshRSS_Themes::icon('logout'), ' ', Minz_Translate::t ('logout'); ?></a></li><?php
-							break;
-						case 'persona':
-							?><li class="item"><a class="signout" href="#"><?php echo FreshRSS_Themes::icon('logout'), ' ', Minz_Translate::t ('logout'); ?></a></li><?php
-							break;
+					case 'form':
+						?><li class="item"><a class="signout" href="<?php echo _url('index', 'formLogout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
+						break;
+					case 'persona':
+						?><li class="item"><a class="signout" href="#"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
+						break;
 					}
 				} ?>
 			</ul>
@@ -97,12 +97,12 @@ if (Minz_Configuration::canLogIn()) {
 	<?php } elseif (Minz_Configuration::canLogIn()) {
 		?><div class="item configure"><?php
 		switch (Minz_Configuration::authType()) {
-			case 'form':
-				echo FreshRSS_Themes::icon('login'); ?><a class="signin" href="<?php echo _url ('index', 'formLogin'); ?>"><?php echo Minz_Translate::t ('login'); ?></a></li><?php
-				break;
-			case 'persona':
-				echo FreshRSS_Themes::icon('login'); ?><a class="signin" href="#"><?php echo Minz_Translate::t ('login'); ?></a></li><?php
-				break;
+		case 'form':
+			echo _i('login'); ?><a class="signin" href="<?php echo _url('index', 'formLogin'); ?>"><?php echo _t('login'); ?></a></li><?php
+			break;
+		case 'persona':
+			echo _i('login'); ?><a class="signin" href="#"><?php echo _t('login'); ?></a></li><?php
+			break;
 		}
 		?></div><?php
 	} ?>
diff --git a/p/themes/Dark/icons/icon.svg b/p/themes/Dark/icons/icon.svg
new file mode 100644
index 000000000..4eb53dda9
--- /dev/null
+++ b/p/themes/Dark/icons/icon.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256">
+	<title>Logo FreshRSS</title>
+	<circle fill="#6986B2" cx="128" cy="128" r="33"/>
+	<g fill="none" stroke="#6986B2" stroke-width="24">
+		<g stroke-opacity="0.3">
+			<path d="M12,128 A116,116 0 1,1 128,244"/>
+			<path d="M54,128 A74,74 0 1,1 128,202"/>
+		</g>
+		<path d="M128,12 A116,116 0 0,1 244,128"/>
+		<path d="M128,54 A74,74 0 0,1 202,128"/>
+	</g>
+</svg>
-- 
cgit v1.2.3


From e7dba0ce7cfaf5e84687593a8b0d58d89fbff302 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 9 Aug 2014 23:29:13 +0200
Subject: Add basic system of update

- Check on update.freshrss.org for new updates
- Download script
- Apply script
- Need translations and verifications

NOTE: current script on server indicates version 0.7.3 is an update
of 0.8-dev ==> IT'S ONLY FOR MY TESTS!

Script just does a backup of ./data actually...

See https://github.com/marienfressinaud/FreshRSS/issues/411
---
 app/Controllers/updateController.php | 106 +++++++++++++++++++++++++++++++++++
 app/i18n/en.php                      |   2 +
 app/i18n/fr.php                      |   2 +
 app/layout/aside_configure.phtml     |  38 ++++++++-----
 app/layout/header.phtml              |   6 ++
 app/views/update/index.phtml         |  19 +++++++
 constants.php                        |   2 +
 lib/Minz/View.php                    |  15 +++--
 8 files changed, 171 insertions(+), 19 deletions(-)
 create mode 100644 app/Controllers/updateController.php
 create mode 100644 app/views/update/index.phtml

(limited to 'app/layout/header.phtml')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
new file mode 100644
index 000000000..a15cb9fd5
--- /dev/null
+++ b/app/Controllers/updateController.php
@@ -0,0 +1,106 @@
+<?php
+
+class FreshRSS_update_Controller extends Minz_ActionController {
+	public function firstAction() {
+		$current_user = Minz_Session::param('currentUser', '');
+		if (!$this->view->loginOk && Minz_Configuration::isAdmin($current_user)) {
+			Minz_Error::error(
+				403,
+				array('error' => array(_t('access_denied')))
+			);
+		}
+
+		Minz_View::prependTitle(_t('update_system') . ' · ');
+	}
+
+	public function indexAction() {
+		if (file_exists(UPDATE_FILENAME)) {
+			// There is an update file to apply!
+			$this->view->message = array(
+				'status' => 'good',
+				'title' => _t('ok'),
+				'body' => _t('update_can_apply', _url('update', 'apply'))
+			);
+
+			return;
+		}
+	}
+
+	public function checkAction() {
+		$this->view->change_view('update', 'index');
+
+		if (file_exists(UPDATE_FILENAME)) {
+			// There is already an update file to apply: we don't need to check
+			// the webserver!
+			$this->view->message = array(
+				'status' => 'good',
+				'title' => _t('ok'),
+				'body' => _t('update_can_apply', _url('update', 'apply'))
+			);
+
+			return;
+		}
+
+		$c = curl_init(FRESHRSS_UPDATE_WEBSITE);
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+		$result = curl_exec($c);
+
+		if (curl_getinfo($c, CURLINFO_HTTP_CODE) == 200) {
+			$res_array = explode("\n", $result, 2);
+			$status = $res_array[0];
+
+			if (strpos($status, 'UPDATE') === 0) {
+				$script = $res_array[1];
+				if (file_put_contents(UPDATE_FILENAME, $script) !== false) {
+					$this->view->message = array(
+						'status' => 'good',
+						'title' => _t('ok'),
+						'body' => _t('update_can_apply', _url('update', 'apply'))
+					);
+				} else {
+					$this->view->message = array(
+						'status' => 'bad',
+						'title' => _t('damn'),
+						'body' => _t('update_problem')
+					);
+				}
+			} else {
+				$this->view->message = array(
+					'status' => 'bad',
+					'title' => _t('damn'),
+					'body' => _t('no_update')
+				);
+			}
+		} else {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('damn'),
+				'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
+			);
+		}
+		curl_close($c);
+	}
+
+	public function applyAction() {
+		require(UPDATE_FILENAME);
+		$res = apply_update();
+
+		if ($res === true) {
+			@unlink(UPDATE_FILENAME);
+
+			Minz_Session::_param('notification', array(
+				'type' => 'good',
+				'content' => Minz_Translate::t('update_finished')
+			));
+
+			Minz_Request::forward(array(), true);
+		} else {
+			Minz_Session::_param('notification', array(
+				'type' => 'bad',
+				'content' => Minz_Translate::t('update_failed', $res)
+			));
+
+			Minz_Request::forward(array('c' => 'update'), true);
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/i18n/en.php b/app/i18n/en.php
index d80299b10..6110ccb11 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -408,4 +408,6 @@ return array (
 	'stats_entry_per_category'	=> 'Entries per category',
 	'stats_top_feed'		=> 'Top ten feeds',
 	'stats_entry_count'		=> 'Entry count',
+
+	'update_can_apply'		=> 'There is an available update. <a class="btn" href="%s">Apply</a>',
 );
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 4be028ac3..5f88aa069 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -408,4 +408,6 @@ return array (
 	'stats_entry_per_category'	=> 'Articles par catégorie',
 	'stats_top_feed'		=> 'Les dix plus gros flux',
 	'stats_entry_count'		=> 'Nombre d’articles',
+
+	'update_can_apply'		=> 'Il y’a une mise à jour à appliquer. <a class="btn" href="%s">Appliquer</a>',
 );
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index e66f2f64c..03bea4836 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,25 +1,33 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo Minz_Translate::t ('configuration'); ?></li>
-	<li class="item<?php echo Minz_Request::actionName () == 'display' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('display_configuration'); ?></a>
+	<li class="nav-header"><?php echo _t('configuration'); ?></li>
+	<li class="item<?php echo Minz_Request::actionName() == 'display' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'reading' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'reading'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'reading' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'archiving' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'archiving' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'sharing' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'sharing' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'shortcut' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'shortcut' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'queries' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'queries'); ?>"><?php echo Minz_Translate::t ('queries'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'queries' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
 	</li>
 	<li class="separator"></li>
-	<li class="item<?php echo Minz_Request::actionName () == 'users' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'users' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a>
 	</li>
+	<?php
+		$current_user = Minz_Session::param('currentUser', '');
+		if (Minz_Configuration::isAdmin($current_user)) {
+	?>
+	<li class="item<?php echo Minz_Request::controllerName() == 'update' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
+	</li>
+	<?php } ?>
 </ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 2e42bfdea..028e63d8a 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -75,6 +75,12 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a></li>
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a></li>
+				<?php
+					$current_user = Minz_Session::param('currentUser', '');
+					if (Minz_Configuration::isAdmin($current_user)) {
+				?>
+				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
+				<?php } ?>
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('stats'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('logs'); ?></a></li>
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
new file mode 100644
index 000000000..a1a872845
--- /dev/null
+++ b/app/views/update/index.phtml
@@ -0,0 +1,19 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<h1><?php echo _t('update_system'); ?></h1>
+
+	<?php if (!empty($this->message)) { ?>
+	<p class="alert <?php echo $this->message['status'] === 'bad' ? 'alert-error' : 'alert-warn'; ?>">
+		<span class="alert-head"><?php echo $this->message['title']; ?></span>
+		<?php echo $this->message['body']; ?>
+	</p>
+	<?php } ?>
+
+	<?php if (empty($this->message) || $this->message['status'] !== 'good') { ?>
+	<p>
+		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('update_check'); ?></a>
+		<?php echo _i('help'); ?> <?php echo _t('update_last', $this->last_update_time); ?>
+	</p>
+	<?php } ?>
+</div>
diff --git a/constants.php b/constants.php
index e32b8cbc3..a968b82f4 100644
--- a/constants.php
+++ b/constants.php
@@ -1,6 +1,7 @@
 <?php
 define('FRESHRSS_VERSION', '0.8-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
+define('FRESHRSS_UPDATE_WEBSITE', 'http://update.freshrss.org?v=' . FRESHRSS_VERSION);
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
 define('PHP_COMPRESSION', false);
@@ -13,6 +14,7 @@ define('FRESHRSS_PATH', dirname(__FILE__));
 		define('PUBLIC_RELATIVE', '..');
 
 	define('DATA_PATH', FRESHRSS_PATH . '/data');
+		define('UPDATE_FILENAME', DATA_PATH . '/update.php');
 		define('LOG_PATH', DATA_PATH . '/log');
 		define('CACHE_PATH', DATA_PATH . '/cache');
 
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index f034ab10b..a0dec1824 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -26,12 +26,19 @@ class Minz_View {
 	 * Détermine si on utilise un layout ou non
 	 */
 	public function __construct () {
+		$this->change_view(Minz_Request::controllerName(),
+		                   Minz_Request::actionName());
+		self::$title = Minz_Configuration::title ();
+	}
+
+	/**
+	 * Change le fichier de vue en fonction d'un controller / action
+	 */
+	public function change_view($controller_name, $action_name) {
 		$this->view_filename = APP_PATH
 		                     . self::VIEWS_PATH_NAME . '/'
-		                     . Minz_Request::controllerName () . '/'
-		                     . Minz_Request::actionName () . '.phtml';
-
-		self::$title = Minz_Configuration::title ();
+		                     . $controller_name . '/'
+		                     . $action_name . '.phtml';
 	}
 
 	/**
-- 
cgit v1.2.3