From 59c17a3c6c26d6b487e2ec5e02caa3fb26f9ff9c Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 27 Sep 2014 08:20:13 -0400
Subject: [PATCH 001/363] Fix read all shortcut

Before, the read all shortcut raised a javascript exception when we use the confirmation option. The confirmation was not even displayed. The code was failling since there was a missing variable.
Now, the shortcut ask for confirmation when the option is selected in the reading configuration page.

The definition of the shortcut was buggy since the confirmation was handled properly in an other location. I simplified the code by removing the confirmation code in the shortcut.
---
 p/scripts/main.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index f6d5d2907..8a45ae896 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -538,14 +538,7 @@ function init_shortcuts() {
 	});
 	shortcut.add("shift+" + shortcuts.mark_read, function () {
 		// on marque tout comme lu
-		var btn = $(".nav_menu .read_all");
-		if (btn.hasClass('confirm')) {
-			if (confirm(str_confirmation)) {
-				btn.click();
-			}
-		} else {
-			btn.click();
-		}
+		$(".nav_menu .read_all").click();
 	}, {
 		'disable_in_input': true
 	});

From 3d288eb170091c2679cac34ee09e850b56e46861 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 29 Sep 2014 18:26:28 -0400
Subject: [PATCH 002/363] Add percent of total on top 10 feeds

---
 app/i18n/en.php             | 1 +
 app/i18n/fr.php             | 1 +
 app/views/stats/index.phtml | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/i18n/en.php b/app/i18n/en.php
index beba02c4d..0d3654744 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -56,6 +56,7 @@ return array (
 	'stats_entry_per_hour'		=> 'Per hour',
 	'stats_entry_per_day_of_week'	=> 'Per day of week',
 	'stats_entry_per_month'		=> 'Per month',
+	'stats_percent_of_total'	=> '%% of total',
     
 	'last_week'			=> 'Last week',
 	'last_month'			=> 'Last month',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index b0fbf15ae..c72fc3e93 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -56,6 +56,7 @@ return array (
 	'stats_entry_per_hour'		=> 'Par heure',
 	'stats_entry_per_day_of_week'	=> 'Par jour de la semaine',
 	'stats_entry_per_month'		=> 'Par mois',
+	'stats_percent_of_total'	=> '%% du total',
 
 	'last_week'			=> 'Depuis la semaine dernière',
 	'last_month'			=> 'Depuis le mois dernier',
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 412e77e16..31185fbe3 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -48,6 +48,7 @@
 					<th><?php echo _t ('feed'); ?></th>
 					<th><?php echo _t ('category'); ?></th>
 					<th><?php echo _t ('stats_entry_count'); ?></th>
+					<th><?php echo _t ('stats_percent_of_total'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -56,6 +57,7 @@
 						<td><a href="<?php echo _url('stats', 'repartition', 'id', $feed['id']); ?>"><?php echo $feed['name']; ?></a></td>
 						<td><?php echo $feed['category']; ?></td>
 						<td class="numeric"><?php echo formatNumber($feed['count']); ?></td>
+						<td class="numeric"><?php echo formatNumber($feed['count'] / $this->repartition['all_feeds']['total'] * 100, 1);?></td>
 					</tr>
 				<?php endforeach;?>
 			</tbody>

From cd88414abcffd94cfce933cf578ecc640b691381 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 29 Sep 2014 18:54:03 -0400
Subject: [PATCH 003/363] Add an average per day for the 30 day period

---
 app/Controllers/statsController.php |  1 +
 app/Models/StatsDAO.php             | 27 ++++++++++++++++++++++++---
 app/Models/StatsDAOSQLite.php       | 23 +++++++++++++++++++++++
 app/views/stats/index.phtml         | 16 +++++++++++++---
 4 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 256543f37..3069be34d 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -21,6 +21,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		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->average = $statsDAO->calculateEntryAverage();
 		$this->view->feedByCategory = $statsDAO->calculateFeedByCategory();
 		$this->view->entryByCategory = $statsDAO->calculateEntryByCategory();
 		$this->view->topFeed = $statsDAO->calculateTopFeed();
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 40505ab3e..08dd4cd5c 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -79,6 +79,27 @@ SQL;
 		return $this->convertToSerie($count);
 	}
 
+	/**
+	 * Calculates entry average per day on a 30 days period.
+	 *
+	 * @return integer
+	 */
+	public function calculateEntryAverage() {
+		$period = self::ENTRY_COUNT_PERIOD;
+
+		// Get stats per day for the last 30 days
+		$sql = <<<SQL
+SELECT COUNT(1) / {$period} AS average
+FROM {$this->prefix}entry AS e
+WHERE FROM_UNIXTIME(e.date, '%Y%m%d') BETWEEN DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -{$period} DAY), '%Y%m%d') AND DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d')
+SQL;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetch(PDO::FETCH_NAMED);
+
+		return round($res['average'], 2);
+	}
+
 	/**
 	 * Initialize an array for the entry count.
 	 *
@@ -160,7 +181,7 @@ SQL;
 	public function calculateEntryAveragePerFeedPerHour($feed = null) {
 		return $this->calculateEntryAveragePerFeedPerPeriod(1/24, $feed);
 	}
-	
+
 	/**
 	 * Calculates the average number of article per day of week per feed
 	 *
@@ -180,10 +201,10 @@ SQL;
 	public function calculateEntryAveragePerFeedPerMonth($feed = null) {
 		return $this->calculateEntryAveragePerFeedPerPeriod(30, $feed);
 	}
-	
+
 	/**
 	 * Calculates the average number of article per feed
-	 * 
+	 *
 	 * @param float $period number used to divide the number of day in the period
 	 * @param integer $feed id
 	 * @return integer
diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php
index 3b1256de1..bb2336532 100644
--- a/app/Models/StatsDAOSQLite.php
+++ b/app/Models/StatsDAOSQLite.php
@@ -34,6 +34,29 @@ SQL;
 		return $this->convertToSerie($count);
 	}
 
+	/**
+	 * Calculates entry average per day on a 30 days period.
+	 *
+	 * @return integer
+	 */
+	public function calculateEntryAverage() {
+		$period = self::ENTRY_COUNT_PERIOD;
+
+		// Get stats per day for the last 30 days
+		$sql = <<<SQL
+SELECT COUNT(1) / {$period} AS average
+FROM {$this->prefix}entry AS e
+WHERE strftime('%Y%m%d', e.date, 'unixepoch')
+	BETWEEN strftime('%Y%m%d', 'now', '-{$period} days')
+	AND strftime('%Y%m%d', 'now', '-1 day')
+SQL;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetch(PDO::FETCH_NAMED);
+
+		return round($res['average'], 2);
+	}
+
 	protected function calculateEntryRepartitionPerFeedPerPeriod($period, $feed = null) {
 		if ($feed) {
 			$restrict = "WHERE e.id_feed = {$feed}";
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 31185fbe3..9b19cb560 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -93,12 +93,22 @@ function initStats() {
 		return;
 	}
 	// Entry per day
+	var avg = [];
+	for (var i = -31; i <= 0; i++) {
+		avg.push([i, <?php echo $this->average?>]);
+	}
 	Flotr.draw(document.getElementById('statsEntryPerDay'),
-		[<?php echo $this->count ?>],
+		[{
+			data: <?php echo $this->count ?>,
+			bars: {horizontal: false, show: true}
+		},{
+			data: avg,
+			lines: {show: true},
+			label: <?php echo $this->average?>
+		}],
 		{
 			grid: {verticalLines: false},
-			bars: {horizontal: false, show: true},
-			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0},
+			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0, min: -30.75, max: -0.25},
 			yaxis: {min: 0},
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
 		});

From fc6a3c2fd223d3c723c534768238182c917a2318 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 29 Sep 2014 18:57:40 -0400
Subject: [PATCH 004/363] Add string delimiters for averages.

Before, if the average was equal to 0, it was displayed on the graph but the label was not displayed.
Now, the label is displayed.
---
 app/views/stats/index.phtml       | 2 +-
 app/views/stats/repartition.phtml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 9b19cb560..fa57a77c0 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -104,7 +104,7 @@ function initStats() {
 		},{
 			data: avg,
 			lines: {show: true},
-			label: <?php echo $this->average?>
+			label: "<?php echo $this->average?>"
 		}],
 		{
 			grid: {verticalLines: false},
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index b425c1458..750a3ffdc 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -67,7 +67,7 @@ function initStats() {
 		}, {
 			data: avg_h,
 			lines: {show: true},
-			label: <?php echo $this->averageHour?>,
+			label: "<?php echo $this->averageHour?>",
 			yaxis: 2
 		}],
 		{
@@ -96,7 +96,7 @@ function initStats() {
 		}, {
 			data: avg_dow,
 			lines: {show: true},
-			label: <?php echo $this->averageDayOfWeek?>,
+			label: "<?php echo $this->averageDayOfWeek?>",
 			yaxis: 2
 		}],
 		{
@@ -126,7 +126,7 @@ function initStats() {
 		}, {
 			data: avg_m,
 			lines: {show: true},
-			label: <?php echo $this->averageMonth?>,
+			label: "<?php echo $this->averageMonth?>",
 			yaxis: 2
 		}],
 		{

From d087f753370541b2f35f59ded7db1aaff2370e9e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 10:10:06 +0200
Subject: [PATCH 005/363] We are working on 0.10-dev...

but it could be the 1.0!
---
 CHANGELOG     | 2 +-
 README.fr.md  | 4 ++--
 README.md     | 4 ++--
 constants.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d7de86d9b..44d3452ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 # Journal des modifications
 
-## 2014-09-xx FreshRSS 0.8.0
+## 2014-09-26 FreshRSS 0.8.0 / 0.9.0 (beta)
 
 * UI
 	* New interface for statistics
diff --git a/README.fr.md b/README.fr.md
index df43ef7e8..4e6c52d68 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -10,8 +10,8 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an
 * Site officiel : http://freshrss.org
 * Démo : http://demo.freshrss.org/
 * Développeur : Marien Fressinaud <dev@marienfressinaud.fr>
-* Version actuelle : 0.8-dev
-* Date de publication 2014-0x-xx
+* Version actuelle : 0.10-dev
+* Date de publication 2014-xx-xx
 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
diff --git a/README.md b/README.md
index 0a22df8f1..971d53ea6 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ It is a multi-user application with an anonymous reading mode.
 * Official website: http://freshrss.org
 * Demo: http://demo.freshrss.org/
 * Developer: Marien Fressinaud <dev@marienfressinaud.fr>
-* Current version: 0.8-dev
-* Publication date: 2014-0x-xx
+* Current version: 0.10-dev
+* Publication date: 2014-xx-xx
 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
diff --git a/constants.php b/constants.php
index 4c515d121..f66a012b0 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.8-dev');
+define('FRESHRSS_VERSION', '0.10-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');

From 389e8e749d486f743c0d02c089dd6d6b2b310bc7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 11:08:30 +0200
Subject: [PATCH 006/363] Add space after tag icon

Fix https://github.com/marienfressinaud/FreshRSS/issues/643
---
 app/views/helpers/view/normal_view.phtml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 1dbf14f4c..6d9789f8d 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -153,14 +153,15 @@ if (!empty($this->entries)) {
 				if (!empty($tags)) {
 				?><li class="item">
 					<div class="dropdown">
-						<div id="dropdown-tags-<?php echo $item->id ();?>" class="dropdown-target"></div>
-						<a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>"><?php
-							echo FreshRSS_Themes::icon('tag'), Minz_Translate::t ('related_tags');
+						<div id="dropdown-tags-<?php echo $item->id();?>" class="dropdown-target"></div>
+						<?php echo _i('tag'); ?>
+						<a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id();?>"><?php
+							echo _t('related_tags');
 						?></a>
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li><?php
 							foreach($tags as $tag) {
-								?><li class="item"><a href="<?php echo _url ('index', 'index', 'search', urlencode ('#' . $tag)); ?>"><?php echo $tag; ?></a></li><?php
+								?><li class="item"><a href="<?php echo _url('index', 'index', 'search', urlencode('#' . $tag)); ?>"><?php echo $tag; ?></a></li><?php
 							} ?>
 						</ul>
 					</div>

From 549500764e66529dae082f4f3cde4d639e8f189e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 12:14:28 +0200
Subject: [PATCH 007/363] Coding style (aside_feed.phtml)

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/layout/aside_feed.phtml | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 5ffb1c791..c72710c2d 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -1,75 +1,76 @@
 <ul class="nav nav-list aside aside_feed">
-	<li class="nav-header"><?php echo Minz_Translate::t ('your_rss_feeds'); ?></li>
+	<li class="nav-header"><?php echo _t('your_rss_feeds'); ?></li>
 
-	<li class="nav-form"><form id="add_rss" method="post" action="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'add')); ?>" autocomplete="off">
+	<li class="nav-form">
+		<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
 		<div class="stick">
-			<input type="url" name="url_rss" placeholder="<?php echo Minz_Translate::t ('add_rss_feed'); ?>" />
+			<input type="url" name="url_rss" placeholder="<?php echo _t('add_rss_feed'); ?>" />
 			<div class="dropdown">
 				<div id="dropdown-cat" class="dropdown-target"></div>
 
-				<a class="dropdown-toggle btn" href="#dropdown-cat"><?php echo FreshRSS_Themes::icon('down'); ?></a>
+				<a class="dropdown-toggle btn" href="#dropdown-cat"><?php echo _i('down'); ?></a>
 				<ul class="dropdown-menu">
 					<li class="dropdown-close"><a href="#close">❌</a></li>
 
-					<li class="dropdown-header"><?php echo Minz_Translate::t ('category'); ?></li>
+					<li class="dropdown-header"><?php echo _t('category'); ?></li>
 
 					<li class="input">
 						<select name="category" id="category">
 						<?php foreach ($this->categories as $cat) { ?>
-						<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id () == 1 ? ' selected="selected"' : ''; ?>>
-							<?php echo $cat->name (); ?>
+						<option value="<?php echo $cat->id(); ?>"<?php echo $cat->id() == 1 ? ' selected="selected"' : ''; ?>>
+							<?php echo $cat->name(); ?>
 						</option>
 						<?php } ?>
-						<option value="nc"><?php echo Minz_Translate::t ('new_category'); ?></option>
+						<option value="nc"><?php echo _t('new_category'); ?></option>
 						</select>
 					</li>
 
 					<li class="input" style="display:none">
-						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('new_category'); ?>" />
+						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
 					</li>
 
 					<li class="separator"></li>
 
-					<li class="dropdown-header"><?php echo Minz_Translate::t ('http_authentication'); ?></li>
+					<li class="dropdown-header"><?php echo _t('http_authentication'); ?></li>
 					<li class="input">
-						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('username'); ?>" />
+						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo _t('username'); ?>" />
 					</li>
 					<li class="input">
-						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('password'); ?>" />
+						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo _t('password'); ?>" />
 					</li>
 				</ul>
 			</div>
-			<button class="btn" type="submit"><?php echo FreshRSS_Themes::icon('add'); ?></button>
+			<button class="btn" type="submit"><?php echo _i('add'); ?></button>
 		</div>
 	</form></li>
 
 	<li class="item">
 		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
-			<?php echo Minz_Translate::t('bookmark'); ?>
+			<?php echo _t('bookmark'); ?>
 		</a>
 	</li>
 
-	<li class="item<?php echo Minz_Request::controllerName () == 'importExport' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('importExport', 'index'); ?>"><?php echo Minz_Translate::t ('import_export'); ?></a>
+	<li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('import_export'); ?></a>
 	</li>
 
-	<li class="item<?php echo Minz_Request::actionName () == 'categorize' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Minz_Translate::t ('categories_management'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'categorize' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'categorize'); ?>"><?php echo _t('categories_management'); ?></a>
 	</li>
 
 	<li class="separator"></li>
 
-	<?php if (!empty ($this->feeds)) { ?>
+	<?php if (!empty($this->feeds)) { ?>
 	<?php foreach ($this->feeds as $feed) { ?>
-	<?php $nbEntries = $feed->nbEntries (); ?>
-	<li class="item<?php echo (isset($this->flux) && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>">
-			<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" />
-			<?php echo $feed->name (); ?>
+	<?php $nbEntries = $feed->nbEntries(); ?>
+	<li class="item<?php echo (isset($this->flux) && $this->flux->id() == $feed->id()) ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>">
+		<a href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>">
+			<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
+			<?php echo $feed->name(); ?>
 		</a>
 	</li>
 	<?php } ?>
 	<?php } else { ?>
-	<li class="item disable"><?php echo Minz_Translate::t ('no_rss_feed'); ?></li>
+	<li class="item disable"><?php echo _t('no_rss_feed'); ?></li>
 	<?php } ?>
 </ul>

From 46ae0a3f5ada751c9442eca275e15450fad85509 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 14:33:28 +0200
Subject: [PATCH 008/363] BREAK CATEGORIZE SYSTEM!

And begin big changes.

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/configure/categorize.phtml | 100 +++++++++++++++------------
 p/themes/base-theme/template.css     |  20 ++++++
 2 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 23d1c9fa1..7091ff1cf 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -1,55 +1,63 @@
-<?php $this->partial ('aside_feed'); ?>
+<?php $this->partial('aside_feed'); ?>
 
-<div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+<div>
+	<form id="configure-categorize" method="post" style="display: none;"></form>
 
-	<form method="post" action="<?php echo _url ('configure', 'categorize'); ?>">
-		<legend><?php echo Minz_Translate::t ('categories_management'); ?></legend>
+	<div class="box">
+		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>
 
-		<p class="alert alert-warn"><?php echo Minz_Translate::t ('feeds_moved_category_deleted', $this->defaultCategory->name ()); ?></p>
-
-		<?php $i = 0; foreach ($this->categories as $cat) { $i++; ?>
-		<div class="form-group">
-			<label class="group-name" for="cat_<?php echo $cat->id (); ?>">
-				<?php echo Minz_Translate::t ('category_number', $i); ?>
-			</label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" id="cat_<?php echo $cat->id (); ?>" name="categories[]" value="<?php echo $cat->name (); ?>" />
-
-					<?php if ($cat->nbFeed () > 0) { ?>
-					<a class="btn" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id ()); ?>">
-						<?php echo _i('link'); ?>
-					</a>
-					<button formaction="<?php echo _url('feed', 'delete', 'id', $cat->id (), 'type', 'category'); ?>"
-					        class="btn btn-attention confirm"
-					        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-					        type="submit"><?php echo _t('ask_empty'); ?></button>
-					<?php } ?>
-				</div>
-				(<?php echo Minz_Translate::t ('number_feeds', $cat->nbFeed ()); ?>)
-
-				<?php if ($cat->id () === $this->defaultCategory->id ()) { ?>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('can_not_be_deleted'); ?>
-				<?php } ?>
-
-				<input type="hidden" name="ids[]" value="<?php echo $cat->id (); ?>" />
-			</div>
+		<div class="box-content">
+			<form action="" methos="post">
+				<input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" />
+				<input type="submit" value="<?php echo _t('submit'); ?>" />
+			</form>
 		</div>
-		<?php } ?>
+	</div>
 
-		<div class="form-group">
-			<label class="group-name" for="new_category"><?php echo Minz_Translate::t ('add_category'); ?></label>
-			<div class="group-controls">
-				<input type="text" id="new_category" name="new_category" placeholder="<?php echo Minz_Translate::t ('new_category'); ?>" />
+	<?php
+		foreach ($this->categories as $cat) {
+			$feeds = $cat->feeds();
+	?>
+	<div class="box">
+		<div class="box-title stick">
+			<input type="text" value="<?php echo $cat->name(); ?>" />
+			<div class="dropdown">
+				<div id="dropdown-cat-<?php echo $cat->id(); ?>" class="dropdown-target"></div>
+
+				<a class="dropdown-toggle btn" href="#dropdown-cat-<?php echo $cat->id(); ?>"><?php echo _i('down'); ?></a>
+				<ul class="dropdown-menu">
+					<li class="dropdown-close"><a href="#close">❌</a></li>
+
+					<li class="item">
+						<button class="as-link confirm"
+						        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+						        type="submit"
+						        form="configure-categorize"
+						        formaction="<?php echo _url('feed', 'delete', 'id', $cat->id(), 'type', 'category'); ?>"><?php echo _t('ask_empty'); ?></button>
+					</li>
+					<li class="item"><a href=""><?php echo _t('delete'); ?></a></li>
+				</ul>
 			</div>
 		</div>
 
-		<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>
+		<ul class="box-content">
+			<?php if (!empty($feeds)) { ?>
+			<?php
+					foreach ($feeds as $feed) {
+						$error = $feed->inError() ? ' error' : '';
+						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
+			?>
+			<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $error, $empty; ?>">
+				<a href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
+			</li>
+			<?php
+					}
+				} else {
+			?>
+			<li>Empty</li>
+			<?php } ?>
+		</ul>
+	</div>
+	<?php } ?>
 </div>
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index dc011503d..792eac299 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -559,6 +559,8 @@ br + br + br {
 /*=== GLOBAL VIEW */
 /*================*/
 /*=== Category boxes */
+
+/* TODO <delete> */
 #stream.global .box-category {
 	display: inline-block;
 	width: 19em;
@@ -581,6 +583,24 @@ br + br + br {
 	width: 19em;
 	max-width: 90%;
 }
+/* TODO </delete */
+
+.box {
+	display: inline-block;
+	width: 19em;
+	max-width: 95%;
+	margin: 20px 10px;
+	border: 1px solid #ccc;
+	vertical-align: top;
+}
+.box .box-content {
+	display: block;
+	overflow: auto;
+}
+.box .box-content .item {
+	width: 19em;
+	max-width: 90%;
+}
 
 /*=== Panel */
 #overlay {

From edb02c8fefdb292c96d7b37ad4e2c311e9d43b44 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 15:02:56 +0200
Subject: [PATCH 009/363] Move creation of categories in a new Controller

Category names are 255 chars max
---
 app/Controllers/categoryController.php  | 64 +++++++++++++++++++++++++
 app/Controllers/configureController.php | 12 -----
 app/Models/Category.php                 |  2 +-
 app/views/configure/categorize.phtml    |  2 +-
 4 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 app/Controllers/categoryController.php

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
new file mode 100644
index 000000000..e2d98a509
--- /dev/null
+++ b/app/Controllers/categoryController.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Controller to handle actions relative to categories.
+ * User needs to be connected.
+ */
+class FreshRSS_category_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 *
+	 */
+	public function firstAction() {
+		if (!$this->view->loginOk) {
+			Minz_Error::error(
+				403,
+				array('error' => array(_t('access_denied')))
+			);
+		}
+
+		$catDAO = new FreshRSS_CategoryDAO();
+		$catDAO->checkDefault();
+	}
+
+	/**
+	 * This action creates a new category.
+	 *
+	 * URL parameter is:
+	 *   - new-category
+	 */
+	public function createAction() {
+		$catDAO = new FreshRSS_CategoryDAO();
+		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$cat_name = Minz_Request::param('new-category');
+			if (!$cat_name) {
+				Minz_Request::bad(_t('category_no_name'), $url_redirect);
+			}
+
+			$cat = new FreshRSS_Category($cat_name);
+
+			if ($catDAO->searchByName($cat->name()) != null) {
+				Minz_Request::bad(_t('category_name_exists'), $url_redirect);
+			}
+
+			$values = array(
+				'id' => $cat->id(),
+				'name' => $cat->name(),
+			);
+
+			if ($catDAO->addCategory($values)) {
+				Minz_Request::good(_t('category_created', $cat->name()), $url_redirect);
+			} else {
+				Minz_Request::bad(_t('category_not_created'), $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+}
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 231865bd7..7ef144090 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -45,7 +45,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost()) {
 			$cats = Minz_Request::param('categories', array());
 			$ids = Minz_Request::param('ids', array());
-			$newCat = trim(Minz_Request::param('new_category', ''));
 
 			foreach ($cats as $key => $name) {
 				if (strlen($name) > 0) {
@@ -64,17 +63,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				}
 			}
 
-			if ($newCat != '') {
-				$cat = new FreshRSS_Category($newCat);
-				$values = array(
-					'id' => $cat->id(),
-					'name' => $cat->name(),
-				);
-
-				if ($catDAO->searchByName($newCat) == null) {
-					$catDAO->addCategory($values);
-				}
-			}
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('categories_updated'),
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 0a0dbd3ca..e5f6c4334 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -61,7 +61,7 @@ class FreshRSS_Category extends Minz_Model {
 		$this->id = $value;
 	}
 	public function _name ($value) {
-		$this->name = $value;
+		$this->name = substr(trim($value), 0, 255);
 	}
 	public function _feeds ($values) {
 		if (!is_array ($values)) {
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 7091ff1cf..e7435e1c7 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -7,7 +7,7 @@
 		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>
 
 		<div class="box-content">
-			<form action="" methos="post">
+			<form action="<?php echo _url('category', 'create'); ?>" method="post">
 				<input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" />
 				<input type="submit" value="<?php echo _t('submit'); ?>" />
 			</form>

From 9e0a62727f8ff3c6a68b4ef85089633677ff67ef Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 15:44:45 +0200
Subject: [PATCH 010/363] Move empty cat action in the new Controller

feedController::delete is simpler than before.
Improve coding style

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/categoryController.php | 43 ++++++++++++++++-
 app/Controllers/feedController.php     | 64 ++++++++------------------
 app/views/configure/categorize.phtml   |  8 ++--
 3 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index e2d98a509..6863c3bb8 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -26,7 +26,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	/**
 	 * This action creates a new category.
 	 *
-	 * URL parameter is:
+	 * Request parameter is:
 	 *   - new-category
 	 */
 	public function createAction() {
@@ -55,7 +55,46 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			if ($catDAO->addCategory($values)) {
 				Minz_Request::good(_t('category_created', $cat->name()), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('category_not_created'), $url_redirect);
+				Minz_Request::bad(_t('error_occured'), $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+
+	/**
+	 * This action deletes all the feeds relative to a given category
+	 *
+	 * Request parameter is:
+	 *   - id (of a category)
+	 */
+	public function emptyAction() {
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$id = Minz_Request::param('id');
+			if (!$id) {
+				Minz_Request::bad(_t('category_no_id'), $url_redirect);
+			}
+
+			// List feeds to remove then related user queries.
+			$feeds = $feedDAO->listByCategory($id);
+
+			if ($feedDAO->deleteFeedByCategory($id)) {
+				// TODO: Delete old favicons
+
+				// Remove related queries
+				foreach ($feeds as $feed) {
+					$this->view->conf->remove_query_by_get('f_' . $feed->id());
+				}
+				$this->view->conf->save();
+
+				Minz_Request::good(_t('category_emptied'), $url_redirect);
+			} else {
+				Minz_Request::bad(_t('error_occured'), $url_redirect);
 			}
 		}
 
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c7cc25fbb..7ef427ac2 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -376,62 +376,36 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
-	public function deleteAction () {
-		if (Minz_Request::isPost ()) {
-			$type = Minz_Request::param ('type', 'feed');
-			$id = Minz_Request::param ('id');
-
+	public function deleteAction() {
+		if (Minz_Request::isPost()) {
+			$id = Minz_Request::param('id');
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-			if ($type == 'category') {
-				// List feeds to remove then related user queries.
-				$feeds = $feedDAO->listByCategory($id);
 
-				if ($feedDAO->deleteFeedByCategory ($id)) {
-					// Remove related queries
-					foreach ($feeds as $feed) {
-						$this->view->conf->remove_query_by_get('f_' . $feed->id());
-					}
-					$this->view->conf->save();
+			if ($feedDAO->deleteFeed($id)) {
+				// TODO: Delete old favicon
 
-					$notif = array (
-						'type' => 'good',
-						'content' => Minz_Translate::t ('category_emptied')
-					);
-					//TODO: Delete old favicons
-				} else {
-					$notif = array (
-						'type' => 'bad',
-						'content' => Minz_Translate::t ('error_occured')
-					);
-				}
+				// Remove related queries
+				$this->view->conf->remove_query_by_get('f_' . $id);
+				$this->view->conf->save();
+
+				$notif = array(
+					'type' => 'good',
+					'content' => _t('feed_deleted')
+				);
 			} else {
-				if ($feedDAO->deleteFeed ($id)) {
-					// Remove related queries
-					$this->view->conf->remove_query_by_get('f_' . $id);
-					$this->view->conf->save();
-
-					$notif = array (
-						'type' => 'good',
-						'content' => Minz_Translate::t ('feed_deleted')
-					);
-					//TODO: Delete old favicon
-				} else {
-					$notif = array (
-						'type' => 'bad',
-						'content' => Minz_Translate::t ('error_occured')
-					);
-				}
+				$notif = array(
+					'type' => 'bad',
+					'content' => _t('error_occured')
+				);
 			}
 
-			Minz_Session::_param ('notification', $notif);
+			Minz_Session::_param('notification', $notif);
 
 			$redirect_url = Minz_Request::param('r', false, true);
 			if ($redirect_url) {
 				Minz_Request::forward($redirect_url);
-			} elseif ($type == 'category') {
-				Minz_Request::forward(array ('c' => 'configure', 'a' => 'categorize'), true);
 			} else {
-				Minz_Request::forward(array ('c' => 'configure', 'a' => 'feed'), true);
+				Minz_Request::forward(array('c' => 'configure', 'a' => 'feed'), true);
 			}
 		}
 	}
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index e7435e1c7..2d9dd65ca 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -1,7 +1,6 @@
 <?php $this->partial('aside_feed'); ?>
 
 <div>
-	<form id="configure-categorize" method="post" style="display: none;"></form>
 
 	<div class="box">
 		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>
@@ -14,6 +13,8 @@
 		</div>
 	</div>
 
+	<form id="controller-category" method="post" style="display: none;"></form>
+
 	<?php
 		foreach ($this->categories as $cat) {
 			$feeds = $cat->feeds();
@@ -32,8 +33,9 @@
 						<button class="as-link confirm"
 						        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
 						        type="submit"
-						        form="configure-categorize"
-						        formaction="<?php echo _url('feed', 'delete', 'id', $cat->id(), 'type', 'category'); ?>"><?php echo _t('ask_empty'); ?></button>
+						        form="controller-category"
+						        formaction="<?php echo _url('category', 'empty', 'id', $cat->id()); ?>">
+						        <?php echo _t('ask_empty'); ?></button>
 					</li>
 					<li class="item"><a href=""><?php echo _t('delete'); ?></a></li>
 				</ul>

From b9ddffdade8f6b8ba32684ca7eb640338074e61b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 16:09:08 +0200
Subject: [PATCH 011/363] Additional information about cat configuration

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/configure/categorize.phtml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 2d9dd65ca..5cd962ae4 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -1,6 +1,13 @@
 <?php $this->partial('aside_feed'); ?>
 
-<div>
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
+	<h2><?php echo _t('categories_management'); ?></h2>
+
+	<p class="alert alert-warn">
+		<?php echo _t('feeds_moved_category_deleted', $this->defaultCategory->name()); ?>
+	</p>
 
 	<div class="box">
 		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>

From 13fb1170c06bd67ba69534e823ea6f5861c745dd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 16:31:38 +0200
Subject: [PATCH 012/363] Move deletion of categories into new Controller

Fix i18n (occured -> occurred)

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/categoryController.php  | 47 +++++++++++++++++++++++--
 app/Controllers/configureController.php |  7 ----
 app/views/configure/categorize.phtml    |  9 ++++-
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 6863c3bb8..be8524749 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -55,7 +55,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			if ($catDAO->addCategory($values)) {
 				Minz_Request::good(_t('category_created', $cat->name()), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('error_occured'), $url_redirect);
+				Minz_Request::bad(_t('error_occurred'), $url_redirect);
 			}
 		}
 
@@ -63,7 +63,48 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	}
 
 	/**
-	 * This action deletes all the feeds relative to a given category
+	 * This action deletes a category.
+	 * Feeds in the given category are moved in the default category.
+	 * Related user queries are deleted too.
+	 *
+	 * Request parameter is:
+	 *   - id (of a category)
+	 */
+	public function deleteAction() {
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$catDAO = new FreshRSS_CategoryDAO();
+		$default_category = $catDAO->getDefault();
+		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$id = Minz_Request::param('id');
+			if (!$id) {
+				Minz_Request::bad(_t('category_no_id'), $url_redirect);
+			}
+
+			if ($feedDAO->changeCategory($id, $default_category->id()) === false) {
+				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+			}
+
+			if ($catDAO->deleteCategory($id) === false) {
+				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+			}
+
+			// Remove related queries.
+			$this->view->conf->remove_query_by_get('c_' . $id);
+			$this->view->conf->save();
+
+			Minz_Request::good(_t('category_deleted'), $url_redirect);
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+
+	/**
+	 * This action deletes all the feeds relative to a given category.
+	 * Feed-related queries are deleted.
 	 *
 	 * Request parameter is:
 	 *   - id (of a category)
@@ -94,7 +135,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 				Minz_Request::good(_t('category_emptied'), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('error_occured'), $url_redirect);
+				Minz_Request::bad(_t('error_occurred'), $url_redirect);
 			}
 		}
 
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 7ef144090..a7def6d9a 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -53,13 +53,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 						'name' => $cat->name(),
 					);
 					$catDAO->updateCategory($ids[$key], $values);
-				} elseif ($ids[$key] != $defaultId) {
-					$feedDAO->changeCategory($ids[$key], $defaultId);
-					$catDAO->deleteCategory($ids[$key]);
-
-					// Remove related queries.
-					$this->view->conf->remove_query_by_get('c_' . $ids[$key]);
-					$this->view->conf->save();
 				}
 			}
 
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 5cd962ae4..781c4bb14 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -44,7 +44,14 @@
 						        formaction="<?php echo _url('category', 'empty', 'id', $cat->id()); ?>">
 						        <?php echo _t('ask_empty'); ?></button>
 					</li>
-					<li class="item"><a href=""><?php echo _t('delete'); ?></a></li>
+					<li class="item">
+						<button class="as-link confirm"
+						        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+						        type="submit"
+						        form="controller-category"
+						        formaction="<?php echo _url('category', 'delete', 'id', $cat->id()); ?>">
+						        <?php echo _t('delete'); ?></button>
+					</li>
 				</ul>
 			</div>
 		</div>

From dc714d3949373b79344438335cfc0edde77de036 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 17:11:31 +0200
Subject: [PATCH 013/363] Cat updating system works

Add a submit button
Each box contains a specific form

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/categoryController.php | 39 +++++++++++++++++++
 app/views/configure/categorize.phtml   | 54 ++++++++++++++------------
 2 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index be8524749..65fe631cc 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -62,6 +62,45 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 		Minz_Request::forward($url_redirect, true);
 	}
 
+	/**
+	 * This action updates the given category.
+	 *
+	 * Request parameters are:
+	 *   - id
+	 *   - name
+	 */
+	public function updateAction() {
+		$catDAO = new FreshRSS_CategoryDAO();
+		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$id = Minz_Request::param('id');
+			$name = Minz_Request::param('name', '');
+			if (strlen($name) <= 0) {
+				Minz_Request::bad(_t('category_no_name'), $url_redirect);
+			}
+
+			if ($catDAO->searchById($id) == null) {
+				Minz_Request::bad(_t('category_not_exist'), $url_redirect);
+			}
+
+			$cat = new FreshRSS_Category($name);
+			$values = array(
+				'name' => $cat->name(),
+			);
+
+			if ($catDAO->updateCategory($id, $values)) {
+				Minz_Request::good(_t('category_updated'), $url_redirect);
+			} else {
+				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+
 	/**
 	 * This action deletes a category.
 	 * Feeds in the given category are moved in the default category.
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 781c4bb14..b9d04ddb8 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -28,32 +28,38 @@
 	?>
 	<div class="box">
 		<div class="box-title stick">
-			<input type="text" value="<?php echo $cat->name(); ?>" />
-			<div class="dropdown">
-				<div id="dropdown-cat-<?php echo $cat->id(); ?>" class="dropdown-target"></div>
+			<form action="<?php echo _url('category', 'update', 'id', $cat->id()); ?>" method="post">
+				<input type="text" name="name" value="<?php echo $cat->name(); ?>" />
+				<button class="btn" type="submit">✓</button>
 
-				<a class="dropdown-toggle btn" href="#dropdown-cat-<?php echo $cat->id(); ?>"><?php echo _i('down'); ?></a>
-				<ul class="dropdown-menu">
-					<li class="dropdown-close"><a href="#close">❌</a></li>
+				<div class="dropdown">
+					<div id="dropdown-cat-<?php echo $cat->id(); ?>" class="dropdown-target"></div>
 
-					<li class="item">
-						<button class="as-link confirm"
-						        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-						        type="submit"
-						        form="controller-category"
-						        formaction="<?php echo _url('category', 'empty', 'id', $cat->id()); ?>">
-						        <?php echo _t('ask_empty'); ?></button>
-					</li>
-					<li class="item">
-						<button class="as-link confirm"
-						        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-						        type="submit"
-						        form="controller-category"
-						        formaction="<?php echo _url('category', 'delete', 'id', $cat->id()); ?>">
-						        <?php echo _t('delete'); ?></button>
-					</li>
-				</ul>
-			</div>
+					<a class="dropdown-toggle btn" href="#dropdown-cat-<?php echo $cat->id(); ?>"><?php echo _i('down'); ?></a>
+					<ul class="dropdown-menu">
+						<li class="dropdown-close"><a href="#close">❌</a></li>
+
+						<?php if (!empty($feeds)) { ?>
+						<li class="item">
+							<button class="as-link confirm"
+							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+							        type="submit"
+							        form="controller-category"
+							        formaction="<?php echo _url('category', 'empty', 'id', $cat->id()); ?>">
+							        <?php echo _t('ask_empty'); ?></button>
+						</li>
+						<?php } ?>
+						<li class="item">
+							<button class="as-link confirm"
+							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+							        type="submit"
+							        form="controller-category"
+							        formaction="<?php echo _url('category', 'delete', 'id', $cat->id()); ?>">
+							        <?php echo _t('delete'); ?></button>
+						</li>
+					</ul>
+				</div>
+			</form>
 		</div>
 
 		<ul class="box-content">

From 0d5a1f3a659b6f407b47859c794a662075e3f48e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 19:45:49 +0200
Subject: [PATCH 014/363] Improve design of .box

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/layout/aside_feed.phtml          | 16 ---------
 app/views/configure/categorize.phtml | 24 +++++++------
 p/themes/Dark/dark.css               | 29 ++++++++++++++++
 p/themes/Flat/flat.css               | 30 ++++++++++++++++
 p/themes/Origine/origine.css         | 30 ++++++++++++++++
 p/themes/Pafat/pafat.css             | 29 ++++++++++++++++
 p/themes/Screwdriver/screwdriver.css | 34 +++++++++++++++++++
 p/themes/base-theme/base.css         | 24 +++++++++++++
 p/themes/base-theme/template.css     | 51 ++++++++++++++++++----------
 9 files changed, 223 insertions(+), 44 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index c72710c2d..c028c4918 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -57,20 +57,4 @@
 	<li class="item<?php echo Minz_Request::actionName() == 'categorize' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'categorize'); ?>"><?php echo _t('categories_management'); ?></a>
 	</li>
-
-	<li class="separator"></li>
-
-	<?php if (!empty($this->feeds)) { ?>
-	<?php foreach ($this->feeds as $feed) { ?>
-	<?php $nbEntries = $feed->nbEntries(); ?>
-	<li class="item<?php echo (isset($this->flux) && $this->flux->id() == $feed->id()) ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>">
-		<a href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>">
-			<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-			<?php echo $feed->name(); ?>
-		</a>
-	</li>
-	<?php } ?>
-	<?php } else { ?>
-	<li class="item disable"><?php echo _t('no_rss_feed'); ?></li>
-	<?php } ?>
 </ul>
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index b9d04ddb8..8f77f9724 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -12,12 +12,12 @@
 	<div class="box">
 		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>
 
-		<div class="box-content">
+		<ul class="box-content box-content-centered">
 			<form action="<?php echo _url('category', 'create'); ?>" method="post">
-				<input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" />
-				<input type="submit" value="<?php echo _t('submit'); ?>" />
+				<li class="item"><input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" /></li>
+				<li class="item"><button class="btn btn-important" type="submit"><?php echo _t('submit'); ?></button></li>
 			</form>
-		</div>
+		</ul>
 	</div>
 
 	<form id="controller-category" method="post" style="display: none;"></form>
@@ -27,10 +27,9 @@
 			$feeds = $cat->feeds();
 	?>
 	<div class="box">
-		<div class="box-title stick">
+		<div class="box-title">
 			<form action="<?php echo _url('category', 'update', 'id', $cat->id()); ?>" method="post">
 				<input type="text" name="name" value="<?php echo $cat->name(); ?>" />
-				<button class="btn" type="submit">✓</button>
 
 				<div class="dropdown">
 					<div id="dropdown-cat-<?php echo $cat->id(); ?>" class="dropdown-target"></div>
@@ -39,6 +38,10 @@
 					<ul class="dropdown-menu">
 						<li class="dropdown-close"><a href="#close">❌</a></li>
 
+						<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _t('filter'); ?></a></li>
+
+						<li class="separator"></li>
+
 						<?php if (!empty($feeds)) { ?>
 						<li class="item">
 							<button class="as-link confirm"
@@ -69,15 +72,14 @@
 						$error = $feed->inError() ? ' error' : '';
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
-			<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $error, $empty; ?>">
-				<a href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+			<li class="item<?php echo $error, $empty; ?>">
+				<a class="configure" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
-			<?php
-					}
+			<?php 	}
 				} else {
 			?>
-			<li>Empty</li>
+			<li class="item"><?php echo _t('category_empty'); ?></li>
 			<?php } ?>
 		</ul>
 	</div>
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 10f6e655b..f3790614e 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -435,6 +435,35 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	border: 1px solid #000;
+	border-radius: 5px;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #26303F;
+	border-bottom: 1px solid #000;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 484cee9f3..d0ac46fd5 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -438,6 +438,36 @@ a.btn {
 	background: url("loader.gif") center center no-repeat #34495e;
 }
 
+/*=== Boxes */
+.box {
+	border: 1px solid #ddd;
+	border-radius: 5px;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #ecf0f1;
+	color: #333;
+	border-bottom: 1px solid #ddd;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 08fc08379..e3ae85075 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -467,6 +467,36 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	background: #fff;
+	border-radius: 5px;
+	box-shadow: 0 0 3px #bbb;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #f6f6f6;
+	border-bottom: 1px solid #ddd;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index a35ac861d..28b17e15f 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -491,6 +491,35 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	border: 1px solid #aaa;
+	border-radius: 5px;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: #f6f6f6;
+	border-bottom: 1px solid #aaa;
+	border-radius: 5px 5px 0 0;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 37fa18e10..6206504d1 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -497,6 +497,40 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+	background: #EDE7DE;
+	border-radius: 4px 4px 0 0;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717;
+	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%);
+	box-shadow: 0px -1px #fff inset,0 -2px #ccc inset;
+	color: #888;
+	text-shadow: 0 1px #ccc;
+	border-radius: 4px 4px 0 0;
+	font-size: 1.1rem;
+	font-weight: normal;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index ccfab10df..3f6ae956d 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -329,6 +329,30 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 792eac299..a5a29ab23 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -280,6 +280,40 @@ a.btn {
 	width: 100px;
 }
 
+/*=== Boxes */
+.box {
+	display: inline-block;
+	width: 20rem;
+	max-width: 95%;
+	margin: 20px 10px;
+	border: 1px solid #ccc;
+	vertical-align: top;
+}
+.box .box-title {
+	font-size: 1.2rem;
+	font-weight: bold;
+	text-align: center;
+}
+.box .box-title form {
+	margin: 0;
+}
+.box .box-content {
+	display: block;
+	overflow: auto;
+}
+.box .box-content .item {
+	display: block;
+}
+
+.box .box-content-centered {
+	padding: 30px 5px;
+	text-align: center;
+}
+.box .box-content-centered .btn {
+	margin: 20px 0 0;
+}
+
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -585,23 +619,6 @@ br + br + br {
 }
 /* TODO </delete */
 
-.box {
-	display: inline-block;
-	width: 19em;
-	max-width: 95%;
-	margin: 20px 10px;
-	border: 1px solid #ccc;
-	vertical-align: top;
-}
-.box .box-content {
-	display: block;
-	overflow: auto;
-}
-.box .box-content .item {
-	width: 19em;
-	max-width: 90%;
-}
-
 /*=== Panel */
 #overlay {
 	display: none;

From 5e8872983a84f68bb1b6de560fc44bdaa1cd90d7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 30 Sep 2014 22:18:01 +0200
Subject: [PATCH 015/363] i18n minor spelling

---
 app/i18n/en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/en.php b/app/i18n/en.php
index beba02c4d..98f611c13 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -368,7 +368,7 @@ return array (
 	'login_required'		=> 'Login required:',
 
 	'confirm_action'		=> 'Are you sure you want to perform this action? It cannot be cancelled!',
-	'confirm_action_feed_cat'	=> 'Are you sure you want to perform this action? You may lost related favorites and user queries. It cannot be cancelled!',
+	'confirm_action_feed_cat'	=> 'Are you sure you want to perform this action? You may lose related favorites and user queries. It cannot be cancelled!',
 	'notif_title_new_articles'	=> 'FreshRSS: new articles!',
 	'notif_body_new_articles'	=> 'There are \d new articles to read on FreshRSS.',
 

From a5a0bd9a350836cb7e504fdb501c82cda37d2562 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 30 Sep 2014 22:28:47 +0200
Subject: [PATCH 016/363] SQL performance: Removed filter to hide old articles

As discussed on
https://github.com/marienfressinaud/FreshRSS/issues/493#issuecomment-56266415
For performance, but this is also a good simplification.
Will help with PostgreSQL
https://github.com/marienfressinaud/FreshRSS/issues/416 and SQLite too
https://github.com/marienfressinaud/FreshRSS/issues/100 because the main
query becomes simpler.

Me may need to introduce another system to hide old articles, if this is
a problem for some users.
Also, the feature showing "empty feeds" in another colour may need to be
adapted.
---
 app/Controllers/indexController.php | 12 +++---------
 app/Models/EntryDAO.php             | 29 ++++++++++-------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index e8e26b142..1b6563bb3 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -113,16 +113,10 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			}
 		}
 
-		$today = @strtotime('today');
-		$this->view->today = $today;
-
-		// on calcule la date des articles les plus anciens qu'on affiche
-		$nb_month_old = $this->view->conf->old_entries;
-		$date_min = $today - (3600 * 24 * 30 * $nb_month_old);	//Do not use a fast changing value such as time() to allow SQL caching
-		$keepHistoryDefault = $this->view->conf->keep_history_default;
+		$this->view->today = @strtotime('today');
 
 		try {
-			$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb + 1, $first, $filter, $date_min, true, $keepHistoryDefault);
+			$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb + 1, $first, $filter);
 
 			// Si on a récupéré aucun article "non lus"
 			// on essaye de récupérer tous les articles
@@ -135,7 +129,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 					Minz_Log::record('Failed to automatically correct nbNotRead! ' + $ex->getMessage(), Minz_Log::NOTICE);
 				}
 				$this->view->state = FreshRSS_Entry::STATE_ALL;
-				$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
+				$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter);
 			}
 			Minz_Request::_param('state', $this->view->state);
 
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index c1f87ee34..751ee6da7 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -299,7 +299,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return 'CONCAT(' . $s1 . ',' . $s2 . ')';	//MySQL
 	}
 
-	private function sqlListWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
+	private function sqlListWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {
 		if (!$state) {
 			$state = FreshRSS_Entry::STATE_ALL;
 		}
@@ -356,23 +356,14 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			default:
 				throw new FreshRSS_EntriesGetter_Exception('Bad order in Entry->listByType: [' . $order . ']!');
 		}
-		if ($firstId === '' && parent::$sharedDbType === 'mysql') {
-			$firstId = $order === 'DESC' ? '9000000000'. '000000' : '0';	//MySQL optimization. Tested on MySQL 5.5 with 150k articles
-		}
+		/*if ($firstId === '' && parent::$sharedDbType === 'mysql') {
+			$firstId = $order === 'DESC' ? '9000000000'. '000000' : '0';	//MySQL optimization. TODO: check if this is needed again, after the filtering for old articles has been removed in 0.9-dev
+		}*/
 		if ($firstId !== '') {
 			$where .= 'AND e1.id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' ';
 		}
-		if (($date_min > 0) && ($type !== 's')) {
-			$where .= 'AND (e1.id >= ' . $date_min . '000000';
-			if ($showOlderUnreadsorFavorites) {	//Lax date constraint
-				$where .= ' OR e1.is_read=0 OR e1.is_favorite=1 OR (f.keep_history <> 0';
-				if (intval($keepHistoryDefault) === 0) {
-					$where .= ' AND f.keep_history <> -2';	//default
-				}
-				$where .= ')';
-			}
-			$where .= ') ';
-			$joinFeed = true;
+		if ($date_min > 0) {
+			$where .= 'AND e1.id >= ' . $date_min . '000000 ';
 		}
 		$search = '';
 		if ($filter !== '') {
@@ -434,8 +425,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			. ($limit > 0 ? ' LIMIT ' . $limit : ''));	//TODO: See http://explainextended.com/2009/10/23/mysql-order-by-limit-performance-late-row-lookups/
 	}
 
-	public function listWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
-		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min, $showOlderUnreadsorFavorites, $keepHistoryDefault);
+	public function listWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {
+		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min);
 
 		$sql = 'SELECT e.id, e.guid, e.title, e.author, '
 		     . ($this->isCompressed() ? 'UNCOMPRESS(content_bin) AS content' : 'content')
@@ -452,8 +443,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return self::daoToEntry($stm->fetchAll(PDO::FETCH_ASSOC));
 	}
 
-	public function listIdsWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {	//For API
-		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min, $showOlderUnreadsorFavorites, $keepHistoryDefault);
+	public function listIdsWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {	//For API
+		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min);
 
 		$stm = $this->bd->prepare($sql);
 		$stm->execute($values);

From 7481887db746fd2d6eefab021776b8abd4076429 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 10:06:04 +0200
Subject: [PATCH 017/363] Load feed configuration on the same page

Need improvements

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/configureController.php |  4 ++++
 app/views/configure/categorize.phtml    |  5 ++++-
 app/views/configure/feed.phtml          |  8 +++++--
 p/scripts/main.js                       | 30 +++++++++++++++++++++++++
 p/themes/base-theme/template.css        |  5 +++++
 5 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index a7def6d9a..dd7a0a441 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -90,6 +90,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * Default values are empty strings unless specified.
 	 */
 	public function feedAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		}
+
 		$catDAO = new FreshRSS_CategoryDAO();
 		$this->view->categories = $catDAO->listCategories(false);
 
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 8f77f9724..008dc8c98 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -73,7 +73,7 @@
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
 			<li class="item<?php echo $error, $empty; ?>">
-				<a class="configure" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+				<a class="configure open-slider" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
 			<?php 	}
@@ -85,3 +85,6 @@
 	</div>
 	<?php } ?>
 </div>
+
+<div id="slider">
+</div>
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index e96a28739..f58ac65af 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -1,8 +1,12 @@
-<?php $this->partial ('aside_feed'); ?>
+<?php
+	if (!Minz_Request::param('ajax')) {
+		$this->partial('aside_feed');
+	}
+?>
 
 <?php if ($this->flux) { ?>
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a>
+	<!-- <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a> -->
 
 	<h1><?php echo $this->flux->name (); ?></h1>
 	<?php echo $this->flux->description (); ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f6d5d2907..7fed7a819 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1240,6 +1240,35 @@ function faviconNbUnread(n) {
 	}
 }
 
+function init_slider_observers() {
+	var slider = $('#slider');
+	if (slider.length < 1) {
+		return;
+	}
+
+	$('.open-slider').on('click', function() {
+		if (ajax_loading) {
+			return false;
+		}
+
+		ajax_loading = true;
+
+		var url_slide = $(this).attr('href');
+
+		$.ajax({
+			type: 'GET',
+			url: url_slide,
+			data : { ajax: true }
+		}).done(function (data) {
+			slider.html(data);
+			slider.show();
+			ajax_loading = false;
+		});
+
+		return false;
+	})
+}
+
 function init_all() {
 	if (!(window.$ && window.url_freshrss)) {
 		if (window.console) {
@@ -1275,6 +1304,7 @@ function init_all() {
 		init_feed_observers();
 		init_password_observers();
 		init_stats_observers();
+		init_slider_observers();
 	}
 
 	if (window.console) {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index a5a29ab23..397f943a6 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -645,6 +645,11 @@ br + br + br {
 	display: none;
 }
 
+/*=== Slider */
+#slider {
+	min-height: 50px;
+}
+
 /*=== DIVERS */
 /*===========*/
 .nav-login,

From fdb63fbbe695b6a6bc32f0e93f2ff702ca42329c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 10:19:38 +0200
Subject: [PATCH 018/363] Simplify configureController

Remove useless code for category configuration.

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/configureController.php | 33 +------------------------
 app/views/configure/categorize.phtml    |  2 +-
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index dd7a0a441..3fd1d5149 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -28,43 +28,12 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * This action handles the category configuration page
 	 *
 	 * It displays the category configuration page.
-	 * If this action is reached through a POST request, it loops through
-	 * every category to check for modification then add a new category if
-	 * needed then sends a notification to the user.
-	 * If a category name is emptied, the category is deleted and all
-	 * related feeds are moved to the default category. Related user queries
-	 * are deleted too.
-	 * If a category name is changed, it is updated.
 	 */
 	public function categorizeAction() {
-		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$catDAO = new FreshRSS_CategoryDAO();
-		$defaultCategory = $catDAO->getDefault();
-		$defaultId = $defaultCategory->id();
-
-		if (Minz_Request::isPost()) {
-			$cats = Minz_Request::param('categories', array());
-			$ids = Minz_Request::param('ids', array());
-
-			foreach ($cats as $key => $name) {
-				if (strlen($name) > 0) {
-					$cat = new FreshRSS_Category($name);
-					$values = array(
-						'name' => $cat->name(),
-					);
-					$catDAO->updateCategory($ids[$key], $values);
-				}
-			}
-
-			invalidateHttpCache();
-
-			Minz_Request::good(_t('categories_updated'),
-			                   array('c' => 'configure', 'a' => 'categorize'));
-		}
 
 		$this->view->categories = $catDAO->listCategories(false);
-		$this->view->defaultCategory = $catDAO->getDefault();
-		$this->view->feeds = $feedDAO->listFeeds();
+		$this->view->default_category = $catDAO->getDefault();
 
 		Minz_View::prependTitle(_t('categories_management') . ' · ');
 	}
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 008dc8c98..f5030ef2c 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -6,7 +6,7 @@
 	<h2><?php echo _t('categories_management'); ?></h2>
 
 	<p class="alert alert-warn">
-		<?php echo _t('feeds_moved_category_deleted', $this->defaultCategory->name()); ?>
+		<?php echo _t('feeds_moved_category_deleted', $this->default_category->name()); ?>
 	</p>
 
 	<div class="box">

From 1eef7893068655f8d145a3e06061a9e6296ac1f3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 11:27:41 +0200
Subject: [PATCH 019/363] Reorganize subscription management code

There is still a lot of work to do. Some links are broken.

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/configureController.php       | 116 ----------------
 app/Controllers/subscriptionController.php    | 130 ++++++++++++++++++
 app/Models/Themes.php                         |   1 +
 app/layout/aside_feed.phtml                   |  60 --------
 app/layout/aside_flux.phtml                   |   4 +-
 app/layout/aside_subscription.phtml           |  17 +++
 app/views/importExport/index.phtml            |   2 +-
 .../{configure => subscription}/feed.phtml    |   4 +-
 .../index.phtml}                              |  48 ++++++-
 p/themes/icons/import.svg                     |   9 ++
 10 files changed, 207 insertions(+), 184 deletions(-)
 create mode 100644 app/Controllers/subscriptionController.php
 delete mode 100644 app/layout/aside_feed.phtml
 create mode 100644 app/layout/aside_subscription.phtml
 rename app/views/{configure => subscription}/feed.phtml (98%)
 rename app/views/{configure/categorize.phtml => subscription/index.phtml} (60%)
 create mode 100644 p/themes/icons/import.svg

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 3fd1d5149..b7b88b3ba 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -8,9 +8,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * This action is called before every other action in that class. It is
 	 * the common boiler plate for every action. It is triggered by the
 	 * underlying framework.
-	 *
-	 * @todo see if the category default configuration is needed here or if
-	 *       we can move it to the categorize action
 	 */
 	public function firstAction() {
 		if (!$this->view->loginOk) {
@@ -19,119 +16,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				array('error' => array(_t('access_denied')))
 			);
 		}
-
-		$catDAO = new FreshRSS_CategoryDAO();
-		$catDAO->checkDefault();
-	}
-
-	/**
-	 * This action handles the category configuration page
-	 *
-	 * It displays the category configuration page.
-	 */
-	public function categorizeAction() {
-		$catDAO = new FreshRSS_CategoryDAO();
-
-		$this->view->categories = $catDAO->listCategories(false);
-		$this->view->default_category = $catDAO->getDefault();
-
-		Minz_View::prependTitle(_t('categories_management') . ' · ');
-	}
-
-	/**
-	 * This action handles the feed configuration page.
-	 *
-	 * It displays the feed configuration page.
-	 * If this action is reached through a POST request, it stores all new
-	 * configuraiton values then sends a notification to the user.
-	 *
-	 * The options available on the page are:
-	 *   - name
-	 *   - description
-	 *   - website URL
-	 *   - feed URL
-	 *   - category id (default: default category id)
-	 *   - CSS path to article on website
-	 *   - display in main stream (default: 0)
-	 *   - HTTP authentication
-	 *   - number of article to retain (default: -2)
-	 *   - refresh frequency (default: -2)
-	 * Default values are empty strings unless specified.
-	 */
-	public function feedAction() {
-		if (Minz_Request::param('ajax')) {
-			$this->view->_useLayout(false);
-		}
-
-		$catDAO = new FreshRSS_CategoryDAO();
-		$this->view->categories = $catDAO->listCategories(false);
-
-		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->view->feeds = $feedDAO->listFeeds();
-
-		$id = Minz_Request::param('id');
-		if ($id == false && !empty($this->view->feeds)) {
-			$id = current($this->view->feeds)->id();
-		}
-
-		$this->view->flux = false;
-		if ($id != false) {
-			$this->view->flux = $this->view->feeds[$id];
-
-			if (!$this->view->flux) {
-				Minz_Error::error(
-					404,
-					array('error' => array(_t('page_not_found')))
-				);
-			} else {
-				if (Minz_Request::isPost() && $this->view->flux) {
-					$user = Minz_Request::param('http_user', '');
-					$pass = Minz_Request::param('http_pass', '');
-
-					$httpAuth = '';
-					if ($user != '' || $pass != '') {
-						$httpAuth = $user . ':' . $pass;
-					}
-
-					$cat = intval(Minz_Request::param('category', 0));
-
-					$values = array(
-						'name' => Minz_Request::param('name', ''),
-						'description' => sanitizeHTML(Minz_Request::param('description', '', true)),
-						'website' => Minz_Request::param('website', ''),
-						'url' => Minz_Request::param('url', ''),
-						'category' => $cat,
-						'pathEntries' => Minz_Request::param('path_entries', ''),
-						'priority' => intval(Minz_Request::param('priority', 0)),
-						'httpAuth' => $httpAuth,
-						'keep_history' => intval(Minz_Request::param('keep_history', -2)),
-						'ttl' => intval(Minz_Request::param('ttl', -2)),
-					);
-
-					if ($feedDAO->updateFeed($id, $values)) {
-						$this->view->flux->_category($cat);
-						$this->view->flux->faviconPrepare();
-						$notif = array(
-							'type' => 'good',
-							'content' => _t('feed_updated')
-						);
-					} else {
-						$notif = array(
-							'type' => 'bad',
-							'content' => _t('error_occurred_update')
-						);
-					}
-					invalidateHttpCache();
-
-					Minz_Session::_param('notification', $notif);
-					Minz_Request::forward(array('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true);
-				}
-
-				Minz_View::prependTitle(_t('rss_feed_management') . ' — ' . $this->view->flux->name() . ' · ');
-			}
-		} else {
-			Minz_View::prependTitle(_t('rss_feed_management') . ' · ');
-		}
 	}
 
 	/**
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
new file mode 100644
index 000000000..ab00f3e6a
--- /dev/null
+++ b/app/Controllers/subscriptionController.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * Controller to handle subscription actions.
+ */
+class FreshRSS_subscription_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
+	public function firstAction() {
+		if (!$this->view->loginOk) {
+			Minz_Error::error(
+				403,
+				array('error' => array(_t('access_denied')))
+			);
+		}
+	}
+
+	/**
+	 * This action handles the main subscription page
+	 *
+	 * It displays categories and associated feeds.
+	 */
+	public function indexAction() {
+		$catDAO = new FreshRSS_CategoryDAO();
+
+		$this->view->categories = $catDAO->listCategories(false);
+		$this->view->default_category = $catDAO->getDefault();
+
+		Minz_View::prependTitle(_t('subscription_management') . ' · ');
+	}
+
+	/**
+	 * This action handles the feed configuration page.
+	 *
+	 * It displays the feed configuration page.
+	 * If this action is reached through a POST request, it stores all new
+	 * configuraiton values then sends a notification to the user.
+	 *
+	 * The options available on the page are:
+	 *   - name
+	 *   - description
+	 *   - website URL
+	 *   - feed URL
+	 *   - category id (default: default category id)
+	 *   - CSS path to article on website
+	 *   - display in main stream (default: 0)
+	 *   - HTTP authentication
+	 *   - number of article to retain (default: -2)
+	 *   - refresh frequency (default: -2)
+	 * Default values are empty strings unless specified.
+	 */
+	public function feedAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		}
+
+		$catDAO = new FreshRSS_CategoryDAO();
+		$this->view->categories = $catDAO->listCategories(false);
+
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$this->view->feeds = $feedDAO->listFeeds();
+
+		$id = Minz_Request::param('id');
+		if ($id == false && !empty($this->view->feeds)) {
+			$id = current($this->view->feeds)->id();
+		}
+
+		$this->view->flux = false;
+		if ($id != false) {
+			$this->view->flux = $this->view->feeds[$id];
+
+			if (!$this->view->flux) {
+				Minz_Error::error(
+					404,
+					array('error' => array(_t('page_not_found')))
+				);
+			} else {
+				if (Minz_Request::isPost() && $this->view->flux) {
+					$user = Minz_Request::param('http_user', '');
+					$pass = Minz_Request::param('http_pass', '');
+
+					$httpAuth = '';
+					if ($user != '' || $pass != '') {
+						$httpAuth = $user . ':' . $pass;
+					}
+
+					$cat = intval(Minz_Request::param('category', 0));
+
+					$values = array(
+						'name' => Minz_Request::param('name', ''),
+						'description' => sanitizeHTML(Minz_Request::param('description', '', true)),
+						'website' => Minz_Request::param('website', ''),
+						'url' => Minz_Request::param('url', ''),
+						'category' => $cat,
+						'pathEntries' => Minz_Request::param('path_entries', ''),
+						'priority' => intval(Minz_Request::param('priority', 0)),
+						'httpAuth' => $httpAuth,
+						'keep_history' => intval(Minz_Request::param('keep_history', -2)),
+						'ttl' => intval(Minz_Request::param('ttl', -2)),
+					);
+
+					if ($feedDAO->updateFeed($id, $values)) {
+						$this->view->flux->_category($cat);
+						$this->view->flux->faviconPrepare();
+						$notif = array(
+							'type' => 'good',
+							'content' => _t('feed_updated')
+						);
+					} else {
+						$notif = array(
+							'type' => 'bad',
+							'content' => _t('error_occurred_update')
+						);
+					}
+					invalidateHttpCache();
+
+					Minz_Session::_param('notification', $notif);
+					Minz_Request::forward(array('c' => 'subscription'), true);
+				}
+
+				Minz_View::prependTitle(_t('rss_feed_management') . ' · ' . $this->view->flux->name() . ' · ');
+			}
+		} else {
+			Minz_View::prependTitle(_t('rss_feed_management') . ' · ');
+		}
+	}
+}
diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index 68fc17a2b..e3b260261 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -82,6 +82,7 @@ class FreshRSS_Themes extends Minz_Model {
 			'favorite' => '★',
 			'help' => 'ⓘ',
 			'icon' => '⊚',
+			'import' => '⤓',
 			'key' => '⚿',
 			'link' => '↗',
 			'login' => '🔒',
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
deleted file mode 100644
index c028c4918..000000000
--- a/app/layout/aside_feed.phtml
+++ /dev/null
@@ -1,60 +0,0 @@
-<ul class="nav nav-list aside aside_feed">
-	<li class="nav-header"><?php echo _t('your_rss_feeds'); ?></li>
-
-	<li class="nav-form">
-		<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
-		<div class="stick">
-			<input type="url" name="url_rss" placeholder="<?php echo _t('add_rss_feed'); ?>" />
-			<div class="dropdown">
-				<div id="dropdown-cat" class="dropdown-target"></div>
-
-				<a class="dropdown-toggle btn" href="#dropdown-cat"><?php echo _i('down'); ?></a>
-				<ul class="dropdown-menu">
-					<li class="dropdown-close"><a href="#close">❌</a></li>
-
-					<li class="dropdown-header"><?php echo _t('category'); ?></li>
-
-					<li class="input">
-						<select name="category" id="category">
-						<?php foreach ($this->categories as $cat) { ?>
-						<option value="<?php echo $cat->id(); ?>"<?php echo $cat->id() == 1 ? ' selected="selected"' : ''; ?>>
-							<?php echo $cat->name(); ?>
-						</option>
-						<?php } ?>
-						<option value="nc"><?php echo _t('new_category'); ?></option>
-						</select>
-					</li>
-
-					<li class="input" style="display:none">
-						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
-					</li>
-
-					<li class="separator"></li>
-
-					<li class="dropdown-header"><?php echo _t('http_authentication'); ?></li>
-					<li class="input">
-						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo _t('username'); ?>" />
-					</li>
-					<li class="input">
-						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo _t('password'); ?>" />
-					</li>
-				</ul>
-			</div>
-			<button class="btn" type="submit"><?php echo _i('add'); ?></button>
-		</div>
-	</form></li>
-
-	<li class="item">
-		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
-			<?php echo _t('bookmark'); ?>
-		</a>
-	</li>
-
-	<li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('import_export'); ?></a>
-	</li>
-
-	<li class="item<?php echo Minz_Request::actionName() == 'categorize' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'categorize'); ?>"><?php echo _t('categories_management'); ?></a>
-	</li>
-</ul>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index aac3c0896..341697103 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -7,8 +7,8 @@
 
 		<li>
 			<div class="stick configure-feeds">
-				<a class="btn btn-important" href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('subscription_management'); ?></a>
-				<a class="btn btn-important" href="<?php echo _url('configure', 'categorize'); ?>" title="<?php echo _t('categories_management'); ?>"><?php echo _i('category-white'); ?></a>
+				<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+				<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
 			</div>
 		</li>
 		<?php } elseif (Minz_Configuration::needsLogin()) { ?>
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
new file mode 100644
index 000000000..9a95763c3
--- /dev/null
+++ b/app/layout/aside_subscription.phtml
@@ -0,0 +1,17 @@
+<ul class="nav nav-list aside aside_feed">
+	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
+
+	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+	</li>
+
+	<li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('import_export'); ?></a>
+	</li>
+
+	<li class="item">
+		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
+			<?php echo _t('bookmark'); ?>
+		</a>
+	</li>
+</ul>
diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml
index 35371faca..36c0eab4e 100644
--- a/app/views/importExport/index.phtml
+++ b/app/views/importExport/index.phtml
@@ -1,4 +1,4 @@
-<?php $this->partial('aside_feed'); ?>
+<?php $this->partial('aside_subscription'); ?>
 
 <div class="post ">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
diff --git a/app/views/configure/feed.phtml b/app/views/subscription/feed.phtml
similarity index 98%
rename from app/views/configure/feed.phtml
rename to app/views/subscription/feed.phtml
index f58ac65af..e047741a1 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/subscription/feed.phtml
@@ -1,6 +1,6 @@
 <?php
 	if (!Minz_Request::param('ajax')) {
-		$this->partial('aside_feed');
+		$this->partial('aside_subscription');
 	}
 ?>
 
@@ -19,7 +19,7 @@
 	<p class="alert alert-warn"><?php echo Minz_Translate::t ('feed_empty'); ?></p>
 	<?php } ?>
 
-	<form method="post" action="<?php echo _url ('configure', 'feed', 'id', $this->flux->id ()); ?>" autocomplete="off">
+	<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->flux->id ()); ?>" autocomplete="off">
 		<legend><?php echo Minz_Translate::t ('informations'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="name"><?php echo Minz_Translate::t ('title'); ?></label>
diff --git a/app/views/configure/categorize.phtml b/app/views/subscription/index.phtml
similarity index 60%
rename from app/views/configure/categorize.phtml
rename to app/views/subscription/index.phtml
index f5030ef2c..444dc9d9b 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/subscription/index.phtml
@@ -1,9 +1,51 @@
-<?php $this->partial('aside_feed'); ?>
+<?php $this->partial('aside_subscription'); ?>
 
 <div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<h2><?php echo _t('categories_management'); ?></h2>
+	<h2><?php echo _t('subscription_management'); ?></h2>
+
+	<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
+		<div class="stick">
+			<input type="url" name="url_rss" class="extend" placeholder="<?php echo _t('add_rss_feed'); ?>" />
+			<div class="dropdown">
+				<div id="dropdown-cat" class="dropdown-target"></div>
+
+				<a class="dropdown-toggle btn" href="#dropdown-cat"><?php echo _i('down'); ?></a>
+				<ul class="dropdown-menu">
+					<li class="dropdown-close"><a href="#close">❌</a></li>
+
+					<li class="dropdown-header"><?php echo _t('category'); ?></li>
+
+					<li class="input">
+						<select name="category" id="category">
+						<?php foreach ($this->categories as $cat) { ?>
+						<option value="<?php echo $cat->id(); ?>"<?php echo $cat->id() == 1 ? ' selected="selected"' : ''; ?>>
+							<?php echo $cat->name(); ?>
+						</option>
+						<?php } ?>
+						<option value="nc"><?php echo _t('new_category'); ?></option>
+						</select>
+					</li>
+
+					<li class="input" style="display:none">
+						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
+					</li>
+
+					<li class="separator"></li>
+
+					<li class="dropdown-header"><?php echo _t('http_authentication'); ?></li>
+					<li class="input">
+						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo _t('username'); ?>" />
+					</li>
+					<li class="input">
+						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo _t('password'); ?>" />
+					</li>
+				</ul>
+			</div>
+			<button class="btn" type="submit"><?php echo _i('add'); ?></button>
+		</div>
+	</form>
 
 	<p class="alert alert-warn">
 		<?php echo _t('feeds_moved_category_deleted', $this->default_category->name()); ?>
@@ -73,7 +115,7 @@
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
 			<li class="item<?php echo $error, $empty; ?>">
-				<a class="configure open-slider" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+				<a class="configure open-slider" href="<?php echo _url('subscription', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
 			<?php 	}
diff --git a/p/themes/icons/import.svg b/p/themes/icons/import.svg
new file mode 100644
index 000000000..a7f20c909
--- /dev/null
+++ b/p/themes/icons/import.svg
@@ -0,0 +1,9 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<g transform="translate(-80,-648)" fill="#ffffff">
+<path style="baseline-shift:baseline;block-progression:tb;color:#ffffff;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m84.406,657a0.50005,0.50005,0,0,0,-0.3125,0.21875l-1,1.5a0.50005,0.50005,0,1,0,0.8125,0.5625l1-1.5a0.50005,0.50005,0,0,0,-0.5,-0.78zm7,0a0.50005,0.50005,0,0,0,-0.3125,0.78125l1,1.5a0.50005,0.50005,0,1,0,0.8125,-0.5625l-1-1.5a0.50005,0.50005,0,0,0,-0.5,-0.22z"/>
+<g transform="translate(-80,110)">
+<path style="block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m167,539,0,5.5625-1.2812-1.2812c-0.19-0.19-0.45-0.28-0.72-0.28h-1v1c0.00001,0.2653,0.0931,0.53058,0.28125,0.71875l3,3,0.28125,0.28125h0.875l0.28125-0.28125,3-3c0.19-0.19,0.28-0.45,0.28-0.72v-1h-1c-0.2653,0.00001-0.53059,0.0931-0.71875,0.28125l-1.28,1.28v-5.56z"/>
+<path style="enable-background:accumulate;color:#000000;" d="m163,549,0,4,10,0,0-4zm3.3438,1.4375c0.0208-0.001,0.0417-0.001,0.0625,0,0.29096-0.0556,0.59898,0.20383,0.59375,0.5v0.0625h2v-0.0625c-0.004-0.26416,0.23582-0.50712,0.5-0.50712s0.50373,0.24296,0.5,0.50712l-9.99,0.06c0,0.54535-0.45465,1-1,1h-2c-0.54535,0-1-0.45465-1-1v-0.0625c-0.0108-0.21706,0.13723-0.43234,0.34375-0.5z" fill-rule="evenodd"/>
+</g>
+</g>
+</svg>

From 89c407d7d7f739e42d9e72e40304bbbef00c9b10 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 11:58:08 +0200
Subject: [PATCH 020/363] Add selected feed on main subscription page

- When an id is given, corresponding feed is displayed
- Refactor code
- Improve coding style

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/subscriptionController.php | 114 ++++++------
 app/views/helpers/feed/update.phtml        | 175 +++++++++++++++++++
 app/views/subscription/feed.phtml          | 193 ++-------------------
 app/views/subscription/index.phtml         |   5 +
 4 files changed, 242 insertions(+), 245 deletions(-)
 create mode 100644 app/views/helpers/feed/update.phtml

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index ab00f3e6a..83f803edb 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -16,6 +16,11 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 				array('error' => array(_t('access_denied')))
 			);
 		}
+
+		$catDAO = new FreshRSS_CategoryDAO();
+
+		$this->view->categories = $catDAO->listCategories(false);
+		$this->view->default_category = $catDAO->getDefault();
 	}
 
 	/**
@@ -24,12 +29,13 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 	 * It displays categories and associated feeds.
 	 */
 	public function indexAction() {
-		$catDAO = new FreshRSS_CategoryDAO();
-
-		$this->view->categories = $catDAO->listCategories(false);
-		$this->view->default_category = $catDAO->getDefault();
-
 		Minz_View::prependTitle(_t('subscription_management') . ' · ');
+
+		$id = Minz_Request::param('id');
+		if ($id !== false) {
+			$feedDAO = FreshRSS_Factory::createFeedDao();
+			$this->view->feed = $feedDAO->searchById($id);
+		}
 	}
 
 	/**
@@ -57,74 +63,56 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 			$this->view->_useLayout(false);
 		}
 
-		$catDAO = new FreshRSS_CategoryDAO();
-		$this->view->categories = $catDAO->listCategories(false);
-
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$this->view->feeds = $feedDAO->listFeeds();
 
 		$id = Minz_Request::param('id');
-		if ($id == false && !empty($this->view->feeds)) {
-			$id = current($this->view->feeds)->id();
+		if ($id === false || !isset($this->view->feeds[$id])) {
+			Minz_Error::error(
+				404,
+				array('error' => array(_t('page_not_found')))
+			);
+			return;
 		}
 
-		$this->view->flux = false;
-		if ($id != false) {
-			$this->view->flux = $this->view->feeds[$id];
+		$this->view->feed = $this->view->feeds[$id];
 
-			if (!$this->view->flux) {
-				Minz_Error::error(
-					404,
-					array('error' => array(_t('page_not_found')))
-				);
-			} else {
-				if (Minz_Request::isPost() && $this->view->flux) {
-					$user = Minz_Request::param('http_user', '');
-					$pass = Minz_Request::param('http_pass', '');
+		Minz_View::prependTitle(_t('rss_feed_management') . ' · ' . $this->view->feed->name() . ' · ');
 
-					$httpAuth = '';
-					if ($user != '' || $pass != '') {
-						$httpAuth = $user . ':' . $pass;
-					}
+		if (Minz_Request::isPost()) {
+			$user = Minz_Request::param('http_user', '');
+			$pass = Minz_Request::param('http_pass', '');
 
-					$cat = intval(Minz_Request::param('category', 0));
-
-					$values = array(
-						'name' => Minz_Request::param('name', ''),
-						'description' => sanitizeHTML(Minz_Request::param('description', '', true)),
-						'website' => Minz_Request::param('website', ''),
-						'url' => Minz_Request::param('url', ''),
-						'category' => $cat,
-						'pathEntries' => Minz_Request::param('path_entries', ''),
-						'priority' => intval(Minz_Request::param('priority', 0)),
-						'httpAuth' => $httpAuth,
-						'keep_history' => intval(Minz_Request::param('keep_history', -2)),
-						'ttl' => intval(Minz_Request::param('ttl', -2)),
-					);
-
-					if ($feedDAO->updateFeed($id, $values)) {
-						$this->view->flux->_category($cat);
-						$this->view->flux->faviconPrepare();
-						$notif = array(
-							'type' => 'good',
-							'content' => _t('feed_updated')
-						);
-					} else {
-						$notif = array(
-							'type' => 'bad',
-							'content' => _t('error_occurred_update')
-						);
-					}
-					invalidateHttpCache();
-
-					Minz_Session::_param('notification', $notif);
-					Minz_Request::forward(array('c' => 'subscription'), true);
-				}
-
-				Minz_View::prependTitle(_t('rss_feed_management') . ' · ' . $this->view->flux->name() . ' · ');
+			$httpAuth = '';
+			if ($user != '' || $pass != '') {
+				$httpAuth = $user . ':' . $pass;
+			}
+
+			$cat = intval(Minz_Request::param('category', 0));
+
+			$values = array(
+				'name' => Minz_Request::param('name', ''),
+				'description' => sanitizeHTML(Minz_Request::param('description', '', true)),
+				'website' => Minz_Request::param('website', ''),
+				'url' => Minz_Request::param('url', ''),
+				'category' => $cat,
+				'pathEntries' => Minz_Request::param('path_entries', ''),
+				'priority' => intval(Minz_Request::param('priority', 0)),
+				'httpAuth' => $httpAuth,
+				'keep_history' => intval(Minz_Request::param('keep_history', -2)),
+				'ttl' => intval(Minz_Request::param('ttl', -2)),
+			);
+
+			invalidateHttpCache();
+
+			if ($feedDAO->updateFeed($id, $values)) {
+				$this->view->feed->_category($cat);
+				$this->view->feed->faviconPrepare();
+
+				Minz_Request::good(_t('feed_updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
+			} else {
+				Minz_Request::bad(_t('error_occurred_update'), array('c' => 'subscription'));
 			}
-		} else {
-			Minz_View::prependTitle(_t('rss_feed_management') . ' · ');
 		}
 	}
 }
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
new file mode 100644
index 000000000..4a6425c45
--- /dev/null
+++ b/app/views/helpers/feed/update.phtml
@@ -0,0 +1,175 @@
+<div class="post">
+	<!-- <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->feed->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a> -->
+
+	<h1><?php echo $this->feed->name (); ?></h1>
+	<?php echo $this->feed->description (); ?>
+
+	<?php $nbEntries = $this->feed->nbEntries (); ?>
+
+	<?php if ($this->feed->inError ()) { ?>
+	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t ('damn'); ?></span> <?php echo Minz_Translate::t ('feed_in_error'); ?></p>
+	<?php } elseif ($nbEntries === 0) { ?>
+	<p class="alert alert-warn"><?php echo Minz_Translate::t ('feed_empty'); ?></p>
+	<?php } ?>
+
+	<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->feed->id ()); ?>" autocomplete="off">
+		<legend><?php echo Minz_Translate::t ('informations'); ?></legend>
+		<div class="form-group">
+			<label class="group-name" for="name"><?php echo Minz_Translate::t ('title'); ?></label>
+			<div class="group-controls">
+				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name () ; ?>" />
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="description"><?php echo Minz_Translate::t ('feed_description'); ?></label>
+			<div class="group-controls">
+				<textarea name="description" id="description"><?php echo htmlspecialchars($this->feed->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="website"><?php echo Minz_Translate::t ('website_url'); ?></label>
+			<div class="group-controls">
+				<div class="stick">
+					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
+					<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+				</div>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="url"><?php echo Minz_Translate::t ('feed_url'); ?></label>
+			<div class="group-controls">
+				<div class="stick">
+					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
+					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+				</div>
+
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo Minz_Translate::t ('feed_validator'); ?></a>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="category"><?php echo Minz_Translate::t ('category'); ?></label>
+			<div class="group-controls">
+				<select name="category" id="category">
+				<?php foreach ($this->categories as $cat) { ?>
+				<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->feed->category () ? ' selected="selected"' : ''; ?>>
+					<?php echo $cat->name (); ?>
+				</option>
+				<?php } ?>
+				</select>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
+			<div class="group-controls">
+				<label class="checkbox" for="priority">
+					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority () > 0 ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t ('yes'); ?>
+				</label>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="group-controls">
+				<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>">
+					<?php echo _i('stats'); ?> <?php echo _t('stats'); ?>
+				</a>
+			</div>
+		</div>
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button class="btn btn-attention confirm"
+				        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+				        formaction="<?php echo _url('feed', 'delete', 'id', $this->feed->id ()); ?>"
+				        formmethod="post"><?php echo _t('delete'); ?></button>
+			</div>
+		</div>
+
+		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<div class="stick">
+					<input type="text" value="<?php echo _t('number_articles', $nbEntries); ?>" disabled="disabled" />
+					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->feed->id ()); ?>">
+						<?php echo _i('refresh'); ?> <?php echo _t('actualize'); ?>
+					</a>
+				</div>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="keep_history"><?php echo Minz_Translate::t ('keep_history'); ?></label>
+			<div class="group-controls">
+				<select class="number" name="keep_history" id="keep_history" required="required"><?php
+					foreach (array('' => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+						echo '<option value="' . $v . ($this->feed->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+					}
+				?></select>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="ttl"><?php echo Minz_Translate::t('ttl'); ?></label>
+			<div class="group-controls">
+				<select class="number" name="ttl" id="ttl" required="required"><?php
+					$found = false;
+					foreach (array(-2 => Minz_Translate::t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
+					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
+					                36000 => '10h', 43200 => '12h', 64800 => '18h',
+					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
+					                604800 => '1wk', 1209600 => '2wk', 1814400 => '3wk', 2419200 => '4wk', 2629744 => '1mo', -1 => '∞') as $v => $t) {
+						echo '<option value="' . $v . ($this->feed->ttl() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						if ($this->feed->ttl() == $v) {
+							$found = true;
+						}
+					}
+					if (!$found) {
+						echo '<option value="' . intval($this->feed->ttl()) . '" selected="selected">' . intval($this->feed->ttl()) . 's</option>';
+					}
+				?></select>
+			</div>
+		</div>
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
+			</div>
+		</div>
+
+		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
+		<?php $auth = $this->feed->httpAuth (false); ?>
+		<div class="form-group">
+			<label class="group-name" for="http_user"><?php echo Minz_Translate::t ('http_username'); ?></label>
+			<div class="group-controls">
+				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('access_protected_feeds'); ?>
+			</div>
+
+			<label class="group-name" for="http_pass"><?php echo Minz_Translate::t ('http_password'); ?></label>
+			<div class="group-controls">
+				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
+			</div>
+		</div>
+
+		<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>
+
+		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
+		<div class="form-group">
+			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
+			<div class="group-controls">
+				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
+			</div>
+		</div>
+
+		<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>
diff --git a/app/views/subscription/feed.phtml b/app/views/subscription/feed.phtml
index e047741a1..48a401c4a 100644
--- a/app/views/subscription/feed.phtml
+++ b/app/views/subscription/feed.phtml
@@ -1,186 +1,15 @@
 <?php
-	if (!Minz_Request::param('ajax')) {
-		$this->partial('aside_subscription');
-	}
+
+if (!Minz_Request::param('ajax')) {
+	$this->partial('aside_subscription');
+}
+
+if ($this->feed) {
+	$this->renderHelper('feed/update');
+} else {
 ?>
-
-<?php if ($this->flux) { ?>
-<div class="post">
-	<!-- <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a> -->
-
-	<h1><?php echo $this->flux->name (); ?></h1>
-	<?php echo $this->flux->description (); ?>
-
-	<?php $nbEntries = $this->flux->nbEntries (); ?>
-
-	<?php if ($this->flux->inError ()) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t ('damn'); ?></span> <?php echo Minz_Translate::t ('feed_in_error'); ?></p>
-	<?php } elseif ($nbEntries === 0) { ?>
-	<p class="alert alert-warn"><?php echo Minz_Translate::t ('feed_empty'); ?></p>
-	<?php } ?>
-
-	<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->flux->id ()); ?>" autocomplete="off">
-		<legend><?php echo Minz_Translate::t ('informations'); ?></legend>
-		<div class="form-group">
-			<label class="group-name" for="name"><?php echo Minz_Translate::t ('title'); ?></label>
-			<div class="group-controls">
-				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->flux->name () ; ?>" />
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="description"><?php echo Minz_Translate::t ('feed_description'); ?></label>
-			<div class="group-controls">
-				<textarea name="description" id="description"><?php echo htmlspecialchars($this->flux->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="website"><?php echo Minz_Translate::t ('website_url'); ?></label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->flux->website (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->flux->website (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
-				</div>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="url"><?php echo Minz_Translate::t ('feed_url'); ?></label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->flux->url (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->flux->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
-				</div>
-
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->flux->url (); ?>"><?php echo Minz_Translate::t ('feed_validator'); ?></a>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="category"><?php echo Minz_Translate::t ('category'); ?></label>
-			<div class="group-controls">
-				<select name="category" id="category">
-				<?php foreach ($this->categories as $cat) { ?>
-				<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->flux->category () ? ' selected="selected"' : ''; ?>>
-					<?php echo $cat->name (); ?>
-				</option>
-				<?php } ?>
-				</select>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
-			<div class="group-controls">
-				<label class="checkbox" for="priority">
-					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->flux->priority () > 0 ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('yes'); ?>
-				</label>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="group-controls">
-				<a href="<?php echo _url('stats', 'repartition', 'id', $this->flux->id()); ?>">
-					<?php echo _i('stats'); ?> <?php echo _t('stats'); ?>
-				</a>
-			</div>
-		</div>
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button class="btn btn-attention confirm"
-				        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-				        formaction="<?php echo _url('feed', 'delete', 'id', $this->flux->id ()); ?>"
-				        formmethod="post"><?php echo _t('delete'); ?></button>
-			</div>
-		</div>
-
-		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
-
-		<div class="form-group">
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" value="<?php echo _t('number_articles', $nbEntries); ?>" disabled="disabled" />
-					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->flux->id ()); ?>">
-						<?php echo _i('refresh'); ?> <?php echo _t('actualize'); ?>
-					</a>
-				</div>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="keep_history"><?php echo Minz_Translate::t ('keep_history'); ?></label>
-			<div class="group-controls">
-				<select class="number" name="keep_history" id="keep_history" required="required"><?php
-					foreach (array('' => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->flux->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-					}
-				?></select>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="ttl"><?php echo Minz_Translate::t('ttl'); ?></label>
-			<div class="group-controls">
-				<select class="number" name="ttl" id="ttl" required="required"><?php
-					$found = false;
-					foreach (array(-2 => Minz_Translate::t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
-					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
-					                36000 => '10h', 43200 => '12h', 64800 => '18h',
-					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
-					                604800 => '1wk', 1209600 => '2wk', 1814400 => '3wk', 2419200 => '4wk', 2629744 => '1mo', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->flux->ttl() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-						if ($this->flux->ttl() == $v) {
-							$found = true;
-						}
-					}
-					if (!$found) {
-						echo '<option value="' . intval($this->flux->ttl()) . '" selected="selected">' . intval($this->flux->ttl()) . 's</option>';
-					}
-				?></select>
-			</div>
-		</div>
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->flux->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
-			</div>
-		</div>
-
-		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
-		<?php $auth = $this->flux->httpAuth (false); ?>
-		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo Minz_Translate::t ('http_username'); ?></label>
-			<div class="group-controls">
-				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('access_protected_feeds'); ?>
-			</div>
-
-			<label class="group-name" for="http_pass"><?php echo Minz_Translate::t ('http_password'); ?></label>
-			<div class="group-controls">
-				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
-			</div>
-		</div>
-
-		<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>
-
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
-		<div class="form-group">
-			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
-			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
-			</div>
-		</div>
-
-		<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 class="alert alert-warn">
+	<span class="alert-head"><?php echo _t('no_selected_feed'); ?></span>
+	<?php echo _t('think_to_add'); ?>
 </div>
-
-<?php } else { ?>
-<div class="alert alert-warn"><span class="alert-head"><?php echo Minz_Translate::t ('no_selected_feed'); ?></span> <?php echo Minz_Translate::t ('think_to_add'); ?></div>
 <?php } ?>
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 444dc9d9b..bce9eacf1 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -129,4 +129,9 @@
 </div>
 
 <div id="slider">
+<?php
+	if (isset($this->feed) && $this->feed) {
+		$this->renderHelper('feed/update');
+	}
+?>
 </div>

From a7bf7ced369a046b487ab1cd8b3819acc5ebdafe Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 12:18:32 +0200
Subject: [PATCH 021/363] Fix links for feed management

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/categoryController.php   |  8 ++++----
 app/Controllers/feedController.php       | 16 +++++++++-------
 app/layout/aside_flux.phtml              |  2 +-
 app/views/helpers/view/global_view.phtml |  2 +-
 app/views/helpers/view/normal_view.phtml |  2 +-
 app/views/helpers/view/reader_view.phtml |  2 +-
 app/views/stats/idle.phtml               |  2 +-
 app/views/stats/repartition.phtml        |  2 +-
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 65fe631cc..2c99751a4 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -31,7 +31,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 */
 	public function createAction() {
 		$catDAO = new FreshRSS_CategoryDAO();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
@@ -71,7 +71,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 */
 	public function updateAction() {
 		$catDAO = new FreshRSS_CategoryDAO();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
@@ -113,7 +113,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$catDAO = new FreshRSS_CategoryDAO();
 		$default_category = $catDAO->getDefault();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
@@ -150,7 +150,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 */
 	public function emptyAction() {
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 7ef427ac2..e4859b110 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -26,8 +26,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		if ($url === false) {
 			Minz_Request::forward(array(
-				'c' => 'configure',
-				'a' => 'feed'
+				'c' => 'subscription',
+				'a' => 'index'
 			), true);
 		}
 
@@ -166,7 +166,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feedDAO->rollBack ();
 			}
 
-			Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => $params), true);
+			Minz_Request::forward (array ('c' => 'subscription', 'a' => 'index', 'params' => $params), true);
 		} else {
 
 			// GET request so we must ask confirmation to user
@@ -193,8 +193,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Session::_param('notification', $notif);
 
 				Minz_Request::forward(array(
-					'c' => 'configure',
-					'a' => 'feed',
+					'c' => 'subscription',
+					'a' => 'index',
 					'params' => array(
 						'id' => $feed->id()
 					)
@@ -214,7 +214,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param ('notification', $notif);
 			invalidateHttpCache();
-			Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true);
+			Minz_Request::forward (array ('c' => 'subscription',
+			                              'a' => 'index',
+			                              'params' => array('id' => $id)), true);
 		}
 	}
 
@@ -405,7 +407,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($redirect_url) {
 				Minz_Request::forward($redirect_url);
 			} else {
-				Minz_Request::forward(array('c' => 'configure', 'a' => 'feed'), true);
+				Minz_Request::forward(array('c' => 'subscription', 'a' => 'index'), true);
 			}
 		}
 	}
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 341697103..a8ae2f424 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -89,7 +89,7 @@
 		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
 		<?php if ($this->loginOk) { ?>
 		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('configure', 'feed', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
 		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
 		<li class="item">
 			<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index 72bcf4c73..5e4cad01a 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -48,6 +48,6 @@
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn global">
 	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 6d9789f8d..e469edf58 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -186,6 +186,6 @@ if (!empty($this->entries)) {
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn normal">
 	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index c80dca519..413094239 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -39,6 +39,6 @@ if (!empty($this->entries)) {
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn reader">
 	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 6f3d4a117..75cba1081 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -25,7 +25,7 @@
 				<li class="item">
 					<div class="stick">
 						<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
-						<a class="btn" href="<?php echo _url('configure', 'feed', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
+						<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
 						<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id'], 'r', $current_url); ?>"><?php echo _t('delete'); ?></button>
 					</div>
 				</li>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index b425c1458..dac47e189 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -24,7 +24,7 @@
 	</select>
 
 	<?php if ($this->feed) {?>
-		<a class="btn" href="<?php echo _url('configure', 'feed', 'id', $this->feed->id()); ?>">
+		<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $this->feed->id()); ?>">
 			<?php echo _i('configure'); ?> <?php echo _t('administration'); ?>
 		</a>
 	<?php }?>

From f400621f44c2aac0b1bb4204e95e4c35a8a35f8f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 13:37:10 +0200
Subject: [PATCH 022/363] Fix problem when deleting default category

This is not allowed!

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/categoryController.php     |  4 ++++
 app/Controllers/subscriptionController.php |  1 +
 app/views/subscription/index.phtml         | 12 +++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 2c99751a4..c79f37fa4 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -123,6 +123,10 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('category_no_id'), $url_redirect);
 			}
 
+			if ($id === $default_category->id()) {
+				Minz_Request::bad(_t('category_not_delete_default'), $url_redirect);
+			}
+
 			if ($feedDAO->changeCategory($id, $default_category->id()) === false) {
 				Minz_Request::bad(_t('error_occurred'), $url_redirect);
 			}
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 83f803edb..aabae7b8f 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -19,6 +19,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 
 		$catDAO = new FreshRSS_CategoryDAO();
 
+		$catDAO->checkDefault();
 		$this->view->categories = $catDAO->listCategories(false);
 		$this->view->default_category = $catDAO->getDefault();
 	}
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index bce9eacf1..2d55890f7 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -82,9 +82,14 @@
 
 						<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _t('filter'); ?></a></li>
 
-						<li class="separator"></li>
+						<?php
+							$no_feed = empty($feeds);
+							$is_default = ($cat->id() === $this->default_category->id());
 
-						<?php if (!empty($feeds)) { ?>
+							if (!$no_feed || !$is_default) {
+						?>
+						<li class="separator"></li>
+						<?php } if (!$no_feed) { ?>
 						<li class="item">
 							<button class="as-link confirm"
 							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
@@ -93,7 +98,7 @@
 							        formaction="<?php echo _url('category', 'empty', 'id', $cat->id()); ?>">
 							        <?php echo _t('ask_empty'); ?></button>
 						</li>
-						<?php } ?>
+						<?php } if (!$is_default) { ?>
 						<li class="item">
 							<button class="as-link confirm"
 							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
@@ -102,6 +107,7 @@
 							        formaction="<?php echo _url('category', 'delete', 'id', $cat->id()); ?>">
 							        <?php echo _t('delete'); ?></button>
 						</li>
+						<?php } ?>
 					</ul>
 				</div>
 			</form>

From 405f23050b18e8388edb6f8be90aa59c17ada421 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 13:55:30 +0200
Subject: [PATCH 023/363] Design of the slider

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/subscription/index.phtml |  5 +++--
 p/scripts/main.js                  | 14 ++++++++++----
 p/themes/base-theme/template.css   | 24 +++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 2d55890f7..10578bdd3 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -134,9 +134,10 @@
 	<?php } ?>
 </div>
 
-<div id="slider">
+<a id="close-slider"></a>
+<div id="slider"<?php echo isset($this->feed) ? ' class="active"' : ''; ?>>
 <?php
-	if (isset($this->feed) && $this->feed) {
+	if (isset($this->feed)) {
 		$this->renderHelper('feed/update');
 	}
 ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 7fed7a819..925a93650 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1241,7 +1241,8 @@ function faviconNbUnread(n) {
 }
 
 function init_slider_observers() {
-	var slider = $('#slider');
+	var slider = $('#slider'),
+	    closer = $('#close-slider');
 	if (slider.length < 1) {
 		return;
 	}
@@ -1252,7 +1253,6 @@ function init_slider_observers() {
 		}
 
 		ajax_loading = true;
-
 		var url_slide = $(this).attr('href');
 
 		$.ajax({
@@ -1261,12 +1261,18 @@ function init_slider_observers() {
 			data : { ajax: true }
 		}).done(function (data) {
 			slider.html(data);
-			slider.show();
+			closer.addClass('active');
+			slider.addClass('active');
 			ajax_loading = false;
 		});
 
 		return false;
-	})
+	});
+
+	closer.on('click', function() {
+		closer.removeClass('active');
+		slider.removeClass('active');
+	});
 }
 
 function init_all() {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 397f943a6..e6c832ee4 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -647,7 +647,29 @@ br + br + br {
 
 /*=== Slider */
 #slider {
-	min-height: 50px;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 100%; right: 0;
+	overflow: auto;
+	background: #fff;
+	border-left: 1px solid #aaa;
+	transition: left 200ms linear;
+	-moz-transition: left 200ms linear;
+	-webkit-transition: left 200ms linear;
+	-o-transition: left 200ms linear;
+	-ms-transition: left 200ms linear;
+}
+#slider.active {
+	left: 40%;
+}
+#close-slider {
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 100%; right: 0;
+	cursor: pointer;
+}
+#close-slider.active {
+	left: 0;
 }
 
 /*=== DIVERS */

From fe655e0d9d2fb1173099d77c478bbb2f7ac8b1e1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 13:58:09 +0200
Subject: [PATCH 024/363] Fix close slider when a feed is selected

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/subscription/index.phtml | 5 +++--
 p/scripts/main.js                  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 10578bdd3..577ddd972 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -134,8 +134,9 @@
 	<?php } ?>
 </div>
 
-<a id="close-slider"></a>
-<div id="slider"<?php echo isset($this->feed) ? ' class="active"' : ''; ?>>
+<?php $class = isset($this->feed) ? ' class="active"' : ''; ?>
+<a href="#" id="close-slider"<?php echo $class; ?>></a>
+<div id="slider"<?php echo $class; ?>>
 <?php
 	if (isset($this->feed)) {
 		$this->renderHelper('feed/update');
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 925a93650..005dc961b 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1272,6 +1272,7 @@ function init_slider_observers() {
 	closer.on('click', function() {
 		closer.removeClass('active');
 		slider.removeClass('active');
+		return false;
 	});
 }
 

From bbedca510bb0b88850476bf2e2aa6af8c02ac741 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 09:21:08 +0200
Subject: [PATCH 025/363] Better import icon

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 p/themes/icons/import.svg | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/p/themes/icons/import.svg b/p/themes/icons/import.svg
index a7f20c909..18a54ab59 100644
--- a/p/themes/icons/import.svg
+++ b/p/themes/icons/import.svg
@@ -1,9 +1 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-80,-648)" fill="#ffffff">
-<path style="baseline-shift:baseline;block-progression:tb;color:#ffffff;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m84.406,657a0.50005,0.50005,0,0,0,-0.3125,0.21875l-1,1.5a0.50005,0.50005,0,1,0,0.8125,0.5625l1-1.5a0.50005,0.50005,0,0,0,-0.5,-0.78zm7,0a0.50005,0.50005,0,0,0,-0.3125,0.78125l1,1.5a0.50005,0.50005,0,1,0,0.8125,-0.5625l-1-1.5a0.50005,0.50005,0,0,0,-0.5,-0.22z"/>
-<g transform="translate(-80,110)">
-<path style="block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m167,539,0,5.5625-1.2812-1.2812c-0.19-0.19-0.45-0.28-0.72-0.28h-1v1c0.00001,0.2653,0.0931,0.53058,0.28125,0.71875l3,3,0.28125,0.28125h0.875l0.28125-0.28125,3-3c0.19-0.19,0.28-0.45,0.28-0.72v-1h-1c-0.2653,0.00001-0.53059,0.0931-0.71875,0.28125l-1.28,1.28v-5.56z"/>
-<path style="enable-background:accumulate;color:#000000;" d="m163,549,0,4,10,0,0-4zm3.3438,1.4375c0.0208-0.001,0.0417-0.001,0.0625,0,0.29096-0.0556,0.59898,0.20383,0.59375,0.5v0.0625h2v-0.0625c-0.004-0.26416,0.23582-0.50712,0.5-0.50712s0.50373,0.24296,0.5,0.50712l-9.99,0.06c0,0.54535-0.45465,1-1,1h-2c-0.54535,0-1-0.45465-1-1v-0.0625c-0.0108-0.21706,0.13723-0.43234,0.34375-0.5z" fill-rule="evenodd"/>
-</g>
-</g>
-</svg>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16"><g transform="translate(-80,-648)"/><g transform="translate(-80,-648)"/><g transform="translate(-80,-648)"/><g transform="translate(-80,-648)"><path d="m84.406 657a0.5 0.5 0 0 0-0.312 0.219l-1 1.5a0.5 0.5 0 1 0 0.813 0.563l1-1.5A0.5 0.5 0 0 0 84.406 657zm7 0a0.5 0.5 0 0 0-0.312 0.781l1 1.5a0.5 0.5 0 1 0 0.813-0.562l-1-1.5A0.5 0.5 0 0 0 91.406 657z" style="-inkscape-font-specification:Sans;baseline-shift:baseline;block-progression:tb;direction:ltr;fill:#ffffff;font-family:Sans;font-size:medium;letter-spacing:normal;line-height:normal;text-align:start;text-anchor:start;text-decoration:none;text-indent:0;text-transform:none;word-spacing:normal;writing-mode:lr-tb"/><g transform="translate(-80,110)"><path d="m167 539 0 5.563-1.281-1.281C165.531 543.093 165.265 543 165 543l-1 0 0 1c0 0.265 0.093 0.531 0.281 0.719l3 3 0.281 0.281 0.875 0 0.281-0.281 3-3C171.907 544.531 172 544.265 172 544l0-1-1 0c-0.265 0-0.531 0.093-0.719 0.281L169 544.563 169 539z" style="-inkscape-font-specification:Bitstream Vera Sans;block-progression:tb;direction:ltr;fill:#ffffff;font-family:Bitstream Vera Sans;font-size:medium;letter-spacing:normal;line-height:normal;text-align:start;text-anchor:start;text-decoration:none;text-indent:0;text-transform:none;word-spacing:normal;writing-mode:lr-tb"/><path d="m163 549 0 4 10 0 0-4zm3.344 1.438c0.021-0.001 0.042-0.001 0.063 0 0.291-0.056 0.599 0.204 0.594 0.5l0 0.063 2 0 0-0.062c-0.004-0.264 0.236-0.507 0.5-0.507 0.264 0 0.504 0.243 0.5 0.507L170 551c0 0.545-0.455 1-1 1l-2 0c-0.545 0-1-0.455-1-1l0-0.062c-0.011-0.217 0.137-0.432 0.344-0.5z" fill="#ffffff"/></g></g><g transform="translate(-80,-648)"/><g transform="translate(-80,-648)"/><g transform="translate(-80,-648)"/></svg>

From 9b2ad32e98e4720d5ee422fccd3069f086ee8563 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 10:05:26 +0200
Subject: [PATCH 026/363] Fix a bug in main.js

In global view, there is no ".category.all>a" element so we tried
to apply str2int on an undefined value.
In consequence, we were not able to mark several articles as read

This patch need to apply on 0.8.1 and 0.9.1

See https://github.com/marienfressinaud/FreshRSS/issues/649
---
 p/scripts/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 7cd53c745..c9e8dd299 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -33,7 +33,7 @@ function needsScroll($elem) {
 }
 
 function str2int(str) {
-	if (str == '') {
+	if (str == '' || str === undefined) {
 		return 0;
 	}
 	return parseInt(str.replace(/\D/g, ''), 10) || 0;

From db4da3babc0864099c5ab48e3583d0546a2759d8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 11:39:51 +0200
Subject: [PATCH 027/363] First draft for drag and drop

We can change feed category by drag and drop! Need improvements...

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/feedController.php         | 15 ++++++
 app/Controllers/subscriptionController.php |  2 +
 app/views/subscription/index.phtml         |  4 +-
 p/scripts/category.js                      | 55 ++++++++++++++++++++++
 p/scripts/main.js                          |  2 +-
 p/themes/Origine/origine.css               |  9 ++++
 6 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 p/scripts/category.js

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index e4859b110..315665ef3 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -378,6 +378,21 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
+	public function moveAction() {
+		if (Minz_Request::isPost()) {
+			$feed_id = Minz_Request::param('f_id');
+			$cat_id = Minz_Request::param('c_id');
+
+			$feedDAO = FreshRSS_Factory::createFeedDao();
+
+			$values = array(
+				'category' => $cat_id,
+			);
+
+			$feedDAO->updateFeed($feed_id, $values);
+		}
+	}
+
 	public function deleteAction() {
 		if (Minz_Request::isPost()) {
 			$id = Minz_Request::param('id');
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index aabae7b8f..7cc8179a0 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -30,6 +30,8 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 	 * It displays categories and associated feeds.
 	 */
 	public function indexAction() {
+		Minz_View::appendScript(Minz_Url::display('/scripts/category.js?' .
+		                        @filemtime(PUBLIC_PATH . '/scripts/category.js')));
 		Minz_View::prependTitle(_t('subscription_management') . ' · ');
 
 		$id = Minz_Request::param('id');
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 577ddd972..3a79a34e6 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -113,14 +113,14 @@
 			</form>
 		</div>
 
-		<ul class="box-content">
+		<ul class="box-content" dropzone="move" data-cat-id="<?php echo $cat->id(); ?>">
 			<?php if (!empty($feeds)) { ?>
 			<?php
 					foreach ($feeds as $feed) {
 						$error = $feed->inError() ? ' error' : '';
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
-			<li class="item<?php echo $error, $empty; ?>">
+			<li class="item feed<?php echo $error, $empty; ?>" draggable="true" data-feed-id="<?php echo $feed->id(); ?>">
 				<a class="configure open-slider" href="<?php echo _url('subscription', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
diff --git a/p/scripts/category.js b/p/scripts/category.js
new file mode 100644
index 000000000..fe80c3b22
--- /dev/null
+++ b/p/scripts/category.js
@@ -0,0 +1,55 @@
+"use strict";
+
+
+function init_draggable() {
+	var feeds_draggable = '.box-content > .feed',
+	    box_dropzone = '.box-content';
+
+	$('.box').on('dragstart', feeds_draggable, function(e) {
+		e.originalEvent.dataTransfer.effectAllowed = 'move';
+		e.originalEvent.dataTransfer.setData('html', e.target.outerHTML);
+		e.originalEvent.dataTransfer.setData('feed-id', e.target.getAttribute('data-feed-id'));
+	});
+	$('.box').on('dragend', feeds_draggable, function(e) {
+		var parent = e.target.parentNode;
+		parent.removeChild(e.target);
+	});
+
+	$('.box').on('dragenter', box_dropzone, function(e) {
+		$(e.target).addClass('drag-hover');
+	});
+	$('.box').on('dragleave', box_dropzone, function(e) {
+		$(e.target).removeClass('drag-hover');
+	});
+	$('.box').on('dragover', box_dropzone, function(e) {
+		e.originalEvent.dataTransfer.dropEffect = "move";
+
+		return false;
+	});
+	$('.box').on('drop', box_dropzone, function(e) {
+		var feed_id = e.originalEvent.dataTransfer.getData('feed-id'),
+		    cat_id = e.target.parentNode.getAttribute('data-cat-id');
+
+		$.ajax({
+			type: 'POST',
+			url: './?c=feed&a=move',
+			data : {
+				f_id: feed_id,
+				c_id: cat_id
+			}
+		});
+
+		$(e.target).after(e.originalEvent.dataTransfer.getData('html'));
+		$(e.target).removeClass('drag-hover');
+		return false;
+	});
+}
+
+
+if (document.readyState && document.readyState !== 'loading') {
+	init_draggable();
+} else if (document.addEventListener) {
+	document.addEventListener('DOMContentLoaded', function () {
+		init_draggable();
+	}, false);
+}
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 005dc961b..e8055e00f 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1247,7 +1247,7 @@ function init_slider_observers() {
 		return;
 	}
 
-	$('.open-slider').on('click', function() {
+	$('.post').on('click', '.open-slider', function() {
 		if (ajax_loading) {
 			return false;
 		}
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index e3ae85075..cf6c9a2ef 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -497,6 +497,15 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Draggable */
+.drag-hover {
+	background: #dfd;
+	transition: all linear 0.2s;
+}
+[draggable=true] {
+	cursor: grab;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */

From 50f07febaed5e839d4e7d56a664c8a208bc2aaf5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 12:13:16 +0200
Subject: [PATCH 028/363] Add dataTransfer property to event for JQuery

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 p/scripts/category.js        | 15 +++++++++------
 p/themes/Origine/origine.css |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/p/scripts/category.js b/p/scripts/category.js
index fe80c3b22..4378aa9cd 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -2,17 +2,20 @@
 
 
 function init_draggable() {
+	$.event.props.push('dataTransfer');
+
 	var feeds_draggable = '.box-content > .feed',
 	    box_dropzone = '.box-content';
 
 	$('.box').on('dragstart', feeds_draggable, function(e) {
-		e.originalEvent.dataTransfer.effectAllowed = 'move';
-		e.originalEvent.dataTransfer.setData('html', e.target.outerHTML);
-		e.originalEvent.dataTransfer.setData('feed-id', e.target.getAttribute('data-feed-id'));
+		e.dataTransfer.effectAllowed = 'move';
+		e.dataTransfer.setData('html', e.target.outerHTML);
+		e.dataTransfer.setData('feed-id', e.target.getAttribute('data-feed-id'));
 	});
 	$('.box').on('dragend', feeds_draggable, function(e) {
 		var parent = e.target.parentNode;
 		parent.removeChild(e.target);
+		
 	});
 
 	$('.box').on('dragenter', box_dropzone, function(e) {
@@ -22,12 +25,12 @@ function init_draggable() {
 		$(e.target).removeClass('drag-hover');
 	});
 	$('.box').on('dragover', box_dropzone, function(e) {
-		e.originalEvent.dataTransfer.dropEffect = "move";
+		e.dataTransfer.dropEffect = "move";
 
 		return false;
 	});
 	$('.box').on('drop', box_dropzone, function(e) {
-		var feed_id = e.originalEvent.dataTransfer.getData('feed-id'),
+		var feed_id = e.dataTransfer.getData('feed-id'),
 		    cat_id = e.target.parentNode.getAttribute('data-cat-id');
 
 		$.ajax({
@@ -39,7 +42,7 @@ function init_draggable() {
 			}
 		});
 
-		$(e.target).after(e.originalEvent.dataTransfer.getData('html'));
+		$(e.target).after(e.dataTransfer.getData('html'));
 		$(e.target).removeClass('drag-hover');
 		return false;
 	});
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index cf6c9a2ef..c79f6cc4c 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -481,6 +481,7 @@ a.btn {
 	border-radius: 5px 5px 0 0;
 }
 .box .box-content {
+	min-height: 2.5em;
 	max-height: 260px;
 }
 

From 6effa82cef4ea8fd98178e72b270de6ea4f9f80f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 15:02:42 +0200
Subject: [PATCH 029/363] Improve drag and drop

- Refactoring
- Better design
- Item doesn't disappear if action is not completed

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/subscription/index.phtml | 11 ++++--
 p/scripts/category.js              | 63 +++++++++++++++++++++++-------
 p/themes/Origine/origine.css       |  9 -----
 p/themes/base-theme/template.css   | 12 ++++++
 4 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 3a79a34e6..2c56f79ed 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -1,6 +1,6 @@
 <?php $this->partial('aside_subscription'); ?>
 
-<div class="post">
+<div class="post drop-section">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<h2><?php echo _t('subscription_management'); ?></h2>
@@ -113,21 +113,24 @@
 			</form>
 		</div>
 
-		<ul class="box-content" dropzone="move" data-cat-id="<?php echo $cat->id(); ?>">
+		<ul class="box-content" data-cat-id="<?php echo $cat->id(); ?>">
 			<?php if (!empty($feeds)) { ?>
 			<?php
 					foreach ($feeds as $feed) {
 						$error = $feed->inError() ? ' error' : '';
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
-			<li class="item feed<?php echo $error, $empty; ?>" draggable="true" data-feed-id="<?php echo $feed->id(); ?>">
+			<li class="item feed<?php echo $error, $empty; ?>"
+			    draggable="true"
+			    data-feed-id="<?php echo $feed->id(); ?>"
+			    dropzone="move">
 				<a class="configure open-slider" href="<?php echo _url('subscription', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
 			<?php 	}
 				} else {
 			?>
-			<li class="item"><?php echo _t('category_empty'); ?></li>
+			<li class="item disabled" dropzone="move"><?php echo _t('category_empty'); ?></li>
 			<?php } ?>
 		</ul>
 	</div>
diff --git a/p/scripts/category.js b/p/scripts/category.js
index 4378aa9cd..37ad36b17 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -1,38 +1,66 @@
 "use strict";
 
+var loading = false,
+	dnd_successful = false;
+
+function dragend_process(t) {
+	if (loading) {
+		window.setTimeout(function() {
+			dragend_process(t);
+		}, 50);
+	}
+
+	if (!dnd_successful) {
+		t.style.opacity = 1.0;
+	} else {
+		t.parentNode.removeChild(t);
+	}
+}
+
 
 function init_draggable() {
+	if (!(window.$ && window.url_freshrss)) {
+		if (window.console) {
+			console.log('FreshRSS waiting for JS…');
+		}
+		window.setTimeout(init_draggable, 50);
+		return;
+	}
+
 	$.event.props.push('dataTransfer');
 
-	var feeds_draggable = '.box-content > .feed',
-	    box_dropzone = '.box-content';
+	var draggable = '[draggable="true"]',
+	    dropzone = '[dropzone="move"]';
 
-	$('.box').on('dragstart', feeds_draggable, function(e) {
+	$('.drop-section').on('dragstart', draggable, function(e) {
 		e.dataTransfer.effectAllowed = 'move';
-		e.dataTransfer.setData('html', e.target.outerHTML);
-		e.dataTransfer.setData('feed-id', e.target.getAttribute('data-feed-id'));
+		e.dataTransfer.setData('text/html', e.target.outerHTML);
+		e.dataTransfer.setData('text', e.target.getAttribute('data-feed-id'));
+		e.target.style.opacity = 0.3;
+
+		dnd_successful = false;
 	});
-	$('.box').on('dragend', feeds_draggable, function(e) {
-		var parent = e.target.parentNode;
-		parent.removeChild(e.target);
-		
+	$('.drop-section').on('dragend', draggable, function(e) {
+		dragend_process(e.target);
 	});
 
-	$('.box').on('dragenter', box_dropzone, function(e) {
+	$('.drop-section').on('dragenter', dropzone, function(e) {
 		$(e.target).addClass('drag-hover');
 	});
-	$('.box').on('dragleave', box_dropzone, function(e) {
+	$('.drop-section').on('dragleave', dropzone, function(e) {
 		$(e.target).removeClass('drag-hover');
 	});
-	$('.box').on('dragover', box_dropzone, function(e) {
+	$('.drop-section').on('dragover', dropzone, function(e) {
 		e.dataTransfer.dropEffect = "move";
 
 		return false;
 	});
-	$('.box').on('drop', box_dropzone, function(e) {
-		var feed_id = e.dataTransfer.getData('feed-id'),
+	$('.drop-section').on('drop', dropzone, function(e) {
+		var feed_id = e.dataTransfer.getData('text'),
 		    cat_id = e.target.parentNode.getAttribute('data-cat-id');
 
+		loading = true;
+
 		$.ajax({
 			type: 'POST',
 			url: './?c=feed&a=move',
@@ -40,10 +68,15 @@ function init_draggable() {
 				f_id: feed_id,
 				c_id: cat_id
 			}
+		}).success(function() {
+			$(e.target).after(e.dataTransfer.getData('text/html'));
+			loading = false;
+		}).complete(function() {
+			dnd_successful = true;
 		});
 
-		$(e.target).after(e.dataTransfer.getData('html'));
 		$(e.target).removeClass('drag-hover');
+
 		return false;
 	});
 }
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index c79f6cc4c..b25deab0c 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -498,15 +498,6 @@ a.btn {
 	visibility: visible;
 }
 
-/*=== Draggable */
-.drag-hover {
-	background: #dfd;
-	transition: all linear 0.2s;
-}
-[draggable=true] {
-	cursor: grab;
-}
-
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index e6c832ee4..06874c9fe 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -304,6 +304,10 @@ a.btn {
 .box .box-content .item {
 	display: block;
 }
+.box .box-content .item.disabled {
+	text-align: center;
+	font-style: italic;
+}
 
 .box .box-content-centered {
 	padding: 30px 5px;
@@ -313,6 +317,14 @@ a.btn {
 	margin: 20px 0 0;
 }
 
+/*=== Draggable */
+.drag-hover {
+	margin: 0 0 5px;
+	border-bottom: 2px solid #ccc;
+}
+[draggable=true] {
+	cursor: grab;
+}
 
 /*=== STRUCTURE */
 /*===============*/

From 408ac31dd8751eba037db216243958d396df1c8e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 19:02:43 +0200
Subject: [PATCH 030/363] Hack for dragleave (triggered on children!)

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/feedController.php |  7 ++++++-
 p/scripts/category.js              | 33 +++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 315665ef3..b2b53185e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -389,7 +389,12 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				'category' => $cat_id,
 			);
 
-			$feedDAO->updateFeed($feed_id, $values);
+			if (!$feedDAO->updateFeed($feed_id, $values)) {
+				Minz_Error::error(
+					404,
+					array('error' => array(_t('error_occurred')))
+				);
+			}
 		}
 	}
 
diff --git a/p/scripts/category.js b/p/scripts/category.js
index 37ad36b17..872d14490 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -4,6 +4,8 @@ var loading = false,
 	dnd_successful = false;
 
 function dragend_process(t) {
+	t.style.display = 'none';
+
 	if (loading) {
 		window.setTimeout(function() {
 			dragend_process(t);
@@ -11,13 +13,13 @@ function dragend_process(t) {
 	}
 
 	if (!dnd_successful) {
+		t.style.display = 'block';
 		t.style.opacity = 1.0;
 	} else {
 		t.parentNode.removeChild(t);
 	}
 }
 
-
 function init_draggable() {
 	if (!(window.$ && window.url_freshrss)) {
 		if (window.console) {
@@ -45,14 +47,31 @@ function init_draggable() {
 	});
 
 	$('.drop-section').on('dragenter', dropzone, function(e) {
-		$(e.target).addClass('drag-hover');
+		$(this).addClass('drag-hover');
+
+		e.preventDefault();
 	});
 	$('.drop-section').on('dragleave', dropzone, function(e) {
-		$(e.target).removeClass('drag-hover');
+		var pos_this = $(this).position(),
+		    scroll_top = $(document).scrollTop(),
+		    top = pos_this.top,
+		    left = pos_this.left,
+		    right = left + $(this).width(),
+		    bottom = top + $(this).height(),
+		    mouse_x = e.originalEvent.screenX,
+		    mouse_y = e.originalEvent.clientY + scroll_top;
+
+		if (left <= mouse_x && mouse_x <= right &&
+			top <= mouse_y && mouse_y <= bottom) {
+			// HACK because dragleave is triggered when hovering children!
+			return;
+		}
+		$(this).removeClass('drag-hover');
 	});
 	$('.drop-section').on('dragover', dropzone, function(e) {
 		e.dataTransfer.dropEffect = "move";
 
+		e.preventDefault();
 		return false;
 	});
 	$('.drop-section').on('drop', dropzone, function(e) {
@@ -70,14 +89,14 @@ function init_draggable() {
 			}
 		}).success(function() {
 			$(e.target).after(e.dataTransfer.getData('text/html'));
-			loading = false;
-		}).complete(function() {
 			dnd_successful = true;
+		}).complete(function() {
+			loading = false;
 		});
 
-		$(e.target).removeClass('drag-hover');
+		$(this).removeClass('drag-hover');
 
-		return false;
+		e.preventDefault();
 	});
 }
 

From ce43b1761b810c89e5e8660e8ae2638e97ca6339 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 19:47:02 +0200
Subject: [PATCH 031/363] Fix box when no feed in category

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/helpers/javascript_vars.phtml |  1 +
 p/scripts/category.js                   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 1139eb446..71798369d 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -54,6 +54,7 @@ echo 'authType="', $authType, '",',
 echo 'str_confirmation_default="', Minz_Translate::t('confirm_action'), '"', ",\n";
 echo 'str_notif_title_articles="', Minz_Translate::t('notif_title_new_articles'), '"', ",\n";
 echo 'str_notif_body_articles="', Minz_Translate::t('notif_body_new_articles'), '"', ",\n";
+echo 'str_category_empty="', Minz_Translate::t('category_empty'), '"', ",\n";
 echo 'html5_notif_timeout=', $this->conf->html5_notif_timeout,",\n";
 
 
diff --git a/p/scripts/category.js b/p/scripts/category.js
index 872d14490..dc5df67e4 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -16,7 +16,12 @@ function dragend_process(t) {
 		t.style.display = 'block';
 		t.style.opacity = 1.0;
 	} else {
-		t.parentNode.removeChild(t);
+		var parent = $(t.parentNode);
+		$(t).remove();
+
+		if (parent.children().length <= 0) {
+			parent.append('<li class="item disabled" dropzone="move">' + str_category_empty + '</li>');
+		}
 	}
 }
 
@@ -89,6 +94,9 @@ function init_draggable() {
 			}
 		}).success(function() {
 			$(e.target).after(e.dataTransfer.getData('text/html'));
+			if ($(e.target).hasClass('disabled')) {
+				$(e.target).remove();
+			}
 			dnd_successful = true;
 		}).complete(function() {
 			loading = false;

From 370b51815071a36574ef40f5661de4ba17f071c9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 21:38:18 +0200
Subject: [PATCH 032/363] Filter link on feed updating page

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/views/helpers/feed/update.phtml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 4a6425c45..3f6b32076 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -1,9 +1,11 @@
 <div class="post">
-	<!-- <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->feed->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a> -->
-
 	<h1><?php echo $this->feed->name (); ?></h1>
 	<?php echo $this->feed->description (); ?>
 
+	<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id ()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
+	<?php echo _t('or'); ?>
+	<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>"><?php echo _i('stats'); ?> <?php echo _t('stats'); ?></a>
+
 	<?php $nbEntries = $this->feed->nbEntries (); ?>
 
 	<?php if ($this->feed->inError ()) { ?>
@@ -67,13 +69,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="form-group">
-			<div class="group-controls">
-				<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>">
-					<?php echo _i('stats'); ?> <?php echo _t('stats'); ?>
-				</a>
-			</div>
-		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?php echo _t('save'); ?></button>

From 3b6b7d08d3c84dd9dc094fa3e0c0c58336552114 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 21:41:06 +0200
Subject: [PATCH 033/363] Fix position of links (updating feed)

See last commit
---
 app/views/helpers/feed/update.phtml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 3f6b32076..678c5f132 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -1,10 +1,13 @@
 <div class="post">
 	<h1><?php echo $this->feed->name (); ?></h1>
-	<?php echo $this->feed->description (); ?>
 
-	<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id ()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
-	<?php echo _t('or'); ?>
-	<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>"><?php echo _i('stats'); ?> <?php echo _t('stats'); ?></a>
+	<div>
+		<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id ()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
+		<?php echo _t('or'); ?>
+		<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>"><?php echo _i('stats'); ?> <?php echo _t('stats'); ?></a>
+	</div>
+
+	<p><?php echo $this->feed->description (); ?></p>
 
 	<?php $nbEntries = $this->feed->nbEntries (); ?>
 

From 94520ee326d1ad7323172a6d92ec0645e4606b73 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 22:02:09 +0200
Subject: [PATCH 034/363] Fix category not appear on feed.add page (GET)

Must apply to 0.8.1 and 0.9.1

See https://github.com/marienfressinaud/FreshRSS/issues/649
---
 app/Controllers/feedController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index b2b53185e..eb26d9786 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -171,7 +171,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			// GET request so we must ask confirmation to user
 			Minz_View::prependTitle(Minz_Translate::t('add_rss_feed') . ' · ');
-			$this->view->categories = $this->catDAO->listCategories();
+			$this->view->categories = $this->catDAO->listCategories(false);
 			$this->view->feed = new FreshRSS_Feed($url);
 			try {
 				// We try to get some more information about the feed

From 9f8d3d0527988b768f739fd4c0e61de68dfdd822 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 3 Oct 2014 12:18:43 +0200
Subject: [PATCH 035/363] Fix configure icon on Flat design

See https://github.com/marienfressinaud/FreshRSS/issues/468
---
 p/themes/Flat/flat.css           | 5 +++++
 p/themes/base-theme/template.css | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index d0ac46fd5..7b2695781 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -464,6 +464,11 @@ a.btn {
 .box .box-content .item .configure {
 	visibility: hidden;
 }
+.box .box-content .item .configure .icon {
+	vertical-align: middle;
+	background-color: #95a5a6;
+	border-radius: 3px;
+}
 .box .box-content .item:hover .configure {
 	visibility: visible;
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 06874c9fe..1a96f1e2f 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -73,7 +73,9 @@ label {
 input {
 	width: 180px;
 }
-textarea {
+textarea,
+input[type="file"],
+input.extend:focus {
 	width: 300px;
 }
 input, select, textarea {
@@ -85,9 +87,6 @@ input[type="checkbox"] {
 	width: 15px !important;
 	min-height: 15px !important;
 }
-input.extend:focus {
-	width: 300px;
-}
 button.as-link,
 button.as-link:hover,
 button.as-link:active {

From dd945df0cb2bae216b4612364506e74aa3259c0b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 3 Oct 2014 12:54:10 +0200
Subject: [PATCH 036/363] Fix category not change (updating feed on MySQL)

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/feedController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index eb26d9786..d694c103e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -384,12 +384,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$cat_id = Minz_Request::param('c_id');
 
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-
 			$values = array(
 				'category' => $cat_id,
 			);
 
-			if (!$feedDAO->updateFeed($feed_id, $values)) {
+			$feed = $feedDAO->searchById($feed_id);
+
+			if (!$feed || ($feed->category() != $cat_id &&
+			               !$feedDAO->updateFeed($feed_id, $values))) {
 				Minz_Error::error(
 					404,
 					array('error' => array(_t('error_occurred')))

From 783171011dc6256f37cbd4365f5405b5e8a4b44e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 4 Oct 2014 10:30:40 +0200
Subject: [PATCH 037/363] Fix icon not appearing (Flat theme)

See https://github.com/marienfressinaud/FreshRSS/issues/651
---
 p/themes/Flat/flat.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 7b2695781..e2151b1f9 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -652,6 +652,12 @@ a.btn {
 	padding: 5px 0;
 }
 
+#dropdown-query ~ .dropdown-menu .dropdown-header .icon {
+	vertical-align: middle;
+	background-color: #95a5a6;
+	border-radius: 3px;
+}
+
 /*=== Feed articles */
 .flux {
 	border-left: 2px solid #ecf0f1;

From 91cc88209c710e64cd8a10397e56d006d4566624 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 4 Oct 2014 08:45:57 -0400
Subject: [PATCH 038/363] Remove debugging code

---
 p/scripts/main.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 37281a907..02d16ca64 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -384,8 +384,6 @@ function collapse_entry() {
 }
 
 function user_filter(key) {
-	console.log('user filter');
-	console.warn(key);
 	var filter = $('#dropdown-query');
 	var filters = filter.siblings('.dropdown-menu').find('.item.query a');
 	if (typeof key === "undefined") {

From 7a59568dfc20589c0495235679a96a375e36cfee Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 4 Oct 2014 08:46:11 -0400
Subject: [PATCH 039/363] Fix library with code provided in the comments of the
 library page.

The fix was given by the owner of the project (I assume) but was never integrated in the code. There is no bug tracker so I couldn't open a ticket.
It looks like the project is dead since there is modification to the library.
---
 p/scripts/shortcut.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/p/scripts/shortcut.js b/p/scripts/shortcut.js
index debaffbaa..4137172c3 100644
--- a/p/scripts/shortcut.js
+++ b/p/scripts/shortcut.js
@@ -43,7 +43,9 @@ shortcut = {
 			//Find Which key is pressed
 			if (e.keyCode) code = e.keyCode;
 			else if (e.which) code = e.which;
-			var character = String.fromCharCode(code).toLowerCase();
+			if(  code == 32 ||  (code >= 48 && code <= 90) ||  (code >= 96 && code <= 111) ||  (code >= 186 && code <= 192) ||  (code >= 219 && code <= 222)) {
+				var character = String.fromCharCode(code).toLowerCase();
+			}
 			
 			if(code == 188) character=","; //If the user presses , when the type is onkeydown
 			if(code == 190) character="."; //If the user presses , when the type is onkeydown

From 38a6f0c4b29e5a53c21f345dd839a4fa0b2a6f47 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 4 Oct 2014 09:06:35 -0400
Subject: [PATCH 040/363] Add a shortcut to close drop-down lists

---
 app/Models/Configuration.php            | 1 +
 app/i18n/en.php                         | 1 +
 app/i18n/fr.php                         | 1 +
 app/views/configure/shortcut.phtml      | 7 +++++++
 app/views/helpers/javascript_vars.phtml | 3 ++-
 p/scripts/main.js                       | 6 ++++++
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 95f819779..feba3d2f6 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -47,6 +47,7 @@ class FreshRSS_Configuration {
 			'focus_search' => 'a',
 			'user_filter' => 'u',
 			'help' => 'f1',
+			'close_dropdown' => 'escape',
 		),
 		'topline_read' => true,
 		'topline_favorite' => true,
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 28104196e..0456049a9 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -191,6 +191,7 @@ return array (
 	'user_filter'			=> 'Access user filters',
 	'user_filter_help'		=> 'If there is only one user filter, it is used. Else filters are accessible by their number.',
 	'help'				=> 'Display documentation',
+	'close_dropdown'		=> 'Close drop-down lists',
 
 	'file_to_import'		=> 'File to import<br />(OPML, Json or Zip)',
 	'file_to_import_no_zip'		=> 'File to import<br />(OPML or Json)',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index c72fc3e93..adc79d0e2 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -191,6 +191,7 @@ return array (
 	'user_filter'			=> 'Accéder aux filtres utilisateur',
 	'user_filter_help'		=> 'S’il n’y a qu’un filtre utilisateur, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	'help'				=> 'Afficher la documentation',
+	'close_dropdown'		=> 'Fermer les listes déroulantes',
 
 	'file_to_import'		=> 'Fichier à importer<br />(OPML, Json ou Zip)',
 	'file_to_import_no_zip'		=> 'Fichier à importer<br />(OPML ou Json)',
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index a4029b676..44727e62b 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -111,6 +111,13 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name" for="close_dropdown_shortcut"><?php echo Minz_Translate::t ('close_dropdown'); ?></label>
+			<div class="group-controls">
+				<input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name" for="help_shortcut"><?php echo Minz_Translate::t ('help'); ?></label>
 			<div class="group-controls">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 71798369d..4f7e3db0c 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -28,7 +28,8 @@ echo ',shortcuts={',
 	'auto_share:"', $s['auto_share'], '",',
 	'focus_search:"', $s['focus_search'], '",',
 	'user_filter:"', $s['user_filter'], '",',
-	'help:"', $s['help'], '"',
+	'help:"', $s['help'], '",',
+	'close_dropdown:"', $s['close_dropdown'], '"',
 "},\n";
 
 if (Minz_Request::param ('output') === 'global') {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 37281a907..0d90d3d39 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -663,6 +663,12 @@ function init_shortcuts() {
 		'disable_in_input': true
 	});
 
+	shortcut.add(shortcuts.close_dropdown, function () {
+		window.location.hash = null;
+	}, {
+		'disable_in_input': true
+	});
+
 }
 
 function init_stream(divStream) {

From 6e6d7b3c870975b2981f653b6f53a31f800f56ec Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Oct 2014 01:43:29 +0200
Subject: [PATCH 041/363] Minor JavaScript

---
 p/scripts/main.js     | 2 +-
 p/scripts/shortcut.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 79a34ec29..5793bb50b 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -33,7 +33,7 @@ function needsScroll($elem) {
 }
 
 function str2int(str) {
-	if (str == '' || str === undefined) {
+	if (!str) {
 		return 0;
 	}
 	return parseInt(str.replace(/\D/g, ''), 10) || 0;
diff --git a/p/scripts/shortcut.js b/p/scripts/shortcut.js
index 4137172c3..e78cf6f5e 100644
--- a/p/scripts/shortcut.js
+++ b/p/scripts/shortcut.js
@@ -43,7 +43,7 @@ shortcut = {
 			//Find Which key is pressed
 			if (e.keyCode) code = e.keyCode;
 			else if (e.which) code = e.which;
-			if(  code == 32 ||  (code >= 48 && code <= 90) ||  (code >= 96 && code <= 111) ||  (code >= 186 && code <= 192) ||  (code >= 219 && code <= 222)) {
+			if (code == 32 || (code >= 48 && code <= 90) || (code >= 96 && code <= 111) || (code >= 186 && code <= 192) || (code >= 219 && code <= 222)) {	//FreshRSS
 				var character = String.fromCharCode(code).toLowerCase();
 			}
 			

From 9101bdb15edb7278ea26f6aee01c2b79e0f73dd5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 09:58:21 +0200
Subject: [PATCH 042/363] Design shortcuts_navigation_help box

---
 app/views/configure/shortcut.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 44727e62b..5ae8069ad 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -18,6 +18,8 @@
 
 		<legend><?php echo Minz_Translate::t ('shortcuts_navigation'); ?></legend>
 
+		<p class="alert alert-warn"><?php echo Minz_Translate::t('shortcuts_navigation_help');?></p>
+
 		<div class="form-group">
 			<label class="group-name" for="next_entry"><?php echo Minz_Translate::t ('next_article'); ?></label>
 			<div class="group-controls">
@@ -46,8 +48,6 @@
 			</div>
 		</div>
 
-		<div><?php echo Minz_Translate::t ('shortcuts_navigation_help');?></div>
-
 		<legend><?php echo Minz_Translate::t ('shortcuts_article_action');?></legend>
 
 		<div class="form-group">

From 9c4f0a94d757763842ae183d7aea89044a675ba6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 10:00:49 +0200
Subject: [PATCH 043/363] Coding style shortcut.phtml

---
 app/views/configure/shortcut.phtml | 56 +++++++++++++++---------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 5ae8069ad..fc8e90590 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -1,7 +1,7 @@
-<?php $this->partial ('aside_configure'); ?>
+<?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>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<datalist id="keys">
 		<?php foreach ($this->list_keys as $key) { ?>
@@ -11,115 +11,115 @@
 
 	<?php $s = $this->conf->shortcuts; ?>
 
-	<form method="post" action="<?php echo _url ('configure', 'shortcut'); ?>">
-		<legend><?php echo Minz_Translate::t ('shortcuts'); ?></legend>
+	<form method="post" action="<?php echo _url('configure', 'shortcut'); ?>">
+		<legend><?php echo _t('shortcuts'); ?></legend>
 
-		<noscript><p class="alert alert-error"><?php echo Minz_Translate::t ('javascript_for_shortcuts'); ?></p></noscript>
+		<noscript><p class="alert alert-error"><?php echo _t('javascript_for_shortcuts'); ?></p></noscript>
 
-		<legend><?php echo Minz_Translate::t ('shortcuts_navigation'); ?></legend>
+		<legend><?php echo _t('shortcuts_navigation'); ?></legend>
 
-		<p class="alert alert-warn"><?php echo Minz_Translate::t('shortcuts_navigation_help');?></p>
+		<p class="alert alert-warn"><?php echo _t('shortcuts_navigation_help');?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="next_entry"><?php echo Minz_Translate::t ('next_article'); ?></label>
+			<label class="group-name" for="next_entry"><?php echo _t('next_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?php echo $s['next_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="prev_entry"><?php echo Minz_Translate::t ('previous_article'); ?></label>
+			<label class="group-name" for="prev_entry"><?php echo _t('previous_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?php echo $s['prev_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="first_entry"><?php echo Minz_Translate::t ('first_article'); ?></label>
+			<label class="group-name" for="first_entry"><?php echo _t('first_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="first_entry" name="shortcuts[first_entry]" list="keys" value="<?php echo $s['first_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="last_entry"><?php echo Minz_Translate::t ('last_article'); ?></label>
+			<label class="group-name" for="last_entry"><?php echo _t('last_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="last_entry" name="shortcuts[last_entry]" list="keys" value="<?php echo $s['last_entry']; ?>" />
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('shortcuts_article_action');?></legend>
+		<legend><?php echo _t('shortcuts_article_action');?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="mark_read"><?php echo Minz_Translate::t ('mark_read'); ?></label>
+			<label class="group-name" for="mark_read"><?php echo _t('mark_read'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?php echo $s['mark_read']; ?>" />
-				<?php echo Minz_Translate::t ('shift_for_all_read'); ?>
+				<?php echo _t('shift_for_all_read'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="mark_favorite"><?php echo Minz_Translate::t ('mark_favorite'); ?></label>
+			<label class="group-name" for="mark_favorite"><?php echo _t('mark_favorite'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?php echo $s['mark_favorite']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="go_website"><?php echo Minz_Translate::t ('see_on_website'); ?></label>
+			<label class="group-name" for="go_website"><?php echo _t('see_on_website'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?php echo $s['go_website']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="auto_share_shortcut"><?php echo Minz_Translate::t ('auto_share'); ?></label>
+			<label class="group-name" for="auto_share_shortcut"><?php echo _t('auto_share'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?php echo $s['auto_share']; ?>" />
-				<?php echo Minz_Translate::t ('auto_share_help'); ?>
+				<?php echo _t('auto_share_help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="collapse_entry"><?php echo Minz_Translate::t ('collapse_article'); ?></label>
+			<label class="group-name" for="collapse_entry"><?php echo _t('collapse_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?php echo $s['collapse_entry']; ?>" />
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('shortcuts_other_action');?></legend>
+		<legend><?php echo _t('shortcuts_other_action');?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="load_more_shortcut"><?php echo Minz_Translate::t ('load_more'); ?></label>
+			<label class="group-name" for="load_more_shortcut"><?php echo _t('load_more'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?php echo $s['load_more']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="focus_search_shortcut"><?php echo Minz_Translate::t ('focus_search'); ?></label>
+			<label class="group-name" for="focus_search_shortcut"><?php echo _t('focus_search'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="focus_search_shortcut" name="shortcuts[focus_search]" list="keys" value="<?php echo $s['focus_search']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="user_filter_shortcut"><?php echo Minz_Translate::t ('user_filter'); ?></label>
+			<label class="group-name" for="user_filter_shortcut"><?php echo _t('user_filter'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="user_filter_shortcut" name="shortcuts[user_filter]" list="keys" value="<?php echo $s['user_filter']; ?>" />
-				<?php echo Minz_Translate::t ('user_filter_help'); ?>
+				<?php echo _t('user_filter_help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="close_dropdown_shortcut"><?php echo Minz_Translate::t ('close_dropdown'); ?></label>
+			<label class="group-name" for="close_dropdown_shortcut"><?php echo _t('close_dropdown'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="help_shortcut"><?php echo Minz_Translate::t ('help'); ?></label>
+			<label class="group-name" for="help_shortcut"><?php echo _t('help'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="help_shortcut" name="shortcuts[help]" list="keys" value="<?php echo $s['help']; ?>" />
 			</div>
@@ -127,8 +127,8 @@
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>

From 5474803aa7a05e4afa851c88bf21fd8383bf59d9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 10:57:50 +0200
Subject: [PATCH 044/363] Add a TODO in feedController

---
 app/Controllers/feedController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index d694c103e..92ce40634 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -390,8 +390,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			$feed = $feedDAO->searchById($feed_id);
 
-			if (!$feed || ($feed->category() != $cat_id &&
-			               !$feedDAO->updateFeed($feed_id, $values))) {
+			if ($feed && ($feed->category() == $cat_id ||
+			              $feedDAO->updateFeed($feed_id, $values))) {
+				// TODO: return something useful
+			} else {
 				Minz_Error::error(
 					404,
 					array('error' => array(_t('error_occurred')))

From febabccdd5e6db573ab80bd5c1758d136b91cd78 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Oct 2014 12:14:22 +0200
Subject: [PATCH 045/363] Primitive extension system

https://github.com/marienfressinaud/FreshRSS/issues/252
I have been using this extension system for a little while, in
particular to include custom CSS and/or JavaScript (inclusion of PHP
code is not done yet).
There is very little code and it does not impact performances.
I hurry to post it before
https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/FreshRSS.php       | 21 +++++++++++++++++++++
 extensions/.gitignore  |  1 +
 extensions/Read-me.txt | 15 +++++++++++++++
 p/ext.php              | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 extensions/.gitignore
 create mode 100644 extensions/Read-me.txt
 create mode 100644 p/ext.php

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index cdf8962cb..58aac4059 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -17,6 +17,7 @@ class FreshRSS extends Minz_FrontController {
 		Minz_View::_param('loginOk', $loginOk);
 		$this->loadStylesAndScripts($loginOk);	//TODO: Do not load that when not needed, e.g. some Ajax requests
 		$this->loadNotifications();
+		$this->loadExtensions();
 	}
 
 	private static function getCredentialsFromLongTermCookie() {
@@ -179,4 +180,24 @@ class FreshRSS extends Minz_FrontController {
 			Minz_Session::_param ('notification');
 		}
 	}
+
+	private function loadExtensions() {
+		$extensionPath = FRESHRSS_PATH . '/extensions/';
+		//TODO: Add a preference to load only user-selected extensions
+		foreach (scandir($extensionPath) as $key => $extension) {
+			if (ctype_alpha($extension)) {
+				$mtime = @filemtime($extensionPath . $extension . '/style.css');
+				if ($mtime !== false) {
+					Minz_View::appendStyle(Minz_Url::display('/ext.php?c&amp;e=' . $extension . '&amp;' . $mtime));
+				}
+				$mtime = @filemtime($extensionPath . $extension . '/script.js');
+				if ($mtime !== false) {
+					Minz_View::appendScript(Minz_Url::display('/ext.php?j&amp;e=' . $extension . '&amp;' . $mtime));
+				}
+				if (file_exists($extensionPath . $extension . '/module.php')) {
+					//TODO: include
+				} 
+			}
+		}
+	}
 }
diff --git a/extensions/.gitignore b/extensions/.gitignore
new file mode 100644
index 000000000..d93e5e396
--- /dev/null
+++ b/extensions/.gitignore
@@ -0,0 +1 @@
+/[xX]
diff --git a/extensions/Read-me.txt b/extensions/Read-me.txt
new file mode 100644
index 000000000..e7b66d5bc
--- /dev/null
+++ b/extensions/Read-me.txt
@@ -0,0 +1,15 @@
+== FreshRSS extensions ==
+
+You may place in this directory some custom extensions for FreshRSS.
+
+The structure must be:
+
+./FreshRSS/extensions/
+	./NameOfExtensionAlphanumeric/
+		./style.css
+		./script.js
+		./module.php
+
+Each file is optional.
+
+The name of non-official extensions should start by an 'x'.
diff --git a/p/ext.php b/p/ext.php
new file mode 100644
index 000000000..cff194343
--- /dev/null
+++ b/p/ext.php
@@ -0,0 +1,35 @@
+<?php
+if (!isset($_GET['e'])) {
+	header('HTTP/1.1 400 Bad Request');
+	die();
+}
+$extension = substr($_GET['e'], 0, 64);
+if (!ctype_alpha($extension)) {
+	header('HTTP/1.1 400 Bad Request');
+	die();
+}
+
+require('../constants.php');
+$filename = FRESHRSS_PATH . '/extensions/' . $extension . '/';
+
+if (isset($_GET['j'])) {
+	header('Content-Type: application/javascript; charset=UTF-8');
+	header('Content-Disposition: inline; filename="script.js"');
+	$filename .= 'script.js';
+} elseif (isset($_GET['c'])) {
+	header('Content-Type: text/css; charset=UTF-8');
+	header('Content-Disposition: inline; filename="style.css"');
+	$filename .= 'style.css';
+}
+
+$mtime = @filemtime($filename);
+if ($mtime == false) {
+	header('HTTP/1.1 404 Not Found');
+	die();
+}
+
+require(LIB_PATH . '/http-conditional.php');
+
+if (!httpConditional($mtime, 604800, 2)) {
+	readfile($filename);
+}

From 5a9b08e084b376af9b65699f9868d66a46f8c170 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Oct 2014 12:38:13 +0200
Subject: [PATCH 046/363] Primitive extension system: minor change

https://github.com/marienfressinaud/FreshRSS/issues/252
---
 p/ext.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/p/ext.php b/p/ext.php
index cff194343..a1dde2f93 100644
--- a/p/ext.php
+++ b/p/ext.php
@@ -20,6 +20,9 @@ if (isset($_GET['j'])) {
 	header('Content-Type: text/css; charset=UTF-8');
 	header('Content-Disposition: inline; filename="style.css"');
 	$filename .= 'style.css';
+} else {
+	header('HTTP/1.1 400 Bad Request');
+	die();
 }
 
 $mtime = @filemtime($filename);

From 6c8b36f04ea1bc2c022c331bb0980b6c9dccb83c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 15:55:20 +0200
Subject: [PATCH 047/363] Let's begin the big refactoring!

Minz_Translate::t\s? replaces by _t

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/entryController.php      |  8 +--
 app/Controllers/errorController.php      |  4 +-
 app/Controllers/feedController.php       | 30 +++++-----
 app/Controllers/indexController.php      | 22 +++----
 app/Controllers/statsController.php      |  4 +-
 app/Controllers/usersController.php      |  8 +--
 app/FreshRSS.php                         |  2 +-
 app/Models/CategoryDAO.php               |  2 +-
 app/Models/StatsDAO.php                  |  2 +-
 app/Models/UserDAO.php                   |  4 +-
 app/layout/aside_stats.phtml             | 14 ++---
 app/views/configure/archiving.phtml      | 36 ++++++------
 app/views/configure/display.phtml        | 44 +++++++-------
 app/views/configure/reading.phtml        | 64 ++++++++++----------
 app/views/configure/sharing.phtml        | 24 ++++----
 app/views/configure/users.phtml          | 74 ++++++++++++------------
 app/views/error/index.phtml              |  2 +-
 app/views/feed/add.phtml                 | 34 +++++------
 app/views/helpers/feed/update.phtml      | 60 +++++++++----------
 app/views/helpers/javascript_vars.phtml  |  8 +--
 app/views/helpers/logs_pagination.phtml  |  8 +--
 app/views/helpers/view/normal_view.phtml | 14 ++---
 app/views/helpers/view/reader_view.phtml |  2 +-
 app/views/helpers/view/rss_view.phtml    |  2 +-
 app/views/index/about.phtml              | 26 ++++-----
 app/views/index/logs.phtml               |  8 +--
 lib/lib_rss.php                          |  8 +--
 27 files changed, 256 insertions(+), 258 deletions(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index ab66d9198..048ac1c69 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -5,7 +5,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		if (!$this->view->loginOk) {
 			Minz_Error::error (
 				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
+				array ('error' => array (_t('access_denied')))
 			);
 		}
 
@@ -75,7 +75,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('feeds_marked_read')
+				'content' => _t('feeds_marked_read')
 			);
 			Minz_Session::_param ('notification', $notif);
 		} else {
@@ -111,7 +111,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('optimization_complete')
+				'content' => _t('optimization_complete')
 			);
 			Minz_Session::_param ('notification', $notif);
 		}
@@ -155,7 +155,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 		$notif = array(
 			'type' => 'good',
-			'content' => Minz_Translate::t('purge_completed', $nbTotal)
+			'content' => _t('purge_completed', $nbTotal)
 		);
 		Minz_Session::_param('notification', $notif);
 
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 922650b3d..64a5c06fd 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -24,11 +24,11 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 		if ($this->view->errorMessage == '') {
 			switch(Minz_Request::param('code')) {
 				case 403:
-					$this->view->errorMessage = Minz_Translate::t('forbidden_access');
+					$this->view->errorMessage = _t('forbidden_access');
 					break;
 				case 404:
 				default:
-					$this->view->errorMessage = Minz_Translate::t('page_not_found');
+					$this->view->errorMessage = _t('page_not_found');
 					break;
 			}
 		}
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 92ce40634..029f9fa68 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -15,7 +15,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			) {
 				Minz_Error::error (
 					403,
-					array ('error' => array (Minz_Translate::t ('access_denied')))
+					array ('error' => array (_t('access_denied')))
 				);
 			}
 		}
@@ -84,7 +84,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					// on est déjà abonné à ce flux
 					$notif = array (
 						'type' => 'bad',
-						'content' => Minz_Translate::t ('already_subscribed', $feed->name ())
+						'content' => _t('already_subscribed', $feed->name ())
 					);
 					Minz_Session::_param ('notification', $notif);
 				} else {
@@ -93,7 +93,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						// problème au niveau de la base de données
 						$notif = array (
 							'type' => 'bad',
-							'content' => Minz_Translate::t ('feed_not_added', $feed->name ())
+							'content' => _t('feed_not_added', $feed->name ())
 						);
 						Minz_Session::_param ('notification', $notif);
 					} else {
@@ -131,7 +131,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						// ok, ajout terminé
 						$notif = array (
 							'type' => 'good',
-							'content' => Minz_Translate::t ('feed_added', $feed->name ())
+							'content' => _t('feed_added', $feed->name ())
 						);
 						Minz_Session::_param ('notification', $notif);
 
@@ -143,14 +143,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
 				$notif = array (
 					'type' => 'bad',
-					'content' => Minz_Translate::t ('invalid_url', $url)
+					'content' => _t('invalid_url', $url)
 				);
 				Minz_Session::_param ('notification', $notif);
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
 				$notif = array (
 					'type' => 'bad',
-					'content' => Minz_Translate::t ('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					'content' => _t('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
 				);
 				Minz_Session::_param ('notification', $notif);
 			} catch (Minz_FileNotExistException $e) {
@@ -158,7 +158,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
 				$notif = array (
 					'type' => 'bad',
-					'content' => Minz_Translate::t ('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					'content' => _t('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
 				);
 				Minz_Session::_param ('notification', $notif);
 			}
@@ -170,7 +170,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		} else {
 
 			// GET request so we must ask confirmation to user
-			Minz_View::prependTitle(Minz_Translate::t('add_rss_feed') . ' · ');
+			Minz_View::prependTitle(_t('add_rss_feed') . ' · ');
 			$this->view->categories = $this->catDAO->listCategories(false);
 			$this->view->feed = new FreshRSS_Feed($url);
 			try {
@@ -186,9 +186,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				// Already subscribe so we redirect to the feed configuration page
 				$notif = array(
 					'type' => 'bad',
-					'content' => Minz_Translate::t(
-						'already_subscribed', $feed->name()
-					)
+					'content' => _t('already_subscribed', $feed->name())
 				);
 				Minz_Session::_param('notification', $notif);
 
@@ -210,7 +208,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$n = $feedDAO->truncate($id);
 			$notif = array(
 				'type' => $n === false ? 'bad' : 'good',
-				'content' => Minz_Translate::t ('n_entries_deleted', $n)
+				'content' => _t('n_entries_deleted', $n)
 			);
 			Minz_Session::_param ('notification', $notif);
 			invalidateHttpCache();
@@ -336,19 +334,19 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feed = reset ($feeds);
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('feed_actualized', $feed->name ())
+				'content' => _t('feed_actualized', $feed->name ())
 			);
 		} elseif ($flux_update > 1) {
 			// plusieurs flux on été mis à jour
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('n_feeds_actualized', $flux_update)
+				'content' => _t('n_feeds_actualized', $flux_update)
 			);
 		} else {
 			// aucun flux n'a été mis à jour, oups
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('no_feed_to_refresh')
+				'content' => _t('no_feed_to_refresh')
 			);
 		}
 
@@ -370,7 +368,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// ressenti utilisateur
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('feeds_actualized')
+				'content' => _t('feeds_actualized')
 			);
 			Minz_Session::_param ('notification', $notif);
 			// et on désactive le layout car ne sert à rien
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 1b6563bb3..346739523 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -14,7 +14,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			if ($output === 'rss' && !$token_is_ok) {
 				Minz_Error::error (
 					403,
-					array ('error' => array (Minz_Translate::t ('access_denied')))
+					array ('error' => array (_t('access_denied')))
 				);
 				return;
 			} elseif ($output !== 'rss') {
@@ -62,7 +62,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Log::record ('Not found [' . $getType . '][' . $getId . ']', Minz_Log::DEBUG);
 			Minz_Error::error (
 				404,
-				array ('error' => array (Minz_Translate::t ('page_not_found')))
+				array ('error' => array (_t('page_not_found')))
 			);
 			return;
 		}
@@ -145,7 +145,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE);
 			Minz_Error::error (
 				404,
-				array ('error' => array (Minz_Translate::t ('page_not_found')))
+				array ('error' => array (_t('page_not_found')))
 			);
 		}
 	}
@@ -158,12 +158,12 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	private function checkAndProcessType ($getType, $getId) {
 		switch ($getType) {
 			case 'a':
-				$this->view->currentName = Minz_Translate::t ('your_rss_feeds');
+				$this->view->currentName = _t('your_rss_feeds');
 				$this->nb_not_read_cat = $this->view->nb_not_read;
 				$this->view->get_c = $getType;
 				return true;
 			case 's':
-				$this->view->currentName = Minz_Translate::t ('your_favorites');
+				$this->view->currentName = _t('your_favorites');
 				$this->nb_not_read_cat = $this->view->nb_favorites['unread'];
 				$this->view->get_c = $getType;
 				return true;
@@ -202,18 +202,18 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	}
 	
 	public function aboutAction () {
-		Minz_View::prependTitle (Minz_Translate::t ('about') . ' · ');
+		Minz_View::prependTitle (_t('about') . ' · ');
 	}
 
 	public function logsAction () {
 		if (!$this->view->loginOk) {
 			Minz_Error::error (
 				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
+				array ('error' => array (_t('access_denied')))
 			);
 		}
 
-		Minz_View::prependTitle (Minz_Translate::t ('logs') . ' · ');
+		Minz_View::prependTitle (_t('logs') . ' · ');
 
 		if (Minz_Request::isPost ()) {
 			FreshRSS_LogDAO::truncate();
@@ -279,7 +279,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		} else {
 			$res = array ();
 			$res['status'] = 'failure';
-			$res['reason'] = $reason == '' ? Minz_Translate::t ('invalid_login') : $reason;
+			$res['reason'] = $reason == '' ? _t('invalid_login') : $reason;
 			Minz_Log::record ('Persona: ' . $res['reason'], Minz_Log::WARNING);
 		}
 
@@ -368,7 +368,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			if (!$ok) {
 				$notif = array(
 					'type' => 'bad',
-					'content' => Minz_Translate::t('invalid_login')
+					'content' => _t('invalid_login')
 				);
 				Minz_Session::_param('notification', $notif);
 			}
@@ -403,7 +403,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		} elseif (!Minz_Configuration::canLogIn()) {
 			Minz_Error::error (
 				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
+				array ('error' => array (_t('access_denied')))
 			);
 		}
 		invalidateHttpCache();
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 3069be34d..4adb5e75d 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -120,11 +120,11 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 	public function firstAction() {
 		if (!$this->view->loginOk) {
 			Minz_Error::error(
-			    403, array('error' => array(Minz_Translate::t('access_denied')))
+			    403, array('error' => array(_t('access_denied')))
 			);
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('stats') . ' · ');
+		Minz_View::prependTitle(_t('stats') . ' · ');
 	}
 
 }
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index a9e6c32bc..8eb82f5d5 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -8,7 +8,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 		if (!$this->view->loginOk) {
 			Minz_Error::error(
 				403,
-				array('error' => array(Minz_Translate::t('access_denied')))
+				array('error' => array(_t('access_denied')))
 			);
 		}
 	}
@@ -90,7 +90,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'configuration_updated' : 'error_occurred')
+				'content' => _t($ok ? 'configuration_updated' : 'error_occurred')
 			);
 			Minz_Session::_param('notification', $notif);
 		}
@@ -162,7 +162,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'user_created' : 'error_occurred', $new_user_name)
+				'content' => _t($ok ? 'user_created' : 'error_occurred', $new_user_name)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
@@ -194,7 +194,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'user_deleted' : 'error_occurred', $username)
+				'content' => _t($ok ? 'user_deleted' : 'error_occurred', $username)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 58aac4059..16f64fd8b 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -10,7 +10,7 @@ class FreshRSS extends Minz_FrontController {
 			$loginOk = false;	//Basic protection against XSRF attacks
 			Minz_Error::error(
 				403,
-				array('error' => array(Minz_Translate::t('access_denied') . ' [HTTP_REFERER=' .
+				array('error' => array(_t('access_denied') . ' [HTTP_REFERER=' .
 					htmlspecialchars(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']) . ']'))
 			);
 		}
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index f11f87f47..5def50a26 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -134,7 +134,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		$def_cat = $this->searchById (1);
 
 		if ($def_cat == null) {
-			$cat = new FreshRSS_Category (Minz_Translate::t ('default_category'));
+			$cat = new FreshRSS_Category (_t('default_category'));
 			$cat->_id (1);
 
 			$values = array (
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 08dd4cd5c..113944508 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -416,7 +416,7 @@ SQL;
 	 */
 	private function convertToTranslatedJson($data = array()) {
 		$translated = array_map(function ($a) {
-			return Minz_Translate::t($a);
+			return _t($a);
 		}, $data);
 
 		return json_encode($translated);
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 9f64fb4a7..0c96d7175 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -9,7 +9,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 
 		$ok = false;
 		if (defined('SQL_CREATE_TABLES')) {	//E.g. MySQL
-			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', Minz_Translate::t('default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('default_category'));
 			$stm = $userPDO->bd->prepare($sql);
 			$ok = $stm && $stm->execute();
 		} else {	//E.g. SQLite
@@ -17,7 +17,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 			if (is_array($SQL_CREATE_TABLES)) {
 				$ok = true;
 				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, '', Minz_Translate::t('default_category'));
+					$sql = sprintf($instruction, '', _t('default_category'));
 					$stm = $userPDO->bd->prepare($sql);
 					$ok &= ($stm && $stm->execute());
 				}
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
index fbfb9d84d..1cd31a99c 100644
--- a/app/layout/aside_stats.phtml
+++ b/app/layout/aside_stats.phtml
@@ -1,12 +1,12 @@
 <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 () == 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'index'); ?>"><?php echo Minz_Translate::t ('stats_main'); ?></a>
+	<li class="nav-header"><?php echo _t('stats'); ?></li>
+	<li class="item<?php echo Minz_Request::actionName() == 'index' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _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 class="item<?php echo Minz_Request::actionName() == 'idle' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('stats_idle'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'repartition' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'repartition'); ?>"><?php echo Minz_Translate::t ('stats_repartition'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'repartition' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('stats_repartition'); ?></a>
 	</li>
 </ul>
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index c9cc7fe02..3180fe933 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -1,31 +1,31 @@
 <?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>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'archiving'); ?>">
-		<legend><?php echo Minz_Translate::t('archiving_configuration'); ?></legend>
-		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('archiving_configuration_help'); ?></p>
+		<legend><?php echo _t('archiving_configuration'); ?></legend>
+		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo Minz_Translate::t('delete_articles_every'); ?></label>
+			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo Minz_Translate::t('month'); ?>
-				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo Minz_Translate::t('purge_now'); ?></a>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo _t('month'); ?>
+				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('purge_now'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history_default"><?php echo Minz_Translate::t('keep_history'), ' ', Minz_Translate::t('by_feed'); ?></label>
+			<label class="group-name" for="keep_history_default"><?php echo _t('keep_history'), ' ', _t('by_feed'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
 					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . ($this->conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
-				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
+				?></select> (<?php echo _t('by_default'); ?>)
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl_default"><?php echo Minz_Translate::t('ttl'); ?></label>
+			<label class="group-name" for="ttl_default"><?php echo _t('ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
 					$found = false;
@@ -42,34 +42,34 @@
 					if (!$found) {
 						echo '<option value="' . intval($this->conf->ttl_default) . '" selected="selected">' . intval($this->conf->ttl_default) . 's</option>';
 					}
-				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
+				?></select> (<?php echo _t('by_default'); ?>)
 			</div>
 		</div>
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('entry', 'optimize'); ?>">
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
+		<legend><?php echo _t('advanced'); ?></legend>
 
 		<div class="form-group">
-		<p class="group-name"><?php echo Minz_Translate::t('current_user'); ?></p>
+		<p class="group-name"><?php echo _t('current_user'); ?></p>
 			<div class="group-controls">
-				<p><?php echo formatNumber($this->nb_total), ' ', Minz_Translate::t('articles'), ', ', formatBytes($this->size_user); ?></p>
+				<p><?php echo formatNumber($this->nb_total), ' ', _t('articles'), ', ', formatBytes($this->size_user); ?></p>
 				<input type="hidden" name="optimiseDatabase" value="1" />
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('optimize_bdd'); ?></button>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('optimize_todo_sometimes'); ?>
+				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
 			</div>
 		</div>
 
 		<?php if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { ?>
 		<div class="form-group">
-			<p class="group-name"><?php echo Minz_Translate::t('users'); ?></p>
+			<p class="group-name"><?php echo _t('users'); ?></p>
 			<div class="group-controls">
 				<p><?php echo formatBytes($this->size_total); ?></p>
 			</div>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 8eb3a156b..f1b80ab15 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -1,13 +1,13 @@
 <?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>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'display'); ?>">
-		<legend><?php echo Minz_Translate::t ('display_configuration'); ?></legend>
+		<legend><?php echo _t('display_configuration'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="language"><?php echo Minz_Translate::t ('language'); ?></label>
+			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
 				<?php $languages = $this->conf->availableLanguages (); ?>
@@ -19,13 +19,13 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('theme'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('theme'); ?></label>
 			<div class="group-controls">
 				<select name="theme" id="theme" required=""><?php
 					$found = false;
 					foreach ($this->themes as $theme) {
 						?><option value="<?php echo $theme['id']; ?>"<?php if ($this->conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
-							echo $theme['name'] . ' — ' . Minz_Translate::t ('by') . ' ' . $theme['author'];
+							echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author'];
 						?></option><?php
 					}
 					if (!$found) {
@@ -37,42 +37,42 @@
 
 		<?php $width = $this->conf->content_width; ?>
 		<div class="form-group">
-			<label class="group-name" for="content_width"><?php echo Minz_Translate::t('content_width'); ?></label>
+			<label class="group-name" for="content_width"><?php echo _t('content_width'); ?></label>
 			<div class="group-controls">
 				<select name="content_width" id="content_width" required="">
 					<option value="thin" <?php echo $width === 'thin'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_thin'); ?>
+						<?php echo _t('width_thin'); ?>
 					</option>
 					<option value="medium" <?php echo $width === 'medium'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_medium'); ?>
+						<?php echo _t('width_medium'); ?>
 					</option>
 					<option value="large" <?php echo $width === 'large'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_large'); ?>
+						<?php echo _t('width_large'); ?>
 					</option>
 					<option value="no_limit" <?php echo $width === 'no_limit'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_no_limit'); ?>
+						<?php echo _t('width_no_limit'); ?>
 					</option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('article_icons'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('article_icons'); ?></label>
 			<table>
 				<thead>
 					<tr>
 						<th> </th>
-						<th title="<?php echo Minz_Translate::t ('mark_read'); ?>"><?php echo FreshRSS_Themes::icon('read'); ?></th>
-						<th title="<?php echo Minz_Translate::t ('mark_favorite'); ?>"><?php echo FreshRSS_Themes::icon('bookmark'); ?></th>
-						<th><?php echo Minz_Translate::t ('sharing'); ?></th>
-						<th><?php echo Minz_Translate::t ('related_tags'); ?></th>
-						<th><?php echo Minz_Translate::t ('publication_date'); ?></th>
+						<th title="<?php echo _t('mark_read'); ?>"><?php echo FreshRSS_Themes::icon('read'); ?></th>
+						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo FreshRSS_Themes::icon('bookmark'); ?></th>
+						<th><?php echo _t('sharing'); ?></th>
+						<th><?php echo _t('related_tags'); ?></th>
+						<th><?php echo _t('publication_date'); ?></th>
 						<th><?php echo FreshRSS_Themes::icon('link'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						<th><?php echo Minz_Translate::t ('top_line'); ?></th>
+						<th><?php echo _t('top_line'); ?></th>
 						<td><input type="checkbox" name="topline_read" value="1"<?php echo $this->conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo $this->conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
@@ -80,7 +80,7 @@
 						<td><input type="checkbox" name="topline_date" value="1"<?php echo $this->conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_link" value="1"<?php echo $this->conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
-						<th><?php echo Minz_Translate::t ('bottom_line'); ?></th>
+						<th><?php echo _t('bottom_line'); ?></th>
 						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo $this->conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo $this->conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo $this->conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
@@ -93,16 +93,16 @@
 		</div>
 		
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('html5_notif_timeout'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('html5_notif_timeout'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo Minz_Translate::t ('seconds_(0_means_no_timeout)'); ?>
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
 			</div>
 		</div>
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 8b2da2a28..7e4efc264 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -1,13 +1,13 @@
 <?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>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'reading'); ?>">
-		<legend><?php echo Minz_Translate::t ('reading_configuration'); ?></legend>
+		<legend><?php echo _t('reading_configuration'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('articles_per_page'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('articles_per_page'); ?></label>
 			<div class="group-controls">
 				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->posts_per_page; ?>" min="5" max="50" />
 				<?php echo _i('help'); ?> <?php echo _t('number_divided_when_reader'); ?>
@@ -15,22 +15,22 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="sort_order"><?php echo Minz_Translate::t ('sort_order'); ?></label>
+			<label class="group-name" for="sort_order"><?php echo _t('sort_order'); ?></label>
 			<div class="group-controls">
 				<select name="sort_order" id="sort_order">
-					<option value="DESC"<?php echo $this->conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('newer_first'); ?></option>
-					<option value="ASC"<?php echo $this->conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('older_first'); ?></option>
+					<option value="DESC"<?php echo $this->conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
+					<option value="ASC"<?php echo $this->conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="view_mode"><?php echo Minz_Translate::t ('default_view'); ?></label>
+			<label class="group-name" for="view_mode"><?php echo _t('default_view'); ?></label>
 			<div class="group-controls">
 				<select name="view_mode" id="view_mode">
-					<option value="normal"<?php echo $this->conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('normal_view'); ?></option>
-					<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('reader_view'); ?></option>
-					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('global_view'); ?></option>
+					<option value="normal"<?php echo $this->conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
+					<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
+					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -50,7 +50,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="hide_read_feeds">
 					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo $this->conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t('hide_read_feeds'); ?>
+					<?php echo _t('hide_read_feeds'); ?>
 				</label>
 			</div>
 		</div>
@@ -59,8 +59,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_posts">
 					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo $this->conf->display_posts ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('display_articles_unfolded'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('display_articles_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -69,8 +69,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_categories">
 					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo $this->conf->display_categories ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('display_categories_unfolded'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('display_categories_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -79,8 +79,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="sticky_post">
 					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo $this->conf->sticky_post ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('sticky_post'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('sticky_post'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -89,8 +89,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">
 					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('auto_load_more'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('auto_load_more'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -99,8 +99,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
 					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('img_with_lazyload'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('img_with_lazyload'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -109,48 +109,48 @@
 			<div class="group-controls">
 				<label class="checkbox" for="reading_confirm">
 					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo $this->conf->reading_confirm ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('reading_confirm'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('reading_confirm'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t ('auto_read_when'); ?></label>
+			<label class="group-name"><?php echo _t('auto_read_when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
 					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo $this->conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t('article_viewed'); ?>
+					<?php echo _t('article_viewed'); ?>
 				</label>
 				<label class="checkbox" for="check_open_site">
 					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo $this->conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('article_open_on_website'); ?>
+					<?php echo _t('article_open_on_website'); ?>
 				</label>
 				<label class="checkbox" for="check_scroll">
 					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo $this->conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('scroll'); ?>
+					<?php echo _t('scroll'); ?>
 				</label>
 				<label class="checkbox" for="check_reception">
 					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo $this->conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('upon_reception'); ?>
+					<?php echo _t('upon_reception'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t ('after_onread'); ?></label>
+			<label class="group-name"><?php echo _t('after_onread'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="onread_jump_next">
 					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo $this->conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('jump_next'); ?>
+					<?php echo _t('jump_next'); ?>
 				</label>
 			</div>
 		</div>
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 02ce331da..ee276a94e 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -1,7 +1,7 @@
 <?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>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
 		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a>
@@ -9,28 +9,28 @@
 		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
 			<div class="stick">
-			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
-			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
+			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('share_name'); ?>" size="64" />
+			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('share_url'); ?>" size="64" />
 			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a></div>
-			<a target="_blank" class="btn" title="<?php echo Minz_Translate::t('more_information'); ?>" href="##help##"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo FreshRSS_Themes::icon('help'); ?></a>
 			</div></div>'>
-		<legend><?php echo Minz_Translate::t ('sharing'); ?></legend>
+		<legend><?php echo _t('sharing'); ?></legend>
 		<?php foreach ($this->conf->sharing as $key => $sharing): ?>
 			<?php $share = $this->conf->shares[$sharing['type']]; ?>
 			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
-					<?php echo Minz_Translate::t ($sharing['type']); ?>
+					<?php echo _t($sharing['type']); ?>
 				</label>
 				<div class="group-controls">
 					<input type='hidden' id='share_<?php echo $key;?>_type' name="share[<?php echo $key;?>][type]" value='<?php echo $sharing['type']?>' />
 					<?php if ($share['form'] === 'advanced') { ?>
 						<div class="stick">
-							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
-							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
+							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('share_name'); ?>" size="64" />
+							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('share_url'); ?>" size="64" />
 							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 						</div>
 
-						<a target="_blank" class="btn" title="<?php echo Minz_Translate::t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo FreshRSS_Themes::icon('help'); ?></a>
 					<?php } else { ?>
 					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 					<?php } ?>
@@ -42,7 +42,7 @@
 			<div class="group-controls">
 				<select>
 					<?php foreach($this->conf->shares as $key => $params):?>
-						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo Minz_Translate::t($key) ?></option>
+						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
 					<?php endforeach; ?>
 				</select>
 				<a href='#' class='share add btn'><?php echo FreshRSS_Themes::icon('add'); ?></a>
@@ -51,8 +51,8 @@
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 272896fb2..04e662fa3 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -1,36 +1,36 @@
 <?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>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('users', 'auth'); ?>">
-		<legend><?php echo Minz_Translate::t('login_configuration'); ?></legend>
+		<legend><?php echo _t('login_configuration'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="current_user"><?php echo Minz_Translate::t('current_user'); ?></label>
+			<label class="group-name" for="current_user"><?php echo _t('current_user'); ?></label>
 			<div class="group-controls">
 				<input id="current_user" type="text" disabled="disabled" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
 				<label class="checkbox" for="is_admin">
 					<input type="checkbox" id="is_admin" disabled="disabled" <?php echo Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_')) ? 'checked="checked" ' : ''; ?>/>
-					<?php echo Minz_Translate::t('is_admin'); ?>
+					<?php echo _t('is_admin'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo Minz_Translate::t('password_form'); ?></label>
+			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
 				</div>
-				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<?php if (Minz_Configuration::apiEnabled()) { ?>
 		<div class="form-group">
-			<label class="group-name" for="apiPasswordPlain"><?php echo Minz_Translate::t('password_api'); ?></label>
+			<label class="group-name" for="apiPasswordPlain"><?php echo _t('password_api'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
@@ -41,36 +41,36 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name" for="mail_login"><?php echo Minz_Translate::t('persona_connection_email'); ?></label>
+			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
 			<?php $mail = $this->conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_')) ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
-				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
 	<?php if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { ?>
 
-		<legend><?php echo Minz_Translate::t('auth_type'); ?></legend>
+		<legend><?php echo _t('auth_type'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="auth_type"><?php echo Minz_Translate::t('auth_type'); ?></label>
+			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type" required="required">
 					<?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?>
 						<option selected="selected"></option>
 					<?php } ?>
-					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo Minz_Translate::t('auth_form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo Minz_Translate::t('auth_persona'); ?></option>
-					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo Minz_Translate::t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t('auth_none'); ?></option>
+					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
+					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -80,7 +80,7 @@
 				<label class="checkbox" for="anon_access">
 					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
+					<?php echo _t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
 				</label>
 			</div>
 		</div>
@@ -90,7 +90,7 @@
 				<label class="checkbox" for="anon_refresh">
 					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo Minz_Configuration::allowAnonymousRefresh() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('allow_anonymous_refresh'); ?>
+					<?php echo _t('allow_anonymous_refresh'); ?>
 				</label>
 			</div>
 		</div>
@@ -100,7 +100,7 @@
 				<label class="checkbox" for="unsafe_autologin">
 					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('unsafe_autologin'); ?>
+					<?php echo _t('unsafe_autologin'); ?>
 					<kbd>p/i/?a=formLogin&amp;u=Alice&amp;p=1234</kbd>
 				</label>
 			</div>
@@ -108,12 +108,12 @@
 
 		<?php if (Minz_Configuration::canLogIn()) { ?>
 		<div class="form-group">
-			<label class="group-name" for="token"><?php echo Minz_Translate::t('auth_token'); ?></label>
+			<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
 			<?php $token = $this->conf->token; ?>
 			<div class="group-controls">
-				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>"<?php
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
 		<?php } ?>
@@ -123,24 +123,24 @@
 				<label class="checkbox" for="api_enabled">
 					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo Minz_Configuration::apiEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::needsLogin() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('api_enabled'); ?>
+					<?php echo _t('api_enabled'); ?>
 				</label>
 			</div>
 		</div>
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('users', 'delete'); ?>">
-		<legend><?php echo Minz_Translate::t('users'); ?></legend>
+		<legend><?php echo _t('users'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="users_list"><?php echo Minz_Translate::t('users_list'); ?></label>
+			<label class="group-name" for="users_list"><?php echo _t('users_list'); ?></label>
 			<div class="group-controls">
 				<select id="users_list" name="username"><?php
 					foreach (listUsers() as $user) {
@@ -152,16 +152,16 @@
 	
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-attention confirm"><?php echo Minz_Translate::t('delete'); ?></button>
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('users', 'create'); ?>">
-		<legend><?php echo Minz_Translate::t('create_user'); ?></legend>
+		<legend><?php echo _t('create_user'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_language"><?php echo Minz_Translate::t ('language'); ?></label>
+			<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
 				<?php $languages = $this->conf->availableLanguages (); ?>
@@ -173,25 +173,25 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_name"><?php echo Minz_Translate::t('username'); ?></label>
+			<label class="group-name" for="new_user_name"><?php echo _t('username'); ?></label>
 			<div class="group-controls">
 				<input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" placeholder="demo" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_passwordPlain"><?php echo Minz_Translate::t('password_form'); ?></label>
+			<label class="group-name" for="new_user_passwordPlain"><?php echo _t('password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
 					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
 				</div>
-				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_email"><?php echo Minz_Translate::t('persona_connection_email'); ?></label>
+			<label class="group-name" for="new_user_email"><?php echo _t('persona_connection_email'); ?></label>
 			<?php $mail = $this->conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
@@ -200,8 +200,8 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('create'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('create'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml
index ef4fbd39d..5e1949800 100644
--- a/app/views/error/index.phtml
+++ b/app/views/error/index.phtml
@@ -3,7 +3,7 @@
 		<h1 class="alert-head"><?php echo $this->code; ?></h1>
 		<p>
 			<?php echo $this->errorMessage; ?><br />
-			<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t('back_to_rss_feeds'); ?></a>
+			<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 		</p>
 	</div>
 </div>
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 849dacac6..17e52a571 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -1,16 +1,16 @@
 <?php if ($this->feed) { ?>
 <div class="post">
-	<h1><?php echo Minz_Translate::t ('add_rss_feed'); ?></h1>
+	<h1><?php echo _t('add_rss_feed'); ?></h1>
 
 	<?php if (!$this->load_ok) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t('damn'); ?></span> <?php echo Minz_Translate::t('internal_problem_feed', _url('index', 'logs')); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('internal_problem_feed', _url('index', 'logs')); ?></p>
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
-		<legend><?php echo Minz_Translate::t('informations'); ?></legend>
+		<legend><?php echo _t('informations'); ?></legend>
 		<?php if ($this->load_ok) { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t('title'); ?></label>
+			<label class="group-name"><?php echo _t('title'); ?></label>
 			<div class="group-controls">
 				<label><?php echo $this->feed->name() ; ?></label>
 			</div>
@@ -18,7 +18,7 @@
 
 		<?php $desc = $this->feed->description(); if ($desc != '') { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t('feed_description'); ?></label>
+			<label class="group-name"><?php echo _t('feed_description'); ?></label>
 			<div class="group-controls">
 				<label><?php echo htmlspecialchars($desc, ENT_NOQUOTES, 'UTF-8'); ?></label>
 			</div>
@@ -26,7 +26,7 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t('website_url'); ?></label>
+			<label class="group-name"><?php echo _t('website_url'); ?></label>
 			<div class="group-controls">
 				<?php echo $this->feed->website(); ?>
 				<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
@@ -35,17 +35,17 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name" for="url"><?php echo Minz_Translate::t('feed_url'); ?></label>
+			<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url_rss" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
 					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
 				</div>
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo Minz_Translate::t('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('feed_validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="category"><?php echo Minz_Translate::t('category'); ?></label>
+			<label class="group-name" for="category"><?php echo _t('category'); ?></label>
 			<div class="group-controls">
 				<select name="category" id="category">
 					<?php foreach ($this->categories as $cat) { ?>
@@ -53,37 +53,37 @@
 						<?php echo $cat->name(); ?>
 					</option>
 					<?php } ?>
-					<option value="nc"><?php echo Minz_Translate::t('new_category'); ?></option>
+					<option value="nc"><?php echo _t('new_category'); ?></option>
 				</select>
 
 				<span style="display: none;">
-					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo Minz_Translate::t('new_category'); ?>" />
+					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
 				</span>
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t('http_authentication'); ?></legend>
+		<legend><?php echo _t('http_authentication'); ?></legend>
 		<?php $auth = $this->feed->httpAuth(false); ?>
 		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo Minz_Translate::t('http_username'); ?></label>
+			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo Minz_Translate::t('http_password'); ?></label>
+			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
 			<div class="group-controls">
 				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
 
 			<div class="group-controls">
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('access_protected_feeds'); ?>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('access_protected_feeds'); ?>
 			</div>
 		</div>
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 678c5f132..8bd645d11 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -12,27 +12,27 @@
 	<?php $nbEntries = $this->feed->nbEntries (); ?>
 
 	<?php if ($this->feed->inError ()) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t ('damn'); ?></span> <?php echo Minz_Translate::t ('feed_in_error'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('feed_in_error'); ?></p>
 	<?php } elseif ($nbEntries === 0) { ?>
-	<p class="alert alert-warn"><?php echo Minz_Translate::t ('feed_empty'); ?></p>
+	<p class="alert alert-warn"><?php echo _t('feed_empty'); ?></p>
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->feed->id ()); ?>" autocomplete="off">
-		<legend><?php echo Minz_Translate::t ('informations'); ?></legend>
+		<legend><?php echo _t('informations'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="name"><?php echo Minz_Translate::t ('title'); ?></label>
+			<label class="group-name" for="name"><?php echo _t('title'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name () ; ?>" />
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="description"><?php echo Minz_Translate::t ('feed_description'); ?></label>
+			<label class="group-name" for="description"><?php echo _t('feed_description'); ?></label>
 			<div class="group-controls">
 				<textarea name="description" id="description"><?php echo htmlspecialchars($this->feed->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="website"><?php echo Minz_Translate::t ('website_url'); ?></label>
+			<label class="group-name" for="website"><?php echo _t('website_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
@@ -41,18 +41,18 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="url"><?php echo Minz_Translate::t ('feed_url'); ?></label>
+			<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
 					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
 				</div>
 
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo Minz_Translate::t ('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo _t('feed_validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="category"><?php echo Minz_Translate::t ('category'); ?></label>
+			<label class="group-name" for="category"><?php echo _t('category'); ?></label>
 			<div class="group-controls">
 				<select name="category" id="category">
 				<?php foreach ($this->categories as $cat) { ?>
@@ -64,11 +64,11 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
+			<label class="group-name" for="priority"><?php echo _t('show_in_all_flux'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="priority">
 					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority () > 0 ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('yes'); ?>
+					<?php echo _t('yes'); ?>
 				</label>
 			</div>
 		</div>
@@ -83,7 +83,7 @@
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
+		<legend><?php echo _t('archiving_configuration'); ?></legend>
 
 		<div class="form-group">
 			<div class="group-controls">
@@ -96,21 +96,21 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history"><?php echo Minz_Translate::t ('keep_history'); ?></label>
+			<label class="group-name" for="keep_history"><?php echo _t('keep_history'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history" id="keep_history" required="required"><?php
-					foreach (array('' => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+					foreach (array('' => '', -2 => _t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . ($this->feed->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
 					}
 				?></select>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl"><?php echo Minz_Translate::t('ttl'); ?></label>
+			<label class="group-name" for="ttl"><?php echo _t('ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl" id="ttl" required="required"><?php
 					$found = false;
-					foreach (array(-2 => Minz_Translate::t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
+					foreach (array(-2 => _t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
 					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
 					                36000 => '10h', 43200 => '12h', 64800 => '18h',
 					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
@@ -128,21 +128,21 @@
 		</div>
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
+				<button class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo _t('truncate'); ?></button>
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
+		<legend><?php echo _t('login_configuration'); ?></legend>
 		<?php $auth = $this->feed->httpAuth (false); ?>
 		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo Minz_Translate::t ('http_username'); ?></label>
+			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('access_protected_feeds'); ?>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('access_protected_feeds'); ?>
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo Minz_Translate::t ('http_password'); ?></label>
+			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
 			<div class="group-controls">
 				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
@@ -150,24 +150,24 @@
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
+		<legend><?php echo _t('advanced'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
+			<label class="group-name" for="path_entries"><?php echo _t('css_path_on_website'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
+				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
 			</div>
 		</div>
 
 		<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>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 4f7e3db0c..ba02b9fad 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -52,10 +52,10 @@ echo 'authType="', $authType, '",',
 	'url_login="', _url ('index', 'login'), '",',
 	'url_logout="', _url ('index', 'logout'), '",';
 
-echo 'str_confirmation_default="', Minz_Translate::t('confirm_action'), '"', ",\n";
-echo 'str_notif_title_articles="', Minz_Translate::t('notif_title_new_articles'), '"', ",\n";
-echo 'str_notif_body_articles="', Minz_Translate::t('notif_body_new_articles'), '"', ",\n";
-echo 'str_category_empty="', Minz_Translate::t('category_empty'), '"', ",\n";
+echo 'str_confirmation_default="', _t('confirm_action'), '"', ",\n";
+echo 'str_notif_title_articles="', _t('notif_title_new_articles'), '"', ",\n";
+echo 'str_notif_body_articles="', _t('notif_body_new_articles'), '"', ",\n";
+echo 'str_category_empty="', _t('category_empty'), '"', ",\n";
 echo 'html5_notif_timeout=', $this->conf->html5_notif_timeout,",\n";
 
 
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
index e3d14810e..191cfa8de 100755
--- a/app/views/helpers/logs_pagination.phtml
+++ b/app/views/helpers/logs_pagination.phtml
@@ -9,14 +9,14 @@
 	<?php $params[$getteur] = 1; ?>
 	<li class="item pager-first">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo Minz_Translate::t('first'); ?></a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('first'); ?></a>
 		<?php } ?>
 	</li>
 
 	<?php $params[$getteur] = $this->currentPage - 1; ?>
 	<li class="item pager-previous">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo Minz_Translate::t('previous'); ?></a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('previous'); ?></a>
 		<?php } ?>
 	</li>
 
@@ -34,13 +34,13 @@
 	<?php $params[$getteur] = $this->currentPage + 1; ?>
 	<li class="item pager-next">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Minz_Translate::t('next'); ?> ›</a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('next'); ?> ›</a>
 		<?php } ?>
 	</li>
 	<?php $params[$getteur] = $this->nbPage; ?>
 	<li class="item pager-last">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Minz_Translate::t('last'); ?> »</a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('last'); ?> »</a>
 		<?php } ?>
 	</li>
 </ul>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index e469edf58..ee745144f 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -30,12 +30,12 @@ if (!empty($this->entries)) {
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
 	?><div id="new-article">
-		<a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo Minz_Translate::t ('new_article'); ?></a>
+		<a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo _t('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
 		if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) {
 			?><div class="day" id="day_today"><?php
-				echo Minz_Translate::t ('today');
+				echo _t('today');
 				?><span class="date"> — <?php echo timestamptodate (time (), false); ?></span><?php
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
@@ -43,7 +43,7 @@ if (!empty($this->entries)) {
 		}
 		if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $this->today)) {
 			?><div class="day" id="day_yesterday"><?php
-				echo Minz_Translate::t ('yesterday');
+				echo _t('yesterday');
 				?><span class="date"> — <?php echo timestamptodate (time () - 86400, false); ?></span><?php
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
@@ -51,7 +51,7 @@ if (!empty($this->entries)) {
 		}
 		if ($display_others && $item->isDay (FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
 			?><div class="day" id="day_before_yesterday"><?php
-				echo Minz_Translate::t ('before_yesterday');
+				echo _t('before_yesterday');
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
 			$display_others = false;
@@ -98,7 +98,7 @@ if (!empty($this->entries)) {
 				<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></h1>
 				<?php
 					$author = $item->author();
-					echo $author != '' ? '<div class="author">' . Minz_Translate::t('by_author', $author) . '</div>' : '',
+					echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
 						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->content();
 				?>
 			</div>
@@ -133,7 +133,7 @@ if (!empty($this->entries)) {
 						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
 						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
 							<?php echo FreshRSS_Themes::icon('share'); ?>
-							<?php echo Minz_Translate::t ('share'); ?>
+							<?php echo _t('share'); ?>
 						</a>
 
 						<ul class="dropdown-menu">
@@ -141,7 +141,7 @@ if (!empty($this->entries)) {
 							<?php foreach ($sharing as $share) :?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo Minz_Translate::t ($share['name']);?>
+										<?php echo _t($share['name']);?>
 									</a>
 								</li>
 							<?php endforeach;?>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index 413094239..368bf7fdc 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -23,7 +23,7 @@ if (!empty($this->entries)) {
 
 				<div class="author"><?php
 					$author = $item->author();
-					echo $author != '' ? Minz_Translate::t('by_author', $author) . ' — ' : '',
+					echo $author != '' ? _t('by_author', $author) . ' — ' : '',
 						$item->date();
 				?></div>
 
diff --git a/app/views/helpers/view/rss_view.phtml b/app/views/helpers/view/rss_view.phtml
index 2c6ca610b..fd8a8af63 100755
--- a/app/views/helpers/view/rss_view.phtml
+++ b/app/views/helpers/view/rss_view.phtml
@@ -3,7 +3,7 @@
 	<channel>
 		<title><?php echo $this->rss_title; ?></title>
 		<link><?php echo Minz_Url::display(null, 'html', true); ?></link>
-		<description><?php echo Minz_Translate::t ('rss_feeds_of', $this->rss_title); ?></description>
+		<description><?php echo _t('rss_feeds_of', $this->rss_title); ?></description>
 		<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
 		<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
 		<atom:link href="<?php echo Minz_Url::display ($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index 76ff804d8..14c6455b6 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -1,27 +1,27 @@
 <div class="post content">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo Minz_Translate::t ('about_freshrss'); ?></h1>
+	<h1><?php echo _t('about_freshrss'); ?></h1>
 
 	<dl class="infos">
-		<dt><?php echo Minz_Translate::t ('project_website'); ?></dt>
+		<dt><?php echo _t('project_website'); ?></dt>
 		<dd><a href="<?php echo FRESHRSS_WEBSITE; ?>"><?php echo FRESHRSS_WEBSITE; ?></a></dd>
 
-		<dt><?php echo Minz_Translate::t ('lead_developer'); ?></dt>
-		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo Minz_Translate::t ('website'); ?></a></dd>
+		<dt><?php echo _t('lead_developer'); ?></dt>
+		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo _t('website'); ?></a></dd>
 
-		<dt><?php echo Minz_Translate::t ('bugs_reports'); ?></dt>
-		<dd><?php echo Minz_Translate::t ('github_or_email'); ?></dd>
+		<dt><?php echo _t('bugs_reports'); ?></dt>
+		<dd><?php echo _t('github_or_email'); ?></dd>
 
-		<dt><?php echo Minz_Translate::t ('license'); ?></dt>
-		<dd><?php echo Minz_Translate::t ('agpl3'); ?></dd>
+		<dt><?php echo _t('license'); ?></dt>
+		<dd><?php echo _t('agpl3'); ?></dd>
 
-		<dt><?php echo Minz_Translate::t ('version'); ?></dt>
+		<dt><?php echo _t('version'); ?></dt>
 		<dd><?php echo FRESHRSS_VERSION; ?></dd>
 	</dl>
 
-	<p><?php echo Minz_Translate::t ('freshrss_description'); ?></p>
+	<p><?php echo _t('freshrss_description'); ?></p>
 
-	<h1><?php echo Minz_Translate::t ('credits'); ?></h1>
-	<p><?php echo Minz_Translate::t ('credits_content'); ?></p>
+	<h1><?php echo _t('credits'); ?></h1>
+	<p><?php echo _t('credits_content'); ?></p>
 </div>
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 1b77b39af..18629ed9e 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -1,10 +1,10 @@
 <div class="post content">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo Minz_Translate::t ('logs'); ?></h1>
+	<h1><?php echo _t('logs'); ?></h1>
 	<form method="post" action="<?php echo _url ('index', 'logs'); ?>"><p>
 		<input type="hidden" name="clearLogs" />
-		<button type="submit" class="btn"><?php echo Minz_Translate::t ('clear_logs'); ?></button>
+		<button type="submit" class="btn"><?php echo _t('clear_logs'); ?></button>
 	</p></form>
 
 	<?php $items = $this->logsPaginator->items (); ?>
@@ -20,6 +20,6 @@
 		<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
 	</div>
 	<?php } else { ?>
-	<p class="alert alert-warn"><?php echo Minz_Translate::t ('logs_empty'); ?></p>
+	<p class="alert alert-warn"><?php echo _t('logs_empty'); ?></p>
 	<?php } ?>
 </div>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 31c9cdbc1..4f6beb9fd 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -77,11 +77,11 @@ function formatBytes($bytes, $precision = 2, $system = 'IEC') {
 }
 
 function timestamptodate ($t, $hour = true) {
-	$month = Minz_Translate::t (date('M', $t));
+	$month = _t(date('M', $t));
 	if ($hour) {
-		$date = Minz_Translate::t ('format_date_hour', $month);
+		$date = _t('format_date_hour', $month);
 	} else {
-		$date = Minz_Translate::t ('format_date', $month);
+		$date = _t('format_date', $month);
 	}
 
 	return @date ($date, $t);
@@ -107,7 +107,7 @@ function html_only_entity_decode($text) {
 
 function customSimplePie() {
 	$simplePie = new SimplePie();
-	$simplePie->set_useragent(Minz_Translate::t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
+	$simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration(800);
 	$simplePie->strip_htmltags(array(

From c8fad68a4fd15857a2e3e21e7d5311dc7f87226c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 16:10:25 +0200
Subject: [PATCH 048/363] Use _i() whenever it is possible

Transform FreshRSS_Themes::icon\s? in _i

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/layout/layout.phtml                  |  2 +-
 app/layout/nav_entries.phtml             |  6 +++---
 app/views/configure/archiving.phtml      |  4 ++--
 app/views/configure/display.phtml        |  6 +++---
 app/views/configure/sharing.phtml        | 14 +++++++-------
 app/views/configure/users.phtml          |  8 ++++----
 app/views/entry/bookmark.phtml           |  2 +-
 app/views/entry/read.phtml               |  2 +-
 app/views/feed/add.phtml                 |  6 +++---
 app/views/helpers/feed/update.phtml      |  8 ++++----
 app/views/helpers/javascript_vars.phtml  |  2 +-
 app/views/helpers/view/global_view.phtml |  2 +-
 app/views/helpers/view/normal_view.phtml | 14 +++++++-------
 13 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index f95f45b5e..dbfac63a5 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -56,7 +56,7 @@
 ?>
 <div id="notification" class="notification <?php echo $status; ?>">
 	<span class="msg"><?php echo $msg; ?></span>
-	<a class="close" href=""><?php echo FreshRSS_Themes::icon('close'); ?></a>
+	<a class="close" href=""><?php echo _i('close'); ?></a>
 </div>
 	</body>
 </html>
diff --git a/app/layout/nav_entries.phtml b/app/layout/nav_entries.phtml
index 3141e92a0..ca6849193 100644
--- a/app/layout/nav_entries.phtml
+++ b/app/layout/nav_entries.phtml
@@ -1,5 +1,5 @@
 <ul id="nav_entries">
-	<li class="item"><a class="previous_entry" href="#"><?php echo FreshRSS_Themes::icon('prev'); ?></a></li>
-	<li class="item"><a class="up" href="#"><?php echo FreshRSS_Themes::icon('up'); ?></a></li>
-	<li class="item"><a class="next_entry" href="#"><?php echo FreshRSS_Themes::icon('next'); ?></a></li>
+	<li class="item"><a class="previous_entry" href="#"><?php echo _i('prev'); ?></a></li>
+	<li class="item"><a class="up" href="#"><?php echo _i('up'); ?></a></li>
+	<li class="item"><a class="next_entry" href="#"><?php echo _i('next'); ?></a></li>
 </ul>
\ No newline at end of file
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 3180fe933..a883571aa 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -5,7 +5,7 @@
 
 	<form method="post" action="<?php echo _url('configure', 'archiving'); ?>">
 		<legend><?php echo _t('archiving_configuration'); ?></legend>
-		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
+		<p><?php echo _i('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
 
 		<div class="form-group">
 			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
@@ -63,7 +63,7 @@
 				<p><?php echo formatNumber($this->nb_total), ' ', _t('articles'), ', ', formatBytes($this->size_user); ?></p>
 				<input type="hidden" name="optimiseDatabase" value="1" />
 				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
 			</div>
 		</div>
 
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index f1b80ab15..34239c7b2 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -62,12 +62,12 @@
 				<thead>
 					<tr>
 						<th> </th>
-						<th title="<?php echo _t('mark_read'); ?>"><?php echo FreshRSS_Themes::icon('read'); ?></th>
-						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo FreshRSS_Themes::icon('bookmark'); ?></th>
+						<th title="<?php echo _t('mark_read'); ?>"><?php echo _i('read'); ?></th>
+						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
 						<th><?php echo _t('sharing'); ?></th>
 						<th><?php echo _t('related_tags'); ?></th>
 						<th><?php echo _t('publication_date'); ?></th>
-						<th><?php echo FreshRSS_Themes::icon('link'); ?></th>
+						<th><?php echo _i('link'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index ee276a94e..5f657ca74 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -4,15 +4,15 @@
 	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
-		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a>
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" /></div></div>'
 		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
 			<div class="stick">
 			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('share_name'); ?>" size="64" />
 			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('share_url'); ?>" size="64" />
-			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a></div>
-			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a></div>
+			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
 		<legend><?php echo _t('sharing'); ?></legend>
 		<?php foreach ($this->conf->sharing as $key => $sharing): ?>
@@ -27,12 +27,12 @@
 						<div class="stick">
 							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('share_name'); ?>" size="64" />
 							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('share_url'); ?>" size="64" />
-							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 						</div>
 
-						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo _i('help'); ?></a>
 					<?php } else { ?>
-					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 					<?php } ?>
 				</div>
 			</div>
@@ -45,7 +45,7 @@
 						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
 					<?php endforeach; ?>
 				</select>
-				<a href='#' class='share add btn'><?php echo FreshRSS_Themes::icon('add'); ?></a>
+				<a href='#' class='share add btn'><?php echo _i('add'); ?></a>
 			</div>
 		</div>
 
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 04e662fa3..517e302e5 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -22,7 +22,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
 				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
@@ -34,7 +34,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
 			</div>
 		</div>
@@ -113,7 +113,7 @@
 			<div class="group-controls">
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
+				<?php echo _i('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
 		<?php } ?>
@@ -184,7 +184,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
-					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
 				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
diff --git a/app/views/entry/bookmark.phtml b/app/views/entry/bookmark.phtml
index c1fc32b7f..ab61fa206 100755
--- a/app/views/entry/bookmark.phtml
+++ b/app/views/entry/bookmark.phtml
@@ -13,4 +13,4 @@ $url = Minz_Url::display (array (
 	'params' => Minz_Request::params (),
 ));
 
-echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => FreshRSS_Themes::icon(Minz_Request::param ('is_favorite') ? 'non-starred' : 'starred')));
+echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => _i(Minz_Request::param ('is_favorite') ? 'non-starred' : 'starred')));
diff --git a/app/views/entry/read.phtml b/app/views/entry/read.phtml
index 9e79d4c07..0ef9df7eb 100755
--- a/app/views/entry/read.phtml
+++ b/app/views/entry/read.phtml
@@ -13,4 +13,4 @@ $url = Minz_Url::display (array (
 	'params' => Minz_Request::params (),
 ));
 
-echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => FreshRSS_Themes::icon(Minz_Request::param ('is_read') ? 'unread' : 'read')));
+echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => _i(Minz_Request::param ('is_read') ? 'unread' : 'read')));
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 17e52a571..1db053b52 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -29,7 +29,7 @@
 			<label class="group-name"><?php echo _t('website_url'); ?></label>
 			<div class="group-controls">
 				<?php echo $this->feed->website(); ?>
-				<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+				<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo _i('link'); ?></a>
 			</div>
 		</div>
 		<?php } ?>
@@ -39,7 +39,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url_rss" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo _i('link'); ?></a>
 				</div>
 				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('feed_validator'); ?></a>
 			</div>
@@ -76,7 +76,7 @@
 			</div>
 
 			<div class="group-controls">
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('access_protected_feeds'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('access_protected_feeds'); ?>
 			</div>
 		</div>
 
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 8bd645d11..9235752c3 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -36,7 +36,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+					<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo _i('link'); ?></a>
 				</div>
 			</div>
 		</div>
@@ -45,7 +45,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo _i('link'); ?></a>
 				</div>
 
 				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo _t('feed_validator'); ?></a>
@@ -139,7 +139,7 @@
 			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('access_protected_feeds'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('access_protected_feeds'); ?>
 			</div>
 
 			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
@@ -160,7 +160,7 @@
 			<label class="group-name" for="path_entries"><?php echo _t('css_path_on_website'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
 			</div>
 		</div>
 
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index ba02b9fad..011b17b7a 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -33,7 +33,7 @@ echo ',shortcuts={',
 "},\n";
 
 if (Minz_Request::param ('output') === 'global') {
-	echo "iconClose='", FreshRSS_Themes::icon('close'), "',\n";
+	echo "iconClose='", _i('close'), "',\n";
 }
 
 $authType = Minz_Configuration::authType();
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index 5e4cad01a..0e553c957 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -42,7 +42,7 @@
 
 <div id="overlay"></div>
 <div id="panel"<?php echo $this->conf->display_posts ? '' : ' class="hide_posts"'; ?>>
-	<a class="close" href="#"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
 
 <?php } else { ?>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index ee745144f..66b79cd7f 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -66,7 +66,7 @@ if (!empty($this->entries)) {
 							$arUrl['params']['is_read'] = 0;
 						}
 						?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
+							echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
 					?></li><?php
 				}
 				if ($topline_favorite) {
@@ -76,7 +76,7 @@ if (!empty($this->entries)) {
 							$arUrl['params']['is_favorite'] = 0;
 						}
 						?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
+							echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
 					?></li><?php
 				}
 			}
@@ -90,7 +90,7 @@ if (!empty($this->entries)) {
 			?><li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
 			<li class="item title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li>
 			<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
-			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
+			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
 		</ul>
 
 		<div class="flux_content">
@@ -111,7 +111,7 @@ if (!empty($this->entries)) {
 								$arUrl['params']['is_read'] = 0;
 							}
 							?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
+								echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
 						?></li><?php
 					}
 					if ($bottomline_favorite) {
@@ -121,7 +121,7 @@ if (!empty($this->entries)) {
 								$arUrl['params']['is_favorite'] = 0;
 							}
 							?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
+								echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
 						?></li><?php
 					}
 				} ?>
@@ -132,7 +132,7 @@ if (!empty($this->entries)) {
 					?><div class="dropdown">
 						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
 						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
-							<?php echo FreshRSS_Themes::icon('share'); ?>
+							<?php echo _i('share'); ?>
 							<?php echo _t('share'); ?>
 						</a>
 
@@ -171,7 +171,7 @@ if (!empty($this->entries)) {
 					?><li class="item date"><?php echo $item->date (); ?></li><?php
 				}
 				if ($bottomline_link) {
-					?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php
+					?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>

From 70131f776a5fa30fdf26c64578039aeeb41333c7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Oct 2014 16:53:43 +0200
Subject: [PATCH 049/363] SimplePie enclosure bug workaround

https://github.com/marienfressinaud/FreshRSS/issues/504
---
 app/Models/Feed.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 2a5ea45ac..03baf3ad2 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -288,6 +288,8 @@ class FreshRSS_Feed extends Minz_Model {
 						$content .= '<br /><audio lazyload="" postpone="" preload="none" src="' . $elink . '" controls="controls" />';
 					} elseif (strpos($mime, 'video/') === 0) {
 						$content .= '<br /><video lazyload="" postpone="" preload="none" src="' . $elink . '" controls="controls" />';
+					} else {
+						unset($elinks[$elink]);
 					}
 				}
 			}

From d8ed718aab99ad47897fb70ea9086fa704bb912b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 17:29:09 +0200
Subject: [PATCH 050/363] Refactor javascript_vars.phtml

Introduce kind of context objectin JavaScript

See https://github.com/marienfressinaud/FreshRSS/issues/634
See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/views/helpers/javascript_vars.phtml | 79 ++++++++++++-------------
 p/scripts/category.js                   |  4 +-
 p/scripts/global_view.js                |  2 +-
 p/scripts/main.js                       | 66 +++++++++------------
 4 files changed, 70 insertions(+), 81 deletions(-)

diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 011b17b7a..cdbf24eab 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,21 +1,30 @@
+"use strict";
 <?php
 
-echo '"use strict";', "\n";
-
 $mark = $this->conf->mark_when;
-echo 'var ',
-	'help_url="', FRESHRSS_WIKI, '"',
-	',hide_posts=', ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'false' : 'true',
-	',display_order="', Minz_Request::param('order', $this->conf->sort_order), '"',
-	',auto_mark_article=', $mark['article'] ? 'true' : 'false',
-	',auto_mark_site=', $mark['site'] ? 'true' : 'false',
-	',auto_mark_scroll=', $mark['scroll'] ? 'true' : 'false',
-	',auto_load_more=', $this->conf->auto_load_more ? 'true' : 'false',
-	',does_lazyload=', $this->conf->lazyload ? 'true' : 'false',
-	',sticky_post=', $this->conf->sticky_post ? 'true' : 'false';
-
+$mail = Minz_Session::param ('mail', false);
+$auto_actualize = Minz_Session::param('actualize_feeds', false);
+$hide_posts = ($this->conf->display_posts ||
+               Minz_Request::param('output') === 'reader');
 $s = $this->conf->shortcuts;
-echo ',shortcuts={',
+
+echo 'var context={',
+	'hide_posts:', $hide_posts ? 'false' : 'true', ',',
+	'display_order:"', Minz_Request::param('order', $this->conf->sort_order), '",',
+	'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
+	'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',',
+	'auto_mark_scroll:', $mark['scroll'] ? 'true' : 'false', ',',
+	'auto_load_more:', $this->conf->auto_load_more ? 'true' : 'false', ',',
+	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
+	'does_lazyload:', $this->conf->lazyload ? 'true' : 'false', ',',
+	'sticky_post:', $this->conf->sticky_post ? 'true' : 'false', ',',
+	'html5_notif_timeout:', $this->conf->html5_notif_timeout, ',',
+	'auth_type:"', Minz_Configuration::authType(), '",',
+	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
+	'current_view:"', Minz_Request::param('output', 'normal'), '"',
+"},\n";
+
+echo 'shortcuts={',
 	'mark_read:"', $s['mark_read'], '",',
 	'mark_favorite:"', $s['mark_favorite'], '",',
 	'go_website:"', $s['go_website'], '",',
@@ -32,32 +41,20 @@ echo ',shortcuts={',
 	'close_dropdown:"', $s['close_dropdown'], '"',
 "},\n";
 
-if (Minz_Request::param ('output') === 'global') {
-	echo "iconClose='", _i('close'), "',\n";
-}
+echo 'url={',
+	'index:"', _url('index', 'index'), '",',
+	'login:"', _url('index', 'login'), '",',
+	'logout:"', _url('index', 'logout'), '",',
+	'help:"', FRESHRSS_WIKI, '"',
+"},\n";
 
-$authType = Minz_Configuration::authType();
-if ($authType === 'persona') {
-	// If user is disconnected, current_user_mail MUST be null
-	$mail = Minz_Session::param ('mail', false);
-	if ($mail) {
-		echo 'current_user_mail="' . $mail . '",';
-	} else {
-		echo 'current_user_mail=null,';
-	}
-}
+echo 'i18n={',
+	'confirmation_default:"', _t('confirm_action'), '",',
+	'notif_title_articles:"', _t('notif_title_new_articles'), '",',
+	'notif_body_articles:"', _t('notif_body_new_articles'), '",',
+	'category_empty:"', _t('category_empty'), '"',
+"},\n";
 
-echo 'authType="', $authType, '",',
-	'url_freshrss="', _url ('index', 'index'), '",',
-	'url_login="', _url ('index', 'login'), '",',
-	'url_logout="', _url ('index', 'logout'), '",';
-
-echo 'str_confirmation_default="', _t('confirm_action'), '"', ",\n";
-echo 'str_notif_title_articles="', _t('notif_title_new_articles'), '"', ",\n";
-echo 'str_notif_body_articles="', _t('notif_body_new_articles'), '"', ",\n";
-echo 'str_category_empty="', _t('category_empty'), '"', ",\n";
-echo 'html5_notif_timeout=', $this->conf->html5_notif_timeout,",\n";
-
-
-$autoActualise = Minz_Session::param('actualize_feeds', false);
-echo 'auto_actualize_feeds=', $autoActualise ? 'true' : 'false', ";\n";
+echo 'icons={',
+	'close:\'', _i('close'), '\'',
+"}\n";
\ No newline at end of file
diff --git a/p/scripts/category.js b/p/scripts/category.js
index dc5df67e4..c33e68528 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -20,13 +20,13 @@ function dragend_process(t) {
 		$(t).remove();
 
 		if (parent.children().length <= 0) {
-			parent.append('<li class="item disabled" dropzone="move">' + str_category_empty + '</li>');
+			parent.append('<li class="item disabled" dropzone="move">' + i18n['category_empty'] + '</li>');
 		}
 	}
 }
 
 function init_draggable() {
-	if (!(window.$ && window.url_freshrss)) {
+	if (!(window.$ && window.i18n)) {
 		if (window.console) {
 			console.log('FreshRSS waiting for JS…');
 		}
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 7105520a6..6e1f61066 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -40,7 +40,7 @@ function load_panel(link) {
 
 function init_close_panel() {
 	$("#panel .close").click(function () {
-		$("#panel").html('<a class="close" href="#">' + window.iconClose + '</a>');
+		$("#panel").html('<a class="close" href="#">' + icons['close'] + '</a>');
 		init_close_panel();
 		$("#panel").slideToggle();
 		$("#overlay").fadeOut();
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 5793bb50b..ad33f6c57 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -4,14 +4,6 @@ var $stream = null,
 	shares = 0,
 	ajax_loading = false;
 
-function is_normal_mode() {
-	return $stream.hasClass('normal');
-}
-
-function is_global_mode() {
-	return $stream.hasClass('global');
-}
-
 function redirect(url, new_tab) {
 	if (url) {
 		if (new_tab) {
@@ -226,7 +218,7 @@ function toggleContent(new_active, old_active) {
 		return;
 	}
 
-	if (does_lazyload) {
+	if (context['does_lazyload']) {
 		new_active.find('img[data-original], iframe[data-original]').each(function () {
 			this.setAttribute('src', this.getAttribute('data-original'));
 			this.removeAttribute('data-original');
@@ -245,12 +237,12 @@ function toggleContent(new_active, old_active) {
 
 	var box_to_move = "html,body",
 		relative_move = false;
-	if (is_global_mode()) {
+	if (context['current_view'] == 'global') {
 		box_to_move = "#panel";
 		relative_move = true;
 	}
 
-	if (sticky_post) {
+	if (context['sticky_post']) {
 		var prev_article = new_active.prevAll('.flux'),
 		    new_pos = new_active.position().top,
 			old_scroll = $(box_to_move).scrollTop();
@@ -259,7 +251,7 @@ function toggleContent(new_active, old_active) {
 			new_pos = prev_article.position().top;
 		}
 
-		if (hide_posts) {
+		if (context['hide_posts']) {
 			if (relative_move) {
 				new_pos += old_scroll;
 			}
@@ -278,7 +270,7 @@ function toggleContent(new_active, old_active) {
 		}
 	}
 
-	if (auto_mark_article && new_active.hasClass('active')) {
+	if (context['auto_mark_article'] && new_active.hasClass('active')) {
 		mark_read(new_active, true);
 	}
 }
@@ -378,7 +370,7 @@ function collapse_entry() {
 
 	var flux_current = $(".flux.current");
 	flux_current.toggleClass("active");
-	if (isCollapsed && auto_mark_article) {
+	if (isCollapsed && context['auto_mark_article']) {
 		mark_read(flux_current, true);
 	}
 }
@@ -457,12 +449,12 @@ function inMarkViewport(flux, box_to_follow, relative_follow) {
 function init_posts() {
 	var box_to_follow = $(window),
 		relative_follow = false;
-	if (is_global_mode()) {
+	if (context['current_view'] == 'global') {
 		box_to_follow = $("#panel");
 		relative_follow = true;
 	}
 
-	if (auto_mark_scroll) {
+	if (context['auto_mark_scroll']) {
 		box_to_follow.scroll(function () {
 			$('.not_read:visible').each(function () {
 				if ($(this).children(".flux_content").is(':visible') && inMarkViewport($(this), box_to_follow, relative_follow)) {
@@ -472,7 +464,7 @@ function init_posts() {
 		});
 	}
 
-	if (auto_load_more) {
+	if (context['auto_load_more']) {
 		box_to_follow.scroll(function () {
 			var load_more = $("#load_more");
 			if (!load_more.is(':visible')) {
@@ -492,7 +484,7 @@ function init_posts() {
 }
 
 function init_column_categories() {
-	if (!is_normal_mode()) {
+	if (context['current_view'] !== 'normal') {
 		return;
 	}
 	$('#aside_flux').on('click', '.category>a.dropdown-toggle', function () {
@@ -632,7 +624,7 @@ function init_shortcuts() {
 	shortcut.add(shortcuts.go_website, function () {
 		var url_website = $('.flux.current > .flux_header > .title > a').attr("href");
 
-		if (auto_mark_site) {
+		if (context['auto_mark_site']) {
 			$(".flux.current").each(function () {
 				mark_read($(this), true);
 			});
@@ -656,7 +648,7 @@ function init_shortcuts() {
 	});
 
 	shortcut.add(shortcuts.help, function () {
-		redirect(help_url, true);
+		redirect(url['help'], true);
 	}, {
 		'disable_in_input': true
 	});
@@ -678,7 +670,7 @@ function init_stream(divStream) {
 			new_active = $(this).parent();
 			isCollapsed = true;
 		if (e.target.tagName.toUpperCase() === 'A') {	//Leave real links alone
-			if (auto_mark_article) {
+			if (context['auto_mark_article']) {
 				mark_read(new_active, true);
 			}
 			return true;
@@ -724,7 +716,7 @@ function init_stream(divStream) {
 		$(this).attr('target', '_blank');
 	});
 
-	if (auto_mark_site) {
+	if (context['auto_mark_site']) {
 		// catch mouseup instead of click so we can have the correct behaviour
 		// with middle button click (scroll button).
 		divStream.on('mouseup', '.flux .link > a', function (e) {
@@ -784,7 +776,7 @@ function init_actualize() {
 		return false;
 	});
 
-	if (auto_actualize_feeds) {
+	if (context['auto_actualize_feeds']) {
 		auto = true;
 		$("#actualize").click();
 	}
@@ -855,9 +847,9 @@ function notifs_html5_show(nb) {
 		return
 	}
 
-	var notification = new window.Notification(str_notif_title_articles, {
+	var notification = new window.Notification(i18n['notif_title_articles'], {
 		icon: "../themes/icons/favicon-256.png",
-		body: str_notif_body_articles.replace("\d", nb),
+		body: i18n['notif_body_articles.replace("\d", nb)'],
 		tag: "freshRssNewArticles"
 	});
 
@@ -865,10 +857,10 @@ function notifs_html5_show(nb) {
 		window.location.reload();
 	}
 
-	if (html5_notif_timeout !== 0){
+	if (context['html5_notif_timeout'] !== 0){
 		setTimeout(function() {
 					notification.close();
-				}, html5_notif_timeout * 1000);
+				}, context['html5_notif_timeout'] * 1000);
 	}
 }
 
@@ -922,7 +914,7 @@ function load_more_posts() {
 	$.get(url_load_more, function (data) {
 		box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day'));
 		$('.pagination').replaceWith($('.pagination', data));
-		if (display_order === 'ASC') {
+		if (context['display_order'] === 'ASC') {
 			$('#nav_menu_read_all > .read_all').attr(
 				'formaction', $('#bigMarkAsRead').attr('formaction')
 			);
@@ -953,7 +945,7 @@ function focus_search() {
 function init_load_more(box) {
 	box_load_more = box;
 
-	if (!does_lazyload) {
+	if (!context['does_lazyload']) {
 		$('img[postpone], audio[postpone], iframe[postpone], video[postpone]').each(function () {
 			this.removeAttribute('postpone');
 		});
@@ -1062,7 +1054,7 @@ function init_persona() {
 	});
 
 	navigator.id.watch({
-		loggedInUser: current_user_mail,
+		loggedInUser: context['current_user_mail'],
 
 		onlogin: function(assertion) {
 			// A user has logged in! Here you need to:
@@ -1070,13 +1062,13 @@ function init_persona() {
 			// 2. Update your UI.
 			$.ajax ({
 				type: 'POST',
-				url: url_login,
+				url: url['login'],
 				data: {assertion: assertion},
 				success: function(res, status, xhr) {
 					/*if (res.status === 'failure') {
 						alert (res_obj.reason);
 					} else*/ if (res.status === 'okay') {
-						location.href = url_freshrss;
+						location.href = url['index'];
 					}
 				},
 				error: function(res, status, xhr) {
@@ -1091,9 +1083,9 @@ function init_persona() {
 			// (That's a literal JavaScript null. Not false, 0, or undefined. null.)
 			$.ajax ({
 				type: 'POST',
-				url: url_logout,
+				url: url['logout'],
 				success: function(res, status, xhr) {
-					location.href = url_freshrss;
+					location.href = url['index'];
 				},
 				error: function(res, status, xhr) {
 					//alert("logout failure" + res);
@@ -1108,7 +1100,7 @@ function init_confirm_action() {
 	$('body').on('click', '.confirm', function () {
 		var str_confirmation = $(this).attr('data-str-confirm');
 		if (!str_confirmation) {
-			str_confirmation = str_confirmation_default;
+			str_confirmation = i18n['confirmation_default'];
 		}
 
 		return confirm(str_confirmation);
@@ -1274,7 +1266,7 @@ function init_slider_observers() {
 }
 
 function init_all() {
-	if (!(window.$ && window.url_freshrss)) {
+	if (!(window.$ && window.context)) {
 		if (window.console) {
 			console.log('FreshRSS waiting for JS…');
 		}
@@ -1282,7 +1274,7 @@ function init_all() {
 		return;
 	}
 	init_notifications();
-	switch (authType) {
+	switch (context['auth_type']) {
 		case 'persona':
 			init_persona();
 			break;

From 64d1026dd979740010088d1f4237f6dc2a4f4cfd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 17:55:35 +0200
Subject: [PATCH 051/363] Move usersAction into usersController

---
 app/Controllers/configureController.php       | 19 +++++--------------
 app/Controllers/usersController.php           | 13 ++++++++++---
 app/layout/aside_configure.phtml              |  4 ++--
 app/layout/header.phtml                       |  2 +-
 .../users.phtml => users/index.phtml}         |  0
 5 files changed, 18 insertions(+), 20 deletions(-)
 rename app/views/{configure/users.phtml => users/index.phtml} (100%)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index b7b88b3ba..789e9dfb0 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -168,11 +168,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function shortcutAction() {
 		$list_keys = array('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter',
-		                    'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
-		                    'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
-		                    's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
-		                    'z', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
-		                    'f10', 'f11', 'f12');
+		                   'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
+		                   'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
+		                   's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
+		                   'z', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
+		                   'f10', 'f11', 'f12');
 		$this->view->list_keys = $list_keys;
 
 		if (Minz_Request::isPost()) {
@@ -196,15 +196,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(_t('shortcuts') . ' · ');
 	}
 
-	/**
-	 * This action display the user configuration page
-	 *
-	 * @todo move that action in the user controller
-	 */
-	public function usersAction() {
-		Minz_View::prependTitle(_t('users') . ' · ');
-	}
-
 	/**
 	 * This action handles the archive configuration page.
 	 *
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index 8eb82f5d5..7d0171bc7 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -13,6 +13,13 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This action display the user configuration page
+	 */
+	public function indexAction() {
+		Minz_View::prependTitle(_t('users') . ' · ');
+	}
+
 	public function authAction() {
 		if (Minz_Request::isPost()) {
 			$ok = true;
@@ -94,7 +101,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
 	}
 
 	public function createAction() {
@@ -166,7 +173,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
 	}
 
 	public function deleteAction() {
@@ -198,6 +205,6 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
 	}
 }
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index d5c9bf4c9..e17bcb254 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -19,8 +19,8 @@
 		<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 _t('users'); ?></a>
+	<li class="item<?php echo Minz_Request::controllerName() === 'users' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('users', 'index'); ?>"><?php echo _t('users'); ?></a>
 	</li>
 	<?php
 		$current_user = Minz_Session::param('currentUser', '');
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 028e63d8a..4b571ef06 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -74,7 +74,7 @@ if (Minz_Configuration::canLogIn()) {
 				<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 _t('users'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('users', 'index'); ?>"><?php echo _t('users'); ?></a></li>
 				<?php
 					$current_user = Minz_Session::param('currentUser', '');
 					if (Minz_Configuration::isAdmin($current_user)) {
diff --git a/app/views/configure/users.phtml b/app/views/users/index.phtml
similarity index 100%
rename from app/views/configure/users.phtml
rename to app/views/users/index.phtml

From fe1fa98127916936c7f30cb61badf89418db1c66 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 18:00:45 +0200
Subject: [PATCH 052/363] Add feed/move.phtml

Avoid log problem
---
 app/views/feed/move.phtml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/views/feed/move.phtml

diff --git a/app/views/feed/move.phtml b/app/views/feed/move.phtml
new file mode 100644
index 000000000..e69de29bb

From 3831961b2e515ff7d8d352c0f7b6a15b3a613c25 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 18:03:32 +0200
Subject: [PATCH 053/363] Fix bug of i18n in JavaScript

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 p/scripts/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index ad33f6c57..b01a3a34d 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -849,7 +849,7 @@ function notifs_html5_show(nb) {
 
 	var notification = new window.Notification(i18n['notif_title_articles'], {
 		icon: "../themes/icons/favicon-256.png",
-		body: i18n['notif_body_articles.replace("\d", nb)'],
+		body: i18n['notif_body_articles'].replace("\d", nb),
 		tag: "freshRssNewArticles"
 	});
 

From 9a0d01be0cb627b30424e9f938face34c6c3814d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 18:24:28 +0200
Subject: [PATCH 054/363] Coding style

Remove spaces before parenthesis.

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/entryController.php      |  78 ++++----
 app/Controllers/errorController.php      |  28 +--
 app/Controllers/feedController.php       | 184 +++++++++---------
 app/Controllers/indexController.php      | 231 ++++++++++++-----------
 app/Controllers/javascriptController.php |   6 +-
 app/Controllers/statsController.php      |   2 +-
 6 files changed, 270 insertions(+), 259 deletions(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 048ac1c69..ec90666ed 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -1,47 +1,47 @@
 <?php
 
 class FreshRSS_entry_Controller extends Minz_ActionController {
-	public function firstAction () {
+	public function firstAction() {
 		if (!$this->view->loginOk) {
-			Minz_Error::error (
+			Minz_Error::error(
 				403,
-				array ('error' => array (_t('access_denied')))
+				array('error' => array(_t('access_denied')))
 			);
 		}
 
-		$this->params = array ();
+		$this->params = array();
 		$output = Minz_Request::param('output', '');
 		if (($output != '') && ($this->view->conf->view_mode !== $output)) {
 			$this->params['output'] = $output;
 		}
 
 		$this->redirect = false;
-		$ajax = Minz_Request::param ('ajax');
+		$ajax = Minz_Request::param('ajax');
 		if ($ajax) {
-			$this->view->_useLayout (false);
+			$this->view->_useLayout(false);
 		}
 	}
 
-	public function lastAction () {
-		$ajax = Minz_Request::param ('ajax');
+	public function lastAction() {
+		$ajax = Minz_Request::param('ajax');
 		if (!$ajax && $this->redirect) {
-			Minz_Request::forward (array (
+			Minz_Request::forward(array(
 				'c' => 'index',
 				'a' => 'index',
 				'params' => $this->params
 			), true);
 		} else {
-			Minz_Request::_param ('ajax');
+			Minz_Request::_param('ajax');
 		}
 	}
 
-	public function readAction () {
+	public function readAction() {
 		$this->redirect = true;
 
-		$id = Minz_Request::param ('id');
-		$get = Minz_Request::param ('get');
-		$nextGet = Minz_Request::param ('nextGet', $get); 
-		$idMax = Minz_Request::param ('idMax', 0);
+		$id = Minz_Request::param('id');
+		$get = Minz_Request::param('get');
+		$nextGet = Minz_Request::param('nextGet', $get);
+		$idMax = Minz_Request::param('idMax', 0);
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 		if ($id == false) {
@@ -50,47 +50,47 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			}
 
 			if (!$get) {
-				$entryDAO->markReadEntries ($idMax);
+				$entryDAO->markReadEntries($idMax);
 			} else {
 				$typeGet = $get[0];
-				$get = substr ($get, 2);
-				switch ($typeGet) {
-					case 'c':
-						$entryDAO->markReadCat ($get, $idMax);
-						break;
-					case 'f':
-						$entryDAO->markReadFeed ($get, $idMax);
-						break;
-					case 's':
-						$entryDAO->markReadEntries ($idMax, true);
-						break;
-					case 'a':
-						$entryDAO->markReadEntries ($idMax);
-						break;
+				$get = substr($get, 2);
+				switch($typeGet) {
+				case 'c':
+					$entryDAO->markReadCat($get, $idMax);
+					break;
+				case 'f':
+					$entryDAO->markReadFeed($get, $idMax);
+					break;
+				case 's':
+					$entryDAO->markReadEntries($idMax, true);
+					break;
+				case 'a':
+					$entryDAO->markReadEntries($idMax);
+					break;
 				}
 				if ($nextGet !== 'a') {
 					$this->params['get'] = $nextGet;
 				}
 			}
 
-			$notif = array (
+			$notif = array(
 				'type' => 'good',
 				'content' => _t('feeds_marked_read')
 			);
-			Minz_Session::_param ('notification', $notif);
+			Minz_Session::_param('notification', $notif);
 		} else {
-			$is_read = (bool)(Minz_Request::param ('is_read', true));
-			$entryDAO->markRead ($id, $is_read);
+			$is_read = (bool)(Minz_Request::param('is_read', true));
+			$entryDAO->markRead($id, $is_read);
 		}
 	}
 
-	public function bookmarkAction () {
+	public function bookmarkAction() {
 		$this->redirect = true;
 
-		$id = Minz_Request::param ('id');
+		$id = Minz_Request::param('id');
 		if ($id) {
 			$entryDAO = FreshRSS_Factory::createEntryDao();
-			$entryDAO->markFavorite ($id, (bool)(Minz_Request::param ('is_favorite', true)));
+			$entryDAO->markFavorite($id, (bool)(Minz_Request::param('is_favorite', true)));
 		}
 	}
 
@@ -109,11 +109,11 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 			invalidateHttpCache();
 
-			$notif = array (
+			$notif = array(
 				'type' => 'good',
 				'content' => _t('optimization_complete')
 			);
-			Minz_Session::_param ('notification', $notif);
+			Minz_Session::_param('notification', $notif);
 		}
 
 		Minz_Request::forward(array(
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 64a5c06fd..36312b56c 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -3,20 +3,20 @@
 class FreshRSS_error_Controller extends Minz_ActionController {
 	public function indexAction() {
 		switch (Minz_Request::param('code')) {
-			case 403:
-				$this->view->code = 'Error 403 - Forbidden';
-				break;
-			case 404:
-				$this->view->code = 'Error 404 - Not found';
-				break;
-			case 500:
-				$this->view->code = 'Error 500 - Internal Server Error';
-				break;
-			case 503:
-				$this->view->code = 'Error 503 - Service Unavailable';
-				break;
-			default:
-				$this->view->code = 'Error 404 - Not found';
+		case 403:
+			$this->view->code = 'Error 403 - Forbidden';
+			break;
+		case 404:
+			$this->view->code = 'Error 404 - Not found';
+			break;
+		case 500:
+			$this->view->code = 'Error 500 - Internal Server Error';
+			break;
+		case 503:
+			$this->view->code = 'Error 503 - Service Unavailable';
+			break;
+		default:
+			$this->view->code = 'Error 404 - Not found';
 		}
 
 		$errors = Minz_Request::param('logs', array());
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 029f9fa68..93a8d7c2e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -1,27 +1,27 @@
 <?php
 
 class FreshRSS_feed_Controller extends Minz_ActionController {
-	public function firstAction () {
+	public function firstAction() {
 		if (!$this->view->loginOk) {
 			// Token is useful in the case that anonymous refresh is forbidden
 			// and CRON task cannot be used with php command so the user can
 			// set a CRON task to refresh his feeds by using token inside url
 			$token = $this->view->conf->token;
-			$token_param = Minz_Request::param ('token', '');
+			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token == $token_param);
-			$action = Minz_Request::actionName ();
+			$action = Minz_Request::actionName();
 			if (!(($token_is_ok || Minz_Configuration::allowAnonymousRefresh()) &&
 				$action === 'actualize')
 			) {
-				Minz_Error::error (
+				Minz_Error::error(
 					403,
-					array ('error' => array (_t('access_denied')))
+					array('error' => array(_t('access_denied')))
 				);
 			}
 		}
 	}
 
-	public function addAction () {
+	public function addAction() {
 		$url = Minz_Request::param('url_rss', false);
 
 		if ($url === false) {
@@ -32,16 +32,16 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->catDAO = new FreshRSS_CategoryDAO ();
-		$this->catDAO->checkDefault ();
+		$this->catDAO = new FreshRSS_CategoryDAO();
+		$this->catDAO->checkDefault();
 
 		if (Minz_Request::isPost()) {
 			@set_time_limit(300);
 
 
-			$cat = Minz_Request::param ('category', false);
+			$cat = Minz_Request::param('category', false);
 			if ($cat === 'nc') {
-				$new_cat = Minz_Request::param ('new_category');
+				$new_cat = Minz_Request::param('new_category');
 				if (empty($new_cat['name'])) {
 					$cat = false;
 				} else {
@@ -49,55 +49,55 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				}
 			}
 			if ($cat === false) {
-				$def_cat = $this->catDAO->getDefault ();
-				$cat = $def_cat->id ();
+				$def_cat = $this->catDAO->getDefault();
+				$cat = $def_cat->id();
 			}
 
-			$user = Minz_Request::param ('http_user');
-			$pass = Minz_Request::param ('http_pass');
-			$params = array ();
+			$user = Minz_Request::param('http_user');
+			$pass = Minz_Request::param('http_pass');
+			$params = array();
 
 			$transactionStarted = false;
 			try {
-				$feed = new FreshRSS_Feed ($url);
-				$feed->_category ($cat);
+				$feed = new FreshRSS_Feed($url);
+				$feed->_category($cat);
 
 				$httpAuth = '';
 				if ($user != '' || $pass != '') {
 					$httpAuth = $user . ':' . $pass;
 				}
-				$feed->_httpAuth ($httpAuth);
+				$feed->_httpAuth($httpAuth);
 
 				$feed->load(true);
 
-				$values = array (
-					'url' => $feed->url (),
-					'category' => $feed->category (),
-					'name' => $feed->name (),
-					'website' => $feed->website (),
-					'description' => $feed->description (),
-					'lastUpdate' => time (),
-					'httpAuth' => $feed->httpAuth (),
+				$values = array(
+					'url' => $feed->url(),
+					'category' => $feed->category(),
+					'name' => $feed->name(),
+					'website' => $feed->website(),
+					'description' => $feed->description(),
+					'lastUpdate' => time(),
+					'httpAuth' => $feed->httpAuth(),
 				);
 
-				if ($feedDAO->searchByUrl ($values['url'])) {
+				if ($feedDAO->searchByUrl($values['url'])) {
 					// on est déjà abonné à ce flux
-					$notif = array (
+					$notif = array(
 						'type' => 'bad',
-						'content' => _t('already_subscribed', $feed->name ())
+						'content' => _t('already_subscribed', $feed->name())
 					);
-					Minz_Session::_param ('notification', $notif);
+					Minz_Session::_param('notification', $notif);
 				} else {
-					$id = $feedDAO->addFeed ($values);
+					$id = $feedDAO->addFeed($values);
 					if (!$id) {
 						// problème au niveau de la base de données
-						$notif = array (
+						$notif = array(
 							'type' => 'bad',
-							'content' => _t('feed_not_added', $feed->name ())
+							'content' => _t('feed_not_added', $feed->name())
 						);
-						Minz_Session::_param ('notification', $notif);
+						Minz_Session::_param('notification', $notif);
 					} else {
-						$feed->_id ($id);
+						$feed->_id($id);
 						$feed->faviconPrepare();
 
 						$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
@@ -107,7 +107,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 						// on calcule la date des articles les plus anciens qu'on accepte
 						$nb_month_old = $this->view->conf->old_entries;
-						$date_min = time () - (3600 * 24 * 30 * $nb_month_old);
+						$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 						//MySQL: http://docs.oracle.com/cd/E17952_01/refman-5.5-en/optimizing-innodb-transaction-management.html
 						//SQLite: http://stackoverflow.com/questions/1711631/how-do-i-improve-the-performance-of-sqlite
@@ -129,44 +129,50 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						$transactionStarted = false;
 
 						// ok, ajout terminé
-						$notif = array (
+						$notif = array(
 							'type' => 'good',
-							'content' => _t('feed_added', $feed->name ())
+							'content' => _t('feed_added', $feed->name())
 						);
-						Minz_Session::_param ('notification', $notif);
+						Minz_Session::_param('notification', $notif);
 
 						// permet de rediriger vers la page de conf du flux
-						$params['id'] = $feed->id ();
+						$params['id'] = $feed->id();
 					}
 				}
 			} catch (FreshRSS_BadUrl_Exception $e) {
-				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
-				$notif = array (
+				Minz_Log::record($e->getMessage(), Minz_Log::WARNING);
+				$notif = array(
 					'type' => 'bad',
 					'content' => _t('invalid_url', $url)
 				);
-				Minz_Session::_param ('notification', $notif);
+				Minz_Session::_param('notification', $notif);
 			} catch (FreshRSS_Feed_Exception $e) {
-				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
-				$notif = array (
+				Minz_Log::record($e->getMessage(), Minz_Log::WARNING);
+				$notif = array(
 					'type' => 'bad',
-					'content' => _t('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					'content' => _t('internal_problem_feed',
+					                Minz_Url::display(array('a' => 'logs')))
 				);
-				Minz_Session::_param ('notification', $notif);
+				Minz_Session::_param('notification', $notif);
 			} catch (Minz_FileNotExistException $e) {
 				// Répertoire de cache n'existe pas
-				Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
-				$notif = array (
+				Minz_Log::record($e->getMessage(), Minz_Log::ERROR);
+				$notif = array(
 					'type' => 'bad',
-					'content' => _t('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					'content' => _t('internal_problem_feed',
+					                Minz_Url::display(array('a' => 'logs')))
 				);
-				Minz_Session::_param ('notification', $notif);
+				Minz_Session::_param('notification', $notif);
 			}
 			if ($transactionStarted) {
-				$feedDAO->rollBack ();
+				$feedDAO->rollBack();
 			}
 
-			Minz_Request::forward (array ('c' => 'subscription', 'a' => 'index', 'params' => $params), true);
+			Minz_Request::forward(array(
+				'c' => 'subscription',
+				'a' => 'index',
+				'params' => $params
+			), true);
 		} else {
 
 			// GET request so we must ask confirmation to user
@@ -201,41 +207,43 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
-	public function truncateAction () {
-		if (Minz_Request::isPost ()) {
-			$id = Minz_Request::param ('id');
+	public function truncateAction() {
+		if (Minz_Request::isPost()) {
+			$id = Minz_Request::param('id');
 			$feedDAO = FreshRSS_Factory::createFeedDao();
 			$n = $feedDAO->truncate($id);
 			$notif = array(
 				'type' => $n === false ? 'bad' : 'good',
 				'content' => _t('n_entries_deleted', $n)
 			);
-			Minz_Session::_param ('notification', $notif);
+			Minz_Session::_param('notification', $notif);
 			invalidateHttpCache();
-			Minz_Request::forward (array ('c' => 'subscription',
-			                              'a' => 'index',
-			                              'params' => array('id' => $id)), true);
+			Minz_Request::forward(array(
+				'c' => 'subscription',
+				'a' => 'index',
+				'params' => array('id' => $id)
+			), true);
 		}
 	}
 
-	public function actualizeAction () {
+	public function actualizeAction() {
 		@set_time_limit(300);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
 		Minz_Session::_param('actualize_feeds', false);
-		$id = Minz_Request::param ('id');
-		$force = Minz_Request::param ('force', false);
+		$id = Minz_Request::param('id');
+		$force = Minz_Request::param('force', false);
 
 		// on créé la liste des flux à mettre à actualiser
 		// si on veut mettre un flux à jour spécifiquement, on le met
 		// dans la liste, mais seul (permet d'automatiser le traitement)
-		$feeds = array ();
+		$feeds = array();
 		if ($id) {
-			$feed = $feedDAO->searchById ($id);
+			$feed = $feedDAO->searchById($id);
 			if ($feed) {
-				$feeds = array ($feed);
+				$feeds = array($feed);
 			}
 		} else {
 			$feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
@@ -243,7 +251,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		// on calcule la date des articles les plus anciens qu'on accepte
 		$nb_month_old = max($this->view->conf->old_entries, 1);
-		$date_min = time () - (3600 * 24 * 30 * $nb_month_old);
+		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$i = 0;
 		$flux_update = 0;
@@ -263,7 +271,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 				if (count($entries) > 0) {
 					//For this feed, check last n entry GUIDs already in database
-					$existingGuids = array_fill_keys ($entryDAO->listLastGuidsByFeed ($feed->id (), count($entries) + 10), 1);
+					$existingGuids = array_fill_keys(
+						$entryDAO->listLastGuidsByFeed($feed->id(),
+						                               count($entries) + 10), 1);
 					$useDeclaredDate = empty($existingGuids);
 
 					if ($feedHistory == -2) {	//default
@@ -295,14 +305,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					if (!$hasTransaction) {
 						$feedDAO->beginTransaction();
 					}
-					$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, max($feedHistory, count($entries) + 10));
+					$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, max($feedHistory, count($entries) + 10));
 					if ($nb > 0) {
-						Minz_Log::record ($nb . ' old entries cleaned in feed [' . $feed->url() . ']', Minz_Log::DEBUG);
+						Minz_Log::record($nb . ' old entries cleaned in feed [' . $feed->url() . ']', Minz_Log::DEBUG);
 					}
 				}
 
 				// on indique que le flux vient d'être mis à jour en BDD
-				$feedDAO->updateLastUpdate ($feed->id (), 0, $hasTransaction);
+				$feedDAO->updateLastUpdate($feed->id(), 0, $hasTransaction);
 				if ($hasTransaction) {
 					$feedDAO->commit();
 				}
@@ -312,8 +322,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 				}
 			} catch (FreshRSS_Feed_Exception $e) {
-				Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE);
-				$feedDAO->updateLastUpdate ($feed->id (), 1);
+				Minz_Log::record($e->getMessage(), Minz_Log::NOTICE);
+				$feedDAO->updateLastUpdate($feed->id(), 1);
 			}
 
 			$feed->faviconPrepare();
@@ -328,23 +338,23 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 		}
 
-		$url = array ();
+		$url = array();
 		if ($flux_update === 1) {
 			// on a mis un seul flux à jour
-			$feed = reset ($feeds);
-			$notif = array (
+			$feed = reset($feeds);
+			$notif = array(
 				'type' => 'good',
-				'content' => _t('feed_actualized', $feed->name ())
+				'content' => _t('feed_actualized', $feed->name())
 			);
 		} elseif ($flux_update > 1) {
 			// plusieurs flux on été mis à jour
-			$notif = array (
+			$notif = array(
 				'type' => 'good',
 				'content' => _t('n_feeds_actualized', $flux_update)
 			);
 		} else {
 			// aucun flux n'a été mis à jour, oups
-			$notif = array (
+			$notif = array(
 				'type' => 'good',
 				'content' => _t('no_feed_to_refresh')
 			);
@@ -353,26 +363,26 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		if ($i === 1) {
 			// Si on a voulu mettre à jour qu'un flux
 			// on filtre l'affichage par ce flux
-			$feed = reset ($feeds);
-			$url['params'] = array ('get' => 'f_' . $feed->id ());
+			$feed = reset($feeds);
+			$url['params'] = array('get' => 'f_' . $feed->id());
 		}
 
-		if (Minz_Request::param ('ajax', 0) === 0) {
-			Minz_Session::_param ('notification', $notif);
-			Minz_Request::forward ($url, true);
+		if (Minz_Request::param('ajax', 0) === 0) {
+			Minz_Session::_param('notification', $notif);
+			Minz_Request::forward($url, true);
 		} else {
 			// Une requête Ajax met un seul flux à jour.
 			// Comme en principe plusieurs requêtes ont lieu,
 			// on indique que "plusieurs flux ont été mis à jour".
 			// Cela permet d'avoir une notification plus proche du
 			// ressenti utilisateur
-			$notif = array (
+			$notif = array(
 				'type' => 'good',
 				'content' => _t('feeds_actualized')
 			);
-			Minz_Session::_param ('notification', $notif);
+			Minz_Session::_param('notification', $notif);
 			// et on désactive le layout car ne sert à rien
-			$this->view->_useLayout (false);
+			$this->view->_useLayout(false);
 		}
 	}
 
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 346739523..73638acb3 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -3,18 +3,18 @@
 class FreshRSS_index_Controller extends Minz_ActionController {
 	private $nb_not_read_cat = 0;
 
-	public function indexAction () {
-		$output = Minz_Request::param ('output');
+	public function indexAction() {
+		$output = Minz_Request::param('output');
 		$token = $this->view->conf->token;
 
 		// check if user is logged in
 		if (!$this->view->loginOk && !Minz_Configuration::allowAnonymous()) {
-			$token_param = Minz_Request::param ('token', '');
+			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token === $token_param);
 			if ($output === 'rss' && !$token_is_ok) {
-				Minz_Error::error (
+				Minz_Error::error(
 					403,
-					array ('error' => array (_t('access_denied')))
+					array('error' => array(_t('access_denied')))
 				);
 				return;
 			} elseif ($output !== 'rss') {
@@ -25,12 +25,12 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			}
 		}
 
-		$params = Minz_Request::params ();
-		if (isset ($params['search'])) {
-			$params['search'] = urlencode ($params['search']);
+		$params = Minz_Request::params();
+		if (isset($params['search'])) {
+			$params['search'] = urlencode($params['search']);
 		}
 
-		$this->view->url = array (
+		$this->view->url = array(
 			'c' => 'index',
 			'a' => 'index',
 			'params' => $params
@@ -38,31 +38,31 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		if ($output === 'rss') {
 			// no layout for RSS output
-			$this->view->_useLayout (false);
+			$this->view->_useLayout(false);
 			header('Content-Type: application/rss+xml; charset=utf-8');
 		} elseif ($output === 'global') {
-			Minz_View::appendScript (Minz_Url::display ('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
+			Minz_View::appendScript(Minz_Url::display('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
 		}
 
 		$catDAO = new FreshRSS_CategoryDAO();
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
-		$this->view->cat_aside = $catDAO->listCategories ();
-		$this->view->nb_favorites = $entryDAO->countUnreadReadFavorites ();
+		$this->view->cat_aside = $catDAO->listCategories();
+		$this->view->nb_favorites = $entryDAO->countUnreadReadFavorites();
 		$this->view->nb_not_read = FreshRSS_CategoryDAO::CountUnreads($this->view->cat_aside, 1);
 		$this->view->currentName = '';
 
 		$this->view->get_c = '';
 		$this->view->get_f = '';
 
-		$get = Minz_Request::param ('get', 'a');
+		$get = Minz_Request::param('get', 'a');
 		$getType = $get[0];
-		$getId = substr ($get, 2);
-		if (!$this->checkAndProcessType ($getType, $getId)) {
-			Minz_Log::record ('Not found [' . $getType . '][' . $getId . ']', Minz_Log::DEBUG);
-			Minz_Error::error (
+		$getId = substr($get, 2);
+		if (!$this->checkAndProcessType($getType, $getId)) {
+			Minz_Log::record('Not found [' . $getType . '][' . $getId . ']', Minz_Log::DEBUG);
+			Minz_Error::error(
 				404,
-				array ('error' => array (_t('page_not_found')))
+				array('error' => array(_t('page_not_found')))
 			);
 			return;
 		}
@@ -77,11 +77,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		// On récupère les différents éléments de filtrage
 		$this->view->state = Minz_Request::param('state', $this->view->conf->default_view);
-		$state_param = Minz_Request::param ('state', null);
-		$filter = Minz_Request::param ('search', '');
-		$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', '');
+		$state_param = Minz_Request::param('state', null);
+		$filter = Minz_Request::param('search', '');
+		$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', '');
 
 		$ajax_request = Minz_Request::param('ajax', false);
 		if ($output === 'reader') {
@@ -90,23 +90,24 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ) {	//Any unread article in this category at all?
 			switch ($getType) {
-				case 'a':
-					$hasUnread = $this->view->nb_not_read > 0;
-					break;
-				case 's':
-					// This is deprecated. The favorite button does not exist anymore
-					$hasUnread = $this->view->nb_favorites['unread'] > 0;
-					break;
-				case 'c':
-					$hasUnread = (!isset($this->view->cat_aside[$getId])) || ($this->view->cat_aside[$getId]->nbNotRead() > 0);
-					break;
-				case 'f':
-					$myFeed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
-					$hasUnread = ($myFeed === null) || ($myFeed->nbNotRead() > 0);
-					break;
-				default:
-					$hasUnread = true;
-					break;
+			case 'a':
+				$hasUnread = $this->view->nb_not_read > 0;
+				break;
+			case 's':
+				// This is deprecated. The favorite button does not exist anymore
+				$hasUnread = $this->view->nb_favorites['unread'] > 0;
+				break;
+			case 'c':
+				$hasUnread = (!isset($this->view->cat_aside[$getId]) ||
+				              $this->view->cat_aside[$getId]->nbNotRead() > 0);
+				break;
+			case 'f':
+				$myFeed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
+				$hasUnread = ($myFeed === null) || ($myFeed->nbNotRead() > 0);
+				break;
+			default:
+				$hasUnread = true;
+				break;
 			}
 			if (!$hasUnread && ($state_param === null)) {
 				$this->view->state = FreshRSS_Entry::STATE_ALL;
@@ -142,10 +143,10 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 			$this->view->entries = $entries;
 		} catch (FreshRSS_EntriesGetter_Exception $e) {
-			Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE);
-			Minz_Error::error (
+			Minz_Log::record($e->getMessage(), Minz_Log::NOTICE);
+			Minz_Error::error(
 				404,
-				array ('error' => array (_t('page_not_found')))
+				array('error' => array(_t('page_not_found')))
 			);
 		}
 	}
@@ -155,98 +156,98 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * + Initialise correctement les variables de vue get_c et get_f
 	 * + Met à jour la variable $this->nb_not_read_cat
 	 */
-	private function checkAndProcessType ($getType, $getId) {
-		switch ($getType) {
-			case 'a':
-				$this->view->currentName = _t('your_rss_feeds');
-				$this->nb_not_read_cat = $this->view->nb_not_read;
-				$this->view->get_c = $getType;
+	private function checkAndProcessType($getType, $getId) {
+		switch($getType) {
+		case 'a':
+			$this->view->currentName = _t('your_rss_feeds');
+			$this->nb_not_read_cat = $this->view->nb_not_read;
+			$this->view->get_c = $getType;
+			return true;
+		case 's':
+			$this->view->currentName = _t('your_favorites');
+			$this->nb_not_read_cat = $this->view->nb_favorites['unread'];
+			$this->view->get_c = $getType;
+			return true;
+		case 'c':
+			$cat = isset($this->view->cat_aside[$getId]) ? $this->view->cat_aside[$getId] : null;
+			if ($cat === null) {
+				$catDAO = new FreshRSS_CategoryDAO();
+				$cat = $catDAO->searchById($getId);
+			}
+			if ($cat) {
+				$this->view->currentName = $cat->name();
+				$this->nb_not_read_cat = $cat->nbNotRead();
+				$this->view->get_c = $getId;
 				return true;
-			case 's':
-				$this->view->currentName = _t('your_favorites');
-				$this->nb_not_read_cat = $this->view->nb_favorites['unread'];
-				$this->view->get_c = $getType;
-				return true;
-			case 'c':
-				$cat = isset($this->view->cat_aside[$getId]) ? $this->view->cat_aside[$getId] : null;
-				if ($cat === null) {
-					$catDAO = new FreshRSS_CategoryDAO();
-					$cat = $catDAO->searchById($getId);
-				}
-				if ($cat) {
-					$this->view->currentName = $cat->name ();
-					$this->nb_not_read_cat = $cat->nbNotRead ();
-					$this->view->get_c = $getId;
-					return true;
-				} else {
-					return false;
-				}
-			case 'f':
-				$feed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
-				if (empty($feed)) {
-					$feedDAO = FreshRSS_Factory::createFeedDao();
-					$feed = $feedDAO->searchById($getId);
-				}
-				if ($feed) {
-					$this->view->currentName = $feed->name ();
-					$this->nb_not_read_cat = $feed->nbNotRead ();
-					$this->view->get_f = $getId;
-					$this->view->get_c = $feed->category ();
-					return true;
-				} else {
-					return false;
-				}
-			default:
+			} else {
 				return false;
+			}
+		case 'f':
+			$feed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
+			if (empty($feed)) {
+				$feedDAO = FreshRSS_Factory::createFeedDao();
+				$feed = $feedDAO->searchById($getId);
+			}
+			if ($feed) {
+				$this->view->currentName = $feed->name();
+				$this->nb_not_read_cat = $feed->nbNotRead();
+				$this->view->get_f = $getId;
+				$this->view->get_c = $feed->category();
+				return true;
+			} else {
+				return false;
+			}
+		default:
+			return false;
 		}
 	}
 	
-	public function aboutAction () {
-		Minz_View::prependTitle (_t('about') . ' · ');
+	public function aboutAction() {
+		Minz_View::prependTitle(_t('about') . ' · ');
 	}
 
-	public function logsAction () {
+	public function logsAction() {
 		if (!$this->view->loginOk) {
-			Minz_Error::error (
+			Minz_Error::error(
 				403,
-				array ('error' => array (_t('access_denied')))
+				array('error' => array(_t('access_denied')))
 			);
 		}
 
-		Minz_View::prependTitle (_t('logs') . ' · ');
+		Minz_View::prependTitle(_t('logs') . ' · ');
 
-		if (Minz_Request::isPost ()) {
+		if (Minz_Request::isPost()) {
 			FreshRSS_LogDAO::truncate();
 		}
 
 		$logs = FreshRSS_LogDAO::lines();	//TODO: ask only the necessary lines
 
 		//gestion pagination
-		$page = Minz_Request::param ('page', 1);
-		$this->view->logsPaginator = new Minz_Paginator ($logs);
-		$this->view->logsPaginator->_nbItemsPerPage (50);
-		$this->view->logsPaginator->_currentPage ($page);
+		$page = Minz_Request::param('page', 1);
+		$this->view->logsPaginator = new Minz_Paginator($logs);
+		$this->view->logsPaginator->_nbItemsPerPage(50);
+		$this->view->logsPaginator->_currentPage($page);
 	}
 
-	public function loginAction () {
-		$this->view->_useLayout (false);
+	public function loginAction() {
+		$this->view->_useLayout(false);
 
 		$url = 'https://verifier.login.persona.org/verify';
-		$assert = Minz_Request::param ('assertion');
+		$assert = Minz_Request::param('assertion');
 		$params = 'assertion=' . $assert . '&audience=' .
-			  urlencode (Minz_Url::display (null, 'php', true));
-		$ch = curl_init ();
-		$options = array (
+		          urlencode(Minz_Url::display(null, 'php', true));
+		$ch = curl_init();
+		$options = array(
 			CURLOPT_URL => $url,
 			CURLOPT_RETURNTRANSFER => TRUE,
 			CURLOPT_POST => 2,
 			CURLOPT_POSTFIELDS => $params
 		);
-		curl_setopt_array ($ch, $options);
-		$result = curl_exec ($ch);
-		curl_close ($ch);
+		curl_setopt_array($ch, $options);
+		$result = curl_exec($ch);
+		curl_close($ch);
 
-		$res = json_decode ($result, true);
+		$res = json_decode($result, true);
 
 		$loginOk = false;
 		$reason = '';
@@ -273,21 +274,21 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 		if ($loginOk) {
 			Minz_Session::_param('currentUser', $currentUser);
-			Minz_Session::_param ('mail', $email);
+			Minz_Session::_param('mail', $email);
 			$this->view->loginOk = true;
 			invalidateHttpCache();
 		} else {
-			$res = array ();
+			$res = array();
 			$res['status'] = 'failure';
 			$res['reason'] = $reason == '' ? _t('invalid_login') : $reason;
-			Minz_Log::record ('Persona: ' . $res['reason'], Minz_Log::WARNING);
+			Minz_Log::record('Persona: ' . $res['reason'], Minz_Log::WARNING);
 		}
 
 		header('Content-Type: application/json; charset=UTF-8');
-		$this->view->res = json_encode ($res);
+		$this->view->res = json_encode($res);
 	}
 
-	public function logoutAction () {
+	public function logoutAction() {
 		$this->view->_useLayout(false);
 		invalidateHttpCache();
 		Minz_Session::_param('currentUser');
@@ -330,7 +331,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 	}
 
-	public function formLoginAction () {
+	public function formLoginAction() {
 		if ($this->view->loginOk) {
 			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
 		}
@@ -401,15 +402,15 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			}
 			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
 		} elseif (!Minz_Configuration::canLogIn()) {
-			Minz_Error::error (
+			Minz_Error::error(
 				403,
-				array ('error' => array (_t('access_denied')))
+				array('error' => array(_t('access_denied')))
 			);
 		}
 		invalidateHttpCache();
 	}
 
-	public function formLogoutAction () {
+	public function formLogoutAction() {
 		$this->view->_useLayout(false);
 		invalidateHttpCache();
 		Minz_Session::_param('currentUser');
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 67148350f..2a0dbd3d9 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -1,11 +1,11 @@
 <?php
 
 class FreshRSS_javascript_Controller extends Minz_ActionController {
-	public function firstAction () {
-		$this->view->_useLayout (false);
+	public function firstAction() {
+		$this->view->_useLayout(false);
 	}
 
-	public function actualizeAction () {
+	public function actualizeAction() {
 		header('Content-Type: text/javascript; charset=UTF-8');
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$this->view->feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 4adb5e75d..99c57c809 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -99,7 +99,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$categoryDAO = new FreshRSS_CategoryDAO();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		Minz_View::appendScript(Minz_Url::display('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js')));
-		$id = Minz_Request::param ('id', null);
+		$id = Minz_Request::param('id', null);
 		$this->view->categories = $categoryDAO->listCategories();
 		$this->view->feed = $feedDAO->searchById($id);
 		$this->view->days = $statsDAO->getDays();

From b5dee73ea0ab3cc24c4857ac102e9e78cf20ab92 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 18:51:08 +0200
Subject: [PATCH 055/363] Coding style

Remove spaces before parenthesis bis

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Exceptions/BadUrlException.php        |   4 +-
 app/Exceptions/EntriesGetterException.php |   4 +-
 app/Exceptions/FeedException.php          |   4 +-
 app/Models/Category.php                   |  42 +++---
 app/Models/CategoryDAO.php                | 164 +++++++++++-----------
 app/Models/Configuration.php              |  36 ++---
 app/Models/Entry.php                      | 138 +++++++++---------
 app/Models/EntryDAO.php                   |  42 +++---
 app/Models/Log.php                        |  12 +-
 app/Models/LogDAO.php                     |  10 +-
 app/Models/StatsDAO.php                   |   2 +-
 11 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php
index 7d1fe110e..59574e1e5 100644
--- a/app/Exceptions/BadUrlException.php
+++ b/app/Exceptions/BadUrlException.php
@@ -1,6 +1,6 @@
 <?php
 class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
-	public function __construct ($url) {
-		parent::__construct ('`' . $url . '` is not a valid URL');
+	public function __construct($url) {
+		parent::__construct('`' . $url . '` is not a valid URL');
 	}
 }
diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
index eaa330979..5f47c830b 100644
--- a/app/Exceptions/EntriesGetterException.php
+++ b/app/Exceptions/EntriesGetterException.php
@@ -1,7 +1,7 @@
 <?php
 
 class FreshRSS_EntriesGetter_Exception extends Exception {
-	public function __construct ($message) {
-		parent::__construct ($message);
+	public function __construct($message) {
+		parent::__construct($message);
 	}
 }
diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
index 50918ba95..2433b3964 100644
--- a/app/Exceptions/FeedException.php
+++ b/app/Exceptions/FeedException.php
@@ -1,6 +1,6 @@
 <?php
 class FreshRSS_Feed_Exception extends Exception {
-	public function __construct ($message) {
-		parent::__construct ($message);
+	public function __construct($message) {
+		parent::__construct($message);
 	}
 }
diff --git a/app/Models/Category.php b/app/Models/Category.php
index e5f6c4334..37cb44dc3 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -7,65 +7,65 @@ class FreshRSS_Category extends Minz_Model {
 	private $nbNotRead = -1;
 	private $feeds = null;
 
-	public function __construct ($name = '', $feeds = null) {
-		$this->_name ($name);
-		if (isset ($feeds)) {
-			$this->_feeds ($feeds);
+	public function __construct($name = '', $feeds = null) {
+		$this->_name($name);
+		if (isset($feeds)) {
+			$this->_feeds($feeds);
 			$this->nbFeed = 0;
 			$this->nbNotRead = 0;
 			foreach ($feeds as $feed) {
 				$this->nbFeed++;
-				$this->nbNotRead += $feed->nbNotRead ();
+				$this->nbNotRead += $feed->nbNotRead();
 			}
 		}
 	}
 
-	public function id () {
+	public function id() {
 		return $this->id;
 	}
-	public function name () {
+	public function name() {
 		return $this->name;
 	}
-	public function nbFeed () {
+	public function nbFeed() {
 		if ($this->nbFeed < 0) {
-			$catDAO = new FreshRSS_CategoryDAO ();
-			$this->nbFeed = $catDAO->countFeed ($this->id ());
+			$catDAO = new FreshRSS_CategoryDAO();
+			$this->nbFeed = $catDAO->countFeed($this->id());
 		}
 
 		return $this->nbFeed;
 	}
-	public function nbNotRead () {
+	public function nbNotRead() {
 		if ($this->nbNotRead < 0) {
-			$catDAO = new FreshRSS_CategoryDAO ();
-			$this->nbNotRead = $catDAO->countNotRead ($this->id ());
+			$catDAO = new FreshRSS_CategoryDAO();
+			$this->nbNotRead = $catDAO->countNotRead($this->id());
 		}
 
 		return $this->nbNotRead;
 	}
-	public function feeds () {
+	public function feeds() {
 		if ($this->feeds === null) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$this->feeds = $feedDAO->listByCategory ($this->id ());
+			$this->feeds = $feedDAO->listByCategory($this->id());
 			$this->nbFeed = 0;
 			$this->nbNotRead = 0;
 			foreach ($this->feeds as $feed) {
 				$this->nbFeed++;
-				$this->nbNotRead += $feed->nbNotRead ();
+				$this->nbNotRead += $feed->nbNotRead();
 			}
 		}
 
 		return $this->feeds;
 	}
 
-	public function _id ($value) {
+	public function _id($value) {
 		$this->id = $value;
 	}
-	public function _name ($value) {
+	public function _name($value) {
 		$this->name = substr(trim($value), 0, 255);
 	}
-	public function _feeds ($values) {
-		if (!is_array ($values)) {
-			$values = array ($values);
+	public function _feeds($values) {
+		if (!is_array($values)) {
+			$values = array($values);
 		}
 
 		$this->feeds = $values;
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 5def50a26..ce1babfdd 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,15 +1,15 @@
 <?php
 
 class FreshRSS_CategoryDAO extends Minz_ModelPdo {
-	public function addCategory ($valuesTmp) {
-		$sql = 'INSERT INTO `' . $this->prefix . 'category` (name) VALUES(?)';
-		$stm = $this->bd->prepare ($sql);
+	public function addCategory($valuesTmp) {
+		$sql = 'INSERT INTO `' . $this->prefix . 'category`(name) VALUES(?)';
+		$stm = $this->bd->prepare($sql);
 
-		$values = array (
+		$values = array(
 			substr($valuesTmp['name'], 0, 255),
 		);
 
-		if ($stm && $stm->execute ($values)) {
+		if ($stm && $stm->execute($values)) {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
@@ -31,16 +31,16 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		return $cat->id();
 	}
 
-	public function updateCategory ($id, $valuesTmp) {
+	public function updateCategory($id, $valuesTmp) {
 		$sql = 'UPDATE `' . $this->prefix . 'category` SET name=? WHERE id=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array (
+		$values = array(
 			$valuesTmp['name'],
 			$id
 		);
 
-		if ($stm && $stm->execute ($values)) {
+		if ($stm && $stm->execute($values)) {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
@@ -49,13 +49,13 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		}
 	}
 
-	public function deleteCategory ($id) {
+	public function deleteCategory($id) {
 		$sql = 'DELETE FROM `' . $this->prefix . 'category` WHERE id=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array ($id);
+		$values = array($id);
 
-		if ($stm && $stm->execute ($values)) {
+		if ($stm && $stm->execute($values)) {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
@@ -64,40 +64,40 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		}
 	}
 
-	public function searchById ($id) {
+	public function searchById($id) {
 		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array ($id);
+		$values = array($id);
 
-		$stm->execute ($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$cat = self::daoToCategory ($res);
+		$stm->execute($values);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+		$cat = self::daoToCategory($res);
 
-		if (isset ($cat[0])) {
+		if (isset($cat[0])) {
 			return $cat[0];
 		} else {
 			return null;
 		}
 	}
-	public function searchByName ($name) {
+	public function searchByName($name) {
 		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE name=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array ($name);
+		$values = array($name);
 
-		$stm->execute ($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$cat = self::daoToCategory ($res);
+		$stm->execute($values);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+		$cat = self::daoToCategory($res);
 
-		if (isset ($cat[0])) {
+		if (isset($cat[0])) {
 			return $cat[0];
 		} else {
 			return null;
 		}
 	}
 
-	public function listCategories ($prePopulateFeeds = true, $details = false) {
+	public function listCategories($prePopulateFeeds = true, $details = false) {
 		if ($prePopulateFeeds) {
 			$sql = 'SELECT c.id AS c_id, c.name AS c_name, '
 			     . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.website, f.priority, f.error, f.cache_nbEntries, f.cache_nbUnreads ')
@@ -105,80 +105,80 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 			     . 'LEFT OUTER JOIN `' . $this->prefix . 'feed` f ON f.category=c.id '
 			     . 'GROUP BY f.id '
 			     . 'ORDER BY c.name, f.name';
-			$stm = $this->bd->prepare ($sql);
-			$stm->execute ();
-			return self::daoToCategoryPrepopulated ($stm->fetchAll (PDO::FETCH_ASSOC));
+			$stm = $this->bd->prepare($sql);
+			$stm->execute();
+			return self::daoToCategoryPrepopulated($stm->fetchAll(PDO::FETCH_ASSOC));
 		} else {
 			$sql = 'SELECT * FROM `' . $this->prefix . 'category` ORDER BY name';
-			$stm = $this->bd->prepare ($sql);
-			$stm->execute ();
-			return self::daoToCategory ($stm->fetchAll (PDO::FETCH_ASSOC));
+			$stm = $this->bd->prepare($sql);
+			$stm->execute();
+			return self::daoToCategory($stm->fetchAll(PDO::FETCH_ASSOC));
 		}
 	}
 
-	public function getDefault () {
+	public function getDefault() {
 		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=1';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$stm->execute ();
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$cat = self::daoToCategory ($res);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+		$cat = self::daoToCategory($res);
 
-		if (isset ($cat[0])) {
+		if (isset($cat[0])) {
 			return $cat[0];
 		} else {
 			return false;
 		}
 	}
-	public function checkDefault () {
-		$def_cat = $this->searchById (1);
+	public function checkDefault() {
+		$def_cat = $this->searchById(1);
 
 		if ($def_cat == null) {
-			$cat = new FreshRSS_Category (_t('default_category'));
-			$cat->_id (1);
+			$cat = new FreshRSS_Category(_t('default_category'));
+			$cat->_id(1);
 
-			$values = array (
-				'id' => $cat->id (),
-				'name' => $cat->name (),
+			$values = array(
+				'id' => $cat->id(),
+				'name' => $cat->name(),
 			);
 
-			$this->addCategory ($values);
+			$this->addCategory($values);
 		}
 	}
 
-	public function count () {
+	public function count() {
 		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'category`';
-		$stm = $this->bd->prepare ($sql);
-		$stm->execute ();
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
 		return $res[0]['count'];
 	}
 
-	public function countFeed ($id) {
+	public function countFeed($id) {
 		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'feed` WHERE category=?';
-		$stm = $this->bd->prepare ($sql);
-		$values = array ($id);
-		$stm->execute ($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$stm = $this->bd->prepare($sql);
+		$values = array($id);
+		$stm->execute($values);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
 		return $res[0]['count'];
 	}
 
-	public function countNotRead ($id) {
+	public function countNotRead($id) {
 		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id WHERE category=? AND e.is_read=0';
-		$stm = $this->bd->prepare ($sql);
-		$values = array ($id);
-		$stm->execute ($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$stm = $this->bd->prepare($sql);
+		$values = array($id);
+		$stm->execute($values);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
 		return $res[0]['count'];
 	}
 
 	public static function findFeed($categories, $feed_id) {
 		foreach ($categories as $category) {
-			foreach ($category->feeds () as $feed) {
-				if ($feed->id () === $feed_id) {
+			foreach ($category->feeds() as $feed) {
+				if ($feed->id() === $feed_id) {
 					return $feed;
 				}
 			}
@@ -189,8 +189,8 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 	public static function CountUnreads($categories, $minPriority = 0) {
 		$n = 0;
 		foreach ($categories as $category) {
-			foreach ($category->feeds () as $feed) {
-				if ($feed->priority () >= $minPriority) {
+			foreach ($category->feeds() as $feed) {
+				if ($feed->priority() >= $minPriority) {
 					$n += $feed->nbNotRead();
 				}
 			}
@@ -198,11 +198,11 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		return $n;
 	}
 
-	public static function daoToCategoryPrepopulated ($listDAO) {
-		$list = array ();
+	public static function daoToCategoryPrepopulated($listDAO) {
+		$list = array();
 
-		if (!is_array ($listDAO)) {
-			$listDAO = array ($listDAO);
+		if (!is_array($listDAO)) {
+			$listDAO = array($listDAO);
 		}
 
 		$previousLine = null;
@@ -210,11 +210,11 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		foreach ($listDAO as $line) {
 			if ($previousLine['c_id'] != null && $line['c_id'] !== $previousLine['c_id']) {
 				// End of the current category, we add it to the $list
-				$cat = new FreshRSS_Category (
+				$cat = new FreshRSS_Category(
 					$previousLine['c_name'],
-					FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
+					FreshRSS_FeedDAO::daoToFeed($feedsDao, $previousLine['c_id'])
 				);
-				$cat->_id ($previousLine['c_id']);
+				$cat->_id($previousLine['c_id']);
 				$list[$previousLine['c_id']] = $cat;
 
 				$feedsDao = array();	//Prepare for next category
@@ -226,29 +226,29 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 
 		// add the last category
 		if ($previousLine != null) {
-			$cat = new FreshRSS_Category (
+			$cat = new FreshRSS_Category(
 				$previousLine['c_name'],
-				FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
+				FreshRSS_FeedDAO::daoToFeed($feedsDao, $previousLine['c_id'])
 			);
-			$cat->_id ($previousLine['c_id']);
+			$cat->_id($previousLine['c_id']);
 			$list[$previousLine['c_id']] = $cat;
 		}
 
 		return $list;
 	}
 
-	public static function daoToCategory ($listDAO) {
-		$list = array ();
+	public static function daoToCategory($listDAO) {
+		$list = array();
 
-		if (!is_array ($listDAO)) {
-			$listDAO = array ($listDAO);
+		if (!is_array($listDAO)) {
+			$listDAO = array($listDAO);
 		}
 
 		foreach ($listDAO as $key => $dao) {
-			$cat = new FreshRSS_Category (
+			$cat = new FreshRSS_Category(
 				$dao['name']
 			);
-			$cat->_id ($dao['id']);
+			$cat->_id($dao['id']);
 			$list[$key] = $cat;
 		}
 
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index feba3d2f6..2f208e509 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -140,18 +140,18 @@ class FreshRSS_Configuration {
 		}
 		$this->data['language'] = $value;
 	}
-	public function _posts_per_page ($value) {
+	public function _posts_per_page($value) {
 		$value = intval($value);
 		$this->data['posts_per_page'] = $value > 0 ? $value : 10;
 	}
-	public function _view_mode ($value) {
+	public function _view_mode($value) {
 		if ($value === 'global' || $value === 'reader') {
 			$this->data['view_mode'] = $value;
 		} else {
 			$this->data['view_mode'] = 'normal';
 		}
 	}
-	public function _default_view ($value) {
+	public function _default_view($value) {
 		switch ($value) {
 		case FreshRSS_Entry::STATE_ALL:
 			// left blank on purpose
@@ -165,19 +165,19 @@ class FreshRSS_Configuration {
 			break;
 		}
 	}
-	public function _display_posts ($value) {
+	public function _display_posts($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _display_categories ($value) {
+	public function _display_categories($value) {
 		$this->data['display_categories'] = ((bool)$value) && $value !== 'no';
 	}
 	public function _hide_read_feeds($value) {
 		$this->data['hide_read_feeds'] = (bool)$value;
 	}
-	public function _onread_jump_next ($value) {
+	public function _onread_jump_next($value) {
 		$this->data['onread_jump_next'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _lazyload ($value) {
+	public function _lazyload($value) {
 		$this->data['lazyload'] = ((bool)$value) && $value !== 'no';
 	}
 	public function _sticky_post($value) {
@@ -186,7 +186,7 @@ class FreshRSS_Configuration {
 	public function _reading_confirm($value) {
 		$this->data['reading_confirm'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _sort_order ($value) {
+	public function _sort_order($value) {
 		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
 	public function _old_entries($value) {
@@ -201,20 +201,20 @@ class FreshRSS_Configuration {
 		$value = intval($value);
 		$this->data['ttl_default'] = $value >= -1 ? $value : 3600;
 	}
-	public function _shortcuts ($values) {
+	public function _shortcuts($values) {
 		foreach ($values as $key => $value) {
 			if (isset($this->data['shortcuts'][$key])) {
 				$this->data['shortcuts'][$key] = $value;
 			}
 		}
 	}
-	public function _passwordHash ($value) {
+	public function _passwordHash($value) {
 		$this->data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
 	}
-	public function _apiPasswordHash ($value) {
+	public function _apiPasswordHash($value) {
 		$this->data['apiPasswordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
 	}
-	public function _mail_login ($value) {
+	public function _mail_login($value) {
 		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
 		if ($value) {
 			$this->data['mail_login'] = $value;
@@ -222,17 +222,17 @@ class FreshRSS_Configuration {
 			$this->data['mail_login'] = '';
 		}
 	}
-	public function _anon_access ($value) {
+	public function _anon_access($value) {
 		$this->data['anon_access'] = ((bool)$value) && $value !== 'no';
 	}
-	public function _mark_when ($values) {
+	public function _mark_when($values) {
 		foreach ($values as $key => $value) {
 			if (isset($this->data['mark_when'][$key])) {
 				$this->data['mark_when'][$key] = ((bool)$value) && $value !== 'no';
 			}
 		}
 	}
-	public function _sharing ($values) {
+	public function _sharing($values) {
 		$this->data['sharing'] = array();
 		$unique = array();
 		foreach ($values as $value) {
@@ -243,7 +243,7 @@ class FreshRSS_Configuration {
 			// Verify URL and add default value when needed
 			if (isset($value['url'])) {
 				$is_url = (
-					filter_var ($value['url'], FILTER_VALIDATE_URL) ||
+					filter_var($value['url'], FILTER_VALIDATE_URL) ||
 					(version_compare(PHP_VERSION, '5.3.3', '<') &&
 						(strpos($value, '-') > 0) &&
 						($value === filter_var($value, FILTER_SANITIZE_URL)))
@@ -267,7 +267,7 @@ class FreshRSS_Configuration {
 			}
 		}
 	}
-	public function _queries ($values) {
+	public function _queries($values) {
 		$this->data['queries'] = array();
 		foreach ($values as $value) {
 			$value = array_filter($value);
@@ -292,7 +292,7 @@ class FreshRSS_Configuration {
 		}
 	}
 	
-	public function _html5_notif_timeout ($value) {
+	public function _html5_notif_timeout($value) {
 		$value = intval($value);
 		$this->data['html5_notif_timeout'] = $value >= 0 ? $value : 0;
 	}
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 9d7dd5dc4..ee94d1110 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -20,134 +20,134 @@ class FreshRSS_Entry extends Minz_Model {
 	private $feed;
 	private $tags;
 
-	public function __construct ($feed = '', $guid = '', $title = '', $author = '', $content = '',
-	                             $link = '', $pubdate = 0, $is_read = false, $is_favorite = false, $tags = '') {
-		$this->_guid ($guid);
-		$this->_title ($title);
-		$this->_author ($author);
-		$this->_content ($content);
-		$this->_link ($link);
-		$this->_date ($pubdate);
-		$this->_isRead ($is_read);
-		$this->_isFavorite ($is_favorite);
-		$this->_feed ($feed);
-		$this->_tags (preg_split('/[\s#]/', $tags));
+	public function __construct($feed = '', $guid = '', $title = '', $author = '', $content = '',
+	                            $link = '', $pubdate = 0, $is_read = false, $is_favorite = false, $tags = '') {
+		$this->_guid($guid);
+		$this->_title($title);
+		$this->_author($author);
+		$this->_content($content);
+		$this->_link($link);
+		$this->_date($pubdate);
+		$this->_isRead($is_read);
+		$this->_isFavorite($is_favorite);
+		$this->_feed($feed);
+		$this->_tags(preg_split('/[\s#]/', $tags));
 	}
 
-	public function id () {
+	public function id() {
 		return $this->id;
 	}
-	public function guid () {
+	public function guid() {
 		return $this->guid;
 	}
-	public function title () {
+	public function title() {
 		return $this->title;
 	}
-	public function author () {
+	public function author() {
 		return $this->author === null ? '' : $this->author;
 	}
-	public function content () {
+	public function content() {
 		return $this->content;
 	}
-	public function link () {
+	public function link() {
 		return $this->link;
 	}
-	public function date ($raw = false) {
+	public function date($raw = false) {
 		if ($raw) {
 			return $this->date;
 		} else {
-			return timestamptodate ($this->date);
+			return timestamptodate($this->date);
 		}
 	}
-	public function dateAdded ($raw = false) {
+	public function dateAdded($raw = false) {
 		$date = intval(substr($this->id, 0, -6));
 		if ($raw) {
 			return $date;
 		} else {
-			return timestamptodate ($date);
+			return timestamptodate($date);
 		}
 	}
-	public function isRead () {
+	public function isRead() {
 		return $this->is_read;
 	}
-	public function isFavorite () {
+	public function isFavorite() {
 		return $this->is_favorite;
 	}
-	public function feed ($object = false) {
+	public function feed($object = false) {
 		if ($object) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-			return $feedDAO->searchById ($this->feed);
+			return $feedDAO->searchById($this->feed);
 		} else {
 			return $this->feed;
 		}
 	}
-	public function tags ($inString = false) {
+	public function tags($inString = false) {
 		if ($inString) {
-			return empty ($this->tags) ? '' : '#' . implode(' #', $this->tags);
+			return empty($this->tags) ? '' : '#' . implode(' #', $this->tags);
 		} else {
 			return $this->tags;
 		}
 	}
 
-	public function _id ($value) {
+	public function _id($value) {
 		$this->id = $value;
 	}
-	public function _guid ($value) {
+	public function _guid($value) {
 		$this->guid = $value;
 	}
-	public function _title ($value) {
+	public function _title($value) {
 		$this->title = $value;
 	}
-	public function _author ($value) {
+	public function _author($value) {
 		$this->author = $value;
 	}
-	public function _content ($value) {
+	public function _content($value) {
 		$this->content = $value;
 	}
-	public function _link ($value) {
+	public function _link($value) {
 		$this->link = $value;
 	}
-	public function _date ($value) {
+	public function _date($value) {
 		$value = intval($value);
 		$this->date = $value > 1 ? $value : time();
 	}
-	public function _isRead ($value) {
+	public function _isRead($value) {
 		$this->is_read = $value;
 	}
-	public function _isFavorite ($value) {
+	public function _isFavorite($value) {
 		$this->is_favorite = $value;
 	}
-	public function _feed ($value) {
+	public function _feed($value) {
 		$this->feed = $value;
 	}
-	public function _tags ($value) {
-		if (!is_array ($value)) {
-			$value = array ($value);
+	public function _tags($value) {
+		if (!is_array($value)) {
+			$value = array($value);
 		}
 
 		foreach ($value as $key => $t) {
 			if (!$t) {
-				unset ($value[$key]);
+				unset($value[$key]);
 			}
 		}
 
 		$this->tags = $value;
 	}
 
-	public function isDay ($day, $today) {
+	public function isDay($day, $today) {
 		$date = $this->dateAdded(true);
 		switch ($day) {
-			case FreshRSS_Days::TODAY:
-				$tomorrow = $today + 86400;
-				return $date >= $today && $date < $tomorrow;
-			case FreshRSS_Days::YESTERDAY:
-				$yesterday = $today - 86400;
-				return $date >= $yesterday && $date < $today;
-			case FreshRSS_Days::BEFORE_YESTERDAY:
-				$yesterday = $today - 86400;
-				return $date < $yesterday;
-			default:
-				return false;
+		case FreshRSS_Days::TODAY:
+			$tomorrow = $today + 86400;
+			return $date >= $today && $date < $tomorrow;
+		case FreshRSS_Days::YESTERDAY:
+			$yesterday = $today - 86400;
+			return $date >= $yesterday && $date < $today;
+		case FreshRSS_Days::BEFORE_YESTERDAY:
+			$yesterday = $today - 86400;
+			return $date < $yesterday;
+		default:
+			return false;
 		}
 	}
 
@@ -158,7 +158,7 @@ class FreshRSS_Entry extends Minz_Model {
 			$entryDAO = FreshRSS_Factory::createEntryDao();
 			$entry = $entryDAO->searchByGuid($this->feed, $this->guid);
 
-			if($entry) {
+			if ($entry) {
 				// l'article existe déjà en BDD, en se contente de recharger ce contenu
 				$this->content = $entry->content();
 			} else {
@@ -168,25 +168,25 @@ class FreshRSS_Entry extends Minz_Model {
 						htmlspecialchars_decode($this->link(), ENT_QUOTES), $pathEntries
 					);
 				} catch (Exception $e) {
-					// rien à faire, on garde l'ancien contenu (requête a échoué)
+					// rien à faire, on garde l'ancien contenu(requête a échoué)
 				}
 			}
 		}
 	}
 
-	public function toArray () {
-		return array (
-			'id' => $this->id (),
-			'guid' => $this->guid (),
-			'title' => $this->title (),
-			'author' => $this->author (),
-			'content' => $this->content (),
-			'link' => $this->link (),
-			'date' => $this->date (true),
-			'is_read' => $this->isRead (),
-			'is_favorite' => $this->isFavorite (),
-			'id_feed' => $this->feed (),
-			'tags' => $this->tags (true),
+	public function toArray() {
+		return array(
+			'id' => $this->id(),
+			'guid' => $this->guid(),
+			'title' => $this->title(),
+			'author' => $this->author(),
+			'content' => $this->content(),
+			'link' => $this->link(),
+			'date' => $this->date(true),
+			'is_read' => $this->isRead(),
+			'is_favorite' => $this->isFavorite(),
+			'id_feed' => $this->feed(),
+			'tags' => $this->tags(true),
 		);
 	}
 }
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 751ee6da7..34717123c 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -307,27 +307,27 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		$joinFeed = false;
 		$values = array();
 		switch ($type) {
-			case 'a':
-				$where .= 'f.priority > 0 ';
-				$joinFeed = true;
-				break;
-			case 's':	//Deprecated: use $state instead
-				$where .= 'e1.is_favorite=1 ';
-				break;
-			case 'c':
-				$where .= 'f.category=? ';
-				$values[] = intval($id);
-				$joinFeed = true;
-				break;
-			case 'f':
-				$where .= 'e1.id_feed=? ';
-				$values[] = intval($id);
-				break;
-			case 'A':
-				$where .= '1 ';
-				break;
-			default:
-				throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!');
+		case 'a':
+			$where .= 'f.priority > 0 ';
+			$joinFeed = true;
+			break;
+		case 's':	//Deprecated: use $state instead
+			$where .= 'e1.is_favorite=1 ';
+			break;
+		case 'c':
+			$where .= 'f.category=? ';
+			$values[] = intval($id);
+			$joinFeed = true;
+			break;
+		case 'f':
+			$where .= 'e1.id_feed=? ';
+			$values[] = intval($id);
+			break;
+		case 'A':
+			$where .= '1 ';
+			break;
+		default:
+			throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!');
 		}
 
 		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
diff --git a/app/Models/Log.php b/app/Models/Log.php
index d2794458b..df2de72ac 100644
--- a/app/Models/Log.php
+++ b/app/Models/Log.php
@@ -5,22 +5,22 @@ class FreshRSS_Log extends Minz_Model {
 	private $level;
 	private $information;
 
-	public function date () {
+	public function date() {
 		return $this->date;
 	}
-	public function level () {
+	public function level() {
 		return $this->level;
 	}
-	public function info () {
+	public function info() {
 		return $this->information;
 	}
-	public function _date ($date) {
+	public function _date($date) {
 		$this->date = $date;
 	}
-	public function _level ($level) {
+	public function _level($level) {
 		$this->level = $level;
 	}
-	public function _info ($information) {
+	public function _info($information) {
 		$this->information = $information;
 	}
 }
diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
index d1e515200..21593435d 100644
--- a/app/Models/LogDAO.php
+++ b/app/Models/LogDAO.php
@@ -2,15 +2,15 @@
 
 class FreshRSS_LogDAO {
 	public static function lines() {
-		$logs = array ();
+		$logs = array();
 		$handle = @fopen(LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log', 'r');
 		if ($handle) {
 			while (($line = fgets($handle)) !== false) {
-				if (preg_match ('/^\[([^\[]+)\] \[([^\[]+)\] --- (.*)$/', $line, $matches)) {
+				if (preg_match('/^\[([^\[]+)\] \[([^\[]+)\] --- (.*)$/', $line, $matches)) {
 					$myLog = new FreshRSS_Log ();
-					$myLog->_date ($matches[1]);
-					$myLog->_level ($matches[2]);
-					$myLog->_info ($matches[3]);
+					$myLog->_date($matches[1]);
+					$myLog->_level($matches[2]);
+					$myLog->_info($matches[3]);
 					$logs[] = $myLog;
 				}
 			}
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 113944508..99d4e2148 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -415,7 +415,7 @@ SQL;
 	 * @return string
 	 */
 	private function convertToTranslatedJson($data = array()) {
-		$translated = array_map(function ($a) {
+		$translated = array_map(function($a) {
 			return _t($a);
 		}, $data);
 

From 65ab90d3c77085abe9eb259bd7780f648051d49d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 19:11:43 +0200
Subject: [PATCH 056/363] Coding style (views)

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/FreshRSS.php                         | 24 +++++-----
 app/views/configure/display.phtml        |  8 ++--
 app/views/configure/sharing.phtml        |  6 +--
 app/views/entry/bookmark.phtml           | 16 +++----
 app/views/entry/read.phtml               | 16 +++----
 app/views/helpers/feed/update.phtml      | 40 ++++++++--------
 app/views/helpers/logs_pagination.phtml  | 16 +++----
 app/views/helpers/view/global_view.phtml | 16 +++----
 app/views/helpers/view/normal_view.phtml | 60 ++++++++++++------------
 app/views/helpers/view/reader_view.phtml | 14 +++---
 app/views/helpers/view/rss_view.phtml    | 14 +++---
 app/views/index/index.phtml              | 18 +++----
 app/views/index/login.phtml              |  2 +-
 app/views/index/logs.phtml               | 14 +++---
 app/views/stats/index.phtml              | 34 +++++++-------
 app/views/users/index.phtml              |  2 +-
 16 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 16f64fd8b..61e8d83f0 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -88,7 +88,7 @@ class FreshRSS extends Minz_FrontController {
 
 		try {
 			$this->conf = new FreshRSS_Configuration($currentUser);
-			Minz_View::_param ('conf', $this->conf);
+			Minz_View::_param('conf', $this->conf);
 			Minz_Session::_param('currentUser', $currentUser);
 		} catch (Minz_Exception $me) {
 			$loginOk = false;
@@ -100,8 +100,8 @@ class FreshRSS extends Minz_FrontController {
 					'type' => 'bad',
 					'content' => 'Invalid configuration for user [' . $currentUser . ']!',
 				);
-				Minz_Session::_param ('notification', $notif);
-				Minz_Log::record ($notif['content'] . ' ' . $me->getMessage(), Minz_Log::WARNING);
+				Minz_Session::_param('notification', $notif);
+				Minz_Log::record($notif['content'] . ' ' . $me->getMessage(), Minz_Log::WARNING);
 				Minz_Session::_param('currentUser', '');
 			} catch (Exception $e) {
 				die($e->getMessage());
@@ -130,13 +130,13 @@ class FreshRSS extends Minz_FrontController {
 		return $loginOk;
 	}
 
-	private function loadParamsView () {
-		Minz_Session::_param ('language', $this->conf->language);
+	private function loadParamsView() {
+		Minz_Session::_param('language', $this->conf->language);
 		Minz_Translate::init();
-		$output = Minz_Request::param ('output', '');
+		$output = Minz_Request::param('output', '');
 		if (($output === '') || ($output !== 'normal' && $output !== 'rss' && $output !== 'reader' && $output !== 'global')) {
 			$output = $this->conf->view_mode;
-			Minz_Request::_param ('output', $output);
+			Minz_Request::_param('output', $output);
 		}
 	}
 
@@ -161,7 +161,7 @@ class FreshRSS extends Minz_FrontController {
 		switch (Minz_Configuration::authType()) {
 			case 'form':
 				if (!$loginOk) {
-					Minz_View::appendScript(Minz_Url::display ('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')));
+					Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')));
 				}
 				break;
 			case 'persona':
@@ -173,11 +173,11 @@ class FreshRSS extends Minz_FrontController {
 		Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
 	}
 
-	private function loadNotifications () {
-		$notif = Minz_Session::param ('notification');
+	private function loadNotifications() {
+		$notif = Minz_Session::param('notification');
 		if ($notif) {
-			Minz_View::_param ('notification', $notif);
-			Minz_Session::_param ('notification');
+			Minz_View::_param('notification', $notif);
+			Minz_Session::_param('notification');
 		}
 	}
 
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 34239c7b2..1614bd56b 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -1,16 +1,16 @@
-<?php $this->partial ('aside_configure'); ?>
+<?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url ('configure', 'display'); ?>">
+	<form method="post" action="<?php echo _url('configure', 'display'); ?>">
 		<legend><?php echo _t('display_configuration'); ?></legend>
 
 		<div class="form-group">
 			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php $languages = $this->conf->availableLanguages (); ?>
+				<?php $languages = $this->conf->availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
 				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 5f657ca74..09c1e6f40 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -1,9 +1,9 @@
-<?php $this->partial ('aside_configure'); ?>
+<?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
+	<form method="post" action="<?php echo _url('configure', 'sharing'); ?>"
 		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a>
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" /></div></div>'
 		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
diff --git a/app/views/entry/bookmark.phtml b/app/views/entry/bookmark.phtml
index ab61fa206..c346d2c4c 100755
--- a/app/views/entry/bookmark.phtml
+++ b/app/views/entry/bookmark.phtml
@@ -1,16 +1,16 @@
 <?php
 header('Content-Type: application/json; charset=UTF-8');
 
-if (Minz_Request::param ('is_favorite', true)) {
-	Minz_Request::_param ('is_favorite', 0);
+if (Minz_Request::param('is_favorite', true)) {
+	Minz_Request::_param('is_favorite', 0);
 } else {
-	Minz_Request::_param ('is_favorite', 1);
+	Minz_Request::_param('is_favorite', 1);
 }
 
-$url = Minz_Url::display (array (
-	'c' => Minz_Request::controllerName (),
-	'a' => Minz_Request::actionName (),
-	'params' => Minz_Request::params (),
+$url = Minz_Url::display(array(
+	'c' => Minz_Request::controllerName(),
+	'a' => Minz_Request::actionName(),
+	'params' => Minz_Request::params(),
 ));
 
-echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => _i(Minz_Request::param ('is_favorite') ? 'non-starred' : 'starred')));
+echo json_encode(array('url' => str_ireplace('&amp;', '&', $url), 'icon' => _i(Minz_Request::param('is_favorite') ? 'non-starred' : 'starred')));
diff --git a/app/views/entry/read.phtml b/app/views/entry/read.phtml
index 0ef9df7eb..fabdec9e0 100755
--- a/app/views/entry/read.phtml
+++ b/app/views/entry/read.phtml
@@ -1,16 +1,16 @@
 <?php
 header('Content-Type: application/json; charset=UTF-8');
 
-if (Minz_Request::param ('is_read', true)) {
-	Minz_Request::_param ('is_read', 0);
+if (Minz_Request::param('is_read', true)) {
+	Minz_Request::_param('is_read', 0);
 } else {
-	Minz_Request::_param ('is_read', 1);
+	Minz_Request::_param('is_read', 1);
 }
 
-$url = Minz_Url::display (array (
-	'c' => Minz_Request::controllerName (),
-	'a' => Minz_Request::actionName (),
-	'params' => Minz_Request::params (),
+$url = Minz_Url::display(array(
+	'c' => Minz_Request::controllerName(),
+	'a' => Minz_Request::actionName(),
+	'params' => Minz_Request::params(),
 ));
 
-echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => _i(Minz_Request::param ('is_read') ? 'unread' : 'read')));
+echo json_encode(array('url' => str_ireplace('&amp;', '&', $url), 'icon' => _i(Minz_Request::param('is_read') ? 'unread' : 'read')));
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 9235752c3..d79ef2666 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -1,28 +1,28 @@
 <div class="post">
-	<h1><?php echo $this->feed->name (); ?></h1>
+	<h1><?php echo $this->feed->name(); ?></h1>
 
 	<div>
-		<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id ()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
+		<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
 		<?php echo _t('or'); ?>
 		<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>"><?php echo _i('stats'); ?> <?php echo _t('stats'); ?></a>
 	</div>
 
-	<p><?php echo $this->feed->description (); ?></p>
+	<p><?php echo $this->feed->description(); ?></p>
 
-	<?php $nbEntries = $this->feed->nbEntries (); ?>
+	<?php $nbEntries = $this->feed->nbEntries(); ?>
 
-	<?php if ($this->feed->inError ()) { ?>
+	<?php if ($this->feed->inError()) { ?>
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('feed_in_error'); ?></p>
 	<?php } elseif ($nbEntries === 0) { ?>
 	<p class="alert alert-warn"><?php echo _t('feed_empty'); ?></p>
 	<?php } ?>
 
-	<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->feed->id ()); ?>" autocomplete="off">
+	<form method="post" action="<?php echo _url('subscription', 'feed', 'id', $this->feed->id()); ?>" autocomplete="off">
 		<legend><?php echo _t('informations'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="name"><?php echo _t('title'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name () ; ?>" />
+				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name() ; ?>" />
 			</div>
 		</div>
 		<div class="form-group">
@@ -35,8 +35,8 @@
 			<label class="group-name" for="website"><?php echo _t('website_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
-					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo _i('link'); ?></a>
+					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website(); ?>" />
+					<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo _i('link'); ?></a>
 				</div>
 			</div>
 		</div>
@@ -44,11 +44,11 @@
 			<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
-					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo _i('link'); ?></a>
+					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
+					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo _i('link'); ?></a>
 				</div>
 
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo _t('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('feed_validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
@@ -56,8 +56,8 @@
 			<div class="group-controls">
 				<select name="category" id="category">
 				<?php foreach ($this->categories as $cat) { ?>
-				<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->feed->category () ? ' selected="selected"' : ''; ?>>
-					<?php echo $cat->name (); ?>
+				<option value="<?php echo $cat->id(); ?>"<?php echo $cat->id()== $this->feed->category() ? ' selected="selected"' : ''; ?>>
+					<?php echo $cat->name(); ?>
 				</option>
 				<?php } ?>
 				</select>
@@ -67,7 +67,7 @@
 			<label class="group-name" for="priority"><?php echo _t('show_in_all_flux'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="priority">
-					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority () > 0 ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority() > 0 ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('yes'); ?>
 				</label>
 			</div>
@@ -78,7 +78,7 @@
 				<button class="btn btn-important"><?php echo _t('save'); ?></button>
 				<button class="btn btn-attention confirm"
 				        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-				        formaction="<?php echo _url('feed', 'delete', 'id', $this->feed->id ()); ?>"
+				        formaction="<?php echo _url('feed', 'delete', 'id', $this->feed->id()); ?>"
 				        formmethod="post"><?php echo _t('delete'); ?></button>
 			</div>
 		</div>
@@ -89,7 +89,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" value="<?php echo _t('number_articles', $nbEntries); ?>" disabled="disabled" />
-					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->feed->id ()); ?>">
+					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->feed->id()); ?>">
 						<?php echo _i('refresh'); ?> <?php echo _t('actualize'); ?>
 					</a>
 				</div>
@@ -129,12 +129,12 @@
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo _t('truncate'); ?></button>
+				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo _url('feed', 'truncate', 'id', $this->feed->id()); ?>"><?php echo _t('truncate'); ?></button>
 			</div>
 		</div>
 
 		<legend><?php echo _t('login_configuration'); ?></legend>
-		<?php $auth = $this->feed->httpAuth (false); ?>
+		<?php $auth = $this->feed->httpAuth(false); ?>
 		<div class="form-group">
 			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
 			<div class="group-controls">
@@ -159,7 +159,7 @@
 		<div class="form-group">
 			<label class="group-name" for="path_entries"><?php echo _t('css_path_on_website'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
+				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries(); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
 				<?php echo _i('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
 			</div>
 		</div>
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
index 191cfa8de..ad46279c7 100755
--- a/app/views/helpers/logs_pagination.phtml
+++ b/app/views/helpers/logs_pagination.phtml
@@ -1,7 +1,7 @@
 <?php
-	$c = Minz_Request::controllerName ();
-	$a = Minz_Request::actionName ();
-	$params = Minz_Request::params ();
+	$c = Minz_Request::controllerName();
+	$a = Minz_Request::actionName();
+	$params = Minz_Request::params();
 ?>
 
 <?php if ($this->nbPage > 1) { ?>
@@ -9,14 +9,14 @@
 	<?php $params[$getteur] = 1; ?>
 	<li class="item pager-first">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('first'); ?></a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('first'); ?></a>
 		<?php } ?>
 	</li>
 
 	<?php $params[$getteur] = $this->currentPage - 1; ?>
 	<li class="item pager-previous">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('previous'); ?></a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('previous'); ?></a>
 		<?php } ?>
 	</li>
 
@@ -24,7 +24,7 @@
 		<?php if($i > 0 && $i <= $this->nbPage) { ?>
 			<?php if ($i != $this->currentPage) { ?>
 			<?php $params[$getteur] = $i; ?>
-			<li class="item pager-item"><a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo $i; ?></a></li>
+			<li class="item pager-item"><a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo $i; ?></a></li>
 			<?php } else { ?>
 			<li class="item pager-current"><?php echo $i; ?></li>
 			<?php } ?>
@@ -34,13 +34,13 @@
 	<?php $params[$getteur] = $this->currentPage + 1; ?>
 	<li class="item pager-next">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('next'); ?> ›</a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('next'); ?> ›</a>
 		<?php } ?>
 	</li>
 	<?php $params[$getteur] = $this->nbPage; ?>
 	<li class="item pager-last">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('last'); ?> »</a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('last'); ?> »</a>
 		<?php } ?>
 	</li>
 </ul>
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index 0e553c957..2bac09d04 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -1,4 +1,4 @@
-<?php $this->partial ('nav_menu'); ?>
+<?php $this->partial('nav_menu'); ?>
 
 <?php if (!empty($this->entries)) { ?>
 <div id="stream" class="global categories">
@@ -13,21 +13,21 @@
 	}
 
 	foreach ($this->cat_aside as $cat) {
-		$feeds = $cat->feeds ();
-		if (!empty ($feeds)) {
+		$feeds = $cat->feeds();
+		if (!empty($feeds)) {
 ?>
 	<div class="box-category">
 		<div class="category">
-			<a data-unread="<?php echo formatNumber($cat->nbNotRead()); ?>" class="btn" href="<?php $arUrl['params']['get'] = 'c_' . $cat->id (); echo Minz_Url::display($arUrl); ?>">
+			<a data-unread="<?php echo formatNumber($cat->nbNotRead()); ?>" class="btn" href="<?php $arUrl['params']['get'] = 'c_' . $cat->id(); echo Minz_Url::display($arUrl); ?>">
 			<?php echo $cat->name(); ?>
 			</a>
 		</div>
 		<ul class="feeds">
 			<?php foreach ($feeds as $feed) { ?>
-			<?php $not_read = $feed->nbNotRead (); ?>
-			<li id="f_<?php echo $feed->id (); ?>" class="item<?php echo $feed->inError () ? ' error' : ''; ?><?php echo $feed->nbEntries () == 0 ? ' empty' : ''; ?>">
-				<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" />
-				<a class="feed" data-unread="<?php echo formatNumber($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority (); ?>" href="<?php $arUrl['params']['get'] = 'f_' . $feed->id(); echo Minz_Url::display($arUrl); ?>">
+			<?php $not_read = $feed->nbNotRead(); ?>
+			<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() == 0 ? ' empty' : ''; ?>">
+				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
+				<a class="feed" data-unread="<?php echo formatNumber($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php $arUrl['params']['get'] = 'f_' . $feed->id(); echo Minz_Url::display($arUrl); ?>">
 				<?php echo $feed->name(); ?>
 				</a>
 			</li>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 66b79cd7f..109fad0eb 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -1,7 +1,7 @@
 <?php
 
-$this->partial ('aside_flux');
-$this->partial ('nav_menu');
+$this->partial('aside_flux');
+$this->partial('nav_menu');
 
 if (!empty($this->entries)) {
 	$display_today = true;
@@ -30,72 +30,72 @@ if (!empty($this->entries)) {
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
 	?><div id="new-article">
-		<a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo _t('new_article'); ?></a>
+		<a href="<?php echo Minz_Url::display($this->url); ?>"><?php echo _t('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
-		if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) {
+		if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $this->today)) {
 			?><div class="day" id="day_today"><?php
 				echo _t('today');
-				?><span class="date"> — <?php echo timestamptodate (time (), false); ?></span><?php
+				?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
 			$display_today = false;
 		}
-		if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $this->today)) {
+		if ($display_yesterday && $item->isDay(FreshRSS_Days::YESTERDAY, $this->today)) {
 			?><div class="day" id="day_yesterday"><?php
 				echo _t('yesterday');
-				?><span class="date"> — <?php echo timestamptodate (time () - 86400, false); ?></span><?php
+				?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
 			$display_yesterday = false;
 		}
-		if ($display_others && $item->isDay (FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
+		if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
 			?><div class="day" id="day_before_yesterday"><?php
 				echo _t('before_yesterday');
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
 			$display_others = false;
 		}
-	?><div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
+	?><div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
 		<ul class="horizontal-list flux_header"><?php
 			if ($this->loginOk) {
 				if ($topline_read) {
 					?><li class="item manage"><?php
-						$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id ()));
+						$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
 						if ($item->isRead()) {
 							$arUrl['params']['is_read'] = 0;
 						}
 						?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
+							echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
 					?></li><?php
 				}
 				if ($topline_favorite) {
 					?><li class="item manage"><?php
-						$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id ()));
+						$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
 						if ($item->isFavorite()) {
 							$arUrl['params']['is_favorite'] = 0;
 						}
 						?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
+							echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
 					?></li><?php
 				}
 			}
-			$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ());	//We most likely already have the feed object in cache
+			$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed());	//We most likely already have the feed object in cache
 			if ($feed == null) {
 				$feed = $item->feed(true);
 				if ($feed == null) {
 					$feed = FreshRSS_Feed::example();
 				}
 			}
-			?><li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
-			<li class="item title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li>
-			<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
-			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
+			?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
+			<li class="item title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></li>
+			<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date(); ?> </li><?php } ?>
+			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
 		</ul>
 
 		<div class="flux_content">
 			<div class="content <?php echo $content_width; ?>">
-				<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></h1>
+				<h1 class="title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></h1>
 				<?php
 					$author = $item->author();
 					echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
@@ -106,32 +106,32 @@ if (!empty($this->entries)) {
 				if ($this->loginOk) {
 					if ($bottomline_read) {
 						?><li class="item manage"><?php
-							$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id ()));
+							$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
 							if ($item->isRead()) {
 								$arUrl['params']['is_read'] = 0;
 							}
 							?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
+								echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
 						?></li><?php
 					}
 					if ($bottomline_favorite) {
 						?><li class="item manage"><?php
-							$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id ()));
+							$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
 							if ($item->isFavorite()) {
 								$arUrl['params']['is_favorite'] = 0;
 							}
 							?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
+								echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
 						?></li><?php
 					}
 				} ?>
 				<li class="item"><?php
 						if ($bottomline_sharing) {
-							$link = urlencode ($item->link ());
-							$title = urlencode ($item->title () . ' · ' . $feed->name ());
+							$link = urlencode($item->link());
+							$title = urlencode($item->title() . ' · ' . $feed->name());
 					?><div class="dropdown">
-						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
-						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
+						<div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
+						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
 							<?php echo _i('share'); ?>
 							<?php echo _t('share'); ?>
 						</a>
@@ -168,10 +168,10 @@ if (!empty($this->entries)) {
 				</li><?php
 				}
 				if ($bottomline_date) {
-					?><li class="item date"><?php echo $item->date (); ?></li><?php
+					?><li class="item date"><?php echo $item->date(); ?></li><?php
 				}
 				if ($bottomline_link) {
-					?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php
+					?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
@@ -181,7 +181,7 @@ if (!empty($this->entries)) {
 	<?php $this->renderHelper('pagination'); ?>
 </div>
 
-<?php $this->partial ('nav_entries'); ?>
+<?php $this->partial('nav_entries'); ?>
 
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn normal">
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index 368bf7fdc..894c71924 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -1,5 +1,5 @@
 <?php
-$this->partial ('nav_menu');
+$this->partial('nav_menu');
 
 if (!empty($this->entries)) {
 	$lazyload = $this->conf->lazyload;
@@ -9,17 +9,17 @@ if (!empty($this->entries)) {
 <div id="stream" class="reader">
 	<?php foreach ($this->entries as $item) { ?>
 
-	<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
+	<div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
 		<div class="flux_content">
 			<div class="content <?php echo $content_width; ?>">
 				<?php
-					$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ());	//We most likely already have the feed object in cache
-					if (empty($feed)) $feed = $item->feed (true);
+					$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed());	//We most likely already have the feed object in cache
+					if (empty($feed)) $feed = $item->feed(true);
 				?>
-				<a href="<?php echo $item->link (); ?>">
-					<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span>
+				<a href="<?php echo $item->link(); ?>">
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span>
 				</a>
-				<h1 class="title"><?php echo $item->title (); ?></h1>
+				<h1 class="title"><?php echo $item->title(); ?></h1>
 
 				<div class="author"><?php
 					$author = $item->author();
diff --git a/app/views/helpers/view/rss_view.phtml b/app/views/helpers/view/rss_view.phtml
index fd8a8af63..e34b15ab1 100755
--- a/app/views/helpers/view/rss_view.phtml
+++ b/app/views/helpers/view/rss_view.phtml
@@ -6,22 +6,22 @@
 		<description><?php echo _t('rss_feeds_of', $this->rss_title); ?></description>
 		<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
 		<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
-		<atom:link href="<?php echo Minz_Url::display ($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />
+		<atom:link href="<?php echo Minz_Url::display($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />
 <?php
 foreach ($this->entries as $item) {
 ?>
 		<item>
-			<title><?php echo $item->title (); ?></title>
-			<link><?php echo $item->link (); ?></link>
-			<?php $author = $item->author (); ?>
+			<title><?php echo $item->title(); ?></title>
+			<link><?php echo $item->link(); ?></link>
+			<?php $author = $item->author(); ?>
 			<?php if ($author != '') { ?>
 			<dc:creator><?php echo $author; ?></dc:creator>
 			<?php } ?>
 			<description><![CDATA[<?php
-	echo $item->content ();
+	echo $item->content();
 ?>]]></description>
-			<pubDate><?php echo date('D, d M Y H:i:s O', $item->date (true)); ?></pubDate>
-			<guid isPermaLink="false"><?php echo $item->id (); ?></guid>
+			<pubDate><?php echo date('D, d M Y H:i:s O', $item->date(true)); ?></pubDate>
+			<guid isPermaLink="false"><?php echo $item->id(); ?></guid>
 		</item>
 <?php } ?>
 
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 1ff36ca8e..5e935b81e 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,25 +1,25 @@
 <?php
 
-$output = Minz_Request::param ('output', 'normal');
+$output = Minz_Request::param('output', 'normal');
 
 if ($this->loginOk || Minz_Configuration::allowAnonymous()) {
 	if ($output === 'normal') {
-		$this->renderHelper ('view/normal_view');
+		$this->renderHelper('view/normal_view');
 	} elseif ($output === 'reader') {
-		$this->renderHelper ('view/reader_view');
+		$this->renderHelper('view/reader_view');
 	} elseif ($output === 'global') {
-		$this->renderHelper ('view/global_view');
+		$this->renderHelper('view/global_view');
 	} elseif ($output === 'rss') {
-		$this->renderHelper ('view/rss_view');
+		$this->renderHelper('view/rss_view');
 	} else {
-		Minz_Request::_param ('output', 'normal');
+		Minz_Request::_param('output', 'normal');
 		$output = 'normal';
-		$this->renderHelper ('view/normal_view');
+		$this->renderHelper('view/normal_view');
 	}
 } elseif ($output === 'rss') {
 	// token has already been checked in the controller so we can show the view
-	$this->renderHelper ('view/rss_view');
+	$this->renderHelper('view/rss_view');
 } else {
 	// Normally, it should not happen, but log it anyway
-	Minz_Log::record ('Something is wrong in ' . __FILE__ . ' line ' . __LINE__, Minz_Log::ERROR);
+	Minz_Log::record('Something is wrong in ' . __FILE__ . ' line ' . __LINE__, Minz_Log::ERROR);
 }
diff --git a/app/views/index/login.phtml b/app/views/index/login.phtml
index cc814deff..79fbe9d21 100644
--- a/app/views/index/login.phtml
+++ b/app/views/index/login.phtml
@@ -1 +1 @@
-<?php print_r ($this->res); ?>
+<?php print_r($this->res); ?>
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 18629ed9e..101692daf 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -1,23 +1,23 @@
 <div class="post content">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<h1><?php echo _t('logs'); ?></h1>
-	<form method="post" action="<?php echo _url ('index', 'logs'); ?>"><p>
+	<form method="post" action="<?php echo _url('index', 'logs'); ?>"><p>
 		<input type="hidden" name="clearLogs" />
 		<button type="submit" class="btn"><?php echo _t('clear_logs'); ?></button>
 	</p></form>
 
-	<?php $items = $this->logsPaginator->items (); ?>
+	<?php $items = $this->logsPaginator->items(); ?>
 
-	<?php if (!empty ($items)) { ?>
+	<?php if (!empty($items)) { ?>
 	<div class="logs">
-		<?php $this->logsPaginator->render ('logs_pagination.phtml', 'page'); ?>
+		<?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?>
 
 		<?php foreach ($items as $log) { ?>
-		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo @date ('Y-m-d H:i:s', @strtotime ($log->date ())); ?></span><?php echo htmlspecialchars ($log->info (), ENT_NOQUOTES, 'UTF-8'); ?></div>
+		<div class="log <?php echo $log->level(); ?>"><span class="date"><?php echo @date('Y-m-d H:i:s', @strtotime($log->date())); ?></span><?php echo htmlspecialchars($log->info(), ENT_NOQUOTES, 'UTF-8'); ?></div>
 		<?php } ?>
 
-		<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
+		<?php $this->logsPaginator->render('logs_pagination.phtml','page'); ?>
 	</div>
 	<?php } else { ?>
 	<p class="alert alert-warn"><?php echo _t('logs_empty'); ?></p>
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index fa57a77c0..ba4258b71 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -1,38 +1,38 @@
 <?php $this->partial('aside_stats'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t ('stats_main'); ?></h1>
+	<h1><?php echo _t('stats_main'); ?></h1>
 
 	<div class="stat half">
-		<h2><?php echo _t ('stats_entry_repartition'); ?></h2>
+		<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>
+					<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>
+					<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>
+					<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>
+					<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>
+					<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>
@@ -41,14 +41,14 @@
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t ('stats_top_feed'); ?></h2>
+		<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>
-					<th><?php echo _t ('stats_percent_of_total'); ?></th>
+					<th><?php echo _t('feed'); ?></th>
+					<th><?php echo _t('category'); ?></th>
+					<th><?php echo _t('stats_entry_count'); ?></th>
+					<th><?php echo _t('stats_percent_of_total'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -65,18 +65,18 @@
 	</div>
 
 	<div class="stat">
-		<h2><?php echo _t ('stats_entry_per_day'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_day'); ?></h2>
 		<div id="statsEntryPerDay" style="height: 300px"></div>
 	</div>
 
 	<div class="stat half">
-		<h2><?php echo _t ('stats_feed_per_category'); ?></h2>
+		<h2><?php echo _t('stats_feed_per_category'); ?></h2>
 		<div id="statsFeedPerCategory" style="height: 300px"></div>
 		<div id="statsFeedPerCategoryLegend"></div>
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t ('stats_entry_per_category'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_category'); ?></h2>
 		<div id="statsEntryPerCategory" style="height: 300px"></div>
 		<div id="statsEntryPerCategoryLegend"></div>
 	</div>
diff --git a/app/views/users/index.phtml b/app/views/users/index.phtml
index 517e302e5..95659f727 100644
--- a/app/views/users/index.phtml
+++ b/app/views/users/index.phtml
@@ -164,7 +164,7 @@
 			<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
-				<?php $languages = $this->conf->availableLanguages (); ?>
+				<?php $languages = $this->conf->availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
 				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>

From aa8529b2d617137cc7500742090e5bb2246b8928 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 19:12:52 +0200
Subject: [PATCH 057/363] Coding style (views)

Some files was not saved :s

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/views/configure/reading.phtml       | 6 +++---
 app/views/helpers/javascript_vars.phtml | 2 +-
 app/views/index/about.phtml             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 7e4efc264..c8685acf3 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -1,9 +1,9 @@
-<?php $this->partial ('aside_configure'); ?>
+<?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url ('configure', 'reading'); ?>">
+	<form method="post" action="<?php echo _url('configure', 'reading'); ?>">
 		<legend><?php echo _t('reading_configuration'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index cdbf24eab..8f615ed87 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -2,7 +2,7 @@
 <?php
 
 $mark = $this->conf->mark_when;
-$mail = Minz_Session::param ('mail', false);
+$mail = Minz_Session::param('mail', false);
 $auto_actualize = Minz_Session::param('actualize_feeds', false);
 $hide_posts = ($this->conf->display_posts ||
                Minz_Request::param('output') === 'reader');
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index 14c6455b6..407d13ae9 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -1,5 +1,5 @@
 <div class="post content">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<h1><?php echo _t('about_freshrss'); ?></h1>
 

From d8f4681382986524b91acb0500847e9f24badf20 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 19:35:29 +0200
Subject: [PATCH 058/363] Replace Minz_Log::record by corresponding methods

Please not use Minz_Log::record anymore!

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/entryController.php      |  2 +-
 app/Controllers/feedController.php       | 14 +++++------
 app/Controllers/indexController.php      | 20 ++++++++--------
 app/Controllers/javascriptController.php |  2 +-
 app/FreshRSS.php                         |  2 +-
 app/Models/CategoryDAO.php               |  6 ++---
 app/Models/EntryDAO.php                  | 30 ++++++++++++------------
 app/Models/EntryDAOSQLite.php            | 14 +++++------
 app/Models/FeedDAO.php                   | 20 ++++++++--------
 app/Models/FeedDAOSQLite.php             |  2 +-
 app/Models/UserDAO.php                   |  4 ++--
 app/views/index/index.phtml              |  2 +-
 lib/Minz/FrontController.php             |  4 ++--
 lib/Minz/View.php                        | 12 +++-------
 p/api/greader.php                        |  6 ++---
 p/i/index.php                            |  2 +-
 16 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index ec90666ed..d7be05663 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -143,7 +143,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 				$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feedHistory);
 				if ($nb > 0) {
 					$nbTotal += $nb;
-					Minz_Log::record($nb . ' old entries cleaned in feed [' . $feed->url() . ']', Minz_Log::DEBUG);
+					Minz_Log::debug($nb . ' old entries cleaned in feed [' . $feed->url() . ']');
 					//$feedDAO->updateLastUpdate($feed->id());
 				}
 			}
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 93a8d7c2e..70d5c4e22 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -140,14 +140,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					}
 				}
 			} catch (FreshRSS_BadUrl_Exception $e) {
-				Minz_Log::record($e->getMessage(), Minz_Log::WARNING);
+				Minz_Log::warning($e->getMessage());
 				$notif = array(
 					'type' => 'bad',
 					'content' => _t('invalid_url', $url)
 				);
 				Minz_Session::_param('notification', $notif);
 			} catch (FreshRSS_Feed_Exception $e) {
-				Minz_Log::record($e->getMessage(), Minz_Log::WARNING);
+				Minz_Log::warning($e->getMessage());
 				$notif = array(
 					'type' => 'bad',
 					'content' => _t('internal_problem_feed',
@@ -156,7 +156,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Session::_param('notification', $notif);
 			} catch (Minz_FileNotExistException $e) {
 				// Répertoire de cache n'existe pas
-				Minz_Log::record($e->getMessage(), Minz_Log::ERROR);
+				Minz_Log::error($e->getMessage());
 				$notif = array(
 					'type' => 'bad',
 					'content' => _t('internal_problem_feed',
@@ -258,7 +258,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			if (!$feed->lock()) {
-				Minz_Log::record('Feed already being actualized: ' . $feed->url(), Minz_Log::NOTICE);
+				Minz_Log::notice('Feed already being actualized: ' . $feed->url());
 				continue;
 			}
 			try {
@@ -307,7 +307,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					}
 					$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, max($feedHistory, count($entries) + 10));
 					if ($nb > 0) {
-						Minz_Log::record($nb . ' old entries cleaned in feed [' . $feed->url() . ']', Minz_Log::DEBUG);
+						Minz_Log::debug($nb . ' old entries cleaned in feed [' . $feed->url() . ']');
 					}
 				}
 
@@ -318,11 +318,11 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				}
 				$flux_update++;
 				if (($feed->url() !== $url)) {	//HTTP 301 Moved Permanently
-					Minz_Log::record('Feed ' . $url . ' moved permanently to ' . $feed->url(), Minz_Log::NOTICE);
+					Minz_Log::notice('Feed ' . $url . ' moved permanently to ' . $feed->url());
 					$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 				}
 			} catch (FreshRSS_Feed_Exception $e) {
-				Minz_Log::record($e->getMessage(), Minz_Log::NOTICE);
+				Minz_Log::notice($e->getMessage());
 				$feedDAO->updateLastUpdate($feed->id(), 1);
 			}
 
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 73638acb3..0d2eff700 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -59,7 +59,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$getType = $get[0];
 		$getId = substr($get, 2);
 		if (!$this->checkAndProcessType($getType, $getId)) {
-			Minz_Log::record('Not found [' . $getType . '][' . $getId . ']', Minz_Log::DEBUG);
+			Minz_Log::debug('Not found [' . $getType . '][' . $getId . ']');
 			Minz_Error::error(
 				404,
 				array('error' => array(_t('page_not_found')))
@@ -122,12 +122,12 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			// Si on a récupéré aucun article "non lus"
 			// on essaye de récupérer tous les articles
 			if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ && empty($entries) && ($state_param === null) && ($filter == '')) {
-				Minz_Log::record('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
+				Minz_Log::debug('Conflicting information about nbNotRead!');
 				$feedDAO = FreshRSS_Factory::createFeedDao();
 				try {
 					$feedDAO->updateCachedValues();
 				} catch (Exception $ex) {
-					Minz_Log::record('Failed to automatically correct nbNotRead! ' + $ex->getMessage(), Minz_Log::NOTICE);
+					Minz_Log::notice('Failed to automatically correct nbNotRead! ' + $ex->getMessage());
 				}
 				$this->view->state = FreshRSS_Entry::STATE_ALL;
 				$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter);
@@ -143,7 +143,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 			$this->view->entries = $entries;
 		} catch (FreshRSS_EntriesGetter_Exception $e) {
-			Minz_Log::record($e->getMessage(), Minz_Log::NOTICE);
+			Minz_Log::notice($e->getMessage());
 			Minz_Error::error(
 				404,
 				array('error' => array(_t('page_not_found')))
@@ -281,7 +281,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			$res = array();
 			$res['status'] = 'failure';
 			$res['reason'] = $reason == '' ? _t('invalid_login') : $reason;
-			Minz_Log::record('Persona: ' . $res['reason'], Minz_Log::WARNING);
+			Minz_Log::warning('Persona: ' . $res['reason']);
 		}
 
 		header('Content-Type: application/json; charset=UTF-8');
@@ -358,13 +358,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 							self::deleteLongTermCookie();
 						}
 					} else {
-						Minz_Log::record('Password mismatch for user ' . $username . ', nonce=' . $nonce . ', c=' . $c, Minz_Log::WARNING);
+						Minz_Log::warning('Password mismatch for user ' . $username . ', nonce=' . $nonce . ', c=' . $c);
 					}
 				} catch (Minz_Exception $me) {
-					Minz_Log::record('Login failure: ' . $me->getMessage(), Minz_Log::WARNING);
+					Minz_Log::warning('Login failure: ' . $me->getMessage());
 				}
 			} else {
-				Minz_Log::record('Invalid credential parameters: user=' . $username . ' challenge=' . $c . ' nonce=' . $nonce, Minz_Log::DEBUG);
+				Minz_Log::debug('Invalid credential parameters: user=' . $username . ' challenge=' . $c . ' nonce=' . $nonce);
 			}
 			if (!$ok) {
 				$notif = array(
@@ -395,10 +395,10 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 					Minz_Session::_param('currentUser', $username);
 					Minz_Session::_param('passwordHash', $s);
 				} else {
-					Minz_Log::record('Unsafe password mismatch for user ' . $username, Minz_Log::WARNING);
+					Minz_Log::warning('Unsafe password mismatch for user ' . $username);
 				}
 			} catch (Minz_Exception $me) {
-				Minz_Log::record('Unsafe login failure: ' . $me->getMessage(), Minz_Log::WARNING);
+				Minz_Log::warning('Unsafe login failure: ' . $me->getMessage());
 			}
 			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
 		} elseif (!Minz_Configuration::canLogIn()) {
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 2a0dbd3d9..14e6f36de 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -37,7 +37,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 					return;	//Success
 				}
 			} catch (Minz_Exception $me) {
-				Minz_Log::record('Nonce failure: ' . $me->getMessage(), Minz_Log::WARNING);
+				Minz_Log::warning('Nonce failure: ' . $me->getMessage());
 			}
 		}
 		$this->view->nonce = '';	//Failure
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 61e8d83f0..efd302ecc 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -101,7 +101,7 @@ class FreshRSS extends Minz_FrontController {
 					'content' => 'Invalid configuration for user [' . $currentUser . ']!',
 				);
 				Minz_Session::_param('notification', $notif);
-				Minz_Log::record($notif['content'] . ' ' . $me->getMessage(), Minz_Log::WARNING);
+				Minz_Log::warning($notif['content'] . ' ' . $me->getMessage());
 				Minz_Session::_param('currentUser', '');
 			} catch (Exception $e) {
 				die($e->getMessage());
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index ce1babfdd..2e333d2f1 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -13,7 +13,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error addCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error addCategory: ' . $info[2]	);
 			return false;
 		}
 	}
@@ -44,7 +44,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateCategory: ' . $info[2]);
 			return false;
 		}
 	}
@@ -59,7 +59,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error deleteCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error deleteCategory: ' . $info[2]);
 			return false;
 		}
 	}
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 34717123c..5a136499a 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -40,11 +40,11 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			if ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
-				Minz_Log::record('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title'], Minz_Log::ERROR);
+				Minz_Log::error('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
+				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
 			} /*else {
-				Minz_Log::record ('SQL error ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title'], Minz_Log::DEBUG);
+				Minz_Log::debug('SQL error ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
+				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
 			}*/
 			return false;
 		}
@@ -94,7 +94,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error markFavorite: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error markFavorite: ' . $info[2]);
 			return false;
 		}
 	}
@@ -124,7 +124,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			return true;
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateCacheUnreads: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateCacheUnreads: ' . $info[2]);
 			return false;
 		}
 	}
@@ -147,7 +147,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			$stm = $this->bd->prepare($sql);
 			if (!($stm && $stm->execute($values))) {
 				$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-				Minz_Log::record('SQL error markRead: ' . $info[2], Minz_Log::ERROR);
+				Minz_Log::error('SQL error markRead: ' . $info[2]);
 				return false;
 			}
 			$affected = $stm->rowCount();
@@ -166,7 +166,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 				return $stm->rowCount();
 			} else {
 				$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-				Minz_Log::record('SQL error markRead: ' . $info[2], Minz_Log::ERROR);
+				Minz_Log::error('SQL error markRead: ' . $info[2]);
 				return false;
 			}
 		}
@@ -175,7 +175,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			Minz_Log::record('Calling markReadEntries(0) is deprecated!', Minz_Log::DEBUG);
+			Minz_Log::debug('Calling markReadEntries(0) is deprecated!');
 		}
 
 		$sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id '
@@ -190,7 +190,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error markReadEntries: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error markReadEntries: ' . $info[2]);
 			return false;
 		}
 		$affected = $stm->rowCount();
@@ -203,7 +203,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	public function markReadCat($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			Minz_Log::record('Calling markReadCat(0) is deprecated!', Minz_Log::DEBUG);
+			Minz_Log::debug('Calling markReadCat(0) is deprecated!');
 		}
 
 		$sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id '
@@ -213,7 +213,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error markReadCat: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error markReadCat: ' . $info[2]);
 			return false;
 		}
 		$affected = $stm->rowCount();
@@ -226,7 +226,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	public function markReadFeed($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			Minz_Log::record('Calling markReadFeed(0) is deprecated!', Minz_Log::DEBUG);
+			Minz_Log::debug('Calling markReadFeed(0) is deprecated!');
 		}
 		$this->bd->beginTransaction();
 
@@ -237,7 +237,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error markReadFeed: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error markReadFeed: ' . $info[2]);
 			$this->bd->rollBack();
 			return false;
 		}
@@ -251,7 +251,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			$stm = $this->bd->prepare($sql);
 			if (!($stm && $stm->execute($values))) {
 				$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-				Minz_Log::record('SQL error markReadFeed: ' . $info[2], Minz_Log::ERROR);
+				Minz_Log::error('SQL error markReadFeed: ' . $info[2]);
 				$this->bd->rollBack();
 				return false;
 			}
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index 9dc395c3c..66078aca9 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -26,7 +26,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 			return true;
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateCacheUnreads: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateCacheUnreads: ' . $info[2]);
 			return false;
 		}
 	}
@@ -47,7 +47,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 			$stm = $this->bd->prepare($sql);
 			if (!($stm && $stm->execute($values))) {
 				$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-				Minz_Log::record('SQL error markRead 1: ' . $info[2], Minz_Log::ERROR);
+				Minz_Log::error('SQL error markRead 1: ' . $info[2]);
 				$this->bd->rollBack();
 				return false;
 			}
@@ -59,7 +59,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 				$stm = $this->bd->prepare($sql);
 				if (!($stm && $stm->execute($values))) {
 					$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-					Minz_Log::record('SQL error markRead 2: ' . $info[2], Minz_Log::ERROR);
+					Minz_Log::error('SQL error markRead 2: ' . $info[2]);
 					$this->bd->rollBack();
 					return false;
 				}
@@ -72,7 +72,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			Minz_Log::record('Calling markReadEntries(0) is deprecated!', Minz_Log::DEBUG);
+			Minz_Log::debug('Calling markReadEntries(0) is deprecated!');
 		}
 
 		$sql = 'UPDATE `' . $this->prefix . 'entry` SET is_read=1 WHERE is_read=0 AND id <= ?';
@@ -85,7 +85,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error markReadEntries: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error markReadEntries: ' . $info[2]);
 			return false;
 		}
 		$affected = $stm->rowCount();
@@ -98,7 +98,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	public function markReadCat($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			Minz_Log::record('Calling markReadCat(0) is deprecated!', Minz_Log::DEBUG);
+			Minz_Log::debug('Calling markReadCat(0) is deprecated!');
 		}
 
 		$sql = 'UPDATE `' . $this->prefix . 'entry` '
@@ -109,7 +109,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error markReadCat: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error markReadCat: ' . $info[2]);
 			return false;
 		}
 		$affected = $stm->rowCount();
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index b89ae2045..852de6e36 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -19,7 +19,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error addFeed: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error addFeed: ' . $info[2]);
 			return false;
 		}
 	}
@@ -77,7 +77,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateFeed: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateFeed: ' . $info[2]);
 			return false;
 		}
 	}
@@ -107,7 +107,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateLastUpdate: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateLastUpdate: ' . $info[2]);
 			return false;
 		}
 	}
@@ -131,7 +131,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error changeCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error changeCategory: ' . $info[2]);
 			return false;
 		}
 	}
@@ -146,7 +146,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error deleteFeed: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error deleteFeed: ' . $info[2]);
 			return false;
 		}
 	}
@@ -160,7 +160,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error deleteFeedByCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error deleteFeedByCategory: ' . $info[2]);
 			return false;
 		}
 	}
@@ -289,7 +289,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateCachedValues: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateCachedValues: ' . $info[2]);
 			return false;
 		}
 	}
@@ -301,7 +301,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		$this->bd->beginTransaction();
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error truncate: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error truncate: ' . $info[2]);
 			$this->bd->rollBack();
 			return false;
 		}
@@ -313,7 +313,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error truncate: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error truncate: ' . $info[2]);
 			$this->bd->rollBack();
 			return false;
 		}
@@ -338,7 +338,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error cleanOldEntries: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error cleanOldEntries: ' . $info[2]);
 			return false;
 		}
 	}
diff --git a/app/Models/FeedDAOSQLite.php b/app/Models/FeedDAOSQLite.php
index 0d1872389..7599fda53 100644
--- a/app/Models/FeedDAOSQLite.php
+++ b/app/Models/FeedDAOSQLite.php
@@ -11,7 +11,7 @@ class FreshRSS_FeedDAOSQLite extends FreshRSS_FeedDAO {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateCachedValues: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateCachedValues: ' . $info[2]);
 			return false;
 		}
 	}
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 0c96d7175..15215258c 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -28,7 +28,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 			return true;
 		} else {
 			$info = empty($stm) ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error : ' . $info[2]);
 			return false;
 		}
 	}
@@ -48,7 +48,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 				return true;
 			} else {
 				$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-				Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
+				Minz_Log::error('SQL error : ' . $info[2]);
 				return false;
 			}
 		}
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 5e935b81e..584792e29 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -21,5 +21,5 @@ if ($this->loginOk || Minz_Configuration::allowAnonymous()) {
 	$this->renderHelper('view/rss_view');
 } else {
 	// Normally, it should not happen, but log it anyway
-	Minz_Log::record('Something is wrong in ' . __FILE__ . ' line ' . __LINE__, Minz_Log::ERROR);
+	Minz_Log::error('Something is wrong in ' . __FILE__ . ' line ' . __LINE__);
 }
diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php
index f13882801..e95c56bf3 100644
--- a/lib/Minz/FrontController.php
+++ b/lib/Minz/FrontController.php
@@ -46,7 +46,7 @@ class Minz_FrontController {
 			);
 			Minz_Request::forward ($url);
 		} catch (Minz_Exception $e) {
-			Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
+			Minz_Log::error($e->getMessage());
 			$this->killApp ($e->getMessage ());
 		}
 
@@ -85,7 +85,7 @@ class Minz_FrontController {
 			$this->dispatcher->run();
 		} catch (Minz_Exception $e) {
 			try {
-				Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
+				Minz_Log::error($e->getMessage());
 			} catch (Minz_PermissionDeniedException $e) {
 				$this->killApp ($e->getMessage ());
 			}
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index a0dec1824..b40448491 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -71,9 +71,7 @@ class Minz_View {
 	 */
 	public function render () {
 		if ((include($this->view_filename)) === false) {
-			Minz_Log::record ('File not found: `'
-			            . $this->view_filename . '`',
-			            Minz_Log::NOTICE);
+			Minz_Log::notice('File not found: `' . $this->view_filename . '`');
 		}
 	}
 
@@ -87,9 +85,7 @@ class Minz_View {
 		             . $part . '.phtml';
 
 		if ((include($fic_partial)) === false) {
-			Minz_Log::record ('File not found: `'
-			            . $fic_partial . '`',
-			            Minz_Log::WARNING);
+			Minz_Log::warning('File not found: `' . $fic_partial . '`');
 		}
 	}
 
@@ -103,9 +99,7 @@ class Minz_View {
 		            . $helper . '.phtml';
 
 		if ((include($fic_helper)) === false) {;
-			Minz_Log::record ('File not found: `'
-			            . $fic_helper . '`',
-			            Minz_Log::WARNING);
+			Minz_Log::warning('File not found: `' . $fic_helper . '`');
 		}
 	}
 
diff --git a/p/api/greader.php b/p/api/greader.php
index 5a6fdad7d..1a66c30fb 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -160,7 +160,7 @@ function authorizationToUserConf() {
 					return $conf;
 				} else {
 					logMe('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1] . "\n");
-					Minz_Log::record('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1], Minz_Log::WARNING);
+					Minz_Log::warning('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1]);
 					unauthorized();
 				}
 			} else {
@@ -181,7 +181,7 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 			$conf = new FreshRSS_Configuration($email);
 		} catch (Exception $e) {
 			logMe($e->getMessage() . "\n");
-			Minz_Log::record('Invalid API user ' . $email, Minz_Log::WARNING);
+			Minz_Log::warning('Invalid API user ' . $email);
 			unauthorized();
 		}
 		if ($conf->apiPasswordHash != '' && password_verify($pass, $conf->apiPasswordHash)) {
@@ -191,7 +191,7 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 				'Auth=', $auth, "\n";
 			exit();
 		} else {
-			Minz_Log::record('Password API mismatch for user ' . $email, Minz_Log::WARNING);
+			Minz_Log::warning('Password API mismatch for user ' . $email);
 			unauthorized();
 		}
 	} else {
diff --git a/p/i/index.php b/p/i/index.php
index 7b34eefd1..ec969c159 100755
--- a/p/i/index.php
+++ b/p/i/index.php
@@ -46,7 +46,7 @@ if (file_exists(DATA_PATH . '/do-install.txt')) {
 		$front_controller->run();
 	} catch (Exception $e) {
 		echo '### Fatal error! ###<br />', "\n";
-		Minz_Log::record($e->getMessage(), Minz_Log::ERROR);
+		Minz_Log::error($e->getMessage());
 		echo 'See logs files.';
 	}
 }

From 6c1fe11395c86f71397629b2ab269e26ee63566c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Oct 2014 20:27:16 +0200
Subject: [PATCH 059/363] SimplePie timeout preference

https://github.com/marienfressinaud/FreshRSS/issues/656
TODO: Make a user setting
---
 lib/lib_rss.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 4f6beb9fd..2f9a2ea45 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -110,6 +110,7 @@ function customSimplePie() {
 	$simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration(800);
+	$simplePie->set_timeout(10);	//TODO: Make a user setting
 	$simplePie->strip_htmltags(array(
 		'base', 'blink', 'body', 'doctype', 'embed',
 		'font', 'form', 'frame', 'frameset', 'html',

From f5a95d383c056fddd86e34024cba3444b527730d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 21:16:06 +0200
Subject: [PATCH 060/363] Coding style errorController

---
 app/Controllers/errorController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 36312b56c..bb3431c2b 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -23,13 +23,13 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 		$this->view->errorMessage = trim(implode($errors));
 		if ($this->view->errorMessage == '') {
 			switch(Minz_Request::param('code')) {
-				case 403:
-					$this->view->errorMessage = _t('forbidden_access');
-					break;
-				case 404:
-				default:
-					$this->view->errorMessage = _t('page_not_found');
-					break;
+			case 403:
+				$this->view->errorMessage = _t('forbidden_access');
+				break;
+			case 404:
+			default:
+				$this->view->errorMessage = _t('page_not_found');
+				break;
 			}
 		}
 

From e2da6e6e6b871dc3dbc289cdd40ba401a21d8e91 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 23:20:16 +0200
Subject: [PATCH 061/363] Refactor feedController

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/feedController.php | 629 +++++++++++++++--------------
 lib/Minz/ModelPdo.php              |   7 +
 2 files changed, 339 insertions(+), 297 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 70d5c4e22..0f52917e4 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -1,6 +1,14 @@
 <?php
 
+/**
+ * Controller to handle every feed actions.
+ */
 class FreshRSS_feed_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
 	public function firstAction() {
 		if (!$this->view->loginOk) {
 			// Token is useful in the case that anonymous refresh is forbidden
@@ -10,9 +18,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token == $token_param);
 			$action = Minz_Request::actionName();
-			if (!(($token_is_ok || Minz_Configuration::allowAnonymousRefresh()) &&
-				$action === 'actualize')
-			) {
+			if ($action !== 'actualize' ||
+					!(Minz_Configuration::allowAnonymousRefresh() || $token_is_ok)) {
 				Minz_Error::error(
 					403,
 					array('error' => array(_t('access_denied')))
@@ -21,10 +28,32 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This action subscribes to a feed.
+	 *
+	 * It can be reached by both GET and POST requests.
+	 *
+	 * GET request displays a form to add and configure a feed.
+	 * Request parameter is:
+	 *   - url_rss (default: false)
+	 *
+	 * POST request adds a feed in database.
+	 * Parameters are:
+	 *   - url_rss (default: false)
+	 *   - category (default: false)
+	 *   - new_category (required if category == 'nc')
+	 *   - http_user (default: false)
+	 *   - http_pass (default: false)
+	 * It tries to get website information from RSS feed.
+	 * If no category is given, feed is added to the default one.
+	 *
+	 * If url_rss is false, nothing happened.
+	 */
 	public function addAction() {
-		$url = Minz_Request::param('url_rss', false);
+		$url = Minz_Request::param('url_rss');
 
 		if ($url === false) {
+			// No url, do nothing
 			Minz_Request::forward(array(
 				'c' => 'subscription',
 				'a' => 'index'
@@ -33,14 +62,19 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$this->catDAO = new FreshRSS_CategoryDAO();
-		$this->catDAO->checkDefault();
+		$url_redirect = array(
+			'c' => 'subscription',
+			'a' => 'index',
+			'params' => array(),
+		);
 
 		if (Minz_Request::isPost()) {
 			@set_time_limit(300);
 
-
-			$cat = Minz_Request::param('category', false);
+			$cat = Minz_Request::param('category');
 			if ($cat === 'nc') {
+				// User want to create a new category, new_category parameter
+				// must exist
 				$new_cat = Minz_Request::param('new_category');
 				if (empty($new_cat['name'])) {
 					$cat = false;
@@ -48,139 +82,114 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					$cat = $this->catDAO->addCategory($new_cat);
 				}
 			}
+
 			if ($cat === false) {
+				// If category was not given or if creating new category failed,
+				// get the default category
+				$this->catDAO->checkDefault();
 				$def_cat = $this->catDAO->getDefault();
 				$cat = $def_cat->id();
 			}
 
+			// HTTP information are useful if feed is protected behind a
+			// HTTP authentication
 			$user = Minz_Request::param('http_user');
 			$pass = Minz_Request::param('http_pass');
-			$params = array();
+			$http_auth = '';
+			if ($user != '' || $pass != '') {
+				$http_auth = $user . ':' . $pass;
+			}
 
-			$transactionStarted = false;
+			$transaction_started = false;
 			try {
 				$feed = new FreshRSS_Feed($url);
-				$feed->_category($cat);
-
-				$httpAuth = '';
-				if ($user != '' || $pass != '') {
-					$httpAuth = $user . ':' . $pass;
-				}
-				$feed->_httpAuth($httpAuth);
-
-				$feed->load(true);
-
-				$values = array(
-					'url' => $feed->url(),
-					'category' => $feed->category(),
-					'name' => $feed->name(),
-					'website' => $feed->website(),
-					'description' => $feed->description(),
-					'lastUpdate' => time(),
-					'httpAuth' => $feed->httpAuth(),
-				);
-
-				if ($feedDAO->searchByUrl($values['url'])) {
-					// on est déjà abonné à ce flux
-					$notif = array(
-						'type' => 'bad',
-						'content' => _t('already_subscribed', $feed->name())
-					);
-					Minz_Session::_param('notification', $notif);
-				} else {
-					$id = $feedDAO->addFeed($values);
-					if (!$id) {
-						// problème au niveau de la base de données
-						$notif = array(
-							'type' => 'bad',
-							'content' => _t('feed_not_added', $feed->name())
-						);
-						Minz_Session::_param('notification', $notif);
-					} else {
-						$feed->_id($id);
-						$feed->faviconPrepare();
-
-						$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
-
-						$entryDAO = FreshRSS_Factory::createEntryDao();
-						$entries = array_reverse($feed->entries());	//We want chronological order and SimplePie uses reverse order
-
-						// on calcule la date des articles les plus anciens qu'on accepte
-						$nb_month_old = $this->view->conf->old_entries;
-						$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
-
-						//MySQL: http://docs.oracle.com/cd/E17952_01/refman-5.5-en/optimizing-innodb-transaction-management.html
-						//SQLite: http://stackoverflow.com/questions/1711631/how-do-i-improve-the-performance-of-sqlite
-						$preparedStatement = $entryDAO->addEntryPrepare();
-						$transactionStarted = true;
-						$feedDAO->beginTransaction();
-						// on ajoute les articles en masse sans vérification
-						foreach ($entries as $entry) {
-							$values = $entry->toArray();
-							$values['id_feed'] = $feed->id();
-							$values['id'] = min(time(), $entry->date(true)) . uSecString();
-							$values['is_read'] = $is_read;
-							$entryDAO->addEntry($values, $preparedStatement);
-						}
-						$feedDAO->updateLastUpdate($feed->id());
-						if ($transactionStarted) {
-							$feedDAO->commit();
-						}
-						$transactionStarted = false;
-
-						// ok, ajout terminé
-						$notif = array(
-							'type' => 'good',
-							'content' => _t('feed_added', $feed->name())
-						);
-						Minz_Session::_param('notification', $notif);
-
-						// permet de rediriger vers la page de conf du flux
-						$params['id'] = $feed->id();
-					}
-				}
 			} catch (FreshRSS_BadUrl_Exception $e) {
+				// Given url was not a valid url!
 				Minz_Log::warning($e->getMessage());
-				$notif = array(
-					'type' => 'bad',
-					'content' => _t('invalid_url', $url)
-				);
-				Minz_Session::_param('notification', $notif);
+				Minz_Request::bad(_t('invalid_url', $url), $url_redirect);
+			}
+
+			try {
+				$feed->load(true);
 			} catch (FreshRSS_Feed_Exception $e) {
+				// Something went bad (timeout, server not found, etc.)
 				Minz_Log::warning($e->getMessage());
-				$notif = array(
-					'type' => 'bad',
-					'content' => _t('internal_problem_feed',
-					                Minz_Url::display(array('a' => 'logs')))
+				Minz_Request::bad(
+					_t('internal_problem_feed', _url('index', 'logs')),
+					$url_redirect
 				);
-				Minz_Session::_param('notification', $notif);
 			} catch (Minz_FileNotExistException $e) {
-				// Répertoire de cache n'existe pas
+				// Cache directory doesn't exist!
 				Minz_Log::error($e->getMessage());
-				$notif = array(
-					'type' => 'bad',
-					'content' => _t('internal_problem_feed',
-					                Minz_Url::display(array('a' => 'logs')))
+				Minz_Request::bad(
+					_t('internal_problem_feed', _url('index', 'logs')),
+					$url_redirect
 				);
-				Minz_Session::_param('notification', $notif);
-			}
-			if ($transactionStarted) {
-				$feedDAO->rollBack();
 			}
 
-			Minz_Request::forward(array(
-				'c' => 'subscription',
-				'a' => 'index',
-				'params' => $params
-			), true);
+			if ($feedDAO->searchByUrl($feed->url())) {
+				Minz_Request::bad(_t('already_subscribed', $feed->name()), $url_redirect);
+			}
+
+			$feed->_category($cat);
+			$feed->_httpAuth($http_auth);
+
+			$values = array(
+				'url' => $feed->url(),
+				'category' => $feed->category(),
+				'name' => $feed->name(),
+				'website' => $feed->website(),
+				'description' => $feed->description(),
+				'lastUpdate' => time(),
+				'httpAuth' => $feed->httpAuth(),
+			);
+
+			$id = $feedDAO->addFeed($values);
+			if (!$id) {
+				// There was an error in database... we cannot say what here.
+				Minz_Request::bad(_t('feed_not_added', $feed->name()), $url_redirect);
+			}
+
+			// Ok, feed has been added in database. Now we have to refresh entries.
+			$feed->_id($id);
+			$feed->faviconPrepare();
+
+			$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
+
+			$entryDAO = FreshRSS_Factory::createEntryDao();
+			// We want chronological order and SimplePie uses reverse order.
+			$entries = array_reverse($feed->entries());
+
+			// Calculate date of oldest entries we accept in DB.
+			$nb_month_old = $this->view->conf->old_entries;
+			$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
+
+			// Use a shared statement and a transaction to improve a LOT the
+			// performances.
+			$prepared_statement = $entryDAO->addEntryPrepare();
+			$feedDAO->beginTransaction();
+			foreach ($entries as $entry) {
+				// Entries are added without any verification.
+				$values = $entry->toArray();
+				$values['id_feed'] = $feed->id();
+				$values['id'] = min(time(), $entry->date(true)) . uSecString();
+				$values['is_read'] = $is_read;
+				$entryDAO->addEntry($values, $prepared_statement);
+			}
+			$feedDAO->updateLastUpdate($feed->id());
+			$feedDAO->commit();
+
+			// Entries are in DB, we redirect to feed configuration page.
+			$url_redirect['params']['id'] = $feed->id();
+			Minz_Request::good(_t('feed_added', $feed->name()), $url_redirect);
 		} else {
-
-			// GET request so we must ask confirmation to user
+			// GET request: we must ask confirmation to user before adding feed.
 			Minz_View::prependTitle(_t('add_rss_feed') . ' · ');
+
 			$this->view->categories = $this->catDAO->listCategories(false);
 			$this->view->feed = new FreshRSS_Feed($url);
 			try {
-				// We try to get some more information about the feed
+				// We try to get more information about the feed.
 				$this->view->feed->load(true);
 				$this->view->load_ok = true;
 			} catch (Exception $e) {
@@ -189,43 +198,53 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			$feed = $feedDAO->searchByUrl($this->view->feed->url());
 			if ($feed) {
-				// Already subscribe so we redirect to the feed configuration page
-				$notif = array(
-					'type' => 'bad',
-					'content' => _t('already_subscribed', $feed->name())
-				);
-				Minz_Session::_param('notification', $notif);
-
-				Minz_Request::forward(array(
-					'c' => 'subscription',
-					'a' => 'index',
-					'params' => array(
-						'id' => $feed->id()
-					)
-				), true);
+				// Already subscribe so we redirect to the feed configuration page.
+				$url_redirect['params']['id'] = $feed->id();
+				Minz_Request::good(_t('already_subscribed', $feed->name()), $url_redirect);
 			}
 		}
 	}
 
+	/**
+	 * This action remove entries from a given feed.
+	 *
+	 * It should be reached by a POST action.
+	 *
+	 * Parameter is:
+	 *   - id (default: false)
+	 */
 	public function truncateAction() {
-		if (Minz_Request::isPost()) {
-			$id = Minz_Request::param('id');
-			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$n = $feedDAO->truncate($id);
-			$notif = array(
-				'type' => $n === false ? 'bad' : 'good',
-				'content' => _t('n_entries_deleted', $n)
-			);
-			Minz_Session::_param('notification', $notif);
-			invalidateHttpCache();
-			Minz_Request::forward(array(
-				'c' => 'subscription',
-				'a' => 'index',
-				'params' => array('id' => $id)
-			), true);
+		$id = Minz_Request::param('id');
+		$url_redirect = array(
+			'c' => 'subscription',
+			'a' => 'index',
+			'params' => array('id' => $id)
+		);
+
+		if (!Minz_Request::isPost()) {
+			Minz_Request::forward($url_redirect, true);
+		}
+
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$n = $feedDAO->truncate($id);
+
+		invalidateHttpCache();
+		if ($n === false) {
+			Minz_Request::bad(_t('error_occurred'), $url_redirect);
+		} else {
+			Minz_Request::good(_t('n_entries_deleted', $n), $url_redirect);
 		}
 	}
 
+	/**
+	 * This action actualizes entries from one or several feeds.
+	 *
+	 * Parameters are:
+	 *   - id (default: false)
+	 *   - force (default: false)
+	 * If id is not specified, all the feeds are actualized. But if force is
+	 * false, process stops at 10 feeds to avoid time execution problem.
+	 */
 	public function actualizeAction() {
 		@set_time_limit(300);
 
@@ -234,213 +253,229 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		Minz_Session::_param('actualize_feeds', false);
 		$id = Minz_Request::param('id');
-		$force = Minz_Request::param('force', false);
+		$force = Minz_Request::param('force');
 
-		// on créé la liste des flux à mettre à actualiser
-		// si on veut mettre un flux à jour spécifiquement, on le met
-		// dans la liste, mais seul (permet d'automatiser le traitement)
+		// Create a list of feeds to actualize.
+		// If id is set and valid, corresponding feed is added to the list but
+		// alone in order to automatize further process.
 		$feeds = array();
 		if ($id) {
 			$feed = $feedDAO->searchById($id);
 			if ($feed) {
-				$feeds = array($feed);
+				$feeds[] = $feed;
 			}
 		} else {
 			$feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
 		}
 
-		// on calcule la date des articles les plus anciens qu'on accepte
+		// Calculate date of oldest entries we accept in DB.
 		$nb_month_old = max($this->view->conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
-		$i = 0;
-		$flux_update = 0;
+		$updated_feeds = 0;
 		$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			if (!$feed->lock()) {
 				Minz_Log::notice('Feed already being actualized: ' . $feed->url());
 				continue;
 			}
+
 			try {
-				$url = $feed->url();
-				$feedHistory = $feed->keepHistory();
-
+				// Load entries
 				$feed->load(false);
-				$entries = array_reverse($feed->entries());	//We want chronological order and SimplePie uses reverse order
-				$hasTransaction = false;
-
-				if (count($entries) > 0) {
-					//For this feed, check last n entry GUIDs already in database
-					$existingGuids = array_fill_keys(
-						$entryDAO->listLastGuidsByFeed($feed->id(),
-						                               count($entries) + 10), 1);
-					$useDeclaredDate = empty($existingGuids);
-
-					if ($feedHistory == -2) {	//default
-						$feedHistory = $this->view->conf->keep_history_default;
-					}
-
-					$preparedStatement = $entryDAO->addEntryPrepare();
-					$hasTransaction = true;
-					$feedDAO->beginTransaction();
-
-					// On ne vérifie pas strictement que l'article n'est pas déjà en BDD
-					// La BDD refusera l'ajout car (id_feed, guid) doit être unique
-					foreach ($entries as $entry) {
-						$eDate = $entry->date(true);
-						if ((!isset($existingGuids[$entry->guid()])) &&
-							(($feedHistory != 0) || ($eDate  >= $date_min))) {
-							$values = $entry->toArray();
-							//Use declared date at first import, otherwise use discovery date
-							$values['id'] = ($useDeclaredDate || $eDate < $date_min) ?
-								min(time(), $eDate) . uSecString() :
-								uTimeString();
-							$values['is_read'] = $is_read;
-							$entryDAO->addEntry($values, $preparedStatement);
-						}
-					}
-				}
-
-				if (($feedHistory >= 0) && (rand(0, 30) === 1)) {
-					if (!$hasTransaction) {
-						$feedDAO->beginTransaction();
-					}
-					$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, max($feedHistory, count($entries) + 10));
-					if ($nb > 0) {
-						Minz_Log::debug($nb . ' old entries cleaned in feed [' . $feed->url() . ']');
-					}
-				}
-
-				// on indique que le flux vient d'être mis à jour en BDD
-				$feedDAO->updateLastUpdate($feed->id(), 0, $hasTransaction);
-				if ($hasTransaction) {
-					$feedDAO->commit();
-				}
-				$flux_update++;
-				if (($feed->url() !== $url)) {	//HTTP 301 Moved Permanently
-					Minz_Log::notice('Feed ' . $url . ' moved permanently to ' . $feed->url());
-					$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
-				}
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::notice($e->getMessage());
 				$feedDAO->updateLastUpdate($feed->id(), 1);
+				continue;
+			}
+
+			$url = $feed->url();
+			$feed_history = $feed->keepHistory();
+			if ($feed_history == -2) {
+				// TODO: -2 must be a constant!
+				// -2 means we take the default value from configuration
+				$feed_history = $this->view->conf->keep_history_default;
+			}
+
+			// We want chronological order and SimplePie uses reverse order.
+			$entries = array_reverse($feed->entries());
+			if (count($entries) > 0) {
+				// For this feed, check last n entry GUIDs already in database.
+				$existing_guids = array_fill_keys($entryDAO->listLastGuidsByFeed(
+					$feed->id(), count($entries) + 10
+				), 1);
+				$use_declared_date = empty($existing_guids);
+
+				// Add entries in database if possible.
+				$prepared_statement = $entryDAO->addEntryPrepare();
+				$feedDAO->beginTransaction();
+				foreach ($entries as $entry) {
+					$entry_date = $entry->date(true);
+					if (isset($existing_guids[$entry->guid()]) ||
+							($feed_history == 0 && $entry_date < $date_min)) {
+						// This entry already exists in DB or should not be added
+						// considering configuration and date.
+						continue;
+					}
+
+					$id = uTimeString();
+					if ($use_declared_date || $entry_date < $date_min) {
+						// Use declared date at first import.
+						$id = min(time(), $entry_date) . uSecString();
+					}
+
+					$values = $entry->toArray();
+					$values['id'] = $id;
+					$values['is_read'] = $is_read;
+					$entryDAO->addEntry($values, $prepared_statement);
+				}
+			}
+
+			if ($feed_history >= 0 && rand(0, 30) === 1) {
+				// TODO: move this function in web cron when available
+				// Remove old entries once in 30.
+				if (!$feedDAO->hasTransaction()) {
+					$feedDAO->beginTransaction();
+				}
+
+				$nb = $feedDAO->cleanOldEntries($feed->id(),
+				                                $date_min,
+				                                max($feed_history, count($entries) + 10));
+				if ($nb > 0) {
+					Minz_Log::debug($nb . ' old entries cleaned in feed [' .
+					                $feed->url() . ']');
+				}
+			}
+
+			$feedDAO->updateLastUpdate($feed->id(), 0, $feedDAO->hasTransaction());
+			if ($feedDAO->hasTransaction()) {
+				$feedDAO->commit();
+			}
+
+			if ($feed->url() !== $url) {
+				// HTTP 301 Moved Permanently
+				Minz_Log::notice('Feed ' . $url . ' moved permanently to ' . $feed->url());
+				$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 			}
 
 			$feed->faviconPrepare();
 			$feed->unlock();
+			$updated_feeds++;
 			unset($feed);
 
-			// On arrête à 10 flux pour ne pas surcharger le serveur
-			// sauf si le paramètre $force est à vrai
-			$i++;
-			if ($i >= 10 && !$force) {
+			// No more than 10 feeds unless $force is true to avoid overloading
+			// the server.
+			if ($updated_feeds >= 10 && !$force) {
 				break;
 			}
 		}
 
-		$url = array();
-		if ($flux_update === 1) {
-			// on a mis un seul flux à jour
-			$feed = reset($feeds);
-			$notif = array(
-				'type' => 'good',
-				'content' => _t('feed_actualized', $feed->name())
-			);
-		} elseif ($flux_update > 1) {
-			// plusieurs flux on été mis à jour
-			$notif = array(
-				'type' => 'good',
-				'content' => _t('n_feeds_actualized', $flux_update)
-			);
-		} else {
-			// aucun flux n'a été mis à jour, oups
-			$notif = array(
-				'type' => 'good',
-				'content' => _t('no_feed_to_refresh')
-			);
-		}
-
-		if ($i === 1) {
-			// Si on a voulu mettre à jour qu'un flux
-			// on filtre l'affichage par ce flux
-			$feed = reset($feeds);
-			$url['params'] = array('get' => 'f_' . $feed->id());
-		}
-
-		if (Minz_Request::param('ajax', 0) === 0) {
-			Minz_Session::_param('notification', $notif);
-			Minz_Request::forward($url, true);
-		} else {
-			// Une requête Ajax met un seul flux à jour.
-			// Comme en principe plusieurs requêtes ont lieu,
-			// on indique que "plusieurs flux ont été mis à jour".
-			// Cela permet d'avoir une notification plus proche du
-			// ressenti utilisateur
+		if (Minz_Request::param('ajax')) {
+			// Most of the time, ajax request is for only one feed. But since
+			// there are several parallel requests, we should return that there
+			// are several updated feeds.
 			$notif = array(
 				'type' => 'good',
 				'content' => _t('feeds_actualized')
 			);
 			Minz_Session::_param('notification', $notif);
-			// et on désactive le layout car ne sert à rien
+			// No layout in ajax request.
 			$this->view->_useLayout(false);
+			return;
+		}
+
+		// Redirect to the main page with correct notification.
+		if ($updated_feeds === 1) {
+			$feed = reset($feeds);
+			Minz_Request::good(_t('feed_actualized', $feed->name()),
+			                   array('get' => 'f_' . $feed->id()));
+		} elseif ($updated_feeds > 1) {
+			Minz_Request::good(_t('n_feeds_actualized', $updated_feeds), array());
+		} else {
+			Minz_Request::good(_t('no_feed_to_refresh'), array());
 		}
 	}
 
+	/**
+	 * This action changes the category of a feed.
+	 *
+	 * This page must be reached by a POST request.
+	 *
+	 * Parameters are:
+	 *   - f_id (default: false)
+	 *   - c_id (default: false)
+	 * If c_id is false, default category is used.
+	 *
+	 * @todo should handle order of the feed inside the category.
+	 */
 	public function moveAction() {
-		if (Minz_Request::isPost()) {
-			$feed_id = Minz_Request::param('f_id');
-			$cat_id = Minz_Request::param('c_id');
+		if (!Minz_Request::isPost()) {
+			Minz_Request::forward(array('c' => 'subscription'), true);
+		}
 
-			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$values = array(
-				'category' => $cat_id,
+		$feed_id = Minz_Request::param('f_id');
+		$cat_id = Minz_Request::param('c_id');
+
+		if ($cat_id === false) {
+			// If category was not given get the default one.
+			$catDAO = new FreshRSS_CategoryDAO();
+			$catDAO->checkDefault();
+			$def_cat = $catDAO->getDefault();
+			$cat_id = $def_cat->id();
+		}
+
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$values = array('category' => $cat_id);
+
+		$feed = $feedDAO->searchById($feed_id);
+		if ($feed && ($feed->category() == $cat_id ||
+		              $feedDAO->updateFeed($feed_id, $values))) {
+			// TODO: return something useful
+		} else {
+			Minz_Log::warning('Cannot move feed `' . $feed_id . '` ' .
+			                  'in the category `' . $cat_id . '`');
+			Minz_Error::error(
+				404,
+				array('error' => array(_t('error_occurred')))
 			);
-
-			$feed = $feedDAO->searchById($feed_id);
-
-			if ($feed && ($feed->category() == $cat_id ||
-			              $feedDAO->updateFeed($feed_id, $values))) {
-				// TODO: return something useful
-			} else {
-				Minz_Error::error(
-					404,
-					array('error' => array(_t('error_occurred')))
-				);
-			}
 		}
 	}
 
+	/**
+	 * This action deletes a feed.
+	 *
+	 * This page must be reached by a POST request.
+	 * If there are related queries, they are deleted too.
+	 *
+	 * Parameters are:
+	 *   - id (default: false)
+	 *   - r (default: false)
+	 * r permits to redirect to a given page at the end of this action.
+	 *
+	 * @todo handle "r" redirection in Minz_Request::forward()?
+	 */
 	public function deleteAction() {
-		if (Minz_Request::isPost()) {
-			$id = Minz_Request::param('id');
-			$feedDAO = FreshRSS_Factory::createFeedDao();
+		$redirect_url = Minz_Request::param('r', false, true);
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'subscription', 'a' => 'index');
+		}
 
-			if ($feedDAO->deleteFeed($id)) {
-				// TODO: Delete old favicon
+		if (!Minz_Request::isPost()) {
+			Minz_Request::forward($redirect_url, true);
+		}
 
-				// Remove related queries
-				$this->view->conf->remove_query_by_get('f_' . $id);
-				$this->view->conf->save();
+		$id = Minz_Request::param('id');
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		if ($feedDAO->deleteFeed($id)) {
+			// TODO: Delete old favicon
 
-				$notif = array(
-					'type' => 'good',
-					'content' => _t('feed_deleted')
-				);
-			} else {
-				$notif = array(
-					'type' => 'bad',
-					'content' => _t('error_occured')
-				);
-			}
+			// Remove related queries
+			$this->view->conf->remove_query_by_get('f_' . $id);
+			$this->view->conf->save();
 
-			Minz_Session::_param('notification', $notif);
-
-			$redirect_url = Minz_Request::param('r', false, true);
-			if ($redirect_url) {
-				Minz_Request::forward($redirect_url);
-			} else {
-				Minz_Request::forward(array('c' => 'subscription', 'a' => 'index'), true);
-			}
+			Minz_Request::good(_t('feed_deleted'), $redirect_url);
+		} else {
+			Minz_Request::bad(_t('error_occurred'), $redirect_url);
 		}
 	}
 }
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index b4bfca746..69e46fb39 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -16,6 +16,7 @@ class Minz_ModelPdo {
 	public static $useSharedBd = true;
 	private static $sharedBd = null;
 	private static $sharedPrefix;
+	private static $has_transaction = false;
 	protected static $sharedDbType;
 
 	/**
@@ -91,12 +92,18 @@ class Minz_ModelPdo {
 
 	public function beginTransaction() {
 		$this->bd->beginTransaction();
+		$this->has_transaction = true;
+	}
+	public function hasTransaction() {
+		return $this->has_transaction;
 	}
 	public function commit() {
 		$this->bd->commit();
+		$this->has_transaction = false;
 	}
 	public function rollBack() {
 		$this->bd->rollBack();
+		$this->has_transaction = false;
 	}
 
 	public static function clean() {

From 031c1d802d74b94d5ef5245f3678138107621179 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 23:57:54 +0200
Subject: [PATCH 062/363] Fix  a bug (has_transaction)

Introduced by the last commit.
---
 lib/Minz/ModelPdo.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 69e46fb39..66127ea22 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -92,18 +92,18 @@ class Minz_ModelPdo {
 
 	public function beginTransaction() {
 		$this->bd->beginTransaction();
-		$this->has_transaction = true;
+		self::$has_transaction = true;
 	}
 	public function hasTransaction() {
-		return $this->has_transaction;
+		return self::$has_transaction;
 	}
 	public function commit() {
 		$this->bd->commit();
-		$this->has_transaction = false;
+		self::$has_transaction = false;
 	}
 	public function rollBack() {
 		$this->bd->rollBack();
-		$this->has_transaction = false;
+		self::$has_transaction = false;
 	}
 
 	public static function clean() {

From d65a9f9bd62e93d8a2cdcb34c520f2af7e02983d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 6 Oct 2014 11:59:27 +0200
Subject: [PATCH 063/363] Refactor entryController

- Coding style
- Refactoring
- Comments (set of TODO)

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/entryController.php | 195 +++++++++++++++++-----------
 app/Controllers/feedController.php  |   2 +-
 2 files changed, 117 insertions(+), 80 deletions(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index d7be05663..c46fbf346 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -1,6 +1,14 @@
 <?php
 
+/**
+ * Controller to handle every entry actions.
+ */
 class FreshRSS_entry_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
 	public function firstAction() {
 		if (!$this->view->loginOk) {
 			Minz_Error::error(
@@ -9,119 +17,153 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			);
 		}
 
+		// Keep parameter information (output) to do a correct redirection at
+		// the end.
 		$this->params = array();
 		$output = Minz_Request::param('output', '');
-		if (($output != '') && ($this->view->conf->view_mode !== $output)) {
+		if ($output != '' && $this->view->conf->view_mode !== $output) {
 			$this->params['output'] = $output;
 		}
 
-		$this->redirect = false;
-		$ajax = Minz_Request::param('ajax');
-		if ($ajax) {
+		// If ajax request, we do not print layout
+		$this->ajax = Minz_Request::param('ajax');
+		if ($this->ajax) {
 			$this->view->_useLayout(false);
-		}
-	}
-
-	public function lastAction() {
-		$ajax = Minz_Request::param('ajax');
-		if (!$ajax && $this->redirect) {
-			Minz_Request::forward(array(
-				'c' => 'index',
-				'a' => 'index',
-				'params' => $this->params
-			), true);
-		} else {
 			Minz_Request::_param('ajax');
 		}
 	}
 
+	/**
+	 * Mark one or several entries as read (or not!).
+	 *
+	 * If request concerns several entries, it MUST be a POST request.
+	 * If request concerns several entries, only mark them as read is available.
+	 *
+	 * Parameters are:
+	 *   - id (default: false)
+	 *   - get (default: false) /(c_\d+|f_\d+|s|a)/
+	 *   - nextGet (default: $get)
+	 *   - idMax (default: 0)
+	 *   - is_read (default: true)
+	 *
+	 * @todo nextGet system should not be present here... or should be?
+	 */
 	public function readAction() {
-		$this->redirect = true;
-
 		$id = Minz_Request::param('id');
 		$get = Minz_Request::param('get');
-		$nextGet = Minz_Request::param('nextGet', $get);
-		$idMax = Minz_Request::param('idMax', 0);
+		$next_get = Minz_Request::param('nextGet', $get);
+		$id_max = Minz_Request::param('idMax', 0);
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
-		if ($id == false) {
+		if ($id === false) {
+			// id is false? It MUST be a POST request!
 			if (!Minz_Request::isPost()) {
 				return;
 			}
 
 			if (!$get) {
-				$entryDAO->markReadEntries($idMax);
+				// No get? Mark all entries as read (from $id_max)
+				$entryDAO->markReadEntries($id_max);
 			} else {
-				$typeGet = $get[0];
+				$type_get = $get[0];
 				$get = substr($get, 2);
-				switch($typeGet) {
+				switch($type_get) {
 				case 'c':
-					$entryDAO->markReadCat($get, $idMax);
+					$entryDAO->markReadCat($get, $id_max);
 					break;
 				case 'f':
-					$entryDAO->markReadFeed($get, $idMax);
+					$entryDAO->markReadFeed($get, $id_max);
 					break;
 				case 's':
-					$entryDAO->markReadEntries($idMax, true);
+					$entryDAO->markReadEntries($id_max, true);
 					break;
 				case 'a':
-					$entryDAO->markReadEntries($idMax);
+					$entryDAO->markReadEntries($id_max);
 					break;
 				}
-				if ($nextGet !== 'a') {
-					$this->params['get'] = $nextGet;
+
+				if ($next_get !== 'a') {
+					// Redirect to the correct page (category, feed or starred)
+					// Not "a" because it is the default value if nothing is
+					// given.
+					$this->params['get'] = $next_get;
 				}
 			}
-
-			$notif = array(
-				'type' => 'good',
-				'content' => _t('feeds_marked_read')
-			);
-			Minz_Session::_param('notification', $notif);
 		} else {
 			$is_read = (bool)(Minz_Request::param('is_read', true));
 			$entryDAO->markRead($id, $is_read);
 		}
+
+		if (!$this->ajax) {
+			Minz_Request::good(_t('feeds_marked_read'), array(
+				'c' => 'index',
+				'a' => 'index',
+				'params' => $this->params,
+			), true);
+		}
 	}
 
+	/**
+	 * This action marks an entry as favourite (bookmark) or not.
+	 *
+	 * Parameter is:
+	 *   - id (default: false)
+	 *   - is_favorite (default: true)
+	 * If id is false, nothing happened.
+	 */
 	public function bookmarkAction() {
-		$this->redirect = true;
-
 		$id = Minz_Request::param('id');
-		if ($id) {
+		$is_favourite = (bool)Minz_Request::param('is_favorite', true);
+		if ($id !== false) {
 			$entryDAO = FreshRSS_Factory::createEntryDao();
-			$entryDAO->markFavorite($id, (bool)(Minz_Request::param('is_favorite', true)));
+			$entryDAO->markFavorite($id, $is_favourite);
+		}
+
+		if (!$this->ajax) {
+			Minz_Request::forward(array(
+				'c' => 'index',
+				'a' => 'index',
+				'params' => $this->params,
+			), true);
 		}
 	}
 
+	/**
+	 * This action optimizes database to reduce its size.
+	 *
+	 * This action shouldbe reached by a POST request.
+	 *
+	 * @todo move this action in configure controller.
+	 * @todo call this action through web-cron when available
+	 */
 	public function optimizeAction() {
-		if (Minz_Request::isPost()) {
-			@set_time_limit(300);
+		$url_redirect = array(
+			'c' => 'configure',
+			'a' => 'archiving',
+		);
 
-			// La table des entrées a tendance à grossir énormément
-			// Cette action permet d'optimiser cette table permettant de grapiller un peu de place
-			// Cette fonctionnalité n'est à appeler qu'occasionnellement
-			$entryDAO = FreshRSS_Factory::createEntryDao();
-			$entryDAO->optimizeTable();
-
-			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$feedDAO->updateCachedValues();
-
-			invalidateHttpCache();
-
-			$notif = array(
-				'type' => 'good',
-				'content' => _t('optimization_complete')
-			);
-			Minz_Session::_param('notification', $notif);
+		if (!Minz_Request::isPost()) {
+			Minz_Request::forward($url_redirect, true);
 		}
 
-		Minz_Request::forward(array(
-			'c' => 'configure',
-			'a' => 'archiving'
-		), true);
+		@set_time_limit(300);
+
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		$entryDAO->optimizeTable();
+
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$feedDAO->updateCachedValues();
+
+		invalidateHttpCache();
+		Minz_Request::good(_t('optimization_complete'), $url_redirect);
 	}
 
+	/**
+	 * This action purges old entries from feeds.
+	 *
+	 * @todo should be a POST request
+	 * @todo should be in feedController
+	 */
 	public function purgeAction() {
 		@set_time_limit(300);
 
@@ -130,21 +172,23 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$feeds = $feedDAO->listFeeds();
-		$nbTotal = 0;
+		$nb_total = 0;
 
 		invalidateHttpCache();
 
 		foreach ($feeds as $feed) {
-			$feedHistory = $feed->keepHistory();
-			if ($feedHistory == -2) {	//default
-				$feedHistory = $this->view->conf->keep_history_default;
+			$feed_history = $feed->keepHistory();
+			if ($feed_history == -2) {
+				// TODO: -2 must be a constant!
+				// -2 means we take the default value from configuration
+				$feed_history = $this->view->conf->keep_history_default;
 			}
-			if ($feedHistory >= 0) {
-				$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feedHistory);
+
+			if ($feed_history >= 0) {
+				$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feed_history);
 				if ($nb > 0) {
-					$nbTotal += $nb;
+					$nb_total += $nb;
 					Minz_Log::debug($nb . ' old entries cleaned in feed [' . $feed->url() . ']');
-					//$feedDAO->updateLastUpdate($feed->id());
 				}
 			}
 		}
@@ -152,16 +196,9 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$feedDAO->updateCachedValues();
 
 		invalidateHttpCache();
-
-		$notif = array(
-			'type' => 'good',
-			'content' => _t('purge_completed', $nbTotal)
-		);
-		Minz_Session::_param('notification', $notif);
-
-		Minz_Request::forward(array(
+		Minz_Request::good(_t('purge_completed', $nb_total), array(
 			'c' => 'configure',
 			'a' => 'archiving'
-		), true);
+		));
 	}
 }
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0f52917e4..18829d252 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -332,7 +332,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			if ($feed_history >= 0 && rand(0, 30) === 1) {
-				// TODO: move this function in web cron when available
+				// TODO: move this function in web cron when available (see entry::purge)
 				// Remove old entries once in 30.
 				if (!$feedDAO->hasTransaction()) {
 					$feedDAO->beginTransaction();

From 34151ea1ae2107d4b5d96cefe8f4b2dc1ae3b70f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 6 Oct 2014 13:12:36 +0200
Subject: [PATCH 064/363] Add comments in error and importExport controllers

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/errorController.php        |  17 ++-
 app/Controllers/importExportController.php | 149 +++++++++++++++++----
 2 files changed, 140 insertions(+), 26 deletions(-)

diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index bb3431c2b..76ab930e0 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -1,8 +1,21 @@
 <?php
 
+/**
+ * Controller to handle error page.
+ */
 class FreshRSS_error_Controller extends Minz_ActionController {
+	/**
+	 * This action is the default one for the controller.
+	 *
+	 * It is called by Minz_Error::error() method.
+	 *
+	 * Parameters are:
+	 *   - code (default: 404)
+	 *   - logs (default: array())
+	 */
 	public function indexAction() {
-		switch (Minz_Request::param('code')) {
+		$code_int = Minz_Request::param('code', 404);
+		switch ($code_int) {
 		case 403:
 			$this->view->code = 'Error 403 - Forbidden';
 			break;
@@ -22,7 +35,7 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 		$errors = Minz_Request::param('logs', array());
 		$this->view->errorMessage = trim(implode($errors));
 		if ($this->view->errorMessage == '') {
-			switch(Minz_Request::param('code')) {
+			switch($code_int) {
 			case 403:
 				$this->view->errorMessage = _t('forbidden_access');
 				break;
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index f329766b8..57759f277 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -1,6 +1,14 @@
 <?php
 
+/**
+ * Controller to handle every import and export actions.
+ */
 class FreshRSS_importExport_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
 	public function firstAction() {
 		if (!$this->view->loginOk) {
 			Minz_Error::error(
@@ -16,13 +24,23 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$this->feedDAO = FreshRSS_Factory::createFeedDao();
 	}
 
+	/**
+	 * This action displays the main page for import / export system.
+	 */
 	public function indexAction() {
-		$this->view->categories = $this->catDAO->listCategories();
 		$this->view->feeds = $this->feedDAO->listFeeds();
-
 		Minz_View::prependTitle(_t('import_export') . ' · ');
 	}
 
+	/**
+	 * This action handles import action.
+	 *
+	 * It must be reached by a POST request.
+	 *
+	 * Parameter is:
+	 *   - file (default: nothing!)
+	 * Available file types are: zip, json or xml.
+	 */
 	public function importAction() {
 		if (!Minz_Request::isPost()) {
 			Minz_Request::forward(array('c' => 'importExport', 'a' => 'index'), true);
@@ -92,10 +110,10 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$error = $this->importOpml($opml_file);
 		}
 		foreach ($list_files['json_starred'] as $article_file) {
-			$error = $this->importArticles($article_file, true);
+			$error = $this->importJson($article_file, true);
 		}
 		foreach ($list_files['json_feed'] as $article_file) {
-			$error = $this->importArticles($article_file);
+			$error = $this->importJson($article_file);
 		}
 
 		// And finally, we get import status and redirect to the home page
@@ -105,11 +123,15 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		Minz_Request::good($content_notif);
 	}
 
+	/**
+	 * This method tries to guess the file type based on its name.
+	 *
+	 * Itis a *very* basic guess file type function. Only based on filename.
+	 * That's could be improved but should be enough for what we have to do.
+	 *
+	 * @todo move into lib_rss.php
+	 */
 	private function guessFileType($filename) {
-		// A *very* basic guess file type function. Only based on filename
-		// That's could be improved but should be enough, at least for a first
-		// implementation.
-
 		if (substr_compare($filename, '.zip', -4) === 0) {
 			return 'zip';
 		} elseif (substr_compare($filename, '.opml', -5) === 0 ||
@@ -125,6 +147,12 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This method parses and imports an OPML file.
+	 *
+	 * @param string $opml_file the OPML file content.
+	 * @return boolean true if an error occured, false else.
+	 */
 	private function importOpml($opml_file) {
 		$opml_array = array();
 		try {
@@ -139,13 +167,22 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $this->addOpmlElements($opml_array['body']);
 	}
 
+	/**
+	 * This method imports an OPML file based on its body.
+	 *
+	 * @param array $opml_elements an OPML element (body or outline).
+	 * @param string $parent_cat the name of the parent category.
+	 * @return boolean true if an error occured, false else.
+	 */
 	private function addOpmlElements($opml_elements, $parent_cat = null) {
 		$error = false;
 		foreach ($opml_elements as $elt) {
 			$res = false;
 			if (isset($elt['xmlUrl'])) {
+				// If xmlUrl exists, it means it is a feed
 				$res = $this->addFeedOpml($elt, $parent_cat);
 			} else {
+				// No xmlUrl? It should be a category!
 				$res = $this->addCategoryOpml($elt, $parent_cat);
 			}
 
@@ -158,6 +195,13 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $error;
 	}
 
+	/**
+	 * This method imports an OPML feed element.
+	 *
+	 * @param array $feed_elt an OPML element (must be a feed element).
+	 * @param string $parent_cat the name of the parent category.
+	 * @return boolean true if an error occured, false else.
+	 */
 	private function addFeedOpml($feed_elt, $parent_cat) {
 		if (is_null($parent_cat)) {
 			// This feed has no parent category so we get the default one
@@ -165,8 +209,9 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		}
 
 		$cat = $this->catDAO->searchByName($parent_cat);
-
 		if (!$cat) {
+			// If there is not $cat, it means parent category does not exist in
+			// database. It should not happened!
 			return true;
 		}
 
@@ -203,6 +248,13 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $error;
 	}
 
+	/**
+	 * This method imports an OPML category element.
+	 *
+	 * @param array $cat_elt an OPML element (must be a category element).
+	 * @param string $parent_cat the name of the parent category.
+	 * @return boolean true if an error occured, false else.
+	 */
 	private function addCategoryOpml($cat_elt, $parent_cat) {
 		// Create a new Category object
 		$cat = new FreshRSS_Category(Minz_Helper::htmlspecialchars_utf8($cat_elt['text']));
@@ -223,7 +275,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $error;
 	}
 
-	private function importArticles($article_file, $starred = false) {
+	/**
+	 * This method import a JSON-based file (Google Reader format).
+	 *
+	 * @param string $article_file the JSON file content.
+	 * @param boolean $starred true if articles from the file must be starred.
+	 * @return boolean true if an error occured, false else.
+	 */
+	private function importJson($article_file, $starred = false) {
 		$article_object = json_decode($article_file, true);
 		if (is_null($article_object)) {
 			Minz_Log::warning('Try to import a non-JSON file');
@@ -232,16 +291,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
 
-		$google_compliant = (
-			strpos($article_object['id'], 'com.google') !== false
-		);
+		$google_compliant = strpos($article_object['id'], 'com.google') !== false;
 
 		$error = false;
 		$article_to_feed = array();
 
 		// First, we check feeds of articles are in DB (and add them if needed).
 		foreach ($article_object['items'] as $item) {
-			$feed = $this->addFeedArticles($item['origin'], $google_compliant);
+			$feed = $this->addFeedJson($item['origin'], $google_compliant);
 			if (is_null($feed)) {
 				$error = true;
 			} else {
@@ -254,6 +311,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$this->entryDAO->beginTransaction();
 		foreach ($article_object['items'] as $item) {
 			if (!isset($article_to_feed[$item['id']])) {
+				// Related feed does not exist for this entry, do nothing.
 				continue;
 			}
 
@@ -263,6 +321,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			               'summary' : 'content';
 			$tags = $item['categories'];
 			if ($google_compliant) {
+				// Remove tags containing "/state/com.google" which are useless.
 				$tags = array_filter($tags, function($var) {
 					return strpos($var, '/state/com.google') === false;
 				});
@@ -288,7 +347,15 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $error;
 	}
 
-	private function addFeedArticles($origin, $google_compliant) {
+	/**
+	 * This method import a JSON-based feed (Google Reader format).
+	 *
+	 * @param array $origin represents a feed.
+	 * @param boolean $google_compliant takes care of some specific values if true.
+	 * @return FreshRSS_Feed if feed is in database at the end of the process,
+	 *         else null.
+	 */
+	private function addFeedJson($origin, $google_compliant) {
 		$default_cat = $this->catDAO->getDefault();
 
 		$return = null;
@@ -298,14 +365,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$website = $origin['htmlUrl'];
 
 		try {
-			// Create a Feed object and add it in DB
+			// Create a Feed object and add it in database.
 			$feed = new FreshRSS_Feed($url);
 			$feed->_category($default_cat->id());
 			$feed->_name($name);
 			$feed->_website($website);
 
 			// addFeedObject checks if feed is already in DB so nothing else to
-			// check here
+			// check here.
 			$id = $this->feedDAO->addFeedObject($feed);
 
 			if ($id !== false) {
@@ -319,6 +386,16 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $return;
 	}
 
+	/**
+	 * This action handles export action.
+	 *
+	 * This action must be reached by a POST request.
+	 *
+	 * Parameters are:
+	 *   - export_opml (default: false)
+	 *   - export_starred (default: false)
+	 *   - export_feeds (default: array()) a list of feed ids
+	 */
 	public function exportAction() {
 		if (!Minz_Request::isPost()) {
 			Minz_Request::forward(array('c' => 'importExport', 'a' => 'index'), true);
@@ -336,7 +413,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		}
 
 		if ($export_starred) {
-			$export_files['starred.json'] = $this->generateArticles('starred');
+			$export_files['starred.json'] = $this->generateEntries('starred');
 		}
 
 		foreach ($export_feeds as $feed_id) {
@@ -344,9 +421,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			if ($feed) {
 				$filename = 'feed_' . $feed->category() . '_'
 				          . $feed->id() . '.json';
-				$export_files[$filename] = $this->generateArticles(
-					'feed', $feed
-				);
+				$export_files[$filename] = $this->generateEntries('feed', $feed);
 			}
 		}
 
@@ -366,10 +441,16 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$type = $this->guessFileType($filename);
 			$this->exportFile('freshrss_' . $filename, $export_files[$filename], $type);
 		} else {
+			// Nothing to do...
 			Minz_Request::forward(array('c' => 'importExport', 'a' => 'index'), true);
 		}
 	}
 
+	/**
+	 * This method returns the OPML file based on user subscriptions.
+	 *
+	 * @return string the OPML file content.
+	 */
 	private function generateOpml() {
 		$list = array();
 		foreach ($this->catDAO->listCategories() as $key => $cat) {
@@ -381,7 +462,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $this->view->helperToString('export/opml');
 	}
 
-	private function generateArticles($type, $feed = NULL) {
+	/**
+	 * This method returns a JSON file content.
+	 *
+	 * @param string $type must be "starred" or "feed"
+	 * @param FreshRSS_Feed $feed feed of which we want to get entries.
+	 * @return string the JSON file content.
+	 */
+	private function generateEntries($type, $feed = NULL) {
 		$this->view->categories = $this->catDAO->listCategories();
 
 		if ($type == 'starred') {
@@ -389,8 +477,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$this->view->type = 'starred';
 			$unread_fav = $this->entryDAO->countUnreadReadFavorites();
 			$this->view->entries = $this->entryDAO->listWhere(
-				's', '', FreshRSS_Entry::STATE_ALL, 'ASC',
-				$unread_fav['all']
+				's', '', FreshRSS_Entry::STATE_ALL, 'ASC', $unread_fav['all']
 			);
 		} elseif ($type == 'feed' && !is_null($feed)) {
 			$this->view->list_title = _t('feed_list', $feed->name());
@@ -405,6 +492,12 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $this->view->helperToString('export/articles');
 	}
 
+	/**
+	 * This method zips a list of files and returns it by HTTP.
+	 *
+	 * @param array $files list of files where key is filename and value the content.
+	 * @throws Exception if Zip extension is not loaded.
+	 */
 	private function exportZip($files) {
 		if (!extension_loaded('zip')) {
 			throw new Exception();
@@ -428,6 +521,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		unlink($zip_file);
 	}
 
+	/**
+	 * This method returns a single file (OPML or JSON) by HTTP.
+	 *
+	 * @param string $filename
+	 * @param string $content
+	 * @param string $type the file type (opml, json_feed or json_starred).
+	 *                     If equals to unknown, nothing happens.
+	 */
 	private function exportFile($filename, $content, $type) {
 		if ($type === 'unknown') {
 			return;

From 530a1d4b6b043f6b6976bb7ad25b380c29d5b5a4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 6 Oct 2014 14:23:17 +0200
Subject: [PATCH 065/363] Update i18n with strings from i18n.freshrss.org

No more seperation between normal and install files. I will work on
that later!
---
 app/i18n/en.php         | 927 ++++++++++++++++++++--------------------
 app/i18n/fr.php         | 927 ++++++++++++++++++++--------------------
 app/i18n/install.en.php |  69 ---
 app/i18n/install.fr.php |  68 ---
 app/install.php         |   5 -
 5 files changed, 944 insertions(+), 1052 deletions(-)
 delete mode 100644 app/i18n/install.en.php
 delete mode 100644 app/i18n/install.fr.php

diff --git a/app/i18n/en.php b/app/i18n/en.php
index 0456049a9..9e968998a 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -1,456 +1,473 @@
 <?php
-
-return array (
-	// LAYOUT
-	'login'				=> 'Login',
-	'keep_logged_in'		=> 'Keep me logged in <small>(1 month)</small>',
-	'login_with_persona'		=> 'Login with Persona',
-	'login_persona_problem'		=> 'Connection problem with Persona?',
-	'logout'			=> 'Logout',
-	'search'			=> 'Search words or #tags',
-	'search_short'			=> 'Search',
-
-	'configuration'			=> 'Configuration',
-	'users'				=> 'Users',
-	'categories'			=> 'Categories',
-	'category'			=> 'Category',
-	'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_get_all'			=> 'Display all articles',
-	'query_get_favorite'		=> 'Display favorite articles',
-	'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',
-	'query_number'			=> 'Query n°%d',
-	'add_query'			=> 'Add a query',
-	'query_created'			=> 'Query "%s" has been created.',
-	'no_query'			=> 'You haven’t created any user query yet.',
-	'query_filter'			=> 'Filter applied:',
-	'no_query_filter'		=> 'No filter',
-	'query_deprecated'		=> 'This query is no longer valid. The referenced category or feed has been deleted.',
-	'about'				=> 'About',
-	'stats'				=> 'Statistics',
-	'stats_idle'			=> 'Idle feeds',
-	'stats_main'			=> 'Main statistics',
-	'stats_repartition'		=> 'Articles repartition',
-	'stats_entry_per_hour'		=> 'Per hour',
-	'stats_entry_per_day_of_week'	=> 'Per day of week',
-	'stats_entry_per_month'		=> 'Per month',
-	'stats_percent_of_total'	=> '%% of total',
-    
-	'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',
-	'no_rss_feed'			=> 'No RSS feed',
-	'import_export'			=> 'Import / export',
-	'bookmark'			=> 'Subscribe (FreshRSS bookmark)',
-
-	'subscription_management'	=> 'Subscriptions management',
-	'main_stream'			=> 'Main stream',
-	'all_feeds'			=> 'All feeds',
-	'favorite_feeds'		=> 'Favourites (%s)',
-	'not_read'			=> '%d unread',
-	'not_reads'			=> '%d unread',
-
-	'filter'			=> 'Filter',
-	'see_website'			=> 'See website',
-	'administration'		=> 'Manage',
-	'actualize'			=> 'Actualize',
-
-	'mark_read'			=> 'Mark as read',
-	'mark_favorite'			=> 'Mark as favourite',
-	'mark_all_read'			=> 'Mark all as read',
-	'mark_feed_read'		=> 'Mark feed as read',
-	'mark_cat_read'			=> 'Mark category as read',
-	'before_one_day'		=> 'Before one day',
-	'before_one_week'		=> 'Before one week',
-	'display'			=> 'Display',
-	'normal_view'			=> 'Normal view',
-	'reader_view'			=> 'Reading view',
-	'global_view'			=> 'Global view',
-	'rss_view'			=> 'RSS feed',
-	'show_all_articles'		=> 'Show all articles',
-	'show_not_reads'		=> 'Show only unread',
-	'show_adaptive'			=> 'Adjust showing',
-	'show_read'			=> 'Show only read',
-	'show_favorite'			=> 'Show only favorites',
-	'show_not_favorite'		=> 'Show all but favorites',
-	'older_first'			=> 'Oldest first',
-	'newer_first'			=> 'Newer first',
-
-	// Pagination
-	'first'				=> 'First',
-	'previous'			=> 'Previous',
-	'next'				=> 'Next',
-	'last'				=> 'Last',
-
-	// CONTROLLERS
-	'article_published_on'		=> 'This article originally appeared on <a href="%s">%s</a>',
-	'article_published_on_author'	=> 'This article originally appeared on <a href="%s">%s</a> by %s',
-
-	'access_denied'			=> 'You don’t have permission to access this page',
-	'page_not_found'		=> 'You are looking for a page which doesn’t exist',
-	'error_occurred'		=> 'An error occurred',
-	'error_occurred_update'		=> 'Nothing was changed',
-
-	'default_category'		=> 'Uncategorized',
-	'categories_updated'		=> 'Categories have been updated',
-	'categories_management'		=> 'Categories management',
-	'feed_updated'			=> 'Feed has been updated',
-	'rss_feed_management'		=> 'RSS feeds management',
-	'configuration_updated'		=> 'Configuration has been updated',
-	'sharing_management'		=> 'Sharing options management',
-	'bad_opml_file'			=> 'Your OPML file is invalid',
-	'shortcuts_updated'		=> 'Shortcuts have been updated',
-	'shortcuts_navigation'		=> 'Navigation',
-	'shortcuts_navigation_help'	=> 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
-	'shortcuts_article_action'	=> 'Article actions',
-	'shortcuts_other_action'	=> 'Other actions',
-	'feeds_marked_read'		=> 'Feeds have been marked as read',
-	'updated'			=> 'Modifications have been updated',
-
-	'already_subscribed'		=> 'You have already subscribed to <em>%s</em>',
-	'feed_added'			=> 'RSS feed <em>%s</em> has been added',
-	'feed_not_added'		=> '<em>%s</em> could not be added',
-	'internal_problem_feed'		=> 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
-	'invalid_url'			=> 'URL <em>%s</em> is invalid',
-	'feed_actualized'		=> '<em>%s</em> has been updated',
-	'n_feeds_actualized'		=> '%d feeds have been updated',
-	'feeds_actualized'		=> 'RSS feeds have been updated',
-	'no_feed_actualized'		=> 'No RSS feed has been updated',
-	'n_entries_deleted'		=> '%d articles have been deleted',
-	'feeds_imported_with_errors'	=> 'Your feeds have been imported but some errors occurred',
-	'feeds_imported'		=> 'Your feeds have been imported and will now be updated',
-	'category_emptied'		=> 'Category has been emptied',
-	'feed_deleted'			=> 'Feed has been deleted',
-	'feed_validator'		=> 'Check the validity of the feed',
-
-	'optimization_complete'		=> 'Optimization complete',
-
-	'your_rss_feeds'		=> 'Your RSS feeds',
-	'your_favorites'		=> 'Your favourites',
-	'public'			=> 'Public',
-	'invalid_login'			=> 'Login is invalid',
-
-	'file_is_nok'			=> 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into.',
-
-	// VIEWS
-	'save'				=> 'Save',
-	'delete'			=> 'Delete',
-	'cancel'			=> 'Cancel',
-	'submit'			=> 'Submit',
-
-	'back_to_rss_feeds'		=> '← Go back to your RSS feeds',
-	'feeds_moved_category_deleted'	=> 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
-	'category_number'		=> 'Category n°%d',
-	'ask_empty'			=> 'Clear?',
-	'number_feeds'			=> '%d feeds',
-	'can_not_be_deleted'		=> 'Cannot be deleted',
-	'add_category'			=> 'Add a category',
-	'new_category'			=> 'New category',
-
-	'javascript_for_shortcuts'	=> 'JavaScript must be enabled in order to use shortcuts',
-	'javascript_should_be_activated'=> 'JavaScript must be enabled',
-	'shift_for_all_read'		=> '+ <code>shift</code> to mark all articles as read',
-	'see_on_website'		=> 'See on original website',
-	'next_article'			=> 'Skip to the next article',
-	'last_article'			=> 'Skip to the last article',
-	'previous_article'		=> 'Skip to the previous article',
-	'first_article'			=> 'Skip to the first article',
-	'next_page'			=> 'Skip to the next page',
-	'previous_page'			=> 'Skip to the previous page',
-	'collapse_article'		=> 'Collapse',
-	'auto_share'			=> 'Share',
-	'auto_share_help'		=> 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-	'focus_search'			=> 'Access search box',
-	'user_filter'			=> 'Access user filters',
-	'user_filter_help'		=> 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-	'help'				=> 'Display documentation',
-	'close_dropdown'		=> 'Close drop-down lists',
-
-	'file_to_import'		=> 'File to import<br />(OPML, Json or Zip)',
-	'file_to_import_no_zip'		=> 'File to import<br />(OPML or Json)',
-	'import'			=> 'Import',
-	'file_cannot_be_uploaded'	=> 'File cannot be uploaded!',
-	'zip_error'			=> 'An error occured during Zip import.',
-	'no_zip_extension'		=> 'Zip extension is not present on your server.',
-	'export'			=> 'Export',
-	'export_opml'			=> 'Export list of feeds (OPML)',
-	'export_starred'		=> 'Export your favourites',
-	'export_no_zip_extension'	=> 'Zip extension is not present on your server. Please try to export files one by one.',
-	'starred_list'			=> 'List of favourite articles',
-	'feed_list'			=> 'List of %s articles',
-	'or'				=> 'or',
-
-	'informations'			=> 'Information',
-	'damn'				=> 'Damn!',
-	'ok'				=> 'Ok!',
-	'attention'			=> 'Be careful!',
-	'feed_in_error'			=> 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
-	'feed_empty'			=> 'This feed is empty. Please verify that it is still maintained.',
-	'feed_description'		=> 'Description',
-	'website_url'			=> 'Website URL',
-	'feed_url'			=> 'Feed URL',
-	'articles'			=> 'articles',
-	'number_articles'		=> '%d articles',
-	'by_feed'			=> 'by feed',
-	'by_default'			=> 'By default',
-	'keep_history'			=> 'Minimum number of articles to keep',
-	'ttl'				=> 'Do not automatically refresh more often than',
-	'categorize'			=> 'Store in a category',
-	'truncate'			=> 'Delete all articles',
-	'advanced'			=> 'Advanced',
-	'show_in_all_flux'		=> 'Show in main stream',
-	'yes'				=> 'Yes',
-	'no'				=> 'No',
-	'css_path_on_website'		=> 'Articles CSS path on original website',
-	'retrieve_truncated_feeds'	=> 'Retrieves truncated RSS feeds (attention, requires more time!)',
-	'http_authentication'		=> 'HTTP Authentication',
-	'http_username'			=> 'HTTP username',
-	'http_password'			=> 'HTTP password',
-	'blank_to_disable'		=> 'Leave blank to disable',
-	'share_name'			=> 'Share name to display',
-	'share_url'			=> 'Share URL to use',
-	'not_yet_implemented'		=> 'Not yet implemented',
-	'access_protected_feeds'	=> 'Connection allows to access HTTP protected RSS feeds',
-	'no_selected_feed'		=> 'No feed selected.',
-	'think_to_add'			=> 'You may add some feeds.',
-
-	'current_user'			=> 'Current user',
-	'default_user'			=> 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
-	'password_form'			=> 'Password<br /><small>(for the Web-form login method)</small>',
-	'password_api'			=> 'Password API<br /><small>(e.g., for mobile apps)</small>',
-	'persona_connection_email'	=> 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-	'allow_anonymous'		=> 'Allow anonymous reading of the articles of the default user (%s)',
-	'allow_anonymous_refresh'	=> 'Allow anonymous refresh of the articles',
-	'unsafe_autologin'		=> 'Allow unsafe automatic login using the format: ',
-	'api_enabled'			=> 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
-	'auth_token'			=> 'Authentication token',
-	'explain_token'			=> 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&amp;token=%s</kbd>',
-	'login_configuration'		=> 'Login',
-	'is_admin'			=> 'is administrator',
-	'auth_type'			=> 'Authentication method',
-	'auth_none'			=> 'None (dangerous)',
-	'auth_form'			=> 'Web form (traditional, requires JavaScript)',
-	'http_auth'			=> 'HTTP (for advanced users with HTTPS)',
-	'auth_persona'			=> 'Mozilla Persona (modern, requires JavaScript)',
-	'users_list'			=> 'List of users',
-	'create_user'			=> 'Create new user',
-	'username'			=> 'Username',
-	'username_admin'		=> 'Administrator username',
-	'password'			=> 'Password',
-	'create'			=> 'Create',
-	'user_created'			=> 'User %s has been created',
-	'user_deleted'			=> 'User %s has been deleted',
-
-	'language'			=> 'Language',
-	'month'				=> 'months',
-	'archiving_configuration'	=> 'Archiving',
-	'delete_articles_every'		=> 'Remove articles after',
-	'purge_now'			=> 'Purge now',
-	'purge_completed'		=> 'Purge completed (%d articles deleted)',
-	'archiving_configuration_help'	=> 'More options are available in the individual stream settings',
-	'reading_configuration'		=> 'Reading',
-	'display_configuration'		=> 'Display',
-	'articles_per_page'		=> 'Number of articles per page',
-	'number_divided_when_reader'	=> 'Divided by 2 in the reading view.',
-	'default_view'			=> 'Default view',
-	'articles_to_display'		=> 'Articles to display',
-	'sort_order'			=> 'Sort order',
-	'auto_load_more'		=> 'Load next articles at the page bottom',
-	'display_articles_unfolded'	=> 'Show articles unfolded by default',
-	'display_categories_unfolded'	=> 'Show categories folded by default',
-	'hide_read_feeds'		=> 'Hide categories &amp; feeds with no unread article (does not work with “Show all articles” configuration)',
-	'after_onread'			=> 'After “mark all as read”,',
-	'jump_next'			=> 'jump to next unread sibling (feed or category)',
-	'article_icons'			=> 'Article icons',
-	'top_line'			=> 'Top line',
-	'bottom_line'			=> 'Bottom line',
-	'html5_notif_timeout'		=> 'HTML5 notification timeout',
-	'seconds_(0_means_no_timeout)'	=> 'seconds (0 means no timeout)',
-	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
-	'sticky_post'			=> 'Stick the article to the top when opened',
-	'reading_confirm'		=> 'Display a confirmation dialog on “mark all as read” actions',
-	'auto_read_when'		=> 'Mark article as read…',
-	'article_viewed'		=> 'when article is viewed',
-	'article_open_on_website'	=> 'when article is opened on its original website',
-	'scroll'			=> 'while scrolling',
-	'upon_reception'		=> 'upon reception of the article',
-	'your_shaarli'			=> 'Your Shaarli',
-	'your_wallabag'			=> 'Your wallabag',
-	'your_diaspora_pod'		=> 'Your Diaspora* pod',
-	'sharing'			=> 'Sharing',
-	'share'				=> 'Share',
-	'by_email'			=> 'By email',
-	'optimize_bdd'			=> 'Optimize database',
-	'optimize_todo_sometimes'	=> 'To do occasionally to reduce the size of the database',
-	'theme'				=> 'Theme',
-	'content_width'			=> 'Content width',
-	'width_thin'			=> 'Thin',
-	'width_medium'			=> 'Medium',
-	'width_large'			=> 'Large',
-	'width_no_limit'		=> 'No limit',
-	'more_information'		=> 'More information',
-	'activate_sharing'		=> 'Activate sharing',
-	'shaarli'			=> 'Shaarli',
-	'blogotext'			=> 'Blogotext',
-	'wallabag'			=> 'wallabag',
-	'diaspora'			=> 'Diaspora*',
-	'twitter'			=> 'Twitter',
-	'g+'				=> 'Google+',
-	'facebook'			=> 'Facebook',
-	'email'				=> 'Email',
-	'print'				=> 'Print',
-
-	'article'			=> 'Article',
-	'title'				=> 'Title',
-	'author'			=> 'Author',
-	'publication_date'		=> 'Date of publication',
-	'by'				=> 'by',
-
-	'load_more'			=> 'Load more articles',
-	'nothing_to_load'		=> 'There are no more articles',
-
-	'rss_feeds_of'			=> 'RSS feed of %s',
-
-	'refresh'			=> 'Refresh',
-	'no_feed_to_refresh'		=> 'There is no feed to refresh…',
-
-	'today'				=> 'Today',
-	'yesterday'			=> 'Yesterday',
-	'before_yesterday'		=> 'Before yesterday',
-	'new_article'			=> 'There are new available articles, click to refresh the page.',
-	'by_author'			=> 'By <em>%s</em>',
-	'related_tags'			=> 'Related tags',
-	'no_feed_to_display'		=> 'There is no article to show.',
-
-	'about_freshrss'		=> 'About FreshRSS',
-	'project_website'		=> 'Project website',
-	'lead_developer'		=> 'Lead developer',
-	'website'			=> 'Website',
-	'bugs_reports'			=> 'Bugs reports',
-	'github_or_email'		=> '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
-	'license'			=> 'License',
-	'agpl3'				=> '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-	'freshrss_description'		=> 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
-	'credits'			=> 'Credits',
-	'credits_content'		=> 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
-	'version'			=> 'Version',
-
-	'logs'				=> 'Logs',
-	'logs_empty'			=> 'Log file is empty',
-	'clear_logs'			=> 'Clear the logs',
-
-	'forbidden_access'		=> 'Access is forbidden!',
-	'login_required'		=> 'Login required:',
-
-	'confirm_action'		=> 'Are you sure you want to perform this action? It cannot be cancelled!',
-	'confirm_action_feed_cat'	=> 'Are you sure you want to perform this action? You may lose related favorites and user queries. It cannot be cancelled!',
-	'notif_title_new_articles'	=> 'FreshRSS: new articles!',
-	'notif_body_new_articles'	=> 'There are \d new articles to read on FreshRSS.',
-
-	// DATE
-	'january'			=> 'January',
-	'february'			=> 'February',
-	'march'				=> 'March',
-	'april'				=> 'April',
-	'may'				=> 'May',
-	'june'				=> 'June',
-	'july'				=> 'July',
-	'august'			=> 'August',
-	'september'			=> 'September',
-	'october'			=> 'October',
-	'november'			=> 'November',
-	'december'			=> 'December',
-	'january'			=> 'Jan',
-	'february'			=> 'Feb',
-	'march'				=> 'Mar',
-	'april'				=> 'Apr',
-	'may'				=> 'May',
-	'june'				=> 'Jun',
-	'july'				=> 'Jul',
-	'august'			=> 'Aug',
-	'september'			=> 'Sep',
-	'october'			=> 'Oct',
-	'november'			=> 'Nov',
-	'december'			=> 'Dec',
-	'sun'				=> 'Sun',
-	'mon'				=> 'Mon',
-	'tue'				=> 'Tue',
-	'wed'				=> 'Wed',
-	'thu'				=> 'Thu',
-	'fri'				=> 'Fri',
-	'sat'				=> 'Sat',
-	// special format for date() function
-	'Jan'				=> '\J\a\n\u\a\r\y',
-	'Feb'				=> '\F\e\b\r\u\a\r\y',
-	'Mar'				=> '\M\a\r\c\h',
-	'Apr'				=> '\A\p\r\i\l',
-	'May'				=> '\M\a\y',
-	'Jun'				=> '\J\u\n\e',
-	'Jul'				=> '\J\u\l\y',
-	'Aug'				=> '\A\u\g\u\s\t',
-	'Sep'				=> '\S\e\p\t\e\m\b\e\r',
-	'Oct'				=> '\O\c\t\o\b\e\r',
-	'Nov'				=> '\N\o\v\e\m\b\e\r',
-	'Dec'				=> '\D\e\c\e\m\b\e\r',
-	// format for date() function, %s allows to indicate month in letter
-	'format_date'			=> '%s j\<\s\u\p\>S\<\/\s\u\p\> Y',
-	'format_date_hour'		=> '%s j\<\s\u\p\>S\<\/\s\u\p\> Y \a\t H\:i',
-	
-	'status_favorites'		=> 'Favourites',
-	'status_read'			=> 'Read',
-	'status_unread'			=> 'Unread',
-	'status_total'			=> 'Total',
-	
-	'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',
-	'stats_top_feed'		=> 'Top ten feeds',
-	'stats_entry_count'		=> 'Entry count',
-	'stats_no_idle'			=> 'There is no idle feed!',
-
-	'update'			=> 'Update',
-	'update_system'			=> 'Update system',
-	'update_check'			=> 'Check for new updates',
-	'update_last'			=> 'Last verification: %s',
-	'update_can_apply'		=> 'An update is available.',
-	'update_apply'			=> 'Apply',
-	'update_server_not_found'	=> 'Update server cannot be found. [%s]',
-	'no_update'			=> 'No update to apply',
-	'update_problem'		=> 'The update process has encountered an error: %s',
-	'update_finished'		=> 'Update completed!',
-
-	'auth_reset'			=> 'Authentication reset',
-	'auth_will_reset'		=> 'Authentication system will be reset: a form will be used instead of Persona.',
-	'auth_not_persona'		=> 'Only Persona system can be reset.',
-	'auth_no_password_set'		=> 'Administrator password hasn’t been set. This feature isn’t available.',
-	'auth_form_set'			=> 'Form is now your default authentication system.',
-	'auth_form_not_set'		=> 'A problem occured during authentication system configuration. Please retry later.',
-);
+ return array (
+  'about' => 'About',
+  'about_freshrss' => 'About FreshRSS',
+  'access_denied' => 'You don’t have permission to access this page',
+  'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
+  'activate_sharing' => 'Activate sharing',
+  'actualize' => 'Actualize',
+  'add_category' => 'Add a category',
+  'add_query' => 'Add a query',
+  'add_rss_feed' => 'Add a RSS feed',
+  'administration' => 'Manage',
+  'advanced' => 'Advanced',
+  'after_onread' => 'After “mark all as read”,',
+  'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+  'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
+  'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
+  'all_feeds' => 'All feeds',
+  'already_subscribed' => 'You have already subscribed to <em>%s</em>',
+  'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
+  'apr' => 'apr',
+  'Apr' => '\\A\\p\\r\\i\\l',
+  'april' => 'Apr',
+  'archiving_configuration' => 'Archiving',
+  'archiving_configuration_help' => 'More options are available in the individual stream settings',
+  'article' => 'Article',
+  'articles' => 'articles',
+  'articles_per_page' => 'Number of articles per page',
+  'articles_to_display' => 'Articles to display',
+  'article_icons' => 'Article icons',
+  'article_open_on_website' => 'when article is opened on its original website',
+  'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
+  'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
+  'article_viewed' => 'when article is viewed',
+  'ask_empty' => 'Clear?',
+  'attention' => 'Attention!',
+  'aug' => 'aug',
+  'Aug' => '\\A\\u\\g\\u\\s\\t',
+  'august' => 'Aug',
+  'author' => 'Author',
+  'auth_form' => 'Web form (traditional, requires JavaScript)',
+  'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
+  'auth_form_set' => 'Form is now your default authentication system.',
+  'auth_none' => 'None (dangerous)',
+  'auth_not_persona' => 'Only Persona system can be reset.',
+  'auth_no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
+  'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
+  'auth_reset' => 'Authentication reset',
+  'auth_token' => 'Authentication token',
+  'auth_type' => 'Authentication method',
+  'auth_will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+  'auto_load_more' => 'Load next articles at the page bottom',
+  'auto_read_when' => 'Mark article as read…',
+  'auto_share' => 'Share',
+  'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+  'back_to_rss_feeds' => '← Go back to your RSS feeds',
+  'bad_opml_file' => 'Your OPML file is invalid',
+  'base_url' => 'Base URL',
+  'bdd' => 'Database',
+  'bdd_configuration' => 'Database configuration',
+  'bdd_conf_is_ko' => 'Verify your database information.',
+  'bdd_conf_is_ok' => 'Database configuration has been saved.',
+  'bdd_type' => 'Type of database',
+  'before_one_day' => 'Before one day',
+  'before_one_week' => 'Before one week',
+  'before_yesterday' => 'Before yesterday',
+  'blank_to_disable' => 'Leave blank to disable',
+  'blogotext' => 'Blogotext',
+  'bookmark' => 'Subscribe (FreshRSS bookmark)',
+  'bottom_line' => 'Bottom line',
+  'bugs_reports' => 'Bugs reports',
+  'by' => 'by',
+  'by_author' => 'By <em>%s</em>',
+  'by_default' => 'By default',
+  'by_email' => 'By email',
+  'by_feed' => 'by feed',
+  'cache_is_ok' => 'Permissions on cache directory are good',
+  'cancel' => 'Cancel',
+  'can_not_be_deleted' => 'Cannot be deleted',
+  'categories' => 'Categories',
+  'categories_management' => 'Categories management',
+  'categories_updated' => 'Categories have been updated',
+  'categorize' => 'Store in a category',
+  'category' => 'Category',
+  'category_created' => 'Category %s has been created.',
+  'category_deleted' => 'Category has been deleted.',
+  'category_emptied' => 'Category has been emptied',
+  'category_empty' => 'Empty category',
+  'category_name_exists' => 'Category name already exists.',
+  'category_not_delete_default' => 'You cannot delete the default category!',
+  'category_not_exist' => 'The category does not exist!',
+  'category_no_id' => 'You must precise the id of the category.',
+  'category_no_name' => 'Category name cannot be empty.',
+  'category_number' => 'Category n°%d',
+  'category_updated' => 'Category has been updated.',
+  'change_value' => 'You should change this value by any other',
+  'checks' => 'Checks',
+  'choose_language' => 'Choose a language for FreshRSS',
+  'clear_logs' => 'Clear the logs',
+  'collapse_article' => 'Collapse',
+  'configuration' => 'Configuration',
+  'configuration_updated' => 'Configuration has been updated',
+  'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
+  'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You may lost related favorites and user queries. It cannot be cancelled!',
+  'congratulations' => 'Congratulations!',
+  'content_width' => 'Content width',
+  'create' => 'Create',
+  'create_user' => 'Create new user',
+  'credits' => 'Credits',
+  'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
+  'css_path_on_website' => 'Articles CSS path on original website',
+  'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
+  'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
+  'curl_is_nok' => 'You lack cURL (php5-curl package)',
+  'curl_is_ok' => 'You have version %s of cURL',
+  'current_user' => 'Current user',
+  'damn' => 'Damn!',
+  'data_is_ok' => 'Permissions on data directory are good',
+  'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+  'dec' => 'dec',
+  'december' => 'Dec',
+  'default_category' => 'Uncategorized',
+  'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
+  'default_view' => 'Default view',
+  'delete' => 'Delete',
+  'delete_articles_every' => 'Remove articles after',
+  'diaspora' => 'Diaspora*',
+  'display' => 'Display',
+  'display_articles_unfolded' => 'Show articles unfolded by default',
+  'display_categories_unfolded' => 'Show categories folded by default',
+  'display_configuration' => 'Display',
+  'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
+  'dom_is_ok' => 'You have the required library to browse the DOM',
+  'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
+  'email' => 'Email',
+  'error_occurred' => 'An error occurred',
+  'error_occurred_update' => 'Nothing was changed',
+  'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
+  'export' => 'Export',
+  'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
+  'export_opml' => 'Export list of feeds (OPML)',
+  'export_starred' => 'Export your favourites',
+  'facebook' => 'Facebook',
+  'favicons_is_ok' => 'Permissions on favicons directory are good',
+  'favorite_feeds' => 'Favourites (%s)',
+  'feb' => 'feb',
+  'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
+  'february' => 'Feb',
+  'feed' => 'Feed',
+  'feeds' => 'Feeds',
+  'feeds_actualized' => 'RSS feeds have been updated',
+  'feeds_imported' => 'Your feeds have been imported and will now be updated',
+  'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
+  'feeds_marked_read' => 'Feeds have been marked as read',
+  'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
+  'feed_actualized' => '<em>%s</em> has been updated',
+  'feed_added' => 'RSS feed <em>%s</em> has been added',
+  'feed_deleted' => 'Feed has been deleted',
+  'feed_description' => 'Description',
+  'feed_empty' => 'This feed is empty. Please verify that it is still maintained.',
+  'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
+  'feed_list' => 'List of %s articles',
+  'feed_not_added' => '<em>%s</em> could not be added',
+  'feed_updated' => 'Feed has been updated',
+  'feed_url' => 'Feed URL',
+  'feed_validator' => 'Check the validity of the feed',
+  'file_cannot_be_uploaded' => 'File cannot be uploaded!',
+  'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
+  'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
+  'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
+  'filter' => 'Filter',
+  'finish_installation' => 'Complete installation',
+  'first' => 'First',
+  'first_article' => 'Skip to the first article',
+  'fix_errors_before' => 'Fix errors before skip to the next step.',
+  'focus_search' => 'Access search box',
+  'forbidden_access' => 'Access is forbidden!',
+  'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+  'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+  'freshrss' => 'FreshRSS',
+  'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
+  'freshrss_installation' => 'Installation · FreshRSS',
+  'fri' => 'Fri',
+  'g+' => 'Google+',
+  'general_configuration' => 'General configuration',
+  'general_conf_is_ok' => 'General configuration has been saved.',
+  'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
+  'global_view' => 'Global view',
+  'help' => 'Display documentation',
+  'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
+  'host' => 'Host',
+  'html5_notif_timeout' => 'HTML5 notification timeout',
+  'http_auth' => 'HTTP (for advanced users with HTTPS)',
+  'http_authentication' => 'HTTP Authentication',
+  'http_password' => 'HTTP password',
+  'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
+  'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
+  'http_username' => 'HTTP username',
+  'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
+  'import' => 'Import',
+  'import_export' => 'Import / export',
+  'informations' => 'Information',
+  'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
+  'installation_step' => 'Installation — step %d · FreshRSS',
+  'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
+  'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
+  'invalid_login' => 'Login is invalid',
+  'invalid_url' => 'URL <em>%s</em> is invalid',
+  'is_admin' => 'is administrator',
+  'jan' => 'jan',
+  'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+  'january' => 'Jan',
+  'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
+  'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
+  'javascript_should_be_activated' => 'JavaScript must be enabled',
+  'Jul' => '\\J\\u\\l\\y',
+  'jul' => 'jul',
+  'july' => 'Jul',
+  'jump_next' => 'jump to next unread sibling (feed or category)',
+  'Jun' => '\\J\\u\\n\\e',
+  'jun' => 'jun',
+  'june' => 'Jun',
+  'keep_history' => 'Minimum number of articles to keep',
+  'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
+  'language' => 'Language',
+  'language_defined' => 'Language has been defined.',
+  'last' => 'Last',
+  'last_3_month' => 'Last three months',
+  'last_6_month' => 'Last six months',
+  'last_article' => 'Skip to the last article',
+  'last_month' => 'Last month',
+  'last_week' => 'Last week',
+  'last_year' => 'Last year',
+  'lead_developer' => 'Lead developer',
+  'license' => 'License',
+  'load_more' => 'Load more articles',
+  'login' => 'Login',
+  'login_configuration' => 'Login',
+  'login_persona_problem' => 'Connection problem with Persona?',
+  'login_required' => 'Login required:',
+  'login_with_persona' => 'Login with Persona',
+  'logout' => 'Logout',
+  'logs' => 'Logs',
+  'logs_empty' => 'Log file is empty',
+  'log_is_ok' => 'Permissions on logs directory are good',
+  'main_stream' => 'Main stream',
+  'Mar' => '\\M\\a\\r\\c\\h',
+  'mar' => 'mar',
+  'march' => 'Mar',
+  'mark_all_read' => 'Mark all as read',
+  'mark_cat_read' => 'Mark category as read',
+  'mark_favorite' => 'Mark as favourite',
+  'mark_feed_read' => 'Mark feed as read',
+  'mark_read' => 'Mark as read',
+  'May' => '\\M\\a\\y',
+  'may' => 'May',
+  'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
+  'minz_is_ok' => 'You have the Minz framework',
+  'mon' => 'Mon',
+  'month' => 'months',
+  'more_information' => 'More information',
+  'newer_first' => 'Newer first',
+  'new_article' => 'There are new available articles, click to refresh the page.',
+  'new_category' => 'New category',
+  'next' => 'Next',
+  'next_article' => 'Skip to the next article',
+  'next_page' => 'Skip to the next page',
+  'next_step' => 'Go to the next step',
+  'no' => 'No',
+  'normal_view' => 'Normal view',
+  'nothing_to_load' => 'There are no more articles',
+  'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+  'notif_title_new_articles' => 'FreshRSS: new articles!',
+  'not_read' => '%d unread',
+  'not_reads' => '%d unread',
+  'not_yet_implemented' => 'Not yet implemented',
+  'nov' => 'nov',
+  'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+  'november' => 'Nov',
+  'no_feed_actualized' => 'No RSS feed has been updated',
+  'no_feed_to_display' => 'There is no article to show.',
+  'no_feed_to_refresh' => 'There is no feed to refresh…',
+  'no_query' => 'You haven’t created any user query yet.',
+  'no_query_filter' => 'No filter',
+  'no_rss_feed' => 'No RSS feed',
+  'no_selected_feed' => 'No feed selected.',
+  'no_update' => 'No update to apply',
+  'no_zip_extension' => 'Zip extension is not present on your server.',
+  'number_articles' => '%d articles',
+  'number_divided_when_reader' => 'Divided by 2 in the reading view.',
+  'number_feeds' => '%d feeds',
+  'n_entries_deleted' => '%d articles have been deleted',
+  'n_feeds_actualized' => '%d feeds have been updated',
+  'oct' => 'oct',
+  'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+  'october' => 'Oct',
+  'ok' => 'Ok!',
+  'older_first' => 'Oldest first',
+  'oops' => 'Oops!',
+  'optimization_complete' => 'Optimization complete',
+  'optimize_bdd' => 'Optimize database',
+  'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
+  'or' => 'or',
+  'page_not_found' => 'You are looking for a page which doesn’t exist',
+  'password' => 'Password',
+  'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
+  'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+  'pcre_is_nok' => 'You lack a required library for regular expressions (php-pcre)',
+  'pcre_is_ok' => 'You have the required library for regular expressions (PCRE)',
+  'pdo_is_nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite)',
+  'pdo_is_ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite)',
+  'persona_connection_email' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+  'persona_is_ok' => 'Permissions on Mozilla Persona directory are good',
+  'php_is_nok' => 'Your PHP version is %s but FreshRSS requires at least version %s',
+  'php_is_ok' => 'Your PHP version is %s, which is compatible with FreshRSS',
+  'prefix' => 'Table prefix',
+  'previous' => 'Previous',
+  'previous_article' => 'Skip to the previous article',
+  'previous_page' => 'Skip to the previous page',
+  'print' => 'Print',
+  'project_website' => 'Project website',
+  'public' => 'Public',
+  'publication_date' => 'Date of publication',
+  'purge_completed' => 'Purge completed (%d articles deleted)',
+  'purge_now' => 'Purge now',
+  'queries' => 'User queries',
+  'query_created' => 'Query "%s" has been created.',
+  'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
+  'query_filter' => 'Filter applied:',
+  'query_get_all' => 'Display all articles',
+  'query_get_category' => 'Display "%s" category',
+  'query_get_favorite' => 'Display favorite articles',
+  'query_get_feed' => 'Display "%s" feed',
+  'query_number' => 'Query n°%d',
+  'query_order_asc' => 'Display oldest articles first',
+  'query_order_desc' => 'Display newest articles first',
+  'query_search' => 'Search for "%s"',
+  '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',
+  'random_string' => 'Random string',
+  'reader_view' => 'Reading view',
+  'reading_configuration' => 'Reading',
+  'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
+  'refresh' => 'Refresh',
+  'related_tags' => 'Related tags',
+  'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
+  'rss_feeds_of' => 'RSS feed of %s',
+  'rss_feed_management' => 'RSS feeds management',
+  'rss_view' => 'RSS feed',
+  'sat' => 'Sat',
+  'save' => 'Save',
+  'scroll' => 'while scrolling',
+  'search' => 'Search words or #tags',
+  'search_short' => 'Search',
+  'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
+  'see_on_website' => 'See on original website',
+  'see_website' => 'See website',
+  'sep' => 'sep',
+  'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+  'september' => 'Sep',
+  'shaarli' => 'Shaarli',
+  'share' => 'Share',
+  'share_name' => 'Share name to display',
+  'share_url' => 'Share URL to use',
+  'sharing' => 'Sharing',
+  'sharing_management' => 'Sharing options management',
+  'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
+  'shortcuts' => 'Shortcuts',
+  'shortcuts_article_action' => 'Article actions',
+  'shortcuts_navigation' => 'Navigation',
+  'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
+  'shortcuts_other_action' => 'Other actions',
+  'shortcuts_updated' => 'Shortcuts have been updated',
+  'show_adaptive' => 'Adjust showing',
+  'show_all_articles' => 'Show all articles',
+  'show_favorite' => 'Show only favorites',
+  'show_in_all_flux' => 'Show in main stream',
+  'show_not_favorite' => 'Show all but favorites',
+  'show_not_reads' => 'Show only unread',
+  'show_read' => 'Show only read',
+  'sort_order' => 'Sort order',
+  'starred_list' => 'List of favourite articles',
+  'stats' => 'Statistics',
+  'stats_entry_count' => 'Entry count',
+  'stats_entry_per_category' => 'Entries per category',
+  'stats_entry_per_day' => 'Entries per day (last 30 days)',
+  'stats_entry_per_day_of_week' => 'Per day of week',
+  'stats_entry_per_hour' => 'Per hour',
+  'stats_entry_per_month' => 'Per month',
+  'stats_entry_repartition' => 'Entries repartition',
+  'stats_feed_per_category' => 'Feeds per category',
+  'stats_idle' => 'Idle feeds',
+  'stats_main' => 'Main statistics',
+  'stats_no_idle' => 'There is no idle feed!',
+  'stats_percent_of_total' => '%% of total',
+  'stats_repartition' => 'Articles repartition',
+  'stats_top_feed' => 'Top ten feeds',
+  'status_favorites' => 'Favourites',
+  'status_read' => 'Read',
+  'status_total' => 'Total',
+  'status_unread' => 'Unread',
+  'steps' => 'Steps',
+  'sticky_post' => 'Stick the article to the top when opened',
+  'submit' => 'Submit',
+  'subscription_management' => 'Subscriptions management',
+  'sun' => 'Sun',
+  'theme' => 'Theme',
+  'think_to_add' => 'You may add some feeds.',
+  'this_is_the_end' => 'This is the end',
+  'thu' => 'Thu',
+  'title' => 'Title',
+  'today' => 'Today',
+  'top_line' => 'Top line',
+  'truncate' => 'Delete all articles',
+  'ttl' => 'Do not automatically refresh more often than',
+  'tue' => 'Tue',
+  'twitter' => 'Twitter',
+  'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
+  'update' => 'Update',
+  'updated' => 'Modifications have been updated',
+  'update_apply' => 'Apply',
+  'update_can_apply' => 'An update is available.',
+  'update_check' => 'Check for new updates',
+  'update_end' => 'Update process is completed, now you can go to the final step.',
+  'update_finished' => 'Update completed!',
+  'update_last' => 'Last verification: %s',
+  'update_long' => 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
+  'update_problem' => 'The update process has encountered an error: %s',
+  'update_server_not_found' => 'Update server cannot be found. [%s]',
+  'update_start' => 'Start update process',
+  'update_system' => 'Update system',
+  'upon_reception' => 'upon reception of the article',
+  'username' => 'Username',
+  'username_admin' => 'Administrator username',
+  'users' => 'Users',
+  'users_list' => 'List of users',
+  'user_created' => 'User %s has been created',
+  'user_deleted' => 'User %s has been deleted',
+  'user_filter' => 'Access user filters',
+  'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
+  'version' => 'Version',
+  'version_update' => 'Update',
+  'wallabag' => 'wallabag',
+  'website' => 'Website',
+  'website_url' => 'Website URL',
+  'wed' => 'Wed',
+  'width_large' => 'Large',
+  'width_medium' => 'Medium',
+  'width_no_limit' => 'No limit',
+  'width_thin' => 'Thin',
+  'yes' => 'Yes',
+  'yesterday' => 'Yesterday',
+  'your_diaspora_pod' => 'Your Diaspora* pod',
+  'your_favorites' => 'Your favourites',
+  'your_rss_feeds' => 'Your RSS feeds',
+  'your_shaarli' => 'Your Shaarli',
+  'your_wallabag' => 'Your wallabag',
+  'zip_error' => 'An error occured during Zip import.',
+);
\ No newline at end of file
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index adc79d0e2..072094026 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -1,456 +1,473 @@
 <?php
-
-return array (
-	// LAYOUT
-	'login'				=> 'Connexion',
-	'keep_logged_in'		=> 'Rester connecté <small>(1 mois)</small>',
-	'login_with_persona'		=> 'Connexion avec Persona',
-	'login_persona_problem'		=> 'Problème de connexion à Persona ?',
-	'logout'			=> 'Déconnexion',
-	'search'			=> 'Rechercher des mots ou des #tags',
-	'search_short'			=> 'Rechercher',
-
-	'configuration'			=> 'Configuration',
-	'users'				=> 'Utilisateurs',
-	'categories'			=> 'Catégories',
-	'category'			=> 'Catégorie',
-	'feed'				=> 'Flux',
-	'feeds'				=> 'Flux',
-	'shortcuts'			=> 'Raccourcis',
-	'queries'			=> 'Filtres utilisateurs',
-	'query_search'			=> 'Recherche de "%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_get_all'			=> 'Afficher tous les articles',
-	'query_get_favorite'		=> 'Afficher les articles favoris',
-	'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',
-	'query_number'			=> 'Filtre n°%d',
-	'add_query'			=> 'Créer un filtre',
-	'query_created'			=> 'Le filtre "%s" a bien été créé.',
-	'no_query'			=> 'Vous n’avez pas encore créé de filtre.',
-	'query_filter'			=> 'Filtres appliqués :',
-	'no_query_filter'		=> 'Aucun filtre appliqué',
-	'query_deprecated'		=> 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
-	'about'				=> 'À propos',
-	'stats'				=> 'Statistiques',
-	'stats_idle'			=> 'Flux inactifs',
-	'stats_main'			=> 'Statistiques principales',
-	'stats_repartition'		=> 'Répartition des articles',
-	'stats_entry_per_hour'		=> 'Par heure',
-	'stats_entry_per_day_of_week'	=> 'Par jour de la semaine',
-	'stats_entry_per_month'		=> 'Par mois',
-	'stats_percent_of_total'	=> '%% du total',
-
-	'last_week'			=> 'Depuis la semaine dernière',
-	'last_month'			=> 'Depuis le mois dernier',
-	'last_3_month'			=> 'Depuis les trois derniers mois',
-	'last_6_month'			=> 'Depuis les six derniers mois',
-	'last_year'			=> 'Depuis l’année dernière',
-
-	'your_rss_feeds'		=> 'Vos flux RSS',
-	'add_rss_feed'			=> 'Ajouter un flux RSS',
-	'no_rss_feed'			=> 'Aucun flux RSS',
-	'import_export'			=> 'Importer / exporter',
-	'bookmark'			=> 'S’abonner (bookmark FreshRSS)',
-
-	'subscription_management'	=> 'Gestion des abonnements',
-	'main_stream'			=> 'Flux principal',
-	'all_feeds'			=> 'Tous les flux',
-	'favorite_feeds'		=> 'Favoris (%s)',
-	'not_read'			=> '%d non lu',
-	'not_reads'			=> '%d non lus',
-
-	'filter'			=> 'Filtrer',
-	'see_website'			=> 'Voir le site',
-	'administration'		=> 'Gérer',
-	'actualize'			=> 'Actualiser',
-
-	'mark_read'			=> 'Marquer comme lu',
-	'mark_favorite'			=> 'Mettre en favori',
-	'mark_all_read'			=> 'Tout marquer comme lu',
-	'mark_feed_read'		=> 'Marquer le flux comme lu',
-	'mark_cat_read'			=> 'Marquer la catégorie comme lue',
-	'before_one_day'		=> 'Antérieurs à 1 jour',
-	'before_one_week'		=> 'Antérieurs à 1 semaine',
-	'display'			=> 'Affichage',
-	'normal_view'			=> 'Vue normale',
-	'reader_view'			=> 'Vue lecture',
-	'global_view'			=> 'Vue globale',
-	'rss_view'			=> 'Flux RSS',
-	'show_all_articles'		=> 'Afficher tous les articles',
-	'show_not_reads'		=> 'Afficher les non lus',
-	'show_adaptive'			=> 'Adapter l’affichage',
-	'show_read'			=> 'Afficher les lus',
-	'show_favorite'			=> 'Afficher les favoris',
-	'show_not_favorite'		=> 'Afficher tout sauf les favoris',
-	'older_first'			=> 'Plus anciens en premier',
-	'newer_first'			=> 'Plus récents en premier',
-
-	// Pagination
-	'first'				=> 'Début',
-	'previous'			=> 'Précédent',
-	'next'				=> 'Suivant',
-	'last'				=> 'Fin',
-
-	// CONTROLLERS
-	'article_published_on'		=> 'Article publié initialement sur <a href="%s">%s</a>',
-	'article_published_on_author'	=> 'Article publié initialement sur <a href="%s">%s</a> par %s',
-
-	'access_denied'			=> 'Vous n’avez pas le droit d’accéder à cette page !',
-	'page_not_found'		=> 'La page que vous cherchez n’existe pas !',
-	'error_occurred'		=> 'Une erreur est survenue !',
-	'error_occurred_update'		=> 'Rien n’a été modifié !',
-
-	'default_category'		=> 'Sans catégorie',
-	'categories_updated'		=> 'Les catégories ont été mises à jour.',
-	'categories_management'		=> 'Gestion des catégories',
-	'feed_updated'			=> 'Le flux a été mis à jour.',
-	'rss_feed_management'		=> 'Gestion des flux RSS',
-	'configuration_updated'		=> 'La configuration a été mise à jour.',
-	'sharing_management'		=> 'Gestion des options de partage',
-	'bad_opml_file'			=> 'Votre fichier OPML n’est pas valide.',
-	'shortcuts_updated'		=> 'Les raccourcis ont été mis à jour.',
-	'shortcuts_navigation'		=> 'Navigation',
-	'shortcuts_navigation_help'	=> 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
-	'shortcuts_article_action'	=> 'Actions associées à l’article courant',
-	'shortcuts_other_action'	=> 'Autres actions',
-	'feeds_marked_read'		=> 'Les flux ont été marqués comme lus.',
-	'updated'			=> 'Modifications enregistrées.',
-
-	'already_subscribed'		=> 'Vous êtes déjà abonné à <em>%s</em>',
-	'feed_added'			=> 'Le flux <em>%s</em> a bien été ajouté.',
-	'feed_not_added'		=> '<em>%s</em> n’a pas pu être ajouté.',
-	'internal_problem_feed'		=> 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
-	'invalid_url'			=> 'L’url <em>%s</em> est invalide.',
-	'feed_actualized'		=> '<em>%s</em> a été mis à jour.',
-	'n_feeds_actualized'		=> '%d flux ont été mis à jour.',
-	'feeds_actualized'		=> 'Les flux ont été mis à jour.',
-	'no_feed_actualized'		=> 'Aucun flux n’a pu être mis à jour.',
-	'n_entries_deleted'		=> '%d articles ont été supprimés.',
-	'feeds_imported_with_errors'	=> 'Vos flux ont été importés mais des erreurs sont survenues.',
-	'feeds_imported'		=> 'Vos flux ont été importés et vont maintenant être actualisés.',
-	'category_emptied'		=> 'La catégorie a été vidée.',
-	'feed_deleted'			=> 'Le flux a été supprimé.',
-	'feed_validator'		=> 'Vérifier la valididé du flux',
-
-	'optimization_complete'		=> 'Optimisation terminée.',
-
-	'your_rss_feeds'		=> 'Vos flux RSS',
-	'your_favorites'		=> 'Vos favoris',
-	'public'			=> 'Public',
-	'invalid_login'			=> 'L’identifiant est invalide !',
-
-	'file_is_nok'			=> 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
-
-	// VIEWS
-	'save'				=> 'Enregistrer',
-	'delete'			=> 'Supprimer',
-	'cancel'			=> 'Annuler',
-	'submit'			=> 'Valider',
-
-	'back_to_rss_feeds'		=> '← Retour à vos flux RSS',
-	'feeds_moved_category_deleted'	=> 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
-	'category_number'		=> 'Catégorie n°%d',
-	'ask_empty'			=> 'Vider ?',
-	'number_feeds'			=> '%d flux',
-	'can_not_be_deleted'		=> 'Ne peut pas être supprimée.',
-	'add_category'			=> 'Ajouter une catégorie',
-	'new_category'			=> 'Nouvelle catégorie',
-
-	'javascript_for_shortcuts'	=> 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
-	'javascript_should_be_activated'=> 'Le JavaScript doit être activé.',
-	'shift_for_all_read'		=> '+ <code>shift</code> pour marquer tous les articles comme lus',
-	'see_on_website'		=> 'Voir sur le site d’origine',
-	'next_article'			=> 'Passer à l’article suivant',
-	'last_article'			=> 'Passer au dernier article',
-	'previous_article'		=> 'Passer à l’article précédent',
-	'first_article'			=> 'Passer au premier article',
-	'next_page'			=> 'Passer à la page suivante',
-	'previous_page'			=> 'Passer à la page précédente',
-	'collapse_article'		=> 'Refermer',
-	'auto_share'			=> 'Partager',
-	'auto_share_help'		=> 'S’il n’y a qu’un mode de partage, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-	'focus_search'			=> 'Accéder à la recherche',
-	'user_filter'			=> 'Accéder aux filtres utilisateur',
-	'user_filter_help'		=> 'S’il n’y a qu’un filtre utilisateur, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-	'help'				=> 'Afficher la documentation',
-	'close_dropdown'		=> 'Fermer les listes déroulantes',
-
-	'file_to_import'		=> 'Fichier à importer<br />(OPML, Json ou Zip)',
-	'file_to_import_no_zip'		=> 'Fichier à importer<br />(OPML ou Json)',
-	'import'			=> 'Importer',
-	'file_cannot_be_uploaded'	=> 'Le fichier ne peut pas être téléchargé!',
-	'zip_error'			=> 'Une erreur est survenue durant l’import du fichier Zip.',
-	'no_zip_extension'		=> 'L’extension Zip n’est pas présente sur votre serveur.',
-	'export'			=> 'Exporter',
-	'export_opml'			=> 'Exporter la liste des flux (OPML)',
-	'export_starred'		=> 'Exporter les favoris',
-	'export_no_zip_extension'	=> 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
-	'starred_list'			=> 'Liste des articles favoris',
-	'feed_list'			=> 'Liste des articles de %s',
-	'or'				=> 'ou',
-
-	'informations'			=> 'Informations',
-	'damn'				=> 'Arf !',
-	'ok'				=> 'Ok !',
-	'attention'			=> 'Attention !',
-	'feed_in_error'			=> 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
-	'feed_empty'			=> 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
-	'feed_description'		=> 'Description',
-	'website_url'			=> 'URL du site',
-	'feed_url'			=> 'URL du flux',
-	'articles'			=> 'articles',
-	'number_articles'		=> '%d articles',
-	'by_feed'			=> 'par flux',
-	'by_default'			=> 'Par défaut',
-	'keep_history'			=> 'Nombre minimum d’articles à conserver',
-	'ttl'				=> 'Ne pas automatiquement rafraîchir plus souvent que',
-	'categorize'			=> 'Ranger dans une catégorie',
-	'truncate'			=> 'Supprimer tous les articles',
-	'advanced'			=> 'Avancé',
-	'show_in_all_flux'		=> 'Afficher dans le flux principal',
-	'yes'				=> 'Oui',
-	'no'				=> 'Non',
-	'css_path_on_website'		=> 'Sélecteur CSS des articles sur le site d’origine',
-	'retrieve_truncated_feeds'	=> 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
-	'http_authentication'		=> 'Authentification HTTP',
-	'http_username'			=> 'Identifiant HTTP',
-	'http_password'			=> 'Mot de passe HTTP',
-	'blank_to_disable'		=> 'Laissez vide pour désactiver',
-	'share_name'			=> 'Nom du partage à afficher',
-	'share_url'			=> 'URL du partage à utiliser',
-	'not_yet_implemented'		=> 'Pas encore implémenté',
-	'access_protected_feeds'	=> 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
-	'no_selected_feed'		=> 'Aucun flux sélectionné.',
-	'think_to_add'			=> 'Vous pouvez ajouter des flux.',
-
-	'current_user'			=> 'Utilisateur actuel',
-	'password_form'			=> 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
-	'password_api'			=> 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
-	'default_user'			=> 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
-	'persona_connection_email'	=> 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-	'allow_anonymous'		=> 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
-	'allow_anonymous_refresh'	=> 'Autoriser le rafraîchissement anonyme des flux',
-	'unsafe_autologin'		=> 'Autoriser les connexions automatiques non-sûres au format : ',
-	'api_enabled'			=> 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-	'auth_token'			=> 'Jeton d’identification',
-	'explain_token'			=> 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&amp;token=%s</kbd>',
-	'login_configuration'		=> 'Identification',
-	'is_admin'			=> 'est administrateur',
-	'auth_type'			=> 'Méthode d’authentification',
-	'auth_none'			=> 'Aucune (dangereux)',
-	'auth_form'			=> 'Formulaire (traditionnel, requiert JavaScript)',
-	'http_auth'			=> 'HTTP (pour utilisateurs avancés avec HTTPS)',
-	'auth_persona'			=> 'Mozilla Persona (moderne, requiert JavaScript)',
-	'users_list'			=> 'Liste des utilisateurs',
-	'create_user'			=> 'Créer un nouvel utilisateur',
-	'username'			=> 'Nom d’utilisateur',
-	'username_admin'		=> 'Nom d’utilisateur administrateur',
-	'password'			=> 'Mot de passe',
-	'create'			=> 'Créer',
-	'user_created'			=> 'L’utilisateur %s a été créé.',
-	'user_deleted'			=> 'L’utilisateur %s a été supprimé.',
-
-	'language'			=> 'Langue',
-	'month'				=> 'mois',
-	'archiving_configuration'	=> 'Archivage',
-	'delete_articles_every'		=> 'Supprimer les articles après',
-	'purge_now'			=> 'Purger maintenant',
-	'purge_completed'		=> 'Purge effectuée (%d articles supprimés).',
-	'archiving_configuration_help'	=> 'D’autres options sont disponibles dans la configuration individuelle des flux.',
-	'reading_configuration'		=> 'Lecture',
-	'display_configuration'		=> 'Affichage',
-	'articles_per_page'		=> 'Nombre d’articles par page',
-	'number_divided_when_reader'	=> 'Divisé par 2 dans la vue de lecture.',
-	'default_view'			=> 'Vue par défaut',
-	'articles_to_display'		=> 'Articles à afficher',
-	'sort_order'			=> 'Ordre de tri',
-	'auto_load_more'		=> 'Charger les articles suivants en bas de page',
-	'display_articles_unfolded'	=> 'Afficher les articles dépliés par défaut',
-	'display_categories_unfolded'	=> 'Afficher les catégories pliées par défaut',
-	'hide_read_feeds'		=> 'Cacher les catégories &amp; flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
-	'after_onread'			=> 'Après “marquer tout comme lu”,',
-	'jump_next'			=> 'sauter au prochain voisin non lu (flux ou catégorie)',
-	'article_icons'			=> 'Icônes d’article',
-	'top_line'			=> 'Ligne du haut',
-	'bottom_line'			=> 'Ligne du bas',
-	'html5_notif_timeout'		=> 'Temps d’affichage de la notification HTML5',
-	'seconds_(0_means_no_timeout)'	=> 'secondes (0 signifie aucun timeout ) ',
-	'img_with_lazyload'		=> 'Utiliser le mode “chargement différé” pour les images',
-	'sticky_post'			=> 'Aligner l’article en haut quand il est ouvert',
-	'reading_confirm'		=> 'Afficher une confirmation lors des actions “marquer tout comme lu”',
-	'auto_read_when'		=> 'Marquer un article comme lu…',
-	'article_viewed'		=> 'lorsque l’article est affiché',
-	'article_open_on_website'	=> 'lorsque l’article est ouvert sur le site d’origine',
-	'scroll'			=> 'au défilement de la page',
-	'upon_reception'		=> 'dès la réception du nouvel article',
-	'your_shaarli'			=> 'Votre Shaarli',
-	'your_wallabag'			=> 'Votre wallabag',
-	'your_diaspora_pod'		=> 'Votre pod Diaspora*',
-	'sharing'			=> 'Partage',
-	'share'				=> 'Partager',
-	'by_email'			=> 'Par courriel',
-	'optimize_bdd'			=> 'Optimiser la base de données',
-	'optimize_todo_sometimes'	=> 'À faire de temps en temps pour réduire la taille de la BDD',
-	'theme'				=> 'Thème',
-	'content_width'			=> 'Largeur du contenu',
-	'width_thin'			=> 'Fine',
-	'width_medium'			=> 'Moyenne',
-	'width_large'			=> 'Large',
-	'width_no_limit'		=> 'Pas de limite',
-	'more_information'		=> 'Plus d’informations',
-	'activate_sharing'		=> 'Activer le partage',
-	'shaarli'			=> 'Shaarli',
-	'blogotext'			=> 'Blogotext',
-	'wallabag'			=> 'wallabag',
-	'diaspora'			=> 'Diaspora*',
-	'twitter'			=> 'Twitter',
-	'g+'				=> 'Google+',
-	'facebook'			=> 'Facebook',
-	'email'				=> 'Courriel',
-	'print'				=> 'Imprimer',
-
-	'article'			=> 'Article',
-	'title'				=> 'Titre',
-	'author'			=> 'Auteur',
-	'publication_date'		=> 'Date de publication',
-	'by'				=> 'par',
-
-	'load_more'			=> 'Charger plus d’articles',
-	'nothing_to_load'		=> 'Fin des articles',
-
-	'rss_feeds_of'			=> 'Flux RSS de %s',
-
-	'refresh'			=> 'Actualisation',
-	'no_feed_to_refresh'		=> 'Il n’y a aucun flux à actualiser…',
-
-	'today'				=> 'Aujourd’hui',
-	'yesterday'			=> 'Hier',
-	'before_yesterday'		=> 'À partir d’avant-hier',
-	'new_article'			=> 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
-	'by_author'			=> 'Par <em>%s</em>',
-	'related_tags'			=> 'Tags associés',
-	'no_feed_to_display'		=> 'Il n’y a aucun article à afficher.',
-
-	'about_freshrss'		=> 'À propos de FreshRSS',
-	'project_website'		=> 'Site du projet',
-	'lead_developer'		=> 'Développeur principal',
-	'website'			=> 'Site Internet',
-	'bugs_reports'			=> 'Rapports de bugs',
-	'github_or_email'		=> '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
-	'license'			=> 'Licence',
-	'agpl3'				=> '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-	'freshrss_description'		=> 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
-	'credits'			=> 'Crédits',
-	'credits_content'		=> 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
-	'version'			=> 'Version',
-
-	'logs'				=> 'Logs',
-	'logs_empty'			=> 'Les logs sont vides.',
-	'clear_logs'			=> 'Effacer les logs',
-
-	'forbidden_access'		=> 'L’accès vous est interdit !',
-	'login_required'		=> 'Accès protégé par mot de passe :',
-
-	'confirm_action'		=> 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
-	'confirm_action_feed_cat'	=> 'Êtes-vous sûr(e) de vouloir continuer ? Vous pourriez perdre les favoris et les filtres associés. Cette action ne peut être annulée !',
-	'notif_title_new_articles'	=> 'FreshRSS : nouveaux articles !',
-	'notif_body_new_articles'	=> 'Il y a \d nouveaux articles à lire sur FreshRSS.',
-
-	// DATE
-	'january'			=> 'janvier',
-	'february'			=> 'février',
-	'march'				=> 'mars',
-	'april'				=> 'avril',
-	'may'				=> 'mai',
-	'june'				=> 'juin',
-	'july'				=> 'juillet',
-	'august'			=> 'août',
-	'september'			=> 'septembre',
-	'october'			=> 'octobre',
-	'november'			=> 'novembre',
-	'december'			=> 'décembre',
-	'jan'				=> 'jan.',
-	'feb'				=> 'fév.',
-	'mar'				=> 'mar.',
-	'apr'				=> 'avr.',
-	'may'				=> 'mai.',
-	'jun'				=> 'juin',
-	'jul'				=> 'jui.',
-	'aug'				=> 'août',
-	'sep'				=> 'sep.',
-	'oct'				=> 'oct.',
-	'nov'				=> 'nov.',
-	'dec'				=> 'déc.',
-	'sun'				=> 'dim.',
-	'mon'				=> 'lun.',
-	'tue'				=> 'mar.',
-	'wed'				=> 'mer.',
-	'thu'				=> 'jeu.',
-	'fri'				=> 'ven.',
-	'sat'				=> 'sam.',
-	// format spécial pour la fonction date()
-	'Jan'				=> '\j\a\n\v\i\e\r',
-	'Feb'				=> '\f\é\v\r\i\e\r',
-	'Mar'				=> '\m\a\r\s',
-	'Apr'				=> '\a\v\r\i\l',
-	'May'				=> '\m\a\i',
-	'Jun'				=> '\j\u\i\n',
-	'Jul'				=> '\j\u\i\l\l\e\t',
-	'Aug'				=> '\a\o\û\t',
-	'Sep'				=> '\s\e\p\t\e\m\b\r\e',
-	'Oct'				=> '\o\c\t\o\b\r\e',
-	'Nov'				=> '\n\o\v\e\m\b\r\e',
-	'Dec'				=> '\d\é\c\e\m\b\r\e',
-	// format pour la fonction date(), %s permet d'indiquer le mois en toutes lettres
-	'format_date'			=> 'j %s Y',
-	'format_date_hour'		=> 'j %s Y \à H\:i',
-	
-	'status_favorites'		=> 'favoris',
-	'status_read'			=> 'lus',
-	'status_unread'			=> 'non lus',
-	'status_total'			=> 'total',
-	
-	'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 catégorie',
-	'stats_entry_per_category'	=> 'Articles par catégorie',
-	'stats_top_feed'		=> 'Les dix plus gros flux',
-	'stats_entry_count'		=> 'Nombre d’articles',
-	'stats_no_idle'			=> 'Il n’y a aucun flux inactif !',
-
-	'update'			=> 'Mise à jour',
-	'update_system'			=> 'Système de mise à jour',
-	'update_check'			=> 'Vérifier les mises à jour',
-	'update_last'			=> 'Dernière vérification : %s',
-	'update_can_apply'		=> 'Une mise à jour est disponible.',
-	'update_apply'			=> 'Appliquer la mise à jour',
-	'update_server_not_found'	=> 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
-	'no_update'			=> 'Aucune mise à jour à appliquer',
-	'update_problem'		=> 'La mise à jour a rencontré un problème : %s',
-	'update_finished'		=> 'La mise à jour est terminée !',
-
-	'auth_reset'			=> 'Réinitialisation de l’authentification',
-	'auth_will_reset'		=> 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
-	'auth_not_persona'		=> 'Seul le système d’authentification Persona peut être réinitialisé.',
-	'auth_no_password_set'		=> 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
-	'auth_form_set'			=> 'Le formulaire est désormais votre système d’authentification.',
-	'auth_form_not_set'		=> 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
-);
+ return array (
+  'about' => 'À propos',
+  'about_freshrss' => 'À propos de FreshRSS',
+  'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
+  'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
+  'activate_sharing' => 'Activer le partage',
+  'actualize' => 'Actualiser',
+  'add_category' => 'Ajouter une catégorie',
+  'add_query' => 'Créer un filtre',
+  'add_rss_feed' => 'Ajouter un flux RSS',
+  'administration' => 'Gérer',
+  'advanced' => 'Avancé',
+  'after_onread' => 'Après “marquer tout comme lu”,',
+  'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+  'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
+  'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
+  'all_feeds' => 'Tous les flux',
+  'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
+  'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
+  'apr' => 'avr.',
+  'Apr' => '\\a\\v\\r\\i\\l',
+  'april' => 'avril',
+  'archiving_configuration' => 'Archivage',
+  'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
+  'article' => 'Article',
+  'articles' => 'articles',
+  'articles_per_page' => 'Nombre d’articles par page',
+  'articles_to_display' => 'Articles à afficher',
+  'article_icons' => 'Icônes d’article',
+  'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
+  'article_published_on' => 'Article publié initialement sur <a href="%s">%s</a>',
+  'article_published_on_author' => 'Article publié initialement sur <a href="%s">%s</a> par %s',
+  'article_viewed' => 'lorsque l’article est affiché',
+  'ask_empty' => 'Vider ?',
+  'attention' => 'Attention !',
+  'aug' => 'août',
+  'Aug' => '\\a\\o\\û\\t',
+  'august' => 'août',
+  'author' => 'Auteur',
+  'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
+  'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
+  'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
+  'auth_none' => 'Aucune (dangereux)',
+  'auth_not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
+  'auth_no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
+  'auth_persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
+  'auth_reset' => 'Réinitialisation de l’authentification',
+  'auth_token' => 'Jeton d’identification',
+  'auth_type' => 'Méthode d’authentification',
+  'auth_will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
+  'auto_load_more' => 'Charger les articles suivants en bas de page',
+  'auto_read_when' => 'Marquer un article comme lu…',
+  'auto_share' => 'Partager',
+  'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+  'back_to_rss_feeds' => '← Retour à vos flux RSS',
+  'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
+  'base_url' => 'Base de l’URL',
+  'bdd' => 'Base de données',
+  'bdd_configuration' => 'Base de données',
+  'bdd_conf_is_ko' => 'Vérifiez les informations d’accès à la base de données.',
+  'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
+  'bdd_type' => 'Type de base de données',
+  'before_one_day' => 'Antérieurs à 1 jour',
+  'before_one_week' => 'Antérieurs à 1 semaine',
+  'before_yesterday' => 'À partir d’avant-hier',
+  'blank_to_disable' => 'Laissez vide pour désactiver',
+  'blogotext' => 'Blogotext',
+  'bookmark' => 'S’abonner (bookmark FreshRSS)',
+  'bottom_line' => 'Ligne du bas',
+  'bugs_reports' => 'Rapports de bugs',
+  'by' => 'par',
+  'by_author' => 'Par <em>%s</em>',
+  'by_default' => 'Par défaut',
+  'by_email' => 'Par courriel',
+  'by_feed' => 'par flux',
+  'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons',
+  'cancel' => 'Annuler',
+  'can_not_be_deleted' => 'Ne peut pas être supprimée.',
+  'categories' => 'Catégories',
+  'categories_management' => 'Gestion des catégories',
+  'categories_updated' => 'Les catégories ont été mises à jour.',
+  'categorize' => 'Ranger dans une catégorie',
+  'category' => 'Catégorie',
+  'category_created' => 'La catégorie %s a été créée.',
+  'category_deleted' => 'La catégorie a été supprimée.',
+  'category_emptied' => 'La catégorie a été vidée.',
+  'category_empty' => 'Catégorie vide',
+  'category_name_exists' => 'Une catégorie possède déjà ce nom.',
+  'category_not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
+  'category_not_exist' => 'Cette catégorie n\'existe pas !',
+  'category_no_id' => 'Vous devez préciser l\'id de la catégorie.',
+  'category_no_name' => 'Vous devez préciser un nom pour la catégorie.',
+  'category_number' => 'Catégorie n°%d',
+  'category_updated' => 'La catégorie a été mise à jour.',
+  'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
+  'checks' => 'Vérifications',
+  'choose_language' => 'Choisissez la langue pour FreshRSS',
+  'clear_logs' => 'Effacer les logs',
+  'collapse_article' => 'Refermer',
+  'configuration' => 'Configuration',
+  'configuration_updated' => 'La configuration a été mise à jour.',
+  'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
+  'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous pourriez perdre les favoris et les filtres associés. Cette action ne peut être annulée !',
+  'congratulations' => 'Félicitations !',
+  'content_width' => 'Largeur du contenu',
+  'create' => 'Créer',
+  'create_user' => 'Créer un nouvel utilisateur',
+  'credits' => 'Crédits',
+  'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
+  'css_path_on_website' => 'Sélecteur CSS des articles sur le site d’origine',
+  'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
+  'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
+  'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
+  'curl_is_ok' => 'Vous disposez de cURL dans sa version %s',
+  'current_user' => 'Utilisateur actuel',
+  'damn' => 'Arf !',
+  'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
+  'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
+  'dec' => 'déc.',
+  'december' => 'décembre',
+  'default_category' => 'Sans catégorie',
+  'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
+  'default_view' => 'Vue par défaut',
+  'delete' => 'Supprimer',
+  'delete_articles_every' => 'Supprimer les articles après',
+  'diaspora' => 'Diaspora*',
+  'display' => 'Affichage',
+  'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
+  'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
+  'display_configuration' => 'Affichage',
+  'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
+  'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
+  'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
+  'email' => 'Courriel',
+  'error_occurred' => 'Une erreur est survenue !',
+  'error_occurred_update' => 'Rien n’a été modifié !',
+  'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
+  'export' => 'Exporter',
+  'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
+  'export_opml' => 'Exporter la liste des flux (OPML)',
+  'export_starred' => 'Exporter les favoris',
+  'facebook' => 'Facebook',
+  'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
+  'favorite_feeds' => 'Favoris (%s)',
+  'feb' => 'fév.',
+  'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
+  'february' => 'février',
+  'feed' => 'Flux',
+  'feeds' => 'Flux',
+  'feeds_actualized' => 'Les flux ont été mis à jour.',
+  'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
+  'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
+  'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
+  'feeds_moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
+  'feed_actualized' => '<em>%s</em> a été mis à jour.',
+  'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
+  'feed_deleted' => 'Le flux a été supprimé.',
+  'feed_description' => 'Description',
+  'feed_empty' => 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
+  'feed_in_error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
+  'feed_list' => 'Liste des articles de %s',
+  'feed_not_added' => '<em>%s</em> n’a pas pu être ajouté.',
+  'feed_updated' => 'Le flux a été mis à jour.',
+  'feed_url' => 'URL du flux',
+  'feed_validator' => 'Vérifier la valididé du flux',
+  'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
+  'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
+  'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
+  'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
+  'filter' => 'Filtrer',
+  'finish_installation' => 'Terminer l’installation',
+  'first' => 'Début',
+  'first_article' => 'Passer au premier article',
+  'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
+  'focus_search' => 'Accéder à la recherche',
+  'forbidden_access' => 'L’accès vous est interdit !',
+  'format_date' => 'j %s Y',
+  'format_date_hour' => 'j %s Y \\à H\\:i',
+  'freshrss' => 'FreshRSS',
+  'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
+  'freshrss_installation' => 'Installation · FreshRSS',
+  'fri' => 'ven.',
+  'g+' => 'Google+',
+  'general_configuration' => 'Configuration générale',
+  'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
+  'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
+  'global_view' => 'Vue globale',
+  'help' => 'Afficher la documentation',
+  'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
+  'host' => 'Hôte',
+  'html5_notif_timeout' => 'Temps d’affichage de la notification HTML5',
+  'http_auth' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
+  'http_authentication' => 'Authentification HTTP',
+  'http_password' => 'Mot de passe HTTP',
+  'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
+  'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
+  'http_username' => 'Identifiant HTTP',
+  'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
+  'import' => 'Importer',
+  'import_export' => 'Importer / exporter',
+  'informations' => 'Informations',
+  'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
+  'installation_step' => 'Installation — étape %d · FreshRSS',
+  'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
+  'internal_problem_feed' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+  'invalid_login' => 'L’identifiant est invalide !',
+  'invalid_url' => 'L’url <em>%s</em> est invalide.',
+  'is_admin' => 'est administrateur',
+  'jan' => 'jan.',
+  'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
+  'january' => 'janvier',
+  'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
+  'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
+  'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
+  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
+  'jul' => 'jui.',
+  'july' => 'juillet',
+  'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
+  'Jun' => '\\j\\u\\i\\n',
+  'jun' => 'juin',
+  'june' => 'juin',
+  'keep_history' => 'Nombre minimum d’articles à conserver',
+  'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
+  'language' => 'Langue',
+  'language_defined' => 'La langue a bien été définie.',
+  'last' => 'Fin',
+  'last_3_month' => 'Depuis les trois derniers mois',
+  'last_6_month' => 'Depuis les six derniers mois',
+  'last_article' => 'Passer au dernier article',
+  'last_month' => 'Depuis le mois dernier',
+  'last_week' => 'Depuis la semaine dernière',
+  'last_year' => 'Depuis l’année dernière',
+  'lead_developer' => 'Développeur principal',
+  'license' => 'Licence',
+  'load_more' => 'Charger plus d’articles',
+  'login' => 'Connexion',
+  'login_configuration' => 'Identification',
+  'login_persona_problem' => 'Problème de connexion à Persona ?',
+  'login_required' => 'Accès protégé par mot de passe :',
+  'login_with_persona' => 'Connexion avec Persona',
+  'logout' => 'Déconnexion',
+  'logs' => 'Logs',
+  'logs_empty' => 'Les logs sont vides.',
+  'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
+  'main_stream' => 'Flux principal',
+  'Mar' => '\\m\\a\\r\\s',
+  'mar' => 'mar.',
+  'march' => 'mars',
+  'mark_all_read' => 'Tout marquer comme lu',
+  'mark_cat_read' => 'Marquer la catégorie comme lue',
+  'mark_favorite' => 'Mettre en favori',
+  'mark_feed_read' => 'Marquer le flux comme lu',
+  'mark_read' => 'Marquer comme lu',
+  'May' => '\\m\\a\\i',
+  'may' => 'mai.',
+  'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
+  'minz_is_ok' => 'Vous disposez du framework Minz',
+  'mon' => 'lun.',
+  'month' => 'mois',
+  'more_information' => 'Plus d’informations',
+  'newer_first' => 'Plus récents en premier',
+  'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
+  'new_category' => 'Nouvelle catégorie',
+  'next' => 'Suivant',
+  'next_article' => 'Passer à l’article suivant',
+  'next_page' => 'Passer à la page suivante',
+  'next_step' => 'Passer à l’étape suivante',
+  'no' => 'Non',
+  'normal_view' => 'Vue normale',
+  'nothing_to_load' => 'Fin des articles',
+  'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+  'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
+  'not_read' => '%d non lu',
+  'not_reads' => '%d non lus',
+  'not_yet_implemented' => 'Pas encore implémenté',
+  'nov' => 'nov.',
+  'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
+  'november' => 'novembre',
+  'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
+  'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
+  'no_feed_to_refresh' => 'Il n’y a aucun flux à actualiser…',
+  'no_query' => 'Vous n’avez pas encore créé de filtre.',
+  'no_query_filter' => 'Aucun filtre appliqué',
+  'no_rss_feed' => 'Aucun flux RSS',
+  'no_selected_feed' => 'Aucun flux sélectionné.',
+  'no_update' => 'Aucune mise à jour à appliquer',
+  'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
+  'number_articles' => '%d articles',
+  'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
+  'number_feeds' => '%d flux',
+  'n_entries_deleted' => '%d articles ont été supprimés.',
+  'n_feeds_actualized' => '%d flux ont été mis à jour.',
+  'oct' => 'oct.',
+  'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
+  'october' => 'octobre',
+  'ok' => 'Ok !',
+  'older_first' => 'Plus anciens en premier',
+  'oops' => 'Oups !',
+  'optimization_complete' => 'Optimisation terminée.',
+  'optimize_bdd' => 'Optimiser la base de données',
+  'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD',
+  'or' => 'ou',
+  'page_not_found' => 'La page que vous cherchez n’existe pas !',
+  'password' => 'Mot de passe',
+  'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
+  'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+  'pcre_is_nok' => 'Il manque une librairie pour les expressions régulières (php-pcre)',
+  'pcre_is_ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE)',
+  'pdo_is_nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite)',
+  'pdo_is_ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite)',
+  'persona_connection_email' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+  'persona_is_ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons',
+  'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
+  'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
+  'prefix' => 'Préfixe des tables',
+  'previous' => 'Précédent',
+  'previous_article' => 'Passer à l’article précédent',
+  'previous_page' => 'Passer à la page précédente',
+  'print' => 'Imprimer',
+  'project_website' => 'Site du projet',
+  'public' => 'Public',
+  'publication_date' => 'Date de publication',
+  'purge_completed' => 'Purge effectuée (%d articles supprimés).',
+  'purge_now' => 'Purger maintenant',
+  'queries' => 'Filtres utilisateurs',
+  'query_created' => 'Le filtre "%s" a bien été créé.',
+  'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
+  'query_filter' => 'Filtres appliqués :',
+  'query_get_all' => 'Afficher tous les articles',
+  'query_get_category' => 'Afficher la catégorie "%s"',
+  'query_get_favorite' => 'Afficher les articles favoris',
+  'query_get_feed' => 'Afficher le flux "%s"',
+  'query_number' => 'Filtre n°%d',
+  'query_order_asc' => 'Afficher les articles les plus anciens en premier',
+  'query_order_desc' => 'Afficher les articles les plus récents en premier',
+  'query_search' => 'Recherche de "%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',
+  'random_string' => 'Chaîne aléatoire',
+  'reader_view' => 'Vue lecture',
+  'reading_configuration' => 'Lecture',
+  'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
+  'refresh' => 'Actualisation',
+  'related_tags' => 'Tags associés',
+  'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
+  'rss_feeds_of' => 'Flux RSS de %s',
+  'rss_feed_management' => 'Gestion des flux RSS',
+  'rss_view' => 'Flux RSS',
+  'sat' => 'sam.',
+  'save' => 'Enregistrer',
+  'scroll' => 'au défilement de la page',
+  'search' => 'Rechercher des mots ou des #tags',
+  'search_short' => 'Rechercher',
+  'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
+  'see_on_website' => 'Voir sur le site d’origine',
+  'see_website' => 'Voir le site',
+  'sep' => 'sep.',
+  'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
+  'september' => 'septembre',
+  'shaarli' => 'Shaarli',
+  'share' => 'Partager',
+  'share_name' => 'Nom du partage à afficher',
+  'share_url' => 'URL du partage à utiliser',
+  'sharing' => 'Partage',
+  'sharing_management' => 'Gestion des options de partage',
+  'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
+  'shortcuts' => 'Raccourcis',
+  'shortcuts_article_action' => 'Actions associées à l’article courant',
+  'shortcuts_navigation' => 'Navigation',
+  'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
+  'shortcuts_other_action' => 'Autres actions',
+  'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
+  'show_adaptive' => 'Adapter l’affichage',
+  'show_all_articles' => 'Afficher tous les articles',
+  'show_favorite' => 'Afficher les favoris',
+  'show_in_all_flux' => 'Afficher dans le flux principal',
+  'show_not_favorite' => 'Afficher tout sauf les favoris',
+  'show_not_reads' => 'Afficher les non lus',
+  'show_read' => 'Afficher les lus',
+  'sort_order' => 'Ordre de tri',
+  'starred_list' => 'Liste des articles favoris',
+  'stats' => 'Statistiques',
+  'stats_entry_count' => 'Nombre d’articles',
+  'stats_entry_per_category' => 'Articles par catégorie',
+  'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
+  'stats_entry_per_day_of_week' => 'Par jour de la semaine',
+  'stats_entry_per_hour' => 'Par heure',
+  'stats_entry_per_month' => 'Par mois',
+  'stats_entry_repartition' => 'Répartition des articles',
+  'stats_feed_per_category' => 'Flux par catégorie',
+  'stats_idle' => 'Flux inactifs',
+  'stats_main' => 'Statistiques principales',
+  'stats_no_idle' => 'Il n’y a aucun flux inactif !',
+  'stats_percent_of_total' => '%% du total',
+  'stats_repartition' => 'Répartition des articles',
+  'stats_top_feed' => 'Les dix plus gros flux',
+  'status_favorites' => 'favoris',
+  'status_read' => 'lus',
+  'status_total' => 'total',
+  'status_unread' => 'non lus',
+  'steps' => 'Étapes',
+  'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
+  'submit' => 'Valider',
+  'subscription_management' => 'Gestion des abonnements',
+  'sun' => 'dim.',
+  'theme' => 'Thème',
+  'think_to_add' => 'Vous pouvez ajouter des flux.',
+  'this_is_the_end' => 'This is the end',
+  'thu' => 'jeu.',
+  'title' => 'Titre',
+  'today' => 'Aujourd’hui',
+  'top_line' => 'Ligne du haut',
+  'truncate' => 'Supprimer tous les articles',
+  'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
+  'tue' => 'mar.',
+  'twitter' => 'Twitter',
+  'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
+  'update' => 'Mise à jour',
+  'updated' => 'Modifications enregistrées.',
+  'update_apply' => 'Appliquer la mise à jour',
+  'update_can_apply' => 'Une mise à jour est disponible.',
+  'update_check' => 'Vérifier les mises à jour',
+  'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
+  'update_finished' => 'La mise à jour est terminée !',
+  'update_last' => 'Dernière vérification : %s',
+  'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
+  'update_problem' => 'La mise à jour a rencontré un problème : %s',
+  'update_server_not_found' => 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
+  'update_start' => 'Lancer la mise à jour',
+  'update_system' => 'Système de mise à jour',
+  'upon_reception' => 'dès la réception du nouvel article',
+  'username' => 'Nom d’utilisateur',
+  'username_admin' => 'Nom d’utilisateur administrateur',
+  'users' => 'Utilisateurs',
+  'users_list' => 'Liste des utilisateurs',
+  'user_created' => 'L’utilisateur %s a été créé.',
+  'user_deleted' => 'L’utilisateur %s a été supprimé.',
+  'user_filter' => 'Accéder aux filtres utilisateur',
+  'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+  'version' => 'Version',
+  'version_update' => 'Mise à jour',
+  'wallabag' => 'wallabag',
+  'website' => 'Site Internet',
+  'website_url' => 'URL du site',
+  'wed' => 'mer.',
+  'width_large' => 'Large',
+  'width_medium' => 'Moyenne',
+  'width_no_limit' => 'Pas de limite',
+  'width_thin' => 'Fine',
+  'yes' => 'Oui',
+  'yesterday' => 'Hier',
+  'your_diaspora_pod' => 'Votre pod Diaspora*',
+  'your_favorites' => 'Vos favoris',
+  'your_rss_feeds' => 'Vos flux RSS',
+  'your_shaarli' => 'Votre Shaarli',
+  'your_wallabag' => 'Votre wallabag',
+  'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
+);
\ No newline at end of file
diff --git a/app/i18n/install.en.php b/app/i18n/install.en.php
deleted file mode 100644
index c422de90f..000000000
--- a/app/i18n/install.en.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-return array (
-	'freshrss_installation'		=> 'Installation · FreshRSS',
-	'freshrss'			=> 'FreshRSS',
-	'installation_step'		=> 'Installation — step %d · FreshRSS',
-	'steps'				=> 'Steps',
-	'checks'			=> 'Checks',
-	'general_configuration'	=> 'General configuration',
-	'bdd_configuration'		=> 'Database configuration',
-	'bdd_type'		=> 'Type of database',
-	'version_update'		=> 'Update',
-	'this_is_the_end'		=> 'This is the end',
-
-	'ok'				=> 'Ok!',
-	'congratulations'		=> 'Congratulations!',
-	'attention'			=> 'Attention!',
-	'damn'				=> 'Damn!',
-	'oops'				=> 'Oops!',
-	'next_step'			=> 'Go to the next step',
-
-	'language_defined'		=> 'Language has been defined.',
-	'choose_language'		=> 'Choose a language for FreshRSS',
-
-	'javascript_is_better'		=> 'FreshRSS is more pleasant with JavaScript enabled',
-	'php_is_ok'			=> 'Your PHP version is %s, which is compatible with FreshRSS',
-	'php_is_nok'			=> 'Your PHP version is %s but FreshRSS requires at least version %s',
-	'minz_is_ok'			=> 'You have the Minz framework',
-	'minz_is_nok'			=> 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
-	'curl_is_ok'			=> 'You have version %s of cURL',
-	'curl_is_nok'			=> 'You lack cURL (php5-curl package)',
-	'pdo_is_ok'			=> 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite)',
-	'pdo_is_nok'			=> 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite)',
-	'dom_is_ok'			=> 'You have the required library to browse the DOM',
-	'dom_is_nok'			=> 'You lack a required library to browse the DOM (php-xml package)',
-	'pcre_is_ok'			=> 'You have the required library for regular expressions (PCRE)',
-	'pcre_is_nok'			=> 'You lack a required library for regular expressions (php-pcre)',
-	'ctype_is_ok'			=> 'You have the required library for character type checking (ctype)',
-	'ctype_is_nok'			=> 'You lack a required library for character type checking (php-ctype)',
-	'cache_is_ok'			=> 'Permissions on cache directory are good',
-	'log_is_ok'			=> 'Permissions on logs directory are good',
-	'favicons_is_ok'		=> 'Permissions on favicons directory are good',
-	'data_is_ok'			=> 'Permissions on data directory are good',
-	'persona_is_ok'			=> 'Permissions on Mozilla Persona directory are good',
-	'file_is_nok'			=> 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
-	'http_referer_is_ok'		=> 'Your HTTP REFERER is known and corresponds to your server.',
-	'http_referer_is_nok'		=> 'Please check that you are not altering your HTTP REFERER.',
-	'fix_errors_before'		=> 'Fix errors before skip to the next step.',
-
-	'general_conf_is_ok'		=> 'General configuration has been saved.',
-	'random_string'			=> 'Random string',
-	'change_value'			=> 'You should change this value by any other',
-	'base_url'			=> 'Base URL',
-	'do_not_change_if_doubt'	=> 'Don’t change if you doubt about it',
-
-	'bdd_conf_is_ok'		=> 'Database configuration has been saved.',
-	'bdd_conf_is_ko'		=> 'Verify your database information.',
-	'host'				=> 'Host',
-	'bdd'				=> 'Database',
-	'prefix'			=> 'Table prefix',
-
-	'update_start'			=> 'Start update process',
-	'update_long'			=> 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
-	'update_end'			=> 'Update process is completed, now you can go to the final step.',
-
-
-	'installation_is_ok'		=> 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
-	'finish_installation'		=> 'Complete installation',
-	'install_not_deleted'		=> 'Something went wrong; you must delete the file <em>%s</em> manually.',
-);
diff --git a/app/i18n/install.fr.php b/app/i18n/install.fr.php
deleted file mode 100644
index 785c02459..000000000
--- a/app/i18n/install.fr.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-return array (
-	'freshrss_installation'		=> 'Installation · FreshRSS',
-	'freshrss'			=> 'FreshRSS',
-	'installation_step'		=> 'Installation — étape %d · FreshRSS',
-	'steps'				=> 'Étapes',
-	'checks'			=> 'Vérifications',
-	'general_configuration'	=> 'Configuration générale',
-	'bdd_configuration'		=> 'Base de données',
-	'bdd_type'		=> 'Type de base de données',
-	'version_update'		=> 'Mise à jour',
-	'this_is_the_end'		=> 'This is the end',
-
-	'ok'				=> 'Ok !',
-	'congratulations'		=> 'Félicitations !',
-	'attention'			=> 'Attention !',
-	'damn'				=> 'Arf !',
-	'oops'				=> 'Oups !',
-	'next_step'			=> 'Passer à l’étape suivante',
-
-	'language_defined'		=> 'La langue a bien été définie.',
-	'choose_language'		=> 'Choisissez la langue pour FreshRSS',
-
-	'javascript_is_better'		=> 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
-	'php_is_ok'			=> 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
-	'php_is_nok'			=> 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
-	'minz_is_ok'			=> 'Vous disposez du framework Minz',
-	'minz_is_nok'			=> 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
-	'curl_is_ok'			=> 'Vous disposez de cURL dans sa version %s',
-	'curl_is_nok'			=> 'Vous ne disposez pas de cURL (paquet php5-curl)',
-	'pdo_is_ok'			=> 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite)',
-	'pdo_is_nok'			=> 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite)',
-	'dom_is_ok'			=> 'Vous disposez du nécessaire pour parcourir le DOM',
-	'dom_is_nok'			=> 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
-	'pcre_is_ok'			=> 'Vous disposez du nécessaire pour les expressions régulières (PCRE)',
-	'pcre_is_nok'			=> 'Il manque une librairie pour les expressions régulières (php-pcre)',
-	'ctype_is_ok'			=> 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
-	'ctype_is_nok'			=> 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
-	'cache_is_ok'			=> 'Les droits sur le répertoire de cache sont bons',
-	'log_is_ok'			=> 'Les droits sur le répertoire des logs sont bons',
-	'favicons_is_ok'		=> 'Les droits sur le répertoire des favicons sont bons',
-	'data_is_ok'			=> 'Les droits sur le répertoire de data sont bons',
-	'persona_is_ok'			=> 'Les droits sur le répertoire de Mozilla Persona sont bons',
-	'file_is_nok'			=> 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
-	'http_referer_is_ok'		=> 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
-	'http_referer_is_nok'		=> 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
-	'fix_errors_before'		=> 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
-
-	'general_conf_is_ok'		=> 'La configuration générale a été enregistrée.',
-	'random_string'			=> 'Chaîne aléatoire',
-	'change_value'			=> 'Vous devriez changer cette valeur par n’importe quelle autre',
-	'base_url'			=> 'Base de l’URL',
-	'do_not_change_if_doubt'	=> 'Laissez tel quel dans le doute',
-
-	'bdd_conf_is_ok'		=> 'La configuration de la base de données a été enregistrée.',
-	'bdd_conf_is_ko'		=> 'Vérifiez les informations d’accès à la base de données.',
-	'host'				=> 'Hôte',
-	'bdd'				=> 'Base de données',
-	'prefix'			=> 'Préfixe des tables',
-
-	'update_start'			=> 'Lancer la mise à jour',
-	'update_long'			=> 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
-	'update_end'			=> 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
-
-	'installation_is_ok'		=> 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
-	'finish_installation'		=> 'Terminer l’installation',
-	'install_not_deleted'		=> 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
-);
diff --git a/app/install.php b/app/install.php
index 4449cd063..cfdd733ce 100644
--- a/app/install.php
+++ b/app/install.php
@@ -54,11 +54,6 @@ function initTranslate() {
 	if (file_exists($file)) {
 		$translates = array_merge($translates, include($file));
 	}
-
-	$file = APP_PATH . '/i18n/install.' . $actual . '.php';
-	if (file_exists($file)) {
-		$translates = array_merge($translates, include($file));
-	}
 }
 
 function getBetterLanguage($fallback) {

From 79aa5beaf44af13a1828bfa5fc824a08c62054dc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 6 Oct 2014 23:29:20 +0200
Subject: [PATCH 066/363] Refactor authentication system.

Big work, not finished. A lot of features have been removed.

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/categoryController.php     |   2 +-
 app/Controllers/configureController.php    |   2 +-
 app/Controllers/entryController.php        |   2 +-
 app/Controllers/feedController.php         |   2 +-
 app/Controllers/importExportController.php |   2 +-
 app/Controllers/indexController.php        | 328 +++++----------------
 app/Controllers/statsController.php        |   2 +-
 app/Controllers/subscriptionController.php |   2 +-
 app/Controllers/updateController.php       |   2 +-
 app/Controllers/usersController.php        |   2 +-
 app/FreshRSS.php                           | 135 +--------
 app/Models/Auth.php                        | 209 +++++++++++++
 app/layout/aside_flux.phtml                |   6 +-
 app/layout/header.phtml                    |  32 +-
 app/layout/nav_menu.phtml                  |   4 +-
 app/views/helpers/view/normal_view.phtml   |   6 +-
 app/views/index/index.phtml                |   2 +-
 app/views/index/login.phtml                |   1 -
 app/views/index/logout.phtml               |   1 -
 app/views/index/resetAuth.phtml            |  33 ---
 20 files changed, 325 insertions(+), 450 deletions(-)
 create mode 100644 app/Models/Auth.php
 delete mode 100644 app/views/index/login.phtml
 delete mode 100644 app/views/index/logout.phtml
 delete mode 100644 app/views/index/resetAuth.phtml

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index c79f37fa4..537a2b210 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -12,7 +12,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 *
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 789e9dfb0..7e77a757a 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -10,7 +10,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * underlying framework.
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index c46fbf346..a1dfacb4d 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -10,7 +10,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	 * underlying framework.
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 18829d252..2a7238eaf 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -10,7 +10,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	 * underlying framework.
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			// Token is useful in the case that anonymous refresh is forbidden
 			// and CRON task cannot be used with php command so the user can
 			// set a CRON task to refresh his feeds by using token inside url
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 57759f277..aaac1b68b 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -10,7 +10,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 * underlying framework.
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 0d2eff700..3006480f9 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -8,7 +8,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$token = $this->view->conf->token;
 
 		// check if user is logged in
-		if (!$this->view->loginOk && !Minz_Configuration::allowAnonymous()) {
+		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
 			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token === $token_param);
 			if ($output === 'rss' && !$token_is_ok) {
@@ -20,7 +20,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			} elseif ($output !== 'rss') {
 				// "hard" redirection is not required, just ask dispatcher to
 				// forward to the login form without 302 redirection
-				Minz_Request::forward(array('c' => 'index', 'a' => 'formLogin'));
+				Minz_Request::forward(array('c' => 'index', 'a' => 'login'));
 				return;
 			}
 		}
@@ -207,7 +207,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	}
 
 	public function logsAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
@@ -229,265 +229,91 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->logsPaginator->_currentPage($page);
 	}
 
+	/**
+	 * This action handles the login page.
+	 */
 	public function loginAction() {
-		$this->view->_useLayout(false);
+		if (FreshRSS_Auth::hasAccess()) {
+			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
+		}
 
-		$url = 'https://verifier.login.persona.org/verify';
-		$assert = Minz_Request::param('assertion');
-		$params = 'assertion=' . $assert . '&audience=' .
-		          urlencode(Minz_Url::display(null, 'php', true));
-		$ch = curl_init();
-		$options = array(
-			CURLOPT_URL => $url,
-			CURLOPT_RETURNTRANSFER => TRUE,
-			CURLOPT_POST => 2,
-			CURLOPT_POSTFIELDS => $params
-		);
-		curl_setopt_array($ch, $options);
-		$result = curl_exec($ch);
-		curl_close($ch);
+		invalidateHttpCache();
 
-		$res = json_decode($result, true);
+		$auth_type = Minz_Configuration::authType();
+		switch ($auth_type) {
+		case 'form':
+			Minz_Request::forward(array('c' => 'index', 'a' => 'formLogin'));
+			break;
+		case 'http_auth':
+		case 'none':
+			// It should not happened!
+			Minz_Error::error(404);
+		default:
+			// TODO load plugin instead
+			Minz_Error::error(404);
+		}
+	}
 
-		$loginOk = false;
-		$reason = '';
-		if ($res['status'] === 'okay') {
-			$email = filter_var($res['email'], FILTER_VALIDATE_EMAIL);
-			if ($email != '') {
-				$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
-				if (($currentUser = @file_get_contents($personaFile)) !== false) {
-					$currentUser = trim($currentUser);
-					if (ctype_alnum($currentUser)) {
-						try {
-							$this->conf = new FreshRSS_Configuration($currentUser);
-							$loginOk = strcasecmp($email, $this->conf->mail_login) === 0;
-						} catch (Minz_Exception $e) {
-							$reason = 'Invalid configuration for user [' . $currentUser . ']! ' . $e->getMessage();	//Permission denied or conf file does not exist
-						}
-					} else {
-						$reason = 'Invalid username format [' . $currentUser . ']!';
-					}
+	/**
+	 *
+	 */
+	public function formLoginAction() {
+		if (FreshRSS_Auth::hasAccess()) {
+			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
+		}
+
+		invalidateHttpCache();
+
+		$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js');
+		Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . $file_mtime));
+
+		if (Minz_Request::isPost()) {
+			$nonce = Minz_Session::param('nonce');
+			$username = Minz_Request::param('username', '');
+			$challenge = Minz_Request::param('challenge', '');
+			try {
+				$conf = new FreshRSS_Configuration($username);
+			} catch(Minz_Exception $e) {
+				// $username is not a valid user, nor the configuration file!
+				Minz_Log::warning('Login failure: ' . $e->getMessage());
+				Minz_Request::bad(_t('invalid_login'),
+				                  array('c' => 'index', 'a' => 'login'));
+			}
+
+			$ok = FreshRSS_FormAuth::checkCredentials(
+				$username, $conf->passwordHash, $nonce, $challenge
+			);
+			if ($ok) {
+				// Set session parameter to give access to the user.
+				Minz_Session::_param('currentUser', $username);
+				Minz_Session::_param('passwordHash', $conf->passwordHash);
+				FreshRSS_Auth::giveAccess();
+
+				// Set cookie parameter if nedded.
+				if (Minz_Request::param('keep_logged_in', false)) {
+					FreshRSS_FormAuth::makeCookie($username, $conf->passwordHash);
+				} else {
+					FreshRSS_FormAuth::deleteCookie();
 				}
+
+				// All is good, go back to the index.
+				Minz_Request::good(_t('login'),
+				                   array('c' => 'index', 'a' => 'index'));
 			} else {
-				$reason = 'Invalid email format [' . $res['email'] . ']!';
+				Minz_Log::warning('Password mismatch for' .
+				                  ' user=' . $username .
+				                  ', nonce=' . $nonce .
+				                  ', c=' . $challenge);
+				Minz_Request::bad(_t('invalid_login'),
+				                  array('c' => 'index', 'a' => 'login'));
 			}
 		}
-		if ($loginOk) {
-			Minz_Session::_param('currentUser', $currentUser);
-			Minz_Session::_param('mail', $email);
-			$this->view->loginOk = true;
-			invalidateHttpCache();
-		} else {
-			$res = array();
-			$res['status'] = 'failure';
-			$res['reason'] = $reason == '' ? _t('invalid_login') : $reason;
-			Minz_Log::warning('Persona: ' . $res['reason']);
-		}
-
-		header('Content-Type: application/json; charset=UTF-8');
-		$this->view->res = json_encode($res);
 	}
 
 	public function logoutAction() {
-		$this->view->_useLayout(false);
 		invalidateHttpCache();
-		Minz_Session::_param('currentUser');
-		Minz_Session::_param('mail');
-		Minz_Session::_param('passwordHash');
-	}
-
-	private static function makeLongTermCookie($username, $passwordHash) {
-		do {
-			$token = sha1(Minz_Configuration::salt() . $username . uniqid(mt_rand(), true));
-			$tokenFile = DATA_PATH . '/tokens/' . $token . '.txt';
-		} while (file_exists($tokenFile));
-		if (@file_put_contents($tokenFile, $username . "\t" . $passwordHash) === false) {
-			return false;
-		}
-		$expire = time() + 2629744;	//1 month	//TODO: Use a configuration instead
-		Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire);
-		Minz_Session::_param('token', $token);
-		return $token;
-	}
-
-	private static function deleteLongTermCookie() {
-		Minz_Session::deleteLongTermCookie('FreshRSS_login');
-		$token = Minz_Session::param('token', null);
-		if (ctype_alnum($token)) {
-			@unlink(DATA_PATH . '/tokens/' . $token . '.txt');
-		}
-		Minz_Session::_param('token');
-		if (rand(0, 10) === 1) {
-			self::purgeTokens();
-		}
-	}
-
-	private static function purgeTokens() {
-		$oldest = time() - 2629744;	//1 month	//TODO: Use a configuration instead
-		foreach (new DirectoryIterator(DATA_PATH . '/tokens/') as $fileInfo) {
-			if ($fileInfo->getExtension() === 'txt' && $fileInfo->getMTime() < $oldest) {
-				@unlink($fileInfo->getPathname());
-			}
-		}
-	}
-
-	public function formLoginAction() {
-		if ($this->view->loginOk) {
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		}
-
-		if (Minz_Request::isPost()) {
-			$ok = false;
-			$nonce = Minz_Session::param('nonce');
-			$username = Minz_Request::param('username', '');
-			$c = Minz_Request::param('challenge', '');
-			if (ctype_alnum($username) && ctype_graph($c) && ctype_alnum($nonce)) {
-				if (!function_exists('password_verify')) {
-					include_once(LIB_PATH . '/password_compat.php');
-				}
-				try {
-					$conf = new FreshRSS_Configuration($username);
-					$s = $conf->passwordHash;
-					$ok = password_verify($nonce . $s, $c);
-					if ($ok) {
-						Minz_Session::_param('currentUser', $username);
-						Minz_Session::_param('passwordHash', $s);
-						if (Minz_Request::param('keep_logged_in', false)) {
-							self::makeLongTermCookie($username, $s);
-						} else {
-							self::deleteLongTermCookie();
-						}
-					} else {
-						Minz_Log::warning('Password mismatch for user ' . $username . ', nonce=' . $nonce . ', c=' . $c);
-					}
-				} catch (Minz_Exception $me) {
-					Minz_Log::warning('Login failure: ' . $me->getMessage());
-				}
-			} else {
-				Minz_Log::debug('Invalid credential parameters: user=' . $username . ' challenge=' . $c . ' nonce=' . $nonce);
-			}
-			if (!$ok) {
-				$notif = array(
-					'type' => 'bad',
-					'content' => _t('invalid_login')
-				);
-				Minz_Session::_param('notification', $notif);
-			}
-			$this->view->_useLayout(false);
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		} elseif (Minz_Configuration::unsafeAutologinEnabled() && isset($_GET['u']) && isset($_GET['p'])) {
-			Minz_Session::_param('currentUser');
-			Minz_Session::_param('mail');
-			Minz_Session::_param('passwordHash');
-			$username = ctype_alnum($_GET['u']) ? $_GET['u'] : '';
-			$passwordPlain = $_GET['p'];
-			Minz_Request::_param('p');	//Discard plain-text password ASAP
-			$_GET['p'] = '';
-			if (!function_exists('password_verify')) {
-				include_once(LIB_PATH . '/password_compat.php');
-			}
-			try {
-				$conf = new FreshRSS_Configuration($username);
-				$s = $conf->passwordHash;
-				$ok = password_verify($passwordPlain, $s);
-				unset($passwordPlain);
-				if ($ok) {
-					Minz_Session::_param('currentUser', $username);
-					Minz_Session::_param('passwordHash', $s);
-				} else {
-					Minz_Log::warning('Unsafe password mismatch for user ' . $username);
-				}
-			} catch (Minz_Exception $me) {
-				Minz_Log::warning('Unsafe login failure: ' . $me->getMessage());
-			}
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		} elseif (!Minz_Configuration::canLogIn()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
-		}
-		invalidateHttpCache();
-	}
-
-	public function formLogoutAction() {
-		$this->view->_useLayout(false);
-		invalidateHttpCache();
-		Minz_Session::_param('currentUser');
-		Minz_Session::_param('mail');
-		Minz_Session::_param('passwordHash');
-		self::deleteLongTermCookie();
-		Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-	}
-
-	public function resetAuthAction() {
-		Minz_View::prependTitle(_t('auth_reset') . ' · ');
-		Minz_View::appendScript(Minz_Url::display(
-			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
-		));
-
-		$this->view->no_form = false;
-		// Enable changement of auth only if Persona!
-		if (Minz_Configuration::authType() != 'persona') {
-			$this->view->message = array(
-				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('auth_not_persona')
-			);
-			$this->view->no_form = true;
-			return;
-		}
-
-		$conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
-		// Admin user must have set its master password.
-		if (!$conf->passwordHash) {
-			$this->view->message = array(
-				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('auth_no_password_set')
-			);
-			$this->view->no_form = true;
-			return;
-		}
-
-		invalidateHttpCache();
-
-		if (Minz_Request::isPost()) {
-			$nonce = Minz_Session::param('nonce');
-			$username = Minz_Request::param('username', '');
-			$c = Minz_Request::param('challenge', '');
-			if (!(ctype_alnum($username) && ctype_graph($c) && ctype_alnum($nonce))) {
-				Minz_Log::debug('Invalid credential parameters:' .
-				                ' user=' . $username .
-				                ' challenge=' . $c .
-				                ' nonce=' . $nonce);
-				Minz_Request::bad(_t('invalid_login'),
-				                  array('c' => 'index', 'a' => 'resetAuth'));
-			}
-
-			if (!function_exists('password_verify')) {
-				include_once(LIB_PATH . '/password_compat.php');
-			}
-
-			$s = $conf->passwordHash;
-			$ok = password_verify($nonce . $s, $c);
-			if ($ok) {
-				Minz_Configuration::_authType('form');
-				$ok = Minz_Configuration::writeFile();
-
-				if ($ok) {
-					Minz_Request::good(_t('auth_form_set'));
-				} else {
-					Minz_Request::bad(_t('auth_form_not_set'),
-				                      array('c' => 'index', 'a' => 'resetAuth'));
-				}
-			} else {
-				Minz_Log::debug('Password mismatch for user ' . $username .
-				                ', nonce=' . $nonce . ', c=' . $c);
-
-				Minz_Request::bad(_t('invalid_login'),
-				                  array('c' => 'index', 'a' => 'resetAuth'));
-			}
-		}
+		FreshRSS_Auth::removeAccess();
+		Minz_Request::good(_t('disconnected'),
+		                   array('c' => 'index', 'a' => 'index'));
 	}
 }
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 99c57c809..0e3430fcc 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -118,7 +118,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 	 * underlying framework.
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 			    403, array('error' => array(_t('access_denied')))
 			);
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 7cc8179a0..a89168eb3 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -10,7 +10,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 	 * underlying framework.
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index da5bddc65..9da1e8657 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -3,7 +3,7 @@
 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)) {
+		if (!FreshRSS_Auth::hasAccess() && Minz_Configuration::isAdmin($current_user)) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index 7d0171bc7..c2b1d163f 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -5,7 +5,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 	const BCRYPT_COST = 9;	//Will also have to be computed client side on mobile devices, so do not use a too high cost
 
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index efd302ecc..35a37b887 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -4,130 +4,33 @@ class FreshRSS extends Minz_FrontController {
 		if (!isset($_SESSION)) {
 			Minz_Session::init('FreshRSS');
 		}
-		$loginOk = $this->accessControl(Minz_Session::param('currentUser', ''));
+
+		FreshRSS_Auth::init();
+		$this->loadConfiguration();
 		$this->loadParamsView();
 		if (Minz_Request::isPost() && !is_referer_from_same_domain()) {
-			$loginOk = false;	//Basic protection against XSRF attacks
+			//Basic protection against XSRF attacks
+			FreshRSS_Auth::removeAccess();
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied') . ' [HTTP_REFERER=' .
-					htmlspecialchars(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']) . ']'))
+				      htmlspecialchars(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']) . ']'))
 			);
 		}
-		Minz_View::_param('loginOk', $loginOk);
-		$this->loadStylesAndScripts($loginOk);	//TODO: Do not load that when not needed, e.g. some Ajax requests
+		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
 	}
 
-	private static function getCredentialsFromLongTermCookie() {
-		$token = Minz_Session::getLongTermCookie('FreshRSS_login');
-		if (!ctype_alnum($token)) {
-			return array();
-		}
-		$tokenFile = DATA_PATH . '/tokens/' . $token . '.txt';
-		$mtime = @filemtime($tokenFile);
-		if ($mtime + 2629744 < time()) {	//1 month	//TODO: Use a configuration instead
-			@unlink($tokenFile);
-			return array(); 	//Expired or token does not exist
-		}
-		$credentials = @file_get_contents($tokenFile);
-		return $credentials === false ? array() : explode("\t", $credentials, 2);
-	}
-
-	private function accessControl($currentUser) {
-		if ($currentUser == '') {
-			switch (Minz_Configuration::authType()) {
-				case 'form':
-					$credentials = self::getCredentialsFromLongTermCookie();
-					if (isset($credentials[1])) {
-						$currentUser = trim($credentials[0]);
-						Minz_Session::_param('passwordHash', trim($credentials[1]));
-					}
-					$loginOk = $currentUser != '';
-					if (!$loginOk) {
-						$currentUser = Minz_Configuration::defaultUser();
-						Minz_Session::_param('passwordHash');
-					}
-					break;
-				case 'http_auth':
-					$currentUser = httpAuthUser();
-					$loginOk = $currentUser != '';
-					break;
-				case 'persona':
-					$loginOk = false;
-					$email = filter_var(Minz_Session::param('mail'), FILTER_VALIDATE_EMAIL);
-					if ($email != '') {	//TODO: Remove redundancy with indexController
-						$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
-						if (($currentUser = @file_get_contents($personaFile)) !== false) {
-							$currentUser = trim($currentUser);
-							$loginOk = true;
-						}
-					}
-					if (!$loginOk) {
-						$currentUser = Minz_Configuration::defaultUser();
-					}
-					break;
-				case 'none':
-					$currentUser = Minz_Configuration::defaultUser();
-					$loginOk = true;
-					break;
-				default:
-					$currentUser = Minz_Configuration::defaultUser();
-					$loginOk = false;
-					break;
-			}
-		} else {
-			$loginOk = true;
-		}
-
-		if (!ctype_alnum($currentUser)) {
-			Minz_Session::_param('currentUser', '');
-			die('Invalid username [' . $currentUser . ']!');
-		}
-
+	private function loadConfiguration() {
+		$current_user = Minz_Session::param('currentUser');
 		try {
-			$this->conf = new FreshRSS_Configuration($currentUser);
+			$this->conf = new FreshRSS_Configuration($current_user);
 			Minz_View::_param('conf', $this->conf);
-			Minz_Session::_param('currentUser', $currentUser);
-		} catch (Minz_Exception $me) {
-			$loginOk = false;
-			try {
-				$this->conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
-				Minz_Session::_param('currentUser', Minz_Configuration::defaultUser());
-				Minz_View::_param('conf', $this->conf);
-				$notif = array(
-					'type' => 'bad',
-					'content' => 'Invalid configuration for user [' . $currentUser . ']!',
-				);
-				Minz_Session::_param('notification', $notif);
-				Minz_Log::warning($notif['content'] . ' ' . $me->getMessage());
-				Minz_Session::_param('currentUser', '');
-			} catch (Exception $e) {
-				die($e->getMessage());
-			}
+		} catch(Minz_Exception $e) {
+			Minz_Log::error('Cannot load configuration file of user `' . $current_user . '`');
+			die($e->getMessage());
 		}
-
-		if ($loginOk) {
-			switch (Minz_Configuration::authType()) {
-				case 'form':
-					$loginOk = Minz_Session::param('passwordHash') === $this->conf->passwordHash;
-					break;
-				case 'http_auth':
-					$loginOk = strcasecmp($currentUser, httpAuthUser()) === 0;
-					break;
-				case 'persona':
-					$loginOk = strcasecmp(Minz_Session::param('mail'), $this->conf->mail_login) === 0;
-					break;
-				case 'none':
-					$loginOk = true;
-					break;
-				default:
-					$loginOk = false;
-					break;
-			}
-		}
-		return $loginOk;
 	}
 
 	private function loadParamsView() {
@@ -140,7 +43,7 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
-	private function loadStylesAndScripts($loginOk) {
+	private function loadStylesAndScripts() {
 		$theme = FreshRSS_Themes::load($this->conf->theme);
 		if ($theme) {
 			foreach($theme['files'] as $file) {
@@ -158,16 +61,6 @@ class FreshRSS extends Minz_FrontController {
 			}
 		}
 
-		switch (Minz_Configuration::authType()) {
-			case 'form':
-				if (!$loginOk) {
-					Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')));
-				}
-				break;
-			case 'persona':
-				Minz_View::appendScript('https://login.persona.org/include.js');
-				break;
-		}
 		Minz_View::appendScript(Minz_Url::display('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
new file mode 100644
index 000000000..c4a3abd98
--- /dev/null
+++ b/app/Models/Auth.php
@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * This class handles all authentication process.
+ */
+class FreshRSS_Auth {
+	/**
+	 * Determines if user is connected.
+	 */
+	private static $login_ok = false;
+
+	/**
+	 * This method initializes authentication system.
+	 */
+	public static function init() {
+		self::$login_ok = Minz_Session::param('loginOk', false);
+		$current_user = Minz_Session::param('currentUser', '');
+		if ($current_user === '') {
+			$current_user = Minz_Configuration::defaultUser();
+			Minz_Session::_param('currentUser', $current_user);
+		}
+
+		$access_ok = self::accessControl($current_user);
+
+		if ($access_ok) {
+			self::giveAccess();
+		} else {
+			// Be sure all accesses are removed!
+			self::removeAccess();
+		}
+	}
+
+	/**
+	 * This method checks if user is allowed to connect.
+	 *
+	 * Required session parameters are also set in this method (such as
+	 * currentUser).
+	 *
+	 * @param string $username username of the user to check access.
+	 * @return boolean true if user can be connected, false else.
+	 */
+	public static function accessControl($username) {
+		if (self::$login_ok) {
+			return true;
+		}
+
+		switch (Minz_Configuration::authType()) {
+		case 'form':
+			$credentials = FreshRSS_FormAuth::getCredentialsFromCookie();
+			$current_user = '';
+			if (isset($credentials[1])) {
+				$current_user = trim($credentials[0]);
+				Minz_Session::_param('currentUser', $current_user);
+				Minz_Session::_param('passwordHash', trim($credentials[1]));
+			}
+			return $current_user != '';
+		case 'http_auth':
+			$current_user = httpAuthUser();
+			$login_ok = $current_user != '';
+			if ($login_ok) {
+				Minz_Session::_param('currentUser', $current_user);
+			}
+			return $login_ok;
+		case 'none':
+			return true;
+		default:
+			// TODO load extension
+			return false;
+		}
+	}
+
+	/**
+	 * Gives access to the current user.
+	 */
+	public static function giveAccess() {
+		$current_user = Minz_Session::param('currentUser');
+		try {
+			$conf = new FreshRSS_Configuration($current_user);
+		} catch(Minz_Exception $e) {
+			die($e->getMessage());
+		}
+
+		switch (Minz_Configuration::authType()) {
+		case 'form':
+			self::$login_ok = Minz_Session::param('passwordHash') === $conf->passwordHash;
+			break;
+		case 'http_auth':
+			self::$login_ok = strcasecmp($current_user, httpAuthUser()) === 0;
+			break;
+		case 'none':
+			self::$login_ok = true;
+			break;
+		default:
+			// TODO: extensions
+			self::$login_ok = false;
+		}
+
+		Minz_Session::_param('loginOk', self::$login_ok);
+	}
+
+	/**
+	 * Returns if current user is connected.
+	 *
+	 * @return boolean true if user is connected, false else.
+	 */
+	public static function hasAccess() {
+		return self::$login_ok;
+	}
+
+	/**
+	 * Removes all accesses for the current user.
+	 */
+	public static function removeAccess() {
+		Minz_Session::_param('loginOk');
+		self::$login_ok = false;
+		Minz_Session::_param('currentUser', Minz_Configuration::defaultUser());
+
+		switch (Minz_Configuration::authType()) {
+		case 'form':
+			Minz_Session::_param('passwordHash');
+			FreshRSS_FormAuth::deleteCookie();
+			break;
+		case 'http_auth':
+		case 'none':
+			// Nothing to do...
+			break;
+		default:
+			// TODO: extensions
+		}
+	}
+}
+
+
+class FreshRSS_FormAuth {
+	public static function checkCredentials($username, $hash, $nonce, $challenge) {
+		if (!ctype_alnum($username) ||
+				!ctype_graph($challenge) ||
+				!ctype_alnum($nonce)) {
+			Minz_Log::debug('Invalid credential parameters:' .
+			                ' user=' . $username .
+			                ' challenge=' . $challenge .
+			                ' nonce=' . $nonce);
+			return false;
+		}
+
+		if (!function_exists('password_verify')) {
+			include_once(LIB_PATH . '/password_compat.php');
+		}
+
+		return password_verify($nonce . $hash, $challenge);
+	}
+
+	public static function getCredentialsFromCookie() {
+		$token = Minz_Session::getLongTermCookie('FreshRSS_login');
+		if (!ctype_alnum($token)) {
+			return array();
+		}
+
+		$token_file = DATA_PATH . '/tokens/' . $token . '.txt';
+		$mtime = @filemtime($token_file);
+		if ($mtime + 2629744 < time()) {
+			// Token has expired (> 1 month) or does not exist.
+			// TODO: 1 month -> use a configuration instead
+			@unlink($token_file);
+			return array(); 	
+		}
+
+		$credentials = @file_get_contents($token_file);
+		return $credentials === false ? array() : explode("\t", $credentials, 2);
+	}
+
+	public static function makeCookie($username, $password_hash) {
+		do {
+			$token = sha1(Minz_Configuration::salt() . $username . uniqid(mt_rand(), true));
+			$token_file = DATA_PATH . '/tokens/' . $token . '.txt';
+		} while (file_exists($token_file));
+
+		if (@file_put_contents($token_file, $username . "\t" . $password_hash) === false) {
+			return false;
+		}
+
+		$expire = time() + 2629744;	//1 month	//TODO: Use a configuration instead
+		Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire);
+		return $token;
+	}
+
+	public static function deleteCookie() {
+		$token = Minz_Session::getLongTermCookie('FreshRSS_login');
+		Minz_Session::deleteLongTermCookie('FreshRSS_login');
+		if (ctype_alnum($token)) {
+			@unlink(DATA_PATH . '/tokens/' . $token . '.txt');
+		}
+
+		if (rand(0, 10) === 1) {
+			self::purgeTokens();
+		}
+	}
+
+	public static function purgeTokens() {
+		$oldest = time() - 2629744;	// 1 month	// TODO: Use a configuration instead
+		foreach (new DirectoryIterator(DATA_PATH . '/tokens/') as $file_info) {
+			// $extension = $file_info->getExtension(); doesn't work in PHP < 5.3.7
+			$extension = pathinfo($file_info->getFilename(), PATHINFO_EXTENSION);
+			if ($extension === 'txt' && $file_info->getMTime() < $oldest) {
+				@unlink($file_info->getPathname());
+			}
+		}
+	}
+}
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index a8ae2f424..a66be2ed9 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -2,7 +2,7 @@
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<ul class="categories">
-		<?php if ($this->loginOk) { ?>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<form id="mark-read-aside" method="post" style="display: none"></form>
 
 		<li>
@@ -83,11 +83,11 @@
 	<ul class="dropdown-menu">
 		<li class="dropdown-close"><a href="#close">❌</a></li>
 		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
-		<?php if ($this->loginOk) { ?>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
 		<?php } ?>
 		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
-		<?php if ($this->loginOk) { ?>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="separator"></li>
 		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
 		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 4b571ef06..fadfd13d7 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -1,22 +1,11 @@
 <?php
 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 _i('logout'); ?> <a class="signout" href="<?php echo _url('index', 'formLogout'); ?>"><?php echo _t('logout'); ?></a></li><?php
+		if (FreshRSS_Auth::hasAccess()) {
+			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('index', 'logout'); ?>"><?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
+			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('index', 'login'); ?>"><?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
 }
 ?>
@@ -32,7 +21,7 @@ if (Minz_Configuration::canLogIn()) {
 	</div>
 
 	<div class="item search">
-		<?php if ($this->loginOk || Minz_Configuration::allowAnonymous()) { ?>
+		<?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymous()) { ?>
 		<form action="<?php echo _url('index', 'index'); ?>" method="get">
 			<div class="stick">
 				<?php $search = Minz_Request::param('search', ''); ?>
@@ -59,7 +48,7 @@ if (Minz_Configuration::canLogIn()) {
 		<?php } ?>
 	</div>
 
-	<?php if ($this->loginOk) { ?>
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
 	<div class="item configure">
 		<div class="dropdown">
 			<div id="dropdown-configure" class="dropdown-target"></div>
@@ -87,15 +76,8 @@ if (Minz_Configuration::canLogIn()) {
 				<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 _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;
-					}
+					?><li class="separator"></li>
+				<li class="item"><a class="signout" href="<?php echo _url('index', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index a9e6614e7..090b55785 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -6,7 +6,7 @@
 	<a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
 	<?php } ?>
 
-	<?php if ($this->loginOk) { ?>
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
 	<div id="nav_menu_actions" class="stick">
 		<?php
 			$url_state = $this->url;
@@ -300,7 +300,7 @@
 		<?php echo _i($icon); ?>
 	</a>
 	
-	<?php if ($this->loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?>
+	<?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymousRefresh()) { ?>
 	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>"><?php echo _i('refresh'); ?></a>
 	<?php } ?>
 </div>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 109fad0eb..db25714bb 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -7,7 +7,7 @@ if (!empty($this->entries)) {
 	$display_today = true;
 	$display_yesterday = true;
 	$display_others = true;
-	if ($this->loginOk) {
+	if (FreshRSS_Auth::hasAccess()) {
 		$sharing = $this->conf->sharing;
 	} else {
 		$sharing = array();
@@ -58,7 +58,7 @@ if (!empty($this->entries)) {
 		}
 	?><div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
 		<ul class="horizontal-list flux_header"><?php
-			if ($this->loginOk) {
+			if (FreshRSS_Auth::hasAccess()) {
 				if ($topline_read) {
 					?><li class="item manage"><?php
 						$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
@@ -103,7 +103,7 @@ if (!empty($this->entries)) {
 				?>
 			</div>
 			<ul class="horizontal-list bottom"><?php
-				if ($this->loginOk) {
+				if (FreshRSS_Auth::hasAccess()) {
 					if ($bottomline_read) {
 						?><li class="item manage"><?php
 							$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 584792e29..a59063557 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -2,7 +2,7 @@
 
 $output = Minz_Request::param('output', 'normal');
 
-if ($this->loginOk || Minz_Configuration::allowAnonymous()) {
+if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymous()) {
 	if ($output === 'normal') {
 		$this->renderHelper('view/normal_view');
 	} elseif ($output === 'reader') {
diff --git a/app/views/index/login.phtml b/app/views/index/login.phtml
deleted file mode 100644
index 79fbe9d21..000000000
--- a/app/views/index/login.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<?php print_r($this->res); ?>
diff --git a/app/views/index/logout.phtml b/app/views/index/logout.phtml
deleted file mode 100644
index a0aba9318..000000000
--- a/app/views/index/logout.phtml
+++ /dev/null
@@ -1 +0,0 @@
-OK
\ No newline at end of file
diff --git a/app/views/index/resetAuth.phtml b/app/views/index/resetAuth.phtml
deleted file mode 100644
index 6d4282c14..000000000
--- a/app/views/index/resetAuth.phtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="prompt">
-	<h1><?php echo _t('auth_reset'); ?></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><br />
-		<?php echo $this->message['body']; ?>
-	</p>
-	<?php } ?>
-
-	<?php if (!$this->no_form) { ?>
-	<form id="crypto-form" method="post" action="<?php echo _url('index', 'resetAuth'); ?>">
-		<p class="alert alert-warn">
-			<span class="alert-head"><?php echo _t('attention'); ?></span><br />
-			<?php echo _t('auth_will_reset'); ?>
-		</p>
-
-		<div>
-			<label for="username"><?php echo _t('username_admin'); ?></label>
-			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
-		</div>
-		<div>
-			<label for="passwordPlain"><?php echo _t('password'); ?></label>
-				<input type="password" id="passwordPlain" required="required" />
-				<input type="hidden" id="challenge" name="challenge" /><br />
-				<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
-		</div>
-		<div>
-			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('submit'); ?></button>
-		</div>
-	</form>
-	<?php } ?>
-</div>

From 6009990935a2d06c252073f6b51ea5378536ef52 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 7 Oct 2014 10:16:38 +0200
Subject: [PATCH 067/363] Introduce FreshRSS_Auth::hasAccess('admin')

Replace Minz_Configuration::isAdmin($user). FreshRSS_Auth::hasAccess() could
be extended to others scopes later.

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/configureController.php |  2 +-
 app/Controllers/updateController.php    |  2 +-
 app/Controllers/usersController.php     |  8 ++++----
 app/Models/Auth.php                     | 19 +++++++++++++++----
 app/layout/aside_configure.phtml        |  5 +----
 app/layout/header.phtml                 |  5 +----
 app/views/configure/archiving.phtml     |  2 +-
 app/views/users/index.phtml             |  6 +++---
 lib/Minz/Configuration.php              |  3 ---
 9 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 7e77a757a..fb8c1466e 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -229,7 +229,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		$this->view->nb_total = $entryDAO->count();
 		$this->view->size_user = $entryDAO->size();
 
-		if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
+		if (FreshRSS_Auth::hasAccess('admin')) {
 			$this->view->size_total = $entryDAO->size(true);
 		}
 	}
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 9da1e8657..9d1e1ddf5 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -3,7 +3,7 @@
 class FreshRSS_update_Controller extends Minz_ActionController {
 	public function firstAction() {
 		$current_user = Minz_Session::param('currentUser', '');
-		if (!FreshRSS_Auth::hasAccess() && Minz_Configuration::isAdmin($current_user)) {
+		if (!FreshRSS_Auth::hasAccess('admin')) {
 			Minz_Error::error(
 				403,
 				array('error' => array(_t('access_denied')))
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index c2b1d163f..11862ce27 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -51,7 +51,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 				$this->view->conf->_apiPasswordHash($passwordHash);
 			}
 
-			if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
+			if (FreshRSS_Auth::hasAccess('admin')) {
 				$this->view->conf->_mail_login(Minz_Request::param('mail_login', '', true));
 			}
 			$email = $this->view->conf->mail_login;
@@ -65,7 +65,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 				$ok &= (file_put_contents($personaFile, Minz_Session::param('currentUser', '_')) !== false);
 			}
 
-			if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
+			if (FreshRSS_Auth::hasAccess('admin')) {
 				$current_token = $this->view->conf->token;
 				$token = Minz_Request::param('token', $current_token);
 				$this->view->conf->_token($token);
@@ -105,7 +105,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 	}
 
 	public function createAction() {
-		if (Minz_Request::isPost() && Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
+		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
 			$db = Minz_Configuration::dataBase();
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
@@ -177,7 +177,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 	}
 
 	public function deleteAction() {
-		if (Minz_Request::isPost() && Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
+		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
 			$db = Minz_Configuration::dataBase();
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index c4a3abd98..992b444a5 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -99,12 +99,23 @@ class FreshRSS_Auth {
 	}
 
 	/**
-	 * Returns if current user is connected.
+	 * Returns if current user has access to the given scope.
 	 *
-	 * @return boolean true if user is connected, false else.
+	 * @param string $scope general (default) or admin
+	 * @return boolean true if user has corresponding access, false else.
 	 */
-	public static function hasAccess() {
-		return self::$login_ok;
+	public static function hasAccess($scope = 'general') {
+		$ok = self::$login_ok;
+		switch ($scope) {
+		case 'general':
+			break;
+		case 'admin':
+			$ok &= Minz_Session::param('currentUser') === Minz_Configuration::defaultUser();
+			break;
+		default:
+			$ok = false;
+		}
+		return $ok;
 	}
 
 	/**
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index e17bcb254..59846a7c8 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -22,10 +22,7 @@
 	<li class="item<?php echo Minz_Request::controllerName() === 'users' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('users', 'index'); ?>"><?php echo _t('users'); ?></a>
 	</li>
-	<?php
-		$current_user = Minz_Session::param('currentUser', '');
-		if (Minz_Configuration::isAdmin($current_user)) {
-	?>
+	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 	<li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
 	</li>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index fadfd13d7..12c86d61d 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -64,10 +64,7 @@ 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('users', 'index'); ?>"><?php echo _t('users'); ?></a></li>
-				<?php
-					$current_user = Minz_Session::param('currentUser', '');
-					if (Minz_Configuration::isAdmin($current_user)) {
-				?>
+				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
 				<?php } ?>
 				<li class="separator"></li>
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index a883571aa..adbfdb77e 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -67,7 +67,7 @@
 			</div>
 		</div>
 
-		<?php if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { ?>
+		<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 		<div class="form-group">
 			<p class="group-name"><?php echo _t('users'); ?></p>
 			<div class="group-controls">
diff --git a/app/views/users/index.phtml b/app/views/users/index.phtml
index 95659f727..f1cdf01a3 100644
--- a/app/views/users/index.phtml
+++ b/app/views/users/index.phtml
@@ -11,7 +11,7 @@
 			<div class="group-controls">
 				<input id="current_user" type="text" disabled="disabled" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
 				<label class="checkbox" for="is_admin">
-					<input type="checkbox" id="is_admin" disabled="disabled" <?php echo Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_')) ? 'checked="checked" ' : ''; ?>/>
+					<input type="checkbox" id="is_admin" disabled="disabled" <?php echo FreshRSS_Auth::hasAccess('admin') ? 'checked="checked" ' : ''; ?>/>
 					<?php echo _t('is_admin'); ?>
 				</label>
 			</div>
@@ -44,7 +44,7 @@
 			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
 			<?php $mail = $this->conf->mail_login; ?>
 			<div class="group-controls">
-				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_')) ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
+				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
 				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
@@ -56,7 +56,7 @@
 			</div>
 		</div>
 
-	<?php if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { ?>
+	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 
 		<legend><?php echo _t('auth_type'); ?></legend>
 
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 4e9da58b4..554bc8c96 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -100,9 +100,6 @@ class Minz_Configuration {
 	public static function defaultUser () {
 		return self::$default_user;
 	}
-	public static function isAdmin($currentUser) {
-		return $currentUser === self::$default_user;
-	}
 	public static function allowAnonymous() {
 		return self::$allow_anonymous;
 	}

From 1252b3dd867e59917cf303f0c39c7da938b8ce32 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 7 Oct 2014 16:37:10 +0200
Subject: [PATCH 068/363] Authentication system moved + Persona comes back!

AuthController is dedicated to auhentication.
Persona is back, greater than ever!

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/authController.php        | 182 ++++++++++++++++++++++
 app/Controllers/indexController.php       |  90 +----------
 app/FreshRSS.php                          |   8 +
 app/Models/Auth.php                       |  21 ++-
 app/layout/header.phtml                   |  23 +--
 app/views/{index => auth}/formLogin.phtml |  24 +--
 app/views/auth/logout.phtml               |   0
 app/views/auth/personaLogin.phtml         |  24 +++
 app/views/helpers/javascript_vars.phtml   |  13 +-
 p/scripts/main.js                         |  65 --------
 p/scripts/persona.js                      |  76 +++++++++
 11 files changed, 331 insertions(+), 195 deletions(-)
 create mode 100644 app/Controllers/authController.php
 rename app/views/{index => auth}/formLogin.phtml (63%)
 create mode 100644 app/views/auth/logout.phtml
 create mode 100644 app/views/auth/personaLogin.phtml
 create mode 100644 p/scripts/persona.js

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
new file mode 100644
index 000000000..2b67e34b8
--- /dev/null
+++ b/app/Controllers/authController.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * This controller handles action about authentication.
+ */
+class FreshRSS_auth_Controller extends Minz_ActionController {
+	/**
+	 * This action handles the login page.
+	 *
+	 * It forwards to the correct login page (form or Persona) or main page if
+	 * the user is already connected.
+	 */
+	public function loginAction() {
+		if (FreshRSS_Auth::hasAccess()) {
+			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
+		}
+
+		$auth_type = Minz_Configuration::authType();
+		switch ($auth_type) {
+		case 'form':
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'formLogin'));
+			break;
+		case 'persona':
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'personaLogin'));
+			break;
+		case 'http_auth':
+		case 'none':
+			// It should not happened!
+			Minz_Error::error(404);
+		default:
+			// TODO load plugin instead
+			Minz_Error::error(404);
+		}
+	}
+
+	/**
+	 * This action handles form login page.
+	 *
+	 * If this action is reached through a POST request, username and password
+	 * are compared to login the current user.
+	 *
+	 * Parameters are:
+	 *   - nonce (default: false)
+	 *   - username (default: '')
+	 *   - challenge (default: '')
+	 *   - keep_logged_in (default: false)
+	 */
+	public function formLoginAction() {
+		invalidateHttpCache();
+
+		$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js');
+		Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . $file_mtime));
+
+		if (Minz_Request::isPost()) {
+			$nonce = Minz_Session::param('nonce');
+			$username = Minz_Request::param('username', '');
+			$challenge = Minz_Request::param('challenge', '');
+			try {
+				$conf = new FreshRSS_Configuration($username);
+			} catch(Minz_Exception $e) {
+				// $username is not a valid user, nor the configuration file!
+				Minz_Log::warning('Login failure: ' . $e->getMessage());
+				Minz_Request::bad(_t('invalid_login'),
+				                  array('c' => 'auth', 'a' => 'login'));
+			}
+
+			$ok = FreshRSS_FormAuth::checkCredentials(
+				$username, $conf->passwordHash, $nonce, $challenge
+			);
+			if ($ok) {
+				// Set session parameter to give access to the user.
+				Minz_Session::_param('currentUser', $username);
+				Minz_Session::_param('passwordHash', $conf->passwordHash);
+				FreshRSS_Auth::giveAccess();
+
+				// Set cookie parameter if nedded.
+				if (Minz_Request::param('keep_logged_in')) {
+					FreshRSS_FormAuth::makeCookie($username, $conf->passwordHash);
+				} else {
+					FreshRSS_FormAuth::deleteCookie();
+				}
+
+				// All is good, go back to the index.
+				Minz_Request::good(_t('login'),
+				                   array('c' => 'index', 'a' => 'index'));
+			} else {
+				Minz_Log::warning('Password mismatch for' .
+				                  ' user=' . $username .
+				                  ', nonce=' . $nonce .
+				                  ', c=' . $challenge);
+				Minz_Request::bad(_t('invalid_login'),
+				                  array('c' => 'auth', 'a' => 'login'));
+			}
+		}
+	}
+
+	/**
+	 * This action handles Persona login page.
+	 *
+	 * If this action is reached through a POST request, assertion from Persona
+	 * is verificated and user connected if all is ok.
+	 *
+	 * Parameter is:
+	 *   - assertion (default: false)
+	 *
+	 * @todo: Persona system should be moved to a plugin
+	 */
+	public function personaLoginAction() {
+		$this->view->res = false;
+
+		if (Minz_Request::isPost()) {
+			$this->view->_useLayout(false);
+
+			$assert = Minz_Request::param('assertion');
+			$url = 'https://verifier.login.persona.org/verify';
+			$params = 'assertion=' . $assert . '&audience=' .
+			          urlencode(Minz_Url::display(null, 'php', true));
+			$ch = curl_init();
+			$options = array(
+				CURLOPT_URL => $url,
+				CURLOPT_RETURNTRANSFER => TRUE,
+				CURLOPT_POST => 2,
+				CURLOPT_POSTFIELDS => $params
+			);
+			curl_setopt_array($ch, $options);
+			$result = curl_exec($ch);
+			curl_close($ch);
+
+			$res = json_decode($result, true);
+
+			$login_ok = false;
+			$reason = '';
+			if ($res['status'] === 'okay') {
+				$email = filter_var($res['email'], FILTER_VALIDATE_EMAIL);
+				if ($email != '') {
+					$persona_file = DATA_PATH . '/persona/' . $email . '.txt';
+					if (($current_user = @file_get_contents($persona_file)) !== false) {
+						$current_user = trim($current_user);
+						try {
+							$conf = new FreshRSS_Configuration($current_user);
+							$login_ok = strcasecmp($email, $conf->mail_login) === 0;
+						} catch (Minz_Exception $e) {
+							//Permission denied or conf file does not exist
+							$reason = 'Invalid configuration for user ' .
+							          '[' . $current_user . '] ' . $e->getMessage();
+						}
+					}
+				} else {
+					$reason = 'Invalid email format [' . $res['email'] . ']';
+				}
+			} else {
+				$reason = $res['reason'];
+			}
+
+			if ($login_ok) {
+				Minz_Session::_param('currentUser', $current_user);
+				Minz_Session::_param('mail', $email);
+				FreshRSS_Auth::giveAccess();
+				invalidateHttpCache();
+			} else {
+				Minz_Log::error($reason);
+
+				$res = array();
+				$res['status'] = 'failure';
+				$res['reason'] = _t('invalid_login');
+			}
+
+			header('Content-Type: application/json; charset=UTF-8');
+			$this->view->res = $res;
+		}
+	}
+
+	/**
+	 * This action removes all accesses of the current user.
+	 */
+	public function logoutAction() {
+		invalidateHttpCache();
+		FreshRSS_Auth::removeAccess();
+		Minz_Request::good(_t('disconnected'),
+		                   array('c' => 'index', 'a' => 'index'));
+	}
+}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 3006480f9..5b490e672 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -20,7 +20,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			} elseif ($output !== 'rss') {
 				// "hard" redirection is not required, just ask dispatcher to
 				// forward to the login form without 302 redirection
-				Minz_Request::forward(array('c' => 'index', 'a' => 'login'));
+				Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
 				return;
 			}
 		}
@@ -228,92 +228,4 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->logsPaginator->_nbItemsPerPage(50);
 		$this->view->logsPaginator->_currentPage($page);
 	}
-
-	/**
-	 * This action handles the login page.
-	 */
-	public function loginAction() {
-		if (FreshRSS_Auth::hasAccess()) {
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		}
-
-		invalidateHttpCache();
-
-		$auth_type = Minz_Configuration::authType();
-		switch ($auth_type) {
-		case 'form':
-			Minz_Request::forward(array('c' => 'index', 'a' => 'formLogin'));
-			break;
-		case 'http_auth':
-		case 'none':
-			// It should not happened!
-			Minz_Error::error(404);
-		default:
-			// TODO load plugin instead
-			Minz_Error::error(404);
-		}
-	}
-
-	/**
-	 *
-	 */
-	public function formLoginAction() {
-		if (FreshRSS_Auth::hasAccess()) {
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		}
-
-		invalidateHttpCache();
-
-		$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js');
-		Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . $file_mtime));
-
-		if (Minz_Request::isPost()) {
-			$nonce = Minz_Session::param('nonce');
-			$username = Minz_Request::param('username', '');
-			$challenge = Minz_Request::param('challenge', '');
-			try {
-				$conf = new FreshRSS_Configuration($username);
-			} catch(Minz_Exception $e) {
-				// $username is not a valid user, nor the configuration file!
-				Minz_Log::warning('Login failure: ' . $e->getMessage());
-				Minz_Request::bad(_t('invalid_login'),
-				                  array('c' => 'index', 'a' => 'login'));
-			}
-
-			$ok = FreshRSS_FormAuth::checkCredentials(
-				$username, $conf->passwordHash, $nonce, $challenge
-			);
-			if ($ok) {
-				// Set session parameter to give access to the user.
-				Minz_Session::_param('currentUser', $username);
-				Minz_Session::_param('passwordHash', $conf->passwordHash);
-				FreshRSS_Auth::giveAccess();
-
-				// Set cookie parameter if nedded.
-				if (Minz_Request::param('keep_logged_in', false)) {
-					FreshRSS_FormAuth::makeCookie($username, $conf->passwordHash);
-				} else {
-					FreshRSS_FormAuth::deleteCookie();
-				}
-
-				// All is good, go back to the index.
-				Minz_Request::good(_t('login'),
-				                   array('c' => 'index', 'a' => 'index'));
-			} else {
-				Minz_Log::warning('Password mismatch for' .
-				                  ' user=' . $username .
-				                  ', nonce=' . $nonce .
-				                  ', c=' . $challenge);
-				Minz_Request::bad(_t('invalid_login'),
-				                  array('c' => 'index', 'a' => 'login'));
-			}
-		}
-	}
-
-	public function logoutAction() {
-		invalidateHttpCache();
-		FreshRSS_Auth::removeAccess();
-		Minz_Request::good(_t('disconnected'),
-		                   array('c' => 'index', 'a' => 'index'));
-	}
 }
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 35a37b887..6b7a813bf 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -64,6 +64,14 @@ class FreshRSS extends Minz_FrontController {
 		Minz_View::appendScript(Minz_Url::display('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
+
+		if (Minz_Configuration::authType() === 'persona') {
+			// TODO move it in a plugin
+			// Needed for login AND logout with Persona.
+			Minz_View::appendScript('https://login.persona.org/include.js');
+			$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/persona.js');
+			Minz_View::appendScript(Minz_Url::display('/scripts/persona.js?' . $file_mtime));
+		}
 	}
 
 	private function loadNotifications() {
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 992b444a5..cc23d7974 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -20,7 +20,7 @@ class FreshRSS_Auth {
 			Minz_Session::_param('currentUser', $current_user);
 		}
 
-		$access_ok = self::accessControl($current_user);
+		$access_ok = self::accessControl();
 
 		if ($access_ok) {
 			self::giveAccess();
@@ -36,10 +36,9 @@ class FreshRSS_Auth {
 	 * Required session parameters are also set in this method (such as
 	 * currentUser).
 	 *
-	 * @param string $username username of the user to check access.
 	 * @return boolean true if user can be connected, false else.
 	 */
-	public static function accessControl($username) {
+	public static function accessControl() {
 		if (self::$login_ok) {
 			return true;
 		}
@@ -61,6 +60,16 @@ class FreshRSS_Auth {
 				Minz_Session::_param('currentUser', $current_user);
 			}
 			return $login_ok;
+		case 'persona':
+			$email = filter_var(Minz_Session::param('mail'), FILTER_VALIDATE_EMAIL);
+			$persona_file = DATA_PATH . '/persona/' . $email . '.txt';
+			if (($current_user = @file_get_contents($persona_file)) !== false) {
+				$current_user = trim($current_user);
+				Minz_Session::_param('currentUser', $current_user);
+				Minz_Session::_param('mail', $email);
+				return true;
+			}
+			return false;
 		case 'none':
 			return true;
 		default:
@@ -87,6 +96,9 @@ class FreshRSS_Auth {
 		case 'http_auth':
 			self::$login_ok = strcasecmp($current_user, httpAuthUser()) === 0;
 			break;
+		case 'persona':
+			self::$login_ok = strcasecmp(Minz_Session::param('mail'), $conf->mail_login) === 0;
+			break;
 		case 'none':
 			self::$login_ok = true;
 			break;
@@ -131,6 +143,9 @@ class FreshRSS_Auth {
 			Minz_Session::_param('passwordHash');
 			FreshRSS_FormAuth::deleteCookie();
 			break;
+		case 'persona':
+			Minz_Session::_param('mail');
+			break;
 		case 'http_auth':
 		case 'none':
 			// Nothing to do...
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 12c86d61d..deb21edc9 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -2,9 +2,9 @@
 if (Minz_Configuration::canLogIn()) {
 	?><ul class="nav nav-head nav-login"><?php
 		if (FreshRSS_Auth::hasAccess()) {
-			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('index', 'logout'); ?>"><?php echo _t('logout'); ?></a></li><?php
+			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('logout'); ?></a></li><?php
 		} else {
-			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('index', 'login'); ?>"><?php echo _t('login'); ?></a></li><?php
+			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('login'); ?></a></li><?php
 		}
 	?></ul><?php
 }
@@ -74,21 +74,14 @@ if (Minz_Configuration::canLogIn()) {
 				<?php
 				if (Minz_Configuration::canLogIn()) {
 					?><li class="separator"></li>
-				<li class="item"><a class="signout" href="<?php echo _url('index', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
+				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
 	</div>
-	<?php } elseif (Minz_Configuration::canLogIn()) {
-		?><div class="item configure"><?php
-		switch (Minz_Configuration::authType()) {
-		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
-	} ?>
+	<?php } elseif (Minz_Configuration::canLogIn()) { ?>
+	<div class="item configure">
+		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('login'); ?></a>
+	</div>
+	<?php } ?>
 </div>
diff --git a/app/views/index/formLogin.phtml b/app/views/auth/formLogin.phtml
similarity index 63%
rename from app/views/index/formLogin.phtml
rename to app/views/auth/formLogin.phtml
index b05cdced4..0194a11a5 100644
--- a/app/views/index/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -1,9 +1,7 @@
 <div class="prompt">
-	<h1><?php echo _t('login'); ?></h1><?php
+	<h1><?php echo _t('login'); ?></h1>
 
-	switch (Minz_Configuration::authType()) {
-	case 'form':
-	?><form id="crypto-form" method="post" action="<?php echo _url('index', 'formLogin'); ?>">
+	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
 			<label for="username"><?php echo _t('username'); ?></label>
 			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
@@ -24,23 +22,7 @@
 		<div>
 			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('login'); ?></button>
 		</div>
-	</form><?php
-		break;
-
-	case 'persona':
-		?><p>
-			<a class="signin btn btn-important" href="#">
-				<?php echo _i('login'); ?>
-				<?php echo _t('login_with_persona'); ?>
-			</a><br /><br />
-
-			<?php echo _i('help'); ?>
-			<small>
-				<a href="<?php echo _url('index', 'resetAuth'); ?>"><?php echo _t('login_persona_problem'); ?></a>
-			</small>
-		</p><?php
-		break;
-	} ?>
+	</form>
 
 	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></p>
 </div>
diff --git a/app/views/auth/logout.phtml b/app/views/auth/logout.phtml
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
new file mode 100644
index 000000000..d62fe5818
--- /dev/null
+++ b/app/views/auth/personaLogin.phtml
@@ -0,0 +1,24 @@
+<?php if ($this->res === false) { ?>
+<div class="prompt">
+	<h1><?php echo _t('login'); ?></h1>
+
+	<p>
+		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
+			<?php echo _i('login'); ?> <?php echo _t('login_with_persona'); ?>
+		</a>
+
+		<br /><br />
+
+		<?php echo _i('help'); ?>
+		<small>
+			<a href="<?php echo _url('auth', 'resetAuth'); ?>"><?php echo _t('login_persona_problem'); ?></a>
+		</small>
+	</p>
+
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></p>
+</div>
+<?php
+} else {
+	echo json_encode($this->res);
+}
+?>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 8f615ed87..3bbcc3848 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -8,6 +8,15 @@ $hide_posts = ($this->conf->display_posts ||
                Minz_Request::param('output') === 'reader');
 $s = $this->conf->shortcuts;
 
+$url_login = Minz_Url::display(array(
+	'c' => 'auth',
+	'a' => 'login'
+), 'php');
+$url_logout = Minz_Url::display(array(
+	'c' => 'auth',
+	'a' => 'logout'
+), 'php');
+
 echo 'var context={',
 	'hide_posts:', $hide_posts ? 'false' : 'true', ',',
 	'display_order:"', Minz_Request::param('order', $this->conf->sort_order), '",',
@@ -43,8 +52,8 @@ echo 'shortcuts={',
 
 echo 'url={',
 	'index:"', _url('index', 'index'), '",',
-	'login:"', _url('index', 'login'), '",',
-	'logout:"', _url('index', 'logout'), '",',
+	'login:"', $url_login, '",',
+	'logout:"', $url_logout, '",',
 	'help:"', FRESHRSS_WIKI, '"',
 "},\n";
 
diff --git a/p/scripts/main.js b/p/scripts/main.js
index b01a3a34d..77e1e3f77 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1034,67 +1034,7 @@ function init_crypto_form() {
 }
 //</crypto form (Web login)>
 
-//<persona>
-function init_persona() {
-	if (!(navigator.id)) {
-		if (window.console) {
-			console.log('FreshRSS waiting for Persona…');
-		}
-		window.setTimeout(init_persona, 100);
-		return;
-	}
-	$('a.signin').click(function() {
-		navigator.id.request();
-		return false;
-	});
 
-	$('a.signout').click(function() {
-		navigator.id.logout();
-		return false;
-	});
-
-	navigator.id.watch({
-		loggedInUser: context['current_user_mail'],
-
-		onlogin: function(assertion) {
-			// A user has logged in! Here you need to:
-			// 1. Send the assertion to your backend for verification and to create a session.
-			// 2. Update your UI.
-			$.ajax ({
-				type: 'POST',
-				url: url['login'],
-				data: {assertion: assertion},
-				success: function(res, status, xhr) {
-					/*if (res.status === 'failure') {
-						alert (res_obj.reason);
-					} else*/ if (res.status === 'okay') {
-						location.href = url['index'];
-					}
-				},
-				error: function(res, status, xhr) {
-					alert("Login failure: " + res);
-				}
-			});
-		},
-		onlogout: function() {
-			// A user has logged out! Here you need to:
-			// Tear down the user's session by redirecting the user or making a call to your backend.
-			// Also, make sure loggedInUser will get set to null on the next page load.
-			// (That's a literal JavaScript null. Not false, 0, or undefined. null.)
-			$.ajax ({
-				type: 'POST',
-				url: url['logout'],
-				success: function(res, status, xhr) {
-					location.href = url['index'];
-				},
-				error: function(res, status, xhr) {
-					//alert("logout failure" + res);
-				}
-			});
-		}
-	});
-}
-//</persona>
 
 function init_confirm_action() {
 	$('body').on('click', '.confirm', function () {
@@ -1274,11 +1214,6 @@ function init_all() {
 		return;
 	}
 	init_notifications();
-	switch (context['auth_type']) {
-		case 'persona':
-			init_persona();
-			break;
-	}
 	init_confirm_action();
 	$stream = $('#stream');
 	if ($stream.length > 0) {
diff --git a/p/scripts/persona.js b/p/scripts/persona.js
new file mode 100644
index 000000000..36aeeaf56
--- /dev/null
+++ b/p/scripts/persona.js
@@ -0,0 +1,76 @@
+"use strict";
+
+function init_persona() {
+	if (!(navigator.id && window.$)) {
+		if (window.console) {
+			console.log('FreshRSS (Persona) waiting for JS…');
+		}
+		window.setTimeout(init_persona, 100);
+		return;
+	}
+
+	$('a.signin').click(function() {
+		navigator.id.request();
+		return false;
+	});
+
+	$('a.signout').click(function() {
+		navigator.id.logout();
+		return false;
+	});
+
+	navigator.id.watch({
+		loggedInUser: context['current_user_mail'],
+
+		onlogin: function(assertion) {
+			// A user has logged in! Here you need to:
+			// 1. Send the assertion to your backend for verification and to create a session.
+			// 2. Update your UI.
+			$.ajax ({
+				type: 'POST',
+				url: url['login'],
+				data: {assertion: assertion},
+				success: function(res, status, xhr) {
+					if (res.status === 'failure') {
+						openNotification(res.reason, 'bad');
+					} else if (res.status === 'okay') {
+						location.href = url['index'];
+					}
+				},
+				error: function(res, status, xhr) {
+					// alert(res);
+				}
+			});
+		},
+		onlogout: function() {
+			// A user has logged out! Here you need to:
+			// Tear down the user's session by redirecting the user or making a call to your backend.
+			// Also, make sure loggedInUser will get set to null on the next page load.
+			// (That's a literal JavaScript null. Not false, 0, or undefined. null.)
+			$.ajax ({
+				type: 'POST',
+				url: url['logout'],
+				success: function(res, status, xhr) {
+					location.href = url['index'];
+				},
+				error: function(res, status, xhr) {
+					// alert(res);
+				}
+			});
+		}
+	});
+}
+
+if (document.readyState && document.readyState !== 'loading') {
+	if (window.console) {
+		console.log('FreshRSS (Persona) immediate init…');
+	}
+	init_persona();
+} else if (document.addEventListener) {
+	document.addEventListener('DOMContentLoaded', function () {
+		if (window.console) {
+			console.log('FreshRSS (Persona) waiting for DOMContentLoaded…');
+		}
+		init_persona();
+	}, false);
+}

From dbf57266b297c3f831602ec4f451c27a5ad71e6b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 7 Oct 2014 16:58:11 +0200
Subject: [PATCH 069/363] Reset auth system comes back!

It has moved to authController.
---
 app/Controllers/authController.php | 68 ++++++++++++++++++++++++++++++
 app/views/auth/personaLogin.phtml  |  2 +-
 app/views/auth/reset.phtml         | 33 +++++++++++++++
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 app/views/auth/reset.phtml

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 2b67e34b8..e30fa4b72 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -179,4 +179,72 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		Minz_Request::good(_t('disconnected'),
 		                   array('c' => 'index', 'a' => 'index'));
 	}
+
+	/**
+	 * This action resets the authentication system.
+	 *
+	 * After reseting, form auth is set by default.
+	 */
+	public function resetAction() {
+		Minz_View::prependTitle(_t('auth_reset') . ' · ');
+
+		Minz_View::appendScript(Minz_Url::display(
+			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
+		));
+
+		$this->view->no_form = false;
+		// Enable changement of auth only if Persona!
+		if (Minz_Configuration::authType() != 'persona') {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('damn'),
+				'body' => _t('auth_not_persona')
+			);
+			$this->view->no_form = true;
+			return;
+		}
+
+		$conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
+		// Admin user must have set its master password.
+		if (!$conf->passwordHash) {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('damn'),
+				'body' => _t('auth_no_password_set')
+			);
+			$this->view->no_form = true;
+			return;
+		}
+
+		invalidateHttpCache();
+
+		if (Minz_Request::isPost()) {
+			$nonce = Minz_Session::param('nonce');
+			$username = Minz_Request::param('username', '');
+			$challenge = Minz_Request::param('challenge', '');
+
+			$ok = FreshRSS_FormAuth::checkCredentials(
+				$username, $conf->passwordHash, $nonce, $challenge
+			);
+
+			if ($ok) {
+				Minz_Configuration::_authType('form');
+				$ok = Minz_Configuration::writeFile();
+
+				if ($ok) {
+					Minz_Request::good(_t('auth_form_set'));
+				} else {
+					Minz_Request::bad(_t('auth_form_not_set'),
+				                      array('c' => 'auth', 'a' => 'reset'));
+				}
+			} else {
+				Minz_Log::warning('Password mismatch for' .
+				                  ' user=' . $username .
+				                  ', nonce=' . $nonce .
+				                  ', c=' . $challenge);
+				Minz_Request::bad(_t('invalid_login'),
+				                  array('c' => 'auth', 'a' => 'reset'));
+			}
+		}
+	}
 }
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
index d62fe5818..dd3e22b52 100644
--- a/app/views/auth/personaLogin.phtml
+++ b/app/views/auth/personaLogin.phtml
@@ -11,7 +11,7 @@
 
 		<?php echo _i('help'); ?>
 		<small>
-			<a href="<?php echo _url('auth', 'resetAuth'); ?>"><?php echo _t('login_persona_problem'); ?></a>
+			<a href="<?php echo _url('auth', 'reset'); ?>"><?php echo _t('login_persona_problem'); ?></a>
 		</small>
 	</p>
 
diff --git a/app/views/auth/reset.phtml b/app/views/auth/reset.phtml
new file mode 100644
index 000000000..e501555c4
--- /dev/null
+++ b/app/views/auth/reset.phtml
@@ -0,0 +1,33 @@
+<div class="prompt">
+	<h1><?php echo _t('auth_reset'); ?></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><br />
+		<?php echo $this->message['body']; ?>
+	</p>
+	<?php } ?>
+
+	<?php if (!$this->no_form) { ?>
+	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'reset'); ?>">
+		<p class="alert alert-warn">
+			<span class="alert-head"><?php echo _t('attention'); ?></span><br />
+			<?php echo _t('auth_will_reset'); ?>
+		</p>
+
+		<div>
+			<label for="username"><?php echo _t('username_admin'); ?></label>
+			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
+		</div>
+		<div>
+			<label for="passwordPlain"><?php echo _t('password'); ?></label>
+				<input type="password" id="passwordPlain" required="required" />
+				<input type="hidden" id="challenge" name="challenge" /><br />
+				<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+		</div>
+		<div>
+			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('submit'); ?></button>
+		</div>
+	</form>
+	<?php } ?>
+</div>

From eb40dbccdb1e0830fcad96d333b242870cc0d0a7 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Thu, 9 Oct 2014 21:44:44 -0400
Subject: [PATCH 070/363] Change statistic average

I was using the stats and it feels that the stat average was useless in that form since the line is always at the same position no matter what is the value.
So I deleted that line and added the average in the title. It is way more useful this way.

I updated some translations both on i18n files and on http://i18n.freshrss.org
---
 app/Models/StatsDAO.php           |  2 +-
 app/i18n/en.php                   |  6 +++---
 app/i18n/fr.php                   |  6 +++---
 app/views/stats/repartition.phtml | 36 +++----------------------------
 4 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 99d4e2148..283d5dcb1 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -237,7 +237,7 @@ SQL;
 			$interval_in_days = $period;
 		}
 
-		return round($res['count'] / ($interval_in_days / $period), 2);
+		return $res['count'] / ($interval_in_days / $period);
 	}
 
 	/**
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 9e968998a..ebc25ba0c 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -398,9 +398,9 @@
   'stats_entry_count' => 'Entry count',
   'stats_entry_per_category' => 'Entries per category',
   'stats_entry_per_day' => 'Entries per day (last 30 days)',
-  'stats_entry_per_day_of_week' => 'Per day of week',
-  'stats_entry_per_hour' => 'Per hour',
-  'stats_entry_per_month' => 'Per month',
+  'stats_entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
+  'stats_entry_per_hour' => 'Per hour (average: %.2f messages)',
+  'stats_entry_per_month' => 'Per month (average: %.2f messages)',
   'stats_entry_repartition' => 'Entries repartition',
   'stats_feed_per_category' => 'Feeds per category',
   'stats_idle' => 'Idle feeds',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 072094026..220f8b12d 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -398,9 +398,9 @@
   'stats_entry_count' => 'Nombre d’articles',
   'stats_entry_per_category' => 'Articles par catégorie',
   'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
-  'stats_entry_per_day_of_week' => 'Par jour de la semaine',
-  'stats_entry_per_hour' => 'Par heure',
-  'stats_entry_per_month' => 'Par mois',
+  'stats_entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
+  'stats_entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
+  'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
   'stats_entry_repartition' => 'Répartition des articles',
   'stats_feed_per_category' => 'Flux par catégorie',
   'stats_idle' => 'Flux inactifs',
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index a181ae251..670714707 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -30,17 +30,17 @@
 	<?php }?>
 
 	<div class="stat">
-		<h2><?php echo _t('stats_entry_per_hour'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_hour', $this->averageHour); ?></h2>
 		<div id="statsEntryPerHour" style="height: 300px"></div>
 	</div>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_entry_per_day_of_week'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
 		<div id="statsEntryPerDayOfWeek" style="height: 300px"></div>
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_entry_per_month'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_month', $this->averageMonth); ?></h2>
 		<div id="statsEntryPerMonth" style="height: 300px"></div>
 	</div>
 </div>
@@ -56,19 +56,10 @@ function initStats() {
 		return;
 	}
 	// Entry per hour
-	var avg_h = [];
-	for (var i = -1; i <= 24; i++) {
-		avg_h.push([i, <?php echo $this->averageHour?>]);
-	}
 	Flotr.draw(document.getElementById('statsEntryPerHour'),
 		[{
 			data: <?php echo $this->repartitionHour ?>,
 			bars: {horizontal: false, show: true}
-		}, {
-			data: avg_h,
-			lines: {show: true},
-			label: "<?php echo $this->averageHour?>",
-			yaxis: 2
 		}],
 		{
 			grid: {verticalLines: false},
@@ -81,23 +72,13 @@ function initStats() {
 				max: 23.9,
 				tickDecimals: 0},
 			yaxis: {min: 0},
-			y2axis: {showLabels: false},
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
 		});
 	// Entry per day of week
-	var avg_dow = [];
-	for (var i = -1; i <= 7; i++) {
-		avg_dow.push([i, <?php echo $this->averageDayOfWeek?>]);
-	}
 	Flotr.draw(document.getElementById('statsEntryPerDayOfWeek'),
 		[{
 			data: <?php echo $this->repartitionDayOfWeek ?>,
 			bars: {horizontal: false, show: true}
-		}, {
-			data: avg_dow,
-			lines: {show: true},
-			label: "<?php echo $this->averageDayOfWeek?>",
-			yaxis: 2
 		}],
 		{
 			grid: {verticalLines: false},
@@ -111,23 +92,13 @@ function initStats() {
 				max: 6.9,
 				tickDecimals: 0},
 			yaxis: {min: 0},
-			y2axis: {showLabels: false},
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
 		});
 	// Entry per month
-	var avg_m = [];
-	for (var i = 0; i <= 13; i++) {
-		avg_m.push([i, <?php echo $this->averageMonth?>]);
-	}
 	Flotr.draw(document.getElementById('statsEntryPerMonth'),
 		[{
 			data: <?php echo $this->repartitionMonth ?>,
 			bars: {horizontal: false, show: true}
-		}, {
-			data: avg_m,
-			lines: {show: true},
-			label: "<?php echo $this->averageMonth?>",
-			yaxis: 2
 		}],
 		{
 			grid: {verticalLines: false},
@@ -141,7 +112,6 @@ function initStats() {
 				max: 12.9,
 				tickDecimals: 0},
 			yaxis: {min: 0},
-			y2axis: {showLabels: false},
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
 		});
 

From 1283e73d08a0441dbf84d7e45ff8c1c42bf188b1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 14 Oct 2014 20:00:06 +0200
Subject: [PATCH 071/363] SimplePie: bug date CEST

https://github.com/marienfressinaud/FreshRSS/issues/659
https://github.com/simplepie/simplepie/pull/380
---
 lib/SimplePie/SimplePie/Parse/Date.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/SimplePie/SimplePie/Parse/Date.php b/lib/SimplePie/SimplePie/Parse/Date.php
index ef800f125..ba7c0703e 100644
--- a/lib/SimplePie/SimplePie/Parse/Date.php
+++ b/lib/SimplePie/SimplePie/Parse/Date.php
@@ -331,6 +331,7 @@ class SimplePie_Parse_Date
 		'CCT' => 23400,
 		'CDT' => -18000,
 		'CEDT' => 7200,
+		'CEST' => 7200,	//FreshRSS
 		'CET' => 3600,
 		'CGST' => -7200,
 		'CGT' => -10800,

From c5fe3bd6593d0a07c087d1e60ae2e4b8ab5f9fa9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 16 Oct 2014 15:25:46 +0200
Subject: [PATCH 072/363] Reorganize user pages

Three pages:

- User profil
- User management
- Authentication
---
 app/Controllers/authController.php            |  60 +++++
 ...usersController.php => userController.php} |  78 +++----
 app/layout/aside_configure.phtml              |  12 +-
 app/layout/header.phtml                       |   4 +-
 app/views/auth/index.phtml                    |  84 +++++++
 app/views/user/manage.phtml                   |  76 +++++++
 app/views/user/profil.phtml                   |  59 +++++
 app/views/users/index.phtml                   | 211 ------------------
 8 files changed, 325 insertions(+), 259 deletions(-)
 rename app/Controllers/{usersController.php => userController.php} (73%)
 create mode 100644 app/views/auth/index.phtml
 create mode 100644 app/views/user/manage.phtml
 create mode 100644 app/views/user/profil.phtml
 delete mode 100644 app/views/users/index.phtml

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index e30fa4b72..751ce1f3f 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -4,6 +4,66 @@
  * This controller handles action about authentication.
  */
 class FreshRSS_auth_Controller extends Minz_ActionController {
+	/**
+	 * This action handles authentication management page.
+	 *
+	 * Parameters are:
+	 *   - token (default: current token)
+	 *   - anon_access (default: false)
+	 *   - anon_refresh (default: false)
+	 *   - auth_type (default: none)
+	 *   - unsafe_autologin (default: false)
+	 *   - api_enabled (default: false)
+	 *
+	 * @todo move unsafe_autologin in an extension.
+	 */
+	public function indexAction() {
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403,
+			                  array('error' => array(_t('access_denied'))));
+		}
+
+		if (Minz_Request::isPost()) {
+			$ok = true;
+
+			$current_token = $this->view->conf->token;
+			$token = Minz_Request::param('token', $current_token);
+			$this->view->conf->_token($token);
+			$ok &= $this->view->conf->save();
+
+			$anon = Minz_Request::param('anon_access', false);
+			$anon = ((bool)$anon) && ($anon !== 'no');
+			$anon_refresh = Minz_Request::param('anon_refresh', false);
+			$anon_refresh = ((bool)$anon_refresh) && ($anon_refresh !== 'no');
+			$auth_type = Minz_Request::param('auth_type', 'none');
+			$unsafe_autologin = Minz_Request::param('unsafe_autologin', false);
+			$api_enabled = Minz_Request::param('api_enabled', false);
+			if ($anon != Minz_Configuration::allowAnonymous() ||
+				$auth_type != Minz_Configuration::authType() ||
+				$anon_refresh != Minz_Configuration::allowAnonymousRefresh() ||
+				$unsafe_autologin != Minz_Configuration::unsafeAutologinEnabled() ||
+				$api_enabled != Minz_Configuration::apiEnabled()) {
+
+				Minz_Configuration::_authType($auth_type);
+				Minz_Configuration::_allowAnonymous($anon);
+				Minz_Configuration::_allowAnonymousRefresh($anon_refresh);
+				Minz_Configuration::_enableAutologin($unsafe_autologin);
+				Minz_Configuration::_enableApi($api_enabled);
+				$ok &= Minz_Configuration::writeFile();
+			}
+
+			invalidateHttpCache();
+
+			if ($ok) {
+				Minz_Request::good('configuration_updated',
+				                   array('c' => 'auth', 'a' => 'index'));
+			} else {
+				Minz_Request::bad('error_occurred',
+				                  array('c' => 'auth', 'a' => 'index'));
+			}
+		}
+	}
+
 	/**
 	 * This action handles the login page.
 	 *
diff --git a/app/Controllers/usersController.php b/app/Controllers/userController.php
similarity index 73%
rename from app/Controllers/usersController.php
rename to app/Controllers/userController.php
index 11862ce27..c516246c9 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/userController.php
@@ -1,9 +1,18 @@
 <?php
 
-class FreshRSS_users_Controller extends Minz_ActionController {
-
-	const BCRYPT_COST = 9;	//Will also have to be computed client side on mobile devices, so do not use a too high cost
+/**
+ * Controller to handle user actions.
+ */
+class FreshRSS_user_Controller extends Minz_ActionController {
+	// Will also have to be computed client side on mobile devices,
+	// so do not use a too high cost
+	const BCRYPT_COST = 9;
 
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(
@@ -14,13 +23,11 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 	}
 
 	/**
-	 * This action display the user configuration page
+	 * This action displays the user profil page.
 	 */
-	public function indexAction() {
-		Minz_View::prependTitle(_t('users') . ' · ');
-	}
+	public function profilAction() {
+		Minz_View::prependTitle(_t('users.profil') . ' · ');
 
-	public function authAction() {
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
@@ -51,6 +58,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 				$this->view->conf->_apiPasswordHash($passwordHash);
 			}
 
+			// TODO: why do we need of hasAccess here?
 			if (FreshRSS_Auth::hasAccess('admin')) {
 				$this->view->conf->_mail_login(Minz_Request::param('mail_login', '', true));
 			}
@@ -65,43 +73,21 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 				$ok &= (file_put_contents($personaFile, Minz_Session::param('currentUser', '_')) !== false);
 			}
 
-			if (FreshRSS_Auth::hasAccess('admin')) {
-				$current_token = $this->view->conf->token;
-				$token = Minz_Request::param('token', $current_token);
-				$this->view->conf->_token($token);
-				$ok &= $this->view->conf->save();
-
-				$anon = Minz_Request::param('anon_access', false);
-				$anon = ((bool)$anon) && ($anon !== 'no');
-				$anon_refresh = Minz_Request::param('anon_refresh', false);
-				$anon_refresh = ((bool)$anon_refresh) && ($anon_refresh !== 'no');
-				$auth_type = Minz_Request::param('auth_type', 'none');
-				$unsafe_autologin = Minz_Request::param('unsafe_autologin', false);
-				$api_enabled = Minz_Request::param('api_enabled', false);
-				if ($anon != Minz_Configuration::allowAnonymous() ||
-					$auth_type != Minz_Configuration::authType() ||
-					$anon_refresh != Minz_Configuration::allowAnonymousRefresh() ||
-					$unsafe_autologin != Minz_Configuration::unsafeAutologinEnabled() ||
-					$api_enabled != Minz_Configuration::apiEnabled()) {
-
-					Minz_Configuration::_authType($auth_type);
-					Minz_Configuration::_allowAnonymous($anon);
-					Minz_Configuration::_allowAnonymousRefresh($anon_refresh);
-					Minz_Configuration::_enableAutologin($unsafe_autologin);
-					Minz_Configuration::_enableApi($api_enabled);
-					$ok &= Minz_Configuration::writeFile();
-				}
+			if ($ok) {
+				Minz_Request::good('users.profil.updated',
+				                   array('c' => 'user', 'a' => 'profil'));
+			} else {
+				Minz_Request::bad('error_occurred',
+				                  array('c' => 'user', 'a' => 'profil'));
 			}
-
-			invalidateHttpCache();
-
-			$notif = array(
-				'type' => $ok ? 'good' : 'bad',
-				'content' => _t($ok ? 'configuration_updated' : 'error_occurred')
-			);
-			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
+	}
+
+	/**
+	 * This action displays the user management page.
+	 */
+	public function manageAction() {
+		Minz_View::prependTitle(_t('users.manage') . ' · ');
 	}
 
 	public function createAction() {
@@ -173,7 +159,8 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
+
+		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
 
 	public function deleteAction() {
@@ -205,6 +192,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
+
+		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
 }
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 59846a7c8..7a9d0d839 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -19,10 +19,18 @@
 		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
 	</li>
 	<li class="separator"></li>
-	<li class="item<?php echo Minz_Request::controllerName() === 'users' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('users', 'index'); ?>"><?php echo _t('users'); ?></a>
+	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
+	                          Minz_Request::actionName() === 'profil'? ' active' : ''; ?>">
+		<a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a>
 	</li>
 	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
+	                          Minz_Request::actionName() === 'manage' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('users.manage'); ?></a>
+	</li>
+	<li class="item<?php echo Minz_Request::controllerName() === 'auth' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('authentication'); ?></a>
+	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
 	</li>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index deb21edc9..7e7c1b477 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -63,8 +63,10 @@ if (Minz_Configuration::canLogIn()) {
 				<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('users', 'index'); ?>"><?php echo _t('users'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a></li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('users.manage'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('authentication'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
 				<?php } ?>
 				<li class="separator"></li>
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
new file mode 100644
index 000000000..c37a7aef6
--- /dev/null
+++ b/app/views/auth/index.phtml
@@ -0,0 +1,84 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
+	<form method="post" action="<?php echo _url('auth', 'index'); ?>">
+		<legend><?php echo _t('auth_type'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
+			<div class="group-controls">
+				<select id="auth_type" name="auth_type" required="required">
+					<?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?>
+						<option selected="selected"></option>
+					<?php } ?>
+					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
+					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
+				</select>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="anon_access">
+					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : '',
+						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="anon_refresh">
+					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo Minz_Configuration::allowAnonymousRefresh() ? ' checked="checked"' : '',
+						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('allow_anonymous_refresh'); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="unsafe_autologin">
+					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
+						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('unsafe_autologin'); ?>
+					<kbd>p/i/?a=formLogin&amp;u=Alice&amp;p=1234</kbd>
+				</label>
+			</div>
+		</div>
+
+		<?php if (Minz_Configuration::canLogIn()) { ?>
+		<div class="form-group">
+			<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
+			<?php $token = $this->conf->token; ?>
+			<div class="group-controls">
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
+					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
+				<?php echo _i('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
+			</div>
+		</div>
+		<?php } ?>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="api_enabled">
+					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo Minz_Configuration::apiEnabled() ? ' checked="checked"' : '',
+						Minz_Configuration::needsLogin() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('api_enabled'); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
new file mode 100644
index 000000000..03746cabb
--- /dev/null
+++ b/app/views/user/manage.phtml
@@ -0,0 +1,76 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
+	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+		<legend><?php echo _t('users'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="users_list"><?php echo _t('users_list'); ?></label>
+			<div class="group-controls">
+				<select id="users_list" name="username"><?php
+					foreach (listUsers() as $user) {
+						echo '<option>', $user, '</option>';
+					}
+				?></select>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
+			</div>
+		</div>
+	</form>
+
+	<form method="post" action="<?php echo _url('user', 'create'); ?>">
+		<legend><?php echo _t('create_user'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
+			<div class="group-controls">
+				<select name="new_user_language" id="new_user_language">
+				<?php $languages = $this->conf->availableLanguages(); ?>
+				<?php foreach ($languages as $short => $lib) { ?>
+				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<?php } ?>
+				</select>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="new_user_name"><?php echo _t('username'); ?></label>
+			<div class="group-controls">
+				<input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" placeholder="demo" />
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="new_user_passwordPlain"><?php echo _t('password_form'); ?></label>
+			<div class="group-controls">
+				<div class="stick">
+					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
+				</div>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="new_user_email"><?php echo _t('persona_connection_email'); ?></label>
+			<?php $mail = $this->conf->mail_login; ?>
+			<div class="group-controls">
+				<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo _t('create'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+			</div>
+		</div>
+
+	</form>
+</div>
diff --git a/app/views/user/profil.phtml b/app/views/user/profil.phtml
new file mode 100644
index 000000000..a74c7b6f8
--- /dev/null
+++ b/app/views/user/profil.phtml
@@ -0,0 +1,59 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
+	<form method="post" action="<?php echo _url('user', 'profil'); ?>">
+		<legend><?php echo _t('login_configuration'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="current_user"><?php echo _t('current_user'); ?></label>
+			<div class="group-controls">
+				<input id="current_user" type="text" disabled="disabled" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
+				<label class="checkbox" for="is_admin">
+					<input type="checkbox" id="is_admin" disabled="disabled" <?php echo FreshRSS_Auth::hasAccess('admin') ? 'checked="checked" ' : ''; ?>/>
+					<?php echo _t('is_admin'); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
+			<div class="group-controls">
+				<div class="stick">
+					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
+				</div>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+			</div>
+		</div>
+
+		<?php if (Minz_Configuration::apiEnabled()) { ?>
+		<div class="form-group">
+			<label class="group-name" for="apiPasswordPlain"><?php echo _t('password_api'); ?></label>
+			<div class="group-controls">
+				<div class="stick">
+					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
+				</div>
+			</div>
+		</div>
+		<?php } ?>
+
+		<div class="form-group">
+			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
+			<?php $mail = $this->conf->mail_login; ?>
+			<div class="group-controls">
+				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/app/views/users/index.phtml b/app/views/users/index.phtml
deleted file mode 100644
index f1cdf01a3..000000000
--- a/app/views/users/index.phtml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php $this->partial('aside_configure'); ?>
-
-<div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
-
-	<form method="post" action="<?php echo _url('users', 'auth'); ?>">
-		<legend><?php echo _t('login_configuration'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="current_user"><?php echo _t('current_user'); ?></label>
-			<div class="group-controls">
-				<input id="current_user" type="text" disabled="disabled" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
-				<label class="checkbox" for="is_admin">
-					<input type="checkbox" id="is_admin" disabled="disabled" <?php echo FreshRSS_Auth::hasAccess('admin') ? 'checked="checked" ' : ''; ?>/>
-					<?php echo _t('is_admin'); ?>
-				</label>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
-				</div>
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
-			</div>
-		</div>
-
-		<?php if (Minz_Configuration::apiEnabled()) { ?>
-		<div class="form-group">
-			<label class="group-name" for="apiPasswordPlain"><?php echo _t('password_api'); ?></label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
-				</div>
-			</div>
-		</div>
-		<?php } ?>
-
-		<div class="form-group">
-			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
-			<?php $mail = $this->conf->mail_login; ?>
-			<div class="group-controls">
-				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
-			</div>
-		</div>
-
-	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-
-		<legend><?php echo _t('auth_type'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
-			<div class="group-controls">
-				<select id="auth_type" name="auth_type" required="required">
-					<?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?>
-						<option selected="selected"></option>
-					<?php } ?>
-					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
-					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
-				</select>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<div class="group-controls">
-				<label class="checkbox" for="anon_access">
-					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : '',
-						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
-				</label>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<div class="group-controls">
-				<label class="checkbox" for="anon_refresh">
-					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo Minz_Configuration::allowAnonymousRefresh() ? ' checked="checked"' : '',
-						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('allow_anonymous_refresh'); ?>
-				</label>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<div class="group-controls">
-				<label class="checkbox" for="unsafe_autologin">
-					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
-						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('unsafe_autologin'); ?>
-					<kbd>p/i/?a=formLogin&amp;u=Alice&amp;p=1234</kbd>
-				</label>
-			</div>
-		</div>
-
-		<?php if (Minz_Configuration::canLogIn()) { ?>
-		<div class="form-group">
-			<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
-			<?php $token = $this->conf->token; ?>
-			<div class="group-controls">
-				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
-					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo _i('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
-			</div>
-		</div>
-		<?php } ?>
-
-		<div class="form-group">
-			<div class="group-controls">
-				<label class="checkbox" for="api_enabled">
-					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo Minz_Configuration::apiEnabled() ? ' checked="checked"' : '',
-						Minz_Configuration::needsLogin() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('api_enabled'); ?>
-				</label>
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
-			</div>
-		</div>
-	</form>
-
-	<form method="post" action="<?php echo _url('users', 'delete'); ?>">
-		<legend><?php echo _t('users'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="users_list"><?php echo _t('users_list'); ?></label>
-			<div class="group-controls">
-				<select id="users_list" name="username"><?php
-					foreach (listUsers() as $user) {
-						echo '<option>', $user, '</option>';
-					}
-				?></select>
-			</div>
-		</div>
-	
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
-			</div>
-		</div>
-	</form>
-
-	<form method="post" action="<?php echo _url('users', 'create'); ?>">
-		<legend><?php echo _t('create_user'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
-			<div class="group-controls">
-				<select name="new_user_language" id="new_user_language">
-				<?php $languages = $this->conf->availableLanguages(); ?>
-				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
-				<?php } ?>
-				</select>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name" for="new_user_name"><?php echo _t('username'); ?></label>
-			<div class="group-controls">
-				<input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" placeholder="demo" />
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name" for="new_user_passwordPlain"><?php echo _t('password_form'); ?></label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
-					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
-				</div>
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="group-name" for="new_user_email"><?php echo _t('persona_connection_email'); ?></label>
-			<?php $mail = $this->conf->mail_login; ?>
-			<div class="group-controls">
-				<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('create'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
-			</div>
-		</div>
-
-	</form>
-
-	<?php } ?>
-</div>

From 2796cc9ae559842a90fa15cba65c94a11b29195e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 16 Oct 2014 16:43:37 +0200
Subject: [PATCH 073/363] User list load a new page

Beginning of more options for administrator!
---
 app/Controllers/userController.php |  4 +++
 app/views/stats/repartition.phtml  |  2 +-
 app/views/user/manage.phtml        | 41 +++++++++++++++---------------
 p/scripts/main.js                  |  2 +-
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index c516246c9..00b51cc3d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -88,6 +88,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 */
 	public function manageAction() {
 		Minz_View::prependTitle(_t('users.manage') . ' · ');
+
+		$this->view->current_user = Minz_Request::param(
+			'u', Minz_Session::param('currentUser', '_')
+		);
 	}
 
 	public function createAction() {
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 670714707..32268a546 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -5,7 +5,7 @@
 
 	<h1><?php echo _t('stats_repartition'); ?></h1>
 
-	<select id="feed_select">
+	<select id="feed_select" class="select-change">
 		<option data-url="<?php echo _url('stats', 'repartition')?>"><?php echo _t('all_feeds')?></option>
 	<?php foreach ($this->categories as $category) {
 		$feeds = $category->feeds();
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 03746cabb..fb569872b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -3,27 +3,6 @@
 <div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
-		<legend><?php echo _t('users'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="users_list"><?php echo _t('users_list'); ?></label>
-			<div class="group-controls">
-				<select id="users_list" name="username"><?php
-					foreach (listUsers() as $user) {
-						echo '<option>', $user, '</option>';
-					}
-				?></select>
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
-			</div>
-		</div>
-	</form>
-
 	<form method="post" action="<?php echo _url('user', 'create'); ?>">
 		<legend><?php echo _t('create_user'); ?></legend>
 
@@ -71,6 +50,26 @@
 				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
+	</form>
 
+	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+		<legend><?php echo _t('users'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="user-list"><?php echo _t('users_list'); ?></label>
+			<div class="group-controls">
+				<select id="user-list" class="select-change" name="username">
+					<?php foreach (listUsers() as $username) { ?>
+					<option data-url="<?php echo _url('user', 'manage', 'u', $username); ?>" <?php echo $this->current_user === $username ? 'selected="selected"' : ''; ?> value="<?php echo $username; ?>"><?php echo $username; ?></option>
+					<?php } ?>
+				</select>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
+			</div>
+		</div>
 	</form>
 </div>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 77e1e3f77..1e13ff16a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1086,7 +1086,7 @@ function init_share_observers() {
 }
 
 function init_stats_observers() {
-	$('#feed_select').on('change', function(e) {
+	$('.select-change').on('change', function(e) {
 		redirect($(this).find(':selected').data('url'));
 	});
 }

From d4ad951b9b686f387056bda8f3fa6ede8d9ca3f1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 16 Oct 2014 17:08:48 +0200
Subject: [PATCH 074/363] Show more information about user when selected

---
 app/Controllers/userController.php  | 19 ++++++++++++++++---
 app/Models/Factory.php              | 18 +++++++++---------
 app/Models/UserDAO.php              |  4 ++++
 app/views/configure/archiving.phtml |  2 +-
 app/views/user/manage.phtml         |  2 ++
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 00b51cc3d..4a04737f2 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -87,11 +87,24 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 * This action displays the user management page.
 	 */
 	public function manageAction() {
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403,
+			                  array('error' => array(_t('access_denied'))));
+		}
+
 		Minz_View::prependTitle(_t('users.manage') . ' · ');
 
-		$this->view->current_user = Minz_Request::param(
-			'u', Minz_Session::param('currentUser', '_')
-		);
+		$userDAO = new FreshRSS_UserDAO();
+
+		$username = Minz_Request::param('u', Minz_Session::param('currentUser'));
+		if (!$userDAO->exist($username)) {
+			$username = Minz_Session::param('currentUser');
+		}
+		$this->view->current_user = $username;
+
+		$entryDAO = FreshRSS_Factory::createEntryDao($this->view->current_user);
+		$this->view->nb_articles = $entryDAO->count();
+		$this->view->size_user = $entryDAO->size();
 	}
 
 	public function createAction() {
diff --git a/app/Models/Factory.php b/app/Models/Factory.php
index 08569b2e2..93f4552f7 100644
--- a/app/Models/Factory.php
+++ b/app/Models/Factory.php
@@ -2,30 +2,30 @@
 
 class FreshRSS_Factory {
 
-	public static function createFeedDao() {
+	public static function createFeedDao($username = null) {
 		$db = Minz_Configuration::dataBase();
 		if ($db['type'] === 'sqlite') {
-			return new FreshRSS_FeedDAOSQLite();
+			return new FreshRSS_FeedDAOSQLite($username);
 		} else {
-			return new FreshRSS_FeedDAO();
+			return new FreshRSS_FeedDAO($username);
 		}
 	}
 
-	public static function createEntryDao() {
+	public static function createEntryDao($username = null) {
 		$db = Minz_Configuration::dataBase();
 		if ($db['type'] === 'sqlite') {
-			return new FreshRSS_EntryDAOSQLite();
+			return new FreshRSS_EntryDAOSQLite($username);
 		} else {
-			return new FreshRSS_EntryDAO();
+			return new FreshRSS_EntryDAO($username);
 		}
 	}
 
-	public static function createStatsDAO() {
+	public static function createStatsDAO($username = null) {
 		$db = Minz_Configuration::dataBase();
 		if ($db['type'] === 'sqlite') {
-			return new FreshRSS_StatsDAOSQLite();
+			return new FreshRSS_StatsDAOSQLite($username);
 		} else {
-			return new FreshRSS_StatsDAO();
+			return new FreshRSS_StatsDAO($username);
 		}
 	}
 
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 15215258c..85b45c4a7 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -53,4 +53,8 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 			}
 		}
 	}
+
+	public function exist($username) {
+		return file_exists(DATA_PATH . '/' . $username . '_user.php');
+	}
 }
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index adbfdb77e..8f424c126 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -60,7 +60,7 @@
 		<div class="form-group">
 		<p class="group-name"><?php echo _t('current_user'); ?></p>
 			<div class="group-controls">
-				<p><?php echo formatNumber($this->nb_total), ' ', _t('articles'), ', ', formatBytes($this->size_user); ?></p>
+				<p><?php echo _t('articles', formatNumber($this->nb_total)), ' — ', formatBytes($this->size_user); ?></p>
 				<input type="hidden" name="optimiseDatabase" value="1" />
 				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
 				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index fb569872b..65e60add5 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -63,6 +63,8 @@
 					<option data-url="<?php echo _url('user', 'manage', 'u', $username); ?>" <?php echo $this->current_user === $username ? 'selected="selected"' : ''; ?> value="<?php echo $username; ?>"><?php echo $username; ?></option>
 					<?php } ?>
 				</select>
+
+				<p><?php echo _t('articles', formatNumber($this->nb_articles)), ', ', formatBytes($this->size_user); ?></p>
 			</div>
 		</div>
 

From 5797344aff9ceebbdeb6e49305f3984a5c89f82c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 16 Oct 2014 17:15:51 +0200
Subject: [PATCH 075/363] Fix a bug to get size of user (SQLite)

---
 app/Controllers/userController.php | 3 ++-
 app/Models/EntryDAOSQLite.php      | 2 +-
 lib/Minz/ModelPdo.php              | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 4a04737f2..d5c90a382 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -94,14 +94,15 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 		Minz_View::prependTitle(_t('users.manage') . ' · ');
 
+		// Get the correct current user.
 		$userDAO = new FreshRSS_UserDAO();
-
 		$username = Minz_Request::param('u', Minz_Session::param('currentUser'));
 		if (!$userDAO->exist($username)) {
 			$username = Minz_Session::param('currentUser');
 		}
 		$this->view->current_user = $username;
 
+		// Get information about the current user.
 		$entryDAO = FreshRSS_Factory::createEntryDao($this->view->current_user);
 		$this->view->nb_articles = $entryDAO->count();
 		$this->view->size_user = $entryDAO->size();
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index 66078aca9..4a3fe24a2 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -124,6 +124,6 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	}
 
 	public function size($all = false) {
-		return @filesize(DATA_PATH . '/' . Minz_Session::param('currentUser', '_') . '.sqlite');
+		return @filesize(DATA_PATH . '/' . $this->current_user . '.sqlite');
 	}
 }
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 66127ea22..827c89c69 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -24,6 +24,7 @@ class Minz_ModelPdo {
 	 */
 	protected $bd;
 
+	protected $current_user;
 	protected $prefix;
 
 	public function dbType() {
@@ -46,6 +47,7 @@ class Minz_ModelPdo {
 		if ($currentUser === null) {
 			$currentUser = Minz_Session::param('currentUser', '_');
 		}
+		$this->current_user = $currentUser;
 
 		try {
 			$type = $db['type'];

From 74be86d7e817bcccdc0052c54fefdc8379d9fe7f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 17 Oct 2014 09:33:35 +0200
Subject: [PATCH 076/363] Reorganise menus (aside and header)

---
 app/layout/aside_configure.phtml | 2 +-
 app/layout/header.phtml          | 3 ++-
 lib/lib_opml.php                 | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 7a9d0d839..2e2b87203 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -18,12 +18,12 @@
 	<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::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'profil'? ' active' : ''; ?>">
 		<a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a>
 	</li>
 	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+	<li class="nav-header"><?php echo _t('administration'); ?></li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'manage' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('users.manage'); ?></a>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 7e7c1b477..c680cbcdc 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -62,9 +62,10 @@ if (Minz_Configuration::canLogIn()) {
 				<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('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a></li>
+				<li class="separator"></li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+				<li class="dropdown-header"><?php echo _t('administration'); ?></li>
 				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('users.manage'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('authentication'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
diff --git a/lib/lib_opml.php b/lib/lib_opml.php
index 16a9921ea..f320335bb 100644
--- a/lib/lib_opml.php
+++ b/lib/lib_opml.php
@@ -101,6 +101,7 @@ function libopml_parse_string($xml) {
 
 	// First, we get all "head" elements. Head is required but its sub-elements
 	// are optional.
+	// TODO: test head exists!
 	foreach ($opml->head->children() as $key => $value) {
 		if (in_array($key, unserialize(HEAD_ELEMENTS), true)) {
 			$array['head'][$key] = (string)$value;
@@ -114,6 +115,7 @@ function libopml_parse_string($xml) {
 	// Then, we get body oulines. Body must contain at least one outline
 	// element.
 	$at_least_one_outline = false;
+	// TODO: test body exists!
 	foreach ($opml->body->children() as $key => $value) {
 		if ($key === 'outline') {
 			$at_least_one_outline = true;

From ce0984e102f5ce7d07277425595dad74193d4528 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 17 Oct 2014 16:23:07 +0200
Subject: [PATCH 077/363] Fix i18n

---
 app/i18n/en.php                     | 28 +++++++++++++++----------
 app/i18n/fr.php                     | 32 +++++++++++++++++------------
 app/layout/aside_configure.phtml    |  8 ++++----
 app/layout/header.phtml             | 10 ++++-----
 app/views/configure/archiving.phtml | 19 ++++++++++-------
 app/views/user/manage.phtml         |  4 +++-
 6 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/app/i18n/en.php b/app/i18n/en.php
index ebc25ba0c..f65576ea3 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -9,6 +9,7 @@
   'add_category' => 'Add a category',
   'add_query' => 'Add a query',
   'add_rss_feed' => 'Add a RSS feed',
+  'admin.users.articles_and_size' => '%d articles (%s)',
   'administration' => 'Manage',
   'advanced' => 'Advanced',
   'after_onread' => 'After “mark all as read”,',
@@ -18,8 +19,8 @@
   'all_feeds' => 'All feeds',
   'already_subscribed' => 'You have already subscribed to <em>%s</em>',
   'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
-  'apr' => 'apr',
   'Apr' => '\\A\\p\\r\\i\\l',
+  'apr' => 'apr',
   'april' => 'Apr',
   'archiving_configuration' => 'Archiving',
   'archiving_configuration_help' => 'More options are available in the individual stream settings',
@@ -34,8 +35,8 @@
   'article_viewed' => 'when article is viewed',
   'ask_empty' => 'Clear?',
   'attention' => 'Attention!',
-  'aug' => 'aug',
   'Aug' => '\\A\\u\\g\\u\\s\\t',
+  'aug' => 'aug',
   'august' => 'Aug',
   'author' => 'Author',
   'auth_form' => 'Web form (traditional, requires JavaScript)',
@@ -98,10 +99,11 @@
   'choose_language' => 'Choose a language for FreshRSS',
   'clear_logs' => 'Clear the logs',
   'collapse_article' => 'Collapse',
+  'conf.users.articles_and_size' => '%d articles (%s)',
   'configuration' => 'Configuration',
   'configuration_updated' => 'Configuration has been updated',
   'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
-  'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You may lost related favorites and user queries. It cannot be cancelled!',
+  'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
   'congratulations' => 'Congratulations!',
   'content_width' => 'Content width',
   'create' => 'Create',
@@ -116,8 +118,8 @@
   'current_user' => 'Current user',
   'damn' => 'Damn!',
   'data_is_ok' => 'Permissions on data directory are good',
-  'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
   'dec' => 'dec',
+  'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
   'december' => 'Dec',
   'default_category' => 'Uncategorized',
   'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
@@ -182,6 +184,10 @@
   'freshrss_installation' => 'Installation · FreshRSS',
   'fri' => 'Fri',
   'g+' => 'Google+',
+  'gen.menu.admin' => 'Administration',
+  'gen.menu.authentication' => 'Authentication',
+  'gen.menu.manage_users' => 'Manage users',
+  'gen.menu.profil' => 'Profil',
   'general_configuration' => 'General configuration',
   'general_conf_is_ok' => 'General configuration has been saved.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -207,18 +213,18 @@
   'invalid_login' => 'Login is invalid',
   'invalid_url' => 'URL <em>%s</em> is invalid',
   'is_admin' => 'is administrator',
-  'jan' => 'jan',
   'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+  'jan' => 'jan',
   'january' => 'Jan',
   'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
   'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
   'javascript_should_be_activated' => 'JavaScript must be enabled',
-  'Jul' => '\\J\\u\\l\\y',
   'jul' => 'jul',
+  'Jul' => '\\J\\u\\l\\y',
   'july' => 'Jul',
   'jump_next' => 'jump to next unread sibling (feed or category)',
-  'Jun' => '\\J\\u\\n\\e',
   'jun' => 'jun',
+  'Jun' => '\\J\\u\\n\\e',
   'june' => 'Jun',
   'keep_history' => 'Minimum number of articles to keep',
   'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
@@ -244,16 +250,16 @@
   'logs_empty' => 'Log file is empty',
   'log_is_ok' => 'Permissions on logs directory are good',
   'main_stream' => 'Main stream',
-  'Mar' => '\\M\\a\\r\\c\\h',
   'mar' => 'mar',
+  'Mar' => '\\M\\a\\r\\c\\h',
   'march' => 'Mar',
   'mark_all_read' => 'Mark all as read',
   'mark_cat_read' => 'Mark category as read',
   'mark_favorite' => 'Mark as favourite',
   'mark_feed_read' => 'Mark feed as read',
   'mark_read' => 'Mark as read',
-  'May' => '\\M\\a\\y',
   'may' => 'May',
+  'May' => '\\M\\a\\y',
   'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
   'minz_is_ok' => 'You have the Minz framework',
   'mon' => 'Mon',
@@ -274,8 +280,8 @@
   'not_read' => '%d unread',
   'not_reads' => '%d unread',
   'not_yet_implemented' => 'Not yet implemented',
-  'nov' => 'nov',
   'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+  'nov' => 'nov',
   'november' => 'Nov',
   'no_feed_actualized' => 'No RSS feed has been updated',
   'no_feed_to_display' => 'There is no article to show.',
@@ -291,8 +297,8 @@
   'number_feeds' => '%d feeds',
   'n_entries_deleted' => '%d articles have been deleted',
   'n_feeds_actualized' => '%d feeds have been updated',
-  'oct' => 'oct',
   'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+  'oct' => 'oct',
   'october' => 'Oct',
   'ok' => 'Ok!',
   'older_first' => 'Oldest first',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 220f8b12d..ab34eed3e 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -9,6 +9,7 @@
   'add_category' => 'Ajouter une catégorie',
   'add_query' => 'Créer un filtre',
   'add_rss_feed' => 'Ajouter un flux RSS',
+  'admin.users.articles_and_size' => '%d articles (%s)',
   'administration' => 'Gérer',
   'advanced' => 'Avancé',
   'after_onread' => 'Après “marquer tout comme lu”,',
@@ -18,8 +19,8 @@
   'all_feeds' => 'Tous les flux',
   'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
   'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-  'apr' => 'avr.',
   'Apr' => '\\a\\v\\r\\i\\l',
+  'apr' => 'avr.',
   'april' => 'avril',
   'archiving_configuration' => 'Archivage',
   'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
@@ -34,8 +35,8 @@
   'article_viewed' => 'lorsque l’article est affiché',
   'ask_empty' => 'Vider ?',
   'attention' => 'Attention !',
-  'aug' => 'août',
   'Aug' => '\\a\\o\\û\\t',
+  'aug' => 'août',
   'august' => 'août',
   'author' => 'Auteur',
   'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
@@ -88,8 +89,8 @@
   'category_empty' => 'Catégorie vide',
   'category_name_exists' => 'Une catégorie possède déjà ce nom.',
   'category_not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
-  'category_not_exist' => 'Cette catégorie n\'existe pas !',
-  'category_no_id' => 'Vous devez préciser l\'id de la catégorie.',
+  'category_not_exist' => 'Cette catégorie n’existe pas !',
+  'category_no_id' => 'Vous devez préciser l’id de la catégorie.',
   'category_no_name' => 'Vous devez préciser un nom pour la catégorie.',
   'category_number' => 'Catégorie n°%d',
   'category_updated' => 'La catégorie a été mise à jour.',
@@ -98,10 +99,11 @@
   'choose_language' => 'Choisissez la langue pour FreshRSS',
   'clear_logs' => 'Effacer les logs',
   'collapse_article' => 'Refermer',
+  'conf.users.articles_and_size' => '%d articles (%s)',
   'configuration' => 'Configuration',
   'configuration_updated' => 'La configuration a été mise à jour.',
   'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
-  'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous pourriez perdre les favoris et les filtres associés. Cette action ne peut être annulée !',
+  'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
   'congratulations' => 'Félicitations !',
   'content_width' => 'Largeur du contenu',
   'create' => 'Créer',
@@ -116,8 +118,8 @@
   'current_user' => 'Utilisateur actuel',
   'damn' => 'Arf !',
   'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
-  'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
   'dec' => 'déc.',
+  'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
   'december' => 'décembre',
   'default_category' => 'Sans catégorie',
   'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
@@ -182,6 +184,10 @@
   'freshrss_installation' => 'Installation · FreshRSS',
   'fri' => 'ven.',
   'g+' => 'Google+',
+  'gen.menu.admin' => 'Administration',
+  'gen.menu.authentication' => 'Authentification',
+  'gen.menu.manage_users' => 'Gestion des utilisateurs',
+  'gen.menu.profil' => 'Profil',
   'general_configuration' => 'Configuration générale',
   'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -207,18 +213,18 @@
   'invalid_login' => 'L’identifiant est invalide !',
   'invalid_url' => 'L’url <em>%s</em> est invalide.',
   'is_admin' => 'est administrateur',
-  'jan' => 'jan.',
   'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
+  'jan' => 'jan.',
   'january' => 'janvier',
   'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
   'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
   'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
-  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
   'jul' => 'jui.',
+  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
   'july' => 'juillet',
   'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-  'Jun' => '\\j\\u\\i\\n',
   'jun' => 'juin',
+  'Jun' => '\\j\\u\\i\\n',
   'june' => 'juin',
   'keep_history' => 'Nombre minimum d’articles à conserver',
   'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
@@ -244,16 +250,16 @@
   'logs_empty' => 'Les logs sont vides.',
   'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
   'main_stream' => 'Flux principal',
-  'Mar' => '\\m\\a\\r\\s',
   'mar' => 'mar.',
+  'Mar' => '\\m\\a\\r\\s',
   'march' => 'mars',
   'mark_all_read' => 'Tout marquer comme lu',
   'mark_cat_read' => 'Marquer la catégorie comme lue',
   'mark_favorite' => 'Mettre en favori',
   'mark_feed_read' => 'Marquer le flux comme lu',
   'mark_read' => 'Marquer comme lu',
-  'May' => '\\m\\a\\i',
   'may' => 'mai.',
+  'May' => '\\m\\a\\i',
   'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
   'minz_is_ok' => 'Vous disposez du framework Minz',
   'mon' => 'lun.',
@@ -274,8 +280,8 @@
   'not_read' => '%d non lu',
   'not_reads' => '%d non lus',
   'not_yet_implemented' => 'Pas encore implémenté',
-  'nov' => 'nov.',
   'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
+  'nov' => 'nov.',
   'november' => 'novembre',
   'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
   'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
@@ -291,8 +297,8 @@
   'number_feeds' => '%d flux',
   'n_entries_deleted' => '%d articles ont été supprimés.',
   'n_feeds_actualized' => '%d flux ont été mis à jour.',
-  'oct' => 'oct.',
   'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
+  'oct' => 'oct.',
   'october' => 'octobre',
   'ok' => 'Ok !',
   'older_first' => 'Plus anciens en premier',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 2e2b87203..20446c877 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -20,16 +20,16 @@
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'profil'? ' active' : ''; ?>">
-		<a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a>
+		<a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('gen.menu.profil'); ?></a>
 	</li>
 	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-	<li class="nav-header"><?php echo _t('administration'); ?></li>
+	<li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'manage' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('users.manage'); ?></a>
+		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.manage_users'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'auth' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('authentication'); ?></a>
+		<a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index c680cbcdc..e848ac4eb 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -62,12 +62,12 @@ if (Minz_Configuration::canLogIn()) {
 				<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="item"><a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a></li>
-				<li class="separator"></li>
+				<li class="item"><a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('gen.menu.profil'); ?></a></li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-				<li class="dropdown-header"><?php echo _t('administration'); ?></li>
-				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('users.manage'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('authentication'); ?></a></li>
+				<li class="separator"></li>
+				<li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
+				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.manage_users'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
 				<?php } ?>
 				<li class="separator"></li>
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 8f424c126..f469d343c 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -58,20 +58,25 @@
 		<legend><?php echo _t('advanced'); ?></legend>
 
 		<div class="form-group">
-		<p class="group-name"><?php echo _t('current_user'); ?></p>
+			<label class="group-name"><?php echo _t('current_user'); ?></label>
 			<div class="group-controls">
-				<p><?php echo _t('articles', formatNumber($this->nb_total)), ' — ', formatBytes($this->size_user); ?></p>
-				<input type="hidden" name="optimiseDatabase" value="1" />
-				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
-				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
+				<?php echo _t('conf.users.articles_and_size', formatNumber($this->nb_total), formatBytes($this->size_user)); ?>
 			</div>
 		</div>
 
 		<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 		<div class="form-group">
-			<p class="group-name"><?php echo _t('users'); ?></p>
+			<label class="group-name"><?php echo _t('users'); ?></label>
 			<div class="group-controls">
-				<p><?php echo formatBytes($this->size_total); ?></p>
+				<?php echo formatBytes($this->size_total); ?>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<input type="hidden" name="optimiseDatabase" value="1" />
+				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
+				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
 			</div>
 		</div>
 		<?php } ?>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 65e60add5..89c91e06c 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -64,7 +64,9 @@
 					<?php } ?>
 				</select>
 
-				<p><?php echo _t('articles', formatNumber($this->nb_articles)), ', ', formatBytes($this->size_user); ?></p>
+				<p><?php echo _t('admin.users.articles_and_size',
+				                 formatNumber($this->nb_articles),
+				                 formatBytes($this->size_user)); ?></p>
 			</div>
 		</div>
 

From 3bad4d138e5c4a86aa3f88dea3787c3335861ce4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 17 Oct 2014 16:29:55 +0200
Subject: [PATCH 078/363] Fix i18n

---
 app/i18n/en.php | 4 ++--
 app/i18n/fr.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/i18n/en.php b/app/i18n/en.php
index f65576ea3..283d28dc6 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -9,7 +9,7 @@
   'add_category' => 'Add a category',
   'add_query' => 'Add a query',
   'add_rss_feed' => 'Add a RSS feed',
-  'admin.users.articles_and_size' => '%d articles (%s)',
+  'admin.users.articles_and_size' => '%s articles (%s)',
   'administration' => 'Manage',
   'advanced' => 'Advanced',
   'after_onread' => 'After “mark all as read”,',
@@ -99,7 +99,7 @@
   'choose_language' => 'Choose a language for FreshRSS',
   'clear_logs' => 'Clear the logs',
   'collapse_article' => 'Collapse',
-  'conf.users.articles_and_size' => '%d articles (%s)',
+  'conf.users.articles_and_size' => '%s articles (%s)',
   'configuration' => 'Configuration',
   'configuration_updated' => 'Configuration has been updated',
   'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index ab34eed3e..0517544d5 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -9,7 +9,7 @@
   'add_category' => 'Ajouter une catégorie',
   'add_query' => 'Créer un filtre',
   'add_rss_feed' => 'Ajouter un flux RSS',
-  'admin.users.articles_and_size' => '%d articles (%s)',
+  'admin.users.articles_and_size' => '%s articles (%s)',
   'administration' => 'Gérer',
   'advanced' => 'Avancé',
   'after_onread' => 'Après “marquer tout comme lu”,',
@@ -99,7 +99,7 @@
   'choose_language' => 'Choisissez la langue pour FreshRSS',
   'clear_logs' => 'Effacer les logs',
   'collapse_article' => 'Refermer',
-  'conf.users.articles_and_size' => '%d articles (%s)',
+  'conf.users.articles_and_size' => '%s articles (%s)',
   'configuration' => 'Configuration',
   'configuration_updated' => 'La configuration a été mise à jour.',
   'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',

From 7080a32650ab8b19e917d8add944a75cc98381bc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 11:54:31 +0200
Subject: [PATCH 079/363] Add checking installation feature

---
 app/Controllers/updateController.php | 14 ++++-
 app/Models/DatabaseDAO.php           | 83 ++++++++++++++++++++++++++++
 app/Models/DatabaseDAOSQLite.php     | 48 ++++++++++++++++
 app/Models/Factory.php               |  9 +++
 app/SQL/install.sql.mysql.php        |  2 -
 app/SQL/install.sql.sqlite.php       |  2 -
 app/layout/aside_configure.phtml     |  7 ++-
 app/layout/header.phtml              |  1 +
 app/views/update/checkInstall.phtml  | 30 ++++++++++
 lib/lib_rss.php                      | 62 +++++++++++++++++++++
 10 files changed, 252 insertions(+), 6 deletions(-)
 create mode 100644 app/Models/DatabaseDAO.php
 create mode 100644 app/Models/DatabaseDAOSQLite.php
 create mode 100644 app/views/update/checkInstall.phtml

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 9d1e1ddf5..4ebb11f51 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -12,7 +12,6 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 		invalidateHttpCache();
 
-		Minz_View::prependTitle(_t('update_system') . ' · ');
 		$this->view->update_to_apply = false;
 		$this->view->last_update_time = 'unknown';
 		$this->view->check_last_hour = false;
@@ -24,6 +23,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	}
 
 	public function indexAction() {
+		Minz_View::prependTitle(_t('update_system') . ' · ');
+
 		if (file_exists(UPDATE_FILENAME) && !is_writable(FRESHRSS_PATH)) {
 			$this->view->message = array(
 				'status' => 'bad',
@@ -126,4 +127,15 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			}
 		}
 	}
+
+	/**
+	 * This action displays information about installation.
+	 */
+	public function checkInstallAction() {
+		Minz_View::prependTitle(_t('gen.title.check_install') . ' · ');
+
+		$this->view->status_php = check_install_php();
+		$this->view->status_files = check_install_files();
+		$this->view->status_database = check_install_database();
+	}
 }
diff --git a/app/Models/DatabaseDAO.php b/app/Models/DatabaseDAO.php
new file mode 100644
index 000000000..0d85718e3
--- /dev/null
+++ b/app/Models/DatabaseDAO.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * This class is used to test database is well-constructed.
+ */
+class FreshRSS_DatabaseDAO extends Minz_ModelPdo {
+	public function tablesAreCorrect() {
+		$sql = 'SHOW TABLES';
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+		
+		$tables = array(
+			$this->prefix . 'category' => false,
+			$this->prefix . 'feed' => false,
+			$this->prefix . 'entry' => false,
+		);
+		foreach ($res as $value) {
+			$tables[array_pop($value)] = true;
+		}
+
+		return count(array_keys($tables, true, true)) == count($tables);
+	}
+
+	public function getSchema($table) {
+		$sql = 'DESC ' . $this->prefix . $table;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+
+		return $this->listDaoToSchema($stm->fetchAll(PDO::FETCH_ASSOC));
+	}
+
+	public function checkTable($table, $schema) {
+		$columns = $this->getSchema($table);
+
+		$ok = (count($columns) == count($schema));
+		foreach ($columns as $c) {
+			$ok &= in_array($c['name'], $schema);
+		}
+
+		return $ok;
+	}
+
+	public function categoryIsCorrect() {
+		return $this->checkTable('category', array(
+			'id', 'name'
+		));
+	}
+
+	public function feedIsCorrect() {
+		return $this->checkTable('feed', array(
+			'id', 'url', 'category', 'name', 'website', 'description', 'lastUpdate',
+			'priority', 'pathEntries', 'httpAuth', 'error', 'keep_history', 'ttl',
+			'cache_nbEntries', 'cache_nbUnreads'
+		));
+	}
+
+	public function entryIsCorrect() {
+		return $this->checkTable('entry', array(
+			'id', 'guid', 'title', 'author', 'content_bin', 'link', 'date', 'is_read',
+			'is_favorite', 'id_feed', 'tags'
+		));
+	}
+
+	public function daoToSchema($dao) {
+		return array(
+			'name' => $dao['Field'],
+			'type' => strtolower($dao['Type']),
+			'notnull' => (bool)$dao['Null'],
+			'default' => $dao['Default'],
+		);
+	}
+
+	public function listDaoToSchema($listDAO) {
+		$list = array();
+
+		foreach ($listDAO as $dao) {
+			$list[] = $this->daoToSchema($dao);
+		}
+
+		return $list;
+	}
+}
diff --git a/app/Models/DatabaseDAOSQLite.php b/app/Models/DatabaseDAOSQLite.php
new file mode 100644
index 000000000..7f53f967d
--- /dev/null
+++ b/app/Models/DatabaseDAOSQLite.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This class is used to test database is well-constructed (SQLite).
+ */
+class FreshRSS_DatabaseDAOSQLite extends FreshRSS_DatabaseDAO {
+	public function tablesAreCorrect() {
+		$sql = 'SELECT name FROM sqlite_master WHERE type="table"';
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+		
+		$tables = array(
+			'category' => false,
+			'feed' => false,
+			'entry' => false,
+		);
+		foreach ($res as $value) {
+			$tables[$value['name']] = true;
+		}
+
+		return count(array_keys($tables, true, true)) == count($tables);
+	}
+
+	public function getSchema($table) {
+		$sql = 'PRAGMA table_info(' . $table . ')';
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+
+		return $this->listDaoToSchema($stm->fetchAll(PDO::FETCH_ASSOC));
+	}
+
+	public function entryIsCorrect() {
+		return $this->checkTable('entry', array(
+			'id', 'guid', 'title', 'author', 'content', 'link', 'date', 'is_read',
+			'is_favorite', 'id_feed', 'tags'
+		));
+	}
+
+	public function daoToSchema($dao) {
+		return array(
+			'name' => $dao['name'],
+			'type' => strtolower($dao['type']),
+			'notnull' => $dao['notnull'] === '1' ? true : false,
+			'default' => $dao['dflt_value'],
+		);
+	}
+}
diff --git a/app/Models/Factory.php b/app/Models/Factory.php
index 93f4552f7..91cb84998 100644
--- a/app/Models/Factory.php
+++ b/app/Models/Factory.php
@@ -29,4 +29,13 @@ class FreshRSS_Factory {
 		}
 	}
 
+	public static function createDatabaseDAO($username = null) {
+		$db = Minz_Configuration::dataBase();
+		if ($db['type'] === 'sqlite') {
+			return new FreshRSS_DatabaseDAOSQLite($username);
+		} else {
+			return new FreshRSS_DatabaseDAO($username);
+		}
+	}
+
 }
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index 16cb3a3b8..cf0159199 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -57,5 +57,3 @@ INSERT IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");
 ');
 
 define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
-
-define('SQL_SHOW_TABLES', 'SHOW tables;');
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 7988ada04..30bca2810 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -55,5 +55,3 @@ $SQL_CREATE_TABLES = array(
 );
 
 define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
-
-define('SQL_SHOW_TABLES', 'SELECT name FROM sqlite_master WHERE type="table"');
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 20446c877..32dc19a4e 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -31,7 +31,12 @@
 	<li class="item<?php echo Minz_Request::controllerName() === 'auth' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::controllerName() === 'update' &&
+	                          Minz_Request::actionName() === 'checkInstall' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a>
+	</li>
+	<li class="item<?php echo Minz_Request::controllerName() === 'update' &&
+	                          Minz_Request::actionName() === 'index' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
 	</li>
 	<?php } ?>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index e848ac4eb..506cec175 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -68,6 +68,7 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
 				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.manage_users'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
 				<?php } ?>
 				<li class="separator"></li>
diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml
new file mode 100644
index 000000000..32058714e
--- /dev/null
+++ b/app/views/update/checkInstall.phtml
@@ -0,0 +1,30 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
+	<h2><?php echo _t('admin.check_install.php'); ?></h2>
+
+	<?php foreach ($this->status_php as $key => $status) { ?>
+	<p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>">
+		<?php echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok')); ?>
+	</p>
+	<?php } ?>
+
+	<h2><?php echo _t('admin.check_install.files'); ?></h2>
+
+	<?php foreach ($this->status_files as $key => $status) { ?>
+	<p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>">
+		<?php echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok')); ?>
+	</p>
+	<?php } ?>
+
+	<h2><?php echo _t('admin.check_install.database'); ?></h2>
+
+	<?php foreach ($this->status_database as $key => $status) { ?>
+	<p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>">
+		<?php echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok')); ?>
+	</p>
+	<?php } ?>
+
+</div>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 2f9a2ea45..dbed207d0 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -245,3 +245,65 @@ function is_referer_from_same_domain() {
 	}
 	return (isset($host['port']) ? $host['port'] : 0) === (isset($referer['port']) ? $referer['port'] : 0);
 }
+
+
+/**
+ *
+ */
+function check_install_php() {
+	return array(
+		'php' => version_compare(PHP_VERSION, '5.2.1') >= 0,
+		'minz' => file_exists(LIB_PATH . '/Minz'),
+		'curl' => extension_loaded('curl'),
+		'pdo_mysql' => extension_loaded('pdo_mysql'),
+		'pdo_sqlite' => extension_loaded('pdo_sqlite'),
+		'pdo' => extension_loaded('pdo_mysql') || extension_loaded('pdo_sqlite'),
+		'pcre' => extension_loaded('pcre'),
+		'ctype' => extension_loaded('ctype'),
+		'dom' => class_exists('DOMDocument'),
+		'json' => extension_loaded('json'),
+		'zip' => extension_loaded('zip'),
+	);
+}
+
+
+/**
+ *
+ */
+function check_install_files() {
+	return array(
+		'data' => DATA_PATH && is_writable(DATA_PATH),
+		'cache' => CACHE_PATH && is_writable(CACHE_PATH),
+		'logs' => LOG_PATH && is_writable(LOG_PATH),
+		'favicons' => is_writable(DATA_PATH . '/favicons'),
+		'persona' => is_writable(DATA_PATH . '/persona'),
+		'tokens' => is_writable(DATA_PATH . '/tokens'),
+	);
+}
+
+
+/**
+ *
+ */
+function check_install_database() {
+	$status = array(
+		'connection' => true,
+		'tables' => false,
+		'categories' => false,
+		'feeds' => false,
+		'entries' => false,
+	);
+
+	try {
+		$dbDAO = FreshRSS_Factory::createDatabaseDAO();
+
+		$status['tables'] = $dbDAO->tablesAreCorrect();
+		$status['categories'] = $dbDAO->categoryIsCorrect();
+		$status['feeds'] = $dbDAO->feedIsCorrect();
+		$status['entries'] = $dbDAO->entryIsCorrect();
+	} catch(Minz_PDOConnectionException $e) {
+		$status['connection'] = false;
+	}
+
+	return $status;
+}

From 61a2f9387f2d7f681040c1641c7601fa3002c8f8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 12:42:46 +0200
Subject: [PATCH 080/363] Fix i18n (french and english)

---
 app/i18n/en.php | 57 +++++++++++++++++++++++++++++++++++++++++++++----
 app/i18n/fr.php | 57 +++++++++++++++++++++++++++++++++++++++++++++----
 lib/lib_rss.php |  6 ++++++
 3 files changed, 112 insertions(+), 8 deletions(-)

diff --git a/app/i18n/en.php b/app/i18n/en.php
index 283d28dc6..b24af38c1 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -9,6 +9,53 @@
   'add_category' => 'Add a category',
   'add_query' => 'Add a query',
   'add_rss_feed' => 'Add a RSS feed',
+  'admin.check_install.cache.nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
+  'admin.check_install.cache.ok' => 'Permissions on cache directory are good.',
+  'admin.check_install.categories.nok' => 'Category table is bad configured.',
+  'admin.check_install.categories.ok' => 'Category table is ok.',
+  'admin.check_install.connection.nok' => 'Connection to the database cannot being established.',
+  'admin.check_install.connection.ok' => 'Connection to the database is ok.',
+  'admin.check_install.ctype.nok' => 'You lack a required library for character type checking (php-ctype).',
+  'admin.check_install.ctype.ok' => 'You have the required library for character type checking (ctype).',
+  'admin.check_install.curl.nok' => 'You lack cURL (php5-curl package).',
+  'admin.check_install.curl.ok' => 'You have version %s of cURL.',
+  'admin.check_install.data.nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
+  'admin.check_install.data.ok' => 'Permissions on data directory are good.',
+  'admin.check_install.database' => 'Database installation',
+  'admin.check_install.dom.nok' => 'You lack a required library to browse the DOM (php-xml package).',
+  'admin.check_install.dom.ok' => 'You have the required library to browse the DOM.',
+  'admin.check_install.entries.nok' => 'Entry table is bad configured.',
+  'admin.check_install.entries.ok' => 'Entry table is ok.',
+  'admin.check_install.favicons.nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',
+  'admin.check_install.favicons.ok' => 'Permissions on favicons directory are good.',
+  'admin.check_install.feeds.nok' => 'Feed table is bad configured.',
+  'admin.check_install.feeds.ok' => 'Feed table is ok.',
+  'admin.check_install.files' => 'File installation',
+  'admin.check_install.json.nok' => 'You lack JSON (php5-json package).',
+  'admin.check_install.json.ok' => 'You have version %s of JSON.',
+  'admin.check_install.logs.nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
+  'admin.check_install.logs.ok' => 'Permissions on logs directory are good.',
+  'admin.check_install.minz.nok' => 'You lack the Minz framework.',
+  'admin.check_install.minz.ok' => 'You have the Minz framework.',
+  'admin.check_install.pcre.nok' => 'You lack a required library for regular expressions (php-pcre).',
+  'admin.check_install.pcre.ok' => 'You have the required library for regular expressions (PCRE).',
+  'admin.check_install.pdo.nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
+  'admin.check_install.pdo.ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
+  'admin.check_install.pdo_mysql.nok' => 'You lack PDO for MySQL (it\'s ok if PDO is good).',
+  'admin.check_install.pdo_mysql.ok' => 'You have PDO for MySQL.',
+  'admin.check_install.pdo_sqlite.nok' => 'You lack PDO for SQLite (it\'s ok if PDO is good).',
+  'admin.check_install.pdo_sqlite.ok' => 'You have PDO for SQLite.',
+  'admin.check_install.persona.nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
+  'admin.check_install.persona.ok' => 'Permissions on Mozilla Persona directory are good.',
+  'admin.check_install.php' => 'PHP installation',
+  'admin.check_install.php.nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
+  'admin.check_install.php.ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+  'admin.check_install.tables.nok' => 'There is one or more lacking tables in the database.',
+  'admin.check_install.tables.ok' => 'Tables are existing in the database.',
+  'admin.check_install.tokens.nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
+  'admin.check_install.tokens.ok' => 'Permissions on tokens directory are good.',
+  'admin.check_install.zip.nok' => 'You lack ZIP extension (php5-zip package).',
+  'admin.check_install.zip.ok' => 'You have version %s of ZIP extension.',
   'admin.users.articles_and_size' => '%s articles (%s)',
   'administration' => 'Manage',
   'advanced' => 'Advanced',
@@ -118,8 +165,8 @@
   'current_user' => 'Current user',
   'damn' => 'Damn!',
   'data_is_ok' => 'Permissions on data directory are good',
-  'dec' => 'dec',
   'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+  'dec' => 'dec',
   'december' => 'Dec',
   'default_category' => 'Uncategorized',
   'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
@@ -186,8 +233,10 @@
   'g+' => 'Google+',
   'gen.menu.admin' => 'Administration',
   'gen.menu.authentication' => 'Authentication',
+  'gen.menu.check_install' => 'Installation checking',
   'gen.menu.manage_users' => 'Manage users',
   'gen.menu.profil' => 'Profil',
+  'gen.title.check_install' => 'Installation checking',
   'general_configuration' => 'General configuration',
   'general_conf_is_ok' => 'General configuration has been saved.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -219,8 +268,8 @@
   'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
   'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
   'javascript_should_be_activated' => 'JavaScript must be enabled',
-  'jul' => 'jul',
   'Jul' => '\\J\\u\\l\\y',
+  'jul' => 'jul',
   'july' => 'Jul',
   'jump_next' => 'jump to next unread sibling (feed or category)',
   'jun' => 'jun',
@@ -297,8 +346,8 @@
   'number_feeds' => '%d feeds',
   'n_entries_deleted' => '%d articles have been deleted',
   'n_feeds_actualized' => '%d feeds have been updated',
-  'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
   'oct' => 'oct',
+  'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
   'october' => 'Oct',
   'ok' => 'Ok!',
   'older_first' => 'Oldest first',
@@ -375,8 +424,8 @@
   'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
   'see_on_website' => 'See on original website',
   'see_website' => 'See website',
-  'sep' => 'sep',
   'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+  'sep' => 'sep',
   'september' => 'Sep',
   'shaarli' => 'Shaarli',
   'share' => 'Share',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 0517544d5..22494274c 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -9,6 +9,53 @@
   'add_category' => 'Ajouter une catégorie',
   'add_query' => 'Créer un filtre',
   'add_rss_feed' => 'Ajouter un flux RSS',
+  'admin.check_install.cache.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
+  'admin.check_install.cache.ok' => 'Les droits sur le répertoire de cache sont bons.',
+  'admin.check_install.categories.nok' => 'La table category est mal configurée.',
+  'admin.check_install.categories.ok' => 'La table category est bien configurée.',
+  'admin.check_install.connection.nok' => 'La connexion à la base de données est impossible.',
+  'admin.check_install.connection.ok' => 'La connexion à la base de données est bonne.',
+  'admin.check_install.ctype.nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype).',
+  'admin.check_install.ctype.ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype).',
+  'admin.check_install.curl.nok' => 'Vous ne disposez pas de cURL (paquet php5-curl).',
+  'admin.check_install.curl.ok' => 'Vous disposez de cURL dans sa version %s.',
+  'admin.check_install.data.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data</em>. Le serveur HTTP doit être capable d’écrire dedans',
+  'admin.check_install.data.ok' => 'Les droits sur le répertoire de data sont bons.',
+  'admin.check_install.database' => 'Installation de la base de données',
+  'admin.check_install.dom.nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml).',
+  'admin.check_install.dom.ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
+  'admin.check_install.entries.nok' => 'La table entry est mal configurée.',
+  'admin.check_install.entries.ok' => 'La table entry est bien configurée.',
+  'admin.check_install.favicons.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/favicons</em>. Le serveur HTTP doit être capable d’écrire dedans',
+  'admin.check_install.favicons.ok' => 'Les droits sur le répertoire des favicons sont bons.',
+  'admin.check_install.feeds.nok' => 'La table feed est mal configurée.',
+  'admin.check_install.feeds.ok' => 'La table feed est bien configurée.',
+  'admin.check_install.files' => 'Installation des fichiers',
+  'admin.check_install.json.nok' => 'Vous ne disposez pas de JSON (paquet php5-json).',
+  'admin.check_install.json.ok' => 'Vous disposez de JSON dans sa version %s.',
+  'admin.check_install.logs.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/logs</em>. Le serveur HTTP doit être capable d’écrire dedans',
+  'admin.check_install.logs.ok' => 'Les droits sur le répertoire des logs sont bons.',
+  'admin.check_install.minz.nok' => 'Vous ne disposez pas de la librairie Minz.',
+  'admin.check_install.minz.ok' => 'Vous disposez du framework Minz',
+  'admin.check_install.pcre.nok' => 'Il manque une librairie pour les expressions régulières (php-pcre).',
+  'admin.check_install.pcre.ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE).',
+  'admin.check_install.pdo.nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite).',
+  'admin.check_install.pdo.ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite).',
+  'admin.check_install.pdo_mysql.nok' => 'Vous ne possédez pas PDO pour MySQL (ok si PDO est bon).',
+  'admin.check_install.pdo_mysql.ok' => 'Vous possédez PDO pour MySQL.',
+  'admin.check_install.pdo_sqlite.nok' => 'Vous ne possédez pas PDO pour SQLite (ok si PDO est bon).',
+  'admin.check_install.pdo_sqlite.ok' => 'Vous possédez PDO pour SQLite.',
+  'admin.check_install.persona.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/persona</em>. Le serveur HTTP doit être capable d’écrire dedans',
+  'admin.check_install.persona.ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons.',
+  'admin.check_install.php' => 'Installation de PHP',
+  'admin.check_install.php.nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
+  'admin.check_install.php.ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
+  'admin.check_install.tables.nok' => 'Il manque une ou plusieurs tables en base de données.',
+  'admin.check_install.tables.ok' => 'Les tables sont bien présentes en base de données.',
+  'admin.check_install.tokens.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/tokens</em>. Le serveur HTTP doit être capable d’écrire dedans',
+  'admin.check_install.tokens.ok' => 'Les droits sur le répertoire des tokens sont bons.',
+  'admin.check_install.zip.nok' => 'Vous ne disposez pas de l\'extension ZIP (paquet php5-zip).',
+  'admin.check_install.zip.ok' => 'Vous disposez de l\'extension ZIP dans sa version %s.',
   'admin.users.articles_and_size' => '%s articles (%s)',
   'administration' => 'Gérer',
   'advanced' => 'Avancé',
@@ -118,8 +165,8 @@
   'current_user' => 'Utilisateur actuel',
   'damn' => 'Arf !',
   'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
-  'dec' => 'déc.',
   'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
+  'dec' => 'déc.',
   'december' => 'décembre',
   'default_category' => 'Sans catégorie',
   'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
@@ -186,8 +233,10 @@
   'g+' => 'Google+',
   'gen.menu.admin' => 'Administration',
   'gen.menu.authentication' => 'Authentification',
+  'gen.menu.check_install' => 'Vérification de l\'installation',
   'gen.menu.manage_users' => 'Gestion des utilisateurs',
   'gen.menu.profil' => 'Profil',
+  'gen.title.check_install' => 'Vérification de l\'installation',
   'general_configuration' => 'Configuration générale',
   'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -219,8 +268,8 @@
   'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
   'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
   'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
-  'jul' => 'jui.',
   'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
+  'jul' => 'jui.',
   'july' => 'juillet',
   'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
   'jun' => 'juin',
@@ -297,8 +346,8 @@
   'number_feeds' => '%d flux',
   'n_entries_deleted' => '%d articles ont été supprimés.',
   'n_feeds_actualized' => '%d flux ont été mis à jour.',
-  'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
   'oct' => 'oct.',
+  'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
   'october' => 'octobre',
   'ok' => 'Ok !',
   'older_first' => 'Plus anciens en premier',
@@ -375,8 +424,8 @@
   'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
   'see_on_website' => 'Voir sur le site d’origine',
   'see_website' => 'Voir le site',
-  'sep' => 'sep.',
   'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
+  'sep' => 'sep.',
   'september' => 'septembre',
   'shaarli' => 'Shaarli',
   'share' => 'Partager',
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index dbed207d0..9abdf18ce 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -248,7 +248,9 @@ function is_referer_from_same_domain() {
 
 
 /**
+ * Check PHP and its extensions are well-installed.
  *
+ * @return array of tested values.
  */
 function check_install_php() {
 	return array(
@@ -268,7 +270,9 @@ function check_install_php() {
 
 
 /**
+ * Check different data files and directories exist.
  *
+ * @return array of tested values.
  */
 function check_install_files() {
 	return array(
@@ -283,7 +287,9 @@ function check_install_files() {
 
 
 /**
+ * Check database is well-installed.
  *
+ * @return array of tested values.
  */
 function check_install_database() {
 	$status = array(

From ae84e877c5fdda2b1a29ab0bb6c2469258fcc9a5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 12:52:18 +0200
Subject: [PATCH 081/363] Fix some i18n keys

---
 app/i18n/en.php                     | 6 +++---
 app/i18n/fr.php                     | 6 +++---
 app/views/update/checkInstall.phtml | 8 +++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/i18n/en.php b/app/i18n/en.php
index b24af38c1..2792ad7a2 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -18,7 +18,7 @@
   'admin.check_install.ctype.nok' => 'You lack a required library for character type checking (php-ctype).',
   'admin.check_install.ctype.ok' => 'You have the required library for character type checking (ctype).',
   'admin.check_install.curl.nok' => 'You lack cURL (php5-curl package).',
-  'admin.check_install.curl.ok' => 'You have version %s of cURL.',
+  'admin.check_install.curl.ok' => 'You have cURL extension.',
   'admin.check_install.data.nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
   'admin.check_install.data.ok' => 'Permissions on data directory are good.',
   'admin.check_install.database' => 'Database installation',
@@ -32,7 +32,7 @@
   'admin.check_install.feeds.ok' => 'Feed table is ok.',
   'admin.check_install.files' => 'File installation',
   'admin.check_install.json.nok' => 'You lack JSON (php5-json package).',
-  'admin.check_install.json.ok' => 'You have version %s of JSON.',
+  'admin.check_install.json.ok' => 'You have JSON extension.',
   'admin.check_install.logs.nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
   'admin.check_install.logs.ok' => 'Permissions on logs directory are good.',
   'admin.check_install.minz.nok' => 'You lack the Minz framework.',
@@ -55,7 +55,7 @@
   'admin.check_install.tokens.nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
   'admin.check_install.tokens.ok' => 'Permissions on tokens directory are good.',
   'admin.check_install.zip.nok' => 'You lack ZIP extension (php5-zip package).',
-  'admin.check_install.zip.ok' => 'You have version %s of ZIP extension.',
+  'admin.check_install.zip.ok' => 'You have ZIP extension.',
   'admin.users.articles_and_size' => '%s articles (%s)',
   'administration' => 'Manage',
   'advanced' => 'Advanced',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 22494274c..85b32a737 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -18,7 +18,7 @@
   'admin.check_install.ctype.nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype).',
   'admin.check_install.ctype.ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype).',
   'admin.check_install.curl.nok' => 'Vous ne disposez pas de cURL (paquet php5-curl).',
-  'admin.check_install.curl.ok' => 'Vous disposez de cURL dans sa version %s.',
+  'admin.check_install.curl.ok' => 'Vous disposez de cURL.',
   'admin.check_install.data.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data</em>. Le serveur HTTP doit être capable d’écrire dedans',
   'admin.check_install.data.ok' => 'Les droits sur le répertoire de data sont bons.',
   'admin.check_install.database' => 'Installation de la base de données',
@@ -32,7 +32,7 @@
   'admin.check_install.feeds.ok' => 'La table feed est bien configurée.',
   'admin.check_install.files' => 'Installation des fichiers',
   'admin.check_install.json.nok' => 'Vous ne disposez pas de JSON (paquet php5-json).',
-  'admin.check_install.json.ok' => 'Vous disposez de JSON dans sa version %s.',
+  'admin.check_install.json.ok' => 'Vous disposez de l\'extension JSON.',
   'admin.check_install.logs.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/logs</em>. Le serveur HTTP doit être capable d’écrire dedans',
   'admin.check_install.logs.ok' => 'Les droits sur le répertoire des logs sont bons.',
   'admin.check_install.minz.nok' => 'Vous ne disposez pas de la librairie Minz.',
@@ -55,7 +55,7 @@
   'admin.check_install.tokens.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/tokens</em>. Le serveur HTTP doit être capable d’écrire dedans',
   'admin.check_install.tokens.ok' => 'Les droits sur le répertoire des tokens sont bons.',
   'admin.check_install.zip.nok' => 'Vous ne disposez pas de l\'extension ZIP (paquet php5-zip).',
-  'admin.check_install.zip.ok' => 'Vous disposez de l\'extension ZIP dans sa version %s.',
+  'admin.check_install.zip.ok' => 'Vous disposez de l\'extension ZIP.',
   'admin.users.articles_and_size' => '%s articles (%s)',
   'administration' => 'Gérer',
   'advanced' => 'Avancé',
diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml
index 32058714e..5f913bccd 100644
--- a/app/views/update/checkInstall.phtml
+++ b/app/views/update/checkInstall.phtml
@@ -7,7 +7,13 @@
 
 	<?php foreach ($this->status_php as $key => $status) { ?>
 	<p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>">
-		<?php echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok')); ?>
+		<?php
+			if ($key === 'php') {
+				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.2.1');
+			} else {
+				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'));
+			}
+		?>
 	</p>
 	<?php } ?>
 

From df4ddf0e552d9113c9f55d5361212f8279a5c617 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 13:31:49 +0200
Subject: [PATCH 082/363] Unsafe autologin comes back

Should be moved in an extension later!

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/authController.php | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 751ce1f3f..d4b65d849 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -104,6 +104,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	 *   - username (default: '')
 	 *   - challenge (default: '')
 	 *   - keep_logged_in (default: false)
+	 *
+	 * @todo move unsafe autologin in an extension.
 	 */
 	public function formLoginAction() {
 		invalidateHttpCache();
@@ -151,6 +153,42 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('invalid_login'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
+		} elseif (Minz_Configuration::unsafeAutologinEnabled()) {
+			$username = Minz_Request::param('u', '');
+			$password = Minz_Request::param('p', '');
+			Minz_Request::_param('p');
+
+			if (!$username) {
+				return;
+			}
+
+			try {
+				$conf = new FreshRSS_Configuration($username);
+			} catch(Minz_Exception $e) {
+				// $username is not a valid user, nor the configuration file!
+				Minz_Log::warning('Login failure: ' . $e->getMessage());
+				return;
+			}
+
+			if (!function_exists('password_verify')) {
+				include_once(LIB_PATH . '/password_compat.php');
+			}
+
+			$s = $conf->passwordHash;
+			$ok = password_verify($password, $s);
+			unset($password);
+			if ($ok) {
+				Minz_Session::_param('currentUser', $username);
+				Minz_Session::_param('passwordHash', $s);
+				FreshRSS_Auth::giveAccess();
+
+				Minz_Request::good(_t('login'),
+				                   array('c' => 'index', 'a' => 'index'));
+			} else {
+				Minz_Log::warning('Unsafe password mismatch for user ' . $username);
+				Minz_Request::bad(_t('invalid_login'),
+				                  array('c' => 'auth', 'a' => 'login'));
+			}
 		}
 	}
 

From ad92dd7dae35e7205da3172d4ba35ea01da2bc8b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 18:21:10 +0200
Subject: [PATCH 083/363] First draft for Context object.

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/FreshRSS.php       | 40 ++++++++++++++++++++--------------------
 app/Models/Context.php | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 app/Models/Context.php

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 6b7a813bf..e1399ad78 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -1,50 +1,50 @@
 <?php
+
 class FreshRSS extends Minz_FrontController {
 	public function init() {
 		if (!isset($_SESSION)) {
 			Minz_Session::init('FreshRSS');
 		}
 
+		// Need to be called just after session init because it initializes
+		// current user.
 		FreshRSS_Auth::init();
-		$this->loadConfiguration();
-		$this->loadParamsView();
+
 		if (Minz_Request::isPost() && !is_referer_from_same_domain()) {
-			//Basic protection against XSRF attacks
+			// Basic protection against XSRF attacks
 			FreshRSS_Auth::removeAccess();
+			$http_referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 			Minz_Error::error(
 				403,
-				array('error' => array(_t('access_denied') . ' [HTTP_REFERER=' .
-				      htmlspecialchars(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']) . ']'))
+				array('error' => array(
+					_t('access_denied'),
+					' [HTTP_REFERER=' . htmlspecialchars($http_referer) . ']'
+				))
 			);
 		}
+
+		// Load context and configuration.
+		// TODO: remove $this->view->conf variable which is contained in context
+		FreshRSS_Context::init();
+		Minz_View::_param('conf', FreshRSS_Context::$conf);
+
+		$this->loadParamsView();
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
 	}
 
-	private function loadConfiguration() {
-		$current_user = Minz_Session::param('currentUser');
-		try {
-			$this->conf = new FreshRSS_Configuration($current_user);
-			Minz_View::_param('conf', $this->conf);
-		} catch(Minz_Exception $e) {
-			Minz_Log::error('Cannot load configuration file of user `' . $current_user . '`');
-			die($e->getMessage());
-		}
-	}
-
 	private function loadParamsView() {
-		Minz_Session::_param('language', $this->conf->language);
-		Minz_Translate::init();
+		// TODO: outputs should be different actions.
 		$output = Minz_Request::param('output', '');
 		if (($output === '') || ($output !== 'normal' && $output !== 'rss' && $output !== 'reader' && $output !== 'global')) {
-			$output = $this->conf->view_mode;
+			$output = FreshRSS_Context::$conf->view_mode;
 			Minz_Request::_param('output', $output);
 		}
 	}
 
 	private function loadStylesAndScripts() {
-		$theme = FreshRSS_Themes::load($this->conf->theme);
+		$theme = FreshRSS_Themes::load(FreshRSS_Context::$conf->theme);
 		if ($theme) {
 			foreach($theme['files'] as $file) {
 				if ($file[0] === '_') {
diff --git a/app/Models/Context.php b/app/Models/Context.php
new file mode 100644
index 000000000..d984fece7
--- /dev/null
+++ b/app/Models/Context.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * The context object handles the current configuration file and different
+ * useful functions associated to the current view state.
+ */
+class FreshRSS_Context {
+	public static $conf = null;
+	public static $state = 0;
+
+	public static function init() {
+		// Init configuration.
+		$current_user = Minz_Session::param('currentUser');
+		try {
+			self::$conf = new FreshRSS_Configuration($current_user);
+		} catch(Minz_Exception $e) {
+			Minz_Log::error('Cannot load configuration file of user `' . $current_user . '`');
+			die($e->getMessage());
+		}
+
+		// Init i18n.
+		Minz_Session::_param('language', self::$conf->language);
+		Minz_Translate::init();
+
+		// Get the current state.
+		self::$state = self::$conf->default_view;
+	}
+
+	public static function stateEnabled($state) {
+		return self::$state & $state;
+	}
+}

From 1a22a87fb1b1fcb61d201de399c33c2185dc1f6e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 18:45:22 +0200
Subject: [PATCH 084/363] Use FreshRSS_Context::$conf only

- Replace $this->view->conf in controllers
- Replace $this->conf in views
---
 app/Controllers/authController.php         |  6 +-
 app/Controllers/categoryController.php     |  8 +-
 app/Controllers/configureController.php    | 90 +++++++++++-----------
 app/Controllers/entryController.php        |  6 +-
 app/Controllers/feedController.php         | 18 ++---
 app/Controllers/importExportController.php |  4 +-
 app/Controllers/indexController.php        |  8 +-
 app/Controllers/javascriptController.php   |  2 +-
 app/Controllers/userController.php         | 18 ++---
 app/FreshRSS.php                           |  2 -
 app/layout/aside_flux.phtml                |  8 +-
 app/layout/layout.phtml                    |  2 +-
 app/layout/nav_menu.phtml                  | 14 ++--
 app/views/auth/index.phtml                 |  4 +-
 app/views/configure/archiving.phtml        | 10 +--
 app/views/configure/display.phtml          | 30 ++++----
 app/views/configure/queries.phtml          |  4 +-
 app/views/configure/reading.phtml          | 42 +++++-----
 app/views/configure/sharing.phtml          |  6 +-
 app/views/configure/shortcut.phtml         |  2 +-
 app/views/helpers/javascript_vars.phtml    | 16 ++--
 app/views/helpers/pagination.phtml         |  2 +-
 app/views/helpers/view/global_view.phtml   |  6 +-
 app/views/helpers/view/normal_view.phtml   | 30 ++++----
 app/views/helpers/view/reader_view.phtml   |  4 +-
 app/views/user/manage.phtml                |  6 +-
 app/views/user/profil.phtml                |  2 +-
 27 files changed, 174 insertions(+), 176 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index d4b65d849..4af39cb71 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -26,10 +26,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
-			$current_token = $this->view->conf->token;
+			$current_token = FreshRSS_Context::$conf->token;
 			$token = Minz_Request::param('token', $current_token);
-			$this->view->conf->_token($token);
-			$ok &= $this->view->conf->save();
+			FreshRSS_Context::$conf->_token($token);
+			$ok &= FreshRSS_Context::$conf->save();
 
 			$anon = Minz_Request::param('anon_access', false);
 			$anon = ((bool)$anon) && ($anon !== 'no');
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 537a2b210..977ce51be 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -136,8 +136,8 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			}
 
 			// Remove related queries.
-			$this->view->conf->remove_query_by_get('c_' . $id);
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->remove_query_by_get('c_' . $id);
+			FreshRSS_Context::$conf->save();
 
 			Minz_Request::good(_t('category_deleted'), $url_redirect);
 		}
@@ -172,9 +172,9 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 				// Remove related queries
 				foreach ($feeds as $feed) {
-					$this->view->conf->remove_query_by_get('f_' . $feed->id());
+					FreshRSS_Context::$conf->remove_query_by_get('f_' . $feed->id());
 				}
-				$this->view->conf->save();
+				FreshRSS_Context::$conf->save();
 
 				Minz_Request::good(_t('category_emptied'), $url_redirect);
 			} else {
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index fb8c1466e..8a9dcdc62 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -44,23 +44,23 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function displayAction() {
 		if (Minz_Request::isPost()) {
-			$this->view->conf->_language(Minz_Request::param('language', 'en'));
-			$this->view->conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
-			$this->view->conf->_content_width(Minz_Request::param('content_width', 'thin'));
-			$this->view->conf->_topline_read(Minz_Request::param('topline_read', false));
-			$this->view->conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
-			$this->view->conf->_topline_date(Minz_Request::param('topline_date', false));
-			$this->view->conf->_topline_link(Minz_Request::param('topline_link', false));
-			$this->view->conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
-			$this->view->conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
-			$this->view->conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
-			$this->view->conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
-			$this->view->conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
-			$this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
-			$this->view->conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->_language(Minz_Request::param('language', 'en'));
+			FreshRSS_Context::$conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
+			FreshRSS_Context::$conf->_content_width(Minz_Request::param('content_width', 'thin'));
+			FreshRSS_Context::$conf->_topline_read(Minz_Request::param('topline_read', false));
+			FreshRSS_Context::$conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
+			FreshRSS_Context::$conf->_topline_date(Minz_Request::param('topline_date', false));
+			FreshRSS_Context::$conf->_topline_link(Minz_Request::param('topline_link', false));
+			FreshRSS_Context::$conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
+			FreshRSS_Context::$conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
+			FreshRSS_Context::$conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
+			FreshRSS_Context::$conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
+			FreshRSS_Context::$conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
+			FreshRSS_Context::$conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
+			FreshRSS_Context::$conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
+			FreshRSS_Context::$conf->save();
 
-			Minz_Session::_param('language', $this->view->conf->language);
+			Minz_Session::_param('language', FreshRSS_Context::$conf->language);
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
@@ -102,27 +102,27 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function readingAction() {
 		if (Minz_Request::isPost()) {
-			$this->view->conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
-			$this->view->conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
-			$this->view->conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
-			$this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
-			$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
-			$this->view->conf->_display_categories(Minz_Request::param('display_categories', false));
-			$this->view->conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
-			$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
-			$this->view->conf->_lazyload(Minz_Request::param('lazyload', false));
-			$this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false));
-			$this->view->conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
-			$this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
-			$this->view->conf->_mark_when(array(
+			FreshRSS_Context::$conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
+			FreshRSS_Context::$conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
+			FreshRSS_Context::$conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
+			FreshRSS_Context::$conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
+			FreshRSS_Context::$conf->_display_posts(Minz_Request::param('display_posts', false));
+			FreshRSS_Context::$conf->_display_categories(Minz_Request::param('display_categories', false));
+			FreshRSS_Context::$conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
+			FreshRSS_Context::$conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
+			FreshRSS_Context::$conf->_lazyload(Minz_Request::param('lazyload', false));
+			FreshRSS_Context::$conf->_sticky_post(Minz_Request::param('sticky_post', false));
+			FreshRSS_Context::$conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
+			FreshRSS_Context::$conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
+			FreshRSS_Context::$conf->_mark_when(array(
 				'article' => Minz_Request::param('mark_open_article', false),
 				'site' => Minz_Request::param('mark_open_site', false),
 				'scroll' => Minz_Request::param('mark_scroll', false),
 				'reception' => Minz_Request::param('mark_upon_reception', false),
 			));
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->save();
 
-			Minz_Session::_param('language', $this->view->conf->language);
+			Minz_Session::_param('language', FreshRSS_Context::$conf->language);
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
@@ -143,8 +143,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
 			$params = Minz_Request::params();
-			$this->view->conf->_sharing($params['share']);
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->_sharing($params['share']);
+			FreshRSS_Context::$conf->save();
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('configuration_updated'),
@@ -185,8 +185,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				}
 			}
 
-			$this->view->conf->_shortcuts($shortcuts_ok);
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->_shortcuts($shortcuts_ok);
+			FreshRSS_Context::$conf->save();
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('shortcuts_updated'),
@@ -213,10 +213,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
-			$this->view->conf->_old_entries(Minz_Request::param('old_entries', 3));
-			$this->view->conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
-			$this->view->conf->_ttl_default(Minz_Request::param('ttl_default', -2));
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->_old_entries(Minz_Request::param('old_entries', 3));
+			FreshRSS_Context::$conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
+			FreshRSS_Context::$conf->_ttl_default(Minz_Request::param('ttl_default', -2));
+			FreshRSS_Context::$conf->save();
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('configuration_updated'),
@@ -253,8 +253,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					$query['name'] = _t('query_number', $key + 1);
 				}
 			}
-			$this->view->conf->_queries($queries);
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->_queries($queries);
+			FreshRSS_Context::$conf->save();
 
 			Minz_Request::good(_t('configuration_updated'),
 			                   array('c' => 'configure', 'a' => 'queries'));
@@ -262,7 +262,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->query_get = array();
 			$cat_dao = new FreshRSS_CategoryDAO();
 			$feed_dao = FreshRSS_Factory::createFeedDao();
-			foreach ($this->view->conf->queries as $key => $query) {
+			foreach (FreshRSS_Context::$conf->queries as $key => $query) {
 				if (!isset($query['get'])) {
 					continue;
 				}
@@ -330,7 +330,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function addQueryAction() {
 		$whitelist = array('get', 'order', 'name', 'search', 'state');
-		$queries = $this->view->conf->queries;
+		$queries = FreshRSS_Context::$conf->queries;
 		$query = Minz_Request::params();
 		$query['name'] = _t('query_number', count($queries) + 1);
 		foreach ($query as $key => $value) {
@@ -342,8 +342,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$query['state'] -= FreshRSS_Entry::STATE_STRICT;
 		}
 		$queries[] = $query;
-		$this->view->conf->_queries($queries);
-		$this->view->conf->save();
+		FreshRSS_Context::$conf->_queries($queries);
+		FreshRSS_Context::$conf->save();
 
 		Minz_Request::good(_t('query_created', $query['name']),
 		                   array('c' => 'configure', 'a' => 'queries'));
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index a1dfacb4d..449029648 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -21,7 +21,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		// the end.
 		$this->params = array();
 		$output = Minz_Request::param('output', '');
-		if ($output != '' && $this->view->conf->view_mode !== $output) {
+		if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
 			$this->params['output'] = $output;
 		}
 
@@ -167,7 +167,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	public function purgeAction() {
 		@set_time_limit(300);
 
-		$nb_month_old = max($this->view->conf->old_entries, 1);
+		$nb_month_old = max(FreshRSS_Context::$conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -181,7 +181,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
 				// -2 means we take the default value from configuration
-				$feed_history = $this->view->conf->keep_history_default;
+				$feed_history = FreshRSS_Context::$conf->keep_history_default;
 			}
 
 			if ($feed_history >= 0) {
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 2a7238eaf..c2859edf4 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -14,7 +14,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// Token is useful in the case that anonymous refresh is forbidden
 			// and CRON task cannot be used with php command so the user can
 			// set a CRON task to refresh his feeds by using token inside url
-			$token = $this->view->conf->token;
+			$token = FreshRSS_Context::$conf->token;
 			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token == $token_param);
 			$action = Minz_Request::actionName();
@@ -154,14 +154,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feed->_id($id);
 			$feed->faviconPrepare();
 
-			$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
+			$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
 
 			$entryDAO = FreshRSS_Factory::createEntryDao();
 			// We want chronological order and SimplePie uses reverse order.
 			$entries = array_reverse($feed->entries());
 
 			// Calculate date of oldest entries we accept in DB.
-			$nb_month_old = $this->view->conf->old_entries;
+			$nb_month_old = FreshRSS_Context::$conf->old_entries;
 			$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 			// Use a shared statement and a transaction to improve a LOT the
@@ -265,15 +265,15 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feeds[] = $feed;
 			}
 		} else {
-			$feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
+			$feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default);
 		}
 
 		// Calculate date of oldest entries we accept in DB.
-		$nb_month_old = max($this->view->conf->old_entries, 1);
+		$nb_month_old = max(FreshRSS_Context::$conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$updated_feeds = 0;
-		$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
+		$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			if (!$feed->lock()) {
 				Minz_Log::notice('Feed already being actualized: ' . $feed->url());
@@ -294,7 +294,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
 				// -2 means we take the default value from configuration
-				$feed_history = $this->view->conf->keep_history_default;
+				$feed_history = FreshRSS_Context::$conf->keep_history_default;
 			}
 
 			// We want chronological order and SimplePie uses reverse order.
@@ -470,8 +470,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// TODO: Delete old favicon
 
 			// Remove related queries
-			$this->view->conf->remove_query_by_get('f_' . $id);
-			$this->view->conf->save();
+			FreshRSS_Context::$conf->remove_query_by_get('f_' . $id);
+			FreshRSS_Context::$conf->save();
 
 			Minz_Request::good(_t('feed_deleted'), $redirect_url);
 		} else {
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index aaac1b68b..ab277e688 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -289,7 +289,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			return true;
 		}
 
-		$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
+		$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
 
 		$google_compliant = strpos($article_object['id'], 'com.google') !== false;
 
@@ -484,7 +484,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$this->view->type = 'feed/' . $feed->id();
 			$this->view->entries = $this->entryDAO->listWhere(
 				'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
-				$this->view->conf->posts_per_page
+				FreshRSS_Context::$conf->posts_per_page
 			);
 			$this->view->feed = $feed;
 		}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 5b490e672..f994e257c 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -5,7 +5,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 	public function indexAction() {
 		$output = Minz_Request::param('output');
-		$token = $this->view->conf->token;
+		$token = FreshRSS_Context::$conf->token;
 
 		// check if user is logged in
 		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
@@ -76,11 +76,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		);
 
 		// On récupère les différents éléments de filtrage
-		$this->view->state = Minz_Request::param('state', $this->view->conf->default_view);
+		$this->view->state = Minz_Request::param('state', FreshRSS_Context::$conf->default_view);
 		$state_param = Minz_Request::param('state', null);
 		$filter = Minz_Request::param('search', '');
-		$this->view->order = $order = Minz_Request::param('order', $this->view->conf->sort_order);
-		$nb = Minz_Request::param('nb', $this->view->conf->posts_per_page);
+		$this->view->order = $order = Minz_Request::param('order', FreshRSS_Context::$conf->sort_order);
+		$nb = Minz_Request::param('nb', FreshRSS_Context::$conf->posts_per_page);
 		$first = Minz_Request::param('next', '');
 
 		$ajax_request = Minz_Request::param('ajax', false);
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 14e6f36de..62f413989 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -8,7 +8,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 	public function actualizeAction() {
 		header('Content-Type: text/javascript; charset=UTF-8');
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->view->feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
+		$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default);
 	}
 
 	public function nbUnreadsPerFeedAction() {
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index d5c90a382..61d33437d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -42,9 +42,9 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				$this->view->conf->_passwordHash($passwordHash);
+				FreshRSS_Context::$conf->_passwordHash($passwordHash);
 			}
-			Minz_Session::_param('passwordHash', $this->view->conf->passwordHash);
+			Minz_Session::_param('passwordHash', FreshRSS_Context::$conf->passwordHash);
 
 			$passwordPlain = Minz_Request::param('apiPasswordPlain', '', true);
 			if ($passwordPlain != '') {
@@ -55,17 +55,17 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				$this->view->conf->_apiPasswordHash($passwordHash);
+				FreshRSS_Context::$conf->_apiPasswordHash($passwordHash);
 			}
 
 			// TODO: why do we need of hasAccess here?
 			if (FreshRSS_Auth::hasAccess('admin')) {
-				$this->view->conf->_mail_login(Minz_Request::param('mail_login', '', true));
+				FreshRSS_Context::$conf->_mail_login(Minz_Request::param('mail_login', '', true));
 			}
-			$email = $this->view->conf->mail_login;
+			$email = FreshRSS_Context::$conf->mail_login;
 			Minz_Session::_param('mail', $email);
 
-			$ok &= $this->view->conf->save();
+			$ok &= FreshRSS_Context::$conf->save();
 
 			if ($email != '') {
 				$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
@@ -113,9 +113,9 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			$db = Minz_Configuration::dataBase();
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
-			$new_user_language = Minz_Request::param('new_user_language', $this->view->conf->language);
-			if (!in_array($new_user_language, $this->view->conf->availableLanguages())) {
-				$new_user_language = $this->view->conf->language;
+			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$conf->language);
+			if (!in_array($new_user_language, FreshRSS_Context::$conf->availableLanguages())) {
+				$new_user_language = FreshRSS_Context::$conf->language;
 			}
 
 			$new_user_name = Minz_Request::param('new_user_name');
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index e1399ad78..752b14e31 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -24,9 +24,7 @@ class FreshRSS extends Minz_FrontController {
 		}
 
 		// Load context and configuration.
-		// TODO: remove $this->view->conf variable which is contained in context
 		FreshRSS_Context::init();
-		Minz_View::_param('conf', FreshRSS_Context::$conf);
 
 		$this->loadParamsView();
 		$this->loadStylesAndScripts();
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index a66be2ed9..114ccbf56 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,4 +1,4 @@
-<div class="aside aside_flux<?php if ($this->conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
+<div class="aside aside_flux<?php if (FreshRSS_Context::$conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<ul class="categories">
@@ -17,7 +17,7 @@
 
 		<?php
 			$arUrl = array('c' => 'index', 'a' => 'index', 'params' => array());
-			if ($this->conf->view_mode !== Minz_Request::param('output', 'normal')) {
+			if (FreshRSS_Context::$conf->view_mode !== Minz_Request::param('output', 'normal')) {
 				$arUrl['params']['output'] = 'normal';
 			}
 		?>
@@ -47,7 +47,7 @@
 				$c_show = false;
 				if ($this->get_c == $cat->id()) {
 					$c_active = true;
-					if (!$this->conf->display_categories || $this->get_f) {
+					if (!FreshRSS_Context::$conf->display_categories || $this->get_f) {
 						$c_show = true;
 					}
 				}
@@ -92,7 +92,7 @@
 		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
 		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
 		<li class="item">
-			<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
+			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
 			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index dbfac63a5..a8c70ec64 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<?php echo $this->conf->language; ?>" xml:lang="<?php echo $this->conf->language; ?>">
+<html lang="<?php echo FreshRSS_Context::$conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$conf->language; ?>">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="initial-scale=1.0" />
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 090b55785..bb9468ab1 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -98,13 +98,13 @@
 					<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
 				</li>
 
-				<?php foreach ($this->conf->queries as $query) { ?>
+				<?php foreach (FreshRSS_Context::$conf->queries as $query) { ?>
 				<li class="item query">
 					<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
 				</li>
 				<?php } ?>
 
-				<?php if (count($this->conf->queries) > 0) { ?>
+				<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
 				<li class="separator no-mobile"></li>
 				<?php } ?>
 
@@ -132,7 +132,7 @@
 			$string_mark = _t('mark_cat_read');
 		}
 		$nextGet = $get;
-		if ($this->conf->onread_jump_next && strlen($get) > 2) {
+		if (FreshRSS_Context::$conf->onread_jump_next && strlen($get) > 2) {
 			$anotherUnreadId = '';
 			$foundCurrent = false;
 			switch ($get[0]) {
@@ -180,7 +180,7 @@
 
 		$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('get' => $get, 'nextGet' => $nextGet, 'idMax' => $idMax));
 		$output = Minz_Request::param('output', '');
-		if ($output != '' && $this->conf->view_mode !== $output) {
+		if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
 			$arUrl['params']['output'] = $output;
 		}
 		$markReadUrl = Minz_Url::display($arUrl);
@@ -190,7 +190,7 @@
 	<form id="mark-read-menu" method="post" style="display: none"></form>
 
 	<div class="stick" id="nav_menu_read_all">
-		<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
+		<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
 		        formaction="<?php echo $markReadUrl; ?>"
@@ -252,8 +252,8 @@
 
 		<?php
 			$url_output['params']['output'] = 'rss';
-			if ($this->conf->token) {
-				$url_output['params']['token'] = $this->conf->token;
+			if (FreshRSS_Context::$conf->token) {
+				$url_output['params']['token'] = FreshRSS_Context::$conf->token;
 			}
 		?>
 		<a class="view_rss btn" target="_blank" title="<?php echo _t('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index c37a7aef6..17a81f08b 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -14,7 +14,7 @@
 						<option selected="selected"></option>
 					<?php } ?>
 					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
 					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
 					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
 				</select>
@@ -55,7 +55,7 @@
 		<?php if (Minz_Configuration::canLogIn()) { ?>
 		<div class="form-group">
 			<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
-			<?php $token = $this->conf->token; ?>
+			<?php $token = FreshRSS_Context::$conf->token; ?>
 			<div class="group-controls">
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index f469d343c..410434599 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -10,7 +10,7 @@
 		<div class="form-group">
 			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo _t('month'); ?>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$conf->old_entries; ?>" /> <?php echo _t('month'); ?>
 				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('purge_now'); ?></a>
 			</div>
 		</div>
@@ -19,7 +19,7 @@
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
 					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
+						echo '<option value="' . $v . (FreshRSS_Context::$conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
 				?></select> (<?php echo _t('by_default'); ?>)
 			</div>
@@ -34,13 +34,13 @@
 					                36000 => '10h', 43200 => '12h', 64800 => '18h',
 					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
 					                604800 => '1wk', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-						if ($this->conf->ttl_default == $v) {
+						echo '<option value="' . $v . (FreshRSS_Context::$conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						if (FreshRSS_Context::$conf->ttl_default == $v) {
 							$found = true;
 						}
 					}
 					if (!$found) {
-						echo '<option value="' . intval($this->conf->ttl_default) . '" selected="selected">' . intval($this->conf->ttl_default) . 's</option>';
+						echo '<option value="' . intval(FreshRSS_Context::$conf->ttl_default) . '" selected="selected">' . intval(FreshRSS_Context::$conf->ttl_default) . 's</option>';
 					}
 				?></select> (<?php echo _t('by_default'); ?>)
 			</div>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 1614bd56b..69205fa93 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -10,9 +10,9 @@
 			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php $languages = $this->conf->availableLanguages(); ?>
+				<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
 				</select>
 			</div>
@@ -24,7 +24,7 @@
 				<select name="theme" id="theme" required=""><?php
 					$found = false;
 					foreach ($this->themes as $theme) {
-						?><option value="<?php echo $theme['id']; ?>"<?php if ($this->conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
+						?><option value="<?php echo $theme['id']; ?>"<?php if (FreshRSS_Context::$conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
 							echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author'];
 						?></option><?php
 					}
@@ -35,7 +35,7 @@
 			</div>
 		</div>
 
-		<?php $width = $this->conf->content_width; ?>
+		<?php $width = FreshRSS_Context::$conf->content_width; ?>
 		<div class="form-group">
 			<label class="group-name" for="content_width"><?php echo _t('content_width'); ?></label>
 			<div class="group-controls">
@@ -73,20 +73,20 @@
 				<tbody>
 					<tr>
 						<th><?php echo _t('top_line'); ?></th>
-						<td><input type="checkbox" name="topline_read" value="1"<?php echo $this->conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo $this->conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_read" value="1"<?php echo FreshRSS_Context::$conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
-						<td><input type="checkbox" name="topline_date" value="1"<?php echo $this->conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_link" value="1"<?php echo $this->conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
 						<th><?php echo _t('bottom_line'); ?></th>
-						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo $this->conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo $this->conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo $this->conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo $this->conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo $this->conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo $this->conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo FreshRSS_Context::$conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo FreshRSS_Context::$conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo FreshRSS_Context::$conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr>
 				</tbody>
 			</table><br />
@@ -95,7 +95,7 @@
 		<div class="form-group">
 			<label class="group-name" for="posts_per_page"><?php echo _t('html5_notif_timeout'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
 			</div>
 		</div>
 
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index e778ce078..994dfc11b 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -6,7 +6,7 @@
 	<form method="post" action="<?php echo _url('configure', 'queries'); ?>">
 		<legend><?php echo _t('queries'); ?></legend>
 
-		<?php foreach ($this->conf->queries as $key => $query) { ?>
+		<?php foreach (FreshRSS_Context::$conf->queries as $key => $query) { ?>
 		<div class="form-group" id="query-group-<?php echo $key; ?>">
 			<label class="group-name" for="queries_<?php echo $key; ?>_name">
 				<?php echo _t('query_number', $key + 1); ?>
@@ -82,7 +82,7 @@
 		</div>
 		<?php } ?>
 
-		<?php if (count($this->conf->queries) > 0) { ?>
+		<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index c8685acf3..ef775b4b1 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -9,7 +9,7 @@
 		<div class="form-group">
 			<label class="group-name" for="posts_per_page"><?php echo _t('articles_per_page'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->posts_per_page; ?>" min="5" max="50" />
+				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$conf->posts_per_page; ?>" min="5" max="50" />
 				<?php echo _i('help'); ?> <?php echo _t('number_divided_when_reader'); ?>
 			</div>
 		</div>
@@ -18,8 +18,8 @@
 			<label class="group-name" for="sort_order"><?php echo _t('sort_order'); ?></label>
 			<div class="group-controls">
 				<select name="sort_order" id="sort_order">
-					<option value="DESC"<?php echo $this->conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
-					<option value="ASC"<?php echo $this->conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
+					<option value="DESC"<?php echo FreshRSS_Context::$conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
+					<option value="ASC"<?php echo FreshRSS_Context::$conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -28,9 +28,9 @@
 			<label class="group-name" for="view_mode"><?php echo _t('default_view'); ?></label>
 			<div class="group-controls">
 				<select name="view_mode" id="view_mode">
-					<option value="normal"<?php echo $this->conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
-					<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
-					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
+					<option value="normal"<?php echo FreshRSS_Context::$conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
+					<option value="reader"<?php echo FreshRSS_Context::$conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
+					<option value="global"<?php echo FreshRSS_Context::$conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -39,9 +39,9 @@
 			<label class="group-name" for="view_mode"><?php echo _t('articles_to_display'); ?></label>
 			<div class="group-controls">
 				<select name="default_view" id="default_view">
-					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
-					<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
-					<option value="<?php echo FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
+					<option value="<?php echo FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -49,7 +49,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="hide_read_feeds">
-					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo $this->conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo FreshRSS_Context::$conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('hide_read_feeds'); ?>
 				</label>
 			</div>
@@ -58,7 +58,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="display_posts">
-					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo $this->conf->display_posts ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo FreshRSS_Context::$conf->display_posts ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('display_articles_unfolded'); ?>
 					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
@@ -68,7 +68,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="display_categories">
-					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo $this->conf->display_categories ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo FreshRSS_Context::$conf->display_categories ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('display_categories_unfolded'); ?>
 					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
@@ -78,7 +78,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="sticky_post">
-					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo $this->conf->sticky_post ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo FreshRSS_Context::$conf->sticky_post ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('sticky_post'); ?>
 					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
@@ -88,7 +88,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">
-					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo FreshRSS_Context::$conf->auto_load_more ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('auto_load_more'); ?>
 					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
@@ -98,7 +98,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
-					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo FreshRSS_Context::$conf->lazyload ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('img_with_lazyload'); ?>
 					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
@@ -108,7 +108,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="reading_confirm">
-					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo $this->conf->reading_confirm ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo FreshRSS_Context::$conf->reading_confirm ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('reading_confirm'); ?>
 					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
@@ -119,19 +119,19 @@
 			<label class="group-name"><?php echo _t('auto_read_when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
-					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo $this->conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo FreshRSS_Context::$conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('article_viewed'); ?>
 				</label>
 				<label class="checkbox" for="check_open_site">
-					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo $this->conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo FreshRSS_Context::$conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('article_open_on_website'); ?>
 				</label>
 				<label class="checkbox" for="check_scroll">
-					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo $this->conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo FreshRSS_Context::$conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('scroll'); ?>
 				</label>
 				<label class="checkbox" for="check_reception">
-					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo $this->conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo FreshRSS_Context::$conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('upon_reception'); ?>
 				</label>
 			</div>
@@ -141,7 +141,7 @@
 			<label class="group-name"><?php echo _t('after_onread'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="onread_jump_next">
-					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo $this->conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo FreshRSS_Context::$conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('jump_next'); ?>
 				</label>
 			</div>
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 09c1e6f40..ef5e85a0c 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -15,8 +15,8 @@
 			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
 		<legend><?php echo _t('sharing'); ?></legend>
-		<?php foreach ($this->conf->sharing as $key => $sharing): ?>
-			<?php $share = $this->conf->shares[$sharing['type']]; ?>
+		<?php foreach (FreshRSS_Context::$conf->sharing as $key => $sharing): ?>
+			<?php $share = FreshRSS_Context::$conf->shares[$sharing['type']]; ?>
 			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
 					<?php echo _t($sharing['type']); ?>
@@ -41,7 +41,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<select>
-					<?php foreach($this->conf->shares as $key => $params):?>
+					<?php foreach(FreshRSS_Context::$conf->shares as $key => $params):?>
 						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
 					<?php endforeach; ?>
 				</select>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index fc8e90590..66a23877e 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -9,7 +9,7 @@
 		<?php } ?>
 	</datalist>
 
-	<?php $s = $this->conf->shortcuts; ?>
+	<?php $s = FreshRSS_Context::$conf->shortcuts; ?>
 
 	<form method="post" action="<?php echo _url('configure', 'shortcut'); ?>">
 		<legend><?php echo _t('shortcuts'); ?></legend>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 3bbcc3848..8e9141d4e 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,12 +1,12 @@
 "use strict";
 <?php
 
-$mark = $this->conf->mark_when;
+$mark = FreshRSS_Context::$conf->mark_when;
 $mail = Minz_Session::param('mail', false);
 $auto_actualize = Minz_Session::param('actualize_feeds', false);
-$hide_posts = ($this->conf->display_posts ||
+$hide_posts = (FreshRSS_Context::$conf->display_posts ||
                Minz_Request::param('output') === 'reader');
-$s = $this->conf->shortcuts;
+$s = FreshRSS_Context::$conf->shortcuts;
 
 $url_login = Minz_Url::display(array(
 	'c' => 'auth',
@@ -19,15 +19,15 @@ $url_logout = Minz_Url::display(array(
 
 echo 'var context={',
 	'hide_posts:', $hide_posts ? 'false' : 'true', ',',
-	'display_order:"', Minz_Request::param('order', $this->conf->sort_order), '",',
+	'display_order:"', Minz_Request::param('order', FreshRSS_Context::$conf->sort_order), '",',
 	'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
 	'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',',
 	'auto_mark_scroll:', $mark['scroll'] ? 'true' : 'false', ',',
-	'auto_load_more:', $this->conf->auto_load_more ? 'true' : 'false', ',',
+	'auto_load_more:', FreshRSS_Context::$conf->auto_load_more ? 'true' : 'false', ',',
 	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
-	'does_lazyload:', $this->conf->lazyload ? 'true' : 'false', ',',
-	'sticky_post:', $this->conf->sticky_post ? 'true' : 'false', ',',
-	'html5_notif_timeout:', $this->conf->html5_notif_timeout, ',',
+	'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',',
+	'sticky_post:', FreshRSS_Context::$conf->sticky_post ? 'true' : 'false', ',',
+	'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',',
 	'auth_type:"', Minz_Configuration::authType(), '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
 	'current_view:"', Minz_Request::param('output', 'normal'), '"',
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index cea338364..d642443a8 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -20,7 +20,7 @@
 		</a>
 	<?php } elseif ($markReadUrl) { ?>
 		<button id="bigMarkAsRead"
-		        class="as-link <?php echo $this->conf->reading_confirm ? 'confirm' : ''; ?>"
+		        class="as-link <?php echo FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>"
 		        form="mark-read-pagination"
 		        formaction="<?php echo $markReadUrl; ?>"
 		        type="submit">
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index 2bac09d04..ae8af820d 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -4,11 +4,11 @@
 <div id="stream" class="global categories">
 <?php
 	$arUrl = array('c' => 'index', 'a' => 'index', 'params' => array());
-	if ($this->conf->view_mode !== 'normal') {
+	if (FreshRSS_Context::$conf->view_mode !== 'normal') {
 		$arUrl['params']['output'] = 'normal';
 	}
 	$p = Minz_Request::param('state', '');
-	if (($p != '') && ($this->conf->default_view !== $p)) {
+	if (($p != '') && (FreshRSS_Context::$conf->default_view !== $p)) {
 		$arUrl['params']['state'] = $p;
 	}
 
@@ -41,7 +41,7 @@
 </div>
 
 <div id="overlay"></div>
-<div id="panel"<?php echo $this->conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
 	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
 
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index db25714bb..afe8ed872 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -8,24 +8,24 @@ if (!empty($this->entries)) {
 	$display_yesterday = true;
 	$display_others = true;
 	if (FreshRSS_Auth::hasAccess()) {
-		$sharing = $this->conf->sharing;
+		$sharing = FreshRSS_Context::$conf->sharing;
 	} else {
 		$sharing = array();
 	}
-	$hidePosts = !$this->conf->display_posts;
-	$lazyload = $this->conf->lazyload;
-	$topline_read = $this->conf->topline_read;
-	$topline_favorite = $this->conf->topline_favorite;
-	$topline_date = $this->conf->topline_date;
-	$topline_link = $this->conf->topline_link;
-	$bottomline_read = $this->conf->bottomline_read;
-	$bottomline_favorite = $this->conf->bottomline_favorite;
-	$bottomline_sharing = $this->conf->bottomline_sharing && (count($sharing));
-	$bottomline_tags = $this->conf->bottomline_tags;
-	$bottomline_date = $this->conf->bottomline_date;
-	$bottomline_link = $this->conf->bottomline_link;
+	$hidePosts = !FreshRSS_Context::$conf->display_posts;
+	$lazyload = FreshRSS_Context::$conf->lazyload;
+	$topline_read = FreshRSS_Context::$conf->topline_read;
+	$topline_favorite = FreshRSS_Context::$conf->topline_favorite;
+	$topline_date = FreshRSS_Context::$conf->topline_date;
+	$topline_link = FreshRSS_Context::$conf->topline_link;
+	$bottomline_read = FreshRSS_Context::$conf->bottomline_read;
+	$bottomline_favorite = FreshRSS_Context::$conf->bottomline_favorite;
+	$bottomline_sharing = FreshRSS_Context::$conf->bottomline_sharing && (count($sharing));
+	$bottomline_tags = FreshRSS_Context::$conf->bottomline_tags;
+	$bottomline_date = FreshRSS_Context::$conf->bottomline_date;
+	$bottomline_link = FreshRSS_Context::$conf->bottomline_link;
 
-	$content_width = $this->conf->content_width;
+	$content_width = FreshRSS_Context::$conf->content_width;
 ?>
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
@@ -140,7 +140,7 @@ if (!empty($this->entries)) {
 							<li class="dropdown-close"><a href="#close">❌</a></li>
 							<?php foreach ($sharing as $share) :?>
 								<li class="item share">
-									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
+									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
 										<?php echo _t($share['name']);?>
 									</a>
 								</li>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index 894c71924..821a50f7f 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -2,8 +2,8 @@
 $this->partial('nav_menu');
 
 if (!empty($this->entries)) {
-	$lazyload = $this->conf->lazyload;
-	$content_width = $this->conf->content_width;
+	$lazyload = FreshRSS_Context::$conf->lazyload;
+	$content_width = FreshRSS_Context::$conf->content_width;
 ?>
 
 <div id="stream" class="reader">
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 89c91e06c..2bfd633a2 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -10,9 +10,9 @@
 			<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
-				<?php $languages = $this->conf->availableLanguages(); ?>
+				<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
 				</select>
 			</div>
@@ -38,7 +38,7 @@
 
 		<div class="form-group">
 			<label class="group-name" for="new_user_email"><?php echo _t('persona_connection_email'); ?></label>
-			<?php $mail = $this->conf->mail_login; ?>
+			<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
 			</div>
diff --git a/app/views/user/profil.phtml b/app/views/user/profil.phtml
index a74c7b6f8..a2af53c96 100644
--- a/app/views/user/profil.phtml
+++ b/app/views/user/profil.phtml
@@ -42,7 +42,7 @@
 
 		<div class="form-group">
 			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
-			<?php $mail = $this->conf->mail_login; ?>
+			<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
 				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>

From 8a7bab3a55442f85553ab1d897084e89c10f7e05 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 19:35:22 +0200
Subject: [PATCH 085/363] Refactoring of indexController

Global view has been moved to a different action (all is not working)

See https://github.com/marienfressinaud/FreshRSS/issues/634
and https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/Controllers/errorController.php      |  2 +-
 app/Controllers/indexController.php      | 33 +++++++++++----
 app/layout/nav_menu.phtml                |  2 +-
 app/views/helpers/view/global_view.phtml | 53 ------------------------
 app/views/index/global.phtml             | 46 ++++++++++++++++++++
 app/views/index/index.phtml              |  2 -
 lib/lib_rss.php                          |  4 ++
 p/scripts/global_view.js                 |  3 +-
 8 files changed, 79 insertions(+), 66 deletions(-)
 delete mode 100644 app/views/helpers/view/global_view.phtml
 create mode 100644 app/views/index/global.phtml

diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 76ab930e0..6c080bea8 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -37,7 +37,7 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 		if ($this->view->errorMessage == '') {
 			switch($code_int) {
 			case 403:
-				$this->view->errorMessage = _t('forbidden_access');
+				$this->view->errorMessage = _t('access_denied');
 				break;
 			case 404:
 			default:
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index f994e257c..e1ce71b28 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * This class handles main actions of FreshRSS.
+ */
 class FreshRSS_index_Controller extends Minz_ActionController {
 	private $nb_not_read_cat = 0;
 
@@ -12,10 +15,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token === $token_param);
 			if ($output === 'rss' && !$token_is_ok) {
-				Minz_Error::error(
-					403,
-					array('error' => array(_t('access_denied')))
-				);
+				Minz_Error::error(403);
 				return;
 			} elseif ($output !== 'rss') {
 				// "hard" redirection is not required, just ask dispatcher to
@@ -201,17 +201,34 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			return false;
 		}
 	}
+
+	/**
+	 * This action displays the global view of FreshRSS.
+	 */
+	public function globalAction() {
+		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
+			Minz_Error::error(403);
+		}
+
+		Minz_View::appendScript(Minz_Url::display('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
+
+		$catDAO = new FreshRSS_CategoryDAO();
+		$this->view->categories = $catDAO->listCategories();
+	}
 	
+	/**
+	 * This action displays the about page of FreshRSS.
+	 */
 	public function aboutAction() {
 		Minz_View::prependTitle(_t('about') . ' · ');
 	}
 
+	/**
+	 * This action displays logs of FreshRSS for the current user.
+	 */
 	public function logsAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 
 		Minz_View::prependTitle(_t('logs') . ' · ');
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index bb9468ab1..1a26422df 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -240,7 +240,7 @@
 			<?php echo _i("view-normal"); ?>
 		</a>
 
-		<?php $url_output['params']['output'] = 'global'; ?>
+		<?php $url_output['a'] = 'global'; unset($url_output['params']['output']); ?>
 		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-global"); ?>
 		</a>
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
deleted file mode 100644
index ae8af820d..000000000
--- a/app/views/helpers/view/global_view.phtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php $this->partial('nav_menu'); ?>
-
-<?php if (!empty($this->entries)) { ?>
-<div id="stream" class="global categories">
-<?php
-	$arUrl = array('c' => 'index', 'a' => 'index', 'params' => array());
-	if (FreshRSS_Context::$conf->view_mode !== 'normal') {
-		$arUrl['params']['output'] = 'normal';
-	}
-	$p = Minz_Request::param('state', '');
-	if (($p != '') && (FreshRSS_Context::$conf->default_view !== $p)) {
-		$arUrl['params']['state'] = $p;
-	}
-
-	foreach ($this->cat_aside as $cat) {
-		$feeds = $cat->feeds();
-		if (!empty($feeds)) {
-?>
-	<div class="box-category">
-		<div class="category">
-			<a data-unread="<?php echo formatNumber($cat->nbNotRead()); ?>" class="btn" href="<?php $arUrl['params']['get'] = 'c_' . $cat->id(); echo Minz_Url::display($arUrl); ?>">
-			<?php echo $cat->name(); ?>
-			</a>
-		</div>
-		<ul class="feeds">
-			<?php foreach ($feeds as $feed) { ?>
-			<?php $not_read = $feed->nbNotRead(); ?>
-			<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() == 0 ? ' empty' : ''; ?>">
-				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-				<a class="feed" data-unread="<?php echo formatNumber($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php $arUrl['params']['get'] = 'f_' . $feed->id(); echo Minz_Url::display($arUrl); ?>">
-				<?php echo $feed->name(); ?>
-				</a>
-			</li>
-			<?php } ?>
-		</ul>
-	</div>
-<?php
-		}
-	}
-?>
-</div>
-
-<div id="overlay"></div>
-<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
-	<a class="close" href="#"><?php echo _i('close'); ?></a>
-</div>
-
-<?php } else { ?>
-<div id="stream" class="prompt alert alert-warn global">
-	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
-</div>
-<?php } ?>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
new file mode 100644
index 000000000..a72e431df
--- /dev/null
+++ b/app/views/index/global.phtml
@@ -0,0 +1,46 @@
+<?php //$this->partial('nav_menu'); ?>
+
+<div id="stream" class="global categories">
+<?php
+	$url_base = array(
+		'c' => 'index',
+		'a' => 'index',
+		'params' => array(
+			'state' => FreshRSS_Context::$state
+		)
+	);
+
+	foreach ($this->categories as $cat) {
+		$feeds = $cat->feeds();
+		$url_base['params']['get'] = 'c_' . $cat->id();
+
+		if (!empty($feeds)) {
+?>
+	<div class="box">
+		<div class="box-title"><a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
+
+		<ul class="box-content">
+			<?php
+				foreach ($feeds as $feed) {
+					$nb_not_read = $feed->nbNotRead();
+					$error = $feed->inError() ? 'error ' : '';
+					$empty = $feed->nbEntries() === 0 ? 'empty ' : '';
+					$url_base['params']['get'] = 'f_' . $feed->id();
+			?>
+			<li class="item feed<?php echo $error, $empty; ?>">
+				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
+				<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
+			</li>
+			<?php } ?>
+		</ul>
+	</div>
+<?php
+		}
+	}
+?>
+</div>
+
+<div id="overlay"></div>
+<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+	<a class="close" href="#"><?php echo _i('close'); ?></a>
+</div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index a59063557..8b93461dd 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -7,8 +7,6 @@ if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymous()) {
 		$this->renderHelper('view/normal_view');
 	} elseif ($output === 'reader') {
 		$this->renderHelper('view/reader_view');
-	} elseif ($output === 'global') {
-		$this->renderHelper('view/global_view');
 	} elseif ($output === 'rss') {
 		$this->renderHelper('view/rss_view');
 	} else {
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 9abdf18ce..80eb206d2 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -60,6 +60,10 @@ function formatNumber($n, $precision = 0) {
 	return str_replace(' ', ' ',	//Espace insécable	//TODO: remplacer par une espace _fine_ insécable
 		number_format($n, $precision, '.', ' '));	//number_format does not seem to be Unicode-compatible
 }
+function format_number($n, $precision = 0) {
+	// TODO: coding style, prefer THIS function. Remove formatNumber.
+	return formatNumber($n, $precision);
+}
 
 function formatBytes($bytes, $precision = 2, $system = 'IEC') {
 	if ($system === 'IEC') {
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 6e1f61066..8c2e6c1a2 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -50,7 +50,8 @@ function init_close_panel() {
 }
 
 function init_global_view() {
-	$("#stream .box-category a").click(function () {
+	// TODO: should be based on generic classes.
+	$(".box a").click(function () {
 		var link = $(this).attr("href");
 
 		load_panel(link);

From fe293900061263a1917fc1cf18ca369c8e07cb99 Mon Sep 17 00:00:00 2001
From: plopoyop <plopoyop@gmail.com>
Date: Mon, 20 Oct 2014 22:28:40 +0200
Subject: [PATCH 086/363] start with admin only if exists

---
 app/actualize_script.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index 4c306b8da..e5925514e 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -11,8 +11,11 @@ Minz_Configuration::init();
 
 $users = listUsers();
 shuffle($users);	//Process users in random order
-array_unshift($users, Minz_Configuration::defaultUser());	//But always start with admin
-$users = array_unique($users);
+
+if (Minz_Configuration::defaultUser() !== ''){
+	array_unshift($users, Minz_Configuration::defaultUser());	//But always start with admin
+	$users = array_unique($users);
+}
 
 foreach ($users as $myUser) {
 	syslog(LOG_INFO, 'FreshRSS actualize ' . $myUser);

From 80cffa6de51771cd80995fb1c4f1e04ee868eb45 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 21 Oct 2014 16:46:36 +0200
Subject: [PATCH 087/363] Views are in dedicated actions + improve Context

- Seperate normal, global and rss outputs in dedicated actions (NOT WORKING YET!)
- Rewrite aside_flux and nav_menu to use Context object
- Improve Context object

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php           |  97 +++++----
 app/FreshRSS.php                              |  10 -
 app/Models/Context.php                        |  65 +++++-
 app/layout/aside_flux.phtml                   | 111 ++++------
 app/layout/nav_menu.phtml                     | 203 ++++--------------
 app/views/index/global.phtml                  |   4 +-
 .../normal_view.phtml => index/normal.phtml}  |   2 +-
 .../view/rss_view.phtml => index/rss.phtml}   |   0
 lib/Minz/Request.php                          |   7 +
 9 files changed, 209 insertions(+), 290 deletions(-)
 rename app/views/{helpers/view/normal_view.phtml => index/normal.phtml} (98%)
 rename app/views/{helpers/view/rss_view.phtml => index/rss.phtml} (100%)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index e1ce71b28..d348ea1d0 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -7,47 +7,17 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	private $nb_not_read_cat = 0;
 
 	public function indexAction() {
-		$output = Minz_Request::param('output');
-		$token = FreshRSS_Context::$conf->token;
+		// TODO: update the context with information from request.
+		// TODO: then, in dedicated action, get corresponding entries
 
-		// check if user is logged in
-		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
-			$token_param = Minz_Request::param('token', '');
-			$token_is_ok = ($token != '' && $token === $token_param);
-			if ($output === 'rss' && !$token_is_ok) {
-				Minz_Error::error(403);
-				return;
-			} elseif ($output !== 'rss') {
-				// "hard" redirection is not required, just ask dispatcher to
-				// forward to the login form without 302 redirection
-				Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
-				return;
-			}
-		}
-
-		$params = Minz_Request::params();
-		if (isset($params['search'])) {
-			$params['search'] = urlencode($params['search']);
-		}
-
-		$this->view->url = array(
+		$prefered_output = FreshRSS_Context::$conf->view_mode;
+		Minz_Request::forward(array(
 			'c' => 'index',
-			'a' => 'index',
-			'params' => $params
-		);
+			'a' => $prefered_output
+		));
 
-		if ($output === 'rss') {
-			// no layout for RSS output
-			$this->view->_useLayout(false);
-			header('Content-Type: application/rss+xml; charset=utf-8');
-		} elseif ($output === 'global') {
-			Minz_View::appendScript(Minz_Url::display('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
-		}
+		return;
 
-		$catDAO = new FreshRSS_CategoryDAO();
-		$entryDAO = FreshRSS_Factory::createEntryDao();
-
-		$this->view->cat_aside = $catDAO->listCategories();
 		$this->view->nb_favorites = $entryDAO->countUnreadReadFavorites();
 		$this->view->nb_not_read = FreshRSS_CategoryDAO::CountUnreads($this->view->cat_aside, 1);
 		$this->view->currentName = '';
@@ -60,10 +30,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$getId = substr($get, 2);
 		if (!$this->checkAndProcessType($getType, $getId)) {
 			Minz_Log::debug('Not found [' . $getType . '][' . $getId . ']');
-			Minz_Error::error(
-				404,
-				array('error' => array(_t('page_not_found')))
-			);
+			Minz_Error::error(404);
 			return;
 		}
 
@@ -144,10 +111,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			$this->view->entries = $entries;
 		} catch (FreshRSS_EntriesGetter_Exception $e) {
 			Minz_Log::notice($e->getMessage());
-			Minz_Error::error(
-				404,
-				array('error' => array(_t('page_not_found')))
-			);
+			Minz_Error::error(404);
 		}
 	}
 
@@ -202,20 +166,59 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This action displays the normal view of FreshRSS.
+	 */
+	public function normalAction() {
+		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
+			return;
+		}
+
+		$catDAO = new FreshRSS_CategoryDAO();
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+
+		$this->view->categories = $catDAO->listCategories();
+
+	}
+
 	/**
 	 * This action displays the global view of FreshRSS.
 	 */
 	public function globalAction() {
 		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
-			Minz_Error::error(403);
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
+			return;
 		}
 
 		Minz_View::appendScript(Minz_Url::display('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
 
 		$catDAO = new FreshRSS_CategoryDAO();
 		$this->view->categories = $catDAO->listCategories();
+
+		Minz_View::prependTitle(_t('gen.title.global_view') . ' · ');
 	}
-	
+
+	/**
+	 * This action displays the RSS feed of FreshRSS.
+	 */
+	public function rssAction() {
+		$token = FreshRSS_Context::$conf->token;
+		$token_param = Minz_Request::param('token', '');
+		$token_is_ok = ($token != '' && $token === $token_param);
+
+		// Check if user has access.
+		if (!FreshRSS_Auth::hasAccess() &&
+				!Minz_Configuration::allowAnonymous() &&
+				!$token_is_ok) {
+			Minz_Error::error(403);
+		}
+
+		// No layout for RSS output.
+		$this->view->_useLayout(false);
+		header('Content-Type: application/rss+xml; charset=utf-8');
+	}
+
 	/**
 	 * This action displays the about page of FreshRSS.
 	 */
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 752b14e31..b997433bf 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -26,21 +26,11 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
-		$this->loadParamsView();
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
 	}
 
-	private function loadParamsView() {
-		// TODO: outputs should be different actions.
-		$output = Minz_Request::param('output', '');
-		if (($output === '') || ($output !== 'normal' && $output !== 'rss' && $output !== 'reader' && $output !== 'global')) {
-			$output = FreshRSS_Context::$conf->view_mode;
-			Minz_Request::_param('output', $output);
-		}
-	}
-
 	private function loadStylesAndScripts() {
 		$theme = FreshRSS_Themes::load(FreshRSS_Context::$conf->theme);
 		if ($theme) {
diff --git a/app/Models/Context.php b/app/Models/Context.php
index d984fece7..b85179652 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -6,7 +6,22 @@
  */
 class FreshRSS_Context {
 	public static $conf = null;
+
+	public static $total_unread = 0;
+	public static $total_starred = array(
+		'all' => 0,
+		'read' => 0,
+		'unread' => 0,
+	);
+
 	public static $state = 0;
+	public static $current_get = array(
+		'all' => false,
+		'starred' => false,
+		'feed' => false,
+		'category' => false,
+	);
+	public static $order = 'DESC';
 
 	public static function init() {
 		// Init configuration.
@@ -23,10 +38,56 @@ class FreshRSS_Context {
 		Minz_Translate::init();
 
 		// Get the current state.
-		self::$state = self::$conf->default_view;
+		// self::$state = self::$conf->default_view;
 	}
 
-	public static function stateEnabled($state) {
+	public static function isStateEnabled($state) {
 		return self::$state & $state;
 	}
+
+	public static function getRevertState($state) {
+		if (self::$state & $state) {
+			return self::$state & ~$state;
+		} else {
+			return self::$state | $state;
+		}
+	}
+
+	public static function currentGet() {
+		if (self::$current_get['all']) {
+			return 'a';
+		} elseif (self::$current_get['starred']) {
+			return 's';
+		} elseif (self::$current_get['feed']) {
+			return 'f_' . self::$current_get['feed'];
+		} elseif (self::$current_get['category']) {
+			return 'c_' . self::$current_get['category'];
+		}
+	}
+
+	public static function isCurrentGet($get) {
+		$type = $get[0];
+		$id = substr($get, 2);
+
+		switch($type) {
+		case 'a':
+			return self::$current_get['all'];
+		case 's':
+			return self::$current_get['starred'];
+		case 'f':
+			return self::$current_get['feed'] === $id;
+		case 'c':
+			return self::$current_get['category'] === $id;
+		default:
+			return false;
+		}
+	}
+
+	public static function nextStep() {
+		// TODO: fix this method.
+		return array(
+			'get' => 'a',
+			'idMax' => (time() - 1) . '000000'
+		);
+	}
 }
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 114ccbf56..e572e9d48 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,82 +1,53 @@
-<div class="aside aside_flux<?php if (FreshRSS_Context::$conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
+<div class="aside aside-flux" id="aside-flux">
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
-	<ul class="categories">
-		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<form id="mark-read-aside" method="post" style="display: none"></form>
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
+	<div class="stick configure-feeds">
+		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
+	</div>
+	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
+	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a>
+	<?php } ?>
 
-		<li>
-			<div class="stick configure-feeds">
-				<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
-				<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
-			</div>
+	<form id="mark-read-aside" method="post" style="display: none"></form>
+
+	<ul class="tree">
+		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _i('all'), ' ', _t('main_stream'); ?></a>
+		</li>
+
+		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _i('bookmark'), ' ', _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
 		</li>
-		<?php } elseif (Minz_Configuration::needsLogin()) { ?>
-		<li><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></li>
-		<?php } ?>
 
 		<?php
-			$arUrl = array('c' => 'index', 'a' => 'index', 'params' => array());
-			if (FreshRSS_Context::$conf->view_mode !== Minz_Request::param('output', 'normal')) {
-				$arUrl['params']['output'] = 'normal';
+			foreach ($this->categories as $cat) {
+				$feeds = $cat->feeds();
+				if (!empty($feeds)) {
+		?>
+		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('c_' . $cat->id()) ? ' active' : ''; ?>">
+			<a class="tree-folder-title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _i('category'), ' ', $cat->name(); ?></a>
+
+			<ul class="items">
+				<?php foreach ($feeds as $feed) { ?>
+				<li class="item<?php echo FreshRSS_Context::isCurrentGet('f_' . $feed->id()) ? ' active' : ''; ?>">
+					<div class="dropdown">
+						<div class="dropdown-target"></div>
+						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
+						<?php /* feed_config_template */ ?>
+					</div>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
+					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+				</li>
+				<?php } ?>
+			</ul>
+		</li>
+		<?php
+				}
 			}
 		?>
-		<li>
-			<div class="category all<?php echo $this->get_c == 'a' ? ' active' : ''; ?>">
-				<a data-unread="<?php echo formatNumber($this->nb_not_read); ?>" class="btn<?php echo $this->get_c == 'a' ? ' active' : ''; ?>" href="<?php echo Minz_Url::display($arUrl); ?>">
-					<?php echo _i('all'); ?>
-					<?php echo _t('main_stream'); ?>
-				</a>
-			</div>
-		</li>
-
-		<li>
-			<div class="category favorites<?php echo $this->get_c == 's' ? ' active' : ''; ?>">
-				<a data-unread="<?php echo formatNumber($this->nb_favorites['unread']); ?>" class="btn<?php echo $this->get_c == 's' ? ' active' : ''; ?>" href="<?php $arUrl['params']['get'] = 's'; echo Minz_Url::display($arUrl); ?>">
-					<?php echo _i('bookmark'); ?>
-					<?php echo _t('favorite_feeds', formatNumber($this->nb_favorites['all'])); ?>
-				</a>
-			</div>
-		</li>
-
-		<?php
-		foreach ($this->cat_aside as $cat) {
-			$feeds = $cat->feeds();
-			if (!empty($feeds)) {
-				$c_active = false;
-				$c_show = false;
-				if ($this->get_c == $cat->id()) {
-					$c_active = true;
-					if (!FreshRSS_Context::$conf->display_categories || $this->get_f) {
-						$c_show = true;
-					}
-				}
-				?><li data-unread="<?php echo $cat->nbNotRead(); ?>"<?php if ($c_active) echo ' class="active"'; ?>><?php
-				?><div class="category stick<?php echo $c_active ? ' active' : ''; ?>"><?php
-					?><a data-unread="<?php echo formatNumber($cat->nbNotRead()); ?>" class="btn<?php echo $c_active ? ' active' : ''; ?>" href="<?php $arUrl['params']['get'] = 'c_' . $cat->id(); echo Minz_Url::display($arUrl); ?>"><?php echo $cat->name(); ?></a><?php
-					?><a class="btn dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a><?php
-				?></div><?php
-				?><ul class="feeds<?php echo $c_show ? ' active' : ''; ?>"><?php
-				foreach ($feeds as $feed) {
-					$feed_id = $feed->id();
-					$nbEntries = $feed->nbEntries();
-					$f_active = ($this->get_f == $feed_id);
-					?><li id="f_<?php echo $feed_id; ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>"><?php
-						?><div class="dropdown"><?php
-							?><div class="dropdown-target"></div><?php
-							?><a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a><?php
-							/* feed_config_template */
-						?></div><?php
-						?> <img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php
-						?><a class="feed" data-unread="<?php echo formatNumber($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php $arUrl['params']['get'] = 'f_' . $feed_id; echo Minz_Url::display($arUrl); ?>"><?php echo $feed->name(); ?></a><?php
-					?></li><?php
-				}
-				?></ul><?php
-				?></li><?php
-			}
-		} ?>
 	</ul>
-	<span class="aside_flux_ender"><!-- For fixed menu --></span>
 </div>
 
 <script id="feed_config_template" type="text/html">
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 1a26422df..440e4d0b6 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -1,6 +1,5 @@
-<?php
-	$actual_view = Minz_Request::param('output', 'normal');
-?>
+<?php $actual_view = Minz_Request::actionName(); ?>
+
 <div class="nav_menu">
 	<?php if ($actual_view === 'normal') { ?>
 	<a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
@@ -9,82 +8,24 @@
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
 	<div id="nav_menu_actions" class="stick">
 		<?php
-			$url_state = $this->url;
+			$states = array(
+				'read' => FreshRSS_Entry::STATE_READ,
+				'unread' => FreshRSS_Entry::STATE_NOT_READ,
+				'starred' => FreshRSS_Entry::STATE_FAVORITE,
+				'non-starred' => FreshRSS_Entry::STATE_NOT_FAVORITE,
+			);
 
-			if ($this->state & FreshRSS_Entry::STATE_READ) {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_READ;
-				$checked = 'true';
-				$class = 'active';
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_READ;
-				$checked = 'false';
-				$class = '';
-			}
+			foreach ($states as $state_str => $state) {
+				$state_enabled = FreshRSS_Context::isStateEnabled($state);
+				$url_state = Minz_Request::currentRequest();
+				$url_state['params']['state'] = FreshRSS_Context::getRevertState($state);
 		?>
-		<a id="toggle-read"
-		   class="btn <?php echo $class; ?>"
-		   aria-checked="<?php echo $checked; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
-		   title="<?php echo _t('show_read'); ?>">
-			<?php echo _i('read'); ?>
-		</a>
-
-		<?php
-			if ($this->state & FreshRSS_Entry::STATE_NOT_READ) {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_READ;
-				$checked = 'true';
-				$class = 'active';
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_READ;
-				$checked = 'false';
-				$class = '';
-			}
-		?>
-		<a id="toggle-unread"
-		   class="btn <?php echo $class; ?>"
-		   aria-checked="<?php echo $checked; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
-		   title="<?php echo _t('show_not_reads'); ?>">
-			<?php echo _i('unread'); ?>
-		</a>
-
-		<?php
-			if ($this->state & FreshRSS_Entry::STATE_FAVORITE || $this->get_c == 's') {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_FAVORITE;
-				$checked = 'true';
-				$class = 'active';
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_FAVORITE;
-				$checked = 'false';
-				$class = '';
-			}
-		?>
-		<a id="toggle-favorite"
-		   class="btn <?php echo $class; ?>"
-		   aria-checked="<?php echo $checked; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
-		   title="<?php echo _t('show_favorite'); ?>">
-			<?php echo _i('starred'); ?>
-		</a>
-
-		<?php
-			if ($this->state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_FAVORITE;
-				$checked = 'true';
-				$class = 'active';
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_FAVORITE;
-				$checked = 'false';
-				$class = '';
-			}
-		?>
-		<a id="toggle-not-favorite"
-		   class="btn <?php echo $class; ?>"
-		   aria-checked="<?php echo $checked; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
-		   title="<?php echo _t('show_not_favorite'); ?>">
-			<?php echo _i('non-starred'); ?>
-		</a>
+		<a id="toggle-<?php echo $state_str; ?>"
+		   class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
+		   aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
+		   title="<?php echo _t($state_str); ?>"
+		   href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
+		<?php } ?>
 
 		<div class="dropdown">
 			<div id="dropdown-query" class="dropdown-target"></div>
@@ -109,7 +50,7 @@
 				<?php } ?>
 
 				<?php
-					$url_query = $this->url;
+					$url_query = Minz_Request::currentRequest();;
 					$url_query['c'] = 'configure';
 					$url_query['a'] = 'addQuery';
 				?>
@@ -117,74 +58,26 @@
 			</ul>
 		</div>
 	</div>
+
 	<?php
-		$get = false;
+		$get = FreshRSS_Context::currentGet();
+		$next_step = FreshRSS_Context::nextStep();
 		$string_mark = _t('mark_all_read');
-		if ($this->get_f) {
-			$get = 'f_' . $this->get_f;
+		if ($get[0] == 'f') {
 			$string_mark = _t('mark_feed_read');
-		} elseif ($this->get_c && $this->get_c != 'a') {
-			if ($this->get_c === 's') {
-				$get = 's';
-			} else {
-				$get = 'c_' . $this->get_c;
-			}
+		} elseif ($get[0] == 'c') {
 			$string_mark = _t('mark_cat_read');
 		}
-		$nextGet = $get;
-		if (FreshRSS_Context::$conf->onread_jump_next && strlen($get) > 2) {
-			$anotherUnreadId = '';
-			$foundCurrent = false;
-			switch ($get[0]) {
-			case 'c':
-				foreach ($this->cat_aside as $cat) {
-					if ($cat->id() == $this->get_c) {
-						$foundCurrent = true;
-						continue;
-					}
-					if ($cat->nbNotRead() <= 0) continue;
-					$anotherUnreadId = $cat->id();
-					if ($foundCurrent) break;
-				}
-				$nextGet = empty($anotherUnreadId) ? 'a' : 'c_' . $anotherUnreadId;
-				break;
-			case 'f':
-				foreach ($this->cat_aside as $cat) {
-					if ($cat->id() == $this->get_c) {
-						foreach ($cat->feeds() as $feed) {
-							if ($feed->id() == $this->get_f) {
-								$foundCurrent = true;
-								continue;
-							}
-							if ($feed->nbNotRead() <= 0) continue;
-							$anotherUnreadId = $feed->id();
-							if ($foundCurrent) break;
-						}
-						break;
-					}
-				}
-				$nextGet = empty($anotherUnreadId) ? 'c_' . $this->get_c : 'f_' . $anotherUnreadId;
-				break;
-			}
-		}
 
-		$p = isset($this->entries[0]) ? $this->entries[0] : null;
-		$idMax = $p === null ? (time() - 1) . '000000' : $p->id();
-
-		if ($this->order === 'ASC') {	//In this case we do not know but we guess idMax
-			$idMax2 = (time() - 1) . '000000';
-			if (strcmp($idMax2, $idMax) > 0) {
-				$idMax = $idMax2;
-			}
-		}
-
-		$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('get' => $get, 'nextGet' => $nextGet, 'idMax' => $idMax));
-		$output = Minz_Request::param('output', '');
-		if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
-			$arUrl['params']['output'] = $output;
-		}
-		$markReadUrl = Minz_Url::display($arUrl);
-		Minz_Session::_param('markReadUrl', $markReadUrl);
+		$mark_read_url = array(
+			'c' => 'entry',
+			'a' => 'read',
+			'params' => array(
+				'get' => $get,
+				'nextGet' => $next_step['get'],
+				'idMax' => $next_step['idMax']
+			)
+		);
 	?>
 
 	<form id="mark-read-menu" method="post" style="display: none"></form>
@@ -193,7 +86,7 @@
 		<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
-		        formaction="<?php echo $markReadUrl; ?>"
+		        formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
 		        type="submit"><?php echo _t('mark_read'); ?></button>
 
 		<div class="dropdown">
@@ -206,15 +99,16 @@
 				<li class="item">
 					<button class="as-link <?php echo $confirm; ?>"
 					        form="mark-read-menu"
-					        formaction="<?php echo $markReadUrl; ?>"
+					        formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
 					        type="submit"><?php echo $string_mark; ?></button>
 				</li>
 				<li class="separator"></li>
 <?php
-	$mark_before_today = $arUrl;
-	$mark_before_today['params']['idMax'] = $this->today . '000000';
-	$mark_before_one_week = $arUrl;
-	$mark_before_one_week['params']['idMax'] = ($this->today - 604800) . '000000';
+	$today = @strtotime('today');
+	$mark_before_today = $mark_read_url;
+	$mark_before_today['params']['idMax'] = $today . '000000';
+	$mark_before_one_week = $mark_read_url;
+	$mark_before_one_week['params']['idMax'] = ($today - 604800) . '000000';
 ?>
 				<li class="item">
 					<button class="as-link <?php echo $confirm; ?>"
@@ -233,25 +127,20 @@
 	</div>
 	<?php } ?>
 
-	<?php $url_output = $this->url; ?>
+	<?php $url_output = Minz_Request::currentRequest(); ?>
 	<div class="stick" id="nav_menu_views">
-		<?php $url_output['params']['output'] = 'normal'; ?>
+		<?php $url_output['a'] = 'normal'; ?>
 		<a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-normal"); ?>
 		</a>
 
-		<?php $url_output['a'] = 'global'; unset($url_output['params']['output']); ?>
+		<?php $url_output['a'] = 'global'; ?>
 		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-global"); ?>
 		</a>
 
-		<?php $url_output['params']['output'] = 'reader'; ?>
-		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
-			<?php echo _i("view-reader"); ?>
-		</a>
-
 		<?php
-			$url_output['params']['output'] = 'rss';
+			$url_output['a'] = 'rss';
 			if (FreshRSS_Context::$conf->token) {
 				$url_output['params']['token'] = FreshRSS_Context::$conf->token;
 			}
@@ -284,7 +173,7 @@
 	</div>
 	
 	<?php
-		if ($this->order === 'DESC') {
+		if (FreshRSS_Context::$order === 'DESC') {
 			$order = 'ASC';
 			$icon = 'up';
 			$title = 'older_first';
@@ -293,7 +182,7 @@
 			$icon = 'down';
 			$title = 'newer_first';
 		}
-		$url_order = $this->url;
+		$url_order = Minz_Request::currentRequest();
 		$url_order['params']['order'] = $order;
 	?>
 	<a id="toggle-order" class="btn" href="<?php echo Minz_Url::display($url_order); ?>" title="<?php echo _t($title); ?>">
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index a72e431df..ab63c409a 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -5,9 +5,7 @@
 	$url_base = array(
 		'c' => 'index',
 		'a' => 'index',
-		'params' => array(
-			'state' => FreshRSS_Context::$state
-		)
+		'params' => array()
 	);
 
 	foreach ($this->categories as $cat) {
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/index/normal.phtml
similarity index 98%
rename from app/views/helpers/view/normal_view.phtml
rename to app/views/index/normal.phtml
index afe8ed872..6333d63db 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/index/normal.phtml
@@ -80,7 +80,7 @@ if (!empty($this->entries)) {
 					?></li><?php
 				}
 			}
-			$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed());	//We most likely already have the feed object in cache
+			$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $item->feed());	//We most likely already have the feed object in cache
 			if ($feed == null) {
 				$feed = $item->feed(true);
 				if ($feed == null) {
diff --git a/app/views/helpers/view/rss_view.phtml b/app/views/index/rss.phtml
similarity index 100%
rename from app/views/helpers/view/rss_view.phtml
rename to app/views/index/rss.phtml
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index f7a24c026..4b97a3caf 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -45,6 +45,13 @@ class Minz_Request {
 	public static function defaultActionName() {
 		return self::$default_action_name;
 	}
+	public static function currentRequest() {
+		return array(
+			'c' => self::$controller_name,
+			'a' => self::$action_name,
+			'params' => self::$params,
+		);
+	}
 
 	/**
 	 * Setteurs

From fcae4157539306e90299e7f0e90740320a2833d7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 13:13:24 +0200
Subject: [PATCH 088/363] Update title and get parameter correctly.

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php | 113 ++++++++--------------------
 app/Models/Context.php              |  68 +++++++++++++++++
 2 files changed, 100 insertions(+), 81 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index d348ea1d0..f163da53d 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -4,7 +4,6 @@
  * This class handles main actions of FreshRSS.
  */
 class FreshRSS_index_Controller extends Minz_ActionController {
-	private $nb_not_read_cat = 0;
 
 	public function indexAction() {
 		// TODO: update the context with information from request.
@@ -18,30 +17,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		return;
 
-		$this->view->nb_favorites = $entryDAO->countUnreadReadFavorites();
-		$this->view->nb_not_read = FreshRSS_CategoryDAO::CountUnreads($this->view->cat_aside, 1);
-		$this->view->currentName = '';
-
-		$this->view->get_c = '';
-		$this->view->get_f = '';
-
-		$get = Minz_Request::param('get', 'a');
-		$getType = $get[0];
-		$getId = substr($get, 2);
-		if (!$this->checkAndProcessType($getType, $getId)) {
-			Minz_Log::debug('Not found [' . $getType . '][' . $getId . ']');
-			Minz_Error::error(404);
-			return;
-		}
-
-		// mise à jour des titres
-		$this->view->rss_title = $this->view->currentName . ' | ' . Minz_View::title();
-		Minz_View::prependTitle(
-			($this->nb_not_read_cat > 0 ? '(' . formatNumber($this->nb_not_read_cat) . ') ' : '') .
-			$this->view->currentName .
-			' · '
-		);
-
 		// On récupère les différents éléments de filtrage
 		$this->view->state = Minz_Request::param('state', FreshRSS_Context::$conf->default_view);
 		$state_param = Minz_Request::param('state', null);
@@ -115,57 +90,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 	}
 
-	/*
-	 * Vérifie que la catégorie / flux sélectionné existe
-	 * + Initialise correctement les variables de vue get_c et get_f
-	 * + Met à jour la variable $this->nb_not_read_cat
-	 */
-	private function checkAndProcessType($getType, $getId) {
-		switch($getType) {
-		case 'a':
-			$this->view->currentName = _t('your_rss_feeds');
-			$this->nb_not_read_cat = $this->view->nb_not_read;
-			$this->view->get_c = $getType;
-			return true;
-		case 's':
-			$this->view->currentName = _t('your_favorites');
-			$this->nb_not_read_cat = $this->view->nb_favorites['unread'];
-			$this->view->get_c = $getType;
-			return true;
-		case 'c':
-			$cat = isset($this->view->cat_aside[$getId]) ? $this->view->cat_aside[$getId] : null;
-			if ($cat === null) {
-				$catDAO = new FreshRSS_CategoryDAO();
-				$cat = $catDAO->searchById($getId);
-			}
-			if ($cat) {
-				$this->view->currentName = $cat->name();
-				$this->nb_not_read_cat = $cat->nbNotRead();
-				$this->view->get_c = $getId;
-				return true;
-			} else {
-				return false;
-			}
-		case 'f':
-			$feed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
-			if (empty($feed)) {
-				$feedDAO = FreshRSS_Factory::createFeedDao();
-				$feed = $feedDAO->searchById($getId);
-			}
-			if ($feed) {
-				$this->view->currentName = $feed->name();
-				$this->nb_not_read_cat = $feed->nbNotRead();
-				$this->view->get_f = $getId;
-				$this->view->get_c = $feed->category();
-				return true;
-			} else {
-				return false;
-			}
-		default:
-			return false;
-		}
-	}
-
 	/**
 	 * This action displays the normal view of FreshRSS.
 	 */
@@ -175,11 +99,19 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			return;
 		}
 
-		$catDAO = new FreshRSS_CategoryDAO();
-		$entryDAO = FreshRSS_Factory::createEntryDao();
+		try {
+			$this->updateContext();
+		} catch (Minz_Exception $e) {
+			Minz_Error::error(404);
+		}
 
-		$this->view->categories = $catDAO->listCategories();
+		$this->view->categories = FreshRSS_Context::$categories;
 
+		$title = FreshRSS_Context::$name;
+		if (FreshRSS_Context::$get_unread > 0) {
+			$title = '(' . FreshRSS_Context::$get_unread . ') · ' . $title;
+		}
+		Minz_View::prependTitle($title . ' · ');
 	}
 
 	/**
@@ -193,8 +125,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		Minz_View::appendScript(Minz_Url::display('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
 
-		$catDAO = new FreshRSS_CategoryDAO();
-		$this->view->categories = $catDAO->listCategories();
+		try {
+			$this->updateContext();
+		} catch (Minz_Exception $e) {
+			Minz_Error::error(404);
+		}
+
+		$this->view->categories = FreshRSS_Context::$categories;
 
 		Minz_View::prependTitle(_t('gen.title.global_view') . ' · ');
 	}
@@ -214,11 +151,25 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
+		try {
+			$this->updateContext();
+		} catch (Minz_Exception $e) {
+			Minz_Error::error(404);
+		}
+
 		// No layout for RSS output.
+		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
 		$this->view->_useLayout(false);
 		header('Content-Type: application/rss+xml; charset=utf-8');
 	}
 
+	/**
+	 * This action updates the Context object by using request parameters.
+	 */
+	private function updateContext() {
+		FreshRSS_Context::_get(Minz_Request::param('get', 'a'));
+	}
+
 	/**
 	 * This action displays the about page of FreshRSS.
 	 */
diff --git a/app/Models/Context.php b/app/Models/Context.php
index b85179652..7138fd638 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -6,6 +6,9 @@
  */
 class FreshRSS_Context {
 	public static $conf = null;
+	public static $categories = array();
+
+	public static $name = '';
 
 	public static $total_unread = 0;
 	public static $total_starred = array(
@@ -21,6 +24,7 @@ class FreshRSS_Context {
 		'feed' => false,
 		'category' => false,
 	);
+	public static $get_unread = 0;
 	public static $order = 'DESC';
 
 	public static function init() {
@@ -37,8 +41,16 @@ class FreshRSS_Context {
 		Minz_Session::_param('language', self::$conf->language);
 		Minz_Translate::init();
 
+		$catDAO = new FreshRSS_CategoryDAO();
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+
 		// Get the current state.
 		// self::$state = self::$conf->default_view;
+		self::$categories = $catDAO->listCategories();
+
+		// Update number of read / unread variables.
+		self::$total_starred = $entryDAO->countUnreadReadFavorites();
+		self::$total_unread = FreshRSS_CategoryDAO::CountUnreads(self::$categories, 1);
 	}
 
 	public static function isStateEnabled($state) {
@@ -53,6 +65,62 @@ class FreshRSS_Context {
 		}
 	}
 
+	public static function _get($get) {
+		$type = $get[0];
+		$id = substr($get, 2);
+		$nb_unread = 0;
+
+		switch($type) {
+		case 'a':
+			self::$current_get['all'] = true;
+			self::$name = _t('your_rss_feeds');
+			self::$get_unread = self::$total_unread;
+			break;
+		case 's':
+			self::$current_get['starred'] = true;
+			self::$name = _t('your_favorites');
+			self::$get_unread = self::$total_starred['unread'];
+			break;
+		case 'f':
+			self::$current_get['feed'] = $id;
+
+			$feed = FreshRSS_CategoryDAO::findFeed(self::$categories, $id);
+			if ($feed === null) {
+				$feedDAO = FreshRSS_Factory::createFeedDao();
+				$feed = $feedDAO->searchById($id);
+
+				if (!$feed) {
+					// TODO: raise an exception
+					return false;
+				}
+			}
+
+			self::$name = $feed->name();
+			self::$get_unread = $feed->nbNotRead();
+			break;
+		case 'c':
+			self::$current_get['category'] = $id;
+			if (!isset(self::$categories[$id])) {
+				$catDAO = new FreshRSS_CategoryDAO();
+				$cat = $catDAO->searchById($id);
+
+				if (!$cat) {
+					// TODO: raise an exception
+					return false;
+				}
+			} else {
+				$cat = self::$categories[$id];
+			}
+
+			self::$name = $cat->name();
+			self::$get_unread = $cat->nbNotRead();
+			break;
+		default:
+			// TODO: raise an exception!
+			return false;
+		}
+	}
+
 	public static function currentGet() {
 		if (self::$current_get['all']) {
 			return 'a';

From b446a510ebacddd1437d907e795c83b3d05a9b98 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 13:35:30 +0200
Subject: [PATCH 089/363] Finish to update context object

See See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php | 82 ++++++++---------------------
 app/Models/Context.php              |  6 +++
 app/views/index/normal.phtml        |  8 +--
 3 files changed, 32 insertions(+), 64 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index f163da53d..be85aa68d 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -17,70 +17,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		return;
 
-		// On récupère les différents éléments de filtrage
-		$this->view->state = Minz_Request::param('state', FreshRSS_Context::$conf->default_view);
-		$state_param = Minz_Request::param('state', null);
-		$filter = Minz_Request::param('search', '');
-		$this->view->order = $order = Minz_Request::param('order', FreshRSS_Context::$conf->sort_order);
-		$nb = Minz_Request::param('nb', FreshRSS_Context::$conf->posts_per_page);
-		$first = Minz_Request::param('next', '');
-
-		$ajax_request = Minz_Request::param('ajax', false);
-		if ($output === 'reader') {
-			$nb = max(1, round($nb / 2));
-		}
-
-		if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ) {	//Any unread article in this category at all?
-			switch ($getType) {
-			case 'a':
-				$hasUnread = $this->view->nb_not_read > 0;
-				break;
-			case 's':
-				// This is deprecated. The favorite button does not exist anymore
-				$hasUnread = $this->view->nb_favorites['unread'] > 0;
-				break;
-			case 'c':
-				$hasUnread = (!isset($this->view->cat_aside[$getId]) ||
-				              $this->view->cat_aside[$getId]->nbNotRead() > 0);
-				break;
-			case 'f':
-				$myFeed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
-				$hasUnread = ($myFeed === null) || ($myFeed->nbNotRead() > 0);
-				break;
-			default:
-				$hasUnread = true;
-				break;
-			}
-			if (!$hasUnread && ($state_param === null)) {
-				$this->view->state = FreshRSS_Entry::STATE_ALL;
-			}
-		}
-
-		$this->view->today = @strtotime('today');
-
 		try {
 			$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb + 1, $first, $filter);
 
-			// Si on a récupéré aucun article "non lus"
-			// on essaye de récupérer tous les articles
-			if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ && empty($entries) && ($state_param === null) && ($filter == '')) {
-				Minz_Log::debug('Conflicting information about nbNotRead!');
-				$feedDAO = FreshRSS_Factory::createFeedDao();
-				try {
-					$feedDAO->updateCachedValues();
-				} catch (Exception $ex) {
-					Minz_Log::notice('Failed to automatically correct nbNotRead! ' + $ex->getMessage());
-				}
-				$this->view->state = FreshRSS_Entry::STATE_ALL;
-				$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter);
-			}
-			Minz_Request::_param('state', $this->view->state);
-
-			if (count($entries) <= $nb) {
-				$this->view->nextId  = '';
-			} else {	//We have more elements for pagination
-				$lastEntry = array_pop($entries);
-				$this->view->nextId  = $lastEntry->id();
+			if (count($entries) > $nb) {
+				// We have more elements for pagination
+				$last_entry = array_pop($entries);
+				FreshRSS_Context::$next_id = $last_entry->id();
 			}
 
 			$this->view->entries = $entries;
@@ -168,6 +111,23 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 */
 	private function updateContext() {
 		FreshRSS_Context::_get(Minz_Request::param('get', 'a'));
+
+		FreshRSS_Context::$state |= Minz_Request::param(
+			'state', FreshRSS_Context::$conf->default_view
+		);
+		if (FreshRSS_Context::$state & FreshRSS_Entry::STATE_NOT_READ &&
+				FreshRSS_Context::$get_unread <= 0) {
+			FreshRSS_Context::$state |= FreshRSS_Entry::STATE_READ;
+		}
+
+		FreshRSS_Context::$search = Minz_Request::param('search', '');
+		FreshRSS_Context::$order = Minz_Request::param(
+			'order', FreshRSS_Context::$conf->sort_order
+		);
+		FreshRSS_Context::$number = Minz_Request::param(
+			'nb', FreshRSS_Context::$conf->posts_per_page
+		);
+		FreshRSS_Context::$first_id = Minz_Request::param('next', '');
 	}
 
 	/**
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 7138fd638..31ac60207 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -26,6 +26,9 @@ class FreshRSS_Context {
 	);
 	public static $get_unread = 0;
 	public static $order = 'DESC';
+	public static $number = 0;
+	public static $search = '';
+	public static $first_id = 0;
 
 	public static function init() {
 		// Init configuration.
@@ -80,6 +83,9 @@ class FreshRSS_Context {
 			self::$current_get['starred'] = true;
 			self::$name = _t('your_favorites');
 			self::$get_unread = self::$total_starred['unread'];
+
+			// Update state if favorite is not yet enabled.
+			self::$state = self::$state | FreshRSS_Entry::STATE_FAVORITE;
 			break;
 		case 'f':
 			self::$current_get['feed'] = $id;
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 6333d63db..c39dba0a9 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -26,6 +26,8 @@ if (!empty($this->entries)) {
 	$bottomline_link = FreshRSS_Context::$conf->bottomline_link;
 
 	$content_width = FreshRSS_Context::$conf->content_width;
+
+	$today = @strtotime('today');
 ?>
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
@@ -33,7 +35,7 @@ if (!empty($this->entries)) {
 		<a href="<?php echo Minz_Url::display($this->url); ?>"><?php echo _t('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
-		if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $this->today)) {
+		if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $today)) {
 			?><div class="day" id="day_today"><?php
 				echo _t('today');
 				?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
@@ -41,7 +43,7 @@ if (!empty($this->entries)) {
 			?></div><?php
 			$display_today = false;
 		}
-		if ($display_yesterday && $item->isDay(FreshRSS_Days::YESTERDAY, $this->today)) {
+		if ($display_yesterday && $item->isDay(FreshRSS_Days::YESTERDAY, $today)) {
 			?><div class="day" id="day_yesterday"><?php
 				echo _t('yesterday');
 				?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
@@ -49,7 +51,7 @@ if (!empty($this->entries)) {
 			?></div><?php
 			$display_yesterday = false;
 		}
-		if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
+		if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $today)) {
 			?><div class="day" id="day_before_yesterday"><?php
 				echo _t('before_yesterday');
 				?><span class="name"><?php echo $this->currentName; ?></span><?php

From f1f9b2f5ff60f6dca05fad831b766ea7d63ff3a3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 13:52:20 +0200
Subject: [PATCH 090/363] Entries are loaded again! It's working :)

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php | 58 ++++++++++++++++++++---------
 app/Models/Context.php              | 17 +++++++--
 app/layout/layout.phtml             |  4 +-
 app/views/index/normal.phtml        |  8 ++--
 4 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index be85aa68d..d711997be 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -14,23 +14,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			'c' => 'index',
 			'a' => $prefered_output
 		));
-
-		return;
-
-		try {
-			$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb + 1, $first, $filter);
-
-			if (count($entries) > $nb) {
-				// We have more elements for pagination
-				$last_entry = array_pop($entries);
-				FreshRSS_Context::$next_id = $last_entry->id();
-			}
-
-			$this->view->entries = $entries;
-		} catch (FreshRSS_EntriesGetter_Exception $e) {
-			Minz_Log::notice($e->getMessage());
-			Minz_Error::error(404);
-		}
 	}
 
 	/**
@@ -48,6 +31,21 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Error::error(404);
 		}
 
+		try {
+			$entries = $this->listByContext();
+
+			if (count($entries) > FreshRSS_Context::$number) {
+				// We have more elements for pagination
+				$last_entry = array_pop($entries);
+				FreshRSS_Context::$next_id = $last_entry->id();
+			}
+
+			$this->view->entries = $entries;
+		} catch (FreshRSS_EntriesGetter_Exception $e) {
+			Minz_Log::notice($e->getMessage());
+			Minz_Error::error(404);
+		}
+
 		$this->view->categories = FreshRSS_Context::$categories;
 
 		$title = FreshRSS_Context::$name;
@@ -100,6 +98,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Error::error(404);
 		}
 
+		try {
+			$this->view->entries = $this->listByContext();
+		} catch (FreshRSS_EntriesGetter_Exception $e) {
+			Minz_Log::notice($e->getMessage());
+			Minz_Error::error(404);
+		}
+
 		// No layout for RSS output.
 		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
 		$this->view->_useLayout(false);
@@ -130,6 +135,25 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		FreshRSS_Context::$first_id = Minz_Request::param('next', '');
 	}
 
+	private function listByContext() {
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+
+		$get = FreshRSS_Context::currentGet(true);
+		if (count($get) > 1) {
+			$type = $get[0];
+			$id = $get[1];
+		} else {
+			$type = $get;
+			$id = '';
+		}
+
+		return $entryDAO->listWhere(
+			$type, $id, FreshRSS_Context::$state, FreshRSS_Context::$order,
+			FreshRSS_Context::$number + 1, FreshRSS_Context::$first_id,
+			FreshRSS_Context::$search
+		);
+	}
+
 	/**
 	 * This action displays the about page of FreshRSS.
 	 */
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 31ac60207..54fb1e64a 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -28,7 +28,8 @@ class FreshRSS_Context {
 	public static $order = 'DESC';
 	public static $number = 0;
 	public static $search = '';
-	public static $first_id = 0;
+	public static $first_id = '';
+	public static $next_id = '';
 
 	public static function init() {
 		// Init configuration.
@@ -127,15 +128,23 @@ class FreshRSS_Context {
 		}
 	}
 
-	public static function currentGet() {
+	public static function currentGet($array = false) {
 		if (self::$current_get['all']) {
 			return 'a';
 		} elseif (self::$current_get['starred']) {
 			return 's';
 		} elseif (self::$current_get['feed']) {
-			return 'f_' . self::$current_get['feed'];
+			if ($array) {
+				return array('f', self::$current_get['feed']);
+			} else {
+				return 'f_' . self::$current_get['feed'];
+			}
 		} elseif (self::$current_get['category']) {
-			return 'c_' . self::$current_get['category'];
+			if ($array) {
+				return array('c', self::$current_get['category']);
+			} else {
+				return 'c_' . self::$current_get['category'];
+			}
 		}
 	}
 
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index a8c70ec64..2b38df4a1 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -10,9 +10,9 @@
 <?php $this->renderHelper('javascript_vars'); ?>
 		//]]></script>
 <?php
-	if (!empty($this->nextId)) {
+	if (FreshRSS_Context::$next_id !== '') {
 		$params = Minz_Request::params();
-		$params['next'] = $this->nextId;
+		$params['next'] = FreshRSS_Context::$next_id;
 		$params['ajax'] = 1;
 ?>
 		<link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display(array('c' => Minz_Request::controllerName(), 'a' => Minz_Request::actionName(), 'params' => $params)); ?>" />
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index c39dba0a9..36adef2f2 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -32,14 +32,14 @@ if (!empty($this->entries)) {
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
 	?><div id="new-article">
-		<a href="<?php echo Minz_Url::display($this->url); ?>"><?php echo _t('new_article'); ?></a>
+		<a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
 		if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $today)) {
 			?><div class="day" id="day_today"><?php
 				echo _t('today');
 				?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
-				?><span class="name"><?php echo $this->currentName; ?></span><?php
+				?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
 			?></div><?php
 			$display_today = false;
 		}
@@ -47,14 +47,14 @@ if (!empty($this->entries)) {
 			?><div class="day" id="day_yesterday"><?php
 				echo _t('yesterday');
 				?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
-				?><span class="name"><?php echo $this->currentName; ?></span><?php
+				?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
 			?></div><?php
 			$display_yesterday = false;
 		}
 		if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $today)) {
 			?><div class="day" id="day_before_yesterday"><?php
 				echo _t('before_yesterday');
-				?><span class="name"><?php echo $this->currentName; ?></span><?php
+				?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
 			?></div><?php
 			$display_others = false;
 		}

From 98587d5d617f157ba57a260091c8e2c944f5163f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 17:57:22 +0200
Subject: [PATCH 091/363] Fix a set of TODO and bugs

- Context object raises correct Exception if get is invalid
- RSS feed is well-indicated on the home page
- State is better calculated
- Add some comments

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php | 39 ++++++++++++++++++++---------
 app/Exceptions/ContextException.php | 10 ++++++++
 app/Models/Context.php              | 16 +++++-------
 app/layout/layout.phtml             | 17 +++++++------
 4 files changed, 52 insertions(+), 30 deletions(-)
 create mode 100644 app/Exceptions/ContextException.php

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index d711997be..f9af2d0bb 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -5,10 +5,10 @@
  */
 class FreshRSS_index_Controller extends Minz_ActionController {
 
+	/**
+	 * This action only redirect on the default view mode (normal or global)
+	 */
 	public function indexAction() {
-		// TODO: update the context with information from request.
-		// TODO: then, in dedicated action, get corresponding entries
-
 		$prefered_output = FreshRSS_Context::$conf->view_mode;
 		Minz_Request::forward(array(
 			'c' => 'index',
@@ -27,12 +27,12 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		try {
 			$this->updateContext();
-		} catch (Minz_Exception $e) {
+		} catch (FreshRSS_Context_Exception $e) {
 			Minz_Error::error(404);
 		}
 
 		try {
-			$entries = $this->listByContext();
+			$entries = $this->listEntriesByContext();
 
 			if (count($entries) > FreshRSS_Context::$number) {
 				// We have more elements for pagination
@@ -48,6 +48,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		$this->view->categories = FreshRSS_Context::$categories;
 
+		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
 		$title = FreshRSS_Context::$name;
 		if (FreshRSS_Context::$get_unread > 0) {
 			$title = '(' . FreshRSS_Context::$get_unread . ') · ' . $title;
@@ -68,12 +69,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		try {
 			$this->updateContext();
-		} catch (Minz_Exception $e) {
+		} catch (FreshRSS_Context_Exception $e) {
 			Minz_Error::error(404);
 		}
 
 		$this->view->categories = FreshRSS_Context::$categories;
 
+		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
 		Minz_View::prependTitle(_t('gen.title.global_view') . ' · ');
 	}
 
@@ -94,12 +96,12 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		try {
 			$this->updateContext();
-		} catch (Minz_Exception $e) {
+		} catch (FreshRSS_Context_Exception $e) {
 			Minz_Error::error(404);
 		}
 
 		try {
-			$this->view->entries = $this->listByContext();
+			$this->view->entries = $this->listEntriesByContext();
 		} catch (FreshRSS_EntriesGetter_Exception $e) {
 			Minz_Log::notice($e->getMessage());
 			Minz_Error::error(404);
@@ -113,15 +115,25 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 	/**
 	 * This action updates the Context object by using request parameters.
+	 *
+	 * Parameters are:
+	 *   - state (default: conf->default_view)
+	 *   - search (default: empty string)
+	 *   - order (default: conf->sort_order)
+	 *   - nb (default: conf->posts_per_page)
+	 *   - next (default: empty string)
 	 */
 	private function updateContext() {
 		FreshRSS_Context::_get(Minz_Request::param('get', 'a'));
 
-		FreshRSS_Context::$state |= Minz_Request::param(
+		// TODO: change default_view by default_state.
+		FreshRSS_Context::$state = Minz_Request::param(
 			'state', FreshRSS_Context::$conf->default_view
 		);
-		if (FreshRSS_Context::$state & FreshRSS_Entry::STATE_NOT_READ &&
-				FreshRSS_Context::$get_unread <= 0) {
+		$state_forced_by_user = Minz_Request::param('state', false) !== false;
+		if (FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+				FreshRSS_Context::$get_unread <= 0 &&
+				!$state_forced_by_user) {
 			FreshRSS_Context::$state |= FreshRSS_Entry::STATE_READ;
 		}
 
@@ -135,7 +147,10 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		FreshRSS_Context::$first_id = Minz_Request::param('next', '');
 	}
 
-	private function listByContext() {
+	/**
+	 * This method returns a list of entries based on the Context object.
+	 */
+	private function listEntriesByContext() {
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
 		$get = FreshRSS_Context::currentGet(true);
diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
new file mode 100644
index 000000000..357751b7c
--- /dev/null
+++ b/app/Exceptions/ContextException.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * An exception raised when a context is invalid
+ */
+class FreshRSS_Context_Exception extends Exception {
+	public function __construct($message) {
+		parent::__construct($message);
+	}
+}
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 54fb1e64a..4580a4f52 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -17,14 +17,15 @@ class FreshRSS_Context {
 		'unread' => 0,
 	);
 
-	public static $state = 0;
+	public static $get_unread = 0;
 	public static $current_get = array(
 		'all' => false,
 		'starred' => false,
 		'feed' => false,
 		'category' => false,
 	);
-	public static $get_unread = 0;
+
+	public static $state = 0;
 	public static $order = 'DESC';
 	public static $number = 0;
 	public static $search = '';
@@ -48,8 +49,6 @@ class FreshRSS_Context {
 		$catDAO = new FreshRSS_CategoryDAO();
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
-		// Get the current state.
-		// self::$state = self::$conf->default_view;
 		self::$categories = $catDAO->listCategories();
 
 		// Update number of read / unread variables.
@@ -97,8 +96,7 @@ class FreshRSS_Context {
 				$feed = $feedDAO->searchById($id);
 
 				if (!$feed) {
-					// TODO: raise an exception
-					return false;
+					throw new FreshRSS_Context_Exception('Invalid feed: ' . $id);
 				}
 			}
 
@@ -112,8 +110,7 @@ class FreshRSS_Context {
 				$cat = $catDAO->searchById($id);
 
 				if (!$cat) {
-					// TODO: raise an exception
-					return false;
+					throw new FreshRSS_Context_Exception('Invalid category: ' . $id);
 				}
 			} else {
 				$cat = self::$categories[$id];
@@ -123,8 +120,7 @@ class FreshRSS_Context {
 			self::$get_unread = $cat->nbNotRead();
 			break;
 		default:
-			// TODO: raise an exception!
-			return false;
+			throw new FreshRSS_Context_Exception('Invalid getter: ' . $get);
 		}
 	}
 
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 2b38df4a1..1827d6c26 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -10,21 +10,22 @@
 <?php $this->renderHelper('javascript_vars'); ?>
 		//]]></script>
 <?php
+	$url_base = Minz_Request::currentRequest();
 	if (FreshRSS_Context::$next_id !== '') {
-		$params = Minz_Request::params();
-		$params['next'] = FreshRSS_Context::$next_id;
-		$params['ajax'] = 1;
+		$url_next = $url_base;
+		$url_next['params']['next'] = FreshRSS_Context::$next_id;
+		$url_next['params']['ajax'] = 1;
 ?>
-		<link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display(array('c' => Minz_Request::controllerName(), 'a' => Minz_Request::actionName(), 'params' => $params)); ?>" />
+		<link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display($url_next); ?>" />
 <?php } ?>
 		<link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" />
 		<link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" />
 <?php
-	if (isset($this->url)) {
-		$rss_url = $this->url;
-		$rss_url['params']['output'] = 'rss';
+	if (isset($this->rss_title)) {
+		$url_rss = $url_base;
+		$url_rss['a'] = 'rss';
 ?>
-		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($rss_url); ?>" />
+		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
 <?php } ?>
 		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>">
 		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>">

From eb60b82959d768b199985523e7d4e05ba4055591 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 18:06:28 +0200
Subject: [PATCH 092/363] Move back i18n init in FreshRSS.php

---
 app/FreshRSS.php       | 4 ++++
 app/Models/Context.php | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index b997433bf..6114a5d1a 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -26,6 +26,10 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
+		// Init i18n.
+		Minz_Session::_param('language', FreshRSS_Context::$conf->language);
+		Minz_Translate::init();
+
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 4580a4f52..3b3c8673d 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -42,10 +42,6 @@ class FreshRSS_Context {
 			die($e->getMessage());
 		}
 
-		// Init i18n.
-		Minz_Session::_param('language', self::$conf->language);
-		Minz_Translate::init();
-
 		$catDAO = new FreshRSS_CategoryDAO();
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 

From 9551145200b61717fdeb11007e1da541ddf93f0f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 18:21:36 +0200
Subject: [PATCH 093/363] Better view mode

- Seperate view mode from default state in conf
- Load read articles if no unread articles only if view is adaptive

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/configureController.php |  2 +-
 app/Controllers/indexController.php     |  6 +++---
 app/Models/Configuration.php            | 21 +++++++++++++--------
 app/views/configure/reading.phtml       |  6 +++---
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 8a9dcdc62..9a7870000 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -104,7 +104,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost()) {
 			FreshRSS_Context::$conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
 			FreshRSS_Context::$conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
-			FreshRSS_Context::$conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
+			FreshRSS_Context::$conf->_default_view(Minz_Request::param('default_view', 'adaptive'));
 			FreshRSS_Context::$conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
 			FreshRSS_Context::$conf->_display_posts(Minz_Request::param('display_posts', false));
 			FreshRSS_Context::$conf->_display_categories(Minz_Request::param('display_categories', false));
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index f9af2d0bb..2dd4c3068 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -126,13 +126,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	private function updateContext() {
 		FreshRSS_Context::_get(Minz_Request::param('get', 'a'));
 
-		// TODO: change default_view by default_state.
 		FreshRSS_Context::$state = Minz_Request::param(
-			'state', FreshRSS_Context::$conf->default_view
+			'state', FreshRSS_Context::$conf->default_state
 		);
 		$state_forced_by_user = Minz_Request::param('state', false) !== false;
-		if (FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+		if (FreshRSS_Context::$conf->default_view === 'adaptive' &&
 				FreshRSS_Context::$get_unread <= 0 &&
+				!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ) &&
 				!$state_forced_by_user) {
 			FreshRSS_Context::$state |= FreshRSS_Entry::STATE_READ;
 		}
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 2f208e509..53f136513 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -14,7 +14,8 @@ class FreshRSS_Configuration {
 		'apiPasswordHash' => '',	//CRYPT_BLOWFISH
 		'posts_per_page' => 20,
 		'view_mode' => 'normal',
-		'default_view' => FreshRSS_Entry::STATE_NOT_READ,
+		'default_view' => 'adaptive',
+		'default_state' => FreshRSS_Entry::STATE_NOT_READ,
 		'auto_load_more' => true,
 		'display_posts' => false,
 		'display_categories' => false,
@@ -153,18 +154,22 @@ class FreshRSS_Configuration {
 	}
 	public function _default_view($value) {
 		switch ($value) {
-		case FreshRSS_Entry::STATE_ALL:
-			// left blank on purpose
-		case FreshRSS_Entry::STATE_NOT_READ:
-			// left blank on purpose
-		case FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ:
+		case 'all':
 			$this->data['default_view'] = $value;
+			$this->data['default_state'] = (FreshRSS_Entry::STATE_READ +
+			                                FreshRSS_Entry::STATE_NOT_READ);
 			break;
+		case 'adaptive':
+		case 'unread':
 		default:
-			$this->data['default_view'] = FreshRSS_Entry::STATE_ALL;
-			break;
+			$this->data['default_view'] = $value;
+			$this->data['default_state'] = FreshRSS_Entry::STATE_NOT_READ;
 		}
 	}
+	public function _default_state($value) {
+		$this->data['default_state'] = (int)$value;
+	}
+
 	public function _display_posts($value) {
 		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
 	}
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index ef775b4b1..b8f673466 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -39,9 +39,9 @@
 			<label class="group-name" for="view_mode"><?php echo _t('articles_to_display'); ?></label>
 			<div class="group-controls">
 				<select name="default_view" id="default_view">
-					<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
-					<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
-					<option value="<?php echo FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
+					<option value="adaptive"<?php echo FreshRSS_Context::$conf->default_view === 'adaptive' ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
+					<option value="all"<?php echo FreshRSS_Context::$conf->default_view === 'all' ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
+					<option value="unread"<?php echo FreshRSS_Context::$conf->default_view === 'unread' ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
 				</select>
 			</div>
 		</div>

From 8a6ad05ebacb6bf6c0f6afd0afe54a29a0a18ee9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 18:33:46 +0200
Subject: [PATCH 094/363] Remove STATE_STRICT

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/configureController.php | 3 ---
 app/Models/Entry.php                    | 3 +--
 app/Models/EntryDAO.php                 | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 9a7870000..cafd0e8a8 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -338,9 +338,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				unset($query[$key]);
 			}
 		}
-		if (!empty($query['state']) && $query['state'] & FreshRSS_Entry::STATE_STRICT) {
-			$query['state'] -= FreshRSS_Entry::STATE_STRICT;
-		}
 		$queries[] = $query;
 		FreshRSS_Context::$conf->_queries($queries);
 		FreshRSS_Context::$conf->save();
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index ee94d1110..346c98a92 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -1,12 +1,11 @@
 <?php
 
 class FreshRSS_Entry extends Minz_Model {
-	const STATE_ALL = 0;
 	const STATE_READ = 1;
 	const STATE_NOT_READ = 2;
+	const STATE_ALL = 3;
 	const STATE_FAVORITE = 4;
 	const STATE_NOT_FAVORITE = 8;
-	const STATE_STRICT = 16;
 
 	private $id = 0;
 	private $guid;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 5a136499a..5d2909c62 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -333,8 +333,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
 			if (!($state & FreshRSS_Entry::STATE_READ)) {
 				$where .= 'AND e1.is_read=0 ';
-			} elseif ($state & FreshRSS_Entry::STATE_STRICT) {
-				$where .= 'AND e1.is_read=0 ';
 			}
 		}
 		elseif ($state & FreshRSS_Entry::STATE_READ) {

From 1fe5ed5d210334a051c48442fad29a14e8aee155 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 19:19:15 +0200
Subject: [PATCH 095/363] nextGet and idMax are coming back.

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/entryController.php | 14 ++----
 app/Controllers/indexController.php | 15 +++++-
 app/Models/Context.php              | 73 +++++++++++++++++++++++++----
 app/layout/nav_menu.phtml           |  5 +-
 4 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 449029648..d11f3a520 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -17,14 +17,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			);
 		}
 
-		// Keep parameter information (output) to do a correct redirection at
-		// the end.
-		$this->params = array();
-		$output = Minz_Request::param('output', '');
-		if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
-			$this->params['output'] = $output;
-		}
-
 		// If ajax request, we do not print layout
 		$this->ajax = Minz_Request::param('ajax');
 		if ($this->ajax) {
@@ -53,6 +45,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$get = Minz_Request::param('get');
 		$next_get = Minz_Request::param('nextGet', $get);
 		$id_max = Minz_Request::param('idMax', 0);
+		$params = array();
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 		if ($id === false) {
@@ -86,7 +79,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 					// Redirect to the correct page (category, feed or starred)
 					// Not "a" because it is the default value if nothing is
 					// given.
-					$this->params['get'] = $next_get;
+					$params['get'] = $next_get;
 				}
 			}
 		} else {
@@ -98,7 +91,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			Minz_Request::good(_t('feeds_marked_read'), array(
 				'c' => 'index',
 				'a' => 'index',
-				'params' => $this->params,
+				'params' => $params,
 			), true);
 		}
 	}
@@ -123,7 +116,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			Minz_Request::forward(array(
 				'c' => 'index',
 				'a' => 'index',
-				'params' => $this->params,
 			), true);
 		}
 	}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 2dd4c3068..80675b3a6 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -34,12 +34,25 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		try {
 			$entries = $this->listEntriesByContext();
 
-			if (count($entries) > FreshRSS_Context::$number) {
+			$nb_entries = count($entries);
+			if ($nb_entries > FreshRSS_Context::$number) {
 				// We have more elements for pagination
 				$last_entry = array_pop($entries);
 				FreshRSS_Context::$next_id = $last_entry->id();
 			}
 
+			$first_entry = $nb_entries > 0 ? $entries[0] : null;
+			FreshRSS_Context::$id_max = $first_entry === null ?
+			                            (time() - 1) . '000000' :
+			                            $first_entry->id();
+			if (FreshRSS_Context::$order === 'ASC') {
+				// In this case we do not know but we guess id_max
+				$id_max = (time() - 1) . '000000';
+				if (strcmp($id_max, FreshRSS_Context::$id_max) > 0) {
+					FreshRSS_Context::$id_max = $id_max;
+				}
+			}
+
 			$this->view->entries = $entries;
 		} catch (FreshRSS_EntriesGetter_Exception $e) {
 			Minz_Log::notice($e->getMessage());
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 3b3c8673d..3d184dcaa 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -24,6 +24,7 @@ class FreshRSS_Context {
 		'feed' => false,
 		'category' => false,
 	);
+	public static $next_get = 'a';
 
 	public static $state = 0;
 	public static $order = 'DESC';
@@ -31,6 +32,7 @@ class FreshRSS_Context {
 	public static $search = '';
 	public static $first_id = '';
 	public static $next_id = '';
+	public static $id_max = '';
 
 	public static function init() {
 		// Init configuration.
@@ -84,8 +86,6 @@ class FreshRSS_Context {
 			self::$state = self::$state | FreshRSS_Entry::STATE_FAVORITE;
 			break;
 		case 'f':
-			self::$current_get['feed'] = $id;
-
 			$feed = FreshRSS_CategoryDAO::findFeed(self::$categories, $id);
 			if ($feed === null) {
 				$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -96,6 +96,8 @@ class FreshRSS_Context {
 				}
 			}
 
+			self::$current_get['feed'] = $id;
+			self::$current_get['category'] = $feed->category();
 			self::$name = $feed->name();
 			self::$get_unread = $feed->nbNotRead();
 			break;
@@ -118,6 +120,8 @@ class FreshRSS_Context {
 		default:
 			throw new FreshRSS_Context_Exception('Invalid getter: ' . $get);
 		}
+
+		self::_nextGet();
 	}
 
 	public static function currentGet($array = false) {
@@ -150,19 +154,68 @@ class FreshRSS_Context {
 		case 's':
 			return self::$current_get['starred'];
 		case 'f':
-			return self::$current_get['feed'] === $id;
+			return self::$current_get['feed'] == $id;
 		case 'c':
-			return self::$current_get['category'] === $id;
+			return self::$current_get['category'] == $id;
 		default:
 			return false;
 		}
 	}
 
-	public static function nextStep() {
-		// TODO: fix this method.
-		return array(
-			'get' => 'a',
-			'idMax' => (time() - 1) . '000000'
-		);
+	public static function _nextGet() {
+		$get = self::currentGet();
+		self::$next_get = $get;
+
+		if (self::$conf->onread_jump_next && strlen($get) > 2) {
+			$another_unread_id = '';
+			$found_current_get = false;
+			switch ($get[0]) {
+			case 'f':
+				foreach (self::$categories as $cat) {
+					if ($cat->id() != self::$current_get['category']) {
+						continue;
+					}
+
+					foreach ($cat->feeds() as $feed) {
+						if ($feed->id() == self::$current_get['feed']) {
+							$found_current_get = true;
+							continue;
+						}
+
+						if ($feed->nbNotRead() > 0) {
+							$another_unread_id = $feed->id();
+							if ($found_current_get) {
+								break;
+							}
+						}
+					}
+					break;
+				}
+
+				self::$next_get['get'] = empty($another_unread_id) ?
+				                         'c_' . self::$current_get['category'] :
+				                         'f_' . $another_unread_id;
+				break;
+			case 'c':
+				foreach (self::$categories as $cat) {
+					if ($cat->id() == self::$current_get['category']) {
+						$found_current_get = true;
+						continue;
+					}
+
+					if ($cat->nbNotRead() > 0) {
+						$another_unread_id = $cat->id();
+						if ($found_current_get) {
+							break;
+						}
+					}
+				}
+
+				self::$next_get['get'] = empty($another_unread_id) ?
+				                         'a' :
+				                         'c_' . $another_unread_id;
+				break;
+			}
+		}
 	}
 }
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 440e4d0b6..2c9f8724d 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -61,7 +61,6 @@
 
 	<?php
 		$get = FreshRSS_Context::currentGet();
-		$next_step = FreshRSS_Context::nextStep();
 		$string_mark = _t('mark_all_read');
 		if ($get[0] == 'f') {
 			$string_mark = _t('mark_feed_read');
@@ -74,8 +73,8 @@
 			'a' => 'read',
 			'params' => array(
 				'get' => $get,
-				'nextGet' => $next_step['get'],
-				'idMax' => $next_step['idMax']
+				'nextGet' => FreshRSS_Context::$next_get,
+				'idMax' => FreshRSS_Context::$id_max,
 			)
 		);
 	?>

From 00bad6e6442ec3664cbc5a2438a3432962544b5a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 19:30:59 +0200
Subject: [PATCH 096/363] Fix pagination

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/views/helpers/pagination.phtml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index d642443a8..3ea6c3582 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -1,28 +1,32 @@
 <?php
-	$c = Minz_Request::controllerName();
-	$a = Minz_Request::actionName();
-	$params = Minz_Request::params();
-	$markReadUrl = Minz_Session::param('markReadUrl');
-	Minz_Session::_param('markReadUrl', false);
+	$url_next = Minz_Request::currentRequest();
+	$url_next['params']['next'] = FreshRSS_Context::$next_id;
+	$url_next['params']['ajax'] = 1;
+
+	$url_mark_read = array(
+		'c' => 'entry',
+		'a' => 'read',
+		'params' => array(
+			'get' => FreshRSS_Context::currentGet(),
+			'nextGet' => FreshRSS_Context::$next_get,
+			'idMax' => FreshRSS_Context::$id_max,
+		)
+	);
 ?>
 
 <form id="mark-read-pagination" method="post" style="display: none"></form>
 
 <ul class="pagination">
 	<li class="item pager-next">
-	<?php if (!empty($this->nextId)) { ?>
-		<?php
-			$params['next'] = $this->nextId;
-			$params['ajax'] = 1;
-		?>
-		<a id="load_more" href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">
+	<?php if (FreshRSS_Context::$next_id) { ?>
+		<a id="load_more" href="<?php echo Minz_Url::display($url_next); ?>">
 			<?php echo _t('load_more'); ?>
 		</a>
-	<?php } elseif ($markReadUrl) { ?>
+	<?php } elseif ($url_mark_read) { ?>
 		<button id="bigMarkAsRead"
 		        class="as-link <?php echo FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>"
 		        form="mark-read-pagination"
-		        formaction="<?php echo $markReadUrl; ?>"
+		        formaction="<?php echo Minz_Url::display($url_mark_read); ?>"
 		        type="submit">
 			<?php echo _t('nothing_to_load'); ?><br />
 			<span class="bigTick">✓</span><br />

From db1ad1de233ac7a0e0674c6e64a6a01f3d0e8fbe Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 19:36:55 +0200
Subject: [PATCH 097/363] Fix a bug in nextGet

---
 app/Models/Context.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Models/Context.php b/app/Models/Context.php
index 3d184dcaa..d4aeee7ac 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -192,9 +192,9 @@ class FreshRSS_Context {
 					break;
 				}
 
-				self::$next_get['get'] = empty($another_unread_id) ?
-				                         'c_' . self::$current_get['category'] :
-				                         'f_' . $another_unread_id;
+				self::$next_get = empty($another_unread_id) ?
+				                  'c_' . self::$current_get['category'] :
+				                  'f_' . $another_unread_id;
 				break;
 			case 'c':
 				foreach (self::$categories as $cat) {
@@ -211,9 +211,9 @@ class FreshRSS_Context {
 					}
 				}
 
-				self::$next_get['get'] = empty($another_unread_id) ?
-				                         'a' :
-				                         'c_' . $another_unread_id;
+				self::$next_get = empty($another_unread_id) ?
+				                  'a' :
+				                  'c_' . $another_unread_id;
 				break;
 			}
 		}

From 1efbf6fb86dfe4ff549ce1b7884db17dfbf5554f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 20:05:00 +0200
Subject: [PATCH 098/363] Add comments to Context object.

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php |   7 ++
 app/Models/Context.php              | 135 +++++++++++++++++++---------
 2 files changed, 98 insertions(+), 44 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 80675b3a6..ed5b58b45 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -137,6 +137,13 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 *   - next (default: empty string)
 	 */
 	private function updateContext() {
+		// Update number of read / unread variables.
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		FreshRSS_Context::$total_starred = $entryDAO->countUnreadReadFavorites();
+		FreshRSS_Context::$total_unread = FreshRSS_CategoryDAO::CountUnreads(
+			FreshRSS_Context::$categories, 1
+		);
+
 		FreshRSS_Context::_get(Minz_Request::param('get', 'a'));
 
 		FreshRSS_Context::$state = Minz_Request::param(
diff --git a/app/Models/Context.php b/app/Models/Context.php
index d4aeee7ac..36c4087eb 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -34,6 +34,11 @@ class FreshRSS_Context {
 	public static $next_id = '';
 	public static $id_max = '';
 
+	/**
+	 * Initialize the context.
+	 *
+	 * Set the correct $conf and $categories variables.
+	 */
 	public static function init() {
 		// Init configuration.
 		$current_user = Minz_Session::param('currentUser');
@@ -45,19 +50,19 @@ class FreshRSS_Context {
 		}
 
 		$catDAO = new FreshRSS_CategoryDAO();
-		$entryDAO = FreshRSS_Factory::createEntryDao();
-
 		self::$categories = $catDAO->listCategories();
-
-		// Update number of read / unread variables.
-		self::$total_starred = $entryDAO->countUnreadReadFavorites();
-		self::$total_unread = FreshRSS_CategoryDAO::CountUnreads(self::$categories, 1);
 	}
 
+	/**
+	 * Returns if the current state includes $state parameter.
+	 */
 	public static function isStateEnabled($state) {
 		return self::$state & $state;
 	}
 
+	/**
+	 * Returns the current state with or without $state parameter.
+	 */
 	public static function getRevertState($state) {
 		if (self::$state & $state) {
 			return self::$state & ~$state;
@@ -66,6 +71,65 @@ class FreshRSS_Context {
 		}
 	}
 
+	/**
+	 * Return the current get as a string or an array.
+	 *
+	 * If $array is true, the first item of the returned value is 'f' or 'c' and
+	 * the second is the id.
+	 */
+	public static function currentGet($array = false) {
+		if (self::$current_get['all']) {
+			return 'a';
+		} elseif (self::$current_get['starred']) {
+			return 's';
+		} elseif (self::$current_get['feed']) {
+			if ($array) {
+				return array('f', self::$current_get['feed']);
+			} else {
+				return 'f_' . self::$current_get['feed'];
+			}
+		} elseif (self::$current_get['category']) {
+			if ($array) {
+				return array('c', self::$current_get['category']);
+			} else {
+				return 'c_' . self::$current_get['category'];
+			}
+		}
+	}
+
+	/**
+	 * Return true if $get parameter correspond to the $current_get attribute.
+	 */
+	public static function isCurrentGet($get) {
+		$type = $get[0];
+		$id = substr($get, 2);
+
+		switch($type) {
+		case 'a':
+			return self::$current_get['all'];
+		case 's':
+			return self::$current_get['starred'];
+		case 'f':
+			return self::$current_get['feed'] == $id;
+		case 'c':
+			return self::$current_get['category'] == $id;
+		default:
+			return false;
+		}
+	}
+
+	/**
+	 * Set the current $get attribute.
+	 *
+	 * Valid $get parameter are:
+	 *   - a
+	 *   - s
+	 *   - f_<feed id>
+	 *   - c_<category id>
+	 *
+	 * $name and $get_unread attributes are also updated as $next_get
+	 * Raise an exception if id or $get is invalid.
+	 */
 	public static function _get($get) {
 		$type = $get[0];
 		$id = substr($get, 2);
@@ -86,6 +150,7 @@ class FreshRSS_Context {
 			self::$state = self::$state | FreshRSS_Entry::STATE_FAVORITE;
 			break;
 		case 'f':
+			// We try to find the corresponding feed.
 			$feed = FreshRSS_CategoryDAO::findFeed(self::$categories, $id);
 			if ($feed === null) {
 				$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -102,6 +167,7 @@ class FreshRSS_Context {
 			self::$get_unread = $feed->nbNotRead();
 			break;
 		case 'c':
+			// We try to find the corresponding category.
 			self::$current_get['category'] = $id;
 			if (!isset(self::$categories[$id])) {
 				$catDAO = new FreshRSS_CategoryDAO();
@@ -124,46 +190,12 @@ class FreshRSS_Context {
 		self::_nextGet();
 	}
 
-	public static function currentGet($array = false) {
-		if (self::$current_get['all']) {
-			return 'a';
-		} elseif (self::$current_get['starred']) {
-			return 's';
-		} elseif (self::$current_get['feed']) {
-			if ($array) {
-				return array('f', self::$current_get['feed']);
-			} else {
-				return 'f_' . self::$current_get['feed'];
-			}
-		} elseif (self::$current_get['category']) {
-			if ($array) {
-				return array('c', self::$current_get['category']);
-			} else {
-				return 'c_' . self::$current_get['category'];
-			}
-		}
-	}
-
-	public static function isCurrentGet($get) {
-		$type = $get[0];
-		$id = substr($get, 2);
-
-		switch($type) {
-		case 'a':
-			return self::$current_get['all'];
-		case 's':
-			return self::$current_get['starred'];
-		case 'f':
-			return self::$current_get['feed'] == $id;
-		case 'c':
-			return self::$current_get['category'] == $id;
-		default:
-			return false;
-		}
-	}
-
+	/**
+	 * Set the value of $next_get attribute.
+	 */
 	public static function _nextGet() {
 		$get = self::currentGet();
+		// By default, $next_get == $get
 		self::$next_get = $get;
 
 		if (self::$conf->onread_jump_next && strlen($get) > 2) {
@@ -171,13 +203,18 @@ class FreshRSS_Context {
 			$found_current_get = false;
 			switch ($get[0]) {
 			case 'f':
+				// We search the next feed with at least one unread article in
+				// same category as the currend feed.
 				foreach (self::$categories as $cat) {
 					if ($cat->id() != self::$current_get['category']) {
+						// We look into the category of the current feed!
 						continue;
 					}
 
 					foreach ($cat->feeds() as $feed) {
 						if ($feed->id() == self::$current_get['feed']) {
+							// Here is our current feed! Fine, the next one will
+							// be a potential candidate.
 							$found_current_get = true;
 							continue;
 						}
@@ -185,6 +222,9 @@ class FreshRSS_Context {
 						if ($feed->nbNotRead() > 0) {
 							$another_unread_id = $feed->id();
 							if ($found_current_get) {
+								// We have found our current feed and now we
+								// have an feed with unread articles. Leave the
+								// loop!
 								break;
 							}
 						}
@@ -192,13 +232,17 @@ class FreshRSS_Context {
 					break;
 				}
 
+				// If no feed have been found, next_get is the current category.
 				self::$next_get = empty($another_unread_id) ?
 				                  'c_' . self::$current_get['category'] :
 				                  'f_' . $another_unread_id;
 				break;
 			case 'c':
+				// We search the next category with at least one unread article.
 				foreach (self::$categories as $cat) {
 					if ($cat->id() == self::$current_get['category']) {
+						// Here is our current category! Next one could be our
+						// champion if it has unread articles.
 						$found_current_get = true;
 						continue;
 					}
@@ -206,11 +250,14 @@ class FreshRSS_Context {
 					if ($cat->nbNotRead() > 0) {
 						$another_unread_id = $cat->id();
 						if ($found_current_get) {
+							// Unread articles and the current category has
+							// already been found? Leave the loop!
 							break;
 						}
 					}
 				}
 
+				// No unread category? The main stream will be our destination!
 				self::$next_get = empty($another_unread_id) ?
 				                  'a' :
 				                  'c_' . $another_unread_id;

From e37a126b9de20a11f306d29c8f3d5052eb4310dd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 23:41:36 +0200
Subject: [PATCH 099/363] Fix some parts of aside_flux

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_flux.phtml      | 37 ++++++++++++++-----
 p/themes/base-theme/base.css     | 16 +++++++++
 p/themes/base-theme/template.css | 61 ++++++++++++++++----------------
 3 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index e572e9d48..30f362348 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,4 +1,13 @@
-<div class="aside aside-flux" id="aside-flux">
+<?php
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
+
+<div class="aside aside_flux<?php echo $class; ?>" id="aside_flux">
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
@@ -14,24 +23,36 @@
 
 	<ul class="tree">
 		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _i('all'), ' ', _t('main_stream'); ?></a>
+			<div class="tree-folder-title">
+				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+			</div>
 		</li>
 
 		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _i('bookmark'), ' ', _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			<div class="tree-folder-title">
+				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			</div>
 		</li>
 
 		<?php
 			foreach ($this->categories as $cat) {
 				$feeds = $cat->feeds();
 				if (!empty($feeds)) {
+					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
+					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
+					                        FreshRSS_Context::$current_get['feed']);
 		?>
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('c_' . $cat->id()) ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _i('category'), ' ', $cat->name(); ?></a>
+		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+			</div>
 
-			<ul class="items">
-				<?php foreach ($feeds as $feed) { ?>
-				<li class="item<?php echo FreshRSS_Context::isCurrentGet('f_' . $feed->id()) ? ' active' : ''; ?>">
+			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
+				<?php
+					foreach ($feeds as $feed) {
+						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
+				?>
+				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
 					<div class="dropdown">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 3f6ae956d..3b79a0822 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -353,6 +353,22 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1.2rem;
+	font-weight: bold;
+}
+.tree-folder-items .item {
+	padding: 0 5px 0 20px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1a96f1e2f..1eb67c15d 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -325,6 +325,26 @@ a.btn {
 	cursor: grab;
 }
 
+/*=== Tree */
+.tree {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+.tree-folder-title {
+	display: block;
+}
+.tree-folder-items {
+	padding: 0;
+	list-style: none;
+}
+.tree-folder-items .item {
+	display: block;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -371,52 +391,31 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.categories {
-	list-style: none;
-	margin: 0;
-}
-.state_unread li:not(.active)[data-unread="0"] {
+.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"],
+.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
 	display: none;
 }
-.category {
-	display: block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-.category .btn:not([data-unread="0"]):after {
+.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
 
 /*=== Aside main page (feeds) */
-.categories .feeds {
-	width: 100%;
-	list-style: none;
-}
-.categories .feeds:not(.active) {
+.aside_flux .tree-folder-items:not(.active) {
 	display: none;
 }
-.categories .feeds .feed {
-	display: inline-block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	vertical-align: middle;
-}
-.categories .feeds .feed:not([data-unread="0"]):before {
+.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
-.categories .feeds .dropdown-menu {
+.aside_flux .tree-folder-items .dropdown-menu {
 	left: 0;
 }
-.categories .feeds .item .dropdown-toggle > .icon {
+.aside_flux .tree-folder-items .item .dropdown-toggle > .icon {
 	visibility: hidden;
 	cursor: pointer;
-	vertical-align: top;
 }
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
+.aside_flux .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_flux .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_flux .tree-folder-items .item.active .dropdown-toggle > .icon {
 	visibility: visible;
 }
 

From 8c1789ae060000638c563e05ee42eb9b5b1c4fe0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 09:26:00 +0200
Subject: [PATCH 100/363] Begin fixing of Origine theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Origine/origine.css | 35 ++++++++++++++++++++++-------------
 p/themes/base-theme/base.css | 16 ++++------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index b25deab0c..c46f72bf8 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -498,6 +498,22 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1.2rem;
+	font-weight: bold;
+}
+.tree-folder-items .item {
+	padding: 0 5px 0 20px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -538,28 +554,21 @@ a.btn {
 }
 .aside.aside_flux {
 	padding: 10px 0 50px;
+	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 235px;
-	margin: 10px auto;
+.aside.aside_flux .tree {
 	text-align: left;
 }
-.category .btn:first-child {
+.aside_flux .tree-folder-title {
 	position: relative;
-	width: 213px;
+	margin: 5px 0;
 }
-.category.stick .btn:first-child {
-	width: 176px;
-}
-.category .btn:first-child:not([data-unread="0"]):after {
+.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
-	padding: 1px 5px;
+	padding: 0 5px;
 	background: #ccc;
 	color: #fff;
 	border: 1px solid #bbb;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 3b79a0822..bd01a5d70 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -404,25 +404,17 @@ a.btn {
 }
 .aside.aside_flux {
 	padding: 10px 0 50px;
+	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 235px;
-	margin: 10px auto;
+.aside.aside_flux .tree {
 	text-align: left;
 }
-.category .btn:first-child {
+.aside_flux .tree-folder-title {
 	position: relative;
-	width: 213px;
 }
-.category.stick .btn:first-child {
-	width: 176px;
-}
-.category .btn:first-child:not([data-unread="0"]):after {
+.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 1px 5px;

From 8769931a68d0dddb134674c86a43dec75b39bf83 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 09:32:02 +0200
Subject: [PATCH 101/363] Rename aside_flux in aside_feed.

---
 .../{aside_flux.phtml => aside_feed.phtml}    |  2 +-
 app/layout/nav_menu.phtml                     |  2 +-
 app/views/index/normal.phtml                  |  2 +-
 p/scripts/main.js                             | 26 +++++++++----------
 p/themes/Origine/origine.css                  |  8 +++---
 p/themes/base-theme/base.css                  |  8 +++---
 p/themes/base-theme/template.css              | 22 ++++++++--------
 7 files changed, 35 insertions(+), 35 deletions(-)
 rename app/layout/{aside_flux.phtml => aside_feed.phtml} (98%)

diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_feed.phtml
similarity index 98%
rename from app/layout/aside_flux.phtml
rename to app/layout/aside_feed.phtml
index 30f362348..66b7b51af 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_feed.phtml
@@ -7,7 +7,7 @@
 	}
 ?>
 
-<div class="aside aside_flux<?php echo $class; ?>" id="aside_flux">
+<div class="aside aside_feed<?php echo $class; ?>" id="aside_feed">
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 2c9f8724d..6f555c3d0 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -2,7 +2,7 @@
 
 <div class="nav_menu">
 	<?php if ($actual_view === 'normal') { ?>
-	<a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
+	<a class="btn toggle_aside" href="#aside_feed"><?php echo _i('category'); ?></a>
 	<?php } ?>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 36adef2f2..02d621bd0 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -1,6 +1,6 @@
 <?php
 
-$this->partial('aside_flux');
+$this->partial('aside_feed');
 $this->partial('nav_menu');
 
 if (!empty($this->entries)) {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 1e13ff16a..f4b3898db 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -80,7 +80,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 	//Update unread: all
 	if (feed_priority > 0) {
-		elem = $('#aside_flux .all').children(':first').get(0);
+		elem = $('#aside_feed .all').children(':first').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -89,7 +89,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 	//Update unread: favourites
 	if (article && article.closest('div').hasClass('favorite')) {
-		elem = $('#aside_flux .favorites').children(':first').get(0);
+		elem = $('#aside_feed .favorites').children(':first').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -202,7 +202,7 @@ function mark_favorite(active) {
 		}
 
 		if (active.closest('div').hasClass('not_read')) {
-			var elem = $('#aside_flux .favorites').children(':first').get(0),
+			var elem = $('#aside_feed .favorites').children(':first').get(0),
 				feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			if (elem) {
 				elem.setAttribute('data-unread', numberFormat(feed_unreads + inc));
@@ -292,7 +292,7 @@ function next_entry() {
 }
 
 function prev_feed() {
-	var active_feed = $("#aside_flux .feeds li.active");
+	var active_feed = $("#aside_feed .feeds li.active");
 	if (active_feed.length > 0) {
 		active_feed.prevAll(':visible:first').find('a.feed').each(function(){this.click();});
 	} else {
@@ -301,7 +301,7 @@ function prev_feed() {
 }
 
 function next_feed() {
-	var active_feed = $("#aside_flux .feeds li.active");
+	var active_feed = $("#aside_feed .feeds li.active");
 	if (active_feed.length > 0) {
 		active_feed.nextAll(':visible:first').find('a.feed').each(function(){this.click();});
 	} else {
@@ -310,21 +310,21 @@ function next_feed() {
 }
 
 function first_feed() {
-	var feed = $("#aside_flux .feeds.active li:visible:first");
+	var feed = $("#aside_feed .feeds.active li:visible:first");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function last_feed() {
-	var feed = $("#aside_flux .feeds.active li:visible:last");
+	var feed = $("#aside_feed .feeds.active li:visible:last");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function prev_category() {
-	var active_cat = $("#aside_flux .category.stick.active");
+	var active_cat = $("#aside_feed .category.stick.active");
 
 	if (active_cat.length > 0) {
 		var prev_cat = active_cat.parent('li').prevAll(':visible:first').find('.category.stick a.btn');
@@ -338,7 +338,7 @@ function prev_category() {
 }
 
 function next_category() {
-	var active_cat = $("#aside_flux .category.stick.active");
+	var active_cat = $("#aside_feed .category.stick.active");
 
 	if (active_cat.length > 0) {
 		var next_cat = active_cat.parent('li').nextAll(':visible:first').find('.category.stick a.btn');
@@ -352,14 +352,14 @@ function next_category() {
 }
 
 function first_category() {
-	var cat = $("#aside_flux .category.stick:visible:first");
+	var cat = $("#aside_feed .category.stick:visible:first");
 	if (cat.length > 0) {
 		cat.find('a.btn')[0].click();
 	}
 }
 
 function last_category() {
-	var cat = $("#aside_flux .category.stick:visible:last");
+	var cat = $("#aside_feed .category.stick:visible:last");
 	if (cat.length > 0) {
 		cat.find('a.btn')[0].click();
 	}
@@ -487,7 +487,7 @@ function init_column_categories() {
 	if (context['current_view'] !== 'normal') {
 		return;
 	}
-	$('#aside_flux').on('click', '.category>a.dropdown-toggle', function () {
+	$('#aside_feed').on('click', '.category>a.dropdown-toggle', function () {
 		$(this).children().each(function() {
 			if (this.alt === '▽') {
 				this.src = this.src.replace('/icons/down.', '/icons/up.');
@@ -500,7 +500,7 @@ function init_column_categories() {
 		$(this).parent().next(".feeds").slideToggle();
 		return false;
 	});
-	$('#aside_flux').on('click', '.feeds .dropdown-toggle', function () {
+	$('#aside_feed').on('click', '.feeds .dropdown-toggle', function () {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
 			var feed_id = $(this).closest('li').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index c46f72bf8..e6d50c2e9 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -552,20 +552,20 @@ a.btn {
 	border-right: 1px solid #aaa;
 	background: #fff;
 }
-.aside.aside_flux {
+.aside.aside_feed {
 	padding: 10px 0 50px;
 	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.aside.aside_flux .tree {
+.aside.aside_feed .tree {
 	text-align: left;
 }
-.aside_flux .tree-folder-title {
+.aside_feed .tree-folder-title {
 	position: relative;
 	margin: 5px 0;
 }
-.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 0 5px;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index bd01a5d70..0b0a04c9a 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -402,19 +402,19 @@ a.btn {
 }
 .aside {
 }
-.aside.aside_flux {
+.aside.aside_feed {
 	padding: 10px 0 50px;
 	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.aside.aside_flux .tree {
+.aside.aside_feed .tree {
 	text-align: left;
 }
-.aside_flux .tree-folder-title {
+.aside_feed .tree-folder-title {
 	position: relative;
 }
-.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 1px 5px;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1eb67c15d..40ff8140a 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -386,36 +386,36 @@ a.btn {
 	width: 250px;
 	vertical-align: top;
 }
-.aside.aside_flux {
+.aside.aside_feed {
 	background: #fff;
 }
 
 /*=== Aside main page (categories) */
-.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
+.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
 	display: none;
 }
-.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
 
 /*=== Aside main page (feeds) */
-.aside_flux .tree-folder-items:not(.active) {
+.aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before {
+.aside_feed .tree-folder-items .item > a:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
-.aside_flux .tree-folder-items .dropdown-menu {
+.aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
-.aside_flux .tree-folder-items .item .dropdown-toggle > .icon {
+.aside_feed .tree-folder-items .item .dropdown-toggle > .icon {
 	visibility: hidden;
 	cursor: pointer;
 }
-.aside_flux .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.aside_flux .tree-folder-items .item:hover .dropdown-toggle > .icon,
-.aside_flux .tree-folder-items .item.active .dropdown-toggle > .icon {
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	visibility: visible;
 }
 

From 4204336bd67f8692bfdd964b0fddb8babb03b6ac Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 10:44:45 +0200
Subject: [PATCH 102/363] Begin to fix JS for new aside

---
 app/layout/aside_feed.phtml      | 15 ++++----
 p/scripts/main.js                | 63 ++++++++++++++++----------------
 p/themes/Origine/origine.css     |  2 +-
 p/themes/base-theme/template.css |  2 +-
 4 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 66b7b51af..d7b12426b 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -22,15 +22,15 @@
 	<form id="mark-read-aside" method="post" style="display: none"></form>
 
 	<ul class="tree">
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+		<li class="tree-folder all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
 			</div>
 		</li>
 
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+		<li class="tree-folder favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
 			</div>
 		</li>
 
@@ -44,7 +44,8 @@
 		?>
 		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+				<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
+				<a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
 			</div>
 
 			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
@@ -52,14 +53,14 @@
 					foreach ($feeds as $feed) {
 						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
 				?>
-				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
+				<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
 					<div class="dropdown">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
 					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f4b3898db..24c0972fc 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -56,31 +56,31 @@ function incLabel(p, inc, spaceAfter) {
 
 function incUnreadsFeed(article, feed_id, nb) {
 	//Update unread: feed
-	var elem = $('#' + feed_id + '>.feed').get(0),
+	var elem = $('#' + feed_id).get(0),
 		feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0,
 		feed_priority = elem ? str2int(elem.getAttribute('data-priority')) : 0;
 	if (elem) {
-		elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
-		elem = $(elem).closest('li').get(0);
+		elem.setAttribute('data-unread', feed_unreads + nb);
+		elem = $(elem).children('a').get(0);
 		if (elem) {
-			elem.setAttribute('data-unread', feed_unreads + nb);
+			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
 		}
 	}
 
 	//Update unread: category
-	elem = $('#' + feed_id).parent().prevAll('.category').children(':first').get(0);
+	elem = $('#' + feed_id).parents('.tree-folder').get(0);
 	feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 	if (elem) {
-		elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
-		elem = $(elem).closest('li').get(0);
+		elem.setAttribute('data-unread', feed_unreads + nb);
+		elem = $(elem).find('.tree-folder-title .title').get(0);
 		if (elem) {
-			elem.setAttribute('data-unread', feed_unreads + nb);
+			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
 		}
 	}
 
 	//Update unread: all
 	if (feed_priority > 0) {
-		elem = $('#aside_feed .all').children(':first').get(0);
+		elem = $('#aside_feed .all .tree-folder-title .title').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -89,7 +89,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 	//Update unread: favourites
 	if (article && article.closest('div').hasClass('favorite')) {
-		elem = $('#aside_feed .favorites').children(':first').get(0);
+		elem = $('#aside_feed .favorites .tree-folder-title .title').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -97,7 +97,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 	}
 
 	var isCurrentView = false;
-	//Update unread: title
+	// Update unread: title
 	document.title = document.title.replace(/^((?:\([ 0-9]+\) )?)/, function (m, p1) {
 		var $feed = $('#' + feed_id);
 		if (article || ($feed.closest('.active').length > 0 && $feed.siblings('.active').length === 0)) {
@@ -194,7 +194,7 @@ function mark_favorite(active) {
 		}
 		$b.find('.icon').replaceWith(data.icon);
 
-		var favourites = $('.favorites>a').contents().last().get(0);
+		var favourites = $('#aside_feed .favorites .tree-folder-title .title').contents().last().get(0);
 		if (favourites && favourites.textContent) {
 			favourites.textContent = favourites.textContent.replace(/((?: \([ 0-9]+\))?\s*)$/, function (m, p1) {
 				return incLabel(p1, inc, false);
@@ -202,7 +202,7 @@ function mark_favorite(active) {
 		}
 
 		if (active.closest('div').hasClass('not_read')) {
-			var elem = $('#aside_feed .favorites').children(':first').get(0),
+			var elem = $('#aside_feed .favorites .tree-folder-title .title').get(0),
 				feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			if (elem) {
 				elem.setAttribute('data-unread', numberFormat(feed_unreads + inc));
@@ -292,42 +292,42 @@ function next_entry() {
 }
 
 function prev_feed() {
-	var active_feed = $("#aside_feed .feeds li.active");
+	var active_feed = $("#aside_feed .tree-folder-items .item.active");
 	if (active_feed.length > 0) {
-		active_feed.prevAll(':visible:first').find('a.feed').each(function(){this.click();});
+		active_feed.prevAll(':visible:first').find('a').each(function(){this.click();});
 	} else {
 		last_feed();
 	}
 }
 
 function next_feed() {
-	var active_feed = $("#aside_feed .feeds li.active");
+	var active_feed = $("#aside_feed .tree-folder-items .item.active");
 	if (active_feed.length > 0) {
-		active_feed.nextAll(':visible:first').find('a.feed').each(function(){this.click();});
+		active_feed.nextAll(':visible:first').find('a').each(function(){this.click();});
 	} else {
 		first_feed();
 	}
 }
 
 function first_feed() {
-	var feed = $("#aside_feed .feeds.active li:visible:first");
+	var feed = $("#aside_feed .tree-folder-items.active .item:visible:first");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function last_feed() {
-	var feed = $("#aside_feed .feeds.active li:visible:last");
+	var feed = $("#aside_feed .tree-folder-items.active .item:visible:last");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function prev_category() {
-	var active_cat = $("#aside_feed .category.stick.active");
+	var active_cat = $("#aside_feed .tree-folder.active");
 
 	if (active_cat.length > 0) {
-		var prev_cat = active_cat.parent('li').prevAll(':visible:first').find('.category.stick a.btn');
+		var prev_cat = active_cat.prevAll(':visible:first').find('.tree-folder-title .title');
 		if (prev_cat.length > 0) {
 			prev_cat[0].click();
 		}
@@ -338,10 +338,10 @@ function prev_category() {
 }
 
 function next_category() {
-	var active_cat = $("#aside_feed .category.stick.active");
+	var active_cat = $("#aside_feed .tree-folder.active");
 
 	if (active_cat.length > 0) {
-		var next_cat = active_cat.parent('li').nextAll(':visible:first').find('.category.stick a.btn');
+		var next_cat = active_cat.nextAll(':visible:first').find('.tree-folder-title .title');
 		if (next_cat.length > 0) {
 			next_cat[0].click();
 		}
@@ -352,16 +352,16 @@ function next_category() {
 }
 
 function first_category() {
-	var cat = $("#aside_feed .category.stick:visible:first");
+	var cat = $("#aside_feed .tree-folder:visible:first");
 	if (cat.length > 0) {
-		cat.find('a.btn')[0].click();
+		cat.find('.tree-folder-title .title')[0].click();
 	}
 }
 
 function last_category() {
-	var cat = $("#aside_feed .category.stick:visible:last");
+	var cat = $("#aside_feed .tree-folder:visible:last");
 	if (cat.length > 0) {
-		cat.find('a.btn')[0].click();
+		cat.find('.tree-folder-title .title')[0].click();
 	}
 }
 
@@ -487,7 +487,8 @@ function init_column_categories() {
 	if (context['current_view'] !== 'normal') {
 		return;
 	}
-	$('#aside_feed').on('click', '.category>a.dropdown-toggle', function () {
+
+	$('#aside_feed').on('click', '.tree-folder>.tree-folder-title>a.dropdown-toggle', function () {
 		$(this).children().each(function() {
 			if (this.alt === '▽') {
 				this.src = this.src.replace('/icons/down.', '/icons/up.');
@@ -497,12 +498,12 @@ function init_column_categories() {
 				this.alt = '▽';
 			}
 		});
-		$(this).parent().next(".feeds").slideToggle();
+		$(this).parent().next(".tree-folder-items").slideToggle();
 		return false;
 	});
-	$('#aside_feed').on('click', '.feeds .dropdown-toggle', function () {
+	$('#aside_feed').on('click', '.tree-folder-items .item .dropdown-toggle', function () {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
-			var feed_id = $(this).closest('li').attr('id').substr(2),
+			var feed_id = $(this).closest('.item').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
 				template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web);
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index e6d50c2e9..64bec06a2 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -565,7 +565,7 @@ a.btn {
 	position: relative;
 	margin: 5px 0;
 }
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 0 5px;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 40ff8140a..fb02a5b53 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -395,7 +395,7 @@ a.btn {
 .aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
 	display: none;
 }
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
 

From 4708eb7daf5dc743d1c548e4a26e229dc4f6c7dc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 11:17:05 +0200
Subject: [PATCH 103/363] Fix Origine theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Origine/origine.css | 59 +++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 64bec06a2..0a317695b 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -508,8 +508,13 @@ a.btn {
 	font-size: 1.2rem;
 	font-weight: bold;
 }
+.tree-folder-items {
+	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	background: #f6f6f6;
+}
 .tree-folder-items .item {
-	padding: 0 5px 0 20px;
+	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
@@ -563,58 +568,58 @@ a.btn {
 }
 .aside_feed .tree-folder-title {
 	position: relative;
-	margin: 5px 0;
+}
+.aside_feed .tree-folder-title .title {
+	color: #444;
+}
+.aside_feed .tree-folder-title .title:hover {
+	text-decoration: none;
 }
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
-	padding: 0 5px;
-	background: #ccc;
-	color: #fff;
-	border: 1px solid #bbb;
-	border-radius: 5px;
-	box-shadow: 1px 3px 3px #aaa inset;
-	text-shadow: 0 0 1px #aaa;
+	right: 0;
+	padding: 0 10px;
+	font-size: 1rem;
+}
+.aside_feed .tree-folder.active .tree-folder-title {
+	background: #e6e6e6;
 }
 
 /*=== Aside main page (feeds) */
-.categories .feeds .item.active {
+.aside_feed .tree-folder-items .item.active {
 	background: #0062BE;
 }
-.categories .feeds .item.empty.active {
+.aside_feed .tree-folder-items .item.empty.active {
 	background: #e67e22;
 }
-.categories .feeds .item.error.active {
+.aside_feed .tree-folder-items .item.error.active {
 	background: #BD362F;
 }
-.categories .feeds .item.empty .feed {
+.aside_feed .tree-folder-items .item.empty > a {
 	color: #e67e22;
 }
-.categories .feeds .item.error .feed {
+.aside_feed .tree-folder-items .item.error > a {
 	color: #BD362F;
 }
-.categories .feeds .item.active .feed,
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
+.aside_feed .tree-folder-items .item.active > a,
+.aside_feed .tree-folder-items .item.empty.active > a,
+.aside_feed .tree-folder-items .item.error.active > a {
 	color: #fff;
 }
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
+.aside_feed .tree-folder-items .item > a {
 	line-height: 3em;
-	font-size: 0.8em;
 	text-align: left;
 	text-decoration: none;
 }
-.categories .feeds .feed:not([data-unread="0"]) {
+.aside_feed .tree-folder-items .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
-.categories .feeds .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	background-color: #fff;
 	border-radius: 3px;
 	vertical-align: middle;

From 6dc1267b9832272abd466579053c2bcdedcb5ecb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 12:33:22 +0200
Subject: [PATCH 104/363] Fix Origine theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_subscription.phtml |  2 +-
 p/themes/Origine/origine.css        |  8 ++++----
 p/themes/base-theme/template.css    | 24 ++++++++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index 9a95763c3..cbf5df67d 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -1,4 +1,4 @@
-<ul class="nav nav-list aside aside_feed">
+<ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 0a317695b..d01bed963 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -505,7 +505,7 @@ a.btn {
 .tree-folder-title {
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1.2rem;
+	font-size: 1rem;
 	font-weight: bold;
 }
 .tree-folder-items {
@@ -513,7 +513,7 @@ a.btn {
 	border-bottom: 1px solid #ccc;
 	background: #f6f6f6;
 }
-.tree-folder-items .item {
+.tree-folder-items > .item {
 	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
@@ -606,12 +606,12 @@ a.btn {
 .aside_feed .tree-folder-items .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .item > a {
+.aside_feed .tree-folder-items > .item > a {
 	line-height: 3em;
 	text-align: left;
 	text-decoration: none;
 }
-.aside_feed .tree-folder-items .item:not([data-unread="0"]) {
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index fb02a5b53..bcafd162c 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -331,19 +331,31 @@ a.btn {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-title {
-	display: block;
-}
 .tree-folder-items {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-items .item {
+.tree-folder-title {
 	display: block;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
+.tree-folder-title .title {
+	vertical-align: middle;
+}
+.tree-folder-items > .item {
+	display: block;
+	white-space: nowrap;
+}
+.tree-folder-items > .item > a {
+	display: inline-block;
+	vertical-align: middle;
+	width: calc(100% - 32px);
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -392,7 +404,7 @@ a.btn {
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] {
 	display: none;
 }
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
@@ -403,7 +415,7 @@ a.btn {
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_feed .tree-folder-items .item > a:not([data-unread="0"]):before {
+.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
 .aside_feed .tree-folder-items .dropdown-menu {

From ef64003481320254f64cd3ff2ecc6ac2b9a1696d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 12:40:03 +0200
Subject: [PATCH 105/363] Better tree-folder-title:hover (Origine)

---
 p/themes/Origine/origine.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index d01bed963..5ed40f20a 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -582,7 +582,10 @@ a.btn {
 	font-size: 1rem;
 }
 .aside_feed .tree-folder.active .tree-folder-title {
-	background: #e6e6e6;
+	background: #f0f0f0;
+}
+.aside_feed .tree-folder.active .tree-folder-title .title {
+	color: #0062BE;
 }
 
 /*=== Aside main page (feeds) */

From 132235fc4bdb238e7926e4df456b4fab661e76c2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 13:04:12 +0200
Subject: [PATCH 106/363] Fix nb unread in aside_feed (Origine)

---
 p/themes/Origine/origine.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 5ed40f20a..004d31f0f 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -568,8 +568,10 @@ a.btn {
 }
 .aside_feed .tree-folder-title {
 	position: relative;
+	background: #fff;
 }
 .aside_feed .tree-folder-title .title {
+	background: inherit;
 	color: #444;
 }
 .aside_feed .tree-folder-title .title:hover {
@@ -578,8 +580,12 @@ a.btn {
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	right: 0;
+	margin: 10px 0;
 	padding: 0 10px;
-	font-size: 1rem;
+	font-size: 0.9rem;
+	line-height: 1.5rem;
+	background: inherit;
+	border-left: 1px solid #aaa;
 }
 .aside_feed .tree-folder.active .tree-folder-title {
 	background: #f0f0f0;

From cb730c373480ba415997696f4c0cbda4cca9d97e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 13:33:48 +0200
Subject: [PATCH 107/363] Last fix for Origine (I hope!)

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_feed.phtml      |  5 +--
 p/themes/Origine/origine.css     | 73 ++++++++++++++++----------------
 p/themes/base-theme/template.css | 11 +----
 3 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index d7b12426b..47b63f187 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -54,13 +54,12 @@
 						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
 				?>
 				<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
-					<div class="dropdown">
+					<div class="dropdown no-mobile">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 004d31f0f..7292379c0 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -503,11 +503,26 @@ a.btn {
 	margin: 10px 0;
 }
 .tree-folder-title {
+	position: relative;
 	padding: 0 10px;
+	background: #fff;
 	line-height: 2.5rem;
 	font-size: 1rem;
 	font-weight: bold;
 }
+.tree-folder-title .title {
+	background: inherit;
+	color: #444;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	background: #f0f0f0;
+}
+.tree-folder.active .tree-folder-title .title {
+	color: #0062BE;
+}
 .tree-folder-items {
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #ccc;
@@ -518,6 +533,15 @@ a.btn {
 	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
+.tree-folder-items > .item.active {
+	background: #0062be;
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+	color: #fff;
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -561,22 +585,12 @@ a.btn {
 	padding: 10px 0 50px;
 	text-align: center;
 }
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+}
 
 /*=== Aside main page (categories) */
-.aside.aside_feed .tree {
-	text-align: left;
-}
-.aside_feed .tree-folder-title {
-	position: relative;
-	background: #fff;
-}
-.aside_feed .tree-folder-title .title {
-	background: inherit;
-	color: #444;
-}
-.aside_feed .tree-folder-title .title:hover {
-	text-decoration: none;
-}
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	right: 0;
@@ -587,39 +601,24 @@ a.btn {
 	background: inherit;
 	border-left: 1px solid #aaa;
 }
-.aside_feed .tree-folder.active .tree-folder-title {
-	background: #f0f0f0;
-}
-.aside_feed .tree-folder.active .tree-folder-title .title {
-	color: #0062BE;
-}
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items .item.active {
-	background: #0062BE;
-}
-.aside_feed .tree-folder-items .item.empty.active {
+.aside_feed .tree-folder-items > .item.empty.active {
 	background: #e67e22;
 }
-.aside_feed .tree-folder-items .item.error.active {
-	background: #BD362F;
+.aside_feed .tree-folder-items > .item.error.active {
+	background: #bd362f;
 }
-.aside_feed .tree-folder-items .item.empty > a {
+.aside_feed .tree-folder-items > .item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items .item.error > a {
-	color: #BD362F;
+.aside_feed .tree-folder-items > .item.error > a {
+	color: #bd362f;
 }
-.aside_feed .tree-folder-items .item.active > a,
-.aside_feed .tree-folder-items .item.empty.active > a,
-.aside_feed .tree-folder-items .item.error.active > a {
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item > a {
-	line-height: 3em;
-	text-align: left;
-	text-decoration: none;
-}
 .aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index bcafd162c..5a07426ea 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -330,6 +330,7 @@ a.btn {
 	margin: 0;
 	padding: 0;
 	list-style: none;
+	text-align: left;
 }
 .tree-folder-items {
 	padding: 0;
@@ -351,7 +352,7 @@ a.btn {
 .tree-folder-items > .item > a {
 	display: inline-block;
 	vertical-align: middle;
-	width: calc(100% - 32px);
+	width: calc(100% - 16px);
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -717,7 +718,6 @@ br + br + br {
 @media(max-width: 840px) {
 	.header,
 	.aside .btn-important,
-	.aside .feeds .dropdown,
 	.flux_header .item.website span,
 	.item.date, .day .date,
 	.dropdown-menu > .no-mobile,
@@ -746,9 +746,6 @@ br + br + br {
 		width: 90%;
 		overflow: auto;
 	}
-	.aside .categories {
-		margin: 10px 0 75px;
-	}
 
 	.flux_header .item.website {
 		width: 40px;
@@ -770,10 +767,6 @@ br + br + br {
 		width: 100%;
 	}
 
-	#stream.global .box-category {
-		margin: 10px 0;
-	}
-
 	#panel {
 		top: 0; bottom: 0;
 		left: 0; right: 0;

From 45dbe94890e507402d043dee8e176081b8a290e1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 13:54:18 +0200
Subject: [PATCH 108/363] Fix aside on mobile (Origine)

---
 app/layout/aside_feed.phtml      |  2 +-
 p/themes/Origine/origine.css     | 19 +++++++++++--------
 p/themes/base-theme/template.css | 12 ++----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 47b63f187..1480173b2 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -11,7 +11,7 @@
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
-	<div class="stick configure-feeds">
+	<div class="stick configure-feeds no-mobile">
 		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
 		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
 	</div>
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7292379c0..7f60a1ec5 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -582,7 +582,7 @@ a.btn {
 	background: #fff;
 }
 .aside.aside_feed {
-	padding: 10px 0 50px;
+	padding: 10px 0;
 	text-align: center;
 }
 .aside.aside_feed .tree {
@@ -1030,17 +1030,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #f6f6f6;
-		border-left: 1px solid #ddd;
 		border-bottom: 1px solid #ddd;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 5a07426ea..b4cfec952 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -699,19 +699,11 @@ br + br + br {
 /*===========*/
 .nav-login,
 .nav_menu .search,
+.aside .toggle_aside,
 .nav_menu .toggle_aside {
 	display: none;
 }
 
-.aside .toggle_aside {
-	position: absolute;
-	right: 0;
-	display: none;
-	width: 30px;
-	height: 30px;
-	line-height: 30px;
-	text-align: center;
-}
 
 /*=== MOBILE */
 /*===========*/
@@ -724,11 +716,11 @@ br + br + br {
 	.no-mobile {
 		display: none;
 	}
+	.aside .toggle_aside,
 	.nav-login {
 		display: block;
 	}
 	.nav_menu .toggle_aside,
-	.aside .toggle_aside,
 	.nav_menu .search,
 	#panel .close img {
 		display: inline-block;

From 0c8b55fc1317cff28de1f270ada0a75b4de074ac Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 10:07:53 +0200
Subject: [PATCH 109/363] First iteration to update all the themes

See See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_feed.phtml          |  2 +-
 p/themes/Dark/dark.css               | 97 ++++++++++++++++++++++++----
 p/themes/Flat/flat.css               | 95 ++++++++++++++++++++++++---
 p/themes/Origine/origine.css         |  2 +
 p/themes/Pafat/pafat.css             | 95 ++++++++++++++++++++++++---
 p/themes/Screwdriver/screwdriver.css | 94 ++++++++++++++++++++++++---
 p/themes/base-theme/base.css         | 90 +++++++++++++++-----------
 p/themes/base-theme/template.css     |  5 +-
 8 files changed, 400 insertions(+), 80 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 1480173b2..12beba3a1 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -59,7 +59,7 @@
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?></a>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index f3790614e..d00fdcbd3 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -464,6 +464,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -500,10 +536,46 @@ a.btn {
 	border-right: 1px solid #333;
 	background: #1c1c1c;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	border-right: 1px solid #333;
-	background: #1c1c1c;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -963,17 +1035,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #111;
-		border-left: 1px solid #333;
 		border-bottom: 1px solid #333;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index e2151b1f9..a1129771a 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -473,6 +473,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -508,9 +544,46 @@ a.btn {
 .aside {
 	background: #ecf0f1;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	background: #ecf0f1;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -961,15 +1034,19 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 32px;
-		height: 32px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #34495e;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7f60a1ec5..b4465a717 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -584,10 +584,12 @@ a.btn {
 .aside.aside_feed {
 	padding: 10px 0;
 	text-align: center;
+	background: #fff;
 }
 .aside.aside_feed .tree {
 	position: sticky;
 	top: 0;
+	margin: 10px 0 50px;
 }
 
 /*=== Aside main page (categories) */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 28b17e15f..ed19aa5db 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -520,6 +520,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -572,8 +608,46 @@ a.btn {
 	border-right: 1px solid #aaa;
 	background: #fff;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -1056,17 +1130,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
 		text-align: center;
 		background: #f6f6f6;
-		border-left: 1px solid #ddd;
 		border-bottom: 1px solid #ddd;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 6206504d1..94a1bccdd 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -531,6 +531,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -578,9 +614,46 @@ a.btn {
 	background: #222;
 	width: 235px;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	background: #222;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -1135,12 +1208,10 @@ opacity: 1;
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
 		text-align: center;
 		background: #171717;
 		box-shadow: 0 1px rgba(255,255,255,0.08);
@@ -1151,6 +1222,13 @@ opacity: 1;
 		margin: 20px 0 0;
 	}
 
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 0b0a04c9a..968716073 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -358,16 +358,36 @@ a.btn {
 	margin: 10px 0;
 }
 .tree-folder-title {
+	position: relative;
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1.2rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
 	font-weight: bold;
 }
-.tree-folder-items .item {
-	padding: 0 5px 0 20px;
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -403,55 +423,44 @@ a.btn {
 .aside {
 }
 .aside.aside_feed {
-	padding: 10px 0 50px;
+	padding: 10px 0;
 	text-align: center;
 }
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
 
 /*=== Aside main page (categories) */
-.aside.aside_feed .tree {
-	text-align: left;
-}
-.aside_feed .tree-folder-title {
-	position: relative;
-}
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 1px 5px;
 }
 
 /*=== Aside main page (feeds) */
-.categories .feeds .item.active {
+.aside_feed .tree-folder-items > .item.empty.active {
 }
-.categories .feeds .item.empty.active {
+.aside_feed .tree-folder-items > .item.error.active {
 }
-.categories .feeds .item.error.active {
+.aside_feed .tree-folder-items > .item.empty > a {
 }
-.categories .feeds .item.empty .feed {
+.aside_feed .tree-folder-items > .item.error > a {
 }
-.categories .feeds .item.error .feed {
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
 }
-.categories .feeds .item.active .feed,
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
-}
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
-.categories .feeds .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
 	vertical-align: middle;
 }
 
@@ -758,15 +767,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 	}
 
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index b4cfec952..86e06f5ea 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -352,7 +352,7 @@ a.btn {
 .tree-folder-items > .item > a {
 	display: inline-block;
 	vertical-align: middle;
-	width: calc(100% - 16px);
+	width: calc(100% - 32px);
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -399,9 +399,6 @@ a.btn {
 	width: 250px;
 	vertical-align: top;
 }
-.aside.aside_feed {
-	background: #fff;
-}
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],

From 958503251f7bb53799fb1665ddfac08f043dfff5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 10:23:16 +0200
Subject: [PATCH 110/363] Fix Dark theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Dark/dark.css       | 100 +++++++++--------------------------
 p/themes/base-theme/base.css |   7 ++-
 2 files changed, 29 insertions(+), 78 deletions(-)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index d00fdcbd3..2b853a45c 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -473,19 +473,23 @@ a.btn {
 	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 1rem;
+	background: #1c1c1c;
+	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
+	color: #888;
 }
 .tree-folder-title .title:hover {
 	text-decoration: none;
 }
 .tree-folder.active .tree-folder-title {
-	font-weight: bold;
-}
-.tree-folder.active .tree-folder-title .title {
+	background: #2c2c2c;
 }
 .tree-folder-items {
+	border-top: 1px solid #222;
+	border-bottom: 1px solid #222;
+	background: #161616;
 }
 .tree-folder-items > .item {
 	padding: 0 10px;
@@ -493,11 +497,13 @@ a.btn {
 	font-size: 0.8rem;
 }
 .tree-folder-items > .item.active {
+	background: #1c1c1c;
 }
 .tree-folder-items > .item > a {
 	text-decoration: none;
 }
 .tree-folder-items > .item.active > a {
+	color: #888;
 }
 
 /*=== STRUCTURE */
@@ -549,21 +555,33 @@ a.btn {
 /*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
+	right: 0;
+	margin: 10px 0;
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 1.5rem;
+	background: inherit;
+	border-left: 1px solid #666;
 }
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
+	background: #c95;
 }
 .aside_feed .tree-folder-items > .item.error.active {
+	background: #a44;
 }
 .aside_feed .tree-folder-items > .item.empty > a {
+	color: #c95;
 }
 .aside_feed .tree-folder-items > .item.error > a {
+	color: #a44;
+}
+.aside_feed .tree-folder-items > .item.empty.active > a {
+	color: #111;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
 .aside_feed .tree-folder-items > .item.error.active > a {
+	color: #fff;
 }
 .aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
@@ -576,77 +594,7 @@ a.btn {
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
 	vertical-align: middle;
-}
-
-/*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 235px;
-	margin: 10px auto;
-	text-align: left;
-}
-.category .btn:first-child {
-	position: relative;
-	width: 213px;
-}
-.category.stick .btn:first-child {
-	width: 176px;
-}
-.category .btn:first-child:not([data-unread="0"]):after {
-	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
-	background: #111;
-	color: #888;
-	border: 1px solid #000;
-	border-radius: 5px;
-}
-
-/*=== Aside main page (feeds) */
-.categories .feeds .item.active {
-	background: #333;
-}
-.categories .feeds .item.active .feed {
-	color: #888;
-}
-.categories .feeds .item.empty .feed {
-	color: #c95;
-}
-.categories .feeds .item.empty.active {
-	background: #c95;
-}
-.categories .feeds .item.error .feed {
-	color: #a44;
-}
-.categories .feeds .item.error.active {
-	background: #a44;
-}
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
-	color: #fff;
-}
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
-	font-weight: bold;
-}
-.categories .feeds .dropdown-menu:after {
-	left: 2px;
-}
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
-	vertical-align: middle;
 	background-color: #111;
-	border-radius: 3px;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 968716073..4de5fa98a 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -435,8 +435,11 @@ a.btn {
 /*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
+	right: 0;
+	margin: 10px 0;
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 1.5rem;
 }
 
 /*=== Aside main page (feeds) */

From b9b2bfe6cbc2232ad9904715258eba61485db407 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 10:38:18 +0200
Subject: [PATCH 111/363] Fix Flat theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Flat/flat.css | 97 +++++++++---------------------------------
 1 file changed, 21 insertions(+), 76 deletions(-)

diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index a1129771a..c594811f2 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -480,21 +480,23 @@ a.btn {
 .tree-folder-title {
 	position: relative;
 	padding: 0 10px;
+	background: #34495e;
 	line-height: 2.5rem;
 	font-size: 1rem;
+	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
+	color: #fff;
 }
 .tree-folder-title .title:hover {
 	text-decoration: none;
 }
 .tree-folder.active .tree-folder-title {
-	font-weight: bold;
-}
-.tree-folder.active .tree-folder-title .title {
+	background: #2980b9;
 }
 .tree-folder-items {
+	background: #2c3e50;
 }
 .tree-folder-items > .item {
 	padding: 0 10px;
@@ -502,11 +504,11 @@ a.btn {
 	font-size: 0.8rem;
 }
 .tree-folder-items > .item.active {
+	background: #2980b9;
 }
 .tree-folder-items > .item > a {
 	text-decoration: none;
-}
-.tree-folder-items > .item.active > a {
+	color: #fff;
 }
 
 /*=== STRUCTURE */
@@ -547,6 +549,8 @@ a.btn {
 .aside.aside_feed {
 	padding: 10px 0;
 	text-align: center;
+	background: #34495e;
+	border-radius: 0 10px 0 0;
 }
 .aside.aside_feed .tree {
 	position: sticky;
@@ -557,21 +561,30 @@ a.btn {
 /*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
+	right: 0;
+	margin: 10px 0;
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 1.5rem;
+	background: inherit;
 }
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
+	background: #f39c12;
 }
 .aside_feed .tree-folder-items > .item.error.active {
+	background: #bd362f;
 }
 .aside_feed .tree-folder-items > .item.empty > a {
+	color: #e67e22;
 }
 .aside_feed .tree-folder-items > .item.error > a {
+	color: #bd362f;
 }
 .aside_feed .tree-folder-items > .item.empty.active > a,
 .aside_feed .tree-folder-items > .item.error.active > a {
+	color: #fff;
 }
 .aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
@@ -586,74 +599,6 @@ a.btn {
 	vertical-align: middle;
 }
 
-/*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 233px;
-	margin: 10px auto;
-	text-align: left;
-}
-.category .btn:first-child {
-	position: relative;
-	width: 212px;
-}
-.category.stick .btn:first-child {
-	width: 175px;
-}
-.category .btn:first-child:not([data-unread="0"]):after {
-	position: absolute;
-	top: 5px; right: 5px;
-	padding: 1px 5px;
-	background: #3498DB;
-	color: #fff;
-	border-radius: 5px;
-}
-
-/*=== Aside main page (feeds) */
-.categories .feeds .item.active {
-	background: #2980b9;
-}
-.categories .feeds .item.empty.active {
-	background: #f39c12;
-}
-.categories .feeds .item.error.active {
-	background: #bd362f;
-}
-.categories .feeds .item.empty .feed {
-	color: #e67e22;
-}
-.categories .feeds .item.error .feed {
-	color: #bd362f;
-}
-.categories .feeds .item.active .feed,
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
-	color: #fff;
-}
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
-	font-weight: bold;
-}
-.categories .feeds .dropdown-menu:after {
-	left: 2px;
-}
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
-	vertical-align: middle;
-	background-color: #95a5a6;
-	border-radius: 3px;
-}
-
 /*=== Configuration pages */
 .post {
 	padding: 10px 50px;
@@ -1039,7 +984,7 @@ a.btn {
 		height: 50px;
 		line-height: 50px;
 		text-align: center;
-		background: #34495e;
+		background: #2c3e50;
 	}
 
 	.aside.aside_feed {

From ea564ee821c0ac8a760119e6d1ae819b9059775e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 11:37:59 +0200
Subject: [PATCH 112/363] Fix Pafat theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Pafat/pafat.css | 150 ++++++++++-----------------------------
 1 file changed, 39 insertions(+), 111 deletions(-)

diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index ed19aa5db..cdbedbf22 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -192,48 +192,12 @@ a.btn {
 	text-decoration: none;
 }
 
-
-.category.stick .btn {
-	background:#5bc0de;
-	color : #FFF;
-	border-color :#5bc0de;
-}
-
-.category.stick .btn:first-child:hover, .category.stick .btn:last-child:hover, .category.stick .btn.active:first-child, .category.stick.active .btn:last-child {
-	background:#39b3d7;
-	border-color : #39b3d7;
-}
-
-
 .btn.active,
 .btn:active,
 .dropdown-target:target ~ .btn.dropdown-toggle {
 	background: #eee;
 }
 
-.category.all > .btn  {
-	background: #428bca;
-	color : #FFF;
-	border-color : #428bca;
-}
-
-.category.all > .btn:hover  {
-	background: #3276b1;
-	border-color : #3276b1;
-}
-
-.category.favorites > .btn {
-	background:#f0ad4e;
-	border-color: #f0ad4e;
-	color : #fff;
-}
-
-.category.favorites > .btn:hover {
-	background: #ed9c28;
-	border-color : #ed9c28;
-	color : white;
-}
-
 .btn-important {
 	background: #5cb85c;
 	color: #fff;
@@ -526,22 +490,29 @@ a.btn {
 }
 .tree-folder-title {
 	position: relative;
+	margin: 5px;
 	padding: 0 10px;
-	line-height: 2.5rem;
-	font-size: 1rem;
+	line-height: 2rem;
+	font-size: 0.9rem;
+	background: #5bc0de;
+	color: #fff;
+	border-top: 1px solid transparent;
+	border-bottom: 1px solid transparent;
+	border-radius: 5px;
 }
 .tree-folder-title .title {
 	background: inherit;
+	color: #fff;
 }
 .tree-folder-title .title:hover {
 	text-decoration: none;
 }
 .tree-folder.active .tree-folder-title {
+	background: #39b3d7;
 	font-weight: bold;
-}
-.tree-folder.active .tree-folder-title .title {
-}
-.tree-folder-items {
+	font-size: 1rem;
+	border-top: 1px solid #666;
+	border-bottom: 1px solid #666;
 }
 .tree-folder-items > .item {
 	padding: 0 10px;
@@ -549,11 +520,13 @@ a.btn {
 	font-size: 0.8rem;
 }
 .tree-folder-items > .item.active {
+	background: #5cb85c;
 }
 .tree-folder-items > .item > a {
 	text-decoration: none;
 }
 .tree-folder-items > .item.active > a {
+	color: #fff;
 }
 
 /*=== STRUCTURE */
@@ -614,28 +587,49 @@ a.btn {
 }
 .aside.aside_feed .tree {
 	position: sticky;
-	top: 0;
+	top: 5px;
 	margin: 10px 0 50px;
 }
 
 /*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
+	top: 0.25rem; right: 3px;
+	padding: 0px 5px;
+	border: 1px solid #fff;
+	border-radius: 3px;
+	font-size: 0.8rem;
+	line-height: 1.5rem;
+}
+.aside_feed .tree-folder.all .tree-folder-title {
+	background: #428bca;
+}
+.aside_feed .tree-folder.all.active .tree-folder-title {
+	background: #3276b1;
+}
+.aside_feed .tree-folder.favorites .tree-folder-title {
+	background: #f0ad4e;
+}
+.aside_feed .tree-folder.favorites.active .tree-folder-title {
+	background: #ed9c28;
 }
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
+	background: #e67e22;
 }
 .aside_feed .tree-folder-items > .item.error.active {
+	background: #bd362f;
 }
 .aside_feed .tree-folder-items > .item.empty > a {
+	color: #e67e22;
 }
 .aside_feed .tree-folder-items > .item.error > a {
+	color: #bd362f;
 }
 .aside_feed .tree-folder-items > .item.empty.active > a,
 .aside_feed .tree-folder-items > .item.error.active > a {
+	color: #fff;
 }
 .aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
@@ -648,73 +642,7 @@ a.btn {
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
 	vertical-align: middle;
-}
-
-/*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 215px;
-	margin: 10px auto;
-	text-align: left;
-}
-.category .btn:first-child {
-	position: relative;
-	width: 203px;
-}
-.category.stick .btn:first-child {
-	width: 176px;
-}
-.category .btn:first-child:not([data-unread="0"]):after {
-	position: absolute;
-	top: 2px; right: 3px;
-	padding: 0px 3px;
-	border: 1px solid ;
-	border-radius: 3px;
-	font-size:10pt;
-	line-height : 20px;
-}
-
-/*=== Aside main page (feeds) */
-.categories .feeds .item.active {
-	background: #5cb85c;
-}
-.categories .feeds .item.active .feed {
-	color: #fff;
-}
-.categories .feeds .item.empty .feed {
-	color: #e67e22;
-}
-.categories .feeds .item.empty.active {
-	background: #e67e22;
-}
-.categories .feeds .item.empty.active .feed {
-	color: #fff;
-}
-.categories .feeds .item.error .feed {
-	color: #BD362F;
-}
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
-	font-weight: bold;
-}
-.categories .feeds .dropdown-menu:after {
-	left: 2px;
-}
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
 	background-color: #fff;
-	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */

From c886daef8261da39e972004c93a781af90eac532 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 12:06:23 +0200
Subject: [PATCH 113/363] Fix Screwdriver theme

---
 p/themes/Screwdriver/screwdriver.css | 132 +++++----------------------
 1 file changed, 24 insertions(+), 108 deletions(-)

diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 94a1bccdd..99ed9130f 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -539,20 +539,26 @@ a.btn {
 	position: relative;
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1rem;
+	font-size: 0.9rem;
 }
 .tree-folder-title .title {
 	background: inherit;
+	color: #fff;
 }
 .tree-folder-title .title:hover {
 	text-decoration: none;
 }
 .tree-folder.active .tree-folder-title {
-	font-weight: bold;
-}
-.tree-folder.active .tree-folder-title .title {
+	background: linear-gradient(180deg, #222 0%, #171717 100%) #171717;
+	background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
+	box-shadow: 0px 1px #171717, 0px 1px rgba(255, 255, 255, 0.08) inset;
+	text-shadow: 0 0 2px rgba(255,255,255,0.28);
+	color: #fff;
 }
 .tree-folder-items {
+    background: #171717;
+    padding: 8px 0;
+	box-shadow: 0 4px 4px #171717 inset, 0 1px rgba(255,255,255,0.08),0 -1px rgba(255,255,255,0.08);
 }
 .tree-folder-items > .item {
 	padding: 0 10px;
@@ -560,9 +566,15 @@ a.btn {
 	font-size: 0.8rem;
 }
 .tree-folder-items > .item.active {
+	background: linear-gradient(180deg, #222 0%, #171717 100%) #171717;
+	background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
+	border-radius: 4px;
+	margin: 0px 8px;
+	box-shadow: 0px 1px #171717, 0px 1px rgba(255, 255, 255, 0.08) inset, 0 2px 2px #111;
 }
 .tree-folder-items > .item > a {
 	text-decoration: none;
+	color: #fff;
 }
 .tree-folder-items > .item.active > a {
 }
@@ -627,21 +639,21 @@ a.btn {
 /*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
+	right: 3px;
 	padding: 1px 5px;
+	color: #fff;
+	text-shadow: 0 1px rgba(255,255,255,0.08);
+}
+.aside_feed .btn-important {
+	border: none;
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
-}
-.aside_feed .tree-folder-items > .item.error.active {
-}
 .aside_feed .tree-folder-items > .item.empty > a {
+	color: #e67e22;
 }
 .aside_feed .tree-folder-items > .item.error > a {
-}
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
+	color: #BD362F;
 }
 .aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
@@ -656,102 +668,6 @@ a.btn {
 	vertical-align: middle;
 }
 
-/*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.categories .btn-important {
-	border: none;
-}
-.category {
-	width: 235px;
-	margin: 10px auto 0;
-	text-align: left;
-}
-#aside_flux ul.feeds{
-    box-shadow: 0 4px 4px #171717 inset, 0 1px rgba(255,255,255,0.08),0 -1px rgba(255,255,255,0.08);
-}
-ul.feeds{
-    background:#171717;
-    padding:8px 0;
-    box-shadow: 0 4px 4px #EDE7DE inset;
-}
-ul.feeds.active{
-	box-shadow: 0 0 0 #171717 inset, 0 -2px 2px #111 inset,0 1px rgba(255,255,255,0.08),0 -1px rgba(255,255,255,0);
-}
-.category.stick.active{
-	background: linear-gradient(180deg, #222 0%, #171717 100%) #171717;
-	background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
-	box-shadow: 0px 1px #171717, 0px 1px rgba(255, 255, 255, 0.08) inset;
-}
-.category .btn {
-	color: #fff;
-	border: none;
-	background: transparent;
-}
-.category .btn:first-child {
-	position: relative;
-	width: 213px;
-	background: transparent;
-}
-.category.stick .btn:first-child {
-	width: 176px;
-}
-.category .btn:first-child:not([data-unread="0"]):after {
-	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
-	background: transparent;
-	color: #fff;
-	text-shadow: 0 1px rgba(255,255,255,0.08);
-}
-
-/*=== Aside main page (feeds) */
-.categories .feeds .item.active {
-	background: linear-gradient(180deg, #222 0%, #171717 100%) #171717;
-	background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
-	border-radius: 4px;
-	margin: 0px 8px;
-	box-shadow: 0px 1px #171717, 0px 1px rgba(255, 255, 255, 0.08) inset, 0 2px 2px #111;
-}
-.categories .feeds .item.active .feed {
-	color: #fff;
-}
-.categories .feeds .item.empty .feed {
-	color: #e67e22;
-}
-.categories .feeds .item.empty.active {
-	background: #e67e22;
-}
-.categories .feeds .item.empty.active .feed {
-	color: #fff;
-}
-.categories .feeds .item.error .feed {
-	color: #BD362F;
-}
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-	color:#ccc;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
-	font-weight: bold;
-}
-.categories .feeds .dropdown-menu:after {
-	left: 2px;
-}
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
-	background-color: transparent;
-	border-radius: 3px;
-	vertical-align: middle;
-}
-
 /*=== Configuration pages */
 .post {
 	padding: 10px 50px;

From f8f16fdeeaba4a84d6c4686cfe077b54282ca635 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 12:10:20 +0200
Subject: [PATCH 114/363] Fix a small bug in Screwdriver theme

---
 p/themes/Screwdriver/screwdriver.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 99ed9130f..aa5758a90 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -617,7 +617,7 @@ a.btn {
 /*=== Body */
 #global {
 	background:#EDE7DE;
-	height: calc(100% - 85px);
+	height: calc(100% - 60px);
 }
 .aside {
 	border-radius: 0px 12px 0px 0px;

From 9fc536c28763260dd996f64e2cd451605faa64d3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 12:43:05 +0200
Subject: [PATCH 115/363] Fix .state_unread .items with data-unread="0"

---
 p/themes/base-theme/template.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 86e06f5ea..b07b579d0 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -402,7 +402,7 @@ a.btn {
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] {
 	display: none;
 }
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {

From 0d6993fe08cf57121eadb2aa0e4208420756165a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 12:51:17 +0200
Subject: [PATCH 116/363] Reader view comes back!

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php                      | 9 +++++++++
 app/layout/nav_menu.phtml                                | 5 +++++
 .../view/reader_view.phtml => index/reader.phtml}        | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
 rename app/views/{helpers/view/reader_view.phtml => index/reader.phtml} (90%)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index ed5b58b45..8bc23fb70 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -69,6 +69,15 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		Minz_View::prependTitle($title . ' · ');
 	}
 
+	/**
+	 * This action displays the reader view of FreshRSS.
+	 *
+	 * @todo: change this view into specific CSS rules?
+	 */
+	public function readerAction() {
+		$this->normalAction();
+	}
+
 	/**
 	 * This action displays the global view of FreshRSS.
 	 */
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 6f555c3d0..075f84ca6 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -133,6 +133,11 @@
 			<?php echo _i("view-normal"); ?>
 		</a>
 
+		<?php $url_output['a'] = 'reader'; ?>
+		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+			<?php echo _i("view-reader"); ?>
+		</a>
+
 		<?php $url_output['a'] = 'global'; ?>
 		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-global"); ?>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/index/reader.phtml
similarity index 90%
rename from app/views/helpers/view/reader_view.phtml
rename to app/views/index/reader.phtml
index 821a50f7f..f07868488 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/index/reader.phtml
@@ -13,7 +13,7 @@ if (!empty($this->entries)) {
 		<div class="flux_content">
 			<div class="content <?php echo $content_width; ?>">
 				<?php
-					$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed());	//We most likely already have the feed object in cache
+					$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $item->feed());	//We most likely already have the feed object in cache
 					if (empty($feed)) $feed = $item->feed(true);
 				?>
 				<a href="<?php echo $item->link(); ?>">

From fa0c7d75e6b9d01130f1c9518eef5f37d8e6d4ff Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 13:50:08 +0200
Subject: [PATCH 117/363] Begin to fix global view

---
 app/layout/aside_feed.phtml          |  6 ++--
 app/views/index/global.phtml         | 27 +++++++++-----
 p/scripts/global_view.js             |  2 +-
 p/themes/Dark/dark.css               |  3 --
 p/themes/Origine/origine.css         | 11 +++---
 p/themes/Pafat/pafat.css             |  4 ---
 p/themes/Screwdriver/screwdriver.css |  3 --
 p/themes/base-theme/base.css         |  3 --
 p/themes/base-theme/template.css     | 54 ++++++++++------------------
 9 files changed, 44 insertions(+), 69 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 12beba3a1..06e12a5cf 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -42,7 +42,7 @@
 					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
 					                        FreshRSS_Context::$current_get['feed']);
 		?>
-		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+		<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
 			<div class="tree-folder-title">
 				<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
 				<a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
@@ -53,13 +53,13 @@
 					foreach ($feeds as $feed) {
 						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
 				?>
-				<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
+				<li id="f_<?php echo $feed->id(); ?>" class="item feed<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
 					<div class="dropdown no-mobile">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index ab63c409a..5159882ba 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -1,11 +1,20 @@
-<?php //$this->partial('nav_menu'); ?>
+<?php
+	$this->partial('nav_menu');
 
-<div id="stream" class="global categories">
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
+
+<div id="stream" class="global<?php echo $class; ?>">
 <?php
 	$url_base = array(
 		'c' => 'index',
 		'a' => 'index',
-		'params' => array()
+		'params' => Minz_Request::params()
 	);
 
 	foreach ($this->categories as $cat) {
@@ -14,20 +23,20 @@
 
 		if (!empty($feeds)) {
 ?>
-	<div class="box">
-		<div class="box-title"><a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
+	<div class="box category" data-unread="<?php echo $cat->nbNotRead(); ?>">
+		<div class="box-title"><a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
 
 		<ul class="box-content">
 			<?php
 				foreach ($feeds as $feed) {
 					$nb_not_read = $feed->nbNotRead();
-					$error = $feed->inError() ? 'error ' : '';
-					$empty = $feed->nbEntries() === 0 ? 'empty ' : '';
+					$error = $feed->inError() ? ' error' : '';
+					$empty = $feed->nbEntries() === 0 ? ' empty' : '';
 					$url_base['params']['get'] = 'f_' . $feed->id();
 			?>
-			<li class="item feed<?php echo $error, $empty; ?>">
+			<li class="item feed<?php echo $error, $empty; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-				<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
+				<a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
 			</li>
 			<?php } ?>
 		</ul>
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 8c2e6c1a2..14909f44e 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -9,7 +9,7 @@ function load_panel(link) {
 	panel_loading = true;
 
 	$.get(link, function (data) {
-		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination", data));
+		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination, #stream.prompt", data));
 
 		$("#panel .nav_menu").children().not("#nav_menu_read_all").remove();
 
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 2b853a45c..25a3e66f6 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -852,9 +852,6 @@ a.btn {
 	border-radius: 5px;
 	text-align: left;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index b4465a717..7230aa128 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -593,7 +593,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .category .title:not([data-unread="0"]):after {
 	position: absolute;
 	right: 0;
 	margin: 10px 0;
@@ -603,6 +603,9 @@ a.btn {
 	background: inherit;
 	border-left: 1px solid #aaa;
 }
+.feed .item-title:not([data-unread="0"]) {
+	font-weight: bold;
+}
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
@@ -621,9 +624,6 @@ a.btn {
 .aside_feed .tree-folder-items > .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
@@ -903,9 +903,6 @@ a.btn {
 	text-align: left;
 	box-shadow: 0 0 3px #bbb;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index cdbedbf22..84a485e13 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -914,10 +914,6 @@ a.btn {
 	text-align: left;
 }
 
-#stream.global .category {
-	margin: 0;
-}
-
 #stream.global .category:first-child {
 	margin: 0;
 }
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index aa5758a90..5771bb68f 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -969,9 +969,6 @@ opacity: 1;
 	box-shadow: 0 0 4px #171717;
 	overflow:hidden;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 4de5fa98a..53f59bbe5 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -668,9 +668,6 @@ a.btn {
 #stream.global .box-category {
 	text-align: left;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index b07b579d0..1af7a73d6 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -289,6 +289,7 @@ a.btn {
 	vertical-align: top;
 }
 .box .box-title {
+	position: relative;
 	font-size: 1.2rem;
 	font-weight: bold;
 	text-align: center;
@@ -400,22 +401,10 @@ a.btn {
 	vertical-align: top;
 }
 
-/*=== Aside main page (categories) */
-.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] {
-	display: none;
-}
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
-	content: attr(data-unread);
-}
-
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before {
-	content: "(" attr(data-unread) ") ";
-}
 .aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
@@ -612,32 +601,13 @@ br + br + br {
 
 /*=== GLOBAL VIEW */
 /*================*/
-/*=== Category boxes */
+#stream.global {
+	text-align: center;
+}
 
-/* TODO <delete> */
-#stream.global .box-category {
-	display: inline-block;
-	width: 19em;
-	max-width: 95%;
-	margin: 20px 10px;
-	border: 1px solid #ccc;
-	vertical-align: top;
+#stream.global .box {
+	text-align: left;
 }
-#stream.global .category {
-	width: 100%;
-}
-#stream.global .btn {
-	display: block;
-}
-#stream.global .box-category .feeds {
-	display: block;
-	overflow: auto;
-}
-#stream.global .box-category .feed {
-	width: 19em;
-	max-width: 90%;
-}
-/* TODO </delete */
 
 /*=== Panel */
 #overlay {
@@ -694,6 +664,18 @@ br + br + br {
 
 /*=== DIVERS */
 /*===========*/
+.category .title:not([data-unread="0"]):after {
+	content: attr(data-unread);
+}
+.feed .item-title:not([data-unread="0"]):before {
+	content: "(" attr(data-unread) ") ";
+}
+
+.state_unread .category:not(.active)[data-unread="0"],
+.state_unread .feed:not(.active)[data-unread="0"] {
+	display: none;
+}
+
 .nav-login,
 .nav_menu .search,
 .aside .toggle_aside,

From 62727b1d4f101fa328b57eda716803c2f7147d7b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:10:45 +0200
Subject: [PATCH 118/363] Fix Origine and base-theme themes for global view

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Origine/origine.css     | 39 ++++++++++++--------------------
 p/themes/base-theme/base.css     | 32 +++++++++++++-------------
 p/themes/base-theme/template.css |  3 +++
 3 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7230aa128..918d4f653 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -897,32 +897,24 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
-	background: #fff;
-	border-radius: 5px;
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
-	box-shadow: 0 0 3px #bbb;
 }
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	background: #f6f6f6;
-	border: none;
-	border-bottom: 1px solid #ddd;
-	border-radius: 5px 5px 0 0;
-	line-height: 2em;
-	font-size: 1.2rem;
-}
-#stream.global .btn:not([data-unread="0"]) {
+.box.category:not([data-unread="0"]) .box-title {
 	background: #0084CC;
+}
+.box.category:not([data-unread="0"]) .box-title:active {
+	background: #3498db;
+}
+.box.category:not([data-unread="0"]) .box-title .title {
 	color: #fff;
 	font-weight: bold;
-	text-shadow: none;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
 	color: #fff;
@@ -930,12 +922,9 @@ a.btn {
 	box-shadow: none;
 	text-shadow: none;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
-}
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 53f59bbe5..029c2d254 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -665,30 +665,30 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
 }
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	line-height: 2em;
-	font-size: 1.2rem;
+.box.category:not([data-unread="0"]) .box-title {
 }
-#stream.global .btn:not([data-unread="0"]) {
+.box.category:not([data-unread="0"]) .box-title:active {
+}
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
+	border: 0;
+	background: none;
 	font-weight: bold;
+	box-shadow: none;
+	text-shadow: none;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
-}
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1af7a73d6..f4f19ee71 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -294,6 +294,9 @@ a.btn {
 	font-weight: bold;
 	text-align: center;
 }
+.box .box-title a {
+	display: block;
+}
 .box .box-title form {
 	margin: 0;
 }

From 98fbc736ec3b4a5260da72eb8c9f66b798b74725 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:34:08 +0200
Subject: [PATCH 119/363] Fix all the themes for global view

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Dark/dark.css               | 45 +++++++++-------------
 p/themes/Flat/flat.css               | 47 +++++++++--------------
 p/themes/Origine/origine.css         |  3 --
 p/themes/Pafat/pafat.css             | 55 +++++++--------------------
 p/themes/Screwdriver/screwdriver.css | 56 ++++++++++++----------------
 p/themes/base-theme/template.css     |  3 ++
 6 files changed, 76 insertions(+), 133 deletions(-)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 25a3e66f6..f48f42b68 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -845,43 +845,34 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
-	text-align: left;
-	background: #1a1a1a;
-	border: 1px solid #000;
-	border-radius: 5px;
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
+	color: #888;
 }
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	line-height: 2em;
-	font-size: 1.2rem;
+.box.category:not([data-unread="0"]) .box-title {
+	background: #34495E;
+}
+.box.category:not([data-unread="0"]) .box-title:active {
 	background: #26303F;
-	border: none;
-	border-bottom: 1px solid #000;
-	border-radius: 5px 5px 0 0;
 }
-#stream.global .btn:not([data-unread="0"]) {
-	font-weight: bold;
-	background: #34495e;
+.box.category:not([data-unread="0"]) .box-title .title {
 	color: #fff;
-}
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
 	font-weight: bold;
+}
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
-	color: #fff;
+	font-weight: bold;
+	box-shadow: none;
+	text-shadow: none;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
-}
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== Panel */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index c594811f2..432a9a0fb 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -851,44 +851,33 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
-	border: 1px solid #ddd;
-	border-radius: 5px;
 }
-#stream.global .category {
-	margin: 0;
-}
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	line-height: 2em;
-	font-size: 1.2rem;
-	background: #ecf0f1;
-	color: #333;
-	border-bottom: 1px solid #ddd;
-	border-radius: 5px 5px 0 0;
-}
-#stream.global .btn:not([data-unread="0"]) {
-	font-weight: bold;
+.box.category:not([data-unread="0"]) .box-title {
 	background: #3498db;
-	color: #fff;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category:not([data-unread="0"]) .box-title:active {
+	background: #2980b9;
+}
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
-	background: none;
-	border: 0;
 	color: #fff;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
+	border: 0;
+	background: none;
+	font-weight: bold;
+	box-shadow: none;
+	text-shadow: none;
 }
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 918d4f653..7231abd01 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -603,9 +603,6 @@ a.btn {
 	background: inherit;
 	border-left: 1px solid #aaa;
 }
-.feed .item-title:not([data-unread="0"]) {
-	font-weight: bold;
-}
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 84a485e13..f10b66086 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -908,59 +908,32 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
-	background: #fff;
-	border:none;
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
 }
-
-#stream.global .category:first-child {
-	margin: 0;
+.box.category:not([data-unread="0"]) .box-title {
+	background: #5BC0DE;
 }
-
-
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	background: #f6f6f6;
-	border-bottom: 1px solid #aaa;
-	border-radius: 5px 5px 0 0;
-	line-height: 2em;
-	font-size: 1.2rem;
-}
-
-#stream.global .btn:not([data-unread="0"]) {
-	background: #5bc0de;
-	border-color : #5bc0de;
-	color: #fff;
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
-	text-shadow: none;
-
+	color: #fff;
 }
-
-
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
-	color: #fff;
 	font-weight: bold;
 	box-shadow: none;
 	text-shadow: none;
+	font-size: 0.8rem;
+	line-height: 1.6rem;
 }
-
-#stream.global .box-category .feeds {
-	max-height: 250px;
-	width: 302px;
-	border : solid #aaa 1px;
-	border-top : none;
-}
-
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 5771bb68f..c38cb617e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -957,60 +957,50 @@ opacity: 1;
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global{
-	background:#222;
+#stream.global {
+	background: #222;
 	padding: 24px 0;
 	box-shadow: 0 1px #fff, 0 -2px 2px #171717 inset, 0 2px 2px #171717 inset;
 }
-#stream.global .box-category {
-	background: #fff;
-	border-radius: 4px 4px 0 0;
-	text-align: left;
-	box-shadow: 0 0 4px #171717;
-	overflow:hidden;
-}
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
+
+.box.category .box-title {
 	background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717;
 	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%);
-	border: none;
 	box-shadow: 0px -1px #fff inset,0 -2px #ccc inset;
 	border-radius: none;
 	line-height: 2em;
 	font-size: 1.2rem;
-	color:#888;
 	text-shadow:0 1px #ccc;
 }
-#stream.global .btn:not([data-unread="0"]) {
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
+	text-align: left;
+	color: #888;
+}
+.box.category:not([data-unread="0"]) .box-title {
+}
+.box.category:not([data-unread="0"]) .box-title:active {
+}
+.box.category:not([data-unread="0"]) .box-title .title {
 	color: #222;
 	font-weight: bold;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0;
-	right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
-	color: #222;
 	font-weight: bold;
-	box-shadow: none;
-	text-shadow: none;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
-	color:#222;
-	background:#EDE7DE;
-}
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
-	overflow:hidden;
+	font-size: 0.8rem;
 }
-#stream.global .box-category .feed {
-	color:#222;
+.box.category .item.feed .item-title {
+	color: #222;
 }
+
 /*=== PANEL */
 /*===========*/
 #panel {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index f4f19ee71..fd95cb697 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -673,6 +673,9 @@ br + br + br {
 .feed .item-title:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
+.feed .item-title:not([data-unread="0"]) {
+	font-weight: bold;
+}
 
 .state_unread .category:not(.active)[data-unread="0"],
 .state_unread .feed:not(.active)[data-unread="0"] {

From 27c380400dc715441c4193d7c4a7056f960fbfd5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:42:46 +0200
Subject: [PATCH 120/363] Fix feed in error or empty (all the themes)

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Dark/dark.css               | 15 ++++++---------
 p/themes/Flat/flat.css               | 15 ++++++---------
 p/themes/Origine/origine.css         | 12 ++++++------
 p/themes/Pafat/pafat.css             | 15 ++++++---------
 p/themes/Screwdriver/screwdriver.css |  9 +++------
 p/themes/base-theme/base.css         | 15 ++++++---------
 6 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index f48f42b68..1f26224e4 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -565,27 +565,24 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #c95;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #a44;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #c95;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #a44;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a {
+.feed.item.empty.active > a {
 	color: #111;
 }
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 432a9a0fb..46c874311 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -570,25 +570,22 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #f39c12;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7231abd01..1b54e9bfe 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -605,20 +605,20 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 	color: #fff;
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index f10b66086..15fdb3a1a 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -615,25 +615,22 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index c38cb617e..ae6ceb00f 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -649,15 +649,12 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #BD362F;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
@@ -997,7 +994,7 @@ opacity: 1;
 	padding: 2px 10px;
 	font-size: 0.8rem;
 }
-.box.category .item.feed .item-title {
+.box.category .item.feed:not(.empty):not(.error) .item-title {
 	color: #222;
 }
 
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 029c2d254..0d53c50d1 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -443,19 +443,16 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
-}
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;

From cdad09ae2c363ee74ef7feba58e00e3500a35317 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:53:38 +0200
Subject: [PATCH 121/363] Fix feed colors on subscription page (all themes)

---
 p/themes/Dark/dark.css               | 4 ++++
 p/themes/Flat/flat.css               | 4 ++++
 p/themes/Origine/origine.css         | 4 ++++
 p/themes/Pafat/pafat.css             | 4 ++++
 p/themes/Screwdriver/screwdriver.css | 2 ++
 p/themes/base-theme/base.css         | 4 ++++
 p/themes/base-theme/template.css     | 1 +
 7 files changed, 23 insertions(+)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 1f26224e4..e551aa9c0 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -571,15 +571,19 @@ a.btn {
 .feed.item.error.active {
 	background: #a44;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #c95;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #a44;
 }
+.feed.item.empty.active,
 .feed.item.empty.active > a {
 	color: #111;
 }
+.feed.item.error.active,
 .feed.item.error.active > a {
 	color: #fff;
 }
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 46c874311..eb7737c5d 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -576,12 +576,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 1b54e9bfe..464422a0b 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -611,12 +611,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 15fdb3a1a..49cb3bc17 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -621,12 +621,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index ae6ceb00f..4f55d752e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -649,9 +649,11 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #BD362F;
 }
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 0d53c50d1..871a632d8 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -447,10 +447,14 @@ a.btn {
 }
 .feed.item.error.active {
 }
+.feed.item.empty,
 .feed.item.empty > a {
 }
+.feed.item.error,
 .feed.item.error > a {
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index fd95cb697..a79d539d8 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -179,6 +179,7 @@ a.btn {
 .dropdown {
 	position: relative;
 	display: inline-block;
+	vertical-align: middle;
 }
 .dropdown-target {
 	display: none;

From bd5757fff83844fef08fb50d0fce3b1d104728dc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:54:56 +0200
Subject: [PATCH 122/363] Inverse reader and global buttons in nav_menu

---
 app/layout/nav_menu.phtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 075f84ca6..775daf088 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -133,16 +133,16 @@
 			<?php echo _i("view-normal"); ?>
 		</a>
 
-		<?php $url_output['a'] = 'reader'; ?>
-		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
-			<?php echo _i("view-reader"); ?>
-		</a>
-
 		<?php $url_output['a'] = 'global'; ?>
 		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-global"); ?>
 		</a>
 
+		<?php $url_output['a'] = 'reader'; ?>
+		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+			<?php echo _i("view-reader"); ?>
+		</a>
+
 		<?php
 			$url_output['a'] = 'rss';
 			if (FreshRSS_Context::$conf->token) {

From 15316b77f6dd94b46ec8bdac588e273aef259737 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 15:08:57 +0200
Subject: [PATCH 123/363] Fix last sections of main.js

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_feed.phtml  |  4 ++--
 app/views/index/global.phtml |  4 ++--
 p/scripts/main.js            | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 06e12a5cf..3c23e0178 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -22,13 +22,13 @@
 	<form id="mark-read-aside" method="post" style="display: none"></form>
 
 	<ul class="tree">
-		<li class="tree-folder all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
 				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
 			</div>
 		</li>
 
-		<li class="tree-folder favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+		<li class="tree-folder category favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
 				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
 			</div>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 5159882ba..0975a5a00 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -34,9 +34,9 @@
 					$empty = $feed->nbEntries() === 0 ? ' empty' : '';
 					$url_base['params']['get'] = 'f_' . $feed->id();
 			?>
-			<li class="item feed<?php echo $error, $empty; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
+			<li id="f_<?php echo $feed->id(); ?>" class="item feed<?php echo $error, $empty; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-				<a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
+				<a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
 			</li>
 			<?php } ?>
 		</ul>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 24c0972fc..b6370866f 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -61,18 +61,18 @@ function incUnreadsFeed(article, feed_id, nb) {
 		feed_priority = elem ? str2int(elem.getAttribute('data-priority')) : 0;
 	if (elem) {
 		elem.setAttribute('data-unread', feed_unreads + nb);
-		elem = $(elem).children('a').get(0);
+		elem = $(elem).children('.item-title').get(0);
 		if (elem) {
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
 		}
 	}
 
 	//Update unread: category
-	elem = $('#' + feed_id).parents('.tree-folder').get(0);
+	elem = $('#' + feed_id).parents('.category').get(0);
 	feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 	if (elem) {
 		elem.setAttribute('data-unread', feed_unreads + nb);
-		elem = $(elem).find('.tree-folder-title .title').get(0);
+		elem = $(elem).find('.title').get(0);
 		if (elem) {
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
 		}
@@ -80,7 +80,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 	//Update unread: all
 	if (feed_priority > 0) {
-		elem = $('#aside_feed .all .tree-folder-title .title').get(0);
+		elem = $('#aside_feed .all .title').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -89,7 +89,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 	//Update unread: favourites
 	if (article && article.closest('div').hasClass('favorite')) {
-		elem = $('#aside_feed .favorites .tree-folder-title .title').get(0);
+		elem = $('#aside_feed .favorites .title').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -194,7 +194,7 @@ function mark_favorite(active) {
 		}
 		$b.find('.icon').replaceWith(data.icon);
 
-		var favourites = $('#aside_feed .favorites .tree-folder-title .title').contents().last().get(0);
+		var favourites = $('#aside_feed .favorites .title').contents().last().get(0);
 		if (favourites && favourites.textContent) {
 			favourites.textContent = favourites.textContent.replace(/((?: \([ 0-9]+\))?\s*)$/, function (m, p1) {
 				return incLabel(p1, inc, false);
@@ -202,7 +202,7 @@ function mark_favorite(active) {
 		}
 
 		if (active.closest('div').hasClass('not_read')) {
-			var elem = $('#aside_feed .favorites .tree-folder-title .title').get(0),
+			var elem = $('#aside_feed .favorites .title').get(0),
 				feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			if (elem) {
 				elem.setAttribute('data-unread', numberFormat(feed_unreads + inc));
@@ -876,12 +876,12 @@ function init_notifs_html5() {
 
 function refreshUnreads() {
 	$.getJSON('./?c=javascript&a=nbUnreadsPerFeed').done(function (data) {
-		var isAll = $('.category.all > .active').length > 0,
+		var isAll = $('.category.all.active').length > 0,
 		    new_articles = false;
 
 		$.each(data, function(feed_id, nbUnreads) {
 			feed_id = 'f_' + feed_id;
-			var elem = $('#' + feed_id + '>.feed').get(0),
+			var elem = $('#' + feed_id).get(0),
 				feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 
 			if ((incUnreadsFeed(null, feed_id, nbUnreads - feed_unreads) || isAll) &&	//Update of current view?
@@ -891,7 +891,7 @@ function refreshUnreads() {
 			};
 		});
 
-		var nb_unreads = str2int($('.category.all>a').attr('data-unread'));
+		var nb_unreads = str2int($('.category.all .title').attr('data-unread'));
 
 		if (nb_unreads > 0 && new_articles) {
 			faviconNbUnread(nb_unreads);
@@ -1136,7 +1136,7 @@ function init_password_observers() {
 
 function faviconNbUnread(n) {
 	if (typeof n === 'undefined') {
-		n = str2int($('.category.all>a').attr('data-unread'));
+		n = str2int($('.category.all .title').attr('data-unread'));
 	}
 	//http://remysharp.com/2010/08/24/dynamic-favicons/
 	var canvas = document.createElement('canvas'),

From 83d95ca4b894a84de467a97c7f413c1d04c43631 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 15:11:02 +0200
Subject: [PATCH 124/363] Fix titles for normal and global views

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 8bc23fb70..1cf618f7f 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -64,7 +64,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
 		$title = FreshRSS_Context::$name;
 		if (FreshRSS_Context::$get_unread > 0) {
-			$title = '(' . FreshRSS_Context::$get_unread . ') · ' . $title;
+			$title = '(' . FreshRSS_Context::$get_unread . ') ' . $title;
 		}
 		Minz_View::prependTitle($title . ' · ');
 	}
@@ -98,7 +98,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->categories = FreshRSS_Context::$categories;
 
 		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
-		Minz_View::prependTitle(_t('gen.title.global_view') . ' · ');
+		$title = _t('gen.title.global_view');
+		if (FreshRSS_Context::$get_unread > 0) {
+			$title = '(' . FreshRSS_Context::$get_unread . ') ' . $title;
+		}
+		Minz_View::prependTitle($title . ' · ');
 	}
 
 	/**

From 20b40aa85ea23e00e71e9d7ab8f3b08b51f16f41 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 15:22:30 +0200
Subject: [PATCH 125/363] Update i18n

---
 app/i18n/en.php | 14 +++++++-------
 app/i18n/fr.php | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/i18n/en.php b/app/i18n/en.php
index 2792ad7a2..a3593b28c 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -223,7 +223,6 @@
   'first_article' => 'Skip to the first article',
   'fix_errors_before' => 'Fix errors before skip to the next step.',
   'focus_search' => 'Access search box',
-  'forbidden_access' => 'Access is forbidden!',
   'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
   'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
   'freshrss' => 'FreshRSS',
@@ -237,6 +236,7 @@
   'gen.menu.manage_users' => 'Manage users',
   'gen.menu.profil' => 'Profil',
   'gen.title.check_install' => 'Installation checking',
+  'gen.title.global_view' => 'Global view',
   'general_configuration' => 'General configuration',
   'general_conf_is_ok' => 'General configuration has been saved.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -262,14 +262,14 @@
   'invalid_login' => 'Login is invalid',
   'invalid_url' => 'URL <em>%s</em> is invalid',
   'is_admin' => 'is administrator',
-  'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
   'jan' => 'jan',
+  'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
   'january' => 'Jan',
   'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
   'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
   'javascript_should_be_activated' => 'JavaScript must be enabled',
-  'Jul' => '\\J\\u\\l\\y',
   'jul' => 'jul',
+  'Jul' => '\\J\\u\\l\\y',
   'july' => 'Jul',
   'jump_next' => 'jump to next unread sibling (feed or category)',
   'jun' => 'jun',
@@ -307,8 +307,8 @@
   'mark_favorite' => 'Mark as favourite',
   'mark_feed_read' => 'Mark feed as read',
   'mark_read' => 'Mark as read',
-  'may' => 'May',
   'May' => '\\M\\a\\y',
+  'may' => 'May',
   'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
   'minz_is_ok' => 'You have the Minz framework',
   'mon' => 'Mon',
@@ -329,8 +329,8 @@
   'not_read' => '%d unread',
   'not_reads' => '%d unread',
   'not_yet_implemented' => 'Not yet implemented',
-  'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
   'nov' => 'nov',
+  'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
   'november' => 'Nov',
   'no_feed_actualized' => 'No RSS feed has been updated',
   'no_feed_to_display' => 'There is no article to show.',
@@ -346,8 +346,8 @@
   'number_feeds' => '%d feeds',
   'n_entries_deleted' => '%d articles have been deleted',
   'n_feeds_actualized' => '%d feeds have been updated',
-  'oct' => 'oct',
   'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+  'oct' => 'oct',
   'october' => 'Oct',
   'ok' => 'Ok!',
   'older_first' => 'Oldest first',
@@ -424,8 +424,8 @@
   'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
   'see_on_website' => 'See on original website',
   'see_website' => 'See website',
-  'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
   'sep' => 'sep',
+  'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
   'september' => 'Sep',
   'shaarli' => 'Shaarli',
   'share' => 'Share',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 85b32a737..60b7a4682 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -100,7 +100,7 @@
   'auto_load_more' => 'Charger les articles suivants en bas de page',
   'auto_read_when' => 'Marquer un article comme lu…',
   'auto_share' => 'Partager',
-  'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+  'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
   'back_to_rss_feeds' => '← Retour à vos flux RSS',
   'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
   'base_url' => 'Base de l’URL',
@@ -223,7 +223,6 @@
   'first_article' => 'Passer au premier article',
   'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
   'focus_search' => 'Accéder à la recherche',
-  'forbidden_access' => 'L’accès vous est interdit !',
   'format_date' => 'j %s Y',
   'format_date_hour' => 'j %s Y \\à H\\:i',
   'freshrss' => 'FreshRSS',
@@ -237,6 +236,7 @@
   'gen.menu.manage_users' => 'Gestion des utilisateurs',
   'gen.menu.profil' => 'Profil',
   'gen.title.check_install' => 'Vérification de l\'installation',
+  'gen.title.global_view' => 'Vue globale',
   'general_configuration' => 'Configuration générale',
   'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -262,14 +262,14 @@
   'invalid_login' => 'L’identifiant est invalide !',
   'invalid_url' => 'L’url <em>%s</em> est invalide.',
   'is_admin' => 'est administrateur',
-  'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
   'jan' => 'jan.',
+  'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
   'january' => 'janvier',
   'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
   'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
   'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
-  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
   'jul' => 'jui.',
+  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
   'july' => 'juillet',
   'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
   'jun' => 'juin',
@@ -307,8 +307,8 @@
   'mark_favorite' => 'Mettre en favori',
   'mark_feed_read' => 'Marquer le flux comme lu',
   'mark_read' => 'Marquer comme lu',
-  'may' => 'mai.',
   'May' => '\\m\\a\\i',
+  'may' => 'mai.',
   'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
   'minz_is_ok' => 'Vous disposez du framework Minz',
   'mon' => 'lun.',
@@ -329,8 +329,8 @@
   'not_read' => '%d non lu',
   'not_reads' => '%d non lus',
   'not_yet_implemented' => 'Pas encore implémenté',
-  'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
   'nov' => 'nov.',
+  'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
   'november' => 'novembre',
   'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
   'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
@@ -346,8 +346,8 @@
   'number_feeds' => '%d flux',
   'n_entries_deleted' => '%d articles ont été supprimés.',
   'n_feeds_actualized' => '%d flux ont été mis à jour.',
-  'oct' => 'oct.',
   'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
+  'oct' => 'oct.',
   'october' => 'octobre',
   'ok' => 'Ok !',
   'older_first' => 'Plus anciens en premier',
@@ -424,8 +424,8 @@
   'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
   'see_on_website' => 'Voir sur le site d’origine',
   'see_website' => 'Voir le site',
-  'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
   'sep' => 'sep.',
+  'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
   'september' => 'septembre',
   'shaarli' => 'Shaarli',
   'share' => 'Partager',
@@ -506,7 +506,7 @@
   'user_created' => 'L’utilisateur %s a été créé.',
   'user_deleted' => 'L’utilisateur %s a été supprimé.',
   'user_filter' => 'Accéder aux filtres utilisateur',
-  'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+  'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
   'version' => 'Version',
   'version_update' => 'Mise à jour',
   'wallabag' => 'wallabag',

From 5d6407a0bf0ecee7017f9d6c6c110b7afa98fff0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 12:22:13 +0100
Subject: [PATCH 126/363] Update i18n

- Fix i18n strings
- Fix typo profil -> profile

See https://github.com/marienfressinaud/FreshRSS/issues/678
---
 app/Controllers/authController.php             |  6 +++---
 app/Controllers/userController.php             | 16 ++++++++--------
 app/i18n/en.php                                | 16 +++++++++++-----
 app/i18n/fr.php                                | 16 +++++++++++-----
 app/layout/aside_configure.phtml               |  6 +++---
 app/layout/header.phtml                        |  4 ++--
 app/views/user/{profil.phtml => profile.phtml} |  2 +-
 7 files changed, 39 insertions(+), 27 deletions(-)
 rename app/views/user/{profil.phtml => profile.phtml} (97%)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 4af39cb71..a08f906e3 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -143,7 +143,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				}
 
 				// All is good, go back to the index.
-				Minz_Request::good(_t('login'),
+				Minz_Request::good(_t('feedback.login.success'),
 				                   array('c' => 'index', 'a' => 'index'));
 			} else {
 				Minz_Log::warning('Password mismatch for' .
@@ -182,7 +182,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Session::_param('passwordHash', $s);
 				FreshRSS_Auth::giveAccess();
 
-				Minz_Request::good(_t('login'),
+				Minz_Request::good(_t('feedback.login.success'),
 				                   array('c' => 'index', 'a' => 'index'));
 			} else {
 				Minz_Log::warning('Unsafe password mismatch for user ' . $username);
@@ -274,7 +274,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	public function logoutAction() {
 		invalidateHttpCache();
 		FreshRSS_Auth::removeAccess();
-		Minz_Request::good(_t('disconnected'),
+		Minz_Request::good(_t('feedback.logout.success'),
 		                   array('c' => 'index', 'a' => 'index'));
 	}
 
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 61d33437d..2343520ca 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -23,10 +23,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	}
 
 	/**
-	 * This action displays the user profil page.
+	 * This action displays the user profile page.
 	 */
-	public function profilAction() {
-		Minz_View::prependTitle(_t('users.profil') . ' · ');
+	public function profileAction() {
+		Minz_View::prependTitle(_t('gen.title.user_profile') . ' · ');
 
 		if (Minz_Request::isPost()) {
 			$ok = true;
@@ -74,11 +74,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			}
 
 			if ($ok) {
-				Minz_Request::good('users.profil.updated',
-				                   array('c' => 'user', 'a' => 'profil'));
+				Minz_Request::good(_t('feedback.user_profile.updated'),
+				                   array('c' => 'user', 'a' => 'profile'));
 			} else {
-				Minz_Request::bad('error_occurred',
-				                  array('c' => 'user', 'a' => 'profil'));
+				Minz_Request::bad(_t('error_occurred'),
+				                  array('c' => 'user', 'a' => 'profile'));
 			}
 		}
 	}
@@ -92,7 +92,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			                  array('error' => array(_t('access_denied'))));
 		}
 
-		Minz_View::prependTitle(_t('users.manage') . ' · ');
+		Minz_View::prependTitle(_t('gen.title.user_management') . ' · ');
 
 		// Get the correct current user.
 		$userDAO = new FreshRSS_UserDAO();
diff --git a/app/i18n/en.php b/app/i18n/en.php
index a3593b28c..275471e19 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -196,6 +196,10 @@
   'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
   'february' => 'Feb',
   'feed' => 'Feed',
+  'feedback.login.error' => 'Login is invalid',
+  'feedback.login.success' => 'You are connected',
+  'feedback.logout.success' => 'You are disconnected',
+  'feedback.user_profile.updated' => 'Your profile has been modified',
   'feeds' => 'Feeds',
   'feeds_actualized' => 'RSS feeds have been updated',
   'feeds_imported' => 'Your feeds have been imported and will now be updated',
@@ -233,10 +237,12 @@
   'gen.menu.admin' => 'Administration',
   'gen.menu.authentication' => 'Authentication',
   'gen.menu.check_install' => 'Installation checking',
-  'gen.menu.manage_users' => 'Manage users',
-  'gen.menu.profil' => 'Profil',
+  'gen.menu.user_management' => 'Manage users',
+  'gen.menu.user_profile' => 'Profile',
   'gen.title.check_install' => 'Installation checking',
   'gen.title.global_view' => 'Global view',
+  'gen.title.user_management' => 'Manage users',
+  'gen.title.user_profile' => 'Profile',
   'general_configuration' => 'General configuration',
   'general_conf_is_ok' => 'General configuration has been saved.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -262,8 +268,8 @@
   'invalid_login' => 'Login is invalid',
   'invalid_url' => 'URL <em>%s</em> is invalid',
   'is_admin' => 'is administrator',
-  'jan' => 'jan',
   'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+  'jan' => 'jan',
   'january' => 'Jan',
   'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
   'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
@@ -272,8 +278,8 @@
   'Jul' => '\\J\\u\\l\\y',
   'july' => 'Jul',
   'jump_next' => 'jump to next unread sibling (feed or category)',
-  'jun' => 'jun',
   'Jun' => '\\J\\u\\n\\e',
+  'jun' => 'jun',
   'june' => 'Jun',
   'keep_history' => 'Minimum number of articles to keep',
   'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
@@ -329,8 +335,8 @@
   'not_read' => '%d unread',
   'not_reads' => '%d unread',
   'not_yet_implemented' => 'Not yet implemented',
-  'nov' => 'nov',
   'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+  'nov' => 'nov',
   'november' => 'Nov',
   'no_feed_actualized' => 'No RSS feed has been updated',
   'no_feed_to_display' => 'There is no article to show.',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 60b7a4682..e3a49d54c 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -196,6 +196,10 @@
   'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
   'february' => 'février',
   'feed' => 'Flux',
+  'feedback.login.error' => 'L’identifiant est invalide !',
+  'feedback.login.success' => 'Vous êtes désormais connecté',
+  'feedback.logout.success' => 'Vous avez été déconnecté',
+  'feedback.user_profile.updated' => 'Votre profil a été mis à jour',
   'feeds' => 'Flux',
   'feeds_actualized' => 'Les flux ont été mis à jour.',
   'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
@@ -233,10 +237,12 @@
   'gen.menu.admin' => 'Administration',
   'gen.menu.authentication' => 'Authentification',
   'gen.menu.check_install' => 'Vérification de l\'installation',
-  'gen.menu.manage_users' => 'Gestion des utilisateurs',
-  'gen.menu.profil' => 'Profil',
+  'gen.menu.user_management' => 'Gestion des utilisateurs',
+  'gen.menu.user_profile' => 'Profil',
   'gen.title.check_install' => 'Vérification de l\'installation',
   'gen.title.global_view' => 'Vue globale',
+  'gen.title.user_management' => 'Gestion des utilisateurs',
+  'gen.title.user_profile' => 'Profil',
   'general_configuration' => 'Configuration générale',
   'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -262,8 +268,8 @@
   'invalid_login' => 'L’identifiant est invalide !',
   'invalid_url' => 'L’url <em>%s</em> est invalide.',
   'is_admin' => 'est administrateur',
-  'jan' => 'jan.',
   'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
+  'jan' => 'jan.',
   'january' => 'janvier',
   'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
   'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
@@ -272,8 +278,8 @@
   'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
   'july' => 'juillet',
   'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-  'jun' => 'juin',
   'Jun' => '\\j\\u\\i\\n',
+  'jun' => 'juin',
   'june' => 'juin',
   'keep_history' => 'Nombre minimum d’articles à conserver',
   'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
@@ -329,8 +335,8 @@
   'not_read' => '%d non lu',
   'not_reads' => '%d non lus',
   'not_yet_implemented' => 'Pas encore implémenté',
-  'nov' => 'nov.',
   'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
+  'nov' => 'nov.',
   'november' => 'novembre',
   'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
   'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 32dc19a4e..53c52d3e3 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -19,14 +19,14 @@
 		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
-	                          Minz_Request::actionName() === 'profil'? ' active' : ''; ?>">
-		<a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('gen.menu.profil'); ?></a>
+	                          Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
+		<a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a>
 	</li>
 	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 	<li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'manage' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.manage_users'); ?></a>
+		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'auth' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 506cec175..c73d9cdbb 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -62,11 +62,11 @@ if (Minz_Configuration::canLogIn()) {
 				<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="item"><a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('gen.menu.profil'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a></li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 				<li class="separator"></li>
 				<li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
-				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.manage_users'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
diff --git a/app/views/user/profil.phtml b/app/views/user/profile.phtml
similarity index 97%
rename from app/views/user/profil.phtml
rename to app/views/user/profile.phtml
index a2af53c96..60257012c 100644
--- a/app/views/user/profil.phtml
+++ b/app/views/user/profile.phtml
@@ -3,7 +3,7 @@
 <div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url('user', 'profil'); ?>">
+	<form method="post" action="<?php echo _url('user', 'profile'); ?>">
 		<legend><?php echo _t('login_configuration'); ?></legend>
 
 		<div class="form-group">

From 4dec7bf127fdb71c78d09bb4f64995028a60c439 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 12:37:38 +0100
Subject: [PATCH 127/363] Fix i18n string

Order has been changed due to a little bug in sort order function.
---
 app/Controllers/authController.php |   6 +-
 app/i18n/en.php                    | 109 +++++++++++++++--------------
 app/i18n/fr.php                    | 109 +++++++++++++++--------------
 3 files changed, 114 insertions(+), 110 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index a08f906e3..491be8d8a 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -23,6 +23,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			                  array('error' => array(_t('access_denied'))));
 		}
 
+		Minz_View::prependTitle(_t('gen.title.authentication') . ' · ');
+
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
@@ -55,10 +57,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			if ($ok) {
-				Minz_Request::good('configuration_updated',
+				Minz_Request::good(_t('configuration_updated'),
 				                   array('c' => 'auth', 'a' => 'index'));
 			} else {
-				Minz_Request::bad('error_occurred',
+				Minz_Request::bad(_t('error_occurred'),
 				                  array('c' => 'auth', 'a' => 'index'));
 			}
 		}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 275471e19..1e6621c12 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -1,5 +1,17 @@
 <?php
  return array (
+  'Apr' => '\\A\\p\\r\\i\\l',
+  'Aug' => '\\A\\u\\g\\u\\s\\t',
+  'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+  'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
+  'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+  'Jul' => '\\J\\u\\l\\y',
+  'Jun' => '\\J\\u\\n\\e',
+  'Mar' => '\\M\\a\\r\\c\\h',
+  'May' => '\\M\\a\\y',
+  'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+  'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+  'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
   'about' => 'About',
   'about_freshrss' => 'About FreshRSS',
   'access_denied' => 'You don’t have permission to access this page',
@@ -61,42 +73,40 @@
   'advanced' => 'Advanced',
   'after_onread' => 'After “mark all as read”,',
   'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+  'all_feeds' => 'All feeds',
   'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
   'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
-  'all_feeds' => 'All feeds',
   'already_subscribed' => 'You have already subscribed to <em>%s</em>',
   'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
-  'Apr' => '\\A\\p\\r\\i\\l',
   'apr' => 'apr',
   'april' => 'Apr',
   'archiving_configuration' => 'Archiving',
   'archiving_configuration_help' => 'More options are available in the individual stream settings',
   'article' => 'Article',
-  'articles' => 'articles',
-  'articles_per_page' => 'Number of articles per page',
-  'articles_to_display' => 'Articles to display',
   'article_icons' => 'Article icons',
   'article_open_on_website' => 'when article is opened on its original website',
   'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
   'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
   'article_viewed' => 'when article is viewed',
+  'articles' => 'articles',
+  'articles_per_page' => 'Number of articles per page',
+  'articles_to_display' => 'Articles to display',
   'ask_empty' => 'Clear?',
   'attention' => 'Attention!',
-  'Aug' => '\\A\\u\\g\\u\\s\\t',
   'aug' => 'aug',
   'august' => 'Aug',
-  'author' => 'Author',
   'auth_form' => 'Web form (traditional, requires JavaScript)',
   'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
   'auth_form_set' => 'Form is now your default authentication system.',
+  'auth_no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
   'auth_none' => 'None (dangerous)',
   'auth_not_persona' => 'Only Persona system can be reset.',
-  'auth_no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
   'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
   'auth_reset' => 'Authentication reset',
   'auth_token' => 'Authentication token',
   'auth_type' => 'Authentication method',
   'auth_will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+  'author' => 'Author',
   'auto_load_more' => 'Load next articles at the page bottom',
   'auto_read_when' => 'Mark article as read…',
   'auto_share' => 'Share',
@@ -105,9 +115,9 @@
   'bad_opml_file' => 'Your OPML file is invalid',
   'base_url' => 'Base URL',
   'bdd' => 'Database',
-  'bdd_configuration' => 'Database configuration',
   'bdd_conf_is_ko' => 'Verify your database information.',
   'bdd_conf_is_ok' => 'Database configuration has been saved.',
+  'bdd_configuration' => 'Database configuration',
   'bdd_type' => 'Type of database',
   'before_one_day' => 'Before one day',
   'before_one_week' => 'Before one week',
@@ -123,8 +133,8 @@
   'by_email' => 'By email',
   'by_feed' => 'by feed',
   'cache_is_ok' => 'Permissions on cache directory are good',
-  'cancel' => 'Cancel',
   'can_not_be_deleted' => 'Cannot be deleted',
+  'cancel' => 'Cancel',
   'categories' => 'Categories',
   'categories_management' => 'Categories management',
   'categories_updated' => 'Categories have been updated',
@@ -135,10 +145,10 @@
   'category_emptied' => 'Category has been emptied',
   'category_empty' => 'Empty category',
   'category_name_exists' => 'Category name already exists.',
-  'category_not_delete_default' => 'You cannot delete the default category!',
-  'category_not_exist' => 'The category does not exist!',
   'category_no_id' => 'You must precise the id of the category.',
   'category_no_name' => 'Category name cannot be empty.',
+  'category_not_delete_default' => 'You cannot delete the default category!',
+  'category_not_exist' => 'The category does not exist!',
   'category_number' => 'Category n°%d',
   'category_updated' => 'Category has been updated.',
   'change_value' => 'You should change this value by any other',
@@ -165,7 +175,6 @@
   'current_user' => 'Current user',
   'damn' => 'Damn!',
   'data_is_ok' => 'Permissions on data directory are good',
-  'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
   'dec' => 'dec',
   'december' => 'Dec',
   'default_category' => 'Uncategorized',
@@ -178,9 +187,9 @@
   'display_articles_unfolded' => 'Show articles unfolded by default',
   'display_categories_unfolded' => 'Show categories folded by default',
   'display_configuration' => 'Display',
+  'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
   'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
   'dom_is_ok' => 'You have the required library to browse the DOM',
-  'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
   'email' => 'Email',
   'error_occurred' => 'An error occurred',
   'error_occurred_update' => 'Nothing was changed',
@@ -193,19 +202,8 @@
   'favicons_is_ok' => 'Permissions on favicons directory are good',
   'favorite_feeds' => 'Favourites (%s)',
   'feb' => 'feb',
-  'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
   'february' => 'Feb',
   'feed' => 'Feed',
-  'feedback.login.error' => 'Login is invalid',
-  'feedback.login.success' => 'You are connected',
-  'feedback.logout.success' => 'You are disconnected',
-  'feedback.user_profile.updated' => 'Your profile has been modified',
-  'feeds' => 'Feeds',
-  'feeds_actualized' => 'RSS feeds have been updated',
-  'feeds_imported' => 'Your feeds have been imported and will now be updated',
-  'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
-  'feeds_marked_read' => 'Feeds have been marked as read',
-  'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
   'feed_actualized' => '<em>%s</em> has been updated',
   'feed_added' => 'RSS feed <em>%s</em> has been added',
   'feed_deleted' => 'Feed has been deleted',
@@ -217,6 +215,16 @@
   'feed_updated' => 'Feed has been updated',
   'feed_url' => 'Feed URL',
   'feed_validator' => 'Check the validity of the feed',
+  'feedback.login.error' => 'Login is invalid',
+  'feedback.login.success' => 'You are connected',
+  'feedback.logout.success' => 'You are disconnected',
+  'feedback.user_profile.updated' => 'Your profile has been modified',
+  'feeds' => 'Feeds',
+  'feeds_actualized' => 'RSS feeds have been updated',
+  'feeds_imported' => 'Your feeds have been imported and will now be updated',
+  'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
+  'feeds_marked_read' => 'Feeds have been marked as read',
+  'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
   'file_cannot_be_uploaded' => 'File cannot be uploaded!',
   'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
   'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
@@ -239,12 +247,13 @@
   'gen.menu.check_install' => 'Installation checking',
   'gen.menu.user_management' => 'Manage users',
   'gen.menu.user_profile' => 'Profile',
+  'gen.title.authentication' => 'Authentication',
   'gen.title.check_install' => 'Installation checking',
   'gen.title.global_view' => 'Global view',
   'gen.title.user_management' => 'Manage users',
   'gen.title.user_profile' => 'Profile',
-  'general_configuration' => 'General configuration',
   'general_conf_is_ok' => 'General configuration has been saved.',
+  'general_configuration' => 'General configuration',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
   'global_view' => 'Global view',
   'help' => 'Display documentation',
@@ -261,24 +270,21 @@
   'import' => 'Import',
   'import_export' => 'Import / export',
   'informations' => 'Information',
+  'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
   'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
   'installation_step' => 'Installation — step %d · FreshRSS',
-  'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
   'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
   'invalid_login' => 'Login is invalid',
   'invalid_url' => 'URL <em>%s</em> is invalid',
   'is_admin' => 'is administrator',
-  'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
   'jan' => 'jan',
   'january' => 'Jan',
   'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
   'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
   'javascript_should_be_activated' => 'JavaScript must be enabled',
   'jul' => 'jul',
-  'Jul' => '\\J\\u\\l\\y',
   'july' => 'Jul',
   'jump_next' => 'jump to next unread sibling (feed or category)',
-  'Jun' => '\\J\\u\\n\\e',
   'jun' => 'jun',
   'june' => 'Jun',
   'keep_history' => 'Minimum number of articles to keep',
@@ -295,6 +301,7 @@
   'lead_developer' => 'Lead developer',
   'license' => 'License',
   'load_more' => 'Load more articles',
+  'log_is_ok' => 'Permissions on logs directory are good',
   'login' => 'Login',
   'login_configuration' => 'Login',
   'login_persona_problem' => 'Connection problem with Persona?',
@@ -303,41 +310,30 @@
   'logout' => 'Logout',
   'logs' => 'Logs',
   'logs_empty' => 'Log file is empty',
-  'log_is_ok' => 'Permissions on logs directory are good',
   'main_stream' => 'Main stream',
   'mar' => 'mar',
-  'Mar' => '\\M\\a\\r\\c\\h',
   'march' => 'Mar',
   'mark_all_read' => 'Mark all as read',
   'mark_cat_read' => 'Mark category as read',
   'mark_favorite' => 'Mark as favourite',
   'mark_feed_read' => 'Mark feed as read',
   'mark_read' => 'Mark as read',
-  'May' => '\\M\\a\\y',
   'may' => 'May',
   'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
   'minz_is_ok' => 'You have the Minz framework',
   'mon' => 'Mon',
   'month' => 'months',
   'more_information' => 'More information',
-  'newer_first' => 'Newer first',
+  'n_entries_deleted' => '%d articles have been deleted',
+  'n_feeds_actualized' => '%d feeds have been updated',
   'new_article' => 'There are new available articles, click to refresh the page.',
   'new_category' => 'New category',
+  'newer_first' => 'Newer first',
   'next' => 'Next',
   'next_article' => 'Skip to the next article',
   'next_page' => 'Skip to the next page',
   'next_step' => 'Go to the next step',
   'no' => 'No',
-  'normal_view' => 'Normal view',
-  'nothing_to_load' => 'There are no more articles',
-  'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
-  'notif_title_new_articles' => 'FreshRSS: new articles!',
-  'not_read' => '%d unread',
-  'not_reads' => '%d unread',
-  'not_yet_implemented' => 'Not yet implemented',
-  'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
-  'nov' => 'nov',
-  'november' => 'Nov',
   'no_feed_actualized' => 'No RSS feed has been updated',
   'no_feed_to_display' => 'There is no article to show.',
   'no_feed_to_refresh' => 'There is no feed to refresh…',
@@ -347,12 +343,18 @@
   'no_selected_feed' => 'No feed selected.',
   'no_update' => 'No update to apply',
   'no_zip_extension' => 'Zip extension is not present on your server.',
+  'normal_view' => 'Normal view',
+  'not_read' => '%d unread',
+  'not_reads' => '%d unread',
+  'not_yet_implemented' => 'Not yet implemented',
+  'nothing_to_load' => 'There are no more articles',
+  'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+  'notif_title_new_articles' => 'FreshRSS: new articles!',
+  'nov' => 'nov',
+  'november' => 'Nov',
   'number_articles' => '%d articles',
   'number_divided_when_reader' => 'Divided by 2 in the reading view.',
   'number_feeds' => '%d feeds',
-  'n_entries_deleted' => '%d articles have been deleted',
-  'n_feeds_actualized' => '%d feeds have been updated',
-  'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
   'oct' => 'oct',
   'october' => 'Oct',
   'ok' => 'Ok!',
@@ -419,8 +421,8 @@
   'refresh' => 'Refresh',
   'related_tags' => 'Related tags',
   'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
-  'rss_feeds_of' => 'RSS feed of %s',
   'rss_feed_management' => 'RSS feeds management',
+  'rss_feeds_of' => 'RSS feed of %s',
   'rss_view' => 'RSS feed',
   'sat' => 'Sat',
   'save' => 'Save',
@@ -431,7 +433,6 @@
   'see_on_website' => 'See on original website',
   'see_website' => 'See website',
   'sep' => 'sep',
-  'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
   'september' => 'Sep',
   'shaarli' => 'Shaarli',
   'share' => 'Share',
@@ -492,7 +493,6 @@
   'twitter' => 'Twitter',
   'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
   'update' => 'Update',
-  'updated' => 'Modifications have been updated',
   'update_apply' => 'Apply',
   'update_can_apply' => 'An update is available.',
   'update_check' => 'Check for new updates',
@@ -504,15 +504,16 @@
   'update_server_not_found' => 'Update server cannot be found. [%s]',
   'update_start' => 'Start update process',
   'update_system' => 'Update system',
+  'updated' => 'Modifications have been updated',
   'upon_reception' => 'upon reception of the article',
-  'username' => 'Username',
-  'username_admin' => 'Administrator username',
-  'users' => 'Users',
-  'users_list' => 'List of users',
   'user_created' => 'User %s has been created',
   'user_deleted' => 'User %s has been deleted',
   'user_filter' => 'Access user filters',
   'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
+  'username' => 'Username',
+  'username_admin' => 'Administrator username',
+  'users' => 'Users',
+  'users_list' => 'List of users',
   'version' => 'Version',
   'version_update' => 'Update',
   'wallabag' => 'wallabag',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index e3a49d54c..61a84cc04 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -1,5 +1,17 @@
 <?php
  return array (
+  'Apr' => '\\a\\v\\r\\i\\l',
+  'Aug' => '\\a\\o\\û\\t',
+  'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
+  'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
+  'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
+  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
+  'Jun' => '\\j\\u\\i\\n',
+  'Mar' => '\\m\\a\\r\\s',
+  'May' => '\\m\\a\\i',
+  'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
+  'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
+  'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
   'about' => 'À propos',
   'about_freshrss' => 'À propos de FreshRSS',
   'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
@@ -61,42 +73,40 @@
   'advanced' => 'Avancé',
   'after_onread' => 'Après “marquer tout comme lu”,',
   'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+  'all_feeds' => 'Tous les flux',
   'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
   'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
-  'all_feeds' => 'Tous les flux',
   'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
   'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-  'Apr' => '\\a\\v\\r\\i\\l',
   'apr' => 'avr.',
   'april' => 'avril',
   'archiving_configuration' => 'Archivage',
   'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
   'article' => 'Article',
-  'articles' => 'articles',
-  'articles_per_page' => 'Nombre d’articles par page',
-  'articles_to_display' => 'Articles à afficher',
   'article_icons' => 'Icônes d’article',
   'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
   'article_published_on' => 'Article publié initialement sur <a href="%s">%s</a>',
   'article_published_on_author' => 'Article publié initialement sur <a href="%s">%s</a> par %s',
   'article_viewed' => 'lorsque l’article est affiché',
+  'articles' => 'articles',
+  'articles_per_page' => 'Nombre d’articles par page',
+  'articles_to_display' => 'Articles à afficher',
   'ask_empty' => 'Vider ?',
   'attention' => 'Attention !',
-  'Aug' => '\\a\\o\\û\\t',
   'aug' => 'août',
   'august' => 'août',
-  'author' => 'Auteur',
   'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
   'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
   'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
+  'auth_no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
   'auth_none' => 'Aucune (dangereux)',
   'auth_not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
-  'auth_no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
   'auth_persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
   'auth_reset' => 'Réinitialisation de l’authentification',
   'auth_token' => 'Jeton d’identification',
   'auth_type' => 'Méthode d’authentification',
   'auth_will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
+  'author' => 'Auteur',
   'auto_load_more' => 'Charger les articles suivants en bas de page',
   'auto_read_when' => 'Marquer un article comme lu…',
   'auto_share' => 'Partager',
@@ -105,9 +115,9 @@
   'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
   'base_url' => 'Base de l’URL',
   'bdd' => 'Base de données',
-  'bdd_configuration' => 'Base de données',
   'bdd_conf_is_ko' => 'Vérifiez les informations d’accès à la base de données.',
   'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
+  'bdd_configuration' => 'Base de données',
   'bdd_type' => 'Type de base de données',
   'before_one_day' => 'Antérieurs à 1 jour',
   'before_one_week' => 'Antérieurs à 1 semaine',
@@ -123,8 +133,8 @@
   'by_email' => 'Par courriel',
   'by_feed' => 'par flux',
   'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons',
-  'cancel' => 'Annuler',
   'can_not_be_deleted' => 'Ne peut pas être supprimée.',
+  'cancel' => 'Annuler',
   'categories' => 'Catégories',
   'categories_management' => 'Gestion des catégories',
   'categories_updated' => 'Les catégories ont été mises à jour.',
@@ -135,10 +145,10 @@
   'category_emptied' => 'La catégorie a été vidée.',
   'category_empty' => 'Catégorie vide',
   'category_name_exists' => 'Une catégorie possède déjà ce nom.',
-  'category_not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
-  'category_not_exist' => 'Cette catégorie n’existe pas !',
   'category_no_id' => 'Vous devez préciser l’id de la catégorie.',
   'category_no_name' => 'Vous devez préciser un nom pour la catégorie.',
+  'category_not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
+  'category_not_exist' => 'Cette catégorie n’existe pas !',
   'category_number' => 'Catégorie n°%d',
   'category_updated' => 'La catégorie a été mise à jour.',
   'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
@@ -165,7 +175,6 @@
   'current_user' => 'Utilisateur actuel',
   'damn' => 'Arf !',
   'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
-  'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
   'dec' => 'déc.',
   'december' => 'décembre',
   'default_category' => 'Sans catégorie',
@@ -178,9 +187,9 @@
   'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
   'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
   'display_configuration' => 'Affichage',
+  'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
   'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
   'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
-  'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
   'email' => 'Courriel',
   'error_occurred' => 'Une erreur est survenue !',
   'error_occurred_update' => 'Rien n’a été modifié !',
@@ -193,19 +202,8 @@
   'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
   'favorite_feeds' => 'Favoris (%s)',
   'feb' => 'fév.',
-  'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
   'february' => 'février',
   'feed' => 'Flux',
-  'feedback.login.error' => 'L’identifiant est invalide !',
-  'feedback.login.success' => 'Vous êtes désormais connecté',
-  'feedback.logout.success' => 'Vous avez été déconnecté',
-  'feedback.user_profile.updated' => 'Votre profil a été mis à jour',
-  'feeds' => 'Flux',
-  'feeds_actualized' => 'Les flux ont été mis à jour.',
-  'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
-  'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
-  'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
-  'feeds_moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
   'feed_actualized' => '<em>%s</em> a été mis à jour.',
   'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
   'feed_deleted' => 'Le flux a été supprimé.',
@@ -217,6 +215,16 @@
   'feed_updated' => 'Le flux a été mis à jour.',
   'feed_url' => 'URL du flux',
   'feed_validator' => 'Vérifier la valididé du flux',
+  'feedback.login.error' => 'L’identifiant est invalide !',
+  'feedback.login.success' => 'Vous êtes désormais connecté',
+  'feedback.logout.success' => 'Vous avez été déconnecté',
+  'feedback.user_profile.updated' => 'Votre profil a été mis à jour',
+  'feeds' => 'Flux',
+  'feeds_actualized' => 'Les flux ont été mis à jour.',
+  'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
+  'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
+  'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
+  'feeds_moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
   'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
   'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
   'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
@@ -239,12 +247,13 @@
   'gen.menu.check_install' => 'Vérification de l\'installation',
   'gen.menu.user_management' => 'Gestion des utilisateurs',
   'gen.menu.user_profile' => 'Profil',
+  'gen.title.authentication' => 'Authentification',
   'gen.title.check_install' => 'Vérification de l\'installation',
   'gen.title.global_view' => 'Vue globale',
   'gen.title.user_management' => 'Gestion des utilisateurs',
   'gen.title.user_profile' => 'Profil',
-  'general_configuration' => 'Configuration générale',
   'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
+  'general_configuration' => 'Configuration générale',
   'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
   'global_view' => 'Vue globale',
   'help' => 'Afficher la documentation',
@@ -261,24 +270,21 @@
   'import' => 'Importer',
   'import_export' => 'Importer / exporter',
   'informations' => 'Informations',
+  'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
   'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
   'installation_step' => 'Installation — étape %d · FreshRSS',
-  'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
   'internal_problem_feed' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
   'invalid_login' => 'L’identifiant est invalide !',
   'invalid_url' => 'L’url <em>%s</em> est invalide.',
   'is_admin' => 'est administrateur',
-  'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
   'jan' => 'jan.',
   'january' => 'janvier',
   'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
   'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
   'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
   'jul' => 'jui.',
-  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
   'july' => 'juillet',
   'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-  'Jun' => '\\j\\u\\i\\n',
   'jun' => 'juin',
   'june' => 'juin',
   'keep_history' => 'Nombre minimum d’articles à conserver',
@@ -295,6 +301,7 @@
   'lead_developer' => 'Développeur principal',
   'license' => 'Licence',
   'load_more' => 'Charger plus d’articles',
+  'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
   'login' => 'Connexion',
   'login_configuration' => 'Identification',
   'login_persona_problem' => 'Problème de connexion à Persona ?',
@@ -303,41 +310,30 @@
   'logout' => 'Déconnexion',
   'logs' => 'Logs',
   'logs_empty' => 'Les logs sont vides.',
-  'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
   'main_stream' => 'Flux principal',
   'mar' => 'mar.',
-  'Mar' => '\\m\\a\\r\\s',
   'march' => 'mars',
   'mark_all_read' => 'Tout marquer comme lu',
   'mark_cat_read' => 'Marquer la catégorie comme lue',
   'mark_favorite' => 'Mettre en favori',
   'mark_feed_read' => 'Marquer le flux comme lu',
   'mark_read' => 'Marquer comme lu',
-  'May' => '\\m\\a\\i',
   'may' => 'mai.',
   'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
   'minz_is_ok' => 'Vous disposez du framework Minz',
   'mon' => 'lun.',
   'month' => 'mois',
   'more_information' => 'Plus d’informations',
-  'newer_first' => 'Plus récents en premier',
+  'n_entries_deleted' => '%d articles ont été supprimés.',
+  'n_feeds_actualized' => '%d flux ont été mis à jour.',
   'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
   'new_category' => 'Nouvelle catégorie',
+  'newer_first' => 'Plus récents en premier',
   'next' => 'Suivant',
   'next_article' => 'Passer à l’article suivant',
   'next_page' => 'Passer à la page suivante',
   'next_step' => 'Passer à l’étape suivante',
   'no' => 'Non',
-  'normal_view' => 'Vue normale',
-  'nothing_to_load' => 'Fin des articles',
-  'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
-  'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
-  'not_read' => '%d non lu',
-  'not_reads' => '%d non lus',
-  'not_yet_implemented' => 'Pas encore implémenté',
-  'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
-  'nov' => 'nov.',
-  'november' => 'novembre',
   'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
   'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
   'no_feed_to_refresh' => 'Il n’y a aucun flux à actualiser…',
@@ -347,12 +343,18 @@
   'no_selected_feed' => 'Aucun flux sélectionné.',
   'no_update' => 'Aucune mise à jour à appliquer',
   'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
+  'normal_view' => 'Vue normale',
+  'not_read' => '%d non lu',
+  'not_reads' => '%d non lus',
+  'not_yet_implemented' => 'Pas encore implémenté',
+  'nothing_to_load' => 'Fin des articles',
+  'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+  'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
+  'nov' => 'nov.',
+  'november' => 'novembre',
   'number_articles' => '%d articles',
   'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
   'number_feeds' => '%d flux',
-  'n_entries_deleted' => '%d articles ont été supprimés.',
-  'n_feeds_actualized' => '%d flux ont été mis à jour.',
-  'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
   'oct' => 'oct.',
   'october' => 'octobre',
   'ok' => 'Ok !',
@@ -419,8 +421,8 @@
   'refresh' => 'Actualisation',
   'related_tags' => 'Tags associés',
   'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
-  'rss_feeds_of' => 'Flux RSS de %s',
   'rss_feed_management' => 'Gestion des flux RSS',
+  'rss_feeds_of' => 'Flux RSS de %s',
   'rss_view' => 'Flux RSS',
   'sat' => 'sam.',
   'save' => 'Enregistrer',
@@ -431,7 +433,6 @@
   'see_on_website' => 'Voir sur le site d’origine',
   'see_website' => 'Voir le site',
   'sep' => 'sep.',
-  'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
   'september' => 'septembre',
   'shaarli' => 'Shaarli',
   'share' => 'Partager',
@@ -492,7 +493,6 @@
   'twitter' => 'Twitter',
   'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
   'update' => 'Mise à jour',
-  'updated' => 'Modifications enregistrées.',
   'update_apply' => 'Appliquer la mise à jour',
   'update_can_apply' => 'Une mise à jour est disponible.',
   'update_check' => 'Vérifier les mises à jour',
@@ -504,15 +504,16 @@
   'update_server_not_found' => 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
   'update_start' => 'Lancer la mise à jour',
   'update_system' => 'Système de mise à jour',
+  'updated' => 'Modifications enregistrées.',
   'upon_reception' => 'dès la réception du nouvel article',
-  'username' => 'Nom d’utilisateur',
-  'username_admin' => 'Nom d’utilisateur administrateur',
-  'users' => 'Utilisateurs',
-  'users_list' => 'Liste des utilisateurs',
   'user_created' => 'L’utilisateur %s a été créé.',
   'user_deleted' => 'L’utilisateur %s a été supprimé.',
   'user_filter' => 'Accéder aux filtres utilisateur',
   'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+  'username' => 'Nom d’utilisateur',
+  'username_admin' => 'Nom d’utilisateur administrateur',
+  'users' => 'Utilisateurs',
+  'users_list' => 'Liste des utilisateurs',
   'version' => 'Version',
   'version_update' => 'Mise à jour',
   'wallabag' => 'wallabag',

From e86a3d001745656c6ec94837ff3275d4bc93aa5a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 12:40:42 +0100
Subject: [PATCH 128/363] Fix pdo checking

Show only one message for both mysql and sqlite pdo conf. If one of them is ok,
PDO is ok.

See https://github.com/marienfressinaud/FreshRSS/issues/678
---
 lib/lib_rss.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 80eb206d2..8ae357f02 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -257,13 +257,13 @@ function is_referer_from_same_domain() {
  * @return array of tested values.
  */
 function check_install_php() {
+	$pdo_mysql = extension_loaded('pdo_mysql');
+	$pdo_sqlite = extension_loaded('pdo_sqlite');
 	return array(
 		'php' => version_compare(PHP_VERSION, '5.2.1') >= 0,
 		'minz' => file_exists(LIB_PATH . '/Minz'),
 		'curl' => extension_loaded('curl'),
-		'pdo_mysql' => extension_loaded('pdo_mysql'),
-		'pdo_sqlite' => extension_loaded('pdo_sqlite'),
-		'pdo' => extension_loaded('pdo_mysql') || extension_loaded('pdo_sqlite'),
+		'pdo' => $pdo_mysql || $pdo_sqlite,
 		'pcre' => extension_loaded('pcre'),
 		'ctype' => extension_loaded('ctype'),
 		'dom' => class_exists('DOMDocument'),

From 659515862566744fc90511bc4182fc32ccf2e6b3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 14:13:05 +0100
Subject: [PATCH 129/363] Fix themes (aside_feed)

---
 p/themes/Dark/dark.css               |  3 +--
 p/themes/Flat/flat.css               |  3 +--
 p/themes/Origine/origine.css         |  4 +---
 p/themes/Pafat/pafat.css             |  1 -
 p/themes/Screwdriver/screwdriver.css |  1 -
 p/themes/base-theme/base.css         |  1 -
 p/themes/base-theme/template.css     | 14 ++++++++++++--
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index e551aa9c0..03bf3c985 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -474,7 +474,6 @@ a.btn {
 	line-height: 2.5rem;
 	font-size: 1rem;
 	background: #1c1c1c;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -485,6 +484,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #2c2c2c;
+	font-weight: bold;
 }
 .tree-folder-items {
 	border-top: 1px solid #222;
@@ -594,7 +594,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 	background-color: #111;
 }
 
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index eb7737c5d..313bee0ee 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -483,7 +483,6 @@ a.btn {
 	background: #34495e;
 	line-height: 2.5rem;
 	font-size: 1rem;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -494,6 +493,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #2980b9;
+	font-weight: bold;
 }
 .tree-folder-items {
 	background: #2c3e50;
@@ -597,7 +597,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 464422a0b..afd6ec04f 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -508,7 +508,6 @@ a.btn {
 	background: #fff;
 	line-height: 2.5rem;
 	font-size: 1rem;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -519,6 +518,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #f0f0f0;
+	font-weight: bold;
 }
 .tree-folder.active .tree-folder-title .title {
 	color: #0062BE;
@@ -629,11 +629,9 @@ a.btn {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	background-color: #fff;
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 49cb3bc17..8b1e7866c 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -642,7 +642,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 	background-color: #fff;
 }
 
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 4f55d752e..b6c2e670e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -664,7 +664,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 871a632d8..ac30dbfea 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -465,7 +465,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index a79d539d8..ffb104af2 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -401,14 +401,23 @@ a.btn {
 .aside {
 	display: table-cell;
 	height: 100%;
-	width: 250px;
+	width: 300px;
 	vertical-align: top;
 }
 
-/*=== Aside main page (feeds) */
+/*=== Aside main page */
+.aside_feed .tree-folder-title .icon {
+	padding: 5px;
+}
+.aside_feed .tree-folder-items .item.feed {
+	padding: 0px 15px;
+}
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
+.aside_feed .tree-folder-items .dropdown {
+	vertical-align: top;
+}
 .aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
@@ -472,6 +481,7 @@ a.btn {
 .flux .item.date {
 	width: 145px;
 	text-align: right;
+	overflow: hidden;
 }
 .flux .item > a {
 	display: block;

From 956896bf87275317ba822188c14e07eb21fae3de Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sun, 26 Oct 2014 17:01:31 +0100
Subject: [PATCH 130/363] Fixes #683

---
 app/actualize_script.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index e5925514e..74840215b 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -7,6 +7,11 @@ ob_implicit_flush(false);
 ob_start();
 echo 'Results: ', "\n";	//Buffered
 
+if (defined('STDOUT')) {
+	$begin_date = date_create('now');
+	fwrite(STDOUT, 'Starting feed actualization at ' . $begin_date->format('H:i:s (O)') . "\n");	//Unbuffered
+}
+
 Minz_Configuration::init();
 
 $users = listUsers();
@@ -52,6 +57,10 @@ foreach ($users as $myUser) {
 syslog(LOG_INFO, 'FreshRSS actualize done.');
 if (defined('STDOUT')) {
 	fwrite(STDOUT, 'Done.' . "\n");
+	$end_date = date_create('now');
+	$duration = date_diff($end_date, $begin_date);
+	fwrite(STDOUT, 'Ending feed actualization at ' . $begin_date->format('H:i:s (O)') . "\n");	//Unbuffered
+	fwrite(STDOUT, 'Feed actualizations took ' . $duration->format('%H hours %M minutes and %S') . ' secondes for ' . count($users) . " users\n");	//Unbuffered
 }
 echo 'End.', "\n";
 ob_end_flush();

From 01ef0ef2b8b5f8eda53b2dff19f460dd9d1b8276 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 18:58:43 +0100
Subject: [PATCH 131/363] Fix nav_entries menu width

See https://github.com/marienfressinaud/FreshRSS/issues/678
---
 p/themes/base-theme/template.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index ffb104af2..6640284f9 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -569,7 +569,7 @@ br + br + br {
 	position: fixed;
 	bottom: 0; left: 0;
 	display: table;
-	width: 250px;
+	width: 300px;
 	background: #fff;
 	table-layout: fixed;
 }

From e861e5789d52fab6c4055e39fb92d64194eaab5e Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sun, 26 Oct 2014 19:00:00 +0100
Subject: [PATCH 132/363] Fix errors + improvements on bug #683 fix.

---
 app/actualize_script.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index 74840215b..9fe499cc9 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -9,7 +9,7 @@ echo 'Results: ', "\n";	//Buffered
 
 if (defined('STDOUT')) {
 	$begin_date = date_create('now');
-	fwrite(STDOUT, 'Starting feed actualization at ' . $begin_date->format('H:i:s (O)') . "\n");	//Unbuffered
+	fwrite(STDOUT, 'Starting feed actualization at ' . $begin_date->format('c') . "\n");	//Unbuffered
 }
 
 Minz_Configuration::init();
@@ -59,8 +59,8 @@ if (defined('STDOUT')) {
 	fwrite(STDOUT, 'Done.' . "\n");
 	$end_date = date_create('now');
 	$duration = date_diff($end_date, $begin_date);
-	fwrite(STDOUT, 'Ending feed actualization at ' . $begin_date->format('H:i:s (O)') . "\n");	//Unbuffered
-	fwrite(STDOUT, 'Feed actualizations took ' . $duration->format('%H hours %M minutes and %S') . ' secondes for ' . count($users) . " users\n");	//Unbuffered
+	fwrite(STDOUT, 'Ending feed actualization at ' . $end_date->format('c') . "\n");	//Unbuffered
+	fwrite(STDOUT, 'Feed actualizations took ' . $duration->format('%a day(s), %h hour(s),  %i minute(s) and %s seconds') . ' for ' . count($users) . " users\n");	//Unbuffered
 }
 echo 'End.', "\n";
 ob_end_flush();

From 482f995d61f4b172f7b79becc25d0d7157098daf Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 21:21:07 +0100
Subject: [PATCH 133/363] All the category area is clickable

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 p/themes/base-theme/template.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 6640284f9..79fe506f2 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -348,6 +348,8 @@ a.btn {
 	text-overflow: ellipsis;
 }
 .tree-folder-title .title {
+	display: inline-block;
+	width: 100%;
 	vertical-align: middle;
 }
 .tree-folder-items > .item {
@@ -406,6 +408,10 @@ a.btn {
 }
 
 /*=== Aside main page */
+.aside_feed .category .title {
+	width: calc(100% - 35px);
+}
+
 .aside_feed .tree-folder-title .icon {
 	padding: 5px;
 }

From 299495d0820dd6a8c26842264a3b15b95884b9fb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 26 Oct 2014 22:33:00 +0100
Subject: [PATCH 134/363] Crypto update bcrypt.js + bug

https://github.com/marienfressinaud/FreshRSS/issues/676
---
 p/scripts/bcrypt.min.js | 78 ++++++++++++++++++++++-------------------
 p/scripts/main.js       |  2 +-
 2 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/p/scripts/bcrypt.min.js b/p/scripts/bcrypt.min.js
index 6892caddc..614f0c259 100644
--- a/p/scripts/bcrypt.min.js
+++ b/p/scripts/bcrypt.min.js
@@ -1,41 +1,45 @@
-/*
+(function(){/*
  bcrypt.js (c) 2013 Daniel Wirtz <dcode@dcode.io>
  Released under the Apache License, Version 2.0
  see: https://github.com/dcodeIO/bcrypt.js for details
 */
-function p(n){throw n;}var q=null;
-(function(n){function u(c,a,b,f){for(var d,e=c[a],l=c[a+1],e=e^b[0],h=0;14>=h;)d=f[e>>24&255],d+=f[256|e>>16&255],d^=f[512|e>>8&255],d+=f[768|e&255],l^=d^b[++h],d=f[l>>24&255],d+=f[256|l>>16&255],d^=f[512|l>>8&255],d+=f[768|l&255],e^=d^b[++h];c[a]=l^b[17];c[a+1]=e;return c}function s(c,a){var b,f=0;for(b=0;4>b;b++)f=f<<8|c[a]&255,a=(a+1)%c.length;return{key:f,a:a}}function y(c,a,b){for(var f=0,d=[0,0],e=a.length,l=b.length,h=0;h<e;h++){var g=s(c,f),f=g.a;a[h]^=g.key}for(h=0;h<e;h+=2)d=u(d,0,a,b),
-a[h]=d[0],a[h+1]=d[1];for(h=0;h<l;h+=2)d=u(d,0,a,b),b[h]=d[0],b[h+1]=d[1]}function C(c,a,b,f){for(var d=0,e=[0,0],l=b.length,h=f.length,g,k=0;k<l;k++)g=s(a,d),d=g.a,b[k]^=g.key;for(k=d=0;k<l;k+=2)g=s(c,d),d=g.a,e[0]^=g.key,g=s(c,d),d=g.a,e[1]^=g.key,e=u(e,0,b,f),b[k]=e[0],b[k+1]=e[1];for(k=0;k<h;k+=2)g=s(c,d),d=g.a,e[0]^=g.key,g=s(c,d),d=g.a,e[1]^=g.key,e=u(e,0,b,f),f[k]=e[0],f[k+1]=e[1]}function z(c){"undefined"!==typeof process&&"function"===typeof process.nextTick?process.nextTick(c):setTimeout(c,
-0)}function A(c,a,b,f){function d(){if(k<b)for(var n=new Date;k<b&&!(k+=1,y(c,h,g),y(a,h,g),100<Date.now()-n););else{for(k=0;64>k;k++)for(m=0;m<l>>1;m++)u(e,m<<1,h,g);n=[];for(k=0;k<l;k++)n.push((e[k]>>24&255)>>>0),n.push((e[k]>>16&255)>>>0),n.push((e[k]>>8&255)>>>0),n.push((e[k]&255)>>>0);return f?(f(q,n),q):n}f&&z(d);return q}var e=B.slice(),l=e.length;(4>b||31<b)&&p(Error("Illegal number of rounds: "+b));16!=a.length&&p(Error("Illegal salt length: "+a.length+" != 16"));b=1<<b;var h=D.slice(),g=
-E.slice();C(a,c,h,g);var k=0,m;if("undefined"!==typeof f)return d(),q;for(var n;;)if((n=d())!==q)return n}function F(c){for(var a,b,f=[],d=0;d<c.length;d++){a=c.charCodeAt(d);b=[];do b.push(a&255),a>>=8;while(a);f=f.concat(b.reverse())}return f}function w(c,a,b){function f(a){var b=[];b.push("$2");"a"<=d&&b.push(d);b.push("$");10>l&&b.push("0");b.push(l.toString());b.push("$");b.push(v.b(h,h.length));b.push(v.b(a,4*B.length-1));return b.join("")}var d,e;("$"!=a.charAt(0)||"2"!=a.charAt(1))&&p(Error("Invalid salt version: "+
-a.substring(0,2)));"$"==a.charAt(2)?(d=String.fromCharCode(0),e=3):(d=a.charAt(2),("a"!=d||"$"!=a.charAt(3))&&p(Error("Invalid salt revision: "+a.substring(2,4))),e=4);"$"<a.charAt(e+2)&&p(Error("Missing salt rounds"));var l=10*parseInt(a.substring(e,e+1),10)+parseInt(a.substring(e+1,e+2),10);a=a.substring(e+3,e+25);c=F(c+("a"<=d?"\x00":""));var h=[],h=v.c(a,16);if("undefined"==typeof b)return f(A(c,h,l));A(c,h,l,function(a,c){a?b(a,q):b(q,f(c))});return q}function G(){if("undefined"!==typeof module&&
-module.exports)return require("crypto").randomBytes(16);var c=new Uint32Array(16);n.crypto&&"function"===typeof n.crypto.getRandomValues?n.crypto.getRandomValues(c):"function"===typeof x?x(c):p(Error("Failed to generate random values: Web Crypto API not available / no polyfill set"));return Array.prototype.slice.call(c)}var t="./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".split(""),r=[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,54,55,56,57,58,59,60,61,62,63,-1,-1,-1,-1,-1,-1,-1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,-1,-1,-1,-1,-1,-1,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,-1,-1,-1,-1,-1],v={b:function(c,a){var b=0,f=[],d,e;for((0>=a||a>c.length)&&p(Error("Invalid 'len': "+a));b<a;){d=c[b++]&255;f.push(t[d>>2&63]);d=(d&3)<<4;if(b>=a){f.push(t[d&63]);break}e=c[b++]&255;d|=e>>4&15;f.push(t[d&63]);d=(e&15)<<
-2;if(b>=a){f.push(t[d&63]);break}e=c[b++]&255;d|=e>>6&3;f.push(t[d&63]);f.push(t[e&63])}return f.join("")},c:function(c,a){var b=0,f=c.length,d=0,e=[],l,h,g;for(0>=a&&p(Error("Illegal 'len': "+a));b<f-1&&d<a;){g=c.charCodeAt(b++);l=g<r.length?r[g]:-1;g=c.charCodeAt(b++);h=g<r.length?r[g]:-1;if(-1==l||-1==h)break;g=l<<2>>>0;g|=(h&48)>>4;e.push(String.fromCharCode(g));if(++d>=a||b>=f)break;g=c.charCodeAt(b++);l=g<r.length?r[g]:-1;if(-1==l)break;g=(h&15)<<4>>>0;g|=(l&60)>>2;e.push(String.fromCharCode(g));
-if(++d>=a||b>=f)break;g=c.charCodeAt(b++);h=g<r.length?r[g]:-1;g=(l&3)<<6>>>0;g|=h;e.push(String.fromCharCode(g));++d}f=[];for(b=0;b<d;b++)f.push(e[b].charCodeAt(0));return f}},m={},D=[608135816,2242054355,320440878,57701188,2752067618,698298832,137296536,3964562569,1160258022,953160567,3193202383,887688300,3232508343,3380367581,1065670069,3041331479,2450970073,2306472731],E=[3509652390,2564797868,805139163,3491422135,3101798381,1780907670,3128725573,4046225305,614570311,3012652279,134345442,2240740374,
-1667834072,1901547113,2757295779,4103290238,227898511,1921955416,1904987480,2182433518,2069144605,3260701109,2620446009,720527379,3318853667,677414384,3393288472,3101374703,2390351024,1614419982,1822297739,2954791486,3608508353,3174124327,2024746970,1432378464,3864339955,2857741204,1464375394,1676153920,1439316330,715854006,3033291828,289532110,2706671279,2087905683,3018724369,1668267050,732546397,1947742710,3462151702,2609353502,2950085171,1814351708,2050118529,680887927,999245976,1800124847,3300911131,
-1713906067,1641548236,4213287313,1216130144,1575780402,4018429277,3917837745,3693486850,3949271944,596196993,3549867205,258830323,2213823033,772490370,2760122372,1774776394,2652871518,566650946,4142492826,1728879713,2882767088,1783734482,3629395816,2517608232,2874225571,1861159788,326777828,3124490320,2130389656,2716951837,967770486,1724537150,2185432712,2364442137,1164943284,2105845187,998989502,3765401048,2244026483,1075463327,1455516326,1322494562,910128902,469688178,1117454909,936433444,3490320968,
-3675253459,1240580251,122909385,2157517691,634681816,4142456567,3825094682,3061402683,2540495037,79693498,3249098678,1084186820,1583128258,426386531,1761308591,1047286709,322548459,995290223,1845252383,2603652396,3431023940,2942221577,3202600964,3727903485,1712269319,422464435,3234572375,1170764815,3523960633,3117677531,1434042557,442511882,3600875718,1076654713,1738483198,4213154764,2393238008,3677496056,1014306527,4251020053,793779912,2902807211,842905082,4246964064,1395751752,1040244610,2656851899,
-3396308128,445077038,3742853595,3577915638,679411651,2892444358,2354009459,1767581616,3150600392,3791627101,3102740896,284835224,4246832056,1258075500,768725851,2589189241,3069724005,3532540348,1274779536,3789419226,2764799539,1660621633,3471099624,4011903706,913787905,3497959166,737222580,2514213453,2928710040,3937242737,1804850592,3499020752,2949064160,2386320175,2390070455,2415321851,4061277028,2290661394,2416832540,1336762016,1754252060,3520065937,3014181293,791618072,3188594551,3933548030,2332172193,
-3852520463,3043980520,413987798,3465142937,3030929376,4245938359,2093235073,3534596313,375366246,2157278981,2479649556,555357303,3870105701,2008414854,3344188149,4221384143,3956125452,2067696032,3594591187,2921233993,2428461,544322398,577241275,1471733935,610547355,4027169054,1432588573,1507829418,2025931657,3646575487,545086370,48609733,2200306550,1653985193,298326376,1316178497,3007786442,2064951626,458293330,2589141269,3591329599,3164325604,727753846,2179363840,146436021,1461446943,4069977195,
-705550613,3059967265,3887724982,4281599278,3313849956,1404054877,2845806497,146425753,1854211946,1266315497,3048417604,3681880366,3289982499,290971E4,1235738493,2632868024,2414719590,3970600049,1771706367,1449415276,3266420449,422970021,1963543593,2690192192,3826793022,1062508698,1531092325,1804592342,2583117782,2714934279,4024971509,1294809318,4028980673,1289560198,2221992742,1669523910,35572830,157838143,1052438473,1016535060,1802137761,1753167236,1386275462,3080475397,2857371447,1040679964,2145300060,
-2390574316,1461121720,2956646967,4031777805,4028374788,33600511,2920084762,1018524850,629373528,3691585981,3515945977,2091462646,2486323059,586499841,988145025,935516892,3367335476,2599673255,2839830854,265290510,3972581182,2759138881,3795373465,1005194799,847297441,406762289,1314163512,1332590856,1866599683,4127851711,750260880,613907577,1450815602,3165620655,3734664991,3650291728,3012275730,3704569646,1427272223,778793252,1343938022,2676280711,2052605720,1946737175,3164576444,3914038668,3967478842,
-3682934266,1661551462,3294938066,4011595847,840292616,3712170807,616741398,312560963,711312465,1351876610,322626781,1910503582,271666773,2175563734,1594956187,70604529,3617834859,1007753275,1495573769,4069517037,2549218298,2663038764,504708206,2263041392,3941167025,2249088522,1514023603,1998579484,1312622330,694541497,2582060303,2151582166,1382467621,776784248,2618340202,3323268794,2497899128,2784771155,503983604,4076293799,907881277,423175695,432175456,1378068232,4145222326,3954048622,3938656102,
-3820766613,2793130115,2977904593,26017576,3274890735,3194772133,1700274565,1756076034,4006520079,3677328699,720338349,1533947780,354530856,688349552,3973924725,1637815568,332179504,3949051286,53804574,2852348879,3044236432,1282449977,3583942155,3416972820,4006381244,1617046695,2628476075,3002303598,1686838959,431878346,2686675385,1700445008,1080580658,1009431731,832498133,3223435511,2605976345,2271191193,2516031870,1648197032,4164389018,2548247927,300782431,375919233,238389289,3353747414,2531188641,
-2019080857,1475708069,455242339,2609103871,448939670,3451063019,1395535956,2413381860,1841049896,1491858159,885456874,4264095073,4001119347,1565136089,3898914787,1108368660,540939232,1173283510,2745871338,3681308437,4207628240,3343053890,4016749493,1699691293,1103962373,3625875870,2256883143,3830138730,1031889488,3479347698,1535977030,4236805024,3251091107,2132092099,1774941330,1199868427,1452454533,157007616,2904115357,342012276,595725824,1480756522,206960106,497939518,591360097,863170706,2375253569,
-3596610801,1814182875,2094937945,3421402208,1082520231,3463918190,2785509508,435703966,3908032597,1641649973,2842273706,3305899714,1510255612,2148256476,2655287854,3276092548,4258621189,236887753,3681803219,274041037,1734335097,3815195456,3317970021,1899903192,1026095262,4050517792,356393447,2410691914,3873677099,3682840055,3913112168,2491498743,4132185628,2489919796,1091903735,1979897079,3170134830,3567386728,3557303409,857797738,1136121015,1342202287,507115054,2535736646,337727348,3213592640,1301675037,
-2528481711,1895095763,1721773893,3216771564,62756741,2142006736,835421444,2531993523,1442658625,3659876326,2882144922,676362277,1392781812,170690266,3921047035,1759253602,3611846912,1745797284,664899054,1329594018,3901205900,3045908486,2062866102,2865634940,3543621612,3464012697,1080764994,553557557,3656615353,3996768171,991055499,499776247,1265440854,648242737,3940784050,980351604,3713745714,1749149687,3396870395,4211799374,3640570775,1161844396,3125318951,1431517754,545492359,4268468663,3499529547,
-1437099964,2702547544,3433638243,2581715763,2787789398,1060185593,1593081372,2418618748,4260947970,69676912,2159744348,86519011,2512459080,3838209314,1220612927,3339683548,133810670,1090789135,1078426020,1569222167,845107691,3583754449,4072456591,1091646820,628848692,1613405280,3757631651,526609435,236106946,48312990,2942717905,3402727701,1797494240,859738849,992217954,4005476642,2243076622,3870952857,3732016268,765654824,3490871365,2511836413,1685915746,3888969200,1414112111,2273134842,3281911079,
-4080962846,172450625,2569994100,980381355,4109958455,2819808352,2716589560,2568741196,3681446669,3329971472,1835478071,660984891,3704678404,4045999559,3422617507,3040415634,1762651403,1719377915,3470491036,2693910283,3642056355,3138596744,1364962596,2073328063,1983633131,926494387,3423689081,2150032023,4096667949,1749200295,3328846651,309677260,2016342300,1779581495,3079819751,111262694,1274766160,443224088,298511866,1025883608,3806446537,1145181785,168956806,3641502830,3584813610,1689216846,3666258015,
-3200248200,1692713982,2646376535,4042768518,1618508792,1610833997,3523052358,4130873264,2001055236,3610705100,2202168115,4028541809,2961195399,1006657119,2006996926,3186142756,1430667929,3210227297,1314452623,4074634658,4101304120,2273951170,1399257539,3367210612,3027628629,1190975929,2062231137,2333990788,2221543033,2438960610,1181637006,548689776,2362791313,3372408396,3104550113,3145860560,296247880,1970579870,3078560182,3769228297,1714227617,3291629107,3898220290,166772364,1251581989,493813264,
-448347421,195405023,2709975567,677966185,3703036547,1463355134,2715995803,1338867538,1343315457,2802222074,2684532164,233230375,2599980071,2000651841,3277868038,1638401717,4028070440,3237316320,6314154,819756386,300326615,590932579,1405279636,3267499572,3150704214,2428286686,3959192993,3461946742,1862657033,1266418056,963775037,2089974820,2263052895,1917689273,448879540,3550394620,3981727096,150775221,3627908307,1303187396,508620638,2975983352,2726630617,1817252668,1876281319,1457606340,908771278,
-3720792119,3617206836,2455994898,1729034894,1080033504,976866871,3556439503,2881648439,1522871579,1555064734,1336096578,3548522304,2579274686,3574697629,3205460757,3593280638,3338716283,3079412587,564236357,2993598910,1781952180,1464380207,3163844217,3332601554,1699332808,1393555694,1183702653,3581086237,1288719814,691649499,2847557200,2895455976,3193889540,2717570544,1781354906,1676643554,2592534050,3230253752,1126444790,2770207658,2633158820,2210423226,2615765581,2414155088,3127139286,673620729,
-2805611233,1269405062,4015350505,3341807571,4149409754,1057255273,2012875353,2162469141,2276492801,2601117357,993977747,3918593370,2654263191,753973209,36408145,2530585658,25011837,3520020182,2088578344,530523599,2918365339,1524020338,1518925132,3760827505,3759777254,1202760957,3985898139,3906192525,674977740,4174734889,2031300136,2019492241,3983892565,4153806404,3822280332,352677332,2297720250,60907813,90501309,3286998549,1016092578,2535922412,2839152426,457141659,509813237,4120667899,652014361,
-1966332200,2975202805,55981186,2327461051,676427537,3255491064,2882294119,3433927263,1307055953,942726286,933058658,2468411793,3933900994,4215176142,1361170020,2001714738,2830558078,3274259782,1222529897,1679025792,2729314320,3714953764,1770335741,151462246,3013232138,1682292957,1483529935,471910574,1539241949,458788160,3436315007,1807016891,3718408830,978976581,1043663428,3165965781,1927990952,4200891579,2372276910,3208408903,3533431907,1412390302,2931980059,4132332400,1947078029,3881505623,4168226417,
-2941484381,1077988104,1320477388,886195818,18198404,3786409E3,2509781533,112762804,3463356488,1866414978,891333506,18488651,661792760,1628790961,3885187036,3141171499,876946877,2693282273,1372485963,791857591,2686433993,3759982718,3167212022,3472953795,2716379847,445679433,3561995674,3504004811,3574258232,54117162,3331405415,2381918588,3769707343,4154350007,1140177722,4074052095,668550556,3214352940,367459370,261225585,2610173221,4209349473,3468074219,3265815641,314222801,3066103646,3808782860,282218597,
-3406013506,3773591054,379116347,1285071038,846784868,2669647154,3771962079,3550491691,2305946142,453669953,1268987020,3317592352,3279303384,3744833421,2610507566,3859509063,266596637,3847019092,517658769,3462560207,3443424879,370717030,4247526661,2224018117,4143653529,4112773975,2788324899,2477274417,1456262402,2901442914,1517677493,1846949527,2295493580,3734397586,2176403920,1280348187,1908823572,3871786941,846861322,1172426758,3287448474,3383383037,1655181056,3139813346,901632758,1897031941,2986607138,
-3066810236,3447102507,1393639104,373351379,950779232,625454576,3124240540,4148612726,2007998917,544563296,2244738638,2330496472,2058025392,1291430526,424198748,50039436,29584100,3605783033,2429876329,2791104160,1057563949,3255363231,3075367218,3463963227,1469046755,985887462],B=[1332899944,1700884034,1701343084,1684370003,1668446532,1869963892],x=q;m.setRandomPolyfill=function(c){x=c};m.genSaltSync=function(c){c||(c=10);var a;c=c||10;(4>c||31<c)&&p(Error("Illegal number of rounds: "+c));var b=[];
-b.push("$2a$");10>c&&b.push("0");b.push(c.toString());b.push("$");try{b.push(v.b(G(),16)),a=b.join("")}catch(f){p(f)}return a};m.genSalt=function(c,a,b){"function"==typeof a&&(b=a,a=-1);var f;"function"==typeof c?(b=c,f=10):f=parseInt(c,10);"function"!=typeof b&&p(Error("Illegal or missing 'callback': "+b));z(function(){try{var a=m.genSaltSync(f);b(q,a)}catch(c){b(c,q)}})};m.hashSync=function(c,a){a||(a=10);"number"==typeof a&&(a=m.genSaltSync(a));return w(c,a)};m.hash=function(c,a,b){"function"!=
-typeof b&&p(Error("Illegal 'callback': "+b));"number"==typeof a?m.genSalt(a,function(a,d){w(c,d,b)}):w(c,a,b)};m.compareSync=function(c,a){("string"!=typeof c||"string"!=typeof a)&&p(Error("Illegal argument types: "+typeof c+", "+typeof a));60!=a.length&&p(Error("Illegal hash length: "+a.length+" != 60"));for(var b=m.hashSync(c,a.substr(0,a.length-31)),f=b.length==a.length,d=b.length<a.length?b.length:a.length,e=0;e<d;++e)b.length>=e&&(a.length>=e&&b[e]!=a[e])&&(f=!1);return f};m.compare=function(c,
-a,b){"function"!=typeof b&&p(Error("Illegal 'callback': "+b));m.hash(c,a.substr(0,29),function(c,d){b(c,a===d)})};m.getRounds=function(c){"string"!=typeof c&&p(Error("Illegal type of 'hash': "+typeof c));return parseInt(c.split("$")[2],10)};m.getSalt=function(c){"string"!=typeof c&&p(Error("Illegal type of 'hash': "+typeof c));60!=c.length&&p(Error("Illegal hash length: "+c.length+" != 60"));return c.substring(0,29)};"undefined"!=typeof module&&module.exports?module.exports=m:"undefined"!=typeof define&&
-define.amd?define("bcrypt",function(){return m}):(n.dcodeIO||(n.dcodeIO={}),n.dcodeIO.bcrypt=m)})(this);
+function l(t){throw t;}var p=null;
+(function(t){function B(c){if("undefined"!==typeof module&&module&&module.exports)try{return require("crypto").randomBytes(c)}catch(a){}try{var b;(t.crypto||t.msCrypto).getRandomValues(b=new Uint32Array(c));return Array.prototype.slice.call(b)}catch(d){}x||l(Error("Neither WebCryptoAPI nor a crypto module is available. Use bcrypt.setRandomFallback to set an alternative"));return x(c)}function F(c){var a=[],b=0;G.f(function(){return b>=c.length?p:c.charCodeAt(b++)},function(b){a.push(b)});return a}
+function y(c,a){var b=0,d=[],f,e;for((0>=a||a>c.length)&&l(Error("Illegal len: "+a));b<a;){f=c[b++]&255;d.push(u[f>>2&63]);f=(f&3)<<4;if(b>=a){d.push(u[f&63]);break}e=c[b++]&255;f|=e>>4&15;d.push(u[f&63]);f=(e&15)<<2;if(b>=a){d.push(u[f&63]);break}e=c[b++]&255;f|=e>>6&3;d.push(u[f&63]);d.push(u[e&63])}return d.join("")}function H(c){for(var a=0,b=c.length,d=0,f=[],e,k,h;a<b-1&&16>d;){h=c.charCodeAt(a++);e=h<r.length?r[h]:-1;h=c.charCodeAt(a++);k=h<r.length?r[h]:-1;if(-1==e||-1==k)break;h=e<<2>>>0;
+h|=(k&48)>>4;f.push(z(h));if(16<=++d||a>=b)break;h=c.charCodeAt(a++);e=h<r.length?r[h]:-1;if(-1==e)break;h=(k&15)<<4>>>0;h|=(e&60)>>2;f.push(z(h));if(16<=++d||a>=b)break;h=c.charCodeAt(a++);k=h<r.length?r[h]:-1;h=(e&3)<<6>>>0;h|=k;f.push(z(h));++d}c=[];for(a=0;a<d;a++)c.push(f[a].charCodeAt(0));return c}function w(c,a,b,d){for(var f,e=c[a],k=c[a+1],e=e^b[0],h=0;14>=h;)f=d[e>>24&255],f+=d[256|e>>16&255],f^=d[512|e>>8&255],f+=d[768|e&255],k^=f^b[++h],f=d[k>>24&255],f+=d[256|k>>16&255],f^=d[512|k>>8&
+255],f+=d[768|k&255],e^=f^b[++h];c[a]=k^b[17];c[a+1]=e;return c}function v(c,a){for(var b=0,d=0;4>b;++b)d=d<<8|c[a]&255,a=(a+1)%c.length;return{key:d,a:a}}function C(c,a,b){for(var d=0,f=[0,0],e=a.length,k=b.length,h,g=0;g<e;g++)h=v(c,d),d=h.a,a[g]^=h.key;for(g=0;g<e;g+=2)f=w(f,0,a,b),a[g]=f[0],a[g+1]=f[1];for(g=0;g<k;g+=2)f=w(f,0,a,b),b[g]=f[0],b[g+1]=f[1]}function I(c,a,b,d){for(var f=0,e=[0,0],k=b.length,h=d.length,g,m=0;m<k;m++)g=v(a,f),f=g.a,b[m]^=g.key;for(m=f=0;m<k;m+=2)g=v(c,f),f=g.a,e[0]^=
+g.key,g=v(c,f),f=g.a,e[1]^=g.key,e=w(e,0,b,d),b[m]=e[0],b[m+1]=e[1];for(m=0;m<h;m+=2)g=v(c,f),f=g.a,e[0]^=g.key,g=v(c,f),f=g.a,e[1]^=g.key,e=w(e,0,b,d),d[m]=e[0],d[m+1]=e[1]}function D(c,a,b,d,f){function e(){f&&f(q/b);if(q<b)for(var g=Date.now();q<b&&!(q+=1,C(c,m,n),C(a,m,n),100<Date.now()-g););else{for(q=0;64>q;q++)for(r=0;r<h>>1;r++)w(k,r<<1,m,n);g=[];for(q=0;q<h;q++)g.push((k[q]>>24&255)>>>0),g.push((k[q]>>16&255)>>>0),g.push((k[q]>>8&255)>>>0),g.push((k[q]&255)>>>0);if(d){d(p,g);return}return g}d&&
+s(e)}var k=E.slice(),h=k.length,g;if(4>b||31<b){g=Error("Illegal number of rounds (4-31): "+b);if(d){s(d.bind(this,g));return}l(g)}if(16!==a.length){g=Error("Illegal salt length: "+a.length+" != 16");if(d){s(d.bind(this,g));return}l(g)}b=1<<b;var m=J.slice(),n=K.slice(),q=0,r;I(a,c,m,n);if("undefined"!==typeof d)e();else for(;;)if("undefined"!==typeof(g=e()))return g||[]}function A(c,a,b,d){function f(a){var b=[];b.push("$2");"a"<=k&&b.push(k);b.push("$");10>g&&b.push("0");b.push(g.toString());b.push("$");
+b.push(y(m,m.length));b.push(y(a,4*E.length-1));return b.join("")}var e;if("string"!==typeof c||"string"!==typeof a){e=Error("Invalid string / salt: Not a string");if(b){s(b.bind(this,e));return}l(e)}var k,h;if("$"!==a.charAt(0)||"2"!==a.charAt(1)){e=Error("Invalid salt version: "+a.substring(0,2));if(b){s(b.bind(this,e));return}l(e)}if("$"===a.charAt(2))k=String.fromCharCode(0),h=3;else{k=a.charAt(2);if("a"!==k&&"y"!==k||"$"!==a.charAt(3)){e=Error("Invalid salt revision: "+a.substring(2,4));if(b){s(b.bind(this,
+e));return}l(e)}h=4}if("$"<a.charAt(h+2)){e=Error("Missing salt rounds");if(b){s(b.bind(this,e));return}l(e)}var g=10*parseInt(a.substring(h,h+1),10)+parseInt(a.substring(h+1,h+2),10);a=a.substring(h+3,h+25);c=F(c+("a"<=k?"\x00":""));var m=H(a);if("undefined"==typeof b)return f(D(c,m,g));D(c,m,g,function(a,d){a?b(a,p):b(p,f(d))},d)}var n={},x=p;try{B(1)}catch(L){}x=p;n.l=function(c){x=c};n.genSaltSync=function(c,a){"undefined"===typeof c?c=10:"number"!==typeof c&&l(Error("Illegal arguments: "+typeof c+
+", "+typeof a));(4>c||31<c)&&l(Error("Illegal number of rounds (4-31): "+c));var b=[];b.push("$2a$");10>c&&b.push("0");b.push(c.toString());b.push("$");b.push(y(B(16),16));return b.join("")};n.genSalt=function(c,a,b){"function"===typeof a&&(b=a,a=void 0);"function"===typeof c&&(b=c,c=10);"function"!==typeof b&&l(Error("Illegal callback: "+typeof b));"number"!==typeof c?s(b.bind(this,Error("Illegal arguments: "+typeof c))):s(function(){try{b(p,n.genSaltSync(c))}catch(a){b(a)}})};n.hashSync=function(c,
+a){"undefined"===typeof a&&(a=10);"number"===typeof a&&(a=n.genSaltSync(a));("string"!==typeof c||"string"!==typeof a)&&l(Error("Illegal arguments: "+typeof c+", "+typeof a));return A(c,a)};n.hash=function(c,a,b,d){"function"!==typeof b&&l(Error("Illegal callback: "+typeof b));"string"===typeof c&&"number"===typeof a?n.genSalt(a,function(a,e){A(c,e,b,d)}):"string"===typeof c&&"string"===typeof a?A(c,a,b,d):s(b.bind(this,Error("Illegal arguments: "+typeof c+", "+typeof a)))};n.compareSync=function(c,
+a){("string"!==typeof c||"string"!==typeof a)&&l(Error("Illegal arguments: "+typeof c+", "+typeof a));if(60!==a.length)return!1;for(var b=n.hashSync(c,a.substr(0,a.length-31)),d=b.length===a.length,f=b.length<a.length?b.length:a.length,e=0;e<f;++e)b.length>=e&&(a.length>=e&&b[e]!=a[e])&&(d=!1);return d};n.compare=function(c,a,b,d){"function"!==typeof b&&l(Error("Illegal callback: "+typeof b));"string"!==typeof c||"string"!==typeof a?s(b.bind(this,Error("Illegal arguments: "+typeof c+", "+typeof a))):
+n.hash(c,a.substr(0,29),function(d,c){b(d,a===c)},d)};n.getRounds=function(c){"string"!==typeof c&&l(Error("Illegal arguments: "+typeof c));return parseInt(c.split("$")[2],10)};n.getSalt=function(c){"string"!==typeof c&&l(Error("Illegal arguments: "+typeof c));60!==c.length&&l(Error("Illegal hash length: "+c.length+" != 60"));return c.substring(0,29)};var s="undefined"!==typeof process&&process&&"function"===typeof process.nextTick?"function"===typeof setImmediate?setImmediate:process.nextTick:setTimeout,
+u="./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".split(""),r=[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,54,55,56,57,58,59,60,61,62,63,-1,-1,-1,-1,-1,-1,-1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,-1,-1,-1,-1,-1,-1,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,-1,-1,-1,-1,-1],z=String.fromCharCode,G=function(){var c={h:1114111,
+g:function(a,b){var d=p;"number"===typeof a&&(d=a,a=function(){return p});for(;d!==p||(d=a())!==p;)128>d?b(d&127):(2048>d?b(d>>6&31|192):(65536>d?b(d>>12&15|224):(b(d>>18&7|240),b(d>>12&63|128)),b(d>>6&63|128)),b(d&63|128)),d=p},e:function(a,b){function d(a){a=a.slice(0,a.indexOf(p));var b=Error(a.toString());b.name="TruncatedError";b.bytes=a;l(b)}for(var c,e,k,h;(c=a())!==p;)0===(c&128)?b(c):192===(c&224)?((e=a())===p&&d([c,e]),b((c&31)<<6|e&63)):224===(c&240)?(((e=a())===p||(k=a())===p)&&d([c,e,
+k]),b((c&15)<<12|(e&63)<<6|k&63)):240===(c&248)?(((e=a())===p||(k=a())===p||(h=a())===p)&&d([c,e,k,h]),b((c&7)<<18|(e&63)<<12|(k&63)<<6|h&63)):l(RangeError("Illegal starting byte: "+c))},b:function(a,b){for(var c,f=p;(c=f!==p?f:a())!==p;)55296<=c&&57343>=c&&(f=a())!==p&&56320<=f&&57343>=f?(b(1024*(c-55296)+f-56320+65536),f=p):b(c);f!==p&&b(f)},d:function(a,b){var c=p;"number"===typeof a&&(c=a,a=function(){return p});for(;c!==p||(c=a())!==p;)65535>=c?b(c):(c-=65536,b((c>>10)+55296),b(c%1024+56320)),
+c=p},f:function(a,b){c.b(a,function(a){c.g(a,b)})},k:function(a,b){c.e(a,function(a){c.d(a,b)})},c:function(a){return 128>a?1:2048>a?2:65536>a?3:4},j:function(a){for(var b,d=0;(b=a())!==p;)d+=c.c(b);return d},i:function(a){var b=0,d=0;c.b(a,function(a){++b;d+=c.c(a)});return[b,d]}};return c}();Date.now=Date.now||function(){return+new Date};var J=[608135816,2242054355,320440878,57701188,2752067618,698298832,137296536,3964562569,1160258022,953160567,3193202383,887688300,3232508343,3380367581,1065670069,
+3041331479,2450970073,2306472731],K=[3509652390,2564797868,805139163,3491422135,3101798381,1780907670,3128725573,4046225305,614570311,3012652279,134345442,2240740374,1667834072,1901547113,2757295779,4103290238,227898511,1921955416,1904987480,2182433518,2069144605,3260701109,2620446009,720527379,3318853667,677414384,3393288472,3101374703,2390351024,1614419982,1822297739,2954791486,3608508353,3174124327,2024746970,1432378464,3864339955,2857741204,1464375394,1676153920,1439316330,715854006,3033291828,
+289532110,2706671279,2087905683,3018724369,1668267050,732546397,1947742710,3462151702,2609353502,2950085171,1814351708,2050118529,680887927,999245976,1800124847,3300911131,1713906067,1641548236,4213287313,1216130144,1575780402,4018429277,3917837745,3693486850,3949271944,596196993,3549867205,258830323,2213823033,772490370,2760122372,1774776394,2652871518,566650946,4142492826,1728879713,2882767088,1783734482,3629395816,2517608232,2874225571,1861159788,326777828,3124490320,2130389656,2716951837,967770486,
+1724537150,2185432712,2364442137,1164943284,2105845187,998989502,3765401048,2244026483,1075463327,1455516326,1322494562,910128902,469688178,1117454909,936433444,3490320968,3675253459,1240580251,122909385,2157517691,634681816,4142456567,3825094682,3061402683,2540495037,79693498,3249098678,1084186820,1583128258,426386531,1761308591,1047286709,322548459,995290223,1845252383,2603652396,3431023940,2942221577,3202600964,3727903485,1712269319,422464435,3234572375,1170764815,3523960633,3117677531,1434042557,
+442511882,3600875718,1076654713,1738483198,4213154764,2393238008,3677496056,1014306527,4251020053,793779912,2902807211,842905082,4246964064,1395751752,1040244610,2656851899,3396308128,445077038,3742853595,3577915638,679411651,2892444358,2354009459,1767581616,3150600392,3791627101,3102740896,284835224,4246832056,1258075500,768725851,2589189241,3069724005,3532540348,1274779536,3789419226,2764799539,1660621633,3471099624,4011903706,913787905,3497959166,737222580,2514213453,2928710040,3937242737,1804850592,
+3499020752,2949064160,2386320175,2390070455,2415321851,4061277028,2290661394,2416832540,1336762016,1754252060,3520065937,3014181293,791618072,3188594551,3933548030,2332172193,3852520463,3043980520,413987798,3465142937,3030929376,4245938359,2093235073,3534596313,375366246,2157278981,2479649556,555357303,3870105701,2008414854,3344188149,4221384143,3956125452,2067696032,3594591187,2921233993,2428461,544322398,577241275,1471733935,610547355,4027169054,1432588573,1507829418,2025931657,3646575487,545086370,
+48609733,2200306550,1653985193,298326376,1316178497,3007786442,2064951626,458293330,2589141269,3591329599,3164325604,727753846,2179363840,146436021,1461446943,4069977195,705550613,3059967265,3887724982,4281599278,3313849956,1404054877,2845806497,146425753,1854211946,1266315497,3048417604,3681880366,3289982499,290971E4,1235738493,2632868024,2414719590,3970600049,1771706367,1449415276,3266420449,422970021,1963543593,2690192192,3826793022,1062508698,1531092325,1804592342,2583117782,2714934279,4024971509,
+1294809318,4028980673,1289560198,2221992742,1669523910,35572830,157838143,1052438473,1016535060,1802137761,1753167236,1386275462,3080475397,2857371447,1040679964,2145300060,2390574316,1461121720,2956646967,4031777805,4028374788,33600511,2920084762,1018524850,629373528,3691585981,3515945977,2091462646,2486323059,586499841,988145025,935516892,3367335476,2599673255,2839830854,265290510,3972581182,2759138881,3795373465,1005194799,847297441,406762289,1314163512,1332590856,1866599683,4127851711,750260880,
+613907577,1450815602,3165620655,3734664991,3650291728,3012275730,3704569646,1427272223,778793252,1343938022,2676280711,2052605720,1946737175,3164576444,3914038668,3967478842,3682934266,1661551462,3294938066,4011595847,840292616,3712170807,616741398,312560963,711312465,1351876610,322626781,1910503582,271666773,2175563734,1594956187,70604529,3617834859,1007753275,1495573769,4069517037,2549218298,2663038764,504708206,2263041392,3941167025,2249088522,1514023603,1998579484,1312622330,694541497,2582060303,
+2151582166,1382467621,776784248,2618340202,3323268794,2497899128,2784771155,503983604,4076293799,907881277,423175695,432175456,1378068232,4145222326,3954048622,3938656102,3820766613,2793130115,2977904593,26017576,3274890735,3194772133,1700274565,1756076034,4006520079,3677328699,720338349,1533947780,354530856,688349552,3973924725,1637815568,332179504,3949051286,53804574,2852348879,3044236432,1282449977,3583942155,3416972820,4006381244,1617046695,2628476075,3002303598,1686838959,431878346,2686675385,
+1700445008,1080580658,1009431731,832498133,3223435511,2605976345,2271191193,2516031870,1648197032,4164389018,2548247927,300782431,375919233,238389289,3353747414,2531188641,2019080857,1475708069,455242339,2609103871,448939670,3451063019,1395535956,2413381860,1841049896,1491858159,885456874,4264095073,4001119347,1565136089,3898914787,1108368660,540939232,1173283510,2745871338,3681308437,4207628240,3343053890,4016749493,1699691293,1103962373,3625875870,2256883143,3830138730,1031889488,3479347698,1535977030,
+4236805024,3251091107,2132092099,1774941330,1199868427,1452454533,157007616,2904115357,342012276,595725824,1480756522,206960106,497939518,591360097,863170706,2375253569,3596610801,1814182875,2094937945,3421402208,1082520231,3463918190,2785509508,435703966,3908032597,1641649973,2842273706,3305899714,1510255612,2148256476,2655287854,3276092548,4258621189,236887753,3681803219,274041037,1734335097,3815195456,3317970021,1899903192,1026095262,4050517792,356393447,2410691914,3873677099,3682840055,3913112168,
+2491498743,4132185628,2489919796,1091903735,1979897079,3170134830,3567386728,3557303409,857797738,1136121015,1342202287,507115054,2535736646,337727348,3213592640,1301675037,2528481711,1895095763,1721773893,3216771564,62756741,2142006736,835421444,2531993523,1442658625,3659876326,2882144922,676362277,1392781812,170690266,3921047035,1759253602,3611846912,1745797284,664899054,1329594018,3901205900,3045908486,2062866102,2865634940,3543621612,3464012697,1080764994,553557557,3656615353,3996768171,991055499,
+499776247,1265440854,648242737,3940784050,980351604,3713745714,1749149687,3396870395,4211799374,3640570775,1161844396,3125318951,1431517754,545492359,4268468663,3499529547,1437099964,2702547544,3433638243,2581715763,2787789398,1060185593,1593081372,2418618748,4260947970,69676912,2159744348,86519011,2512459080,3838209314,1220612927,3339683548,133810670,1090789135,1078426020,1569222167,845107691,3583754449,4072456591,1091646820,628848692,1613405280,3757631651,526609435,236106946,48312990,2942717905,
+3402727701,1797494240,859738849,992217954,4005476642,2243076622,3870952857,3732016268,765654824,3490871365,2511836413,1685915746,3888969200,1414112111,2273134842,3281911079,4080962846,172450625,2569994100,980381355,4109958455,2819808352,2716589560,2568741196,3681446669,3329971472,1835478071,660984891,3704678404,4045999559,3422617507,3040415634,1762651403,1719377915,3470491036,2693910283,3642056355,3138596744,1364962596,2073328063,1983633131,926494387,3423689081,2150032023,4096667949,1749200295,3328846651,
+309677260,2016342300,1779581495,3079819751,111262694,1274766160,443224088,298511866,1025883608,3806446537,1145181785,168956806,3641502830,3584813610,1689216846,3666258015,3200248200,1692713982,2646376535,4042768518,1618508792,1610833997,3523052358,4130873264,2001055236,3610705100,2202168115,4028541809,2961195399,1006657119,2006996926,3186142756,1430667929,3210227297,1314452623,4074634658,4101304120,2273951170,1399257539,3367210612,3027628629,1190975929,2062231137,2333990788,2221543033,2438960610,
+1181637006,548689776,2362791313,3372408396,3104550113,3145860560,296247880,1970579870,3078560182,3769228297,1714227617,3291629107,3898220290,166772364,1251581989,493813264,448347421,195405023,2709975567,677966185,3703036547,1463355134,2715995803,1338867538,1343315457,2802222074,2684532164,233230375,2599980071,2000651841,3277868038,1638401717,4028070440,3237316320,6314154,819756386,300326615,590932579,1405279636,3267499572,3150704214,2428286686,3959192993,3461946742,1862657033,1266418056,963775037,
+2089974820,2263052895,1917689273,448879540,3550394620,3981727096,150775221,3627908307,1303187396,508620638,2975983352,2726630617,1817252668,1876281319,1457606340,908771278,3720792119,3617206836,2455994898,1729034894,1080033504,976866871,3556439503,2881648439,1522871579,1555064734,1336096578,3548522304,2579274686,3574697629,3205460757,3593280638,3338716283,3079412587,564236357,2993598910,1781952180,1464380207,3163844217,3332601554,1699332808,1393555694,1183702653,3581086237,1288719814,691649499,2847557200,
+2895455976,3193889540,2717570544,1781354906,1676643554,2592534050,3230253752,1126444790,2770207658,2633158820,2210423226,2615765581,2414155088,3127139286,673620729,2805611233,1269405062,4015350505,3341807571,4149409754,1057255273,2012875353,2162469141,2276492801,2601117357,993977747,3918593370,2654263191,753973209,36408145,2530585658,25011837,3520020182,2088578344,530523599,2918365339,1524020338,1518925132,3760827505,3759777254,1202760957,3985898139,3906192525,674977740,4174734889,2031300136,2019492241,
+3983892565,4153806404,3822280332,352677332,2297720250,60907813,90501309,3286998549,1016092578,2535922412,2839152426,457141659,509813237,4120667899,652014361,1966332200,2975202805,55981186,2327461051,676427537,3255491064,2882294119,3433927263,1307055953,942726286,933058658,2468411793,3933900994,4215176142,1361170020,2001714738,2830558078,3274259782,1222529897,1679025792,2729314320,3714953764,1770335741,151462246,3013232138,1682292957,1483529935,471910574,1539241949,458788160,3436315007,1807016891,
+3718408830,978976581,1043663428,3165965781,1927990952,4200891579,2372276910,3208408903,3533431907,1412390302,2931980059,4132332400,1947078029,3881505623,4168226417,2941484381,1077988104,1320477388,886195818,18198404,3786409E3,2509781533,112762804,3463356488,1866414978,891333506,18488651,661792760,1628790961,3885187036,3141171499,876946877,2693282273,1372485963,791857591,2686433993,3759982718,3167212022,3472953795,2716379847,445679433,3561995674,3504004811,3574258232,54117162,3331405415,2381918588,
+3769707343,4154350007,1140177722,4074052095,668550556,3214352940,367459370,261225585,2610173221,4209349473,3468074219,3265815641,314222801,3066103646,3808782860,282218597,3406013506,3773591054,379116347,1285071038,846784868,2669647154,3771962079,3550491691,2305946142,453669953,1268987020,3317592352,3279303384,3744833421,2610507566,3859509063,266596637,3847019092,517658769,3462560207,3443424879,370717030,4247526661,2224018117,4143653529,4112773975,2788324899,2477274417,1456262402,2901442914,1517677493,
+1846949527,2295493580,3734397586,2176403920,1280348187,1908823572,3871786941,846861322,1172426758,3287448474,3383383037,1655181056,3139813346,901632758,1897031941,2986607138,3066810236,3447102507,1393639104,373351379,950779232,625454576,3124240540,4148612726,2007998917,544563296,2244738638,2330496472,2058025392,1291430526,424198748,50039436,29584100,3605783033,2429876329,2791104160,1057563949,3255363231,3075367218,3463963227,1469046755,985887462],E=[1332899944,1700884034,1701343084,1684370003,1668446532,
+1869963892];"undefined"!==typeof module&&module.exports?module.exports=n:"undefined"!==typeof define&&define.amd?define(function(){return n}):(t.dcodeIO=t.dcodeIO||{}).bcrypt=n})(this);})();
diff --git a/p/scripts/main.js b/p/scripts/main.js
index b6370866f..dc5428048 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1014,7 +1014,7 @@ function init_crypto_form() {
 				try {
 					var strong = window.Uint32Array && window.crypto && (typeof window.crypto.getRandomValues === 'function'),
 						s = dcodeIO.bcrypt.hashSync($('#passwordPlain').val(), data.salt1),
-						c = dcodeIO.bcrypt.hashSync(data.nonce + s, strong ? 4 : poormanSalt());
+						c = dcodeIO.bcrypt.hashSync(data.nonce + s, strong ? dcodeIO.bcrypt.genSaltSync(4) : poormanSalt());
 					$('#challenge').val(c);
 					if (s == '' || c == '') {
 						openNotification('Crypto error!', 'bad');

From c6f35ef51c2c536efb4f8e73603ae46b8512cc24 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 27 Oct 2014 21:45:30 +0100
Subject: [PATCH 135/363] Global limits for number of feeds and categories

New 'limits' sub-array in config.php with 'max_feeds' and
'max_categories'. If the values are < 0, then it is the default value
(16384).
https://github.com/marienfressinaud/FreshRSS/issues/680
---
 app/Controllers/categoryController.php |  7 +++++++
 app/Controllers/feedController.php     |  7 +++++++
 lib/Minz/Configuration.php             | 26 ++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 977ce51be..ef8af7ed6 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -33,6 +33,13 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 		$catDAO = new FreshRSS_CategoryDAO();
 		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
+		$limits = Minz_Configuration::limits();
+		$this->view->categories = $catDAO->listCategories(false);
+		if (count($this->view->categories) >= $limits['max_categories']) {
+			Minz_Request::bad(_t('over_max_categories', $limits['max_categories']), $url_redirect);
+			return;
+		}
+
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
 
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c2859edf4..39e4b5761 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -68,6 +68,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			'params' => array(),
 		);
 
+		$limits = Minz_Configuration::limits();
+		$this->view->feeds = $feedDAO->listFeeds();
+		if (count($this->view->feeds) >= $limits['max_feeds']) {
+			Minz_Request::bad(_t('over_max_feeds', $limits['max_feeds']), $url_redirect);
+			return;
+		}
+
 		if (Minz_Request::isPost()) {
 			@set_time_limit(300);
 
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 554bc8c96..fe9ea6b2e 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -60,6 +60,12 @@ class Minz_Configuration {
 		'prefix' => '',
 	);
 
+	const MAX_SMALL_INT = 16384;
+	private static $limits = array(
+		'max_feeds' => Minz_Configuration::MAX_SMALL_INT,
+		'max_categories' => Minz_Configuration::MAX_SMALL_INT,
+	);
+
 	/*
 	 * Getteurs
 	 */
@@ -97,6 +103,9 @@ class Minz_Configuration {
 	public static function dataBase () {
 		return self::$db;
 	}
+	public static function limits() {
+		return self::$limits;
+	}
 	public static function defaultUser () {
 		return self::$default_user;
 	}
@@ -178,6 +187,7 @@ class Minz_Configuration {
 				'api_enabled' => self::$api_enabled,
 				'unsafe_autologin_enabled' => self::$unsafe_autologin_enabled,
 			),
+			'limits' => self::$limits,
 			'db' => self::$db,
 		);
 		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak.php');
@@ -291,6 +301,22 @@ class Minz_Configuration {
 			);
 		}
 
+		if (isset($ini_array['limits'])) {
+			$limits = $ini_array['limits'];
+			if (isset($limits['max_feeds'])) {
+				self::$limits['max_feeds'] = intval($limits['max_feeds']);
+				if (self::$limits['max_feeds'] < 0 || self::$limits['max_feeds'] > Minz_Configuration::MAX_SMALL_INT) {
+					self::$limits['max_feeds'] = Minz_Configuration::MAX_SMALL_INT;
+				}
+			}
+			if (isset($limits['max_categories'])) {
+				self::$limits['max_categories'] = intval($limits['max_categories']);
+				if (self::$limits['max_categories'] < 0 || self::$limits['max_categories'] > Minz_Configuration::MAX_SMALL_INT) {
+					self::$limits['max_categories'] = Minz_Configuration::MAX_SMALL_INT;
+				}
+			}
+		}
+
 		// Base de données
 		if (isset ($ini_array['db'])) {
 			$db = $ini_array['db'];

From 2e5d4d97c989f55c3506ceb918126eaf9c68f1d6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 28 Oct 2014 22:29:55 +0100
Subject: [PATCH 136/363] More limit options in config.php

See e.g. https://github.com/marienfressinaud/FreshRSS/issues/681
https://github.com/marienfressinaud/FreshRSS/issues/680
https://github.com/marienfressinaud/FreshRSS/issues/656
---
 CHANGELOG                  |  6 ++++++
 lib/Minz/Configuration.php | 26 ++++++++++++++++++++------
 lib/lib_rss.php            |  5 +++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 44d3452ae..688a286e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 # Journal des modifications
 
+##
+
+* Configuration
+	* New options in config.php for cache duration, timeout, max number of feeds and categories per user.
+
+
 ## 2014-09-26 FreshRSS 0.8.0 / 0.9.0 (beta)
 
 * UI
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index fe9ea6b2e..9511cb357 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -62,6 +62,8 @@ class Minz_Configuration {
 
 	const MAX_SMALL_INT = 16384;
 	private static $limits = array(
+		'cache_duration' => 800,	//SimplePie cache duration in seconds
+		'timeout' => 10,	//SimplePie timeout in seconds
 		'max_feeds' => Minz_Configuration::MAX_SMALL_INT,
 		'max_categories' => Minz_Configuration::MAX_SMALL_INT,
 	);
@@ -303,16 +305,28 @@ class Minz_Configuration {
 
 		if (isset($ini_array['limits'])) {
 			$limits = $ini_array['limits'];
+			if (isset($limits['cache_duration'])) {
+				$v = intval($limits['cache_duration']);
+				if ($v > 0) {
+					self::$limits['cache_duration'] = $v;
+				}
+			}
+			if (isset($limits['timeout'])) {
+				$v = intval($limits['timeout']);
+				if ($v > 0) {
+					self::$limits['timeout'] = $v;
+				}
+			}
 			if (isset($limits['max_feeds'])) {
-				self::$limits['max_feeds'] = intval($limits['max_feeds']);
-				if (self::$limits['max_feeds'] < 0 || self::$limits['max_feeds'] > Minz_Configuration::MAX_SMALL_INT) {
-					self::$limits['max_feeds'] = Minz_Configuration::MAX_SMALL_INT;
+				$v = intval($limits['max_feeds']);
+				if ($v > 0 && $v < Minz_Configuration::MAX_SMALL_INT) {
+					self::$limits['max_feeds'] = $v;
 				}
 			}
 			if (isset($limits['max_categories'])) {
-				self::$limits['max_categories'] = intval($limits['max_categories']);
-				if (self::$limits['max_categories'] < 0 || self::$limits['max_categories'] > Minz_Configuration::MAX_SMALL_INT) {
-					self::$limits['max_categories'] = Minz_Configuration::MAX_SMALL_INT;
+				$v = intval($limits['max_categories']);
+				if ($v > 0 && $v < Minz_Configuration::MAX_SMALL_INT) {
+					self::$limits['max_categories'] = $v;
 				}
 			}
 		}
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8ae357f02..3648a4582 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -110,11 +110,12 @@ function html_only_entity_decode($text) {
 }
 
 function customSimplePie() {
+	$limits = Minz_Configuration::limits();
 	$simplePie = new SimplePie();
 	$simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);
-	$simplePie->set_cache_duration(800);
-	$simplePie->set_timeout(10);	//TODO: Make a user setting
+	$simplePie->set_cache_duration($limits['cache_duration']);
+	$simplePie->set_timeout($limits['timeout']);
 	$simplePie->strip_htmltags(array(
 		'base', 'blink', 'body', 'doctype', 'embed',
 		'font', 'form', 'frame', 'frameset', 'html',

From 4cbd7e0583709912d790ed04a72b75d79da31b73 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 28 Oct 2014 23:32:55 +0100
Subject: [PATCH 137/363] Bug: unlock was not done for feeds with error

---
 app/Controllers/feedController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 39e4b5761..7ac083d56 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -293,6 +293,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::notice($e->getMessage());
 				$feedDAO->updateLastUpdate($feed->id(), 1);
+				$feed->unlock();
 				continue;
 			}
 

From 00127f07c5fc784130d658e3f26519b0279fc6b8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 28 Oct 2014 23:52:46 +0100
Subject: [PATCH 138/363] SimplePie: cache feeds with errors

Before the cache system was not used for feeds with errors, which was
problematic especially if several users have this feed.
Furthermore, there was no protection against repetitive refresh.

Bonus: slightly better performance by avoiding some superfluous
file_exists().

Warning: needs a bit of testing
https://github.com/marienfressinaud/FreshRSS/issues/681
---
 app/Models/Feed.php                    |  3 ++-
 lib/SimplePie/SimplePie.php            | 24 +++++++++++++++---------
 lib/SimplePie/SimplePie/Cache/File.php | 12 ++++++------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 03baf3ad2..bd1babeea 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -217,7 +217,8 @@ class FreshRSS_Feed extends Minz_Model {
 				$mtime = $feed->init();
 
 				if ((!$mtime) || $feed->error()) {
-					throw new FreshRSS_Feed_Exception($feed->error() . ' [' . $url . ']');
+					$errorMessage = $feed->error();
+					throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Feed error' : $errorMessage) . ' [' . $url . ']');
 				}
 
 				if ($loadDetails) {
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 06c100f59..84001dd9a 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1455,7 +1455,11 @@ class SimplePie
 		{
 			// Load the Cache
 			$this->data = $cache->load();
-			if (!empty($this->data))
+			if ($cache->mtime() + $this->cache_duration > time()) {	//FreshRSS
+				$this->raw_data = false;
+				return true;	// If the cache is still valid, just return true
+			}
+			elseif (!empty($this->data))
 			{
 				// If the cache is for an outdated build of SimplePie
 				if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
@@ -1487,7 +1491,7 @@ class SimplePie
 					}
 				}
 				// Check if the cache has been updated
-				elseif ($cache->mtime() + $this->cache_duration < time())
+				else //if ($cache->mtime() + $this->cache_duration < time())	//FreshRSS removed
 				{
 					// If we have last-modified and/or etag set
 					//if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag']))	//FreshRSS removed
@@ -1516,6 +1520,7 @@ class SimplePie
 						}
 						else
 						{
+							$cache->touch();	//FreshRSS
 							$this->error = $file->error;	//FreshRSS
 							return !empty($this->data);	//FreshRSS
 							//unset($file);	//FreshRSS removed
@@ -1533,17 +1538,18 @@ class SimplePie
 						}
 					}
 				}
-				// If the cache is still valid, just return true
-				else
-				{
-					$this->raw_data = false;
-					return true;
-				}
+				//// If the cache is still valid, just return true
+				//else	//FreshRSS removed
+				//{
+				//	$this->raw_data = false;
+				//	return true;
+				//}
 			}
 			// If the cache is empty, delete it
 			else
 			{
-				$cache->unlink();
+				//$cache->unlink();	//FreshRSS removed
+				$cache->touch();	//FreshRSS
 				$this->data = array();
 			}
 		}
diff --git a/lib/SimplePie/SimplePie/Cache/File.php b/lib/SimplePie/SimplePie/Cache/File.php
index 3b163545b..cb4b528c4 100644
--- a/lib/SimplePie/SimplePie/Cache/File.php
+++ b/lib/SimplePie/SimplePie/Cache/File.php
@@ -136,11 +136,11 @@ class SimplePie_Cache_File implements SimplePie_Cache_Base
 	 */
 	public function mtime()
 	{
-		if (file_exists($this->name))
+		//if (file_exists($this->name))	//FreshRSS removed
 		{
-			return filemtime($this->name);
+			return @filemtime($this->name);	//FreshRSS
 		}
-		return false;
+		//return false;	//FreshRSS removed
 	}
 
 	/**
@@ -150,11 +150,11 @@ class SimplePie_Cache_File implements SimplePie_Cache_Base
 	 */
 	public function touch()
 	{
-		if (file_exists($this->name))
+		//if (file_exists($this->name))	//FreshRSS removed
 		{
-			return touch($this->name);
+			return @touch($this->name);	//FreshRSS
 		}
-		return false;
+		//return false;	//FreshRSS removed
 	}
 
 	/**

From 9f97f7df8822ed2f32a9bc9d46ece92dee93089c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 29 Oct 2014 00:45:42 +0100
Subject: [PATCH 139/363] =?UTF-8?q?Ne=20pas=20rafra=C3=AEchir=20les=20flux?=
 =?UTF-8?q?=20des=20utilisateurs=20non=20logu=C3=A9s=20depuis=20x=20jours?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/marienfressinaud/FreshRSS/issues/681
Warning: needs some testing
---
 CHANGELOG                          |  2 +-
 app/Controllers/userController.php |  3 +--
 app/Models/Auth.php                | 13 +++++--------
 app/Models/UserDAO.php             | 10 +++++++++-
 app/actualize_script.php           | 10 ++++++++++
 lib/Minz/Configuration.php         |  7 +++++++
 6 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 688a286e3..a556fcc13 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@
 ##
 
 * Configuration
-	* New options in config.php for cache duration, timeout, max number of feeds and categories per user.
+	* New options in config.php for cache duration, timeout, max inactivity, max number of feeds and categories per user.
 
 
 ## 2014-09-26 FreshRSS 0.8.0 / 0.9.0 (beta)
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 2343520ca..39db1d879 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -95,9 +95,8 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(_t('gen.title.user_management') . ' · ');
 
 		// Get the correct current user.
-		$userDAO = new FreshRSS_UserDAO();
 		$username = Minz_Request::param('u', Minz_Session::param('currentUser'));
-		if (!$userDAO->exist($username)) {
+		if (!FreshRSS_UserDAO::exist($username)) {
 			$username = Minz_Session::param('currentUser');
 		}
 		$this->view->current_user = $username;
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index cc23d7974..2971d65c8 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -20,10 +20,11 @@ class FreshRSS_Auth {
 			Minz_Session::_param('currentUser', $current_user);
 		}
 
-		$access_ok = self::accessControl();
-
-		if ($access_ok) {
+		if (self::$login_ok) {
 			self::giveAccess();
+		} elseif (self::accessControl()) {
+			self::giveAccess();
+			FreshRSS_UserDAO::touch($current_user);
 		} else {
 			// Be sure all accesses are removed!
 			self::removeAccess();
@@ -38,11 +39,7 @@ class FreshRSS_Auth {
 	 *
 	 * @return boolean true if user can be connected, false else.
 	 */
-	public static function accessControl() {
-		if (self::$login_ok) {
-			return true;
-		}
-
+	private static function accessControl() {
 		switch (Minz_Configuration::authType()) {
 		case 'form':
 			$credentials = FreshRSS_FormAuth::getCredentialsFromCookie();
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 85b45c4a7..60fca71b1 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -54,7 +54,15 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 		}
 	}
 
-	public function exist($username) {
+	public static function exist($username) {
 		return file_exists(DATA_PATH . '/' . $username . '_user.php');
 	}
+
+	public static function touch($username) {
+		return touch(DATA_PATH . '/' . $username . '_user.php');
+	}
+
+	public static function mtime($username) {
+		return @filemtime(DATA_PATH . '/' . $username . '_user.php');
+	}
 }
diff --git a/app/actualize_script.php b/app/actualize_script.php
index 9fe499cc9..6ce4178cd 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -22,7 +22,17 @@ if (Minz_Configuration::defaultUser() !== ''){
 	$users = array_unique($users);
 }
 
+$limits = Minz_Configuration::limits();
+$minLastActivity = time() - $limits['max_inactivity'];
+
 foreach ($users as $myUser) {
+	if (($myUser !== Minz_Configuration::defaultUser()) && (FreshRSS_UserDAO::mtime($myUser) < $minLastActivity)) {
+		syslog(LOG_INFO, 'FreshRSS skip inactive user ' . $myUser);
+		if (defined('STDOUT')) {
+			fwrite(STDOUT, 'FreshRSS skip inactive user ' . $myUser . "\n");	//Unbuffered
+		}
+		continue;
+	}
 	syslog(LOG_INFO, 'FreshRSS actualize ' . $myUser);
 	if (defined('STDOUT')) {
 		fwrite(STDOUT, 'Actualize ' . $myUser . "...\n");	//Unbuffered
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 9511cb357..6cbc9fc0b 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -64,6 +64,7 @@ class Minz_Configuration {
 	private static $limits = array(
 		'cache_duration' => 800,	//SimplePie cache duration in seconds
 		'timeout' => 10,	//SimplePie timeout in seconds
+		'max_inactivity' => PHP_INT_MAX,	//Time in seconds after which a user who has not used the account is considered inactive (no auto-refresh of feeds).
 		'max_feeds' => Minz_Configuration::MAX_SMALL_INT,
 		'max_categories' => Minz_Configuration::MAX_SMALL_INT,
 	);
@@ -317,6 +318,12 @@ class Minz_Configuration {
 					self::$limits['timeout'] = $v;
 				}
 			}
+			if (isset($limits['max_inactivity'])) {
+				$v = intval($limits['max_inactivity']);
+				if ($v > 0) {
+					self::$limits['max_inactivity'] = $v;
+				}
+			}
 			if (isset($limits['max_feeds'])) {
 				$v = intval($limits['max_feeds']);
 				if ($v > 0 && $v < Minz_Configuration::MAX_SMALL_INT) {

From 1ea996c4eaa0f07f4fd906e7cade68a9bee3b11d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Oct 2014 10:15:22 +0100
Subject: [PATCH 140/363] Update i18n for limit of category.

---
 app/Controllers/categoryController.php | 5 +++--
 app/i18n/en.php                        | 5 +----
 app/i18n/fr.php                        | 5 +----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index ef8af7ed6..609284559 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -35,9 +35,10 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 		$limits = Minz_Configuration::limits();
 		$this->view->categories = $catDAO->listCategories(false);
+
 		if (count($this->view->categories) >= $limits['max_categories']) {
-			Minz_Request::bad(_t('over_max_categories', $limits['max_categories']), $url_redirect);
-			return;
+			Minz_Request::bad(_t('sub.categories.over_max', $limits['max_categories']),
+			                  $url_redirect);
 		}
 
 		if (Minz_Request::isPost()) {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 1e6621c12..2c61d822d 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -53,10 +53,6 @@
   'admin.check_install.pcre.ok' => 'You have the required library for regular expressions (PCRE).',
   'admin.check_install.pdo.nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
   'admin.check_install.pdo.ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.pdo_mysql.nok' => 'You lack PDO for MySQL (it\'s ok if PDO is good).',
-  'admin.check_install.pdo_mysql.ok' => 'You have PDO for MySQL.',
-  'admin.check_install.pdo_sqlite.nok' => 'You lack PDO for SQLite (it\'s ok if PDO is good).',
-  'admin.check_install.pdo_sqlite.ok' => 'You have PDO for SQLite.',
   'admin.check_install.persona.nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
   'admin.check_install.persona.ok' => 'Permissions on Mozilla Persona directory are good.',
   'admin.check_install.php' => 'PHP installation',
@@ -477,6 +473,7 @@
   'status_unread' => 'Unread',
   'steps' => 'Steps',
   'sticky_post' => 'Stick the article to the top when opened',
+  'sub.categories.over_max' => 'You have reached your limit of categories (%d)',
   'submit' => 'Submit',
   'subscription_management' => 'Subscriptions management',
   'sun' => 'Sun',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 61a84cc04..2420b20c3 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -53,10 +53,6 @@
   'admin.check_install.pcre.ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE).',
   'admin.check_install.pdo.nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite).',
   'admin.check_install.pdo.ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.pdo_mysql.nok' => 'Vous ne possédez pas PDO pour MySQL (ok si PDO est bon).',
-  'admin.check_install.pdo_mysql.ok' => 'Vous possédez PDO pour MySQL.',
-  'admin.check_install.pdo_sqlite.nok' => 'Vous ne possédez pas PDO pour SQLite (ok si PDO est bon).',
-  'admin.check_install.pdo_sqlite.ok' => 'Vous possédez PDO pour SQLite.',
   'admin.check_install.persona.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/persona</em>. Le serveur HTTP doit être capable d’écrire dedans',
   'admin.check_install.persona.ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons.',
   'admin.check_install.php' => 'Installation de PHP',
@@ -477,6 +473,7 @@
   'status_unread' => 'non lus',
   'steps' => 'Étapes',
   'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
+  'sub.categories.over_max' => 'Vous avez atteint votre limite de catégories (%d)',
   'submit' => 'Valider',
   'subscription_management' => 'Gestion des abonnements',
   'sun' => 'dim.',

From cf7350af4768809c8b5117ba586f5165a4e2b1a8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Oct 2014 10:21:34 +0100
Subject: [PATCH 141/363] Update i18n for limit of feeds

See https://github.com/marienfressinaud/FreshRSS/issues/680
---
 app/Controllers/feedController.php | 4 ++--
 app/i18n/en.php                    | 1 +
 app/i18n/fr.php                    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 7ac083d56..8563b1c0f 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -71,8 +71,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$limits = Minz_Configuration::limits();
 		$this->view->feeds = $feedDAO->listFeeds();
 		if (count($this->view->feeds) >= $limits['max_feeds']) {
-			Minz_Request::bad(_t('over_max_feeds', $limits['max_feeds']), $url_redirect);
-			return;
+			Minz_Request::bad(_t('sub.feeds.over_max', $limits['max_feeds']),
+			                  $url_redirect);
 		}
 
 		if (Minz_Request::isPost()) {
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 2c61d822d..a35a6ccf1 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -474,6 +474,7 @@
   'steps' => 'Steps',
   'sticky_post' => 'Stick the article to the top when opened',
   'sub.categories.over_max' => 'You have reached your limit of categories (%d)',
+  'sub.feeds.over_max' => 'You have reached your limit of feeds (%d)',
   'submit' => 'Submit',
   'subscription_management' => 'Subscriptions management',
   'sun' => 'Sun',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 2420b20c3..c29b6c9ac 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -474,6 +474,7 @@
   'steps' => 'Étapes',
   'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
   'sub.categories.over_max' => 'Vous avez atteint votre limite de catégories (%d)',
+  'sub.feeds.over_max' => 'Vous avez atteint votre limite de flux (%d)',
   'submit' => 'Valider',
   'subscription_management' => 'Gestion des abonnements',
   'sun' => 'dim.',

From fb3cda8ac9f7c8895ed33d7db432a92b063a7198 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Oct 2014 11:08:31 +0100
Subject: [PATCH 142/363] Fix limits in import OPML files

See https://github.com/marienfressinaud/FreshRSS/issues/680
---
 app/Controllers/importExportController.php | 55 +++++++++++++++++-----
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index ab277e688..514077bbd 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -176,19 +176,43 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 */
 	private function addOpmlElements($opml_elements, $parent_cat = null) {
 		$error = false;
+
+		$nb_feeds = count($this->feedDAO->listFeeds());
+		$nb_cats = count($this->catDAO->listCategories(false));
+		$limits = Minz_Configuration::limits();
+
 		foreach ($opml_elements as $elt) {
-			$res = false;
+			$is_error = false;
 			if (isset($elt['xmlUrl'])) {
 				// If xmlUrl exists, it means it is a feed
-				$res = $this->addFeedOpml($elt, $parent_cat);
+				if ($nb_feeds >= $limits['max_feeds']) {
+					Minz_Log::warning(_t('sub.feeds.over_max',
+					                  $limits['max_feeds']));
+					$is_error = true;
+					continue;
+				}
+
+				$is_error = $this->addFeedOpml($elt, $parent_cat);
+				if (!$is_error) {
+					$nb_feeds += 1;
+				}
 			} else {
 				// No xmlUrl? It should be a category!
-				$res = $this->addCategoryOpml($elt, $parent_cat);
+				$limit_reached = ($nb_cats >= $limits['max_categories']);
+				if ($limit_reached) {
+					Minz_Log::warning(_t('sub.categories.over_max',
+					                  $limits['max_categories']));
+				}
+
+				$is_error = $this->addCategoryOpml($elt, $parent_cat, $limit_reached);
+				if (!$is_error) {
+					$nb_cats += 1;
+				}
 			}
 
-			if (!$error && $res) {
+			if (!$error && $is_error) {
 				// oops: there is at least one error!
-				$error = $res;
+				$error = $is_error;
 			}
 		}
 
@@ -203,16 +227,18 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 * @return boolean true if an error occured, false else.
 	 */
 	private function addFeedOpml($feed_elt, $parent_cat) {
+		$default_cat = $this->catDAO->getDefault();
 		if (is_null($parent_cat)) {
 			// This feed has no parent category so we get the default one
-			$parent_cat = $this->catDAO->getDefault()->name();
+			$parent_cat = $default_cat->name();
 		}
 
 		$cat = $this->catDAO->searchByName($parent_cat);
-		if (!$cat) {
+		if (is_null($cat)) {
 			// If there is not $cat, it means parent category does not exist in
-			// database. It should not happened!
-			return true;
+			// database.
+			// If it happens, take the default category.
+			$cat = $default_cat;
 		}
 
 		// We get different useful information
@@ -253,14 +279,19 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 *
 	 * @param array $cat_elt an OPML element (must be a category element).
 	 * @param string $parent_cat the name of the parent category.
+	 * @param boolean $cat_limit_reached indicates if category limit has been reached.
+	 *                if yes, category is not added (but we try for feeds!)
 	 * @return boolean true if an error occured, false else.
 	 */
-	private function addCategoryOpml($cat_elt, $parent_cat) {
+	private function addCategoryOpml($cat_elt, $parent_cat, $cat_limit_reached) {
 		// Create a new Category object
 		$cat = new FreshRSS_Category(Minz_Helper::htmlspecialchars_utf8($cat_elt['text']));
 
-		$id = $this->catDAO->addCategoryObject($cat);
-		$error = ($id === false);
+		$error = true;
+		if (!$cat_limit_reached) {
+			$id = $this->catDAO->addCategoryObject($cat);
+			$error = ($id === false);
+		}
 
 		if (isset($cat_elt['@outlines'])) {
 			// Our cat_elt contains more categories or more feeds, so we

From d20b5a127fe95f91b55f3ae9391365c67f96c4cc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Oct 2014 11:47:51 +0100
Subject: [PATCH 143/363] Fix limit in import Json files

See https://github.com/marienfressinaud/FreshRSS/issues/680
---
 app/Controllers/importExportController.php | 28 +++++++++++++++++++---
 app/Models/FeedDAO.php                     |  2 +-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 514077bbd..8028af8ed 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -327,12 +327,34 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$error = false;
 		$article_to_feed = array();
 
+		$nb_feeds = count($this->feedDAO->listFeeds());
+		$limits = Minz_Configuration::limits();
+
 		// First, we check feeds of articles are in DB (and add them if needed).
 		foreach ($article_object['items'] as $item) {
-			$feed = $this->addFeedJson($item['origin'], $google_compliant);
+			$key = $google_compliant ? 'htmlUrl' : 'feedUrl';
+			$feed = new FreshRSS_Feed($item['origin'][$key]);
+			$feed = $this->feedDAO->searchByUrl($feed->url());
+
 			if (is_null($feed)) {
-				$error = true;
-			} else {
+				// Feed does not exist in DB,we should to try to add it.
+				if ($nb_feeds >= $limits['max_feeds']) {
+					// Oops, no more place!
+					Minz_Log::warning(_t('sub.feeds.over_max', $limits['max_feeds']));
+				} else {
+					$feed = $this->addFeedJson($item['origin'], $google_compliant);
+				}
+
+				if (is_null($feed)) {
+					// Still null? It means something went wrong.
+					$error = true;
+				} else {
+					// Nice! Increase the counter.
+					$nb_feeds += 1;
+				}
+			}
+
+			if (!is_null($feed)) {
 				$article_to_feed[$item['id']] = $feed->id();
 			}
 		}
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 852de6e36..74597c730 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -191,7 +191,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 		$feed = current(self::daoToFeed($res));
 
-		if (isset($feed)) {
+		if (isset($feed) && $feed !== false) {
 			return $feed;
 		} else {
 			return null;

From 9478d2f0116be69e08071dd02c0f945c5f78d7e0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Oct 2014 12:43:52 +0100
Subject: [PATCH 144/363] Add do_post_update support

---
 app/Controllers/updateController.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 4ebb11f51..4ef5357ea 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -109,6 +109,19 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 		require(UPDATE_FILENAME);
 
+		if (Minz_Request::param('post_conf', false)) {
+			$res = do_post_update();
+
+			if ($res === true) {
+				@unlink(UPDATE_FILENAME);
+				@file_put_contents(DATA_PATH . '/last_update.txt', time());
+				Minz_Request::good(_t('update_finished'));
+			} else {
+				Minz_Request::bad(_t('update_problem', $res),
+				                  array('c' => 'update', 'a' => 'index'));
+			}
+		}
+
 		if (Minz_Request::isPost()) {
 			save_info_update();
 		}
@@ -117,10 +130,11 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			$res = apply_update();
 
 			if ($res === true) {
-				@unlink(UPDATE_FILENAME);
-				@file_put_contents(DATA_PATH . '/last_update.txt', time());
-
-				Minz_Request::good(_t('update_finished'));
+				Minz_Request::forward(array(
+					'c' => 'update',
+					'a' => 'apply',
+					'params' => array('post_conf' => true)
+				), true);
 			} else {
 				Minz_Request::bad(_t('update_problem', $res),
 				                  array('c' => 'update', 'a' => 'index'));

From ee5bbe48269a2fd5bc9c175fdb1e5a92a2c04502 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Oct 2014 19:19:09 +0100
Subject: [PATCH 145/363] Fix bug size with SQLite

---
 app/Controllers/configureController.php | 2 +-
 lib/Minz/ModelPdo.php                   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index cafd0e8a8..deb8cc849 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -225,7 +225,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 		Minz_View::prependTitle(_t('archiving_configuration') . ' · ');
 
-		$entryDAO = FreshRSS_Factory::createEntryDao();
+		$entryDAO = FreshRSS_Factory::createEntryDao('freshrss');
 		$this->view->nb_total = $entryDAO->count();
 		$this->view->size_user = $entryDAO->size();
 
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 827c89c69..6198cd85c 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -17,6 +17,7 @@ class Minz_ModelPdo {
 	private static $sharedBd = null;
 	private static $sharedPrefix;
 	private static $has_transaction = false;
+	private static $sharedCurrentUser;
 	protected static $sharedDbType;
 
 	/**
@@ -39,6 +40,7 @@ class Minz_ModelPdo {
 		if (self::$useSharedBd && self::$sharedBd != null && $currentUser === null) {
 			$this->bd = self::$sharedBd;
 			$this->prefix = self::$sharedPrefix;
+			$this->current_user = self::$sharedCurrentUser;
 			return;
 		}
 
@@ -48,6 +50,7 @@ class Minz_ModelPdo {
 			$currentUser = Minz_Session::param('currentUser', '_');
 		}
 		$this->current_user = $currentUser;
+		self::$sharedCurrentUser = $currentUser;
 
 		try {
 			$type = $db['type'];

From 036240ab01999c8eff1b9b3a98a7313cf43f5836 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Oct 2014 19:31:32 +0100
Subject: [PATCH 146/363] Fix coding style formatNumber and formatBytes

---
 app/views/configure/archiving.phtml |  4 ++--
 app/views/stats/index.phtml         | 20 ++++++++++----------
 app/views/user/manage.phtml         |  4 ++--
 lib/lib_rss.php                     | 14 ++++++--------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 410434599..7c2d79343 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -60,7 +60,7 @@
 		<div class="form-group">
 			<label class="group-name"><?php echo _t('current_user'); ?></label>
 			<div class="group-controls">
-				<?php echo _t('conf.users.articles_and_size', formatNumber($this->nb_total), formatBytes($this->size_user)); ?>
+				<?php echo _t('conf.users.articles_and_size', format_number($this->nb_total), format_bytes($this->size_user)); ?>
 			</div>
 		</div>
 
@@ -68,7 +68,7 @@
 		<div class="form-group">
 			<label class="group-name"><?php echo _t('users'); ?></label>
 			<div class="group-controls">
-				<?php echo formatBytes($this->size_total); ?>
+				<?php echo format_bytes($this->size_total); ?>
 			</div>
 		</div>
 
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index ba4258b71..c75810850 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -18,23 +18,23 @@
 			<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>
+					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['total']); ?></td>
+					<td class="numeric"><?php echo format_number($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>
+					<td class="numeric"><?php echo FreshRSS_Context::$conf($this->repartition['main_stream']['read']); ?></td>
+					<td class="numeric"><?php echo format_number($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>
+					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['unread']); ?></td>
+					<td class="numeric"><?php echo format_number($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>
+					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['favorite']); ?></td>
+					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['favorite']); ?></td>
 				</tr>
 			</tbody>
 		</table>
@@ -56,8 +56,8 @@
 					<tr>
 						<td><a href="<?php echo _url('stats', 'repartition', 'id', $feed['id']); ?>"><?php echo $feed['name']; ?></a></td>
 						<td><?php echo $feed['category']; ?></td>
-						<td class="numeric"><?php echo formatNumber($feed['count']); ?></td>
-						<td class="numeric"><?php echo formatNumber($feed['count'] / $this->repartition['all_feeds']['total'] * 100, 1);?></td>
+						<td class="numeric"><?php echo format_number($feed['count']); ?></td>
+						<td class="numeric"><?php echo format_number($feed['count'] / $this->repartition['all_feeds']['total'] * 100, 1);?></td>
 					</tr>
 				<?php endforeach;?>
 			</tbody>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 2bfd633a2..e46e02572 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -65,8 +65,8 @@
 				</select>
 
 				<p><?php echo _t('admin.users.articles_and_size',
-				                 formatNumber($this->nb_articles),
-				                 formatBytes($this->size_user)); ?></p>
+				                 format_number($this->nb_articles),
+				                 format_bytes($this->size_user)); ?></p>
 			</div>
 		</div>
 
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 3648a4582..317c6852f 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -56,16 +56,14 @@ function checkUrl($url) {
 	}
 }
 
-function formatNumber($n, $precision = 0) {
-	return str_replace(' ', ' ',	//Espace insécable	//TODO: remplacer par une espace _fine_ insécable
-		number_format($n, $precision, '.', ' '));	//number_format does not seem to be Unicode-compatible
-}
 function format_number($n, $precision = 0) {
-	// TODO: coding style, prefer THIS function. Remove formatNumber.
-	return formatNumber($n, $precision);
+	// number_format does not seem to be Unicode-compatible
+	return str_replace(' ', ' ',	//Espace insécable	//TODO: remplacer par une espace _fine_ insécable
+		number_format($n, $precision, '.', ' ')
+	);
 }
 
-function formatBytes($bytes, $precision = 2, $system = 'IEC') {
+function format_bytes($bytes, $precision = 2, $system = 'IEC') {
 	if ($system === 'IEC') {
 		$base = 1024;
 		$units = array('B', 'KiB', 'MiB', 'GiB', 'TiB');
@@ -77,7 +75,7 @@ function formatBytes($bytes, $precision = 2, $system = 'IEC') {
 	$pow = $bytes === 0 ? 0 : floor(log($bytes) / log($base));
 	$pow = min($pow, count($units) - 1);
 	$bytes /= pow($base, $pow);
-	return formatNumber($bytes, $precision) . ' ' . $units[$pow];
+	return format_number($bytes, $precision) . ' ' . $units[$pow];
 }
 
 function timestamptodate ($t, $hour = true) {

From ba832bef4de4a02df46023b389f752b01d43c98b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Oct 2014 19:34:36 +0100
Subject: [PATCH 147/363] Fix TODO in format_number()

---
 lib/lib_rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 317c6852f..e7ca95aba 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -58,7 +58,7 @@ function checkUrl($url) {
 
 function format_number($n, $precision = 0) {
 	// number_format does not seem to be Unicode-compatible
-	return str_replace(' ', ' ',	//Espace insécable	//TODO: remplacer par une espace _fine_ insécable
+	return str_replace(' ', ' ',  //Espace fine insécable
 		number_format($n, $precision, '.', ' ')
 	);
 }

From 58deab37cdd97e93ac25aba574a32befe1db2243 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Oct 2014 19:57:08 +0100
Subject: [PATCH 148/363] Fix Minz_Error::error() -> use default values

---
 app/Controllers/authController.php         |  3 +--
 app/Controllers/categoryController.php     |  5 +---
 app/Controllers/configureController.php    |  5 +---
 app/Controllers/entryController.php        |  5 +---
 app/Controllers/feedController.php         | 10 ++------
 app/Controllers/importExportController.php |  5 +---
 app/Controllers/statsController.php        | 29 ++++++++++------------
 app/Controllers/subscriptionController.php | 10 ++------
 app/Controllers/updateController.php       |  5 +---
 app/Controllers/userController.php         |  8 ++----
 10 files changed, 25 insertions(+), 60 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 491be8d8a..44496cd3e 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -19,8 +19,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	 */
 	public function indexAction() {
 		if (!FreshRSS_Auth::hasAccess('admin')) {
-			Minz_Error::error(403,
-			                  array('error' => array(_t('access_denied'))));
+			Minz_Error::error(403);
 		}
 
 		Minz_View::prependTitle(_t('gen.title.authentication') . ' · ');
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 609284559..50b1d841a 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -13,10 +13,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 */
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 
 		$catDAO = new FreshRSS_CategoryDAO();
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index deb8cc849..1c8ac9111 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -11,10 +11,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 	}
 
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index d11f3a520..b4beed619 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -11,10 +11,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	 */
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 
 		// If ajax request, we do not print layout
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 8563b1c0f..9990a852c 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -20,10 +20,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$action = Minz_Request::actionName();
 			if ($action !== 'actualize' ||
 					!(Minz_Configuration::allowAnonymousRefresh() || $token_is_ok)) {
-				Minz_Error::error(
-					403,
-					array('error' => array(_t('access_denied')))
-				);
+				Minz_Error::error(403);
 			}
 		}
 	}
@@ -442,10 +439,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		} else {
 			Minz_Log::warning('Cannot move feed `' . $feed_id . '` ' .
 			                  'in the category `' . $cat_id . '`');
-			Minz_Error::error(
-				404,
-				array('error' => array(_t('error_occurred')))
-			);
+			Minz_Error::error(404);
 		}
 	}
 
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 8028af8ed..4e2dbd157 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -11,10 +11,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 */
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 
 		require_once(LIB_PATH . '/lib_opml.php');
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 0e3430fcc..18fbca6df 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -5,6 +5,19 @@
  */
 class FreshRSS_stats_Controller extends Minz_ActionController {
 
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
+	public function firstAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
+		}
+
+		Minz_View::prependTitle(_t('stats') . ' · ');
+	}
+
 	/**
 	 * This action handles the statistic main page.
 	 *
@@ -111,20 +124,4 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$this->view->repartitionMonth = $statsDAO->calculateEntryRepartitionPerFeedPerMonth($id);
 		$this->view->averageMonth = $statsDAO->calculateEntryAveragePerFeedPerMonth($id);
 	}
-
-	/**
-	 * This action is called before every other action in that class. It is
-	 * the common boiler plate for every action. It is triggered by the
-	 * underlying framework.
-	 */
-	public function firstAction() {
-		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-			    403, array('error' => array(_t('access_denied')))
-			);
-		}
-
-		Minz_View::prependTitle(_t('stats') . ' · ');
-	}
-
 }
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index a89168eb3..67b95eba6 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -11,10 +11,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 	 */
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 
 		$catDAO = new FreshRSS_CategoryDAO();
@@ -71,10 +68,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 
 		$id = Minz_Request::param('id');
 		if ($id === false || !isset($this->view->feeds[$id])) {
-			Minz_Error::error(
-				404,
-				array('error' => array(_t('page_not_found')))
-			);
+			Minz_Error::error(404);
 			return;
 		}
 
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 4ef5357ea..0896b13ac 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -4,10 +4,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	public function firstAction() {
 		$current_user = Minz_Session::param('currentUser', '');
 		if (!FreshRSS_Auth::hasAccess('admin')) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 
 		invalidateHttpCache();
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 39db1d879..5050571a9 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -15,10 +15,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 */
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
+			Minz_Error::error(403);
 		}
 	}
 
@@ -88,8 +85,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 */
 	public function manageAction() {
 		if (!FreshRSS_Auth::hasAccess('admin')) {
-			Minz_Error::error(403,
-			                  array('error' => array(_t('access_denied'))));
+			Minz_Error::error(403);
 		}
 
 		Minz_View::prependTitle(_t('gen.title.user_management') . ' · ');

From 39d2a26cf0cbdf9238ba7a43c812225565f094b1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Oct 2014 20:00:25 +0100
Subject: [PATCH 149/363] Fix bug in stats/index.phtml

---
 app/views/stats/index.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index c75810850..1300cb2c7 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -23,7 +23,7 @@
 				</tr>
 				<tr>
 					<th><?php echo _t('status_read'); ?></th>
-					<td class="numeric"><?php echo FreshRSS_Context::$conf($this->repartition['main_stream']['read']); ?></td>
+					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['read']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['read']); ?></td>
 				</tr>
 				<tr>

From 3d3dc81e0fd382112a98e895559980836970bf80 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 31 Oct 2014 14:23:11 +0100
Subject: [PATCH 150/363] Update CHANGELOG

---
 CHANGELOG | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a556fcc13..1543847df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,42 @@
 # Journal des modifications
 
-##
+## 2014-10-31 FreshRSS 0.9.2 (beta)
 
+* UI
+	* New subscription page (introduce .box items)
+	* Change feed category by drag and drop
+	* New feed aside on the main page
+	* New configuration / administration organization
 * Configuration
 	* New options in config.php for cache duration, timeout, max inactivity, max number of feeds and categories per user.
+* Refactoring
+	* Refactor authentication system (introduce FreshRSS_Auth model)
+	* Refactor indexController (introduce FreshRSS_Context model)
+	* Use ```_t()```, ```_i()```, ```_url()```, ```Minz_Request::good()``` and ```Minz_Request::bad()``` as much as possible
+	* Refactor javascript_vars.phtml
+	* Better coding style
+* I18n
+	* Introduce a new system for i18n keys (not finished yet)
+* Misc.
+	* Fix global view (didn't work anymore)
+	* Add do_post_update for update system
+	* Introduce ```checkInstallAction``` to test if FreshRSS installation is ok
+
+
+
+## 2014-10-09 FreshRSS 0.8.1 / 0.9.1 (beta)
+
+* UI
+	* Add a space after tag icon
+* Statistics
+	* Add an average per day on the 30 day period graph
+	* Add percent of total on top 10 feed
+* Bug fixes
+	* Fix "mark as read" in global view
+	* Fix "read all" shortcut
+	* Fix categories not appearing when adding a new feed (GET action)
+	* Fix enclosure problem
+	* Fix getExtension() on PHP < 5.3.7
 
 
 ## 2014-09-26 FreshRSS 0.8.0 / 0.9.0 (beta)

From d9c56fb6f76a0a79ec193188e7416d624944c8f3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 31 Oct 2014 15:58:19 +0100
Subject: [PATCH 151/363] Remove check database for next beta

See https://github.com/FreshRSS/FreshRSS/issues/678
---
 app/views/update/checkInstall.phtml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml
index 5f913bccd..b36551340 100644
--- a/app/views/update/checkInstall.phtml
+++ b/app/views/update/checkInstall.phtml
@@ -25,6 +25,7 @@
 	</p>
 	<?php } ?>
 
+	<?php /*
 	<h2><?php echo _t('admin.check_install.database'); ?></h2>
 
 	<?php foreach ($this->status_database as $key => $status) { ?>
@@ -32,5 +33,6 @@
 		<?php echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok')); ?>
 	</p>
 	<?php } ?>
+	*/ ?>
 
 </div>

From 724e13f0a6419b046b33da71e66058e279551edd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 31 Oct 2014 16:43:05 +0100
Subject: [PATCH 152/363] Fix global view mark as read

---
 app/views/index/global.phtml     |  5 +++--
 p/scripts/global_view.js         | 12 ++++++------
 p/themes/base-theme/template.css |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 0975a5a00..ae7f5ffbc 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -47,7 +47,8 @@
 ?>
 </div>
 
-<div id="overlay"></div>
-<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+<div id="overlay">
 	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
+<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+</div>
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 14909f44e..7d7ba22b5 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -24,12 +24,13 @@ function load_panel(link) {
 		// en en ouvrant une autre ensuite, on se retrouve au même point de scroll
 		$("#panel").scrollTop(0);
 
-		$('#panel').on('click', '#nav_menu_read_all > a, #nav_menu_read_all .item > a, #bigMarkAsRead', function () {
+		$('#panel').on('click', '#nav_menu_read_all button, #bigMarkAsRead', function () {
+			console.log($(this).attr("formaction"));
 			$.ajax({
-				url: $(this).attr("href"),
+				type: "POST",
+				url: $(this).attr("formaction"),
 				async: false
 			});
-			//$("#panel .close").first().click();
 			window.location.reload(false);
 			return false;
 		});
@@ -39,9 +40,8 @@ function load_panel(link) {
 }
 
 function init_close_panel() {
-	$("#panel .close").click(function () {
-		$("#panel").html('<a class="close" href="#">' + icons['close'] + '</a>');
-		init_close_panel();
+	$("#overlay .close").click(function () {
+		$("#panel").html('');
 		$("#panel").slideToggle();
 		$("#overlay").fadeOut();
 
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 79fe506f2..5ba621415 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -645,13 +645,13 @@ br + br + br {
 	overflow: auto;
 	background: #fff;
 }
-#panel .close {
+#overlay .close {
 	position: fixed;
 	top: 0; bottom: 0;
 	left: 0; right: 0;
 	display: block;
 }
-#panel .close img {
+#overlay .close img {
 	display: none;
 }
 
@@ -762,7 +762,7 @@ br + br + br {
 	}
 
 	#panel {
-		top: 0; bottom: 0;
+		top: 25px; bottom: 30px;
 		left: 0; right: 0;
 	}
 	#panel .close {

From afe51884d9258e26a3aecfe422e69ede9f86fa7e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 1 Nov 2014 09:58:06 -0400
Subject: [PATCH 153/363] Add CSS numbering on user query list

---
 p/themes/base-theme/template.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 5ba621415..f696ac237 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -499,7 +499,8 @@ a.btn {
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
-.flux .item.share > a {
+.flux .item.share > a,
+.item.query > a {
 	display: list-item;
 	list-style-position: inside;
 	list-style-type: decimal;

From 2dcea37e70cf4520faadd0d4862a44fce6cb8fc7 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 1 Nov 2014 10:11:11 -0400
Subject: [PATCH 154/363] Remove border on Dark and Origin for unread entry
 counters

---
 p/themes/Dark/dark.css       | 1 -
 p/themes/Origine/origine.css | 1 -
 2 files changed, 2 deletions(-)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 03bf3c985..909444d43 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -561,7 +561,6 @@ a.btn {
 	font-size: 0.9rem;
 	line-height: 1.5rem;
 	background: inherit;
-	border-left: 1px solid #666;
 }
 
 /*=== Aside main page (feeds) */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index afd6ec04f..eb2ecd5e8 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -601,7 +601,6 @@ a.btn {
 	font-size: 0.9rem;
 	line-height: 1.5rem;
 	background: inherit;
-	border-left: 1px solid #aaa;
 }
 
 /*=== Aside main page (feeds) */

From 960f86ba20fdf7320c957141a9983d17c7e521fa Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 2 Nov 2014 10:05:26 -0500
Subject: [PATCH 155/363] Add a feature to hide articles when they are read

This is a new reading option to hide articles when they are read. The hidding process occurs when the article is left for an other article. This way, even when the article is marked as read on opening, it is hidden only while navigating to an other article.
I'm not really happy with the behavior when the "mark while scrolling" option is enabled. Please review.
It is missing the i18n since we're not supposed to push them before it exists on i18n.freshrss.org. Or maybe I misunderstood the process.

See #476
---
 app/Controllers/configureController.php |  2 ++
 app/Models/Configuration.php            |  4 ++++
 app/Models/Context.php                  | 22 ++++++++++++++++++++++
 app/views/configure/reading.phtml       | 10 ++++++++++
 app/views/helpers/javascript_vars.phtml |  1 +
 p/scripts/main.js                       |  8 ++++++++
 6 files changed, 47 insertions(+)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 1c8ac9111..53536afce 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -89,6 +89,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *   - image lazy loading
 	 *   - stick open articles to the top
 	 *   - display a confirmation when reading all articles
+	 *   - auto remove article after reading
 	 *   - article order (default: DESC)
 	 *   - mark articles as read when:
 	 *       - displayed
@@ -110,6 +111,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$conf->_lazyload(Minz_Request::param('lazyload', false));
 			FreshRSS_Context::$conf->_sticky_post(Minz_Request::param('sticky_post', false));
 			FreshRSS_Context::$conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
+			FreshRSS_Context::$conf->_auto_remove_article(Minz_Request::param('auto_remove_article', false));
 			FreshRSS_Context::$conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
 			FreshRSS_Context::$conf->_mark_when(array(
 				'article' => Minz_Request::param('mark_open_article', false),
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 53f136513..8668470b0 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -24,6 +24,7 @@ class FreshRSS_Configuration {
 		'lazyload' => true,
 		'sticky_post' => true,
 		'reading_confirm' => false,
+		'auto_remove_article' => false,
 		'sort_order' => 'DESC',
 		'anon_access' => false,
 		'mark_when' => array(
@@ -191,6 +192,9 @@ class FreshRSS_Configuration {
 	public function _reading_confirm($value) {
 		$this->data['reading_confirm'] = ((bool)$value) && $value !== 'no';
 	}
+	public function _auto_remove_article($value) {
+		$this->data['auto_remove_article'] = ((bool)$value) && $value !== 'no';
+	}
 	public function _sort_order($value) {
 		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 36c4087eb..cbd6a5888 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -265,4 +265,26 @@ class FreshRSS_Context {
 			}
 		}
 	}
+
+	/**
+	 * Determine if the auto remove is available in the current context.
+	 * This feature is available if:
+	 *   - it is activated in the configuration
+	 *   - the "read" state is not enable
+	 *   - the "unread" state is enable
+	 *
+	 * @return boolean
+	 */
+	public static function isAutoRemoveAvailable() {
+		if (!self::$conf->auto_remove_article) {
+			return false;
+		}
+		if (self::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+			return false;
+		}
+		if (!self::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ)) {
+			return false;
+		}
+		return true;
+	}
 }
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index b8f673466..0f7a3347a 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -115,6 +115,16 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="auto_remove_article">
+					<input type="checkbox" name="auto_remove_article" id="auto_remove_article" value="1"<?php echo FreshRSS_Context::$conf->auto_remove_article ? ' checked="checked"' : ''; ?> />
+					<?php echo _t('auto_remove_article'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name"><?php echo _t('auto_read_when'); ?></label>
 			<div class="group-controls">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 8e9141d4e..6424d8d04 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -18,6 +18,7 @@ $url_logout = Minz_Url::display(array(
 ), 'php');
 
 echo 'var context={',
+	'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',',
 	'hide_posts:', $hide_posts ? 'false' : 'true', ',',
 	'display_order:"', Minz_Request::param('order', FreshRSS_Context::$conf->sort_order), '",',
 	'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
diff --git a/p/scripts/main.js b/p/scripts/main.js
index dc5428048..d1d31c801 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -231,6 +231,14 @@ function toggleContent(new_active, old_active) {
 		}
 		old_active.removeClass("active current");
 		new_active.addClass("current");
+		if (context['auto_remove_article'] && !old_active.hasClass('not_read')) {
+			var p = old_active.prev();
+			var n = old_active.next();
+			if (p.hasClass('day') && n.hasClass('day')) {
+				p.remove();
+			}
+			old_active.remove();
+		}
 	} else {
 		new_active.toggleClass('active');
 	}

From 4c4604120e41ad8f40e6299bd7baaa7ea9c7c3db Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 2 Nov 2014 18:22:59 -0500
Subject: [PATCH 156/363] Fix view title

---
 app/layout/nav_menu.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 775daf088..dd7cbea30 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -139,7 +139,7 @@
 		</a>
 
 		<?php $url_output['a'] = 'reader'; ?>
-		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-reader"); ?>
 		</a>
 

From ba7d63e5cac1c98e28dc831112bc21dbd76aebbb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Tue, 4 Nov 2014 08:47:23 +0100
Subject: [PATCH 157/363] Temporarily remove scheme check in referer

If needed, we may re-introduce the check for scheme with proper support
for proxy
https://github.com/FreshRSS/FreshRSS/issues/565#issuecomment-61602425
---
 lib/lib_rss.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index e7ca95aba..8170c7fd9 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -242,11 +242,14 @@ function is_referer_from_same_domain() {
 	$host = parse_url(((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ? 'https://' : 'http://') .
 		(empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
 	$referer = parse_url($_SERVER['HTTP_REFERER']);
-	if (empty($host['scheme']) || empty($referer['scheme']) || $host['scheme'] !== $referer['scheme'] ||
-	    empty($host['host']) || empty($referer['host']) || $host['host'] !== $referer['host']) {
+	if (empty($host['host']) || empty($referer['host']) || $host['host'] !== $referer['host']) {
 		return false;
 	}
-	return (isset($host['port']) ? $host['port'] : 0) === (isset($referer['port']) ? $referer['port'] : 0);
+	//TODO: check 'scheme', taking into account the case of a proxy
+	if ((isset($host['port']) ? $host['port'] : 0) !== (isset($referer['port']) ? $referer['port'] : 0)) {
+		return false;
+	}
+	return true;
 }
 
 

From 0b7af8f8719f698b67e31b5a84fa19b0f20c0590 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 31 Oct 2014 17:21:35 +0100
Subject: [PATCH 158/363] Fix bug on archiving page

Introduced by https://github.com/FreshRSS/FreshRSS/commit/ee5bbe48269a2fd5bc9c175fdb1e5a92a2c04502
---
 app/Controllers/configureController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 1c8ac9111..f8d9b47c3 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -222,7 +222,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 		Minz_View::prependTitle(_t('archiving_configuration') . ' · ');
 
-		$entryDAO = FreshRSS_Factory::createEntryDao('freshrss');
+		$entryDAO = FreshRSS_Factory::createEntryDao();
 		$this->view->nb_total = $entryDAO->count();
 		$this->view->size_user = $entryDAO->size();
 

From 38cf7a109ee80cc03edfd420b641676ecd1dfae6 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 8 Nov 2014 09:26:01 -0500
Subject: [PATCH 159/363] Add more info in article repartition page

I added the same information than on the main stat page (total, read, unread and favorite) on the repartition page. Some refactoring was needed.
---
 app/Controllers/statsController.php |  1 +
 app/Models/StatsDAO.php             | 48 ++++++++++++++++-------------
 app/views/stats/repartition.phtml   | 17 ++++++++++
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 18fbca6df..578df9434 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -117,6 +117,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$this->view->feed = $feedDAO->searchById($id);
 		$this->view->days = $statsDAO->getDays();
 		$this->view->months = $statsDAO->getMonths();
+		$this->view->repartition = $statsDAO->calculateEntryRepartitionPerFeed($id);
 		$this->view->repartitionHour = $statsDAO->calculateEntryRepartitionPerFeedPerHour($id);
 		$this->view->averageHour = $statsDAO->calculateEntryAveragePerFeedPerHour($id);
 		$this->view->repartitionDayOfWeek = $statsDAO->calculateEntryRepartitionPerFeedPerDayOfWeek($id);
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 283d5dcb1..0ca251228 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -6,18 +6,36 @@ class FreshRSS_StatsDAO extends Minz_ModelPdo {
 
 	/**
 	 * Calculates entry repartition for all feeds and for main stream.
+	 *
+	 * @return array
+	 */
+	public function calculateEntryRepartition() {
+		return array(
+		    'main_stream' => $this->calculateEntryRepartitionPerFeed(null, true),
+		    'all_feeds' => $this->calculateEntryRepartitionPerFeed(null, false),
+		);
+	}
+
+	/**
+	 * Calculates entry repartition for the selection.
 	 * The repartition includes:
 	 *   - total entries
 	 *   - read entries
 	 *   - unread entries
 	 *   - favorite entries
 	 *
-	 * @return type
+	 * @param null|integer $feed feed id
+	 * @param boolean $only_main
+	 * @return array
 	 */
-	public function calculateEntryRepartition() {
-		$repartition = array();
-
-		// Generates the repartition for the main stream of entry
+	public function calculateEntryRepartitionPerFeed($feed = null, $only_main = false) {
+		$filter = '';
+		if ($only_main) {
+			$filter .= 'AND f.priority = 10';
+		}
+		if (!is_null($feed)) {
+			$filter .= "AND e.id_feed = {$feed}";
+		}
 		$sql = <<<SQL
 SELECT COUNT(1) AS `total`,
 COUNT(1) - SUM(e.is_read) AS `unread`,
@@ -26,27 +44,13 @@ SUM(e.is_favorite) AS `favorite`
 FROM {$this->prefix}entry AS e
 , {$this->prefix}feed AS f
 WHERE e.id_feed = f.id
-AND f.priority = 10
+{$filter}
 SQL;
 		$stm = $this->bd->prepare($sql);
 		$stm->execute();
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$repartition['main_stream'] = $res[0];
 
-		// Generates the repartition for all entries
-		$sql = <<<SQL
-SELECT COUNT(1) AS `total`,
-COUNT(1) - SUM(e.is_read) AS `unread`,
-SUM(e.is_read) AS `read`,
-SUM(e.is_favorite) AS `favorite`
-FROM {$this->prefix}entry AS e
-SQL;
-		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$repartition['all_feeds'] = $res[0];
-
-		return $repartition;
+		return $res[0];
 	}
 
 	/**
@@ -179,7 +183,7 @@ SQL;
 	 * @return integer
 	 */
 	public function calculateEntryAveragePerFeedPerHour($feed = null) {
-		return $this->calculateEntryAveragePerFeedPerPeriod(1/24, $feed);
+		return $this->calculateEntryAveragePerFeedPerPeriod(1 / 24, $feed);
 	}
 
 	/**
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 32268a546..85a750bd0 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -29,6 +29,23 @@
 		</a>
 	<?php }?>
 
+	<div class="stat">
+	    <table>
+		<tr>
+		    <th><?php echo _t('status_total'); ?></th>
+		    <th><?php echo _t('status_read'); ?></th>
+		    <th><?php echo _t('status_unread'); ?></th>
+		    <th><?php echo _t('status_favorites'); ?></th>
+		</tr>
+		<tr>
+		    <td><?php echo $this->repartition['total']; ?></td>
+		    <td><?php echo $this->repartition['read']; ?></td>
+		    <td><?php echo $this->repartition['unread']; ?></td>
+		    <td><?php echo $this->repartition['favorite']; ?></td>
+		</tr>
+	    </table>
+	</div>
+
 	<div class="stat">
 		<h2><?php echo _t('stats_entry_per_hour', $this->averageHour); ?></h2>
 		<div id="statsEntryPerHour" style="height: 300px"></div>

From 960abfcc6558d8421423a42b7781184dad0d9bc7 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 8 Nov 2014 09:29:51 -0500
Subject: [PATCH 160/363] Refactor some if statements

---
 app/Models/StatsDAO.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 0ca251228..255a2b1ff 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -151,10 +151,9 @@ SQL;
 	 * @return string
 	 */
 	protected function calculateEntryRepartitionPerFeedPerPeriod($period, $feed = null) {
+		$restrict = '';
 		if ($feed) {
 			$restrict = "WHERE e.id_feed = {$feed}";
-		} else {
-			$restrict = '';
 		}
 		$sql = <<<SQL
 SELECT DATE_FORMAT(FROM_UNIXTIME(e.date), '{$period}') AS period
@@ -214,10 +213,9 @@ SQL;
 	 * @return integer
 	 */
 	protected function calculateEntryAveragePerFeedPerPeriod($period, $feed = null) {
+		$restrict = '';
 		if ($feed) {
 			$restrict = "WHERE e.id_feed = {$feed}";
-		} else {
-			$restrict = '';
 		}
 		$sql = <<<SQL
 SELECT COUNT(1) AS count

From c4f6709a296dd7cd76bdd6507004fccf3da1de53 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 8 Nov 2014 10:04:43 -0500
Subject: [PATCH 161/363] Small format fix

---
 app/views/stats/repartition.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 85a750bd0..4ea71cfb5 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -38,10 +38,10 @@
 		    <th><?php echo _t('status_favorites'); ?></th>
 		</tr>
 		<tr>
-		    <td><?php echo $this->repartition['total']; ?></td>
-		    <td><?php echo $this->repartition['read']; ?></td>
-		    <td><?php echo $this->repartition['unread']; ?></td>
-		    <td><?php echo $this->repartition['favorite']; ?></td>
+		    <td class="numeric"><?php echo $this->repartition['total']; ?></td>
+		    <td class="numeric"><?php echo $this->repartition['read']; ?></td>
+		    <td class="numeric"><?php echo $this->repartition['unread']; ?></td>
+		    <td class="numeric"><?php echo $this->repartition['favorite']; ?></td>
 		</tr>
 	    </table>
 	</div>

From 56ac35095a6923661453916c472e117643cdea84 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Nov 2014 22:23:59 +0100
Subject: [PATCH 162/363] Better error message for inaccessible feeds

https://github.com/FreshRSS/FreshRSS/issues/456
---
 lib/SimplePie/SimplePie.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 84001dd9a..dc4bbb6cb 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1582,13 +1582,15 @@ class SimplePie
 
 			if (!$locate->is_feed($file))
 			{
+				$copyStatusCode = $file->status_code;	//FreshRSS
+				$copyContentType = $file->headers['content-type'];	//FreshRSS
 				// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
 				unset($file);
 				try
 				{
 					if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
 					{
-						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+						$this->error = "A feed could not be found at `$this->feed_url`; the status code is `$copyStatusCode` and content-type is `$copyContentType`";	//FreshRSS
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}

From e4ea629f590192faf19a9cbdf33d400fdd6d5569 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Nov 2014 22:42:47 +0100
Subject: [PATCH 163/363] SimplePie: Added unconventional mime type for RSS

Since `application/rss+xml` is not official
http://www.iana.org/assignments/media-types/media-types.xhtml, then it
is fair enough to use the `x-` prefix.
https://github.com/FreshRSS/FreshRSS/issues/706
---
 lib/SimplePie/SimplePie/Locator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Locator.php b/lib/SimplePie/SimplePie/Locator.php
index 90ee7a302..4e5f7c1ca 100644
--- a/lib/SimplePie/SimplePie/Locator.php
+++ b/lib/SimplePie/SimplePie/Locator.php
@@ -148,7 +148,7 @@ class SimplePie_Locator
 		{
 			$sniffer = $this->registry->create('Content_Type_Sniffer', array($file));
 			$sniffed = $sniffer->get_type();
-			if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
+			if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml', 'application/x-rss+xml')))	//FreshRSS
 			{
 				return true;
 			}

From a235f003bd5b78f2c94ccbbe56614f5828918962 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Nov 2014 22:58:33 +0100
Subject: [PATCH 164/363] Better log in case of nonce errors

https://github.com/FreshRSS/FreshRSS/issues/676
---
 app/Controllers/javascriptController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 62f413989..113f58ea9 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -39,6 +39,8 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 			} catch (Minz_Exception $me) {
 				Minz_Log::warning('Nonce failure: ' . $me->getMessage());
 			}
+		} else {
+			Minz_Log::notice('Nonce failure due to invalid username!');
 		}
 		$this->view->nonce = '';	//Failure
 		$this->view->salt1 = '';

From 764946814f2b9af2022925d3edd185f9874c5357 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Nov 2014 23:28:47 +0100
Subject: [PATCH 165/363] force_feed option

By adding #force_feed at the end of the URL of a feed sent with a wrong
content-type (mime)
https://github.com/FreshRSS/FreshRSS/issues/456
---
 app/Models/Feed.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index bd1babeea..8f4b60097 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -210,6 +210,10 @@ class FreshRSS_Feed extends Minz_Model {
 					$url = preg_replace('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url);
 				}
 				$feed = customSimplePie();
+				if (substr($url, -11) === '#force_feed') {
+					$feed->force_feed(true);
+					$url = substr($url, 0, -11);
+				}
 				$feed->set_feed_url($url);
 				if (!$loadDetails) {	//Only activates auto-discovery when adding a new feed
 					$feed->set_autodiscovery_level(SIMPLEPIE_LOCATOR_NONE);
@@ -226,7 +230,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$subscribe_url = $feed->subscribe_url(false);
 
 					$title = strtr(html_only_entity_decode($feed->get_title()), array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));	//HTML to HTML-PRE	//ENT_COMPAT except &
-					$this->_name($title == '' ? $this->url : $title);
+					$this->_name($title == '' ? $url : $title);
 
 					$this->_website(html_only_entity_decode($feed->get_link()));
 					$this->_description(html_only_entity_decode($feed->get_description()));
@@ -235,7 +239,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$subscribe_url = $feed->subscribe_url(true);
 				}
 
-				if ($subscribe_url !== null && $subscribe_url !== $this->url) {
+				if ($subscribe_url !== null && $subscribe_url !== $url) {
 					if ($this->httpAuth != '') {
 						// on enlève les id si authentification HTTP
 						$subscribe_url = preg_replace('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url);

From dab266a922be0d27536239d62e9dfef650666e9e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Nov 2014 23:33:47 +0100
Subject: [PATCH 166/363] SimplePie changelog

https://github.com/FreshRSS/FreshRSS/issues/456
https://github.com/FreshRSS/FreshRSS/issues/706
---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1543847df..e09b55d21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 # Journal des modifications
 
+## Dev
+
+* SimplePie
+	* Support for content-type application/x-rss+xml
+	* New force_feed option (for feeds sent with the wrong content-type / MIME) by adding #force_feed at the end of the feed URL
+	* Improved error messages
+
+
 ## 2014-10-31 FreshRSS 0.9.2 (beta)
 
 * UI

From ec55aa94bfb30cdb0cd701785189215dfaf2094a Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 15 Nov 2014 18:02:22 -0500
Subject: [PATCH 167/363] Theme selection redesign

I made a CSS3 gallery to select the theme. Now you can see the theme before applying it.
Comments are welcome.

See #571
---
 app/views/configure/display.phtml        |  34 ++++++---
 p/themes/Dark/thumbs/original.png        | Bin 0 -> 123928 bytes
 p/themes/Flat/thumbs/original.png        | Bin 0 -> 133420 bytes
 p/themes/Origine/thumbs/original.png     | Bin 0 -> 135886 bytes
 p/themes/Pafat/thumbs/original.png       | Bin 0 -> 129220 bytes
 p/themes/Screwdriver/thumbs/original.png | Bin 0 -> 133107 bytes
 p/themes/base-theme/template.css         |  92 +++++++++++++++++++++++
 7 files changed, 115 insertions(+), 11 deletions(-)
 create mode 100644 p/themes/Dark/thumbs/original.png
 create mode 100644 p/themes/Flat/thumbs/original.png
 create mode 100644 p/themes/Origine/thumbs/original.png
 create mode 100644 p/themes/Pafat/thumbs/original.png
 create mode 100644 p/themes/Screwdriver/thumbs/original.png

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 69205fa93..39582249e 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -21,17 +21,29 @@
 		<div class="form-group">
 			<label class="group-name" for="theme"><?php echo _t('theme'); ?></label>
 			<div class="group-controls">
-				<select name="theme" id="theme" required=""><?php
-					$found = false;
-					foreach ($this->themes as $theme) {
-						?><option value="<?php echo $theme['id']; ?>"<?php if (FreshRSS_Context::$conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
-							echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author'];
-						?></option><?php
-					}
-					if (!$found) {
-						?><option selected="selected"></option><?php
-					}
-				?></select>
+				<ul class="slides">
+					<?php $slides = count($this->themes); $i = 1; ?>
+					<?php foreach($this->themes as $theme) { ?>
+						<input type="radio" name="theme" id="img-<?php echo $i ?>" <?php if (FreshRSS_Context::$conf->theme === $theme['id']) {echo "checked";}?> value="<?php echo $theme['id'] ?>"/>
+						<li class="slide-container">
+							<div class="slide">
+								<img src="<?php echo Minz_Url::display('/themes/' . $theme['id'] . '/thumbs/original.png')?>"/>
+							</div>
+							<div class="nav">
+								<?php if ($i !== 1) {?>
+									<label for="img-<?php echo $i - 1 ?>" class="prev">&#x2039;</label>
+								<?php } ?>
+								<?php if ($i !== $slides) {?>
+									<label for="img-<?php echo $i + 1 ?>" class="next">&#x203a;</label>
+								<?php } ?>
+							</div>
+							<div class="properties">
+								<?php echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author']?>
+							</div>
+						</li>
+						<?php $i++ ?>
+					<?php } ?>
+				</ul>
 			</div>
 		</div>
 
diff --git a/p/themes/Dark/thumbs/original.png b/p/themes/Dark/thumbs/original.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd574319f5139cf9381353a1c7c5ae84bc748b2d
GIT binary patch
literal 123928
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

literal 0
HcmV?d00001

diff --git a/p/themes/Flat/thumbs/original.png b/p/themes/Flat/thumbs/original.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9cafa9c8dcfffc7083ca11740dc8151b0a4897a
GIT binary patch
literal 133420
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

literal 0
HcmV?d00001

diff --git a/p/themes/Origine/thumbs/original.png b/p/themes/Origine/thumbs/original.png
new file mode 100644
index 0000000000000000000000000000000000000000..d26d4fbedec332033b8205830ae0ce84aed2a30b
GIT binary patch
literal 135886
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
H^Wgsjya(Jj

literal 0
HcmV?d00001

diff --git a/p/themes/Pafat/thumbs/original.png b/p/themes/Pafat/thumbs/original.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe05f7260ed4796ae1a0fc59df572a63795d34be
GIT binary patch
literal 129220
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%0DSC)Z}vQW`Ms>Itq3nI#L!Fou<$&2u+bB@*)$
z+KR;h>R3vUMdZTTHfJ;TGS5_tJ$G1%9A6i6b*6e47${I>oMR~R&MjQ-RJoXL06g-n
z9MX>XpCf?)I!2W|+;av|C>zhzr`MjAtcbTb78Q1NM~XXDnbxnJ6K`Am#ftAKraVu)
z9qnk-yPwqUo%p%Q`D0#e$EjQ+DrLp8r}xNfB8hL#%YLL6@P7RWt2K4crqCu(bM9OR
zFFf<;9~q`#J^Sye@IpOzguNOd!_{r8Kox1*#Fhl)8?4GuJ^aV$JGPVPF^rNR<Y#*f
z(s3Bc19ztRV^Y)Cy}S<WI~a3s8_3RGnb`f_6TTb{)XGh#koBDx#7Ebp{^eESK*#w!
z5AhlPW0TC#wHpDlt>zh<M$lXdW13F1$}1VSRuVMv+)9gyD$_Gu?*?oF?%K(`N4?5u
zVu!@ka$+8IcXWJdqVx^a1}#wR`VrVxKYi^yi5~auPdWFdX6MBJdS{^d?vU=26`~Pm
z`ee>)@+WchG6eZdI%u|tdDk6A5tR!pa-N*t`1=0ga;Q7}X14^^{nKS&;oFuRx4lPw
zMU*q+!VEXa*ej390?zWQVu-^26PQDL_XsH$O0w>@cn>W&4`_x{RSpTugSqc~$;4_6
z4Q9L60F{W#c8cWHiua1YW{;5B4qagb)caK5bu3987M>*vFg>!I>o1oBg^?`fcdKro
zsO6u)&?8GhvConG_W4+;1xP7s^K01O-_L>{NlGZ)${M7qW>~+e`|bY%wpZ(Z<a<1*
zjK#8NsJqn$Vy*z8f)T6|)c3rb$gue4m5uha-(C8N=^^pLkkG-i4im=|c$1s_<$Dfl
zd>nW~%eseyPQvV|^+OjO5bD+2$#JZi$sTeRd4+>~N|X}ig@)>ziH|ujdy_y~uQe6b
z?H_K8DsvNYEWkUoB#hgEM>2+?mHMvYk4gR9?S56q*ShsB`(m}WvBYcFdixQ9e~6DH
zUFr6D<<&qjwCn!(YKRxWv<>v~o`_0M`(*FY()Tq~#Ok5Zv!16l2czLz=_TQ!WERe<
z^qa*KQI^X;ZGcpPuBs_dz3|&r6lg}=SI5e94N;IX>#hra;fz0lPAIXWR~B_t(w^%#
z{aa5{rZtJz^<c%ER^GK-#}7ItHh7zj*=Aq3A&vqFmu>OBfQ^{6g0An?3<5IVZr{aJ
z8=wwIHmtpu6=8XiZkX9+Z{9M7^{Y-5S$5A{kwKzR#p8vvc7TB-e~r1B&_lD_XgFQG
z6Lh_&R=ZOS&!dAo^7r(zmDxtCa@x)K%rSE~3ef0APSU_n&$5@KqDF7Q^!vx%ThU?)
z#4X~?R)%kR>Kt{f78QhVBR@ou+qAlf5{LLWTLEM1v!RHF^%&jGA85EVwoI6i@6a!~
z1GaTWnPwKQ+fIPT@ouz8!F${J2?UZIII|_~g)oUtGD|fbF3f>dzs;lIwt6zJ)tWa{
zOU@bCZI8UQS(s4S;z3WTTTBw9byL%~jXfJ0Gtt!BhvGhwW`dkG<%kmG;K>9k+qdgS
z7*16Z&*oGm>F(*iaYe1usnlk8h|M3xGx=KF?pfc`JQjP~P6hA7er=`G98X>5>!k$_
zyPkZ&!fUb%PGwSn6aN0zW0PtpSo6wT;6s-z-g_teD{YQhdh)59QKeVs*BT9X;n?zS
z%%kC*zn@%&WY(z$K|_Q15-IOB)BlnNfrOn}rm)PBi`B(%+iA78V^oZXN4YBs-!~=J
z7yeas_{FnJ)nUDRz_XJWs&6+wBBvtKlmnz&6Lv}Y3GYGeBlMjs2LxHq#~F5moF4e~
z4KSQ0R`J^!(3{Hm&H@mzB)veZ-<Ot}dnxYhX&SvMVZ8faT!8ZR{xc5pn$U_auP`0V
z%h@~MbUIQ@vDrjGXUZ#*>;oJorA7N{UFFGrd2yezJuAY*g~A7qGlpXp)BMo2Kv~sI
z7lUQ9duGc#{q%zOl`b4!jP>GU+yI<cN%w{BuQ_Oaj|{5nd4+;Eu*61T2oeC0U6D%E
zvAl20?+W^=-gg>a&nFCnUcSQuh!|@&lM5z`+YMgl$Sq)_W~)XDhkcWVPe^RhMK<gw
zgmvA3Qqe0-JXgwb>}iQ0;j%bzDC@6GQ=9m#N=909is@AmuReHXmA711Xa}ga-B0ws
z<V9pgK#XADBMf6*QPvC~3TZls7C`pPqHHkB!smdLu*Zu3k^8MmIE(}_1E~s*SYUi>
zzZjb96oCqw^qK=xM(nAlW0iSevYb_38j!?gw!syDha_kY(XxBj0TMn&(e*2E4;}5=
z@k`B_N)U$GN9Imw?8t#Iuu=c2lDsay_^2Xx?fJh_hiZG7GHGXEHd0QL7s)iitX|m8
z!pNrXLzE?mozuv>0e@HHes%32%%R?N(J-1u1K|W?D;;v{4Ke%=2FrW^FP<2X8ky(N
zI3XTU;5J1wMhBdmzz~WZnszgR3&!pNM8KWXk5jxVIZ!Y-r*^j$#`5qguKIQ~wed?_
zGD=e|;$Gt->}q?SOr%{S&W=7fAF0A%sn|&OOQx-0H6hlYu$Ei}LdbwLd*Tw;W+<B(
zpNVf>)4{=3p9Xj|j(;t6CyI-2ZLj7ndMS8=?6GU&3PnNzjnsVy@+!xxSA46$D%3GG
z3xm3Puq~{-<>AbwT6zlMO?MU^bF`+Cv+qY;r2}Wr4>xba`l{>JarJ&vT@GpS{9hVc
zYnbm9hDn|x0$MqKiC0ae|G{+Tp}S1F05cHr+6mTT>j&Vz#P(sNnRrsZb){or+o_?h
zjCA1k>9IN{YI$p=BJfkNNM2ZI;OSIj6x(w|^XlMr2G9<iwl~v7dR;DEp3g?-s~;&5
zZI7!n!%c@KYvvt_lNooOkacfWRl+~&t7k_KaX7H+jdgYVI}9_rFO&6F<-_&X+Ss{w
zx}<)qhq7Mn(6*b0d6!qKG+uXWNl(}EJZeg-5Jd%=_e|U7FA5lP22`dHHqBGp#;g%q
z#xd^PoMF%5xPUCq5_z@y!rmj#i==}nK1muCB}D4amAYC2yY%`b*qUlN?7O*V((Tvw
zo}p70II5|OH=w)Y^O1%fk-1dbw%Y-~THe7l+un3vS30~A{aE;GLqVLVJLoe^bUcza
z$9>dDmP%9tJH>AOI|6oZA-Tfr@J(Ztd51SA5-kEb(|`p;w^-dPyEi8^NY^fShM4iG
zi<B&>#gP)44qEL&BRH|nt`3!qf33>pdmZ)uI{DJW0jh~63+z5lIG|}M>zx?RF`N@=
zCpI10{f7->=bho1cJ3f~)MUZjjnD6)SjVP~&rB5r@H6?+qD#UxvxmuUio`OPwzT*G
zb7K1LHKd}>PG8kj&D_OTTuGHp`>73Jrz&44#6lwQX8koiHrOT_W!(!4*m1m`11*^N
zgyu8K(OwD7-}CC-4Vs)Am$P=UfB-25pYP3{l}X)h(DtSC%;pPk8BUA$$;Uv<CTmfr
zZU{h0LidSz=j)nf!JIOs4OuK2qA~9T#lO;;x`jxzfN|>t>-Z5xlx0VZmZDt~c_1Hg
z8|MZbc_ZaT+~ShA8~XQrmva-Ib8>T*kk{%(985|>?oBwDPwr&&uRw=)-6-@4mGi$&
zsMoUGz}8-_%W-(C!Y?v|Ttatwe*V?I=R9DyVV5VW!e6o>nht<EcHD0%DT$ptZJf%Q
zi!<}<VaM<k331k~C!D!#J-NVRUysb5?pg_`A@J)-3mh>q;tb~8d-qb-uI>@^m`lge
z1bydf5rlK*sZ!yeQZrjj^kd;G0Ca|(?+?{eQb*LD4b3vId>;@0TKP4My`M=F>oQ`#
zBk<GQY~>ixW~CM-=A_B(e>0H9J^QALM<#qQyS-A8E?~SsYyy^-#$RhjwsZJXtREru
z-e-wtw=simaoe2Ozsmmd!9SF4+nO!Zi(Tu;I6s726_XB-1@@MKJ-spfcW`U6wqBf$
z2Y+y49g}NULkbgpUE7G>TT(VpOkV4<IUqpF<@>%hspiXfCV%m0wH35+YL!Puv_f}H
z04){F5wVcCtM@y;VE2ZM-%ea{n*OiG^rGAYsZIcjep}^en~!*Z1DgU_m-p7=cqo#v
z^9*uEqHYi30jMGG#I{m>3llzxxq~vp()rEKcW7Hgx4_h2D|wn-d)U)4x8^!=?_jxU
zBg~m-mZZE0?)&%=5*k+j+{wrK`9tNoTxF5(kigT1!0rYG_qc{yK|1I0PW4?0D;gA2
zqHM=d&<>g6ZKmWIFFYJ$YV%{-wViXfwSED`Y&tOwFb?TL_YI%7x3l%hX!nPf)%J2-
z@j?}C0sR><dsjnv(k(NWgp0Ea^wI$fw}`5S;qbiN;sVc~v8H$)f7egz0xVC5>_s3V
zs$5xqsR1vVyYx!-soh?UD=ucWi5jFYqF{SsCuKxdU4z5XTtS}@q%qJdW*oBUF}U?P
zE`P?868Q+>I!mL4nJ%KaG<RTlz0uP`9G;r2Zo&^!&DAD^k=>>=T2dZmV8`fqB7yD;
zj<=rlG=?MB!&W_(g4XEXrdEsf*XP5olk;}_C9vJvethM_i93ke%qJoUy9_&mTAIg9
z3n<^uBLbMNeO-TST3btq-M)C<ZF=6%F=^}L1-I1WV1s$#v1BID?Kn(HDfcM6=5pIF
zW^K-69qFgx`6o_{>Yg&)v!D3Pl)<t%+q>`-pzvqf>L{!TbdFdH$9}tM`IBBD57Ap+
zxB&^c9*K%pL@Z_&2`A-?!5E%kLk1O4YtpPR_NwAL9xP}Zonws4Q}GX0_Bj<=CUnUe
z2*F=BftQY-gHZPVU)Yw23AETijkn_c78bji?aLWtC${191`Jj2vXJk>Bi=R~PGx(?
zCW48=)Oj1K2xq$A8`?RUQ)g@JeR(LD4y-*81>%@L>ud?Z>}+Z%x?a{kHU56ytMs!x
zr>3lGHf`R~&n!8`;;yVcydefU)x8aIz?ZJdOxJ3A=VEnd%1}U-uS>sw#WQI3a)u*A
zqcQ(^n4C?(9Ft69j2=o;WvJtkJf&w-is03<X2L<-8yY0M_vNS}($*w+w}6PH7^U>Q
z%X<fEfSpmnj*dukM&d*acLoCQh<hD`5f?@SE6x(L=g6T@$A#C|i5Ettl6Qv_hi2HF
zKmUojHz{AGRq6!hVJc<uW9B=7#benBi_W92IwEvAb)xJ}PFXPrRC$=LRfw{#VXF+>
z&N}%dQ5I+FuCbtEE*)#4*>w}vCSuOd#<@1X4)m^eO@cz<JR9eyvbkQmMiuRS==!ml
zJ*yJVZk@mEoJ2X96(Mb+!g34IAxk^hg4<jGy`@w+DZ-&^!-`2a^|~_?=974jNEj`a
z+74ytAc^)IVV`~u9C^^6;r_$@7HD~f>}Zuw`2$gb;9P4i=ip|nUFOVD8~eXN!(eo%
zC83caTbmQ%bMoEcC-pQZXxMkX&MmqqHy$<5i4KTEj%PBc(NZ+s&1!y{Mmm4%h1)#5
zDdTN@rK`Y0r<icm;1Tr4e)=ggtz*Q?!kTxF=56_~YtpMDV?-kND{Gz25Y-fPRCnvS
zq9v8k?cULDF>A^1{`AHc!P;H{KuEgceYXP6?&@;m>oZ;od~G{I@2@wB=*;sL>J3_I
zclajsm3{TbRyN`HO!Mh|iz}QK&$F|{cN%VpOWdNM(?qrv$EHe_eIJvO#FjiFd9#O<
zbqHLBGb7)O*594qS?=E|&a=BT(#$Nw69OUCi(TH~YQc&}`4*B@;pPY+11Dl&0h1f-
z$dI){2*agVMyhKnB@4qED*J?B3|UGX?F04_RCiS)DAHe{g^(yk*y{qurka_;VYo9@
zFa;dHLWLYJauJa7h>d%xk}ZUcIb@Md(#;BJ`whoOS(OD;*$W6Xj#A$lyNR~D|6q41
z;H9h^vIUvf?kN@ttdaiSZk#^2?8rxd9%QvmN?wn5=HJdTkv<ZZ^fff=we@yexK@08
z=_Wii3bomg;=7Ww9@f~gsJgUNc5WeAhNJjWowajnVwqR<UV5)3+{DaW*t4Yj>r;vR
ztOtwmNlPV%>Fk+XrCrQP0b;FXgBNB7o#W%Ow5_FN0Zpn~+h#JX_gZ`+PF1+iKR!B^
zyqP1wp@w>d2kvUAqQ>sTY|Ghh=7ln6w(IuNIH|@cRKQ^4jY0?X?zrphk6(#Ay)}?j
z2uc0HfLqvc4}O7>sC)G2h_8<quORNBVqa64vz*>nrRmBEDCCHEW7W#v3!0y~t0)#x
ziB4ZIW?>3b9NMNEWK4J0u?^~wS4mgGIasdu{x~t(6AmFDE`tr@c5K#u-3q!wdR5?o
zPK{VeZ2TZrn+8}oM7npV_f!pe>Ek}XUrR*7HQQLiE7O^gbEB$rNFXreA(lOIm{b{2
z!g+0pI_-Qaa2=zo<H=WY8Ez$VBA$kcI}H^rp3LAAe~e8HIj(cDcGr9Wfed-iCbT&C
zabF=gCS}O3mnkkEzTf^hwfulKle36^%z={lQv1rMgJk+fwkf(2W|XK#qwOdaQy{Np
zcf<_$*u`-r6^M_hTiCyJw44HZJ%eI%Ca;ruW7dJWN3TC_zq$ALn(X|O9siO53tY%E
z)0xkY_Q_`roCalY$Q%z%@!q?f40KUj^{MNg?DX@+;2Bm|L8~xAt<c9Poj$$4)oCO}
zpiZklt6T#}19|oDpNI+2#aoGQ80!YGsWH00I&0#VSG3zyX=VnAMpmbgitJo%s+?S`
z<NR}@>-v|fif?aIp?yo}Yh`Jo!N-v+8J9=nJ3r6GM~XQ?ys@YOgqY4qtr_{pxhmL{
zh=bBj#N8DFRq5jDc?g3B&QD&!ync6(OuRqfUc5#exqwV>V4RWrFn+7psO+;Mw=Ke@
z=3@>(Gw+UTKbbR7x=iR1j?pg^y$lp|Ns9=HsvK9r?PwE~0^Pe0Gl9WqTkdPY3jjKz
z+BbHa+zh|Ld+xEwMs(ieQ#>s$KL+iSr+=l~l|V*zf8|GMv8RL;DO7d&aKH%JOVCSo
zfbSJ68Na$V(UxEaI^-NNVd^`2ELw1*c4;TpmwwN2Cl+SEWiPz1<{ew-F{~Byi{p`b
zgbwgHX<S;X_62?#=XBrG%kx|#Amiao$(dqadAFS)Hp)zf0(GK8j~z*a#?l>#T6XEt
zH)j2W8|cWv7JCKSafL_G)~0(Vz3a^dqSBw=-@>{W=ARxh-<m5w@yn7y9kF>?IpyoQ
zNm9nwI1i<k{$IRKN;}`pu==SMa|^W|$?DQM>q+bVl4c?lO7c>vtX!~4p~K?S(Iaf4
z7rZr|xZfHCf**RF?;j3TxJcLnCq}rIxikhCKuGl<#Iz-*tv<fYWPl2-lN>ecX~JRJ
zO{6s-R(Q=2jyGNONZR6ArQwvX))joYzKCuF;#^8oTlh*6O6Xw{Z8-<dX7GHF7NqdT
zK?W8iX;#^(+kS~#*$k=SLA8B90CmPn+Hm|30Lclpo7$XePa6NXfr|NG2dd2^qi5-e
z_C-Y?cLO7E02z@5d_Km_ttJ_<C7#A7cZ`?Dak+y#I=+EdUi^nADmKCGOoc0+F{{9E
z3RN%B=QQ=S^O-`4Trj-Q`wOxuCt@5SU4+?)8X(x%#p-ZLIJv`dnH}R9U%4O*iTP9t
zHaI={sM`E}%TdCAh~MCX-wpaSlepx))P6VYGC#HzKVZ|%HH@W8+mtk6z@IB~_(GsW
zNTk_Pfo4zCeGOj6Sl^Y$?f1K6#SJ}2#*Wk)HPw&anr^@i12)ll+YC{&K7wp>-sw^A
zaN2|o!Nj4HKpre6cSl)<M?LVmjC<)W&i_U!86zy-RvZ~`7`rkCm`%XD!OPJ|xe(dC
zW@+&JQp`kJTPLgf%Oclj0dod?J)7^8ZuR8IU8wDZV1xNzDTBe;JyUbDYc|{gEV(*u
za8sB&QPpJ5z|#z{Y-1?Gs>3m29~+gWN7UB|Z4>(IvX_pENlNy8Q>_ohW{mh>(m|+!
zm{m_2PA%Sbo}uT8bYOwfbao`6SU*Cz*!JQ?qnSQA>~n6uzLswKbzZ|k%E=b#gelR1
z2QQPo{yx_IdKpHj19mfF?d{6*`vYG9c_p)h58m#~J=L)&=ESKMp)3k~7l<mH?YI4p
z7+CXn>e;ngch*d!fp%A7rPd>xps=D^xO^2d;2UN(w3u_0G!qV#m2Wr^OI__XtZIEs
zBpQmrqaCo$DyTs*DfM(rab|?cn3(CsY}OQw34OGslv+vr-1%gmCUWgbTbgW9?a4!k
zjZ-QYx(>XTvvv;ivekBK)H&~c^xrche?~L3)-;AjZIf;kP3Cy2yE!t+tOFUV#(yrO
z5*#}Rt7-h6kvCgJe%-nREInl&r+Qd-p1?MZRMh%W2Y0s*1cpX(MGRCQD6rTW8#Yc8
z^T5WzH5Q(}qI<)^{I^)j-=jqM+%SvPSp-X-W=N9AGIb*E+-SU_&Y5b2lPhTv=>Vu<
z$&-SM6X*|Dk$;+e)4jnUKK9E~o1^eSlbkRRWnpwmL$e%XIi#H`AMozw6>psyULFDN
zh;kqE>RluLRVTY&tiG>=0optAw{U3Vjs81~uFJ1Ik7Rnh?|CV16*7R)nPK%rCC6Xq
zZO!WO>wzfbC+gL`ub6A^oJ}eH`NQZXewQ1w>}7pOU=UIWVhP~>zWHTOU(@U*%*HIs
zYaKvSBdzE|RN-<$qf)ENhsMnzH;0Gzuw1RtU)4#Z@oi5jcHC9*ZO|#`ImSFsnV+*;
zXm5oQ_Z3?%z$Iy$1Y0uhj3K&hn$q5%>s4fQDLp#N5@zK*sVHleBk<Y#Yka`l31H<G
zjsmrUn&o8Yi}=LL(rqp>q5!@fLc`?9!4T;Wb*}pMX4ssa>~C>lhC^2IOF;(9T|47v
zc7jKXZ@Q~mS}o1*Kn!7VBXXi&#nxKu%s!wNvj_s`x};+~-HVgma^rMlb*5&4rKa_T
zBjGYxvV8O5T-qM)>{aU)yoS+~lMkfldviRyWGk-RA{1(+D|+qI+o;?xB=V5)JMGR-
z93};-^7AM}=b(zFtHM>bv98H|Wqhw(ldbA?+C@*!ykHeDoUt~#Qz4e%n*3aWm_7Im
zkb5#f@ZN+OO8o}Xjye`=@na$=^)WkC_Z5n3n+t&O<e=CRSAc;0Nu{X^m@h<fnQ^)<
zqO;CbMZD)#h!wmM8xN6N7`njIL-QEKyb}<|(VDpYt0KteB-R6N+{ODzXyRh$qv)K;
z9CCb#%*Vbe5duPc>F?s$b$$T}ieqSpFAiwu9_{}}l_0^v3PX8IBY30ET#PT~1H^Mg
z`~ao6v)?^IT%R*Zc<&Z)V4B9+;iJV~<<eDvQ{HqHAZVggbO9oH0er7usPeFjm7{F!
zpN0xrghum~V?$?w|2o0gjGRd}RX9huboI9kkW<bx#Up67+f+fYK6cpE^TSId{4rJh
z{?(47xC*2GO3&$+5pft)$J4~tBy{ii-fv3910a(6%zTjMvA3Y2G|YbF?$YtQ3W#kU
zRV?DKEQjsjav5zoL4;Iy&Q1?BfydbLJTkDqL(bAL(FrV?C!buZ6^oV>V&>K;66-r@
zHhCH1cp;6We9T{>P=FL{9X#knP|>zrSU!d_yR$OyzF}Q^QQoIiGH!eD7air>`#he>
z7v$;Rj}UviUccVh-QzuIt>2i}b$Y1F1O6CyYsO=Uc@B7rTl9#=T{~j(Tz7+4+I+h-
z)A1PMY6;sEn$1!-M$iuWSElXtxJ4ztLgA!5v4CL?y-SBDMIr3!I}_W0JqQ%=YJ;BI
zyuob_2Y?{J6OQ)>3ngGS;=^SlERHf8QKXjZXJRCPt(AvDCS~}+7~rqN@g{l15Eez-
z>|btCR<t-NwZ)juQFF?v1&2vq1rhyeKvv}@(^fi}<h(s++yGQ*qBmx)s!+t*S|l3z
z)9#%FZAc9-3@~pp4cCJ1Oae@I;>S$Uuvkr#fvO4BrfDbnAJ+>DqT`dTW`0WUxe@&?
z>fl1|mpEHo-wSvvC~cS;%@uOLw;t#Nm7`~f{v|{7s`HSx?6!PKk%dlMvG#-`^IVo)
zXT!XArzV{l6U*FVH+jKf?^$NTkUDF=D0#T+vB>M~xr~G~``4nDZC2rDw4YdY3j`bB
z--^K{wM25M8?Tj&wxkRz^`PH3gM_<t%r8^{g(3w=NM^dH&Q}=dooDvbSYLj=Ffmoj
zCM;Tk!;N*!KmBoALdnkj%aKE|=fpCtpB<CK@qgA`NJ~F!a@^$hj)!O`93??oXKMd_
z!G}7dfQrcY2u|9y6)-^@fd?%rd+&27)7JFy-xm%4T0;R=XhbF<<)vS9&HT@l=P>+9
zIkh}ap;>n8jbtam+`^?9+G9L5tZ1Y%h(-#k&MQ_t2Tu-fOQm;#lk1G1=MCF*nz(0)
ziT(LNkbZs>NCaQ(O)6t&Dh#4g6JI~o(Cc)}?9foQcksspQE%>7Bh|fl{HWd93|qwC
z+`HIo^yr>G;ZCj`iT;1N+p-?${|Q(K+EV9-YBW%oHxu~W`|)am6{D9hz*Ve=b%*KD
zS2_VqUA5%_A14;=sXp$9hgXl6J(O(x(C?jyAq*5rkXi+*i-*oOiCq4>-N<(n^er9a
z(gmQo<qURXY;40hWucM{;Dl9s8noXt9Kk||2l2RcBV0QapHO+XF|&RN_jR@OosgUY
z)4v}o{ZH_-siBgw-vGZ^d?+b<j{o=LZ2d<I|BwltMxibB4-UhD((W4hG16^@MB#Sn
zqs&jcw<*}9SFAT$mQ?Jz3BepLH6MEO?C#yx7jI6SIdS%3c?Qp=>tS!M-}{j9=(Om|
zAAFBA)q7<^{>nQs)3s>P=Vss;YMfb*3L`nZmsv$$A|z(!Z66Gid_R=@2~uHC2LGGo
z^MBU|<x(|MP2@KkRDX;oe6O&|zpAOqH{gY*o#JF8`(6xj#;>w6nIYr+>3`F~Uiim(
zHp4BxS#v0@sydifyp}|uUwgt8KELw6J@9Hf%@LNw;$9+&9v^CCmuV4()tOH89McX4
zPw`)G{cd9?au!p%5xwIVl)_}gu=A_)6z3fstHcN7$lB9}T_=~ek9`wzIdb*CnIn4w
zs9?P4gFu&;tHWjPM8e2Q3G3S4i14jcH+YhLD1%fzPQsb+OUB6<vbYf4s-=&qz+>7{
zlor?UtAmN+H^z9bc>m)LB%6uTQ?E@)9qHhrk5w27A2{VJI$NsB>7PvQeX{0cC~~33
zS`k3tp2?Tt-FQzpbYhacR_;rh;Y=FE*qSi<U5J>y@QAbd-(0>9L*sLk_T46sey&Ns
zZc3p252$c~!YEOcOj+UbLQKkeRa)L4B?TrNsgJDj<PA@PSotwJku<2thoq~2vQ0Y8
zTyR%x7CO!GKmJQEd&S{83GTJP#!8a3+$c7Qa~;|u%sF+=B+q50By(fb4{KSWG`jVU
zZBp33C_2>?I~Xqy>oJhFn>CY@C*On`tQbQNzGUxiiAUngTA3bni69Pi<Rs=8st<x+
z3ydW#Xsm9(+QEP*Voa&}4XDW$zg(4*hV7mYUe~4GubYp&S4+SYOkBetT?6EroSkhO
zm1>0KT|Y~C*{+WcU;>E;(^bCt54zTp#RdX>bK@zx_3=Hmi(b{;y-~`M$3BSs<IN|{
zV)g_B;I`{uPbA1G)KxJ#i4>)+1#-K=Ig2^?&0OTxseY!_U)dtLD^P~$8eA`N!j4Vr
zvbPd<qWDl~WtuXC8w}JWeB9^z^=@UK;+uBMg?ws)p{nOIgiE%b{l4r!>lcdKymB)>
zQ5wBJ`>-`24w{Sa&%;9$>qgtUymo$C<7G3P3+fkxuc<mVUnAjjD{Q9LU)xZuQ0$``
zJ_j#MRb2i}SNsXtJz6b7D$B&?UpHOTf9N77q3OaQ(?(o#O|SRe-}`}N6`gs|yqw~<
z{wD=JyZa@~{C<-&w|qb3GlKCHcllmi=dp?SVEmkt$SLsmKGYCWDAEZ#YtX#fz-SFK
zTCH{4%<2&`ZxiN{BgC8kS~`+>=+_e5<<0zmaRCl$(T6W~*c|;g*Yk?GwT6oy7WKno
zZSkF-lqvTNMzv}K9qnDjKL~NlcUZZOhm;57gR@mz%=AW9!*J%ciX#Ez#|pTPRoi&4
z{Yh!G9D9l%EHPa2K2|vK`~#f7MxkOES4uKaUMrMDP4$_%_}NoTpa(xJl_$_UBN`PB
z?fDNJb>d!|<`O$!m5i@LrBtWPubBVO8D)4as9dFQr!<5dQ9Gj*Fuj2A!T;y@p9@)&
zqzE&3al5YgOWGSm5pOU$v0@MrB2WUz?dBImdWD~K>N|GQ=^XrVGb*SX>iJT><U7_Y
zkfungXPY#;<MRoEQ$f}2++XYoK-6t|yyQ6cKW57s-hGT6w`viB@V7QBNrDO8VPkZr
z3@!63tP)xeS9fP{oh$mfr9hmWwp7L>JaO?`%IAiUGxbf3JWiPODTgW%65L#pZJ~@#
zhE02~V2v)#lt#bRf{&JyXnXxWOu#|ril%W)pxKr|c7M5vh*?74-Nt{cQx3t<z3)TI
z=wL6xui8u;Bk91NEnc%$N~5Z)9qk=i)bG_fR_io=B3(1GuGlIVFUZE^2uohTY?P^E
zeiR}xeyg^)fU=v3vr+??ctyjhQ$4?$<FQ697Zj)k#rCF35{<>bLhzqsZo*sYo$;Rq
za2N<S4DL_k6qNV;xi4Dd)*84nF#ryg;onf`M3Kv5+_Wo4WZuvITXOINRmA8dV&3@d
zh-|>O!{eFQoA^wMvY_3FLOIf{>V3S>tp-y@A)x?d<CJVhI*P!0tQNW-IBRy~C+k0+
zHS1(pun}Zh3as;?6)<R^{R4y+MoaOdZ7O~Fw@Zt!^;m8@3Ad);iyhbh+RU60Ntau!
z)0vjGe#Vbs<TLxnc!s&G41BCM4^R0PjDIe&i-|AU^;XiN`bQ*tXUkRlC2$-uoLi>;
zbkmR~9ytEm3CwvZul%2Lbo6-jq0?{w<0b{cek~L7|9|kWE%(R&=g;Gw0?=uBwR3vc
z0OxM^+^Lil?>+@mjioOR=6wT;j%e~0ru#WRvxVIjx9P3KnFmb?=odT%a;Opo5E(XF
z>uw|G`u(qBkXX4-T6abn6bn@C{;_#||MIe=Gc{4%Mm;kW++4@ef4}IQx#2=RDZuOT
z1Ka>p7r^zq<hRkxKm_L?&zC(Q>g{p;+m0*2_-+C8tQRnU$@B$0)INRpcNfK<KUoSm
z&}$82g^@cGMAieFK;gZ*I$qH_8u3JLV|6ASr1u^*SqBQ?Q_yu_Um!97C$pYEKL&!B
zi><rj4T?=9y-%GlGAuS3F{!luwg7AJ5$*R|6sH%BFE}0;FjON-%K-(bRILP7<C0mK
zeEjc%>V-btLt6lXJTF<Zsm1u`2TBCDl9TteZ@!#O*<sFqT`N%6Wcp$eJDvLOEqrf;
zfE<4*fG}KWN#|Ao0r$jo00~A<t{w}R1(Mm;!3f)6)2_{juTUioKh-mK%>0N|IU)Eb
zPWTGj0Up2Y0o8NU$(~cUpqN|z<VE_x_<fDXs~K$!X_&8Oj<nDzeN;7tJ8s&2s7K^v
zx$IQ_cphi{3Fns_r|C<;qfoA=<OlMh*R|v~|H1+~pvB9VhYNwkIo8Yl%%@7bq5F&B
zvly%MhAw1~`Tf@dGl$eIy&mQYpUv<6eg!D2CSYJ%OB0YVsKL{-4ecJ>x`&?k;c0<r
z0PXnudO*+c3oANzy{6{}W*(4)U2ri$#yhVz=#&g_UR_6KQnotdg&Y8j?S$9UpT95Z
zQ~1@DU}z{N<YrGrP(W4;cEaJKhEc`fuBoikqA+&__wHJ0Qo!O^x<kOT^Z?R3=!H+=
zzgLHx&)g@Mn|A@Zs%3#&(SOYIk9}bE9;?d~RWw=*JvSL&`km2<?UvE$r2L?DHU^qP
z20(gRe{vNvx(T(<g`#9d%>I;hnf+9=LifhVbjl1lTHRVk1fDOULVDRM%+PYHx3F5b
z8<p<^&B~sIjvyg|x5lPGBzT5pjC1q}ry!v1)3v<{MzYvdR4^1Wu*)SqLtTlX6m|Xh
z>a|R;@%pLG%~4ep8Bkx{6b^0bS3x&gVHcdrg9>FP_5*6)bV6s3-={Byx}vuI8T~D*
zfWvnu7v7yJhnq&M2(cXpqho6A4_{!A;|R2;7MU5O*@IN?Y1cS^!f}I_f88&k`;dn(
zUa|vRj9m~PU9)Gh2IydwfN_ck&JEu&{Np<f7|+$QfzT1)HBkXLMU%uxOeSTI?ph9}
zl@3lRh}sZ-S!U2IaL-zrs{lD8V2E}E+~Pc@My)jY#4l$wdO&mRdtGh#NGh`TbvyT@
zz;#{a+=!@%xQP<VMc_{Qx%Ae^)*KEPJZeMrEiS3yw-)HiNaY3E_K;TQ9w0vnikU+`
z0I7;MjE1z=fB7+RG~o<5f^t;AzM7WY3&vj(fBqMzV7MW2<w?7e!EB||R9(M3G5_W{
z9DboEnFu_)+;FudE_OMHCDZ{4^4v2hj~DJ7gL{kN+~lc9BavBsKgu5k>54P5A|{$J
zZieETo^8yCa+OkLxHP&nqEM*;%r}P&%Q<tUaR)oVb{qxVNK)gpECi`v2HYHKR%F=M
z(}r>%v*C_;fmm^3VSXCpl>2a33z(yXiE~;4>DM;Vda#x{rRA*>hnad!Pwp`9NYZsb
zrGe8&%<8wzqRb<rJ2K47^T24h>tW0~iN-e!QOSBoh%ZO=9KVz|du{9L;oZv;dlW~y
zBTVg|#dwpd^5(pt$?Lsik3+zLrAqTw6PLVY4{uQ!8PQjTuj{RRt!Vm`yL-&kP44KG
zY<eYrS3u?c#WM(_A_l_O8vng=CWmLCf=M8Jn$u+3&jn4g19@>#)|3%@Mx|jPha#fD
zQSFWM{3BotRDq28P=m5j!($+5v`7`psQ@VFu8|>aCxx64kv{M@tdjzjZ>oA9i(t=J
z@ko!%T@F9|-Ke?f{`q6~sTe}tmY(fg4_!L>d4b<2Y}IL0iT`8dg$s|xa1ISm_1clZ
zj6f9c0wzTJ$&~X)eYeg(SI<LB2T3|qs%4sfpfDj)qV4{ET`nWE8*xT+&4i17T|Oga
zNoS8$Cr)C5A0Nw%T2x2_nE|ijakY#lsVSXRIeoFxYc7>)7SAjD8om1l6h?z+Z&QYu
zJt{L~Q~RQPaLW%^6wVt2aL6dvx06W<apbqOid~=~G_tU;uuWUDVeE<7TLt3k$&PZ~
z8pyok6iZ;KQj_BNT7lAVXjMHUp>DbU0XRA@ORo||nko_5r)rnKp|@7k49)>v@c_~(
zVNKr28qtf<QCcr=v0+^O8Hd7bjmbc3c5L}qIbS@vLO<pfZYXVt=;giFNVy~WywxbD
zIfUW0LM7Uy3W*xr68NQmZ+=nXmZ4-qwPvn*+~fm?o-L&fgORlA_gt~4=yKrtZNYLN
zdBNH0ZWI9##qyIi&}Rji)T!j$@!_h)3i4-na{g1mTaRD6hi%K+K75LE@q1p_lVgvN
zN!zcVBQ%D<$bQhJa{T6mIi!sL;@ct*{SNTX=Pvhv*yLx&g*l`g`OZc>JZ_BqxwBvg
zO*5`|9$K6)nhb)OoPeFM`?qjXU2jyIZ+L9?4!g+Mc96{dn8P{&-|n^Jp(3MH!B0OI
z;N#`3*!aQ~IM}(+>e}hX&VKvd1W66*Y57Mk$xC-`46Rv#UEtsw63qeeA}rd*;j_YY
zdV&C9-gGCo+9_*RDh6+`vC=an%G?>m!h~p2n+Mrau9mi(0fkwBS~&`2iQc_fT(X3n
z?hh=_y39VU2Y7`qtZ~$>9c*RoP(So8^8Nf}J6JUWzE#Z}<ifs^me5Q20g$IPTI94C
z(u4Htfj^}w#wi6L72ms(W({V78*+R3>Wf=V$q6?56B(?LV{Kbi_w`<@!HRb?stmkW
z&!GAPDkz0t5BpKGOD1Ip+Ukn;H+eYf9lc|{_gk8W*ovmd;?QSF%U2&e_Dt)YSmZyA
z9`jC1l@FreL-Iw=PlQkw@#PLB`LZl`Z_`WSD-go*G1^@dmdMv2?-`Ju!)ha_y&Fom
zxIvX-#1_MD;|h`oELI*W-r<(@u#F<9>4fI91urQaG&h5)sOWi5QYQRYONBn}on!JY
z4Ok0h`c8-h*=B@^1u2gKz7~5@HLwsWCECliN=n(?qK19D0%B0tN`BRo^!tA#^twi<
zwBu&Dg5ofTPl^246qp(=u23cJjt)sRIB2uFQ`KR|^r;RS?XBj8P*9Zcm>d0xz^WI4
z39LRBfxv6e67$1MXyk`XDLmHu2>RO?zRTZ1RqLONRj&^Lg~_j$5x_#O|1eBGscI0t
z;*CY`F&29gk25=o*TNy5h^_OC$8)W*J06-Lk9JISrQ4%kqNzcdVS4M0r+t}!Da|p8
zQqtWw*Q*<E%_Y3;iwbINT+I~Tqy!#pw)gvcLRVR|#a)%a5Y<@X%A*l}Ei?T&?NHaQ
zOjSAu7FK0zhznWC{$w>2N^zv^{<QTgx0EDr{+cP?lI|O;KZl<XJdy`3Zcbhum`+~p
z-CZFr7znO@Lo=<;IE3?^om`V~?WK;ozDjMnNMX^`>iPDVh>F9tFB;X7bEamz(_nlJ
zDK2JB#?aNC6W}N<#EY(qTySKDi;wsoI(zN+RM#CF1<K~qjaI*!A_B_R@~7QNMdw=E
zxiFQvAQyBe+UQ`!7L3+x^?S~Z0uP5^BIWS1&nlj-%R+P9&ci{g=S_|k8wm@4Jr0Or
zWO&pb<Bfxt!RE5<G8bqc)2RJwmQNA)A`Q#(M1>TnEB)rnH6F`@rL!^<G6RZ8fib8P
z5RzMLg_xC`6&y<ux6!oaARLxr4|>D}Dz5FF_^-24)2`~dQ;DaXJR>Xvda<`5<N|Gx
z@mVQ7{OFyMY5DM4&RDj~4ufnO!5!OGIh#IMqTOYv5>4Ue#6|SxnoQ!a%X=k5MwT7>
z?f6lny0j;gS`W?N{9IU3Tv!*nQl9J$-onEK2!Le9<R*$Ln}Dme^vK>9*}hv2TAsyr
zaro+Tdzhc`h*L|EKY7_pi>&NrLyq&BsdvaeUX9vKsjOG}cy8Aum%2qvhdrM#m+LLf
zZepu(ijmwcPDgqqtjnJ9PAkCAFDk+8dm2qFMIuZW0!cYwf<5~^!8non!y)!Tca}BS
zopo4RDTv+GOGzd6_$vo2y@o|bXWV5%Uq->-NRAXkrHMN{_zT7-7B;=@mbqt!xj*}`
z{9sMFtY9MhVBk8(q>90WGPJEJ)g!|F7EoNlY*WE2!DBI?SJ3Z(<khdvn_f3d=%9+m
zv-0^J{GmppQY;%w1Q;wsVfRW5-?BRHmn0fxE`gR`G^3Mv0M=TpCfqwk*UmdH1Uj|Y
zAabbSovl*9AIc>wvhN(7KhR&nt|93rz!}G_Lh$+}xgiWJbs0LaV}eB^*!vJ9waodN
zpvh3}qSbfzA5EH7juKSzD_Ve<tJ0Zcjnh@L>BCd*c0u2O68(yy6~qPQ6bW%fX&ZcV
z46VM27ff$(4p($`jI4y)crqy1Rn?7D%5j{m6ccLl?wZsgZSgb{G1r>v!|=h6m1#OY
z?)mAaF66C<x!p)%abnaTOf7kP(1^Cw#YF6KDbveExQy-(1>IDJD~j|Z#s_}j;gifU
zr_1sk%h1K>2+mBbCMt96h^>Q>{LNq7Dco{iw-(&kMMQ0H{~CNOl8ZI7!b@;jNKnIs
zL!|;iTjNhAAqoDCHE_s_>a6f-2&?GeH+g#Dad|VmNR-twlyCX+qLGJ!PrKHfvcOTW
zV;R}X0e43x4nxC{mp?nMMb^wzp=ozk_IKhbfGzc`aUFy!J?K(4U}3<T-7qL!URRVf
zsII7+237eDJzTPtSdE59N;I7QE(R{vPD{>to<XChuwI2-rfO0(J;NBu-Wuuk;_7L}
zh7yxesL0QEQk&QPGy%Vom2g&O`n*Vu#%@{+SfFUK3cf$BhT%^V#cmK36wi^)MMk`9
z!Y_ivjrfTKe=r@~bViR>16PewHhho;%~q_v(|g<rvcFcEf84RmM$vRl0A7FKlN{i^
zO7j@%@T5H}VYYXymP%P29jFU5L{t7SZS0dz#_ZmWB5elaiK=}jwQrCnS`EHg!XHs5
zO@GuWjt2GZ)mdqJa=rNSy9mr%{$mTM`OYFf6@BW>7LLW@K#asCTR$qpA|VYdBpArs
zoYxCwyfmZNg=n^M%(<JI58(;4On;!D3G1dO*PsrCpOmDxqzyAKJhVGn9X02w@~^od
zPdGe+2ccikV(^wTXFLz|PY@|+U&3cR85Z|FklI=O<Y@IK+VI5L$u@Rx{ka=AIVRP4
z(b8Y7epdqcweNpAQE*XpH!cL6x!WYDEy%~`Qj&Xi^7%7-)4|Wj>bMY^{KE*P<VXGP
zS!S0GwnpHkXxD(R_s!88GveQmRezm!7u%F!bc-Yf$+QPW_I;sz0k=pY`BG8}vbe$X
z4(dS8?$#&1TP>+-9}iK$;PpaIjSF6jG?^NZBi2sGz>HRoRqK&xY<{KIEcJV#_ncCJ
zHTm><-D4`ECr~aRvmb3HDd&-Q<@_YUJKR#v<J&2mby?ty%WNg9S>svnv<7K-h$ndy
zVLR-;&+8y(4O<G(12aLCJ`=PrpFiZo@-f|St+sy!92A+cXolT;N11&NSeCIH*WS=~
zZfK=wKrT3>WLhgyf6aZw>&7JopA3S;-H*Bgj`NZz@U<wl5(da*GaRh@X)H<yw<}?^
zvcSFhga=(q?AvDC@;)xzTbm$_=rvq0J_B|mpM4U+`Z4Jh2od#!L7wNG9rhipoz4Nk
zfYk)-a&z&LcrH%jRXMUATc$>_fC)6ic`?O{O4LJ=kN!lFNb&UJn4YXb^is;N`aNLI
z;~lm0POzru%OYQgg5s#c4KS*8Af-*5)LoU`c(A~{SOVoTE9Dv*vi{afHJjVC6+TsV
zvv}E1b#>?4J7N{f$~YU8CPLor4|1KlF#`Yx?0A6wWYDjk17a!DQ|A@gp|vH&E`i--
zXK<W30jU${2yp*wZwNzusNOA@&s>YM>`C^7Cr7fFTsB$zUPUwDZupXi9#8)%f2f%b
zOuzV^LCCQEBdJNQ4_LAtoiONsVFPN<%z69KqDwxjO@BXTCzYyVx=N<98#wo!b<+Fx
z0(Y!%REVEoKjyHwx3!op9HaRr8Wcq~Kyj;lm|266G&09xaG+;ZQ}z3ZdCYcTq5y|9
zEa5V70tOxyTjFOXk?d1=m7)z8EIj|*BtjQEtu9!@Jh*lRoHWZmLui!8mQ^ZH-jP|U
zb9lPzh;1XXYmQit^clHPTkRjor4TKzuG}hn6P#lrE(IdRaJ0m3Ff-ov>16pe{PO#_
zF*64WoHOAw#2%ba`+iV9slJT~kooUE182t0h*Ufg%hFW-Q-jwyu2+ya@~ysTxn{~>
zan8A@CAPizN$RebUvckf7TJXi7jI^Ex%L~sF4VToaIpZ%<H`$mjw+#5(;@S~Waah3
za;ATxnDzZFpcGCn^^^<(B3KKSnULf1`-hQ1{xFCr>xB!igtE~d45u#JCQHH9{jePv
z2mr!}_31$kBS881`WQ=8%h0dLbli>SYR9Xo8+TtmkXZhUzFzxmb0IIhKWPmdMmT_Z
z^1GChEm!cIdGLNfr1YQ*ROao%=2Xi&T$G|PPz?1(1~ppo)QlLVQ7w0XzV&sFVdz{%
zpJKAUOY-tcaZWH^e}eOeNyJTq8f2$x339}59mM5{IZo*V_{$Lr6DF5%cpgKGwn3U#
z@-4r!a7daFfMWA7ce+*I+xw5#u^>%`8v&a-50s6SW5M_*{t;)V<|yeQ9excteoA|5
z_3QVyxP4~-kaPR-h66up4&f@{cn;PR(*)1v;#GhqHl|4Q5WG|EwJH+{_b1Cel`3Ad
zGh-6)EEQTx+;fM`4oP45y%{o=K(*E_e!dfFv<1$;t}IKGxefjrosYBmq6Y^o1j*^l
zHhIX{cZkCtci_!)e*ths%n^@l7{ZJ|@@d}!e~i7LugU?ryVW|`D(GZwNZkG+Gq<9=
zBS2_Y>aN^f&kjR^s-lj-ALN~#SP;yF1S>`+DFC>Ot%3kPcleM|a+=5e^J+VHZhkMh
zJCtMJ@`&1LqfsU>q93}_^vW|rQnMnjV@tt%ZIWljhNmV@OL6b|Dt6oY4c%k!7;L^X
zjwzY#cg1L++YA>Vo&tE-IYCoano-YyBChawb>bKXAiyljZ4IM~PjHcIcxqoFZ)hvf
zexCF&mH(P{E=YR0&I?~@Hy2MbRAEzf5nK+8_zoVoxptUW<MmYX+xyRGqC1gHCDs)9
zpic{U%x{DQ!CqX=v%|0fP%c}`wg}guVLS7B+_M17vv&jkuC6y2s>^tf)jf{C#b1u*
zDv}1u?X@~^J;+<{PQJ?4h-!X{T-n1fl&prOoOgO?pj)`o>$464P@Npuq|5VptpRuL
zB<fYfh0a`#tQ<tjIh{C65XIJVX}>*cI46jqUCgrWJx^vt(4ea>4l`gSPy>;40r2!Q
z%)OUZApP#yam^^P0Bjr>lYgIgzAza=L<v1ZY#Ka*w}(zR4NYNG?-ijVAEt|kmfUOm
z93HzWqa*2T^>lSci)JG})C{jnzqT$rLaT_zw)^SUrWY_-(_BXrSa|FXES(!055=ih
z&w{5R9ahBb^v9L6e?ziJTL^YE<K7X{Q|KSzpD%@0A;#pNeR)%J^#hkW9b`m5dkj-V
z5*}X-=8ACWz88c`D|{bXc>6xfU=@Acf|1jFzMn9>QT4Pr_~RUkw>}LgMXaw2H{jC)
z;C8hVA+XY-<&_lhq2qzYA=Y!9av+JQ*?TPO5Lm9ZKR~FRPIgA;ebOH(VZ1a<DQ){?
zT4}3e8(4QW?B>YUxp!?n+YDC+>NX4#%Ba={Fn-nSen-0hI>2;mg|$89^>wC!9}ExV
zM_?kOlQJ$`@#cQYaz*ZnIxYcuDUws}0^=V5SWRr4Ru`zzsG52Ukb>`_D8|EB^@07J
z6*gn()LE%1IC;5d>2hH?gk->ZL<7KbuJ>}=QX+Qto?MS}&)UF%%w?wrs89*HQNU1A
zWe0rmols4jhob7V=RVjd>-|*3NIp$g>o<|pI}EFYU76@$lOX9~*+%-%1Ks|+y}zNF
zM=*g*G4K(v3X%Z_3b*6*7jT#GuP%3o)BkIq{r=5E9ftq@f&aTdaMJ&OXbe5HlV+yh
z{)emo{WP2&f|*$+w^ozgp<nh)xgK~5*-8I4=lzd=#mC<s$z2UZ+e4w2Y#?0d8~)`W
zkRciig0>1@QL$cr1c)u|1!7z~KOpFST<=T&l@}*@YL0yn|6Mt&B}&0f`1k~SK1o0)
zUJm~5YDi|FqbUU#y3xst1AxX~vH4wrL=S@1xaiL(6}g;z3UrUPCH5ttVzrb0Z3U+N
z9{hiQ6N^3|w-)>G9Z}baz*!js_Dm?4lErTGox2Ok&RptWsQ<+UnE30&xmD10a;l|!
z^Li?Cz~yx`=%*a`7Em9%mtcY51^tum$7TRlw0d9$unHViOaC}>{I4pDe__@rfEE@o
z{|mJq1FFi;@fvxYX>^xc4(En%(@?k%Xk`?8uTOh{&HiJ%HNczDco^|9r~{rg&VYi2
z2po4jl~5}S6f#M5D$R^EI`EUQApItT_-1n5Dxy%eT?M}n)_ypURnlQOKj2R~wW6i4
z6U)pl!FN6yB>aw=RN2ojfHU)yL6tpZ1-O|2?Fru+HOEbu2R_{}uDHK+%?|)NEfLFr
zzqpk5dzRZQ_NI<v{k(DE<#mRQphq{^2Mpj|f@)NH!S9Bj(9H==P{0rY@f(~yq;Y|q
za`1eR1-}bAc6b0eiH}C;lZ<t1*TS~k*ZF%LBsfZFRuOjnelqldgen)Pq0Ce(B8c3C
z)E;3|^6TAo)#8mM;d=k?6Wk^?5vIv26btWhVXi5MW3NdQ&EZXBHUY9@ob$+p=M{g%
zp8mbDhk-?A9F!y+;;{oc8!Fo~K3&R8F6XTzKt<6}4w&dCg-~~!IZ#p)IiJ+-rQS^R
zGOcxMmGvZ?cQ+0dro#R5fa|aKl&9e&X|pLkn0K87mR)6q(Q7L2{}dVmF)Vi%Z;pHA
zAf70gxr{XUy0iUMhE@Y$R|<G`f3!%8u&dk<7;!%n-ZUXQk#nVAtNq%vtNunFx;k5J
z!6c#`uL*W2)0)dDp^0kSDfyfD2#;NvkrnhEB~se=29=7<eHO%%nA!w7$*-2qx$@&i
zOsg<+I=&8q+53$iI3_P>RlvHQ<1@oitE<!iFT}d0T)8zC4wdRMpl-)e#2k{sIeunB
z0>8%%I?28`d-r#1D$`ziJ+l#6eO{gK4q~l#@qT7!XPn?vIbExZy0e9RjP1W$VyAm7
zshx>KpExfBE!4eXcp}f2`pFgy?o4ZaI4)0v!*Dro{x`mR)<iMUt3b8~s&Y>sK#=z#
zZqqBE7x~c0unYNW`|xEA6Ei$;SuTMT8HsM!30wj?K|{k<42b#cUqNQPGmtE_BnV}f
z8J|<j<t*gVi=<H`mIL%T3m6T8K9J~00Sy>YP)32{TJ?J*xnYm7fG5{Y_*tT?ClbXD
zsc-N!2MNBUq&(oid#iF492`FHE)S@3dp4U^Jnvb}e9gs(MXxAK`2PLKBczv&{MzqA
zN~yjNUY%4!aW1dA%i>_Jfolq_zTwa3cDT1c^16%A*913+!LjO{B(Ku42Z|Wx3f}R$
zL_J61`?r{H?Qb#mgga0L&xYb;(ecrqq-TPS+|DzRzdkKIIT+@Rykrp$^%RcUg%Ffx
zFqf&=hto`Vb->bi=n88|<G%fp1r2mnKQD0Jars2yxE9@Ha@(Ne!X@28xo^M(zuocm
z{mc&Sdk_aC<Mw@Y$IiK`IncC6*K0cm(02P$WGq2u^2y?Lme|U^=@mMgbxbNj2zufF
zu=l3nY;W(ocz3(Cd$ZMUQ7tv>&Ske+HMGV~s;#0$LPe;eS|k)P4=vT%&{2&kib_Ok
zN)SU)L(OA?glMTDL=;IXk>srC{toB=yZ*1vb)8qo%U%unto3}>dY=2apZiY98~elp
z_Ikf}z`#p9SOxf=_hWBjYRvZx1O{85$Q6!Z0-3`unY5=nj@5VOk8%OxlDQ(z06T29
ze@kLioOc5T9hvNYl;0jmp}O4i>nr8o=pJxAM)6>(vlv{S+Bf6{(1^f((_&+16$ydx
zu{R|3TwsoJsq)Occoi>%&p(+}Jk*KE^A~I~%FU;>0qp*c;|oX~^I?%Q^?gF<&_oRr
zVa+0NP_-Nm3Qa`#C6GCNZ|4bqtv9LKQ%bNE!ExB}+wTQOD$#Kj9NxnoQ_*cFpLR)r
zrzDtcwMy44WyB;6PC)q9NY%PSmn+w90d?T1D7WpmUw@Z-A&rEryi$+*HjQXjeg5mM
z2TfA!NiOJ%wuD0vp-Td|0@jlfW~4P&?)&Am{kmB_AdK=xJ_z$0XA%ggnsnFX4acAT
zs%#VGTPDV7Ln?JwA+bFe8_3=14$T7xeyh#^>$K;JFE(OfQo}wWFhb*3o1APS4crn9
zlVD7U<Fg-nTmTwY_g-Id4^d~H4?_1<%wPQK@9apqc^hevK5H_4)Z&}dW)NQ!DS-P!
z5fDadc9Q8$fnja;tNXf*kpfHv&vFC*9ovgMg{$QB7$Ce)@`<=Jf=V*(HX>EO6f4ab
z{4uO5Yoajp+N9hF=KDEAsiwc_Z)!S}FGoWffh+IjKZT9Nd7)<^@Cm4BtpzGEO^*AA
z#sUGc;&<xpg|SnVYFwp1<Yx9`ow%bjsvB(J<@@?JOY9LwJkb-Qt)-(1&f!}?0anKY
zp>$ZAm6PNonVQEi#9Ln;KuJ~@Vm>UBsX+C#e*BrGL9aN#7@$TpCCsqMY%nNmI*Coa
z=~L50TYeXMc<Ti@+GbD^UA|V>YUOhRE{go@)K>I^SP~YrTw80hGV!8Y>zONgBf_kb
zpVo=8+luCYtvvU{pE~0xI+buso$Ch{OpO9yQfiH<KQ=h%D%Q3z?Nu$utR4G`Rl?Cx
zB^Zd7@f^IUOH>LIa;!A`DG`CqCT+tVA{M%!7Z+8;@u|AjoS>{xd`PqWP<cS3XMzK=
zL4o;OYSb#t)a#ggx|FMGm2Mfja@5lKz#ko&bdL<&U_`yjjt||8$Vh?Arb7nTzguEK
zLkT<RQ!}umn#M^xuIex~HX{Y~nY$P^-5|kPPTWhl!BUO-G+j2MBr`M~vkeyOMU4!c
z?jn3Y*<<p2-KRA&qqPo@0s8Rv><jfaTOGx#%zdDH(44hu@m0^W|NZ5$9X=Oz%Ljs!
zPc>|f`Yi`(+V=9`xD&<xrT%6B`~}>7gZZNxrG3M_iYuNypm{0!Q^Lg9-tB}~XMN^*
z_M6bUSA`F5uGT?HUFT&AS4Y}&e{O(h70jn*{b&281XWds!^OL_lD$p<dyK5uXswXN
ziEb_6@)2JVSrzz>)HUN6wD)_3W}#Q<abkKW8{K}?g7crC#TqZZ7ksnQ8=?!ZGzpox
z)VawhfkN0~uE?DzV$}{>L{$z67n5KGmxd&v95ShZM)x6x3CE+Zb}1$dzdq=^Z3vJs
z4`P8K`E3nm!w~FAyWMuG4|y9Y{2M0K_)XE!=yp-_c8j0@^tVWpKu#9CA{6M{j6tcS
z%fS%^@{k4cc8*z@&(D5O*hrT~5W1Al@02=(MLE}!bLmotE9hp2hi;V_!(V6a-bCBJ
zc1-B&`iy!5i!RG&YNn^+Fke@nOCxpeyZ-%b{2a#1F0S^3_uvswZ#vpve(vo{1=(Wv
zD$plukZ>r<ZTYj64)-q2ztxuuwYRsQFcOUPGmILY5qcmkd(*rt#di2v=TUaFhD2b`
zJ4MGF|HEHF#PhHh0RYuRdM*3iXTL+)4L1WIq5a(2K&z-L-%0epE$|#Wsl9q92=W#k
zfEy8ls|l}2D?ZRkGHFgzM7MxWeQzc3NccHnst@4-vZ7I?T-PXgiO$S7V3q5RAaNN{
z?GChMJi&Y6<1RoIh83|4?JTJ52Mc$m7LwPKaMZsws#cqW4=8BDi^NQX>{@5l>~9>e
zr6iW5=#0&m*?L4&Kwb7p;-!S4LPp?Jk$<2wtHPxXt3{!no2U%4${=bPdE^DYy`v;2
zF0opEg}5Iy%)gv@dirkd>2<Z2HWC3ZMCuTQ6vW!K1PW_;z!?A;MV}f;wHSB`e88Ns
z(BH>s3TS<K@Mv>FRVb6ChKIS~vL!3T3OdVS#SowT(%tE<4vuvY{i$6UXX}_ilU*eR
z7+BT5q5eJ$@yi8ZI+bV!KZjU;y#hpoZ9L8PiSwn}J;vOM?X+BfL0+gp;-7SBA4r#W
zI9q+#KVQ+OzRJW0QbemPa`xyF;byRp7k{|{`o&q4YUJN$!J*-ZgV-QClIdl9Bilf`
z2+yeUmI&j>iDUE>aDjhDmvSUFn;?IT!;%>F_HYF=>+(t@ojo5XPg7ax`jcW}QXDpJ
zX5w&DgPT^04%$hK3P_%*gmSEwh&!cmq?HBL@o@~yy?WD~v9&ndchG*Zl4kqo3>T=@
z#YW!&<%SvD<mTYz3cqh}TwY@uR^?rv{bHFFcqv_9N4pj@k&iay-UO_GDRSS@%Mvgx
zx#$(_J^|$M=ZiVYGdugfN*4B>Q24$_5-D&kHU=ixSLk+l2;Rx46u9VosWy=}^Ti&1
zmR;6hvTYIMN7oBg@yf}AQ?_`~^B=US>%OVr1)patu>SLce@nfMzB<d0vG3w_IV9;P
zz^ERr)NWlA!jS^i#d(CKj#kH5%np;A0=>N(94JH!=cfsk%05qFR|dR>GW;DO1#>2-
z(KULo(N}D_k>cKR_y=|Z<|?Wv+=Dw*7#hg$DS;l&`l{<Ua_Cp$Nr#`;_+iKLKiO<h
z$B-6w4L3wajb$euNO|iL6TR1`0>HlyoJ_(v1ycIs62~76-)8h51oK_|({1nTj}(Ui
zEnea<=&vLCaxGl&*jXrU>Ei~OPjh75*MJLmFFrlWn)~5@tk<`hJoM&6pbAta0f*w7
z8IjP&JRlBL8C4@^<||I4xI30?Q1A3=fsX`Gny+|CeKv0lqAcmtl(9k#HK0)Rwpsht
z&yvNf_;C3MiLIwJv}($~H5R6ubH*l>1Kp5n@;(W-^2MC*K6jE|G)vXZF;`MzJIRL4
zu3&VL?So#T^Cq@#2Es9@cCI(O&iu4%XN`Vn1v|Z>5fxN$!Gxkp(kcxv0EZu&aMbU6
zXZLoZ;zm1H+GcopgG41SqTy~|rtcdt{s8hJF&(hd81nGlZ3S^RdUmiVTgPYAupq2M
z#VGV1ZX7ax%UbUvP@>F$MNM~SX1Yh;mlhsA+xAMs1C&I!SuA{Roc!3Yx0*rq+d#-<
zdhS3CFl1bSx6u{?6S!4u3yIR~&bQ5fE|v89@2gw=YfEK>>;OYol!meuNOq>)Z1Xtq
zno;p^|9M{$D40K}!6`RDp*sTFpE@1s2E-O#;})7{ZxOQp{j=E`DCCVW1o%~1fh>I9
zA47=(`J?~Q@>d`*|Mz7*RPI}MpAglcPYM0F(UAQn4kIj(#(ghfhn7`F43t&G`OpV9
z>IU~z4uo}LUXlicED^_toD0YAqCWZqnKNYPRUqh>o}ZGPlEe+XD}!cs8HW96kRS)P
z>KlXz6MSOMNg;J^FoR}gD%btE8@Yt*oc@LkhjnEhli*C=8z@}l%*#yLGq1Ga#sI*V
zc<`T8zMA9Ef2S!G+}T(5+!++JUslaU6EdA(Q2|v%QtHs^i%RZtLc@+7U`Zb|r7=O-
zON)5=hq+wK54zr{woCoJ_xv37(;`1`^I9^h-u1-?#NWET(Jnvj$=T>%iCLZ=68DNm
zZ74k;oysnRfyPiRPs`7GdfU}sQZE`<k4%986u-irzNrjx;gak3vv9E>OAw214QP3N
zzhoLVUZh243_T_jCL73AO);Fw7hKqEo(8NzUB-c$gs~^?)4|P+$PA?((tj2B;+L1}
zeq!Q~Nfc{z1hRVY<>fcok~nbsP{mF>Z{MmhLM0V!59VH*2Eap^Sg>o`AqTk>^re<}
zf98o%J(_v7NDLFGZxIXp0oCq=wdapAk$;#E2h}m^mkwDg!!H<RF_Tkw((T1Qi_@(9
z!t1mB`QxK!UPN*p=!Md6!e4rZIZ$AhAbSfKe#SU@sB^6KMLS5oZ~AI5w8WI*HN3L$
zA*%X)+bF1~hCzqKwJ>RB4B8wBfQQ5FcqlGqM2u+w_{nSVL#74Vctj#R+0#t@Un!=e
zG}7p^lQ_Y|{7f*D+yM7ouo8HUyIE<pI=$Maq!@);D$v1S?Z`OnOjfBDuqeW?2Pkg`
ziemq*n?ySMgVE&*Xg*=b$<IIGNOWZs`}9_cTScdblAI$?l%}1|Jr7h*QLkcB@VEE6
z#@=om+3c2ZN#bMUqginga8kFea*XW1*ni85_AYs3krh>}pfTd5qyDm}dA?>q<xmhF
z60&@Yw1VbRqXeo^WuhNpAz14Y_gi`jCx8F>H|c<>dHQa@9z9&vzk)a#s)6*)Q8)7u
zCjNEiB2KwQrQ%PT--vkLtL4U3C7{)@N4&##mc@Mxx%2G#5d(%6z=oty`519ss_QKT
zlnF;-X$rpZayII_<5uR$z|XN`umAbJ0NDQtzOCye0vDsp3e72s+Be5A9w6pD0VI8U
zJe)TLO0G7*Nz;H4k%&Vu!XL2?!j-)Po89n^zacB;!B<)5Cgx-R912i7CMH2j=6<zc
z)rx9B3#$?ZY8Hr_5O5dWrn=CYJ%MUr-%k5#IEvXS>x#kX!=1EKVk{%^gcqf-4DdY%
zfi~TY`c052yUG|Y+>vsHxR>7^Z~E}f0JspmQiu4p0i3M^axhnRICoh5HGW6N{_{Nl
z1{1}<8*E6;|NDo3_V<6R$DKKC-?5WQ27%twL4pFxWy8uqrl(OD=Wpf>Ia154da9UL
z$e`eTfG~mvGgs}GPI+<A{TmcMPX<u$xJqYJ3OG89h_tVbPY_?~V{>Q@d$fRjDY&j&
z+gE^EWiK0mgrr$l;M;XHX$KhZhMjB6C1p5PhYrAFK)0I+h>(>ROf(%zTRPeT^+J7N
zz1&2QHoyQrg#csjdpQ|7e<ejz!OdUZ#Q~XvIqBf}JN^I>F5dC)*m;f``}hmB#3LaU
zTIe{V(qHIQt-m}BsGcK!0M2#qytiRx49Kx$b{p>4yMsnRjtm2o!3}_(fcz}O*Rg6l
zyOEe*upiXb1klnh=U^4R!BvOcAyE##g?SkIF*Qzw_PWXFELS_0zw$RVh6)sghrm1O
zT^B7eFWN7rWGe%bJ0L_))w~1gOnxtNmk?Z002z?{_q*}#jJ&5Lviife91ozGT&Spj
z6?_>nxsD9T>vrE2FW^Jq1LwrwBu`UT`)2pYNCBI&YxaGX^%9^&qdAfC`<X#*zF5kg
zfU{0^Lt;xwUB8L*{ORn3Iber`5+#TYZQvvm{@gKzZMzJ73&AT;*fKl@jrzn;8e}W=
z6TxGbix^yB5|b~Um3X;^rU!hILYh6@4)9QEsW6LESHV&580!WW0MYbxhs%=uzDp_E
zpHa_-fzK5&O=Tm1t&Vx0fCw<NG;mv#7h1^MM}BWqI7-cLHAjT4{`gJ?KmrkN<OoHL
z0GBDp)KcZL8K9c>`|LR`82!+7ssEKrd_imnXnVu!9u{WImc-*QXJ7X<%$;3|_BLoa
z+7o&3;d0Pb9ObM`e_2!!;Dc>6G6OOp(|3N^KobH>u-cZ@NCB?`5diWyKyqyjb=W_=
zC|voDv6F?nChG@f<d`Sjf87%X@)QcB*c9|AuLJY4*JVER(L-1+g|j=q-ky?5F)fYn
z1I^siOY%-$5fS%|6jQD7`C2C)eib^Jj-Gigplv#_ISZlg_E-+DRR*rZLcz1;l)}cZ
z!6I9ZNegQ4_xX-fT%A!}xiQmOhbX{eKT377x1T29yBNS|?OKwi^X621M7K_M#A9yA
z!yuX0YE$pug5gQ#Dp0}__XM_h*1i_;X7RE$R*ADl>0LJZv-|XePQ|-qi39xdFi1lo
zLGCDLyq9ZpLRriMnZX&l)zIf-`)N@`)-ZDSx%dwN;Vw7nT}QM3Sr!A173i_Mfyt0k
zpIQMKGE)G=oxouIHr@L<Du&qNV$gj!Y~Sk_dH{df4={|8JB)mheYtUAzZI@9USC=I
z8W)@YVAyjCwD+%rp^;Lcd{X(K%QNBhpRr2A<mY?MX<h)=l)+&)^-7xc3xSa+DRA}+
zK_pnd43oi9L0zK~tns6F!~8#63Cf_yQXAykr#&o2V?wHlr{nCce@Due?N^M&NLr&-
zQBT3xhjL0DTK;~TVMuT6rDve$J)7UwsT#F<^hTJrm<IM(U$aH$b-w?8P|ye9L(p-c
zKBz=3uRQz%S>~*-0$l%s+89p;^$!czU7DROe=h)aD*?3SD+ub|JzYZP46j@0X+7YV
zrPhrvH?b3jomWTm-!}jCYAg`Ae-#>mkC|ZGkebV_6a2hl(J4IkEO%0kuQ(wD3gX%`
zZJSb9B11FlBk$kZP#%xc`C5<7_-_-f(VJrNJW&sz%{{U0YbI^lWMmfVBatfkb|4bo
z7OD#8o*LcX!p`WNI+%`%Nh1aGw@o;LoBJgJK!t1>f`U_covshnTS2mu`U-1TKj~cK
zH`J++R)RAiIDl9ZPX+z4RtA`9)#27}fJpIXP8F&A8n&$F<oX<=|Jh1rvU*dUVjF~&
zziIx|OeSHyCd49SdF(3nQ9-0_<K-;mS^3hZiaP4cBo$9DSWk3Y@Xyz4iv;KxU#tP}
zMc5k^b3jN+<easBkGZIO#Q+ePmC1oV87e}vjl|D|d4hqXBGAEgC73OhK8?3}XIpsm
z0-H8dlBs^)ByI$|a6qdZ5{nk;Z-dh%;YQ+&0rBV^!z)UDF;+^!5tUv!M1I$GeS$E4
zaK7u6NacC!iQhwaf&gH<{~{42S#8L>iofNQOE-BXkO_tFt<>8zL{Z}gCDc1e#PGJB
z`MWYVV7_|cGGz*Mo*L%eN2mVsoAY9ph?f3jsq9?ddGK9)75e>?KvA{&NLYkEIxm1M
z?Kl6G2}}Iv^#OAQls$maP~PEuyi20AcrMAkC#hQ3d4PziI)poHF$t)Y>MWS!MXxA;
z?T@Il(a!3uINBL;KGM5IyL^DY9W(uCuHG7Q#lhJndfLU0h#YzBZ7!1|ka^Aa2iFsP
zU;>O<Z6(;uVjWt#W-E^s!|V@XF*(8g?(ak{wJM(2)&nVP>pp$-kvwhR^NYSp?~I<U
z{!#!itGbJTpL1rM(j<k9DFmDk$hWJYHhf;)v}eFSZ{eUrQ1dXQWlVQb|20UpD~?z~
z5-}TXC0t6GGxqtdR&Bwy`Pf!h3&6<ytrRU39O&$VOeC2+Ke7Mw&Ih*9upZP2u~ayV
zH$;Ly85g{$-WTI&cZ${Vouf0YYp9RsIi3xqr2fr31Bg+Ns|p#`tR=Og`MS?(yOrC(
zt-05GM>Vn5{7V3fJrkZ`4cD8lFb|}IJfheFa4G?MS*qpUX8$GUH209PVE2+(IrW*3
zW9YI>?`NC+)KZ^3({#EoO`Q*G-a(l9w6bf7lWypv7sUH~=*8nUyF!P?$R%cb>~xfN
z9%ksC4yOxHT{*~-(|t<gHeRk;kG-Oz)yhq^ex7R4-~>PZRJSHmFF)*DPfRdG-?TU8
zhG+xQD3Q_-V)UMT#zR68D8t7Mb+)h@!`?Gh$BzvcV-EDyCih$9R;JndW^Lkulcn_J
zp`I!=>gLc()}Xm?HK*uL*B-+|FTBHct!%JI73BlV%-qAy^2NcwoT?hrO=jEnaDjR2
zC+~#GMuz&;t!sA+2HI!5LJDNx906N1%#kY({p$(lCVL5BjF11$qwI>&Hrmu(p3bl|
z7*fN5;|Ba$Ei~UP{!GD`_TmpS>%p8rjn&@U{aw7%CvR6rY4KH;D<wmH;)(cE#J?C?
zjtFkh(KL)2debA6jOFCc{Ak;|M0IpE_wt)rI`O|Y;|b9RY(|BeS2Q)0Jv)RWjxdBp
zIU)caH)3qD*B>OPJg(?`^kRQOrxz-#)8+uo|A+PLF@OJOArT(PA_cR*%}<mcIxLB-
zb*#xNO}&!!8}iwj7Dr<I+d3RZk^R9*hBtt7pO}z17y2h&z2yA&)2F1lS=X!vPJ;IS
z)5=R2nKDR4exVzi)bz(P<`}ziFd&Bd_MgR_YEK?N-D%%1$gMT+v+aELV}t#bJDCf%
znICF-+D^Wy?V*g#%V2Gv4ykmA000Qw6rNNyX+_M-tuw`LhMGDjK8D4HFrHsszG|&D
z0olb5f!q_`fi_!b;wnw!C@6$>qoCsPA4tL0i1`;MfK+1t_Vj1A@`{?}kcB)=nFBi^
ziFs(Y!-cA-M7~qvtok%CnyJ}1a{sh5WMMx;%iz5|dK0q*h>+NG$J{!faU{M>6#R<|
za0b46RwoXN{gX?i*NY-8xlYcCb%<_%Gx4$D2M5vrtu?8H)Jk&?qJ=z2U0ymPW8&85
zaY<9Fsq>NSes9ovBV+9}N&E~_Hqt6{uH2b37*Rbr+-M#ZfP06A!1Zqo&3^!wPtzIB
z#QrDDI^hy-(M$><d~H(my8|E`!;1L#jI^$04hX_y!z|=UPO*%C23|Pb52WUPj=Y#u
z{?h9;%=xD;5wg~o_&D<(5wAcy=XIulTkXeG#Tw=L6hGMXw=dtpb+9Y&$E8#4l-=C@
zS5n87H6XuZ;TbL0pz__QbDG3Wh1H^C6arSTx7_sd8YZIr`RQ%!gBs!Y)vOCTa?4Fo
z{b#=4w2pXR?b^JV_*C7<C^QkbaAagmcbX8RA{(c%9j9R)yRj%*`Fp2JX^|8=rKxBc
zO}`{TWL&rX%TjDIFn}=;#$S@7ZG>Ab^#?+JnD!peOi{oo9^EF=c|GHwH@jP_+$INo
zdI`+Uh{e?BeL@m2e`d$_dOi`^GiVwQt=HwaW^xT8SA!E9wxCS*yg*}v>u`H`v`t2v
z^$Ue`)2>T$!o89^Adm7R`re_<7X`A+sP0+ymg=itnO=#A=@M-BF~3X0wv9Z)X(?r4
z*O@B5f4Bd;u7@?-Wmo?0&;+*#AY5;qpluQJTpg2iz?<NWHGz+`j>5^YMLZTWh=v5(
z*e@WF1%CG2^O{vZq6I5mQG`^ViXq|muBfvk8K;M0sqqc~U}92HQL8cj!^0cMp^N(b
z&<-Kk^X8(Gz_~g0reBXm8o4DzmLAb&#m`enf0I`=L@Uz9QQi5iqj;#3Xx#PN{ENUS
zdPrdA0&kEcxz|~>q&`x!yk@RtuK|vn*V8;7_s>Sdiv@3tL^IYDiDGY)P=V@fky8Q<
zeHIZPQ~<{JB=0`Z9R3n%9QD1pnzI6mkzd!^R=v+I`C`{ujQ`G{tBMmSmj*F!AUG~V
z?Nm}_T7N^Jgaz*^{DdVis1OrMPPdA;9(V0*-RqhOj3x=w0R}rte!lOD!u;7Q%mnpD
zZD9`KAm$GnQ+Go}y!9^+qpi~O0ANsl@sfn0zO$HsHeei^hvBdjj-?(bm#)k>P}*xe
zje`42UJj_9(TUUCVV>pnci)udNHK<i5T|BRH_IUMbqs4AkY*@g^;Hy!*34dghafR`
z;TssM9Usop#UfGyR0eJ!V77wyV=X4gd}F+@(1X7`Ba3=EYR~^GdDU@+^;drQe9X>G
zJrU<A{m~Lqj+6#T4k&DAPdA;d!*#-E$vC*duG-%cKXa|zMKMlxr{+5zaddig12Rwv
zJ%S7HLx7?^PV-a^P+f>p(N-bG=ZJF<A;>{)nS^rZ;d}OQ%)v3?0CK4%tA8I8I%xc@
zW-HZ_!y}dDMM!xXhQT3FeM)MDOuS1}V%aTflQ3k~1n!QE<!gY*kwOwx%2aiC28`?q
zlRH^R^X~=Jc%ateCh;bUwQ4gR6#J|#DE&8Blazjtih&20ouQ<QXEZ-K-KO!<_Ric;
z*kaYInG*&K{yC*_PRU+U7U8c^{=9KyCuCX}jG$L1La$fP)6s6!olN^iNhAaj2Jm|q
zmXS}}mj4b5jnI<?N6x=;3%y+M!2)70jtG^s*&vkB3<{PX@=PYr703FWcR379I~Asf
zYC=kZCF%f#c;ot0sv6aD-+_UcKt!|D?`H?xzSrwr3DyeZcmpfY5-C~jTj@994{xZK
z%S-&_(4~3BS1G{Ar#8T_OtW%QTZ~XL?W#T=0I5DW3yz*GGm1DYSBj-xhZ{VrV}j~^
z1Xx0jdYp&vH3I-<lGKcxwZ;*fKi~VdW#2Jpa-uT9miHlP&L|!1cs6=>!mTVp%fu9z
zXuR;vUv=VmupAPTWle>WwjFky7D6w|(bU6jVcIiOUqeN<TyZt`2vl<%P|XD(v*R)`
z6q}rgZuYb3rNjdPfB3}*r0H~d5!c_2lg4#jNu0kI<H*X9r(MkYuieH|u(LIfR`?Zk
zW=WTcf970z(8$cb*wPM|uFN6+57`8gr{f_T?r>;Na2+$J%?|#tVr7BFq1GKMeBunS
z?OMkoiqrO@b_>ZMdACrxb1ExFtErEjx>x?01cECx2|v#o+h@KTrDk8Yp+4E?)QE6X
z+FFgT)J5{Xd2)petzp?&Hb_gHQe~AjqI^j+-N~1aU_VwB<Mr(VEPq38S?l+$yK^4n
zWcw|vUR6!$V7auuB}(5mAO8XJSGjtC{Jr_nYAR?COxDxnHK1}~N+8Kd%qaLB*=)7l
z2Xua^mT87x)RFRJ%rNvt<(Wc0k9{W)Gy*wEslu<7P~nt`=$32^Pm95+8iVpWY1h+h
z_yeP<gu0p^UDx_mX&5P&xY^KE8hbuUXWq+gdx-WqU+nz-HdEUg-ocl&=b2+<`u(%4
z*(<Mbm0C_8*f(jE-7!>qgk?a1Z8C{9p-PV?pZJmem6P^r=BPpcKnc+Z1n*DH61C^2
zF*gV5PZAzNdNOV?{EW!kKPdVb6l?7O4>7bKWJ*#Bn)b|Ly#0VD1bzhj0r~}(TPqr8
z1yYrXL-(bX3c_O-ImA@a<fI8Z0A&y)bnIuY#K2JOFuR1I!_$U*^f-YRLuFA^#nhE@
zh9hd6%FpY#8v}DsRP+j*u2)9F1vOtj-qNTFuhz%_3J0>)c(dBt#UV}IC1S&EXBkD>
zK7FWX-y3(*NS9&*0nD&wUV|dSLtC~g36|LNXdM-w?C)5xQ`^O*pO`1{(iV)96$~6I
zuCyWt*E0w_&>7<ZHe=;uSe)t~0Q{YM4X!Egp_;}xFYGm_3r=rjkqdKt!)J+vEY6hZ
zN6AQdTL-izJOoB^L9`b|0?np=rIPwlQK0K|P?RsscjhsOs_|N5!)tfr9E<xP*`Z+6
z$8Y-5-RcuAWm5N9!fWvZDrGc;&0~%7IBpGS&<A|Ma7+h^Mj}@`Vhh%;n_%$<k(mbH
z>W3Z+CShf#o`CCb6D=&nc81TG{ssj-Y`uLf(3QF0vFYnSx;_&rU^tKc^pdMl&~$fQ
zoCtUHnixP(zbzYgbnU?s0omxAMiP^FsMbMnpA8Sj-XW(7dBoabi>T_)0=p$5ljaFf
zmcz__8xEWjXDvT}fQ}QyS3}ar3T@;ryUzk(B+g|dRs}V-jE9e;%%(&ElKm&84T*N*
z>f+}QkWK^Gy^U|tM@vB@81>NiG_z8<EgE2jDu0aoZ~YtWf4Jd4Kly*1HhgliGKhuz
z3Dv5_+~~?cuxBa6#wQ9%fi`PjX~)@r6J?c>PgjCUd|z27i0(Nc8d3^+bP6`udIY^@
z<URoTL94I`4AxbMHY;kk08SZX7YnUneIh9X0GwArCjrr!c7j}q@-hI<^Y>wE^x6ZU
z%li*GyZl)M7>v>dyoqiW7;`HEqfDCf`k(_w0K7K2puRK-scrTER)qVK0+|j#_2L1}
zv7%ROswcMbdZs(^*tRog3N)BLfU~9?Ex(RC)3@I{Qj2;ze5bkiS@y>Ln;rh6VRdDR
z2?RC{GH)E`b6G?&p96r$&|!<u7m^K=h63Od`tf_ghweNFDb7DkVK*=Z@_FB-H<u?+
z)ww`u3Y=^OKre<|ddo%+EL#`kDNjt@L-DCurcz$C@*=4Ku@BoD7S0{Os3p7bGCPkS
zDHygku>u$<#3~R3D(dJem{%DFH&O!`m~-C)SX;Zm5G18u-EZ$IP4%ZPr+5HnFBu3{
z5OJXWG7Lz1y~9ao0hl^YxDA*U<!$LkVPxenFuV{kKmg`*&2Xz`vo^7^$S~1|#knwR
zrbO3i3Hc+`X*mO=I{wWUskUJdqqLh&i4m739nU=uLXIOez#)&&OX<lrBaP=Uv9mXD
zT%a35QlACgkqSfzUnG`@VMZmo+NL#|w0ImIT3R!*PX@%%f31zUixyYHkU=b$G;L%@
z=ZkSQ&nvM;06z;HFH-+xJ3SuPfkBljAM&5>{!8yhL8V%}p5-mAIs_QYC;&(z0ay?d
zBVu1l#;uO*<Tum+u6KFj1(*Ct@&t1n?2ThmBj{b@sIMyr5afcZ?{WEa=DPs4<u8Jo
zzx(i^TNzgN9Z(kw5t1EWtBLUm(RILBj&uz=Pz}&lRI`~&_WqWTmu}H8lzBl!Us*AN
zs;eNkFGaykH729&{G(1p6{6A0KZ|)TdkpF_`QMo3pAc$~!ur>T;S55V+vly^VZiD;
zGrRG`xyF#ynDEKxCp5+3wbuUqIcIR53^oG3J^Rn*Y&1J%@=?=okT(i5Vs#Uj%$o(~
zv9^+%VlM70NA$jXgq2(F3*&37uDYPxQ*<;u^$I1kH_E8&<fN=W5$l*gZ*C}ABKM{<
z`Plv(HY!a#w(4IKpMde`N;gp8@Icp~0KjaS^q4d=mH;3d`j$OSzs2imrnE%-5qfy{
zUVY+sf;_(C6hY}i9TVW@w<IJaGAVLz8AiLXjhp`1{%4?f_9Mf!2Z@}F&QK6PNQ>Nm
zx(ugBzF{<+6C%l8S?c<+@jaCz@Y0*lu>E~nS=X?j%f}f{Fc}tuRy96gC&hr)-+9;C
zRdXeN=O1>inZqdU=9<0Am#pkWo1lAZK7pk@Rj$6xCiAdQwnU+dG8)hi<U-)`>6qLB
z{(gUz7r!GR$vZ8oLVC{5y8<w=+h0kuJdQm1mKyhN)&_!)1PxsO*#jTr9HFl&zMoae
z{%R;ZW#a$yw7#hL?;ehI=E;kH<*Zka4dPuLA-0O~!)~$I%&yrPohaX&I}0KY)~F~O
zGcQQsY93Eu;pxs@A<N;|YJ1%96T$!?qt7#JI5a*FM-Dyp9jb{dbHK`*9*%zd+kw&Y
zhr14BU4Ip}{@3*rr^|nBiQBX1ue*s#_h_=@pwTCDpFyYeM&Q2Rlas455}HGg4~2DQ
zlu<I&8p4dd4*qRxpYzuImoBlOQVp`;&Sm+xqkz9rCAUjjZ_Y*{Gt9!$r|;#5&yME1
zQUaka4!baZWcp00Fh93%p!)Lrlmq2#CG^*?Ul#;BI>G)rr_BTlK2a4W6v4X1j8Z}U
z>Wq%bptSLYa{J2%0?6OvrM1qvo)Dgjn)-P=Io<?I)w?zebN>EmBghR*^ko;cidX7^
zkGAi#F_$#+towZ6ZIzY!ure&BHX}oYPJzUJ0sXja0=BnHiG~^O(?}j8;PG7>izIV(
z%03VQqyN!?AL&}|7iq4goM{jbNc@G_ObkBjptr09G4ihwFuX7qK-5a(Z(pw2BfE2B
zbrVq3d&><h2VfR!2bj{9*8l(gl4Nnrp4p*e6ln8p1Qc6Y8QIsGldXpmN}vVncbP~&
zsOqvqW!E?L{DveVsFMcpg7vsyucnO^+a#_v{C-<TS>Fw<>Qgz<+IlhUQba^VaO&w(
zkaPPak!4M|utSh5_J+V_b)oAN%e9;T{F3kXWyP3LbG#Z?mt64`Zl%Ra1{3^mUA142
zt1br}Cfjf3a@Uk~qs6^o-8DS1SQ|d?nqYJzZyE9p2eYt<!_~vfJYPv49$4mXhTH-H
z-mj89V<-Oyqaw6m#uZi7nfGV2m5WOzoR0!kW1!;K#YI0bL$h-UwBF(``T}ci_cQ8{
zm!9dvuU~H?RhO3b7jiLPmqjQe#uIXhbm$@QpS8iD-^7O|`>AfW`nvv#0TTfiOeubl
z@05I?lM77V2@#OmfH*}yAj<(<%)0@KOUDSoK9Fl(uXi;|<R4G_uctlB)g2W-ZQ@es
zUeFy=&Mw+1dRyyX)TEV6UmMK%EgD>$!)u&^&%MJ0$;tlZL2PB^aC@p=m*H~v8A7Ga
zsf^R7A7G5+88;Q75@+-i)~ooO{8k2h!VLy68B0JODm5)_CqF0!?2~C-iu(HW53QMM
z^NkA5rI2@$6U)P5+&TOZ#&Mv(uHjWul7~1GX}*HT9<irPUb09>qkZ^U6o{A*EDIZW
zbD(?x<pWyE_uV_$H{+b}XSqFFCTjMOnmiM|c6L@TKMwL4PuFk~zYB;xUbKxn{&}RY
zdapkVBgJRj$zA_`5l)5%gHC4$xGc=RIZ6(#=AIN=Zmm=61O3eNN^3{U%onhV+G1<F
zl-K$@iZHv^GQAe<|NIVK_j1Gc+>@Ih{}eMka^*iC&bR8@W5T8R-<WJq&MhwX`!uyS
z0=aJ8CAoipUi=5a!E5_J{^6h!EfUxiO#(ie?h973H?neOAKzI}1vm`f=N0eV2AuAn
zp9RunkX8wzj*iZaUigc4lE$cx^#0k78IEpWXl|pBdy{=-iSw1%AyznNFc?iF?7G88
z#C(sRKZ*I)>g6~LMoW+GS8@<{KnFgOeq)Sw@{>?_H?nVN#HCfEtph<EITtK-X-xs=
z=f~7+axVE&>2#mS?@yfHAWpy#CpE$rIX_gDhVcv-WRwvy?&5WIyu51Oeg}T`purF_
za<!MR1#LFfU2*sx-k8*rHp3`MIL3@f{MTq6_{Ar4FD8$1#7k}$$-me~rFen6*K=`k
zv0ZGcmu&iE+lq?Gkt5fPc@w)!I3;B@d{%@Hz9P7FqfKA$jxu~<S>Jsh{e3$G8>ZTI
z{E4v*q@KkEOvL2#{M2^$KHUe@2#x2n<GxP^*uQSkEN9Lr9T5q5hf7GsL&7wh$W~hU
z0ZM!uq@=h*z+&mZtEXc4-+x1njOQ8)t={9S1sfh&-FYVl^?v@`x%5h_jydvzrAx0`
zPQ9@>@tISrNAs<&5Kd82U*uVS3b!=(dQvgoX%Nmm_)^f3O6qu$dNG^RF=TrK84_mI
zTgSA&;!D!1y-`KFeX3Ck=}dRJC9Ish6A@mCrEDY^B<LpJ^`E-r<$?cvSQ!(jjDHLx
zHXG|-8*Rz2Qj2)={=W*3wS{A_oDqfPi;_#Ywp#a8712Z``VCu&oC;<)&+Vl4_FjkL
zoe+RL>Rz)n!upW`K;^Iy9fFq4tJKX#&{q?SM$NmT0YljGjdM+9-|BP@Vlodu@dn|Z
zSI@5zeTCZi7BsFlSM5ADlfItRp**USHm?;_3%eP)xEKiAQi&%VT6IM9RYVo}=B=EX
zHpH|V+C~i%yS_)mYK=dI!X;9VQIg)wP9lhu&^{$n`{!dLM~Pwh{a4WAaj)tj?6xn`
zHz2=6G#7{aBc|C93+yag3JK{59hmdBG5k>}AIF@0yaRS=dTaR1&bB}Z)!5k}7;%bk
z_&kgi8NTr2R@myv0!!ef{hw+~yeLozp|<k7-6WO1LXdW4)7xrL$t$gPHP<6~CFqpS
z&dh@eJ~iKNEPd0A8VYB7IqT5NCzNWYY!0N_+-{{2wCUl2Z;h)Wn8Hxlj+O5<<6G(w
z?tNGL0tn5<qrN}xt#sM>fz{CwtiEg<X5I6f|7iKDT2+ob+#K8N&>=JB9rvc5Tlh^P
zx0=6N^u!<A&Kg~GCh0l(&Qc!O<5R;*Kd*9dBf6_Ev-3JP(TfQGtOq1(4EonXszIk+
zP9SGF)qs9*K^iHu)2E~kcP2tO;8npHy@m18Oh5Bipjp?-ZM%m`rCqx#xT6eM#1%E@
zk%VXeoHXJ<O;&f0rqWkAdbukBFOu~U82Bs{Aks+9>N#uwo<@aaJExGn;d9QaB5cJ(
zYSLgUO?7o)Q_WOK9b)C+lIiW3^ld|#NAMqV2MP}AtN3HwByKxLAzgoX#6DXYIJBkt
z_+2=}#_a6J1A2cCZZUSco3-A}4B?em;WxRBPGQ5w11})Ud{n<y&lgQ@hOJZ_4q#fI
z*C-;8@E+w693`wh_$~-dbj{wcWyIGyJfL$)_Hll#%69PAOG?I`q2R*o{Jvfarl04f
zO^03|31hidMBJ)b2@u_;`@2s3e|DQwNZOxFCPVv1dyucIN<Q5$PIA6ofsni<TAoJN
zHw(YkM!H~cquSqfFRdQ0LpY084hET95mI+cd(6Eo|0<2N+t#0wN*{Git%pnaZH^6!
zV~%W@3R+Kszv`G&ve6sL4;bl4M%vxIp6|tk#HQ$@(ZTY>QR6+Ka7cu4d2vfkP43gc
zPs8)l$Z__G9{Y+ISS;2OfM=_Dg`UtJqwiA4B$n|F6$i+K!M4gg#r+oP;Z?X}G>@P}
zgEZs)z!)#VGy+OLx|U)5JZ09-#K1<3{N$rrBNqn;n0F(t-T^|z+|r-85R@)+lTvWi
zRY<oJqSGB#fZ@eatg-z}nDPGdS0_?i+e<`--Wg6X?@`r1&W+UJfPGPAVTbZmUfVz=
zesp2p_UVFUpR_YGKOANA)?W8w9gZaP$cd7v4zm!Ds#k4k%+WDjC|Wk|6~=MIX2-0`
z9}rsL8x0TdNA??_Q%h1virj!Hgcf@6Cd8C|o+o}6BmQQTU}FEr6A-X@z#fpQ+AeKU
zTeq=9(o2366CqG?)=P?<wYG6|^sW)buu`AYh8B&8W|gAc_4N(HyQVfHbr6M^WAXtR
z%8tYVWm;t9hq^*E=Axy=xIvift+55m9q-5~5k`5v#&#wO6tpflq&ek9V#KWQjETtQ
zLdH<Qgd2@{Du#O2HOKf6-M{9mt=FLE$kqLCAgVr&FTE&ed0cat=y7!okep8;KfG31
zS<$fbz1K0Lhz%S=hdwSz({1Qrwps7gGa87!D`@Tj!4xiYZqrX>O}s}fwg+Wt7l(SZ
zNQJoQtFdL4{9#J%jRsnjfD)zSEaYmY;v<>ZNj_avGvr)FPcsPW<T}oeLFb*Eu4Syu
zUH;(_<VzjVyOt+I=HV$FROGfP=#ZzaS=Pe*r(~poY2j%St18hQ2}|+mI_N4-YYKzM
zrbzBa9m4EOC(J*T-s_6sI$2d2?^o0SL-!u|WKzd!_!rBip}V1chs_WkMxC8<0>(_K
z5*ZHuSwzoNV^fcnwAYR2F}wI@rUtYr^pu(*D06hV>F^84@OES4A>)MQQIe|0al1Ej
zaFgxX5B?+6?1p(MiR5qMbv!F>xUpFM0wG4zZYjXSpRKf-Iv0rsgpV<PeRR6XD7<OA
zLn7Qog+Ki<IB55WX3EYZQUvJJAU!Qmt^Ew`wWR|>)%Daq4{AGR0Nbwo0;xw|nGf=|
z$BGyp2#WCT-MgRmpK-9!nZql5OBs39F+TF@-XaF(ol|6UE3Rmb^ZE0atz|*+^BKrK
z^5~6}VasG2TpXvCca{3fB_L<?uRjR#7H^O_{kOce4Y<+&N%z+Nm)igPhyR21*d8y|
zSgZQpq;!-ENLeH8X(yJ}b8aphEe-wU&k74`CMmsn+q5L$4w`LhN1M=04&$Z4vOkpv
zDe0{>&EGw)fHWx1rfP6RB1PrJix;v*0su<siS>-HRs|R3<8X2MQ()A?YqB%lOBI-2
zM<s+rmH{2t(0<;dFOL*x+Y}U1AE<=305aI(dah?cj-M}otaX=Cp~OgrCs|HePjwqP
zE=cd(z)fe_I_C7nB>LKSQ2x(%ICFP;cY@({PfyRR;R^q$xuZY||ErF+_8>qhkG=qP
z3Lt5E007Up1n`X?`d7wKc|6|2ilmejqT9jNR&F#muEFNTzqkNPaZnRLc$7W<+qu;-
zPQ_HlF;D=KJ{n0Lp03`kn5L7?JZh4PmJQ~gFGF!sd@hZ+`L$X}3}-yf#Ti`BU0qrT
z4sx~K8)i{7x<7jdZ8O&><rYwu5+K3CU7P!N!J)Q8@~mh%&!o}l+*<WFNAdwEnQoO4
zKox^i4a!k{;3;D6mo+f+;;+PNMqki|_^C^U;$t>?Xh?Z>M72NJTzeg%n*VA=XOb~A
zlp8hX_?CGd0sd&HXr%UfKs5DBjoGn7<==wDr7$Q!)DUaTPq(Mq<&d&j8!IDs@kGez
z>r1};Rt@|c0CoTqPk_n30a{x7uS>cko_qre*c`Stb4iRA=z4?W$eHpXl<isKKV`X;
z5VhK%k~d2OsA{{vzPh@4yO{2ceF;PaP91Y^m9x2eb;qbP6e_N#T)FwT3TS-O@qFWH
z#Wm+GUYFt0Q=G#nDG1NxZ;&y(#utLx={`0-y(S8XYVR{Jpc;ayQceZNa-ghyMS}RK
z$$gJN5qCQw2w%<Gt&~<>ODPzIc@&~+8^V`XEY@=0Z={6Sgk;`|i~skR(v!RF`Uv*a
z^rcRaz(Xen)^gcbcQB#-wj?CC%I+o-+$U8avrkAas@XFiDA5_Jtd~BkAhny7t$vmT
zD++2);4W^A!KGK<;8kul=uEobw31RmZ3k6B$H%d-u_XL_DZjduX@~!|QU8IhHUS7N
zRbRcziBvBQ7d~m}G70l?=tyVDy=lwyIhtfa^%iO@5A$b-=Zr^)9%m>4%l%jV`Mu#`
z@!+sssLoa6p6KCEWI{|Q(?<qw)Av6rG)U&YclHGr`^)O)q<g&Eh-sZ|tb)gts!rdV
ztR>^i25<Kpml?eNW;U0UXMBjj+RbKShK2%nBJDpkcpne1_x?kNeSv!_B6Kg7mbUcy
zhO3}c9D>&`42^NbFvRSI6BeqLZ0B{d3TvFhrt?4$h<--yPkq2Bbq@X#`_TUnB6`Dy
z4Z1WN`CJuj$eA-{7cM*kiECH~@E*QlnReVoQc`k`J)=KDSxBl~ZEVjlqP~3ndU#y!
zp8Aoeda(-tsYXZ?8>44XaxIJyWo6~SsF09~ky_6Ib%SpKC{$SpsOb@d`OTXp-YH`3
zoFfKoA&{Z6d-5C%JxaKQ?f^p}2(+KSKa;S!y85t2!xj=;kZ3<H1ftr5H5$iJ!7)^|
zajoZ(apdx55@nS8Ec%#4c$EEfk3}r(l7)HRRmf$p8s6MFa8=$+xFSJ+PV-b+$0$l!
zUm^|-CmjvyMhD5lRwZgjRe_&U7D7WQr4{1Rhtl*(2u^q}BRRNv03A<)XAXD4|6+g|
zNY~Kj1I4#eqY8cs%R51C4hxB?D;$kfdOKg}smn&dZwNAFb>I4vpGJ6@y;}K_hTHO2
zfr@CX5jV-KTX(eQ#B#sa>8Z;tR|ooC;&p=F9NN2oH#uj-j(Vd;NISRmsd*DKL~fUQ
zu+a!A@{qSgQKhEI?;{G;NEZvN^ld@m!IlWiW#fwLP1}wgTwcu@hEk^*D<G3znL>A&
z8d0=kkQVC-t8AJUIuZ-hxCAO6zM|cI-Zmc#`dQbj!36{J6hSwiGxoiYqc2y_C^}Pz
z8>L1$UUl1iuk(uE*Qe591FC|^$iTOwoSE^6W+rR0@@tF8>=Q2?04X0oy?9=S6aI3N
z?gpjSM37eKB7yVLH?vwfq<8?2b$I>uP2!tde6EeWdScnfD~kuX7C3nk?(cU01S6L@
zocQ->hFRi_zr17(XV_~CRc@aUnEE{_zi%S^o-hfx;#-;z{t;*QnJ@NfcfB40SmqtT
z8Z4VI+g3h5bx;k`hztq}3QkoIL3NB`oa65DX6H%jA?Y6mi+~{iF`#3=&;_#Kmhz|X
zoU>2N7tNP(Bi@Z&I^||=HW6liYPh7Z>{1dF!%0W#k^|GZus*%iWAKPAR8`?M^vVb<
ztlosnkr}+)X;GJqk*=<y%7-6R>mSa@x?}OnSDg9c+;VwVg#M&&L-J9RQH>VcD$LV}
z#TQG?+m7GPrQY|GT&EmbfEZSo*x8|Mr2En4+V(bho75cY6Q~fUTGVen9iCF4ZLH{e
zG`c_C=o#y7ZIpv|B%eJ0CPI#jY7UFDr&d$4_!x#WQ6iH|OK=|ERwDDLX_1h#LO?rV
zw9ylx8PPC_!TH;l_u}Updg0HUCCm9E_3tk(*w-EdFZY{Z>%-;j`vl&;qWWQ$&kyVA
zhQ*b@8LabTz6EMs@>)}K&p)^28Ay<qr>CUqiv#75Yk6<Gk3xZu9m6AWj8I!khem|v
zNkjKyc;um>9X0pC+_b5Yb6t*Jc))vx&8rdyRuys|Gfd_W7XxaTQsnIRDU_`dBi9R}
zD*rN+|4!2W0nZo+2)(CV)+yjk+2(;O_wD#|@7i-=w3z$Ll6R1yu6F%_5*`?#6x!s`
z7)Q_N+$J9{E`{pZu)T5gb#5!D612VqLaZ>mdh^?DqZAM(o_WtB#so_dc0YbFldpbZ
zv=teSYMl4Q`qEA$(Q5uS+4Zu|)dFXb=5M&2F%{(8qUCe12~%XGwE)r65n3+HnSs(Z
zQ1C;7cxv9iiu(u?R&DE&G93X*-DkfNBLq|4C~VN<8xUy?L-xkL=Qsam3s)+QJOUc$
z&BA8A8$Xn&;G$uy<NakB_$)|c3DqWpZt;k104~=%kM`$8!-8(kYD1{%?}5sj`J_n5
zFrPGcR+RLS|N2xnLbhbijsG64C+pZ!)T8%2T?Ptk%c|Y`^wG}^an;Vf2;KXRyc_it
z;+y&&eX8CN;>Ux`>s#0?=~LdS+iOZZjFd0QQnyXtO}1@?!{LFVyBjuTac-sRsj+L~
zWfMJjj<XL!=}(?K+3nPz48Y+eH@?pBxN+JTbRfz}^1->Sj~n%UEKTRsE@=-GsN3r(
zBNLep4+7^WwO|$4RtpPx>|67MG6cD)_hF(}K|;{d{j?O%kV)RwrCHO8Kpv=z9n1%e
zIwd!k!B1tKHZmeFmp7bvaN11*tyf#!eE%6{*MMzh)?>@K+FYx6(>i8{u?vQ-BT?P;
zeRTf|y2a|M8pY`O7}RUpY2vCBWklPe$S$kMn>Am;7YHp*Q)!eux}J}FAy9Y}DL3*-
zJ7(9i7FnCtUx^NV<lnt!XJ-**xMLQ@dgZ8k81u>Ayw#T#N0;x872ir_h92Tcl?L(l
znaCdcFPLy~)z<QR6T&bW7SUaOV_uhUAF+zQ?9Be6C@cH#`_96GPpK8^Tvw#pZbl9`
zLn1w;p%#1R5SBWaLKiTxbEPXmfySu7yhq`O7$bO$1B4QKLY~+;o1k6JhBmf}n<m<y
zHU|M-ljCzH<z@ok7g%S!aLV37<Hbgy=M0dCr6Zi4x-+I8FhfbFh+fLWux+fP6=tb(
zyboDjcQMfe9w#9&hv^Y>(aNmJ%^TSjKZd(KY$DE)c{#kl52Y|DMx7oc{#^e6^$Z#(
z@5Cq~NKfrV=45t_VZK7>?C{u1%=$PY5?j)Q$ntvrmK##el7-Cacgci~?EW2zvJ@CZ
zpY{{*?-Exaw)+*$jZD83W4x-NGEkcS6kAwxp?gf1%o0QC`*L6YjvN^vxVyXSmJYab
zZ9hx;h`u=s8+9d!!-eBjmO<>{vD+TgG0DQMI3Fi{o85b}e2c4YfBlt+_rYsN!Tp8Q
zg-1<@Ds|+@a^0MCu1v~@wbqN)xveyHZ&*!uMS3K6;&UdZ0Cab8=EHq`$Fd?B+hbcE
z9q4zg47f#e1$hS;_2faG>X-U}DXS|~w!{2UrCYw(eC)_<_v2i}3>`1%4-b|i@zh#6
z*l{}n1=7Lnw*V`N5oC5PR}>Lut9apqU#^mD`+lhZh6><H<8EWsZ6G#<oL}KZgeT-o
zNcl?r{jE#O!(SHyCHyemwjZDj-cJ43%_O`jt?n&mmwY{>Tv&ZFIlbn`ob;RuyqX?g
zJM0XViG2q`KDA^XciQSo%aq+W#&)Ey(uA=LHzJF2I|ER<AMjP!PEXdmaZ`W{2lsf7
zJw|awDBn}-%uDyTx|{CptHk<OSW5u!0i5ht%vQT!0JxXF0JTUcgLf_UKDeuK!~0Ri
z>x&IDhy8=5H789%LP&zQ9{^liW%Xr(YJhE*mI@raXeBVEB|ks!l50E&*YhEb<e~0q
zk0cbB1k|rC4x~?-Wlo8fU+pBtKR%;+eK}>bAP0`$jZup*soj?qrLpKa$2mJS@IXO1
zFY+dDk8(CUbSpgj3|*_nGmvnw&_wwrt=}V}kF6jTH0;yHK*>lO>s@gkXYz$lU>0>n
z+xXJM7g%zGi1{(Hz+SZyRYfPdKU?{^*J)+0;8w{>v609h;{f%h;=9-z>o5fcrD*fg
zZTY9E_4O@LgI4>>(@*&43a&HG^R9wMS{I%%Kp^P$_4a-ZE9~vHhV8)Cnka*oTtAsS
z>}5|x!awQkk)<(c7~pJzLb9#A+VnGXBgt=Y4rQ%1g(<vDPnfbQ3w2+Xrhb!R)LmJU
zaz7YUQ<E8C^G6?Smd0r^q>(XC+s^ZJQpQzgox<p50Atz^^CfxxE?g=j{9Ifad}@IA
z0mJF<uTSv|j0}uT??st4c2~C5hIu7a%zs;Qe&4B%DD}D@T6<5)i*$Up+ew+{UAfZI
zowVEbdwv&IvW%uGYFZ5DmOV7sZX1k|G`GMN9JPLkIZ8%_Y%s9M=ErnTL9285B|eG%
zX~+8z4W}V<47!r`{4sLUpg&3mikZ*%B%oiQ5*~ZPI-cD>MyMZH*~;?;2`=}<D1X90
z(=8V54D!ZN+Lc@UDMOR#L20fLqk3E1ljz{sWkrSR&if7fch#&itD7G+S(|A501L6w
zzsx#asiMp}uM22gB#_44d35kwG|Z>Z<n^=?)iQWiTTl>XpKKfv+Ft=)T2RXj*M6GS
zY;{VJoQbJ-;FmAhdj+@tb>(=z%!SUbHtx=nUvh4G=Fn@(s2R@j8Hx_OO;wR8of#r>
ziShQ;DUCCIKfq+6&fWysUVUv;(J_cs!4hLbn(;M)jAg~UYs-Y3Gjz_=pt$%A&D6O~
z18+gMM&pmbnhV%J?NmdfpPs6UaDYwM$cHf__a_2<j>oyaft#A%9RC?xau1svf@}w#
zWQ~!l;eAX`3z$X1Twy5+ga$?ua%$l`@1W!_fC#P@02nt%yYl|LGEh{xE%uR>iJ)`{
z2#~D>QR}naX6+!)WL6C1TBduRxo8H;kYqid3_*Kt>);9h$-z51J+pu8FNdg++}pM(
zUDv1NtsCk99oHR6&z3b>RvsLikK_*XjU^RnkJtYlp<Cs4<m?k7d<t?P_tri3H+PBa
zlrFl<nL~Pz-TLTc)s<^#gi{g0pg&5&WgcS@VQd@xV*xWg6*usG-fN4`k@CXwy7;@D
zD2tm_lkTrlK{<bA+`D#<GLMGoqITA*{%Z7q3>Sn=kIuC9>YtnHHum|EcPqmO{@f#P
zH?&WIkp7tVWh2OGN<M|6|Ne}#{IUAhRWFVEp6jp&U)c!l@x0WZgzo4n>T@?(JCh#Q
z%tdk+*Yiz-1pH2>`BH}%NA(Bumiu@k;1&RB{x*>2V+E34>A7qKBn}((+d}H$tEcF+
z4tEYLpO-kfnggQ?10KA}Vhpb`mgr8<<N2tYJ0-WWnKqCS6|eaZ0~x%JUjz%^A`lTL
zeL*;|GcQdA@q)^~JQW=29{OL*y?H#8?fW<0hEh^@X(4o1QiNnDw5ueEv5lqd+YH6n
zm*Ped+LT?wV8)DWGqxcVDQnCOGh@#>hBVEHvHZ@VKKK3U^ZCAB&-47AKc4H4yqfJg
z&+9s`<2;V{@jl+iE`nGAr)n||TffB?|2$<|$VpwVnC+OQyOpjk>Au6GD$1o9f`6K{
z(*AJTHpJ-s0gCA4%7~F!`g1zVVOx&!u4Y3Y)alnuB*^>k{?I$7aB=Fw(B5qh!qZ$A
z__6s-Py)7DM7j#0!lR;2+TtlhgZBy(NDt4`!^fd1{O9BFh$N69V2h+By&(6dOhoU#
z?vGZ3h?=YZfL&#Dn#-wA6RI+f$11@JNrnc7La4e+kt$`7eUqE;r&!GT(RsPpzr@iz
zYBO~hA+|^ks)VR=HTAJlhm!jDnC?j9`GU-0Q58ow+F3023VBaf!NUffPSJ9ZF(f*&
zM0W|U;;BcBiBgyJ^RM<jyx>Y)W(@yuMItr+9>0*}W0o<s0T@So(w<KRLnPh%gL~f#
zc>52dHHo=!e#z1okIu)JzSQrxLF@J!1)<NFG`jHHV<gZB=!MRGm0?#P*%dirty?r3
zMQNxFCa!fUjA@1bv_zq_OOhRaLTr~PyMhbkaZ^L1y^uTfkw?k7ZPUktfdYC}_0fv$
zsl#0$>C7@C)+P9^=4=jb!rQtZ;`3j)hEcj6vU_3MBF;6b_nP99nbk`k1+vnRW0{j?
zHIGT6ed>lstbt0P_Y$;Va&)`rD{Ra6?*jW|5>ZN4HJo!VQqP%cyDpK*o>H)5==4&n
zEAA`zg0Pm22*0zw{5F{IA<LBuUR5Xy6;U;3E$!}G<OoPSs#Ogn5H6g|BX^pYzdruB
z^m@KVnUJ36;up#HJL&C5KxNxVs*Ndk7jrEt+t>$|(IdTlK#I2BW!dNv24(qK!=PP=
z!_3uu@R`l<#=Z;NzXubJk+BHW@xQ2*oIkYxjM4kT0UXqIS+4<VF4T+)H6FZ{-)_t?
zat`RRf7$cZSUZ4G;Hpp)h{%~IeQ)tzGUZ7z%Z?dbl5F*&PIwEgLw$xA3i!;W3M!TE
znbPJ9Yj7QdEBKuFgr_$}g<gZz!27(RXVqc7J4G%`mM3YM(feKchiFpJ82XKU{<h;`
z{Yn|krC+&#Kzu2O-g41UxqC%@DAmMuMvLWKXen)6o0EjHP5s#COCG=R7{%Wo)~L@X
zjQ3r=bHeF^oACUvgpM{sZTBTc|CR{2NG#!Y!-IivT}Ah0wQIdFgycf4S>e=B+l}Lv
zP%z0TZW1a#CVOz5;aO~`9ZV#ar$=bCFmC&!i+da24ZChn;DJgvREq4A{5Oo=0uXN<
zQ}P}QeU{2cY=FW#s{u1L&PSz@ST8=cRlnwhsOFNxx5{t_`?HKUt(h*SdK*hCi~LF|
zRVTU0fsrEo-F>_MJw>x0nEs2#su}=D)Cej{5<`D9hLrD0C8ZLA%&Jo>%x)tobgDFi
zQgQ|fI6mN}tsWqG8U|hW^`EZ*rpHfC%+HVf-+iIUceMEYXx|(=)<@;$i-t?K&*5bS
z+%w&~1}aK_L9SVM-_8L<n+Z_#4esJwH{mDf=c@Hr2V@)fuK_k~7XJD_fy-LPV9id8
z#bs|@(pqJ;JOUK>Ul9CZr?>c`S0s?_AO9*#Vm~oYw6?{jrNS2YT6rj1#?#OzAYHa3
zeMz!R6diE-h3t3EChoaUvca>RCBU_(kGF|@{XaugiE${3g`wB!A=ZpvK|A1NsGzLz
zRfNW7Q|mvRIDJXRo?{w3qu(Z=TuMjsia#Q!$C|vS&l<23Xw{1S(}tC{X2I`*8!1by
z(Fh(5H)|oI>b;YkdNlhY51#r-zemgZ5A|sZz+Hz@AqHc@F<P47IY|80#vBd=Tmz~c
z%e{VZmxFC?o?wObWWBW6$Y_dmrct`MImE87$5Pa15vmc;@*N?;?z0wFCo5%m63X(r
zwrxv0(Wl8)=p!>8u$EUZXqMdH7xeu4{y7KxMC}tz3Lt5YL}qv9OXVtA2YF{U0Vl9A
z*X0h#k_#xXO!aE5@)@mu1xfKR(8Cci62ow?GA<WbkB=A7vqs-zRJ_FNe7_QO<BV_a
zvR560<3epFr&FEMe*AdVV@Y&7e<u8WPNhF%xy}~jT~l{Oa|U2@-2J6{KpzNoOC`DW
z?{UMNjMsByFyR6*P4No23!Cu%F$LkRc#p4Tfc(*It92q@gr#--Z5M0#j{Ot09qKww
z4;7TZchTu-L0lwnkc;FknVZmd+_5g$%yPZyv>5FI)q@yDnx#PP(~~uQt+Ubi{%YKU
zSwG3XK<8|pr{?T*p^21*Pu1Kiuk0Y<UpY4b?)@-w?)lsyQfPU<zj);UD&GQ!rubCQ
zOsR-IfHS(ada*9Lh5QH$8uf8!Y+0dEwQtp*R|$U&)F!`CgUR1Eh-`1XOZ^-OHJHl2
z+J6N*c03D$z$7nV3-9m&T5NnioIfB0kdF*zo^7}mUXZGJemFDAIQ*&Z`Qd5rxytaJ
zOI{8AOBVA1<0&;ku0GAx4;Mf|C11UEV@0D?o=5K=^rcnm-(~lIk+cAXvLLyyTd34>
zeY%vGXwxQqjh}-0!7i_Ns5g%cN}Qdq_Jhr67o4o-C5x$@)FEb|zFL5dv2-SrfWQ@X
znQespnd2jT+u+00rZ6s0M9i5}h3t?vGHTaI3c7hOFUk&IL1GfK!j&*Psp;Qna;zSX
zg+Zyy>sgaqD{nauX9!S~1^%7?%IXvU88juoSF)N5eVTDkUntIs|6S-`K3w7rbJS>C
zcuKG$0gF6ADj__?p${33QEuM-JZHh^4f0+g6*c4rQAWRK+I~GfeLO|<8KC5v3$hQj
z`4>zhCjxZP`mX~9FgFkznv0$>c2Ws*x`3WQs2UFWb`76cUj1&--vFB$@q?QrFAazk
zp&>sa8h?!n$dCO!s+qpI*Et2EF#~Le^r$v{wy4U>>(m3q+J@TNZe*%Jk)<mJ71c?o
z&QC_25jux@-Ra7@6`xaVMYqq;3aZeq7&3;`U-zJPs@x(Q5h*DC{RF)+;TA2wnft)8
zW{HGAPHPMo97h$TR<=ZBnd=ynC6kW&0ir3&!YBXdqFegMqB|P~)w|EBSA%B8MuSKV
zvX3%oX3MILzc~8h{rUSgKK<>&_@pRPNIF_`5Im5tAGa11b!DLXIVKmZ)3Nih_Va`3
zLU*-hXKNqW?ryNs3etTij8bnUEThvqCObjeqh>Z_Ds$uDtO)|u3h7YwlC{rKk^Ly(
zHPbsMD}>ePTQiuCm;W}Hk6zU>?$<un&oH$Oz&oq<3i(vF28=wC8D-ngdt2VrJA7KZ
zvhKQVW#;SSfmWD51A0GE8N>OXFI8Sg`3R4gQtkC2#h6ecU5JQF0(=%Xi1YldeR=6}
z0-8Pz3x7Z%C}iG!$Y9>EXcE?hPOdJ^{Ai@&lMqx28=W5EQQqtYy5MR;UR1xyc&BAO
zMg`m^zxq<-q!Y_ItCrzo^?^Sw1U%t>o;ul#mkP@OjAko2!cLUV=`FSUDU!}k6F7a@
zbpUZrUt5y@xcNW=K`8tgstSZPQ{1p-i5bah`PSRmj9}uZZ<q`78g7rrko?WyiLw{h
z{#L6+t+IjnOkv%W@v=?DhU?IIHbxn*GRu}r1a2236uvjk=mU0s3gaB3-j?)Qomo7u
zhAWt4MpX$jhmfBi3>b4=07RaZZsVj{w2yI&fBGe1nk)!pRF~;dB2(VsIpn{l2SIkG
z_*Bi&c7jiTrBT`Rg_&L4fuHf`s#&cOe5DLLeAC-X%2p?|jw|Q&>y3wyrZx8EV{Wng
zTG~465AL=Hj+04$-_xtBzAlJ?oc_fdUi-CGCu8mB{?}i)3es#Jo)|Mf94;TNpliiB
zQIJ9Fj*9&}FZdlm<^(mas+?>&f*AhzJBhbEM^|-!*G>W6l`RAEXWu+j17_cgcc=Gq
zN?Ljf?x_gHr@E<V2RlQ5IBJq`rrhk7ClWn#&P(93>u+uu`l`8P0t=l>#H}zxUUV-l
zxSvoP$!U&>zT3jxjnNMF$(;Uv*9w0Qqgu!hNa!su6jp2sh2DC^O%<;lfH&z~i*c&#
zTuhmsEWOWY&C~;oQ?*V?k86>x2&1}hdA%q3Tj*9GmZb6rZNuSzv=Uz>c}(X$O)YgR
zg{jhej1_Uo0N#=xYrQxVFwLy@?vJygI0UoIv3}0FiM`d!?OT|iOnfK|?I4LpH)#!_
z;8uOBKKR^<4dBOw?Zqdp_yxUGGYV0!ssURvt?)#@g@#Y^{7ic_H)^hB{6xnRT+cO*
zn`$-=Zigpp_%~aV54>qJuufb2@=D;fD9D{N=>32^!z>+Brr7R*X$$+h-Sb*4kY1bc
zsbN?O<`)-$OV)k;ij=s$hZ?%6957Ygj&Xn&cg@n(v1>V?pDF^m1MTr5DW)<C<5Ui4
z-CkzKr+n24&qaNP&1i{ZWm_?)0D`3NTNB!);$uW<Ox0W(ZS~=Q4aDI4q_^o4s{-5P
zMXJ<kwT!HG&oQ`cG5Hm{F5;$Ve-y#HALJWH1B#34mTn{jQa>+VsNZ6@CfD%DQA@*4
zdt;VD%h4>kr@<iq%~m*n>SoY^E)~{J?kw&-l#&R88k|JmV?WWk+wy*I$PS?asqUD)
zeNvkt>-<?$ZXCgN5|XWd&4JW<-&pWcc?__SRbcyp43Kc%Nzy<rA`YS!F#laf*$&|*
z<NAmn-rGk0-eS_){Rg%J0g_O~U`KGv@$?3<U4m|UzuomxAL?)czh&I6b?(R2oIzs!
z*cskaqN_;zB`Llag4h#9)~Yf1B{!e+rN!AvTqe8t@<fw&F><_Y{>>Y>X+iwQVGw5y
zOOiM{xO4Eh4ah(A#w~Yy2VsZ6wma4JK1poempcEd3*Z5}-*FQU%8*W}YlvgMMD18r
z;p;v<N?zH3`FI^O<()Nn&B%kEW^QKGfgX$6MVm&$iaSpQOw995Ql^GMdbAnPJxf71
z8q=qHcV6C@2wIY?TX*EJ)2+PyzQM}cl3&?RT<B9u{RtIKU!JE&Rcg*TJzHuXSPmU4
zLFhC;4-pe1(PO+0Gzix+emr1ltvb{ezQ;kqcc`)9pBkNiHV$of55t1UoE<&H%P}<+
ztPF!Loqw>w5F;mz3S{x(?d3zMNiViTH8lpzZ<vfRdGS<B@lZ%ATB?^q`Va->`Gmr<
z&}A^U8JxEE%KM!f7f+qs$&Fv{*=-Uy!Ln~%N!TlD+Cb5|xe%J?u=#FV-!R@X-Ljf_
zj`YCVJ!|+R>AM=(!0V#_9^GD=`u%*QPOOB12eg-VTiQs-UrJx*G|2_%u)fH1nS8@Z
z2kb+Ke7P;+EAzFyl}E8CPu6V&yW#WOT1;!m@N0`=H<QvOv(A0}H8$=>9szUTLci{A
z1ZMla#V{M}d=9P1QzDzt6SH4@w$?XJ`T_5G{iR(WPX9~{Z=4AUDKI18TP?IhA}uA2
zi$_7H#}k3gU2THN(K&7>_m(H&-czPiOhT-!pP1NUlkvUAGN_vnfN1nGtuny%&$id6
zrRxIpVScaPvwSkqafcG*or^hDJETl|F$J_5QBe4vA|9?4;MB7>r$F6mY~O^cDw|Z2
z1W37WtS=DDSLno4hn0b;GdI^F5N#S+<6OEsjU&pR=?;h!v5Dt~=FZsyh%U&W7E`?r
zU08X<i&pB1?`gXUKZ~s_Ehb;HHnAx%vyLJh^-9~T5`QUho}H&34dW@sLOyloT2J-^
z9JaaPhM~Bk)z5%La`;-8zILYki^B}y28yqmR@o|mGF&9$t{+1;_T4g$FMC*L8I-VO
zKYo4&k95Zo-|%Y`Ulpn62n{UH(JQAS$&Tm6?^benr;@b#L++rL_+En4zqgdF4yd^X
zRD$letF*z$FCk)X4-&q0_aHq?3-SbMtqZuJ?Qp2Ne~Y#8jEeRR>vLnifi3Gff&#BY
zOxyW9m%{#H4qC>)LtxI2Z8!zw^?(L#MBUq&mXAfcG2^<A7b<_CLd`jI9%G)N)o;s>
z;3*Lg{PU4DA&uZZ&7sVClmiVv825F<0eDFr@PziXKhofDz%oxfe64lt)_2*wq29iZ
zPWQ0e5Za_dSdvwr2u-St!+LF@5goUX+Y`|hw-Niw{mAe^bIQf^i@yRRZJ#{%oXXY^
ztB$=6rPhDuErbBdxQ6ZH(DRz!Q@Kt>LC`m)bw<jmrEQf;U6MiGp1>XY85OCvoX)bP
zxpH{R;X(I}m)hqisTEUxyFDt}GTY3A=d>fV_D+_YKfRQZXJu{62CPeJWZax6ez+9w
zp`7z->ANtd@W7RtVS?alR5*MXpyfQJ{C24xq%BTDLjZH0Tfm*oxzf6OL3xD>l^oCi
zE_lqGdX;+b;k{KGa{l%!DH)c;6+AabB6n9^F*>$?ckOCoswkH!ajg-6A`0A1;fJG4
z_)v58@Qn{Sa=!laFcY2`A5BAvfG}v#Ec02=llba|qDfb3?4|EMM}|GPq0`N^(5Zu-
z9X0%~(5c}@5SYIDG@uRv?!*+L4ZizJ#Zqp%e(>Fsi^Ut-!H!!fRJ9%QPO8g7UA6M*
z@U+j?$X@+|4&hHvzC&&PInhWdSHf+OmU2OTdANrXwY=VGJ}tw!`8y*(FEd{$_wO0T
z2ju<H*sm>vi;s#0Rbu^B<r*%P$o0ndS^Xs?+x7Am{jb}<Vw?q+?t}S;2ECvFs*?T8
z<%YB5*RD~lp7YkSknr)O*W*&1acoi#zscCv+)1>Ly0bwyV^g$w!>B7e@JVCdQ?rb$
zT`%~`;oAHtao>>fB%yn#QxrV~k%>}%*F)L?S|h>*ua>+-S_-e>`eRLJ&U1H-w?8iT
z4D9Jpd|!;TBR&6Qj=s!bG2-v6oZbB4$S*4d$s5l;_(`-+Vi#>8RVC+;x07Vj9+S>_
z7fRnjDrk)rhwXC@)5nCka&82Fl*PPm+wpKg#O{DmN1p3yFqT9C3E5?geT)Hc$@a&^
z)-ua-o_b&NhWzDHo)CT7l~Iw5ToLf^m2C5(B0Q9`i;#jOQx_R?cMm$o1F_-8T#;Je
zEI*~KaNpV;;3{mbTQ>}dyT8h}ZtU}&3Fzo-jlJX%P@F?C08$y*oyv_<aU^@9dhuC2
z-xheOG77ob_+TEwCxk<SgQ^%cR83QC*b8R^A*Xx<lx2UDfRj4MP4qrgcO8*3UGfU?
zdXJH^PaVMJxWC0Vp-RnCOM`k_)J$H}NxO;U)?SBtJ<JM<8HK#U=EYB^OI%(jT#|09
z^rDFkR>^;kakH?g%Opj-wMQ6Xk<U;sIQJno?E}kI9Po+YW~X<Ld#|Qm^AHeLIc3+!
z_Y~Q)p;Q37E4x8>oK74T<qHo)Ma5hsR?QVW(5kUwt_5k{+G|1D-L)Vs9|URJG3gh`
z7}U-11fiJoe<Dxmw^%81wV8q|`Zu03w@q{d59@y&o!Gu@^Sd3Ca6ZWqotAg-^eW)I
z*t}He@PD1O$A_EZ3-;EzX!xTl>Ej&0X{e0=%k>U2oKgH(h|_&Mz>Z0|%H+KFGx+nH
zQ*3=2$^mMLV(wmx)~5WcN5V34gR2$21i0zDNn<5FgM5Ai(V2Fy8uPtuj3@*Ni0M;k
zn1YX-+?%tnHOh$eyi=@j0SWfJI(L7VD&-|ikH(5|7K)W$Q0VPyUIbx!2OxZY?_3hw
zx4NQd``o$9;@<2(fJCtIU%Z`+(v#c2jWYxz`w681=0LLr$N&q>aH){I9&l7j)kKUX
zd-kySRB?+m$s6>AmC7<?6%^x8=W4|XB`v&7t!{)&`Rz#&KS&aO-cn9Vpk0iS*KTq;
z?$0S91zh(s7nlP9o064l)MRtp=vcRWXE){pT3!w=6|)&G!A&dWOqP1(rxp7;65n70
zEboL7<oGoUwpezq#c2**q11y*UNwA|JWo7h031n#JCj?Bf0JM1kJ(kVIjU2)>UFM{
zer&W4bybhYJ91J#xovwF^{qQ#(GB;$mzOsvSpDYX@_z(rHjp<~PUdpTBw=)oX_><7
zZwk+@b<tOg0qtb}4)C5DfoH@xAIV2jtmqBeh%C<O2OQ00XL@Y+$4=W8(f{%HZ%UMj
zs`|86;TXB)w`;e1PB4?FgwY`2O7;UAr(s`r+K)}nF0ZXrxN|z_`7fA)`(N;a;r}Zy
zycd9Py^cs2n<FM`c%qtRpwiBY!mw*e%a0QGEEFT(<Q<+CH~nY8_<kE)JJ)Uh+{wsG
znR-?1+YsGm?Vk(|Q26k;e2zdE?iI)?=j)Rzn&FBrtXtO*<?ew-;b*tIJ1J7$!2)cJ
z`alc_Jk+c;4)+@3-S}hwb&pSLxZII?l``V@55uCgcBhhuR7F^kI5#4G4Db|KXO9>c
z9=MN>GlDu6%r|uD9nD!Zdd1jh4FI5NaqbBZnpM}zxKchlmCU+5yNe21dAkbs1L&NF
zJ&~)lA}^=@DyB3j%XpNWfOd3DUcT>nA7>lLBLFWC;eP*~-8?UTSd`N4q?ojJ;%(uu
zxtjkYGBM-@s@d}YKlE*2oxU`7+Y``%1M(XNXO+%(&co%j?Kyr|#?`R^AUn}#Ce)WR
zKov2c?6y8Z+g}K~I=(oEQ5AoR_hu(e(63G<SPT1O0IxLgj$z(@Rh8XNM<<_=ogRg~
z+|W}K6nN65axRHb%fNngpvG-XV>VW-CMeb&Ip?99*>SUIepQ;K=|(pju$M;#b-!H;
zMnva1Pbi}KU0O`id!34|iZJ9+u@+CEFlkqSd9Szqg?Wcv;EDK!dHZuQ?`P<PGrutJ
z&4K?F^A5ZGPt5z=&A&149Y%4Y{8xxC)Bjrd#%`4|H0^ZRXxQObvq!xVWLl9$6ZvK#
z<A0UkZP>%SeLJ<cV8`4T_A&cQB3#5=>M;yJaDCW=Cc_ezge9D~x=#@FrDjeYY%JyB
z!WSj;;eq&T9#AU9d1eWDSaMgNHg_?s1NGtA9Ztu4xP}QVjbm<xZ@anJcF<=H9vr2!
z5Cl6j&p&WoH*V1lsDX{{UjE9*0cC-dUCZV8khc*DaQ@36Y&blb5=@;jx4Kn7Xv(ep
zk&Yr5O=vW+PKRgl3l(1#&Wt4>uB7=nK@8sEcrvONe`Lehg`xU9pUrC^yQ@+9{%Odk
zdl;Saks__{rqB!XUnI}}>0G7d7ei9@6;LT-OiifN_{)$_^a>HGbn-bsV;X>8J2v4J
zg=Hj?|Fw=)2!+xv9N?BIhghiXHa@zGwmjO>Yd|GW7vLdjV?!tIppM5|w>@0ehy!S4
zhNs$K?n|kA5c>*buB=Nxm*yCbE+(PQeRdsni&4iGtfXLYtn0J+sM|oe7m3&o8E_CZ
zKITdTpoxoBlNA0w@>t*!yE*?s-ebb<=NgTTbg=AV!^j??)G;k>H&9G;Z@$rdr4(-4
zYr-AzIw0@)Z`V7}keE$2Oy8sP*8_mc2amPn?c+ba<P>EMLAopqT%baF^E_e4)h0A!
zh<&||bM7+HSW}|1kM{1TeT(e0+~JZvjEiZAz+OE=$>`AL^5jo|GA$LOB>D!aOtOU~
zmli4>+D!KP$gO0xmit(02nm@BKT#QsRVibw4b=o_ug;M~Xf6b+R9zyWFHoHnw3<yk
zcq|ku9P{F7%WAqFL_{j#v1_Eh*i}+rDo)KI1Q{IMjm3-DRiaEFS0=6YlJo{M>OlKo
ze~ehZB0}m`D$9=GzrZ`?Un3s5fbr<0ri{6!Qh)OQng#jLc98cdDJrOw!Y%mDPuqG|
zA|tB3r<FAjcR&t@t#qOD2nYshz%m$B^*!zuTn9)g@i;(5xQLO8ChnavYAT$TUcInq
zchZ1KeC`&^MKI5t0tzEZ5p$7Ro$Lk*mT9F7E1npCXi>ukh`I8B*BU3z`5`2zg0kym
z14Wj9qhyVUWe@#^{rHmf>jHgpU}MqZ*S6VnH+kBpOC6V-QlS{3#b2a3Hi)(RjY(3?
zCp3HD_`C(9_&iYUJ2?D2xesLjJUr-PD*G{azNVSX&3coA4TOs7d}@^7Bfux}o*V^*
zvnGcdD_3ptIw0ZoPYVQWIB?lSgsT7HvYF38GSZRTNYCq-#nMw=<sc_kH?{<L+RcEX
zkB<WpGHhTh6{kY-?lB~~N!zgeFP36PFW2v{jD^qNI)+LY%562Zwn0OQyR%RqjT$wE
z!n6DZcnbLKSqD;WLFRB&fb5THRmYpOwJImaZPPQ$=O0F&qwcm)zlh<&<}9V4q6Xcu
zPG7ok81Rbkh_rC0M$ThmK}JwXCKdVB6wNJhEq5{YZXPfu`+;;PPReBXkD0Z!;tr!r
ze0YuPxa2q#w2>fw9ctnIaW~#8cAkE^rl4;T^9oKYczH?W3UgI}_$e2C=ZQyQ33eyF
z9&t%UrFlrcYCs$i33L%K3V#SkZGgO$j0=3zrd(i36-|ob`fxaYBfWSu|54HRtelqK
zPg|S0UYyh|o;Xl}a=7)0llf59<Q^yy#iW}n%Dh49cz3D-YNW}26@XgaX4Rt)aca0E
zq{!Hsql(_lqK_>f7n1<s6F|G<d0?>>&2O$3iQ%B>r0322LAC%7-C=#36*?95*IK6L
z-ob_wWvQqAipuG;IW05fy^W_Yai;wjj|WW6sEF<-&HJPrNV@AfkRlHQGys!fGtZFe
z!UwiTZGcwY59i_`CuW(oT#WM5(bdAmtUtni=jN}q{6y>@$!~>AYA%1D|H^hZY?evZ
z&5YXu_yu3(dvqcZ!Qn;e2Q<V#_Texe7bOZv2iztU1CrGb#U?(em5F(=<>$jIQ7GlN
z8qBYID(_Is01eLEr-Q#3h%{gKhvUj6Ds7xX#tU)I>9HM!^_n%H@`@5#A2WKv(fytL
z^nmxx>!m%xuY0||3v}a32OpK&20(mQ`oGbeGf1+A0l3ELmkn60;tG`g*F{N2H5Q=Z
zNPPcpWkdqivdu>YW-{U$Fn(IysxkOR&mTK!%eSHN^NxDSYNF~U0W<fSG!Uf44v74L
z8P*VkX@$4)T+VoQbnc5;r<!k7Y<YkV;uZOIM?>b?9-a5sPe#Whq`c)Yo21W9s1)~Y
z=PmJR4wk91jDtCeP;zXas^K-t2ncAlpPf%kPe09>RJK9a{a)THTyA+it&*8gF4yH%
zRR?jbIoBT^DZ;P~e}Ni6q^%5Kg+*MJl?q79fo-ua3NY)S=H(#cP6re<pgH~A(#<m(
zV*^__fj%B+Pw9h@knjH1UAV-ePRr4`Emm>{){7w6ulJ1B?<V^loJ%;a-3vQEY=@1x
zRJr5VZTRVH-cpPKj9zcLjz;qrj`*9i3`PO=4WPg3ah_@x)HQjIE-v84csYdZ<wpWn
zdK*>Ok6Nk`kt;McjqIXgYw)@FvS&U<RL?SLkA94kvR{lNV>r@>oY2=EohPMY(7(G%
zYIAB~&7U@vsGwA!5mg*(FfcV`qJ4onM6h~Y4GI8yG79gAGyR*68-6A!O}S=v$QrFZ
zeyg^0-6>)MAKoRz*C#A7u#J%6-FB;z3>Rrq>lMQDUlpf7Y`r6JqF#`aijB>ZTPNKv
za{}7@+-~is<S;OrOE@VARVW`N%qB#Qel7g;F?q_Uo}$Hh`!Ls2jS*KF+jFO?QAwzf
z!qG{tuf^1v8A#;g^?CwM57OULL2XDiy<&T*U*z>9TZU$RwX!hdoRaoGeRRvm1I7&8
z`}Bw~sHWJ&{35B0_`LpG_bmuU<85HYS6|wIaa_7IN~IU1sb851xg=dRU61AXVz#0m
z8@l#O9q~5#0jdfFKlP>!uv6QaDFf`b0GFV+S)6adUe|O`ZB{mA^v;g}!t4KXS$F`2
zEhX=%&ag#rErtY-*O|M(hv%0NqG^pLNtrdO8A{L{c}mkGTK8vBj0~kz5OWvxBJ+`B
zbK6oB45JT`9}@j5KspG~9L=Y{siM!fV668gAVq&Ebt>6PT=l`$Zos{32td#6a0@n+
zn1P>m1q-mQ7OnEOOSt%=o~Sp!t&(QnkU0l&#mw-XsuN{sDng+;K1crxxo7G6<tZ3<
zSw?}r@Yepz%}WC8A2wv8R<Qqizb+=9E}kpX99^c_4(26AGX4944hz6{S&GDX|G5?n
zteyUG-e>hP&ApTKx8+QRmwQbQ(U-)VJ#9-{kCeJ1)Ro2%IVqZf!vI^LFcx@>b8~i!
z=l5&))H>5YCt(>#gp-o}H)?iHv-LNZmcn99Bqpc7Br*-U%m4IBdsD)ar<HC&r&5{s
z6gpDma43`zTSpz8)`HHXJ>6ld;zt?-2p59(!#y-;+#7J=-_|9B!i&%B{U+R&lx?qP
zKoy$C=D`UAOBo$U{r~NALbZ%rh9j;9o;tn+s2)DwIT|9*F&dn`Gb0|O-0|;I-3;dg
zZTZm63l*KCb|&f0+mx0}Iz_ZijI^hNGCPji{Px2#F_(0k)-3hf#j=z7r=xTxi>r9D
zyg0bLGkxs-Ty(QSx~Oot*sArtXZLSTN)hP7;UMNau%2UWX6Qw;P_#c^W(ho%`E;^R
zqJ1SwZ{=<IooSc{P~IZ5Zr|>G)3!^lj1?=odfI&=fYFqy1{oFuksJskkB%5|mhZ2o
z9-rQsrl~QfirXkPx~jW9tkhw}YW|b?$KBmjD$z+TDSGy!^fs7c+cNX3D%;z)s+O^u
z&^fY@o;&0X+7@|lQ+ly_j$3X&c=4TVVqAd7d2l7*o#|(Px>ukZiTgBR&Z?6_5$*$R
zEg?9ot$5?^uQ)V*<(#*?^Im|T0#PW92w~mTUplEA7)Gr_#@-QxuZGDNGql5gh8!nM
z-@L6_Erhe-!GqlFR9BNgPGubx7m4cy`ZgA)5YNhiM+krx$U9G<{V!z+nc?QsS8HBp
zmH4Krxuu^%Z@9z^Y*H$$dZ&6LC=f^xh}2Jr$v`qEeN*S+^Y0GJI>8uIN}c5R1p3&_
z$(Iqa<ww0%D_QT+4+2<n$?W#jR7^J8pH)#2u@WfJ2qF!&`iClIy^tO^+4So7Kw}|#
zUn3A`YY=f+o70BsT1=oR@znI7K+L6NUl?M%EzOkce!lf^cIl545AL>ebkuQ+6QXg+
z3-B3+_#16k{*eMre24Lnv2v;sT`=_|H=S4*n;%Mr_Vw9vm1&qi1HbbYph@q+A92#r
zZkx@yrHMX>R*;i8l`fi#A6xS6zr!Rtsw5%a3k)(*lXG0glvWoW(L*-=N)KintYr|3
zi(5dsUUOQzA1X<`8L$mJ@8s%3uU?Oc17LY6CUq2~E*v_aWGoc{JwuSAk2`63YIS0^
zM;tt)1I~+2D%t0ek`K&q(GYuZ^W{6|R1#i0tXzezG8Ok>7Z&^#{Jz;4T8f(8p4<*(
z7FrV<KsN(__f*R{P(g6<hbm8+AVw<6cRCa!G}<T!+qwdxjX^i#E4E#9=`sSS;_U2E
zP-J}rB)Nbp{3HwD^266nPH@qP)ALQWK<+FQYWWQ1(>ooQ^Y--Ie7kwsbq{p#@?<G3
zxB3bM5-<8GA|fI;Xl=EA8REsSd%Q|vc<T`lig4d_5UMetw$FDG4$9SS`#zz!h<B1h
zT8$efP4O`Mu^dCKPNHLou}45l3Z}ZC0F;WA!4a5L_B^VY1qhckUqy-HbH+LV3Pq}T
zUrZgF$sqf;v&_|VLM=2`#9f!_Z84tc!mfnXbk@BNAeH}<?>Gn~Ez<==Dl01w<D?%!
zBqo8DjE2&iU3C?CSBWCi03BD|!-H1|s56VKGleu&sMW%Hn%KFvy%|#=<?ZmR>dbs(
zruwlxIad_!5zrP8UcGcTT_>*e1$F@e_+!H=B6m$pUW)3*9ABOPz96tou1V(Y!-B?9
z@AAulnhgoV#kw`nEJvX!f9l&?6%+Y)=#3(euYzrqPPGE;0fC@WS?t20Rr(QwFmsW&
zF?i{-E#!b}#aMwhzGF{oQN%AUfDg(pX9$;-^)BS?>M7qo_!pjet1MPrJIy18>T7g`
zZe>Vn1Hc-$)LR}v){Vy`tM3?0C-C4~7b@Htxu^OAgP#GD<o3=}5m<=-Hvaqf*E0vg
z1e2zwrXFzBP&6SexD8zN7@3PB8rQ%<ad*`d!~I$gCqk(JL}tbS#VnAELJoSp46<aH
zyizBD?lD8$l&9-3TX0)TVoH3xedA5rRor0RC2QIMZonwgFW8z;u8{MQR#f`*Qf5a(
z)<j!^a|U=wlhucQ8B=-Cev(OXEx72mRhV|w3K2bD|MWD-3!k&lJ6;8hlJ5$bX%UDX
zz(rm+2ZT$wb<}{V<Io%ibq1Mh`lRd!>}GdpnMa1`FJoxKix)S-Jqk$RnpG>#8<fQ8
z8W4GKe|UKKXf<bA0S1Es>5!6arBKl9(n{kW1{viqGV?V80F*SG%B2yRwR|O#9W<Kg
zIMpxl_&`iAC?pm{URlM1Z*2o;Uy_(#RhWoyjPjjiq#k=M%z}WTBktZ~2!(3&Szgf)
zR)|S$SY;iodnDRF@IndZtVr?2T~Q-ehuq@k+}DnK*G5EWu|7^<;7+T1!P?7QdeGmv
z#;=e5TX4JfVq(<5i%Xf=cK=(O>S74HkE0vqGDx12^Cd5_IDE89Qc%4m{XqY-X0bS(
zwhr<x)+U1+&mX<ceGs+tM(C3xyl1vdp54i_^UB6;YTMP?wry<Q_AKGRty>|S;>O;t
z-NZW;Imy#wW^}XfMvxf_q}RxVn8WT{8zcDlF?t8>kd3kMrqxn~UoU@=+Jt|Q5YPJ$
z6&LVUIe#ronC5|N3WWH}4ztcwB?$l-!e8G3fA7Yll>y6Xvdp(BVIlT<aXG4ITaVW%
z>B&nT(cKDRt8#_EK7P+a0#?fa9lx3nXEr2geVWs;xWp9O&kD7~wS7FlCBDGJYqkmN
zQ8H8U2eS)j=wNM$?tyeZoqY@HXbZ=FAK6t(D0Mlr!7Ch}X{|h0pniAcREBfXUMu9l
zg>xeSSQ+aIgCL7oizDj0UnH^O^^hZV7wMF!OU(9#r(YMB5EzG#_lq4m!8Sqh>rhOa
zDH+kK$WR>eXQk!wwIzuHVlaXE)OmY+Wkpp$`SO7GcXp?PJ`4>LqU|=fDu{$>^<?@V
z9IZI}H<t>`^9=SWZUEO-q&eEL^Dyirb%l6kbUAeRCFqXpnl$RXUnbdUzHfkiAMxJd
z-HTHq4`jb>Lh`%#kZ}oTMf8(u|5OSYNsRa!$b-}ylS{(0O_GA?y3Or+k}ZW1-o+*P
zT0{Q50Y_)hB{D%ea83KGVDBq3Wc5yt3cw@7Kc>FH*U7Hj`cU`rXfgJ6o(}6wGvYt)
z0LGT4^~M+N=QZvj(ypcGe95=M3N#N^)c<tE5Lefsi*ya7>S~jqGS)(mT$T@qXCs-P
zC8*&=0dZgk=0lV2JV;Qy?)xd#uZ(g4>mFTZMQ|*g(JWxds)%Mp9XsQVh$cb4C3B?o
z?f~lKsa+U88?4ChOU+pTKC;moc5-9Hw$ih(nu)FX{ut+^mu}^Kd+<T$v~cCkZrk)a
zRq;t|T5P9s7GpS|e?IzU^LYDdg7Gc&8DAKFenw2y^|~_Rf<-}}!kn)j-dS)jpun+z
zyeRVM1zuk+BL^l;ebypMLgBWK8hPsck3$iJkAyLUPj2Mh&ad`Whp)$3^SFZ3BPinG
ziL^fNkB@r%j$#MANgb1L=I|Ey-js2%A{0--X3+WKVsXXUw4josG~pkq?dprQu-E_X
zf@hnALVJ8jDuV;Y1p($(H$2dVx5FD!gS^h0m^A4JR9q!_g_tw}d{kJ2tO2ty_=0^Z
z$v`V2L{ocTSexF|@rd46fAA-BaqU4mXfjbcU|fNHYG`15!=wp{O44&S)G3Q+EP(r7
ziG06}cEg3}I`g9h^sSfKE1T5Bk%DcdNaCLNAY^6GGsY@=X{h8cTVKldV3Q$o;Z^*1
zx4?I1{>MEc2-A=^!!uu=LlAuPK1DE79Xuh$0v^4m1Tk`jXJO3nXk|A`lMbiGOa$|p
z09;!RtDxa(ehoTy5z0m>#31_@p288#*gNPEx`sMTl--3(D!e!XjEwxY|6)Q~p7Wb&
zYu!wp{cq3IIgjL5XEC-r<ypTQ0brg&|DYXW$Nv5pp7V%)VCD=k^k2pY{QciFd@_d|
zvVZ^CKlahIEKHxyw)5^}l9$7?@AIAboAC)w@d2_SjC$wd$bLci4*3wG{ISjd`F5(3
z%-Y+%qUyXnzuDWXw>+fxyy&t&U3K=|BJ)#wq2wRG&Edi}_<L;99;$s_LvpiMLfC_H
zbgcaFoKZq=X{`)Q^!HB-0H3{R%WtCq>uCUW|KANcSM;gO<u`*J4nBhw{%!ezjM6>y
zTA|*rtNQ`+nisEuf;M-*zRUEu{jfX)CV$Aryi4A}V%)U27%4Hi{vY*9;9Ga&AJj5x
zqUfi@Mi1I7m%qu99r}+?yd5yc^qmsz10Sf6KKBXw+axxCHV$zq69eE@m>`l5{BC3J
z*UH#Z4%r-KSepv_uH_MbjTUS~C(ByAoWdUL`~6#Mo8S}d01k<4cqFdfcP;I7PZyDx
zop15$+u-j#-#^PPzROp9;I#=4bnlgbN2<7yciWrEQl$MZ&=VJ*@h$7hvnkhg>&9C_
zR5j)Pjw{HN<~O>(*mu^(b9U(cHIp?6lzS;2MMUs28TkGrpeLKS^YEpFjPsF6g|>}J
z61p!E8X6kJUh1!{=Dh82&`I49D3iNwq)v3^Kw0LUigM5!mdI;~Hr#SoZd1{TNzlGm
zbRoz?a6q+&GhO+QGo8!5{TbB9p0bP)E9MG&kQQdnt0}pIuBn>lAnf6;_be%pj+#;g
zeejC;J_8jBfH=xpR@g0#Cc955wj^u#U}5j$uNdWUJ4+u>_xga_6b$+WD42_{yXSU6
z2DT*mQLg%j4HCVYW-&XHC4#;_Zo}w6y`AWvQnQ5zxu)j1xXg?QuV0rH0kk2RgOTEt
z2>Do`ib}b3dUEh<DcP!6Mxt1hbwb(y`}p&Ca#xofSBCiL^%N&)G`y!s;<P&u(8np|
zO<#2Ht5Q3y>16Fc5Ac9ypg|_0s$VbEnjnAJCG`--r>Dr?JNJAGP_qf>I<<(nv9()J
z>&IKJ8kz&8#Mz)<WGhcm7_R`o%BIf#`1p9-%WJ)rAwaN*aayMH+1D2Xdv+FoK6rB{
zP3l1qhk<9T_xka5@IK!SO{Gjf^Glx`P?aqJ1t`8<&nu!;cFU}Ql}RL#UOZ7>zs_!#
zy6iNiRGJnLN`A#>$=lLzAAHI?d%lN`ZV`CK-+a$cqop?LOXVB0H<;$Y%A6|6<khw1
zeDuix+sBZ<MZXbKwA}wPWOGe*0Ht9YvD#<6%D0L3jilb$O<Edc8IGB^5X9Y-?Gc#$
zsQv5Cw9SKlYb~HLK}C2BKXZ2<e=jEp=oQ1}@IBX1VbI<HS=s3d!GeI6%u6vv>+LKp
zQwe;%9UZrWM&eD}Zb^r-vu*pUgOoSN?xr;y`s@$U>CGf-9wZvh1sp=?95CW5{VpRV
zbrp5pYLZT`mw^#~=+@$mEG?Jf#I@no3zKM%PgJ`a!=H~%)POhWLdt%dC;l2p{$I4f
z=I1xdX4(f7Q@?;-ztlV4kpdzPE5v6PBqSsT=O?cZ5lyU>;xyR_L3eeuNuab8Q9u-2
zcTlALeN@^eNZh6;@V7t*U@~g%c$sAh=TT6vcXelANya-1?Yy^&rILM>b@Q#!qfg2;
z)~r-fik&$PXI<tLMtu?6YJ~-i$E+|Q*1ahrW-`%0QxrwS)Qny14Y;vYzxP@2SgOy|
zslMA&Ug^deuM9I%+XK25K4*}Vj&_-U=l0gXSU|8he&pP`3-l_0PKrChzCY91JjXxU
zi`79GXwzPywHhY6+&cmU(%f=UdoV7R!p@c*`xG1=33w8noIv~J!3qBYsD4&Z9_$9;
z)2B~|dGQsI7<;4iSDc<FByJB4AiviinG*t@B5!I^axzTN4SV14hG>a(7fM}d+_T*;
zta>ZxQC=zo6FS<KsL<F-9xIp#U{4j&$wkw}x}Z(Kh32bamoIvtB@tfjUF((1b<JBk
zPnjFfOvvos6Hs~oLB#bFUPWJNo^9FX#z2Dh>|Q<po3lWV4LAA4La=lEim6YgUgH@(
zL;NNGQ-=ChSkTZT?KEeW7a!YSRov$$hbb<2DW0nsl2F~TxWGV+w$AalRAdqdN8l+{
zq$yQ1$6yXTV`61uJ9E;95BAAYhSRt|xtWTNYdA5?6a`SJBOHg>v&<w4c_+@1)88<q
zgelFLOmE7<;{1{xa@;8B9fDicb!HJ*AHC7jGdANX-(yB1TNpD~yo|Zhira9!<#rt@
zjnACScqsMr?KHCzGHs8P?uaJdH{IDuL)^;5FDQ9`)vcH1!8Z31O?_Ctoh!rfLW6to
zPg?bcd&PipI(*E{h<;5e$zY#w*AjMGknS@C8d|ew*lcfRvqD=pM}S{d$g5&cJg|nv
zA?R=?APx^>O(cLO!>LGnBR-#+bL;6qo*Xui%d1W#S~doUzvLGw4d&V&3Zil$MYRJV
zeii|A)%LoH?!JNg^D(ZIDCuPR<ObR}Jk18Q)*1z<+2*!R*O~g+vz(hF=qJz3<#j;!
zXwAzgR|j$wd8adh{~S@Xm~+jjEi`mPB@DD@k1^*9!h*-Bl)2lR?zyGHdbc2|m|Zj7
zh^9KmXTIr8)lJa~q5xI3#EpF06NqRN>cm2@#QE!dc-!cYE#sm&&w^JTorfTiOQHKK
zChQvUJo5e94haEi*^`}}mrmtYZqV~&1_U&Vlwyfn?wyM?&1Jm_wVJaPSohfVgjJR5
zkbtt~4$x8Nc*gY95+I2ag`&h33M;=1B{>*&(unU{1o@;}L}!E|UJ|?)r2@iqnR3g%
zPYb>+%D@lDXNZ`S^(=P5d(p|BL1PxxCl{%a(B>L%Z`P(l<`*?jX0j^`J#cxI+;#8A
zWgw2!?AM3fr8GJt4lA_W8NG|xa-SY;<efFABW)tMKq#HeO_h{f^mv!1%b$8x$}P2U
z`mgeKzb3`VNsE4p(4>DD_3{{U7B0B%3~p!Md(4evs27;!zWs=rK_DnMrL3p<Cn|dk
z^bm(_HIZ9@c0$s`v`lUs2b<{bLz9D^;ZfHSgJ{4QP(9$U+DkozsQYV+@-d^JG~c0z
zaQfnxXZmi^`aJl8nq_}q|11P(6fx*RpjX5in@$Se5JFv|ycC{nlMz2&2I<`^V{X@<
zvjd{3=aO7?!MtF@O<0b(5}hCnCG~$jep6J@(w2%^|D0+qd{=tESjgg?fWB7@lho%B
z-!_TeCqIFXKGcI2ovbvw%TN#WRn1c_k0y!(L*Cgd&O9-Y>$d0QpML&TePQp5qyk-F
z5@g2objJV6IPP^5QIgT}NLmWdG)Z$lx%GP2QOL?p=*Me!#^2E&w$~(Xf3t(xaq#AT
z+GOLopbqIH5TAY92_(f9Pknh7fJI$gT^XIKE@peSXtre9cll_6aQ1bM)shM+V%vV3
zM#C$kTdn}Pq)VL>o*0LzqVsIz^UB#T7gaFJbfVB;jS?==HIXhOXKvEecS=z<p~Bw#
z_S9s(W6P4bkLG^!o1Hdee&w!{5nmTVNdnvrZ}v$n_UW)@n}!+HMtt{TaLC00HOKs-
z!vyWmUg00Kx1?&gm<sCXI6=9)XCB-If0iyMnZG4JdMi9LHTh_<CTIb6rewf4klo|R
zwhDXsO5R=wD8xWqEkisw9XjGY1IFWh7;}fKggyL*miP)QqqL8RV`VJwLJ^rVh#x9C
z6iT*Hrc^BE644d1-o2+Q=N3TUMi0pLm1?7C8=|$#Wod!goS?yrXVEV_j~$!i!xxh1
zH$It#d=Sgq&VN%$G2^^I#*p(#p}!jPiOb}%feJl#nl7-}3tdCT!-FmrE6k{uB|P{g
zotO!JcbyuyX=}unkM`$)(^hq@_TgV2L%h!CsrBCNJ8+up03~gwnYx@O32rx`wkvgJ
z>^j75=H4rHuY(ZlAN(%aR<7n*BLQ0xjv3+!2fGltlUdUzf%mxI{pE-22=T0(lWpnR
z;+5;f`OS&`tcWW-qjCx=$tosd0{D|VCWod$2aeL^;Y<vBH2(acGsKW1G%_DXb+W$(
z4WQwSZ)|<U=jg5wDP3v40GGuot;~Sx8ELx$Y;@JDHRBw(W}Nj89CJTeuiX!;lufI_
zobU+h_!#?r`PIbaXVYF0PRFSLeKM8V8h~`)mLIkiZkw9iuzH^&wB5k5O?yWl@H;kY
zho@V;2AwQV6JJBtr?wL;5YVZL72-lyZ{ax;a!{f0KyK~h7l;wMmiwVvOfa7Iqa2I2
zgGFnX#gxd(RTRA5(M8R@l6$c*VtZF$-odW;T_tja3odui9967P;Up^Z+fpqopT!@Z
z>2g-u!lY@Lk3&GTYkhufKJB@xNg3U3=L@jMYi4GNqV6i=7UwW%%V=m!Nd5%eZTP|!
zs0Y;%uocH2Ji*;vvQD*|mQxM(3mz{;I;XwpD0=v!X2>f{04{D}^2eP-0mtNKlkBm&
zkeLEkCByA0O38p~LTZgh&IaaKUi$M56yTULXcd7BKQ5*NBepms<e=?J>ry@Q8<qo>
zha?Pz)H4hc)Bi%|K}XoFx}$H)m6_e6p9W{g896O!6k|hi^&Ug?ErJ*>ar))X%>5VC
zL!lYsreviePGJl#(EU~6uGg&l1<!a{$%5-1e>wrho#2}7drr-dFKnQ_l81{<vh`HT
z6^|y|aODBr;TT)>i6bd0WigNl^B*YsX>FHzkFWv=cz%A}=tE_C?9*-0=4jN`FRVsX
zrCuDwJAW=9Cq2)-6yq9ZPMbXY))u0NgO0r#RI%_7q0<zNL7t*$XGnK0skCAa<pDYS
zD#GR)5Ns3TAKQ&WZ9@#xH$Wnhx^mn`?zY)3y*Gy`NB^L?Xu6z5JvN@{FZax`Y!Ihi
zGJm-jA(J0*o?kf?8;-8nXZ!#)H(x1n9caFk<uh*F$e(oqUCI0|dWgUXok+dn^iI%<
ztL`>7)QT*DC{aIljaZS5-#U50;45aG`seb$w8SyGnEOIITo*oP>pn9#F>fpjx;1Oe
z9B&`Qg$n8=?M%axl}iMGztr>`v(9Uw7M1&H6IhtG{S<5G1psu|lEqw|@Mkg5OP^-)
zo#n%n(@H*_(15sCT2BLs0v_DhIZ0UCj4JGWpIj9Ekw34RQNP2+zQ}VkJqEot{L;yF
z_AU#55rmNLPJRR(CJCY_QQG@p-e$)HKRjGyO0#dIGbT8NI8)OeSDiL)u(ITj(&2Uu
z;{_ON`J>oR!fhAy&8`xR$!Zk|UwO;a?<_Ae+h7G-7NEAnyrP|%JotVF`eaB-VN)zC
z8{U5uqxy$JnJAMH%v|_Zf9GY!?7Ps4)1)8;M9=BsH{I3xAv1FBoBKW1Iucw?1FcS)
z(#HHc%2UmUv8TOo)bFPDjs7(u{x$kIYMTA-)~f`ulLhpK>Sa=e7Ofr8mv_VDY@r8u
zwmdscSs?HG;bIqq1=<&8rs?LQ-FhoOD<UxY9%}nP3)4RGRa0*9Zrkr7O>tk?fbLCb
zS8UNmUPDBm=z6L|xqG%2cGk}pZ|@+6RgR=nD<&(j-6i4I)vGLJTn|_dB9E6XQ4Epj
zPi3#8zAEz6=Ok$yBGFrd;&Cb0_-r5axb2wO1~)7XM70~9o%9R=onzTevIx#AalY_B
zD1y?)`Qys6z@ya4fP3s7kZO+c+6V-qt1E|sIzpknDTXiIg^THIA9Au;@>RF38+2~?
zqGoHlM!sR(F$x7IH20Nm>pc=Mn7rg&bt+zhD3sPf5sJ_7tZ%IDhCx-FX!3~SoNtFP
ztL*im`heKn$gGzq%$|C9Bv1MEwLTkjyMda^g)quy1TE#2-AcGynt3@wW~{}~dRks3
zud2PuAex=znKpR#<D_|Wrl(H=U2;#iXPZPorT^nQwU`H9aN#yK*do820+FfmTUJEb
z(7T7ba1w<gqv+h+V-tuh&9ZpGR!;4<eX7U4ycHL<%aMTgJ=T+iX{PHPDogdL!ckBC
zgh<2l`5nW}M;3zo$onfFZ6GH`%Hh95&=!LN0oMJ7w^8RM)u(3+GW=2TjHc1;=n9kA
zJyVB(*_AzFi7sTbKdI1(hz3WX2+XIP^Im4%7Y%+7BB29_M;B~{TL;bpD5F5cW#Z(W
z_fNjY$n*|$#>nb%z4?3J2L)iFeP3}o9%-P<;A8E;Z%vZy#f(?4-g+-hwMx+Z!p$il
zOh)U_$KwZ#*{Li&RZvHf_I$*=q1tD_t!pGSlxn7fu9O)TfTz>^Kf-H#nxQrP@EozK
zDyzM;?fnN1(6;yae&($yjwAimI2<Hday=CKZk+eY#{p%7_3I7>bcD$+4}-o)tw+UH
zOr9iGvh04im-gLwiAbMOjjuK5@)o{mEw_^f>!@jUeqvy~1mCc>cISFKKw3^s;{q8(
ztc)Fz=Z3e?1M6e%({}mGl*MDwUyPoYPPjc2FyLG;JK8Z|eBYz-y{^Nz>W>fXj|$VS
z^T$K>s^4b5D14Iz>Q3b&&Srr-qI$=sE(6mCu1rt#^+!vM@R)#Py<Dh$j0zGvvb-4l
zQh~geDqjzVwC-Tgrf}T$aJ*(X^E9}Qi?6DxXxr_}fJ*DvlC67XvjR1_*zD&<{PRRE
zEbBP_#i_Yf!TW?cA|t=hfp4+fMi~ssWs&lc#2n4GbadNl7M~~Y+PioGAZE`3|MWtx
z!s>QnCPwfui?vGzbaQ|&A*eZ$D-R=T7MWAHQJ{AwS1@Vy@KCx#<i+0{WK=|5^2BC#
zdRbN2naf%zHVRW(-n2+E7J=wvcqzZTD^;%h6#cw?fdHnyMPIQjK7B8_=dMwWW+}$O
z%|NYI#%9~^DTxu(cKA+tpWhQp0FUGbw*Lu8a$%YOKqR?n-0xT`=(#E{{lE6J01pf*
zdvjzsL*US8!O~XUje`HEod6f$F?tgyEQtE3AVvddB+B;2@5nNE8=&8(R^P7B@Y=@z
zJH`#b%o8W_KKc5FJ(wSRnPIDc<hMCI+((PDRFc7cx*4OAIB}A1r>BXiZNp67$x7ES
zC`ElYjcwK^IR(1W@7VeG;aQgpvUq2d2L<84`-^+<_mQv*lxn<%Yy`00-^VBlz{4KI
zGXPHf`zV(JKVhK+l7fF9HrT76GlPi$z;ymT63~|f;66t91c2j@4%YqQxk9nI@UA4+
zwz;gm(7{n}>%X5XduJFmM2KvEx*0&(p0}@nV)4IEaA-93el5nFV6V;vx)COSy}<u=
zE?!>zq?lS~E%%O0DklOs?(c)y^mgEdJZz`@Gq&6b(BJ;Tzm9iRr+z}am;Y^&^G8<k
z&3`|KK1dzd7++ocpgH98_g`FqpL72CCBlB1v9a+gI(y~W(L@vq^+-ISxXJ$0i$t?x
zhwvcaNKVxxV)y<%I~(kkRm9ev2hS%crua{Icwu0wG&}o!#K&Ed*GmclTnYS6J`9Sz
zWlb=le5RVyydvhO*F8Jj=or|4&;bp_xykcwKd^aa3BWgr`xP86q@+6=nu){4+(S4}
zPk>7%w<N1L22#JZ0Nk~1o3P@sVb<jfD?Ue`%w*yq)B~_YucZ*?O3n2gLOJ#V`{y07
zsWvk-wA~|T<<<}@>U!zXzT4c+u~q>LB@GM?hie?!#l0{Tky=KQl4~<C^{`vqcClz~
z64QQx?=4in)C)8lj5>bo*myi*;XJhWq_Jthupl{MxUq7v>AUOH_dbeXO|UCQ&3DwI
zK|9W^L}jieq^hW{OBqKYqqn~RL++g5c6Hcu!qnrv7tj8rv1O|wyNC0jOI@W*rtxAQ
zX=1tky>^XCSJ-i~RRB!I^6g91!m$ID6UgLiKxN+9$!VMzsrTj+TBb~3q4mhOphuDx
z*T^d>q15jIi$CtHw!7<J990>O5P_crqG*B^aG)E>PQV3m*pEni*A|l;y5Vw9m&cz%
zpe-daq7?gQf^`e%cma(gon5_w>S0u%Tq;sDen#D6;0));H65Ku7QLVb*Qq%3OkYbL
zgTd@y`u|uv^KdBizx|(cI$D&pNfIiRA|#=#l}ZxI&KPU5&LGCV6p0cl*|#L?n6b_b
zV~Z?h&oUEZj3wI)#x^F#@cT^XobNg3d7kU}=lRVa$JH^{VCJ*FU-x~#Puxqh2w1#X
z=1Nf|9r%%*U~z|~Sd)p;N5S~|EbyLDYg?N>QI(U)ZKEjFgd45Wmkq2pFWF|T%~Tjp
zu0Q8`*u5c?Q<5z?$y$=EfWcu3!9l^X18yrW?d<sHBUn_;r=g8WGnN@*Ln{w037Zq3
zxaMC<AHmktkhj0z93i-#xz1l#kW1|z8agK5-%<faQK#~ckx+rH*`)#S?##`2pNSo{
zQT-kFe6u;XXKc*Ig9O73EWZH~CnZ#V{>+Ps0wl6SWb2292b1g#K6=jMy&>;*&?ci-
z{+W9(=ooA(IG<<yi4);Je6Z6~#WtU%)1}ICX>CO!k+LGe8zo5>tV3WY@Bm>fD9a7s
z->pXu9tNSDeStFw5VSlAy8P}+%{{@LtDSNfqw|`8e0IQZA7r^N)~GteqZ*-gi>nlG
z<i%6J0{R8#&Z$r1y^F%5<aFCsPE~{X4HkE3J?i=k+^}Dp@YQf$5n-QS`t@a#bM49t
zgO2;NG)$>yCh!Pad!meOLw%_QZAW2AiHszzFA*zMXh;)dyW!z)K>cdBtDN-klJilB
z%R<Hc?QBP0n69CEq^a-mTB8(hG2XZ-T{oqgkwjl=+xv=DNRHW%pHOA-=XMkS^W!YZ
zxMq-1dt(bvL(78S16fH!SIx#gO`hj9wPB;S{Davv%Z@08VTaHcEh51~+mXq+;o6?(
z^&-nGx7LaBkNdZDnHFh#;DhB~&=5&}#skal)#*URB%b7{BHa%cv-)q+>&By%+NFcn
zv^+pvdT{qI+QgE(EojhubD-d$yZ0V_>EG&DWO_s9%N&US(<(2Rm5QPCoJ79{ie65^
z2)ia8gazuce1Xc*I3Q=ZSavw@XqSD~dh}7b*7&S0BbFKe9k>9ydD`PEQ-h^LDjJ6?
zlit%K@F-$Xx3>l*1>li)B<u$&>mWTS5>sO#8fd>kX>nlPrfn>I;_cudEMop#03Zt;
zl^zK(&o`I!FuEHP&Fj_gVc}8>eV8}+NWxS;5ud-$5jyijYCAia1=?xOGVf5N`?dJn
z=f54&t?_^4q7Ox=pC**7C)uaVfJA>8PLJt7_XaaWT3)74^^<gbF@h+8SM8O1jj!(T
zgk~jCflw3$SR1AYQBy!W7ZwdfKC6BNmFX=`D}j5LdTKp6eeSo{e|eS#hL<AM?>_UB
zp)S;N2jW_4Cw{G8{S!JHbu@U!&kXNu4r?3z6wc{9@JZ4&mK`)<=%zG&FD~D)&gvOl
zF=-Kh+{Uw)Z-{dS628pHGSJgI;C=<O)P2zmt5Bt#4k%cS`xTdO7g$B<;)-6gkB;P^
zPh0p-@GXC{jTsOuSRdV_B8&8}L9Wga_EqY$QVaj8J4QY%*R54oBQ9L>JY2bD$!+b*
zav9M$JjgS2Dx&~)F{Yht4fpp?gF*3G-<M)i8ouxnL=@^W^c*05t0`q2hl~;Aea4Ab
zf(EWFr+5<ve1p>}zoh2V*1vAR=>i^I<vf#wZWi6gyT&xI_@sGG!#z|l8?~TM`|6B2
zo`%b2c|Vw+JfNgvRJn|cADl3V*$O~}K_8mce@!G!8#ohaVtk43O9v}fQ>e<$pLTgL
z`*<efMR38o0~4`H4u~judh-|Oj`)LyldIl@lyJ2fya4E|R#W7iQHW`yl})3zq-W%Z
z(Qg=AUnyhquSbmddAQ}Gk6p3ZB50<8CQ_2Q#p+^@6$K0u`-&{p{Fe&W6c11T%B@mw
za{vB*nF!5G6+GgyMo`bO^=@@ugaky4=y&86{fhr;p-Sz{x5-I~)Fj|S31owN+^w49
z_iGL<Oji`{js)9iV(`Ye$mmDqbVifl)#ftY@ii9%OO)<1-yOyriCE2EC5>M6+`l-b
zwlx5ffm<wI0&saYz(&LwV$ez1+Vs{pGjkHT+Y|KF`%9H%{`zKP6~zWtM0rPlxy3pH
z6LC!A-h-JN+%c#-s7hC4Ph>k~{Ai0}_}(P#Wfs4!B@RaOTlmzkR_y<4&{s{wLuNw{
zahoCv{eFywcYp~jU~$HbGxU2qo`c;(^<jb;C3veQFeaW@``7Vh3UsU9woL^}$@5lM
zc}b@~ze_yqXT@0VQo|9o%$k)v)6n-l=f(`~<<9uU2)iKKW-vK37_&%fZMa!wfw^`s
zA}8bvXa+qngYWF|ztllG`i%>RSIhPl*N=+6MDNSjm#^r<&{*_35qId<KDpEebGbuH
zs}Hl8c*c#vgu(6oRfUD;Z7vtE2xhk!yYS&cjx|U3+RyZ4kIuAmmBajQLwMo-B5!oC
z@aF|xH%y<@^5ZSh@mPEiLS1&I>fMZz_k206uk;I+TI&=_>M-mWUH1aFglz-;6HyOM
zp5F5UiYNV{Z}9Y;Y+9Ns+bS-}zxvDsL(8}l6h!bL5EV>TXwKfeuVy_?oGP22u4~%8
zv*%a6cJ0?rdobN-y)ymv9HeeH9I6H3A1i2j`I{LAj~GSuIcvvw&tBzv!{Jld&hx0+
z(*A`&Ku0rR5||=fdY-(3w$wC1XyLJMLe-A+vixt`-}=>T-p*blg{Q#Q)>*f223E9Z
z#W8Zm%#9<eTqpv|ByZ{P_OBtNE?nB4@Nyjlv~cEYtD#i@xlt|$olk4jt)C7p!!==|
zI-z3DoZR;y{WQMqL<R4-tbI(n2>iLT$c+^5xgUmLYftm4-Tgq63#SLY?7wXsNgn2g
zBMz(~E!hR6UA6ixC%HrvcOiN`uY+6?@})2d?noP$?)!RFUAqr;jCa)YI(s=|YbaWO
zCTE5r9kdwfCILaDWF7Wa?95|i|5kLH^v<u+C`l)+8`)n*<?mV_<2i0S*XyGusNymn
zNO^xV^6u6q`%|!l=N`WwrwQ2Uv8yzum-8vchXPW(K~V4**|h{qbXBg0eF!{6SFD-H
zew5+U7ByAH4^!F@kEq?+WQoqldIs>158!Uzyg9n%T0$kq+NSh5L%$aYKEO=R_2$OZ
z{NmL{`<8i_<@Z=Ucxy&C_~aia^2Xw8Ptwh-slP(PGOv;8RI{7RP{updrV+0tC$qa|
zJ5eq&M2Gnc+RTdTirLq{t;o-W7?(91c}cr1Z|{7j8CM}5tyi4qETwY3a0Xv%6r*ld
z*QY*jhC{~qA2&kWlh!W?1>@$zEE;(dCDF5aKTC*dg?=W}6DXjdTNDiDULFUuS-%w?
zj5-wUx6O#$<&N@61KWeMnm4Z&>nfv9Wfv^P@AC`Bl@@*64MR4=bULUStzpQ|MNiII
z^UJf~RiIhVfwo!SW`@Hn56ZymQR0lxc``X&OYHp#U#m54)mSCWl`Y-7J|R)TE?7wo
zWZ$;V_jM-<lp%AP`n)}pTLMR28X4h3M&#6`$8yk#lasNa_D4QG>bG=zJHq&#BfJ(;
zi_<yVhc^=2)|Mb0Q(0)nD>02w8_K`n5CGx-PTkQRhSOoAy6->{%~gB30%MJj$t&Cy
zzp!m;?h;Ga8}mTXXrNoN@U0WHYRxAu5am`nvM@n-$9*7pbKQwVU2PoLP8#%>N$(w9
zknh2Rge1UfK;e+51BMMSuB*wVx*&<qCM8<N8S%(<2PN|(Rby8x*QPWeV}rM*5|rBR
zQm&BDCK}yAy9X6c_eV`mxfVt{i!=_ZZQ^h4hO;_{A0D0)r(wYIkHv*R@?{kI0`tu>
zW*Udn9#kz{mz>zZ|DrCoPCavpunP3*rWS}3`vLyGIG!J=_Ov%Pj~lHRAX&mU=>zGR
z$=BlVxk1|A-&R+I=qX}~pL$^*xVZgQ$*N;@MpRub{+Ig_rZt3JHLW|>C0}49@jrI@
z6-AH3A$n`<=iYTUNyEp1f${6={c74ud_rsBn4|(>iqBbT1%lqaS;wApH9}++1`5w4
zzNXS`J_OPzym<GK&AKLi`hytQpnY;t?ic6+Di_sHE~RaUkacEG4xoT+>E~6U=9ZJY
z1Ok=?h@!9n-vQA1JC>X?^TY@mK1;45V%->>y_Dqn-z>P|^or!PM~jb=&nkOTlR;Y=
zbhh~wznuiqNd`C_7LUH8E;k<3^@L1uQtH`eAfU~^^fiI6oQ;?7XT;MK&4}TfzZhmZ
z0m;B9duZu(!~K4Cn{-_{UH?@9OK<QD{UT@lYWxWlb>;PJb01LSU*ge*I`0_yK~6%m
z9ec}*COD}2EPBRI_af~Mz!|}PiRcBdmA1)ELk+a~nM>Ns4Q+=~Z|4O7dkEuWrBRvW
zr7kvm1b+aiOouO}(k}s6F?h8f(+brec2JbExYz-dgj67<Wa;zBP(+zTO!B!Moypqv
zDca6cH+zqm!9NY0S)P8@BODhQk)RE1gd%&%=Ls=+_-40dj!dab<!fI`J<0$y^Nh-x
ziz<H!H*gX_NGG-;G(d!W(WFEnqCi5Ey-&R21&;4^83y&KouX&+sXJCKDraHZba~4H
z;#f7opyKBZFVDDk<P$O>k;pmc4ne$CE_A-PBS9D62U}EA9kel&FbIo+r>k)?-9sR2
zt#8<q{n<MjitLmpYH{lkFim7UmbZQI=w4G>Se8d;vyJR**~meOtsoCpv*359lycZ&
zpB!QHiaxOq#s=l$ep3X!1B`A1UCH&(z09pHL8I)G6>*A=#-B4sY!^oAu~ov*t7oet
z<o0IcAW65WznjuL$DiFMI!OW8m>{4F-8hk&e(@!+ck_Qqp2V*{$D$P7nK~Y*l|!eR
z%4*;JvIMS@l_wv+#OTJdU8=23KP<?l2Tl#sM8<DI=c{0v6HKuIHlcS!eo*y=ciQlh
zUZrmJL^I2m3l<*4<TIhZ??Uuu=X!uTss1ALC37pq|K4?lon!g9yOZB?*bLChi(>2v
z$+_q$J4SM?!|-<dFctnhaQj6a9=Zd~^$GWQea*I2yrLfyX+~QQC2^!u+i`v<)=j6V
zb7b`#e9$gx{=Erb|I2!Aw7^6aGdJXt0Y5asH@x(Dxl|n<txs%1r`R(sf)kpCg=;rh
zdOW`x1m}-F@^rn+YN!(CLZRy)8{C`ch1;Tt`SACmJpPGy$#3rS^3uw>?Z*H(eYj)&
z?x7*-=3_Klj=VL{<P7xPs%@)@8X7Ol<7ivdQy#(fi*3v5V0JB+zl_%|-?$B86>Bni
z0YdBbhCXLQ+GhVCG?&<fghabsYRA`S@+5JiW$*CGHAr)_UkvcD7P-z9l`qRZoCktx
z!Pa3)=%f9Mr89fsWQyXe0?PpM<#?b(ejQJj?8k%!8H7yEoXMenH+%O%FRb`=1EgsE
ze0kw+4?|<j2hE4zSeP(-1y-d{TTeXNk8JoN7cR9U)yb4a88;>ovWF-7){UN^;|=*+
zk7{8{YmpLG2-{hnGyUTIB!=6yX%%37lXMHdVjXpb*yj|q*nE_Q%V`lewl2coUUgM3
zgn3F0xi7r{5|-5zk^&muBRF&m=?oy4z{IZKaRp^&yP2z737+{<PJQf`!Fc?8h8Gc;
zJGFu80eyDTfRcwCO#R(hER-65Y0!l99Nhjr<7TC0)A2vlFGC~pSSEB6GL>M^J0x?L
zyqbr6pmI4YxTbA84B5P&q0@UazPZ7GJ!WbNgkiAhaY=RPnAp*wGpqrhPZx<~_ip{H
z5^Ph{uT&wATU1AgtMM0bZa!5-@jE(ni=?rL?xh$$Dp-Av8#2i-E}!eZS%crj)al*o
z2MzrUz+r;Dm1EV%4vx$nwm5hN>lmEx>_`u*%*k(ikd`}B{fQF#*kigoQ$|hcXI-y7
zko_cGIKYcHm}>3C<<G5FLw|mFNPNK{(uj=f_hchkx6mwb;Ag%$gvZZE_D|o6dOGB9
zP&+>d5F=H!STLj+5myLX+<|*dm>|ak)t+F8pWsDJ%vpk5?W7i0Iy&`T;EbFe(g^B-
zH)<@Py*i<e-U$Y(vG~3~HiJ0lOf)QIo*3pVvreA(K!0Ta(4}WsDWz_?B4>BxjtV()
zlt*fwqtN*3lO{+<mU=je`@bmby*`YrenI8V%I8&m-$CF@!FEP^1wa()g01t@=s9cK
z2tLDEBiMJ<B_u!lKY&<6u$aEoNej-F$`qyHZ>?@!cmSs7W$v%*ABnr3t^<)E9(tVS
z3KN`h#o+sSCVb3>gw;q^UU7uPNy2J3uM6==QC)Izv)75jI=M~S3Z}*7EV3@L)k#|m
zVjOu@DVml``UKq<T(Rln^Ab{IW`QzKpi3)I4yR#lKNZ9kw5Aqs+{0Pv(RxiP{ZLY`
z<a7!ZD&nY<KL&34e<BODnM@Q|Y)U<|0|ON<fu29SaEs&$r`+I%XZ6bwyiOe*D(F<Y
z69Q?1Mu~ggznVG!24Ry=u=7JLG_efc<6-wB-nr+BVyv`JRrGHKV{AOe<#kfzJ3yIJ
zWpyh>r$TP?Ic~xh6i^rYPM>|M-;H8t<?>`(RE<FR?*y;4S<bRnaI5rBylMeAkvCmy
z;I(TH{jX)QQRDAI#GsyyWvcnPcM#@8Wmssd-qp7bfXvyC^S0&aX23b#PXGNmFui*d
zQVTY)$RM0BXlm;J>j&oH!-ogy(cTa}23ymsj&Z3X3KMexEUJ}%R5?z<!lT9NHYTL!
z!qTEo_#L_S#Gx95TGvKi+oHfLC*l{j6au?e0zI}UVCf~^h=KW?G#ekJUWc@B3)S@%
z81XNg4U_yI_nB1SA2TV5S2=^baidRUdM5cM6T*iU-`OWuzNG@ToEicn=DJ~AChMBi
zJ%kf}MTb;k8(t&dhtEa_9st2t!VGja2b*J2$dd4%q6m5b(c`^v4+4J}O|>yOQ7}9e
zJbgLI&0w??t4@4{Pw$mOf#+d|&*|rU>(V5G-pn;WnYk|K=s@U0l&h5^2A-%&fGZ<`
z$f(N+UhYuPL`k543v>j@^YG)VOzazWj&$*0)GqDb>IZF6hlV&d4S49L;c@XkMFPF8
zs`J|f`&VaW`h7Pgjzfb{>pxO>WuR~Wrcx4Tkp)$B{5Irn^D$FZGBw=H_Lpgl&MzxB
zV%C?4`YOpe^XK}7tQ83;b|Inc+6k0GH9~Er4zv@_@=_W@*gHm5+7E8`09Pun4bYcE
zLWTT$2HF`*o)iDYK+6~*H`F)CsB}30%{6GxQCD9N)Qp0Cijc0+@}UP#>#oD5_K;V#
ztK?rnV~!fCs_8hzX*fKr1?FsyQw_@uPA>U6bWEI%&KGPSBj?TnrO2iq@!WE-<!1dR
zE$60$u`OMd$*@o|Dh$!hCzPP=T+3m5GIo|Dz8$Wu(j_!wC_u{cm3q{9>l6rMdu)_=
z4EAyqd0(Yp0hEjd?>V~ML}bj)jTuu<6<gK?c^%UrDoO&O?~lcCFPGbxQ@wuX{NLfG
zTxS$DYnD5eV8(@Jog{9wLMX`uv5R~3Qck4Q(Q+8~lk#f+qYR)D$3k=Qc8Fs^BTsg?
z5HDY27}WGlM44TYxN4l_=XXC-TbUNi-FHc~;<r;_AE}PkU*4S7<idRkkl!r6Yd3Av
z7?+8*BHz?6gt;%v>9W*WO?8}-2Uxm+(itq>z=)DRD7N{?HqhcLR-NM9ug)@R5x{)V
zIaQ(E<SjG3l_K>n3#{Bm^mJj8r*gN<^%jdc-8gz@XvhcTgP+Uwjk^g{#2w~N&ZU?9
z(D|i>wmz|yJ2}?WcrX;QHc~Cp{`g7g^}QQkuX&m2w!ZvkxKw+GRBAZ>1y8`iX9te|
zHHc^q2%KX{2+61QW@Fo`ms?7~gnoAV?`D;cvN?L^IeiPKYwtyNkk1;wTLc<fZ$Z)H
zapH;nJT`Om+nK1zneDT>!Rz{h!?y%u6ey`HpRAXgm(>64eWI=PA(d$)A}7j!*e<|-
zj4>k}*<OW=c~C8!ND{w21|Z#^kEDf_ncklOJ~`<7=l!gYm`ws(0#mE)B~)`@sI|7N
zb{7aICHF3cgg~PB{71}@=L%g)gOUDY(ZI0uJuq&6+t<XhWfheDxUVj_W?!5*IcB%4
zQehYgL9mKJPg7Dzi?*@C(dDTw+_sclWE09D@(99MT+U)F75LmYjoZw$S!!ETTi?2k
zipF8E6zRQN0mc<9J5$QgL*cY4a7s=#ArhQ;faX@P<5`xyY^`?5kY{x()_fIr?ABe(
zBKGMYp9=WzT@29KV||}ITfeW+Ev4jkCB$rSwOk?3VmCaSCVqv_&Nq}4zFVtZqN+{%
zJ`9=fRAu$dMNz<Fp4NRa4mH)G1?IR>MKY7H*)}@E%suKtGwIN;INIeuwhJD6j(@*&
z$~++Nvh2`TyD)W7<ImiVd<6VQquxudghEq+B71DUyFIIO;9(WqDDhk_|FJUL-iLU2
zgmKm1ST1pw9AO^pzwOgsv*s35B_$=jBGfy2yEUC&PBg2}KmX}U;=)BQ^Ghc!#V<c}
zG_4V+DDgLL<i5?9NWfZNNK24P;usOJ?`4#Oe@tHVD9<F9ds$qf1*HnpR2G5Y<t^ue
zV(g}5-SG6OI;2LdSB*PKk9<-hwf~nzusTpNW&?gL`Rf09*KV{Mwzam--g^e@tD}y9
z_?)xsG86=W44#7i7nPI|{D~^w{_B4(YyRZez+(0HLnh-ChiUwOed3-ya1p8VUwnY6
zWzBi3K@a@YzaQ-q+x}%sium`h2xzL8y|z|!sNjuuOYiXLYkz+pU>YRq0u*awtqE=Z
z1ir6Uw@1kTB!`au{it+m95I?L01b@dovOdw4ZjkRSVcV|8>AaH02LhSk=JwcA8Xw8
z_pfuKG4+BI;LESHyT|^Cbv+FK^dS8c=$gm<=|TGY{o5~NeELrh(m!6b-Eh~Rwx)kP
z)1yDHelD7NSQeW%q-<_tGj9ob8IgDx@lt?akpS)sz{m6VOEgwrvT<V-jp1K%{)Awu
z^ZBCx{<iFe3PU9BZn#23V%_|U?j?>%<nM<^KY;vXQG3M-fV2(CAfWAUB7D+DRp7|b
z#T;O==>fj6f4{-T;0;dN3){E<|1?U<!Ish5dPf#MbXnH1=afE(5LnzM`;T8?G6VeB
z#JE+E39vA7P4?0E+p<<4e*sX}EQhz#0%B(7lBeuGc7ugiAO=o%Uy-$GJOc<b1)&f0
zs=ci3GM1o{?%F{QVk+rdSfuwns{1jvTh^ib-3Q9npLF^`z}6`$=sVvIoI@w!E&X`t
zUxOsk4D^j`A8U&20IK_ri2b7N-I?kg&P6p3bAfGUwIbl>Eb$kufR;Us5>WOj=5fgd
zhNgaJaN4-L^@|T}ZP=fl1WqrBAt50akfMeGXLOQ)VOWK+{$u}z_AARY9O2m(!C5=9
zeB)2f{IGgBQNS{2&5rf)Mh<Nh^d^l3$3NAa^72a)c2nwZRS&)#SOzu-uaq1M{)ZjO
zeC|r<XLHv%!y)C`_|3nx0N|hPXZnwPVZ95GszA_;1PS<ORzY&E02BY^ngUWZ(%|5%
zw!hGA0P7txp3Y297YBixgIDroAW%K!VC2d&)2J(Bk<!V4J`coyl&)FPD=PFJuC^U@
zTLt%X%T-spGLYi)Eu7Kws?X$J&IPMEumN2p>Yl$4I!V6}B?<Ey9_lzfNrUG0V4=U`
z5+eqH2&mVb7fvFPU|rmspwX+>1D4l`KR)m=JHewz+uM_5VYWvU=D=6%X!Jaz8kluf
z)7^4t0$Su2A0V67H?jb3pr7`kr@Ici?EV@hsPJqGWmz|jJ>Jir;t`a;K~As$jyBg}
z->I~ZzDM7?alBKsL**9agIhq0*a6;E*bml#ea3*}>(&K=^+anN_I&RAHc22uJ<Za6
zQaGPd`OIpa1-8+j4yz2%K_)HN&hG$-5(OHAWb}y9wONj_hW8ziz4IzRrsfO$w6CbW
zO8Q}qE-F%>5m2(A+4Qa*ZGI?`V&I1>2mI6#dO@)7y;1KbaVr@%MWgt%p&VUGp3LDz
z<8oBWRSbC~A5J_$qb(qVgW6lVIHsSQe_ray;ZVj7+`3x+R;U6cpv+J#cz7%FC$}vy
zMB?K{d9O44fU0!$!*Wgvyi|9zaz^p_F*&EVX+a!dUVKliZ@$KF`bNu#pSl9jSs0_T
zxZ)Le%(<2_Ir&gFXv4>YhQcKax>kQx-uy8>8Op0VZA7`zwz4Bt(b3Rb21g01g2q_T
zuAl2+VXC8R0Qf8-w*YkmsuCFWKG`)F=oYf`c9#LN+)0=~SIw7ZsNbuxWeXvN3qoso
z2a5_qS5d3pg}%?{UH@FQs(X0VHo9Ggt1BVj@}ykID!a(^eoXD((3FXd7FKbxq@@#N
zyOeF!TM7!q{kyc7Vjt$8pDT_kmrmm-a<9347?F>EO@J5~JyeI_Qs*fSX7>b2s0+=4
zuHW1+xhymuuQ=3W6jkS0q>1-e9E=B_RSIx6K7$OOVX<4QMpoP2DC$$bIv(xxPUiSu
zi*(PoJfmLrYngdT+*X1E`z=xo?m5yIqo=8<**NhcGIH)8F!jFLPne3QD+8G7Y>bdx
zY?UZVY!UWv-+t&%m}(JYQjhBMw6C5JmQu41T3vVQ{pvnZosck#TL!j5)Y_+&sL77F
z@VOQGYPt;bF3BpFvN-Qowr+LvhYGHyrn9ropSs<n_d8}%n(lhhzf~$m^qzUY!+OWS
zLpZoGta&&LZ%Cdt{v9V$s0I&G%kCaJ25f#*6?m;e1**_hUN_M60VNBsT;&kM^PXJF
zfvAiv#N?Uf3=nYEc30x^pfg42Zp|hb&nRJP_w#Q9W%hGh`fL%zGAPW^tLUn%a%;d)
zF5m0(<U;t>>HIiE_z$0CieEPPoXc<)NGo5Z5v4a8tqa$J48h8<=}np_6?XbsqGSCY
zSNlAEhW9c?$nTLJ|F32(yQQnG{P#zccWo_%t0iV@B@7bHGVo|-JU>!(aaKb}jV%d3
z$OG=<>ikazV>F_Vm9$Y$LHRHH3BfEbvIPI!xI+8y>0h(X5>7UvKl7^~QAqDY^e~$S
z&bnl+?u)~jG*4F}B2|YAk&I?eTYKVCfd<IJb)dBA*(;}sf=6=N%+QsQ)oS16*%dIS
zdTTX$t5Hv&ZdF$GzbWb36?}a?nWl(neO7>PS=nUKHO!4KAu?`RqmOdW2*;<O|HB?3
zPn<q<8!%Crm(+uvyh=TODapyRLEq|v>&Pv5wOoHKV9S!#Rbd!ZoVZ!2cuXxwdFI|g
zk?KJ^u62vqK}_4Tdc5WMvtd0Ixj^ttuQW6H0VA^GZn$B-#;qusz<7F0#mh;Ri&U;E
zmyEdZ1LDC5-z?K0{E1BF*<WCD)eZprI|@skmkA`sJy1?vQv3r?=8($c?2opG9K;9|
z3EH@V^PbVQm(f=g-`#T7L~>l9RFxXU^~~aLB)*%M5N|RMhJVe{$gLIz7@TZ^O(yg%
zx{wByT+S*zvVMK;Cz$-`t5oFR?q6OyY>>(-$sVkgoy5`6yj}Vc1x9#;HdM@1<gl<p
z@RpmFPi;salZfD=08lfTsf)GTKeRW|yAnBhCFKQdfja3A&g$y)wCb^9^7gfLW_bI%
zHKn;~SwzPq{<(7l<6h#%$ZUF)-Qy&p;1IQO0nqPCl~Ipn#yWr9k1&<`ehM)7af8LL
z$5Z9)Xc`t=MSAOkgIQ)Rr?`R??|Us{EHJnG%T1QqwBG00@l3DhqKvm$NZ0pvttL=z
ziDMizxNYiOqrrgU74P0YyBcAe=Q!1p)vQ@ZH$kK@-sDGrQBeO}NQc0`1{)8zV85b1
z@2JEc!_PCpG3XA2+7ECNSal_5`K-_6&IKNVW=TwYqR#gJrVm_r(}Nh`5z{s9)DQ`L
zkn1SWU$62C^%#?v_j!9XK0GsgT@K2O@#MWjOQ34rrFk*jc^@P90$XM^3V=a5aX03k
zKfqucBrM&JP4=cBXgVhUB7=G{fDHN<=o8z~d_}T@etaPuw6m(3%u+6gQNKtHD^APa
zzmoq$HGgycyr-H4^eR${dl=N9`!8JQ*$H&#wnl{}*17(I0jF&Kw?q=LgF`whCU(&Z
z<@U<2xJz|E11AVrY$Dd20Qy$AU6HQ*<{FvLAvuK}Pe&c(27bIRAD1TDY^9KdPuzZF
zUhe|Kdo;ZIDk=83@wL3)x&_bheS7D%HPZ&I-_C{GWNs3X5)Hu;K9ZLMD!JgAh^)0W
zLBK~asciZp684!oS)^zZbQ9F>>+r6dYc%916ddY?v|1G#HyW5vC6{)f<|f5#jgyz~
zXR0<BnRD*HF1*+_F_|F(^<4@#P5{MfT?6qC3|xT0&RkzVAy+pgV8oChWY26~xGz@V
zv>!=Syk_(`m+&EoamuoAZIdzc)ToUW^Tf}psbAsi#cZ{OzC}%bnP3))Qb=7jVV#?<
z!5^vQ2%f0@$WOsYMn1`Mu}_Q;^j3ujKAs=mY;@naqo7WzubPr_d-=@(<<FDk5tk2#
zaXpyn73SwW|NY#%YkF56R|rp2s=SL}qtvwAIyo{|HMcl$OC>j0%i-_mP4~&w0?og)
z`^5A$Z`Viz1Rd#ikKsG^Tnvx$0H2@yO9MCLiQ=J^+cfUMATqBW4N63m&!_#^W)N2J
zdNunQ)1ys;TicK+UANIwtNSZbxSc5PoAA8cA}+sMp9Ll550lJ43%LsQ$zg{R3M|?^
zMKrEFSq&2mC8h{DSZZMo82y98{jatnIxqYmU=4;GYzFe~Ke(En(iXDEBL^t2%_}^=
z^kKXQna+OTnpaj^`lZ~w!T}2T>L6@p*@GH#zsbjebl4#fVdLfJZd;Y~AEQyfS3P<w
zw!1uebvGy6=87A-Lm69n-kk8K(}-l~q3;0oQ*l|=RC3kMQx(d5l&s#1RJU^sOh&`*
zk)Z<Y>j-@b^O`zIgN(V%_3E;%LR2mU#H)n+ItSa~*m9hjjh(Q$u}yq@KS?SprPH!J
zbFo-kOjek1La|q9h#IaQ_?4z%0JW`H<3zqpr8`hNMvMw}8?i4q`in|t<@%Pt#P{B{
zhaPGde<vhk6T8L?-Xik-iVh(^fQ(|Xh;Qh~ewC#!$>?{N08Qp^-1^}VX^3*<%fb6{
zTkxh<R&VNKw7vE~Ylh9tVO2(}@ff-R85mx1&UX2SYy65p1=&kOGiok=ppM6H3*Cbr
zq1E(jv}?!icF`j3cnF(2e0#h<AEem#J_5BcCmAX)yaxL5M#?<TF~o_?dtFMCC?Z%C
z@gqiJCBrjRH2LS~Rv76kxtp1#^8iXz_Zz#Q=O%%3rNH48quZ;<TR&RVT$r+G@25W0
zgU)KL>DzIO^ZXsgw~@tWP*wjbOYY=^_RU*=9OxRY0Gih$P7IGmKIl#?1!55tnt<ON
zSp{dw;(C+?EeK_1dk2^{!}8G*&?50Jl5HYr_>RMas&QN{{%p6W<ijjfTag(M$=MJ)
z%KVG!+H72<VVi;ZhnouO3@#V=OAhi6GxCfzC8suxI6zJmWy}-LS<V+$K;Xnvk(C(S
zUP=%PW*(I_W@t;G{+rJUzYlTOW(IpLCKF`fA|}=S%8H&9s1fzphfi~97#^7Va{1kh
zb~}KF>NuZ?_>h73XJ8S4U7m?g@~vn+mhVb4iVhhhV<aDTH^)A7yB(I#eXC|7Ud}s_
zV`V*&c@es=@Z+kvMy_vAi=$vj(0y}z0G}uC<pprP;|}IqI&35#*4DGK%U{BUzr!zP
z5{0Z#4))e=<CBE5>*sKpbLU{x3%V}n%IqBc`7Q%wRnVR$2PL7{m|26GD}&t+A)5~s
zi`C!$jr_PU0N6|REY)P=vE4D+-OA(<<1}+-VGU~cqnc5eZma(Bst3A6P#g05COCvv
z({tRWA0>^f>tE^@84?Dq^bQ-#eIu03rN7hW7%Bk-R6}JGDxI<+dgPiWREQl0&Ew?m
zpMyq1h{g%R#n4msW3u%t(>!p*brkwdjjc|`W%mXhk1c-I>YTGKH`@-_Mfx>I5kx4z
zd;6Tpa%g<r<~pq^%J?MXLk<r4{YLBC;m7*?;!f9SX=*?}nOBbr83Z@u-&J`8bOS*t
zt_I~3N)@8fZ!ja%%h_al5dSxxTJL`z`556*em-Qfs{<U4eUj0jOZWfFjmd<`LAMG>
zHbiz2A(wTV8wzDMIeBK?x<0QWZprjIxC@RD`NmWE9pn~ae*nKVZ3!OP{Jh_!a`@R@
zJxK_HS8F*t<esrkckRkiV8NbmsrVbHiK4t)qJ_x#bOQSnxy&1Snnf2}qrHQ9k27<q
ztQ8>aO9tZPGS8VFcqXcCuV+jProvE^SKE91n3$6ps2zVa7HoffLLGLRrEO`25j>cj
z<NGCE@X*lVjc+dqSC-u{S7vuPfno4xY859$Y}64fGfvNGt%k)k%eoL!k;)V5$Ea*C
zN<IRelCxlN!s!Fd$HOvPvV|=qQDK-@V1zBA=TBo_{x)(WgtUWzh?BKxn;?7~v=~i$
zmZ<43QGrk^MLR#B^XdUJt~!Gxg5nKGyP8MYSSe(s&T$VQ!jCy#arF^&MUuwt1zmO<
zhNTM$O?40s_D>ogBqZ9#LB%e2Ne??WOI9hbj^l3T&Lvhjr6KPj8kW>Sk6iIBU0L~L
zQ$Zb1why*E>DscF`Til*rI}SX{uU9mny~vzQmqFzNmK0@_F8ctO=D_)r!<lYQ%xT}
z-2JV}FBFo$Xvw%5mYy8zhgy^z3Q$4ijfYLnG@6K!foRzo0J$r$!Ak(LF~7~b8Pwt<
z7O@Laa+IQIUyk}$#g~vc0Lq-$u)?304W7%4?~@!svVUp8!G|hM1;-W4+<sp6jdFGR
zH8Mi0x+4rTd{)OfX*c${FfWuZ7$FDA(u(QMN{3cjk`t!?Uf9^yS@T-cK}b-B0ONU8
zHR4ayrLs4yKwO>4Z~l(j=Si<QmA_Aq8B-3=cV^!RfuJ;0KAii|&%(h-4-@_%xM@Y`
zFof=RptI+unGp(T*5uHytPS1_aKaKdCwQGbYqU_n5(o8=9zW3L{bo59DrH{Ltz+Cx
z!+(f2+979fPueGcLv=<qYF=hd9g-k4U8d)T6z=D+!Q4N&*BszpZWa!<{|p5?`!8D^
zbgvE=X&y>Cq*nw=s{vFbW^aebL?<&&g0G@LnTaz)t%vGzfuqhhwu%$WQLr@KWxlw;
z-_EsI5R5ZitIbFZDkv=@El(S4V?tqOXIa3Xm-KRnS462oD8$<ep|CLiZ&KC;B%E^`
zR3;*fxRM-=ka&uCQi#`xE;qkeKiAoF^rr-Pa1rU^Y!a3x!E2%V<lbY}6jLDyGHmW_
zvF=sp=mb+x=byc#pkv`2wA`t<Y(45uiYtMrnz>2nroxJ!&^lswx6^YECA+@R@un?(
z)7HOSh*;e%No&T%fz&#ez)0UE%c>6T0<FB4xpn6+f+`D?lF|L8(ZiCC8K*n3^(3Eb
zAqB?=r4!TELm^Sx?_({)N^nDuB2_98x`ubSut&Ykt_^`;6&J_?QX;_s>=H-$X33zm
zge6S^X$qNeVt6fxyy^gfS1;Zo9q70Gqk2Nc-lBiqJR<LssNxPnY6=8F>c#rEgXSn>
zT{CLKNXFKNeFg1@3FEoF8udXfhq9%bGKX&fdpqND&_;z&mvQe3lw+@HutncU`Fpp$
z(YS(4pV%%=0n7LuL<&mAPfi;uA>p9&5c=QfPFU=)oedYx)+_zF1d#Pe@PYHZkNgI1
zH$2>R?_PL6Pg%&<0S#vt{+8rboxC6*xDbaZQ-QWA9TYCE!*K1f5M8eL&_wP3psam*
z5t&jaR^BGyA9u%uh8$-wic~jiY=8e?hQR_Wp9L$_6w??bHq^o2zrG6cP+X8!Y}9ck
zhQ9ZkV-i~MOc6f)KCUJStx<a!)N;$L>O&-QBr5u1UnHSL{wn)U;&OE}u)m@e8v9p(
z4e49>CIff$a2^9zN}K*qiW~@e=1Sm(XRLb0DL<mcK~Lub!(w?+Pane5OTrdZ{&6El
zww>#sH(u2pIKBEo^Wiwl66xxCRP$<DP+kG)A{Sp28GmOUgh1XMHui1uI`J@aO?arF
z355?dDR+1c<D1Gs3i2QhW<KfY?H@A|&oewuYcS>S7H{lN#11dQIAE&{fUSh2vi!>%
z-hmz|bGLjq2`irVQ8UKSZv`09@u<~wCr8DA9}5dVM5%}Eft3e)vpC(P-IM*7A5Nw&
zO~oJEvHMba9R7*dz>~K9eLY@aPgOC~DB6z8zXT3}=9U8wAov27bv_ZPVmpx|USX*4
zg<lF<N|u#)EcDY3>FUN}=WnkH!hANYC~ySV9*~)*Aa<P=6rhy^y+w1tyOn@U4)&uF
z^AxghTy}|PN?@Bq!0?||%h`+S@@duY<D_iP01aG9Uee~Z&u^VfX}r$R2qgN=E?AWT
ze;4(QDOAeY9C`&<O@!<fdJ&(#SI=Qd?O+0c{JZb59UUE5XX@5k#+HmXB@o9pCM#5x
zK>qqO_siNL5Ey}r4<ZCq{K|#A?tcn!<RCJ)2Y(_mUy&iz^4iAuY^$=<-+^5d<gsb?
zJ+cF$;*IKxPM}F0WX$HnFp~B)^{8S0pLooxU%hvu9#$tpLtY%b-Zqy9FPZRDH|4^D
za6uTc-3;zL%~%OFB*))3K`vmi>=2kWNNhwoRNE+lUk4vT+I8^Esbhmwm88x4KV=Pn
z9%kE3KtVD5;`#IE_vkvqVA^Yb=)sZ0(nzZT!Pb+LAwUTGH$B<EzwCYp>Da50!yfnl
z4X?y@!9A{qK-zEqpYX_kp>2S9t&TRlc^NJbSkC|GA_U_heeq|yoKPsRlK%aW$pEm;
zn^68hnFD$d-qS~J{0oPzJ@}tO{Qe>#;43gv{;wf^|Nc9PQAa^U?Sq5h5&%5l|9F{*
zD<^(BH~;@aw5<O%$PWYp{{2SmU+(!YDSp83{LgQ9{`UyKKkL?<FYSig{uSYO_rJZ1
zZHd^3L`@cdJYWTXKWr=jN_(hSe(eUpsDHm+W565m)64z~`2>RpxPbpMS^RwV|MtYW
zjuC8WY0pbRh0eRlm%e~xCA*D}soGKyY<qjMoW!g@y~cj4!?Wf;vvL1^5A8qLl|+S#
z&%!%_D~~=1T(Ej<2rd=9JM4=9!In2jzwG`#kPM+2UafK_O3~ICAjyD9w%=rac5VRC
z(yHUE?fXN8E;+nf1BmFoRGD4dVULlIPs$17V9%cf)J*{>!|9m0JD8f1jBn}f`SjRY
zW3cdJQ=-}5rDc=oli);W|FAvr^&)#*!FVeJtb~LiaD$kP3Es%c&(Htj6Sy?$q0LaF
zS566+0h3-~o)&g6Ht=mEgEL<nCHfiN{|7jiACK10xhuoP#Z^<P6YPK#%;I)--55RU
zvEh@TmJ}3~HVk2n5?xVpJGxTaeoVcNTAi$2i!nAz9BejX`SsT?y>#_g><>K#a@yK`
zRNly>Kh{^_S-G`)9c)>NV5?6A-&kq&Vl;9R5rKE$k|^t(q3Y^4+er{!jS;^jq8i|X
z6Pz2ss(>O*Y2bx(`ZT)Z@c{ziVI5_@`b1m{4|HY5qmOyfq1LadJ3umFj&&~mV(c3H
zp}Jej?v^N@Lf~Qq30jvpuACZy%r10ot?Fd$LX{uGsTa7FJOIl}QJSy##5uX<<maDL
zwzP{DkZm6F?A4x(hrml%J**L%!Zk6S)C-@U@szcw<=fh5YCccP-OA-vUU=;2>Z<D`
z@`38nPtWX}<Ah#w9DZhqV_$1I%OcG?U(DJ{KA?yZJj`xp&)Tb%Wi001&$<h6fzfQ1
zLGo=CKij(FU<RDYIx0Fb_$e4fgJG;u&O0ZKmqF|wAq(*{(mA<vWOd7x-d<IBcBz^!
zktn;R>T1>LyPo9RnKUol#K#m4bn%~E%~KJN(8?OCE$<n8?-_b>q~|yByvM)6cq8Vb
z&zI6!wR|j{5<Y`pvu`Uio>MFM;^JtiYD6Wj*1dCTsQUHmr2VfU4+6%SyA@4mj*MQr
zv*S>jZd6oMJosGtnoHoorUO&dRXn=1(y&{a6G;Zq8UY{S+l|Cp2inKM!<nGww%oq8
zUbNiqJB5kBr6!zbWz+^`RL;y*PUf<6k|QnC;PWC?jmKOs$5lY>55j4>>GE|!_UTDw
zGgobD;?yft5csd2Ldu_{Vp}MeCNQH0?n0SU;{8%XMkn7&&}79VJ->T&#@-0`5W4XK
z<XsLjcZ~h=ey32ywI>tinLS}7F#ZSRLs=O(H-8{=O969Q!Bb_iu;}n8_DHMbkWrgQ
zRu=VrZSAn~`gGRA$@Zj4Al7<FAFeTK<mf?nJNlft5b*{9$eFx~-^v9LA_;O*e)arT
zY%Q-=zPA7Nm1mG(N+2_i!H)2GdAz0UQ^tEcaPysvGqxyccyum<IQ8PJ>G`4MJrC^!
z>T5yJs0FXNales<X&6b57`gBI&ijraa&*8|b}&>bx;}zlw^hqoQrOXo{KIRS-RM9-
zZaqkr=0aB0p<L(KU7!f?9Ho`Pi40X3_7U|I(m%9UNb%BgWis$+cZ7$!@@$vRmE0Zr
zZ3w%`yybuG)r1m3AY?IveqhjQg}f};px9HcQ9b9`F!vOu(O%Lln={Xn%>hm7?YeXi
z1jAcx>8GpO(s|>wJuhV+fbX}l1V(YzFHPL%W`AwX6Ck{PR^Ald>MHFy*j*B4_~c-`
z>130pz45u|FT1;+V>}}k8@%9eLK{#AT}>0bw!)(oOh(-&o7t0|`o4P!a*5}hdre^{
zb<h-&?^BX>uR==hnZnzKt`nsd4Btl^+{>#kJM4;Z%Fhp4IlLSNfw{9UBmi)8Kb+0M
zsdFDDm|&b;QW$azt)Vy!Sp>5glW(-7O1h4j@6J`(-gRavoYV>;Ouq#_sw<7&KE{zA
zaGb2DH|W}Rr)7?CAxi^-j(s;$FaP~{vn0tJ(Qhcv!(*NBOvf!fa+aQTeO~S_EdZdB
z<%q_zlLbSjv~%ZFd;`E#cG2KmMV)#V?msy)lAEO9nl99@dF9B=ZROvHVD*Lwb@4~9
zgUXH+e)?pUF7@qP7WJIVmU{*MwB%H>?ZW+0NK*DW|KxGSQ9_+gvCBC5uu=L4kE4j8
zydQ<c+xIFE1W#y{7iQu0MBVb6PFwR~&?aJ8m;H$CCd4D6THTK|U5;rp*&3IbuY8T5
zn2QEfJld3Zg|h=D)L1}B;U+OEpTF5NG?kr~dx`bZ?@SX}p&s_8HG^4pdCo)BWK%5N
zrvZfARvNDLnv+avDs9Ucus#_;Pu0Ks0$lL}cAb(_c7VZ$F`Nm7C5T%Zw|o3H^=pAA
z>JUL1itjV`CL_YOQe9gQ#Pbi9X9O&1A}hdg@X#Q>emR*T6u#qy<>pcX)>cfMhh_g!
zyH76NljjtQ*>v^%>yp(bu1CpB4{9iH2>hYa_Y^^xsKhex#);zsn)>gb8}ztOFRTbS
zq%VEH<;!@@e&QL)CdBcl`>ua@qWT&{v)~SF^OXkagkPkVRoB_{U`l3h51;yQ1I$3^
zLf$KHd5Y9WoMMQR0aP(w+7jN>dv+B2&4cghwdi^;&!M&RVT<~p6G44XJpIU^`pEi+
zyiY*ykO;CD_|LmWrrG4!gpnNmV^TD$Xcu9jw|$n{V{(YqLX-0Yq`S-{Qme(@3~Son
z<QS*Dm=`Ifxt%Xbk1A$;CE{=HpmqF!X<R27`VHK0JQwHI<{%`Ts{A>PRDNN4-$@=v
zr5@N4hi567xGgqIOMThsG&9$#Ug^=o+NQ@iSPa$g%~>6Rke0^ALsRT1h8M@?)Y!dh
zru*Q}y+tN9UB3DEZM3xY-nF&;u?_`|VEon0Y|wszIT&z{K}}3NyL=_UD5`Q3H9+WD
zM&FNYCxmv0up^S#br$yMAln?M_j1*8d%9?cbVrfVoQ%TWG+VU8;3mIo=fz$Erecr!
zo{7YHwK1_4Yk}Q8GP}(zMMXL&565FymApp1QlbMkoGD-AJGy654zx{wOlFKd>Fs!t
z7Ovkf=(}mvdD!FAt1FXB!Eb{nI^)+4jV&F;&G%fBZ4Z&$(IMyBe$hL|!eu;QlwfI5
zJ6^2aRXLr<%I<62bpdX*jpzFIr^-N5LQqt7vh-XSJ#c{L+aqc+(z-YD%IeK+%Zn`{
zxG|?e+wKdSjG|ze5!&1l2X6X-nb$rqKk2-dZt2oi{q!0#=fdl!Iu?qPj-HP;=E+r{
zq5aBEsY|ys)u%*Qu$PzVe@xs)xk(Tl<}!6jD1&pw;w##?<XI~F{viJow5?3k*@iMX
z2g$=my4I|iPyLcpp{1j(%eXo=Ou|}Jd!YB2!r7rxX~l%f)rQtsPo1o2LB0&e(OulQ
z0CO3i7ju<xUy&s#Pg*ZG&f0g}td?`NTb(1pYTQ)!1#G~|zGrwfb_H)P8!ZzXRTN4I
zJSR_gaihcD?YxzCqH`a8H%^n0Fsa&AmEJQiOHDfDP5B+CDIR<-y~#0M(9`C}MDC_<
zyd59BjNl(X<t)s!Fac9F!gF3Q-WX+OM{Baw9q@Vfb-RvPSMXqIALGqwEf>GewW*9?
zi`!lPZ&+RckHeN4{2BE-L|phZ)*^V7icBf)HU3Pj&C#}U`u+u<7}0KPM=j+v+noXM
z5eI_3SC60A_D9hIJ{R4`8v7=`_|=_8NpH7&_aVC2AV;_|da2deTqtf#-~glZMVp2U
z;{YO6d05aL)}v>><ND4MH_Uv*nx8+ZP6!>=@kzLNbz?k64NF(res*1-_;vn6)Wp?1
z(RA36;)$M;yT{u0)HZ1CiO-x(xIEkx&>IB~S<Ssg_41AGca?A8H@dglMq~&jx(XLk
z>TM#@t0@#vJNj(fG)nzN{RBmphlC%$(SO?RI7sfzdJ0)bX{rZ}trw4X@(te@+LXEd
z@%9Oq<B1ZxY5V+^Ytt`_IdGZtuOx_`>h1LEeeNc?uWRJ~l9rjbaGBo4(fGS$R=Y@t
zP%Pm_jy1WaOWCz|SjH|ehs`fKwAa+TyRR=zs_HnO8Nc@V0+g%hkddN$18Sf9+dCE6
zp^5f;dHXJFnQ^v8msn<~DtDs|h41FEh{KnTP5<6X`=L{Th{x(Q+P#(gP0|RbQ_U6s
zTvv(07xKO6SqFxYL~<t8TDc0SQZ^7@y{f9+v{02U-77}(kAoF*np76@d?Bc-UzQ4^
zSRE+QNfLWGc)T|L7BPq2(q5a@adMuBWF|UOT=pl8KPAQR&z+4Z-)qi)Py}cB`*@@U
zyYtwUujd_3zVs5TJZmT*)aG@pv;j8gC)yQJ-$G4chDP|4BDnIY$Km9zbzM1T4AhCJ
zbWQ$F1(*3{R)~9cY}3TKhTqbB@6$}fck?kb?)$Z?Kbr`Rv>jHPtkUw|^K>BZ+Ck4!
zna`hMvOdv4j@G#i-h-NB*wM;}?(4RLsN8FJuWVGT_UY@b7c1MChQ%fL=fpnS+b~kQ
zbO`=wRb&V0ck;l}uivMXI8%+d3s)_AS-SdD1v-@$T&L{V>DcG~X)LnxR={XHZ!vJk
zQ-a=BGR|AN)pLc#%#=64F1QBVeT{o3asJk!Dp=WMaL)%#tSvbv(hq(}U%^~<cK5F@
zSmda&iG;14NquQm*q%Pio<NHies{{c^86)dY8P>u`kQ*nk+JE5_a}1oPei(<w8&mA
zIOa?CHw}YOMcVG!-~6m3>7)B={Il|ySVGm-&YSRBUB%LnnSmXLyXt)uYtNQ>Sik(-
z7;LYS^gUT=UZ@2zGH;vSWpW)~pSjaI0<(!3DSS|-T-IwY`ZkTeqcAnL@MOrumq&Hk
zl{qh-C?BsDjSoqgBGrs9eg11^rFT3+zoDL{UiPh4I9{M_RzSPD^TgBJTB%1O>R+hs
z9J-eBV$*8-$wiSOX^yuV*0s3#UWmT^?AOC1YN7NaR`c68ejRRz5asc8+cvY$WTxfn
z%6Apo<cC~X2UDnJM>W*VB|)Sb_bOWX!tIyJ-8y#n-a6B63P}_MZ75nj&ZKL<m~gFQ
z%VVVm)V3uH7>M*+EOHqQigmtFXsdj0F_ZBysdNoiR9t!w7eU!cF1M}SSZXszi!F6k
zzKeRc+hHkWVLnIK=AG1>&-Sv#nri_i+X#2g3=J>0i=;G>hNY89xp0@1oO98LuuHwT
z2ZO=)Dxe<UKlnP&{VGepT7xN2*<=gIPJP_vK}ntSVvCVtl0~EJ+j;G~l0|d7zRkf@
z?OhehRx>W}sBJhTmC!3@WSk*L_9~>LE1(S7Iq$6r3yq@qZIlaO)?TsMn=NINBl#k;
ziy8_|LW=CrD}j@Rrv58$eIIOgHq`n_55tUvRUM&n84ikv+ju)D*2F;K+l=NMcAr8M
zQGPCRe7~;1=PFVQRNMEHUfi6n+=RWme$cRq$H&Ru>;XfHg9W6l&M+{rI3H`6441_v
zNrN>-DoZzDD~m5mBpD~_y(p<u!4oezb1df^>0>_&1{w#hbya>J+GCDU!(DtHooUd3
zN;#GKT4UcN`tfDla5g=n`S%O!>CL~S)oVJI2;Z7UNY5+pOra2VRaPsf`Orqx(mX4+
zIP<UeTC75%)^;5Qm6r2z&Rz;JtHafG=s1&ICdAGn$9ZM-)YRI{rlW^WEN&#^nj%S(
zJE(=2sRRjc{zg)s?G}XcC2Y&R0S0BCs|rr2Gpvd>K@#!n*yY7_)@il3pPrY*66fW%
z*ux<PcAj@l@V%ZQn7j^|2C8Hs9NRCfFjaR^(opDBzwQNB@G8vLk?oCkFi8{fxXYvQ
ztmx)76mHn5{<Qg9+Rb;Ndlkgz)r4^MonDFzcbSCABbR<3P;H&yj@q)Cy21l5d^NOn
z;q@uF;8Lqh34UjTLxVDvbL<A1OamnB$Ey>ToqpoydA^?;dN!vPU5uZwZR+xtvEvQB
zSZt{X-!HqbCBXZ7kZ(_FZ{GN`CVr2o9}SYC2{Y|HX1wbJPscEl)$os3d#dbx=#^ll
z*eVKUJ0mM)Pf#oG-z8rjCB%_Tc`n-E?7Pyv2KeE<|I<2Aox$0a9osTIVf-FEYmITD
zMgG!}Zf#|P5;rL|G+^--4KpR2MtL)TU;ftf<muyES3*6^+$pzAMP7+1Bq&ZSPbKcP
z$TA&v_nf_q!+46XO}vYC#n0pzO}G<YnWhgoqW4EfPAFc7bW2+4`IZj3I->J!79_O>
z6w>1M*x0EOtC#qUHL`u4-Keo2UwVzPcpn|x;xCH+dxdy=<g@?ow*F#AseN~n1{-74
zH*BvS5Qc_q+qR}#eb8sW_!GOaBOgBd3t0DFBfVS|h5-fScJH;r`6e%Wo}E(jSy_nr
zVg*}w_MKt{mfmmSMy6N^Ed=p$<2oUCO`sQRGPFca554iu5w=#kVNsiKPCwowEL@^G
zuF+TEg;K_z2fO{s&mUGMy*v2o|CRTZVNq>u*hgtl1d)&q34x&`hY}@32@ym(rC|W+
z8af04i%?2X;^@#ZL&E@~42|^AG2#%?(%%~2^XB>g{rJ8=`{H71@4fbVo@d?nz3%7H
zR+~(8Dck+g7H^TNgQpG|Hc1a9=Jt|GAH6+d4;r*z&u${>SsQXO8Igg|bwUT9OXE-5
zqD+bJs4BK=W4YW*<lQ<n)0U?$lJ$JHEi_pp%k@2&BlSANvMq=6(dg5vpPZ~C+$D2h
z%FgVr6NPlNw64k0+2VbWaW}R8W;aC}xPnXfVZjMc7&jC5R_}CZUYY1T8Dhf0T(a^a
z-hSQ1xcT`0ZI*<|cc_B^{eYSrN6BQ-F{gc%0NTt-O6027O78L#eM`#?sJ--XRz+%a
zK)gFxvVZVOFL2$?NYV^&4Ox?QUS^YhanD$_^MUhRDkB-kRD){P(H*NdvLm&$+HBXc
z=ieU%<f3%mi!t@wW_F-`&ghATG$S++KC`fdG)Xoerzu`Wi_Ajio-vY11XJBYzvqph
zp>x}zXObOtOS_&WLA3mlBbi3AB3KibG~-bh?1PN;wgZSrlBenM<UWH@*)26!Z+rwA
zVpBv1o68p+NpG?&fe7Dzdva<w0c48_`D<Am!oqO~O*`*rZzp$pf4TU#2^zVVz=FBb
zB=l+|1GGQpC~D|bLE)Jm_p-kRX-tdeU%MMN$DU93n)GeuW2<ZCFFo)wVdfe+GetY{
zhcA<8d5LAeKi)RS-ejJWhOt0f<?NY9TROh!zuj3J@FTjQ^Tm@v&w43LY=Ge5qDFxP
zWi^lROfMznIYBo<IsIKwF3vJr5-0fsWxZ)!O8Ya~R6U=8hn=L))@T~5xKJ-eS|H#t
zY2Tw<@)2|e84witJw?H69_59#8Ux>_pt*o~Dx}j7(G?|8HO2gKho2K#UWCF~{}fEo
z_3V2*SW--%v?jVZlrT}{UUt10ZA>#n<xhKRuJ$cadV8qW-m*6z3`F#o%kDxBiq2*m
zP~^x94dfV>HFp`Y2=_ml71wh{5gW4Y5Ps~SaWoSST3kjv`*vY6lDbTwTy}-|j#nZl
z>0oUvNo;6y{&n5dBS??bQd`Rv2i}WKLHOB5`b<p923Jk)4UyzvwPD)Vgn~Ic5u-5@
z_!O#>y^&ZZ?KJW`tAEK56MwEmjNOAWcB-J4U#p?=6FY)SROV9uq@#fu7c?`tXn_Z+
z{hOF>^lIO}bGQe-emId1HqH@{%h8TxPJ$XfFN0c5zWele#^rvQNVx#tSy)*Y@(-Um
z4zg0&4_;^G5j}#~L6K)SJnlksN`!kcx<OXGCcPxM_FC<|YNB2WG{lW_LcN`=&)noL
zv~w*h)Y5SszgyO0l^pKQIB#5&=Qac#yi&O#Hs^b&jBsSzfE7uxDC9~DV5jAS>gBxl
z5CP5uCAU~H?Q#j)dkJMM3QFj;!tC#3UhBT5enz-DSz`65&qWd!EE;FlJ5O{0s`RkD
zA|zm`$<T==tdbn**XugnXG>**2){1cnv97=pxp-Lw0N-GWwx3MkEhNFmGFGQ0rOSy
z*Cr^Rvw-LGj2yWPMtmZIAsXQ>R2Kf$_+Q`ob@M$$)ihLJ`{UbcIg9DMz6z}?$IJ0W
z%rOf2neKm1BSz?j(C{~#&TxC!7$0q)4k3L0%%R4c5}Oas-+EK~c%Q??SM({1tz~+<
z;IN;fLZcIlC92~*5)-!3JwV6bLsA;-a7LF?W!Y|Fc8v`4+(5na7q9$;5mtRT;}c7o
z%+KgaR0Cg1WXNg{C-$WSB3k|sew|+L{Dq4i%QD*wchU+yGQ2O~0&jFx2VRddWiCJo
zXv=T-jRf9(m8~#;en|Hp-GVw8kxx=sN6t-vMVd5QYg|mz_m(?f-bvlH0M+gc*f}V=
zDDO7D%>Wz991=#mjkvUD5%FWU=Hl<Eg<ccBb-{BzD{WapeJSy95BL2Xv?JtEmGM@e
zVoyUP+${6cBEn~Z3K_gJFwhg{V1|L>g)C9p`k_wi+YR{ZJxY<I_HU2)P}*;|a3{hs
zA8@1rjf*euO}x(8UQSb9nGjiKesb-1)<cLySows}zf(q5hbqZ7H+_lc#8mhBYT^ma
z5a3|PcFp((=<eepuZImK{^s6vz$Y1sb@_I~@a6HL&FfH$%BBU`P;5Ocl)Tf(LPAs^
zf+frBxG<a6>U~K*%7wE>YJOQezwN?)_czOlt;e-9gJ$}z4PJ0Iy&>`_ir2mKuTF3;
zN{gTo4-{_CM@<$5KQ2xyT3Fnij&pfs-$)HWqqqi&`0!v2amQYnd5X*YSnkU<19zJt
zo5%AtW3^{X{#9PI=2;rlr25v^7Hh1}cGm1^VJl?5+c@Z>uNN*{q(tg<ZecDzBs01)
z)a0PZ`MK^SYB*o_bqB<a)Im+l;%dViH5BhzYd~Dqr^oR3UAF=s!J6oP?LE<dQ58#&
z#={e41IHQNvV6nxt1D4<&zU!2*$ar*2B>Ix<u|tQeJjz7uk|sBm1Ahhj`EVRlNbu5
ztur<9?)LHok$vY=hB-+A&|v;6OlXj_Sj#g6Tkn)LxiQuPKi8UaQhR0;M;fh5Y=~vA
zKkE~oc2gT++f8IJ`*nzhz4S;hwY#O;=OcFPgPGGpLjtZ@O))Qa*abaNJo`ufQb$G8
zvN*e4oiPqA``(bSHK>O!4*Cim{c=im9n7c}1xin)pH4StWty*a`bN0+Pe}hzHbi<e
zd?-g1%iVWKbyI%)LpK{1*ecz(88{cVfuOQJy>W&wyP8offH|X=zmyT9-@_*3%RYLE
zk<pAMIsKu2`oc);j!~_SN#$s8lMOP9g+b`yo}AU-p&|NOr)`N@s%Ln&LV1%16-o~7
zJO44F-uBLf=mBLNQ_KemD1%$E8}HB0V3uVF%t?!sYA$^d#J<GwPNE?<g=mQh4YVdm
zb0Vps>YF|*gB{XnM^)}?{nrWeZJCKc(0COM_&YQyKm$(#G{M9PKYYjYA}B{)%&VLj
zQpO4}BJIGfxN3S1Nno+8?A1JQKUs)O?EEX7T-Nep7I2VXOrQpIQ5Bm1h?*`YZ?7+w
ztmNtY2F^0=(Gqj2gXIJ5#=77_NDzP`-+H}OL-hnEhKXX&mt<Wh!ciFQ;pDWv*xzq`
z4$8(y<72kNTpkMN{sx8u4rMn^H6DNSdY@jm8EyJ5@(;bwen&rkXSSY@Y(K^PDTlE}
z2EUmow^s&)Me2}(%$IF8Kddz*S~IeRwgCn(T+dzheb&4BNeb(YWpzJuhoW|jCJy(>
zQ9Fp+WBIluG8;y3kJwB+@hh&kX7jwh^jwUw+XqykL$WqA6qQc(?WwV~*h}_LrttUK
zIUQ9bMYq?Zi*~IahuHHM``K_}7CMuWYyQxN!PorwlhmpvCbZf4A-S)Wt>(AadL9|D
zrTn=1@)|Z~>3upOud#0=qNJU!mk@D9(Qrdl#QOs-J`O8tLkdQN<$&EZKJH_1!oaCd
z#K*{Avz#4(-W%KJ2x+{@0s%#|r{gI1V1*(PgC^Y-*!!fV(&SG>4b49jdwp9~j62AY
zRgKrlW^M;h4yJZ<V<mpkiz>re-Qc*F(2v5wpLo)rxHfTYmDP|;j8;WP<P{H5%RU01
ziFV|mJp<d-=zS0`sgV6{TKd+3(=)1lp&reNE`3UbdQ(AJ`=!TGXMWHF3S{fac{GF}
zYrUBc#*xh-g0<OwDh7Qr#D$+vN6Eb1N>fAG%|so6_e@@+K$7Q)^w3fHMX&S6TjMX)
z)G7VqU|_6qGn|uNVdYEd2~T+3Yx}LdqgGdg61m>WJkn|)0%}AluRqGPh{9+UZ^vA?
zZp8F+5Zz;VJxN>9R*{8o@Nm93NRB{iybxXIyocnFAmFv|k<gD>$_(LN@i;#J{TG3F
z7~?sbdymX6=E#l*TclI%Rfdu$rd`UmUT3cU(#!8+xoGO_c0BCfUB&Pr^w7DOo_m~O
z|7&+BrjEAK1tC=;&u;Tw+r3Z9JY#SFET&sL)UpW!+rS+R+0}QS!8c8h@bmL~7;Js$
zFYlBrA%;1+vLv6>Mo&9oNn#x-6RMdddFsNCNZH>rarc!PN-a!XD=EVkHFz^@b80Uf
z-`+7ymDLtUc}a2SxtrGVb!>qgDVweLpg1Et?0eZa&%`xwr&(X=So>*hF;>NGe>Kt7
zT=~kwaoNbndMe!UrY)AjR&VJKDAgNA*7CTM1?#y4(I!V;sE3kAZos%*8huwvLAJmB
z;SmKI+QpEzA!#QX4Kk|^DB6unU%d0ctG7MSh}&_+tBV#YChG-w9oaW$lJ#nMOd<|&
zP1`e_o_&dkBWg;d86CM!Q?>Pdl=jDF$^C%qKR^O(Td)2=NPrIx?rjR|Y-49-;Rm&R
zW2Kg-lB2$6jr@wSpqT7zWHe+{>Xu_^P-ZQ;5gptg-l0?^q{<QMp*k3d{q};ti?T6r
zw_>CcrkGk|y}fui8=t5^VqQVg=Q85Qda%g+Av@%gNxN*#?#5b?E#Fj-CO$-*Cj8Re
zBn4dapNQ*Li`R1%%A0Uc-qnJ8UwAA%eGK9q?tq#*J=x|5@5<Cz_P)AVM%9(ka6ln)
zsmirvP!cHs7<4v>Sl76Hb1Jsqth*elii%$62sQ+TBy8h!iv~t3LJO2%X1vO^WyPNs
z6{04?Kka7#aK&VeNN<1<_Qp%vaf-z|CHS!0cpFC_H2E!B)J#Iu_5Pi#rVW3gM_&__
zv!x;pH{A70#MXal9I*PSwnw{VAU!e+r2VZ|*ztmI4q^{>`$~&gp(dyvp%4qPyG~uN
zuP+132ITt&k8`b<a2<)`t)Z30KHBH}<dwn4`ZIcY5IocF$xzPew|HXD?M+{4Qh0r9
zgM?FvN{i|jwL5$w82G7#+bh5i##f~ALv(eGtfw<;%2y9)@>u&d0SG~vl^v)P6PZw0
zl=S^Br>yR$FUii$?liZy8hl@7-_E-VHNghkF8z_4+$v>c#q;D`B<IzgaJ!pgA@_wL
z{I~}epk4s@ngFB!>0CXU(etT8i@=)Q>2`7Ku3LHMcd<DJP&g^<rNnwr0o181wFJdM
znpzmJjacTz&hs6_Ryq_1*{k-#h4xIiMj2tv;}0E@lhs7#1wB<fw=r3r-Khn(%D}ly
zyG>l@_@}MV+{-`${sg&nWFs<lc$0Y<Hx;@SGz4~wWW)qmN2VeI!aOkLG-$SO4~@nL
zGuu8?ly4|roMFToB~Ju@>3zY%E1ck!)(hg3XToGGFo|a{t3L;mB)EI?ON*v-K*U~V
z>P@w<0ws51`EIfu#Pe)R^vp)hG<C>i(wBk#)Ze)EM1u8`vfcWT<I}74Vi_(j2<tQa
zTCII=0g;`k{^f0FY7@-TyQMOkyf-$>9mT$7=WR^>Kt#m9soXX@_ej&oieA32KCWP5
zBcmbO^u+~s7L;Y=c5qe#=g&GE)eKP=f!78}07rVET~*ZT?q%#v`L&i6a-#_miw2Z=
z=lA<_(z;uhVL{y!_WRMlM*G{lLppn=fX(JQV+AGh=jI5{veClTpv;t5T@#G4CCYA6
z+o!PS>y4fRP7wjv^ltKTMY6v3O6oW1v6I6*;k@OD$lVdC8!HUbkV~e1We=HEb%}@D
z3PZ~nJ}<g_Zd!2b8n>W<MTRTHra*e+v;<kud(Neq<TX;-I7-Ihr6zkd>AMiDeLhw+
z>dDOz`A1*ks^Y43%6OA}IDlQy_;x@^YeVIf2Be}SgZ75?*iMfxY~l${n_Q3mqj{Jh
zDVEm)5Xr^MF7)Wai47JCBscXknov5g1~)DF3I&NQsS$3+t+*!-Oif(~4n#xse(v&X
z+(X%79bEWy_Vc#FG8|8Wij3wAtHQ>vW-dI8yIW|0CiKsiNT_kuUr)PL+X9i87xto=
zXTNClxoae6M)UVq{_{{|=(~<}DwN1n4D#hFxxyZD4QqJrGE7bCf#96sKi~9^QJFVW
zMZ3{+&KVl;T!uye<A1-0>lXRIo97-vQL_9m!0|s{i0h4tGUaNQdkT*K^@2CwH7q4p
zuO{L6pD*Oy-~vDEsl)xhKc4mU{@fm5Rl7tc$hn}R``yzbe|t;({ka-~Ab}AUMU%yt
zt@8J?B&Ua^u{#UYd+<bkZxD75B-KRG|8)ufI1N<?ZUYqWvl-tHtMiF8dE4T-E8}$Z
ze>+Q)r&nMU7-}h_wES)vW0<%GxnASXXDiK5a*W}_2<5sz{$L!{R8=vM1^b}^;qzZV
z@i7aGmWqnXoEfFcoG&I7@?Wn;(L4-~G9@92j;E;j-*c;eVo{r73lRN;|Gk|CLKUco
z_wN^_gVFi#K^u<$>)ZbKX6O~)`Tyx7K$Eh+G2;$Ybq=J!eu0`@!Dx@H^1nw0%5fP+
zf8~lG-|Jf_b0jP)0N678wz8nYw5J@+tq%3~Td6G({Ov{j7RyIV0fZRjnhi|*OHEW*
z@m=OJx8hun*W5#I?9YUTYVI|H?ah_GYZGRByFi_n0emcKRsy^d-zbN|$MM?#F-)@F
z-=7~G&78qbk8#QwgdOcWKZY^Kz$CZA6ZqJ}_D^}Sf&u~tT3<|21Z(SVqDu-^B$HgX
zV~mXWl6;on=YAa=V=PZ?rUUVi8zF}~)bb+ps{y!17AkHSF9iy}$13%xN&5ZI9J~3v
z!Lyt+zKpg`-BiVyyx?!6qZ!J_bC;Ht&$g8(5%RvP=?4oOXO1HEs}f$I-KZ(%B#GVZ
zMamu}@&fE&ybnG?iB#@71H5pRd~#g#w-o@ZX`7o*$ypZu`!UXgF!3x&eK|9;2E9!U
z5k4_iDn>}hfjnQf+vwtmh+7>|4N;SzVdWcwErHS<(5KW%11%{nZK8CtqtDV=2lhv2
zyyC|QO}r>1xMm|P8YfK76FmQKC&}A)FGt88y~;UGKG`Vc=`Gfn?Wx#U!SBDxn9g>A
zPq=@q{WZL@d|H05doxDgcS>U$`9?QwP0+aZ8a7@SK<%Aa&rUYO^b2%^wnS?3{Y2rO
z`|DE$z%<^z|DB3mpC4-gInt<&+fjZCt^?m4epCQtbatge|B6xud>4pAK?{Up@n;G0
zPZr|{t>St>yhZpdVr#uH*?re^a+KV%f&2=)$M}e>(!QsH;lqwHXu-%|BN9SLw$uI#
ziTyrWdSKZ5yK$6+j?Wp4{y;M}>8jDp7Gvc9=jtS~bZsFyp^u2z_;5Iri|K5IuKjyh
z(~)&s%(%}7r(}O2LI}yVxy6o#oNpsIq;R|gH`C)g(QCaM2%d{h0V=5r9nYj@fT>5Z
zTF!5^RlxDD&6n&f_e}V^V~oFD-tRk87%aibtidm_xtB$(bpxV!rC^H{;UcC#vR;j6
z*2$9I4@RNdq9=EQc(L&wOta!P?c|kDmb#?TYoL1Qj%KuQtbt9L#F+v+mRcZ9;en_+
zwah_D_M0D>c}ANTh_8$c6&)SoOWoS8Bn*8jsp~R18Z7d4G9qlCnOrD41^pMR=bgqj
z<2GiRn-v*WH06PI-w+KUGWPE^57`}FCTOY9!neE)vdXeQdyhf4;*0QU4$}<*zTUh`
z*6r4V;^U`;t?IylJfYZ2i9613q=z7c>UZ?(Q&FHL$d05ho;_`zi(%;oS`Kc^zlJgH
zNAxLcfyGwG&BKe*ZWE8wR^)#Hbx>$;&_S0eD)D1vB-y12IHSxR4qFo9;i5WkVap~g
zWvd?AtsF=B@<O_Y=IY^a5&vPnhczqx%yiwS;$n!=gw3&9C>shc_rn7K2=?HHlVB!o
zlK(weYp<{CuSUK~8w7$(?jf$v&tt0CR-_N!Co5HOf4+T5@o}i9VqJh&LbVX+6%e?>
zyZwbH*+?&nai2dY_+^mN%P3RM=@-7uEPL!yXPaA+Lt|sUQwf%ca(s!uTg<_5S*`ug
z*B7NvKRpcUPP~m9`(@c6htV=cmX`HAEbXhpyE932nn^px9Q4R<cXwq$w#i);{jpdn
z=NGlXKQC<K3w&%DU0r~5A?KlONvKQB%EW7+O;{K?La&|L?k@jHA+##JxHSG$sF-GL
zFv%P>#eTNzhkFycCO=+q6&j)+Yc8MX4SEYA5<TjjhXwKM<H@!jBsQ?uR7~xf>Y{_3
z_B3As8}APJF%`J(6xIEwe&K{V#|qF$S};Al^PcXUFKFAnr<~Y~I<OpHubG71m_)iG
zI~R;U?=^WO+>d{EZ{ejacf~Y7B5H)KkGci1(@!uE-^WW$AxD(w!CKMj*rsuHBjYoa
z$a!oTw4B?!`gMDtSYy?9q!)mR_9Yxr|B6yY3cjmjv`)N~I~bJ8EOnF;LPz=Zm+fR}
zL`Q+L4_k=Rj;$=sk2nVw($#uzVY<$(2ofsS91_D4pgK9c!}LwbzMF|f+5e|i{YB5F
z6u_f&CbBq;mg_!CGC~6Vwou^U##XQVhAO)d^&>JS%DMcWj>=+r9Ru?Rq+5+%xZXQ+
zsc@IU=Q${))!9?p6w8366zLU$4NG?5k3S97wVB9gi(dwAH=@-#7^!f?#bNk}rdz^p
zE0`xkF`f{bX77~;rW_w2BNLDQim3`wrs`Ci{fptu4w@K1jHSBWoqF!U$#7I6Fh9F=
zyDismW4adC=9jX%T)|t?xILZ?opMwg=kF{P15y%`i~FpVRf!#Ie+fi*(wZz9JI#)k
z5ooBY0m3^u(-D4<lx}VdV<~@E#?G~y^`-~y2l(G1+nsq35H>znp`6*J+&|G<Oa)q^
z8ta`V0mVEf(Sn&l$o$ratjRra7YW?0zokU;sy@+m#*B0x%cTWyfJV@5eewgZ`9u&C
z7a>!M9&3DmY!#DZ58Bx+18qn-Mly;v=HybifTJw;AnDYpSl}Q9QUQ18_QF_kVR>&u
zH9S+-aE_sTSohU(I$%K54}g@(-Pzfh((@mhk4wU48&<6eY7z|farH}0pgjERG0;<*
zk1|E*&|Zn$+%fIvXn>yt9&seQ5Y!QC4!M`k=MEX`*@S-$71rN8j9&V4vX3C`U$}Fd
z9c$%7JObp6Mgy<lbfk53$&T?ZmPwZ`+{cZHD8p!!1N_%(ajxt%u&ZP1hx&O*^beKc
zY+`QoA%ZYA3}NH6t9eD}h4*5TahG8s;q;}>KqRqZrl(9^5;we)5&|->bautuR8M}}
zd|LQP++^H{=H^=Xv6smA<U)@42F?b$&cF-&V(1pH8G^Y|gS+>05(*?GB_%x_Sguc9
zn|r1ZA?8QYUb`z2q9G+vR+29+<}~=By~^kk&rThq-!$hpsNWZr37$pnDDE%|36DB@
z=h0P|ClL!DmK1q{Y<fj?Mr%>%?pWS3Wf+9bJnNFIf3~#Rccfd%{mE3>XKGp+T@2W+
zjK0tSlhz+20N1KKn|A-`gIgUO$x(1SJ?Yc$p620qJxs{xS|FbN>azd#3@)0Z9xkA4
zjb8iBd7F+zuf+zXke>Wz`?Ex0$y0&Mt0;#(WbTV+!-%841}+raXPcBuVFDN<=AO9R
zRtHw12Y_&VpDt;1Kx*x6H3p}Jjem|!rX7i<K!R1Pb9KmDTT(y_R)XgQ!(0WkU*tRL
z^;*CDudr{xr-z1w@EVmI4n2~ixtjypHXC}9$6gTZJYr@jIfb6mZ4g^T-382<>g{JR
z8fmtjP)@Bujm5pTS@;Y$y^DUk%GNe8mPA6Azr5gav!q8u^dHy$Dzc3p)-I#|9!g1x
zjH}i2`MLua33=^tZ<=2#-3oboF<<wogq_@@uxi(SAv>BM%(*h(t#1f6F?~<C&Cgl7
zqi3D6>O%HSN-TvrPj=H)zq|a}Uj?5&YN;b!w&mWHGzyp^roFs3(ecNfIfk+;3wEjj
z?+3-+#)6h85IYMRds;^hP>ddY)jcgt3`;08MbNK*)lVGp5nq4d$Lh>*7l4*#G-rE_
zBn${ATKy?#)M#~(Nm4WZCxv{h2!;wdVlvuw+GMx^9aKl{nhOyzG`eCc=wNBC@{gw^
z$S^H?m>L->+t4>P10aLcRaZ4`M@APDJL!!_Q6MGJd1kzoBB)F2F72AkKD~-m?>8dQ
z#T%)lfMf1QX|$;Q3ISH6x275apc|lg?2j#%2h&u@=~&MD)w>soviN0%bGSxMEg*N{
z?-7p#3Jm%oawO^wUvDkh<$s23RUEI@h4y(mWMglK=kqc-J3zg3w#45Mz*2K4VJVTq
zLzW3rd}Ug!HXpt6@olHUr7q;i)0;csH&0$LMw!ky%l<G@LH`JIi!6B=A_{A*drYHz
zKvr<h)<pRSTA7-C1#1<0^Cm<c<#V7}k(pmA?0UBx2&}~%Ah-yxd0=ckaSlfe!nSaf
z=X@ki1oDs<Ys1$|q7f}1;Jw_U*wWadsHe@PJ2!HIQ;D|>jyiAk2354fMp6O+9p8&@
zf8f$>m1BZZ@-H6Fy9MpVavpVbP5E9OZENz7cUgc7rAssmpOps#5(&>8HCarCN9?XT
z>8@Ibs?6=x??M=mMmU@N`r?}E4hULeq}rMR8I+V+c6J1>9jUt`(kVxq&kMq7S;MdS
zgtg!?5$aZkx#t7Hts(u6ozbNnv6wlVC{r>X+0y#;y8ENulH6ZGD`*O_%R_!C!2@cH
zc5gf7KYd!X3K(PscXUfU^3&tc$4kJc&owiMdj60M@LNrDGO#NJ|BRhnA9LO@je#YR
z`NpBTf(i(v#Ja*JD@fjKODu!@elzPOzs|Ul-Vkwh877Kaw=w0AdSf8B44<kp?tLgh
zv>S<b`&NEjp*nnyp+k%DOW@6CK1URv?&Sz1m>yPT(u)U#{A?xDr$W9STFQb;W3Md4
zjMd&<PJ?<x9<LO>SCZ2)2o5Uczd-t(tlh0rbOO2-28TL$Cgh&`O_>=adSEDU1-TN3
zJ1hF@s{#VArBDH8wfrcVkGx=c=Ob#2V;&FXQp?{UPuJk;B~!Xce!QHvJf=}B^cY7i
zCzvHVT~J*|Ag&+=w2CY&%`#NTZ*Qr{f*qtc++ni{`}+?IW=0{~esBUYMaPIY0~hjY
zq>uqNenx=FIl9LOkGEW9?bbOeKO}ktZNw%}i6m)se|(y`P;*qIW<QH$LC{<fp4lIG
zdCR0G!&2Xb%2AIU9cAhdf`4&`(8bQFdcO=pKiVGFYHD?HUjj#kb(Fm^c!>+Ch=%l0
zApB{?+eWsvfbKrSEmMMDS|n3*Bg&Ks>Rse>pmo)W<_5A0Y%buz=QRR~i4Yg9U>2m6
zVm7o!1p~cM=DFsB9`{w>V-6WurXr&r?8Cn>9laCcj+<sjgE?XF#h=A@xpYu=Z{TdI
z4~Zv$XCnjgL$b};PKa?u`<`|GDAi8nV_KLTHTyRjr*Zf|o|?4weN-YewOOfz+9UK?
zNsF%vPdIq;hz+{J?`v6J4p9f1s<&^Mg#s%SPuzPa7{bSEKNPqpHawX5;HjUc)`4U^
zEc;$a6<?zxKWoN?op*x~_RO4C_9+SdFnY*^<+iZm)ljq2M3a+6Z$*Q$?sMM#rk2Qr
zpzxpw9ba~aVVb+V*gCRLUi)wOKzj_e9@amEhyJiq?E{Xnlp`VUHIi#!hW9*ORgL(+
z%(Kf0nv0{?2G?Q<1#^1NZjN)YHLZLh!o}$(=j`cWR>1OB>kX}(zR`3#e%%a<h19qA
z$a=&cHH!~D1I3W})%qQv&2a^f3CU<lWI+ag=B=BOX?cAL#+ETwwp)C|`7VALNn(jo
z^gy&KY${`V>=yH#I0#rY*w!LxshpU&d?}}-VteCBaLY^optVhdUG84DJW$IW4}7uj
z9ls~q_$@xcGxaAb761({T7Wz3AuJS%t$_eS(&P<GT8Nov2R&hfnUmDn9ivl6#KPd4
zWAW0@jF!OzcTsBnYIpL3Q9SlDk`wRu-oygRqgxEf)}o*2vk%tO7MC`k*3tKyn`AHf
zO$QYEyw_iM(fBtsVW8wcga;mV9{|PLV-K^M_b7fwAP594P#qIdwC4?o;}x=eD3_?x
z|Mc2Cj{$#RsoWcPQyXR2;lHfqnTrN*Uyq(_7{rmhe_f#U#%4P7EJVI5;pk}^QKSJ4
z4-@Mg!1HB{CZT$%OYg)Icwx+*$jY$YHKA7{rk|`%c@|GsK2=MXU<2s>nFI)>+W;KE
z#gbx{@?$8^_fn3t%AYS7%`gN#i)Vl_idwjy*yz(5<(z;lz0~`lkh)v6lVnB2B=xDj
zfaPp<OXB%`@_ot?^AuL-E02T@2#kYICv(iXNek;JmJ6lJNb8zspmC;soF$7VHc>TO
zuG+;RwO!mydlZg0C2lxdV9W|Tf9M*^blEbde$J}?S2P4C7MEnV_~nJ6sMUn%zkusJ
z^BNozy%2VOd-D1O>O^0_y(L5l#v#W6Vj#%pI=Kzu6qQ-;dWrHM+|EY38FroA5@0kM
zA?+~XpPv^r&U3qg^8d_xLnQ6ZBgPo*8CTpm#Bcgv^(&#SsY;%hFmd4=1;{Xdvnn^Y
zRmbxSwBQ$-3DXmcWfwF=sUg&~{`BVh$b7zFt~;aipyhHukdoW7IbG>uEYQxdhrAOC
zd3T%rKT+d||GX@6uCBJ;EcrEq7~l*o(w?OdAhEw-fbh7NF69EO?r!yi{%fwamETs*
zzb7Mr89~&bQRqaMxfHm*B*_mCzmK&jiUT9%2uq*kJH?C7WB&&vCifJ1Fo1?wk5||g
zJSw#?OlMXKMjgz>a&%?o>(Gmx6|55sTESX(%wEwG;pKF##LsNjf=S#))f#Tf*H*Ig
zchK{02Ng03*pyCCgwhs~USxiJa#zS(>s>FcdoqVI`<oaa;ILZlB+l|kAmm*(=)UTT
zKYpRXF3uwDD&Uv;gyQd5sX?^Iy|HSSv;g2gSA2iC)Ux@BgN8~jA~*ExbkCw?1_~ej
z#Czv&fb9b*G-M7~*AYBr4a*+f|K1%QGz)MOvFhsTrQW+GDt`lqQ$GI2AV13g{mTF*
zPQZL3{to{B1zY~#`3Q0JB=BwhcZ~S`mjTIN=kR6z|78HW>x|4W;dqJ7Gk>1Y@mf<&
LN44aZRmA@RkJU7{

literal 0
HcmV?d00001

diff --git a/p/themes/Screwdriver/thumbs/original.png b/p/themes/Screwdriver/thumbs/original.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba9bacf90ec52ffd7dd3d0c62c3c8d5339edf6a9
GIT binary patch
literal 133107
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
PI>DKf=T2abJ4F01U}s~`

literal 0
HcmV?d00001

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index f696ac237..aab511fb9 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -683,6 +683,98 @@ br + br + br {
 	left: 0;
 }
 
+/*=== SLIDESHOW */
+/*==============*/
+.slides {
+	padding: 0;
+	height: 320px;
+	display: block;
+	position: relative;
+	min-width: 260px;
+	max-width: 640px;
+}
+.slides * {
+	user-select: none;
+	-ms-user-select: none;
+	-moz-user-select: none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+	-webkit-touch-callout: none;
+}
+.slides input {
+	display: none;
+}
+.slide-container {
+	display: block;
+}
+.slide {
+	top: 0;
+	opacity: 0;
+	width: 100%;
+	height: 100%;
+	display: block;
+	position: absolute;
+	transform: scale(0);
+	transition: all .7s ease-in-out;
+}
+.slide img {
+	width: 100%;
+	height: 100%;
+}
+.nav label {
+	width: 10%;
+	height: 100%;
+	display: none;
+	position: absolute;
+	opacity: 0;
+	z-index: 9;
+	cursor: pointer;
+	transition: opacity .2s;
+	color: #FFF;
+	font-size: 1000%;
+	text-align: center;
+	line-height: 225%;
+	font-family: "Varela Round", sans-serif;
+	background-color: rgba(255, 255, 255, .3);
+	text-shadow: 0px 0px 15px rgb(119, 119, 119);
+	padding: 0;
+}
+.properties {
+	bottom: 15px;
+	display: none;
+	left: 15%;
+	padding: 5px;
+	position: absolute;
+	text-align: center;
+	width: 70%;
+	font-size: 15pt;
+	text-shadow: 0px 0px 15px rgb(119, 119, 119);
+	border-radius: 5px;
+	box-shadow: 5px 5px 10px;
+	border: 1px solid;
+	background-color: #fff;
+}
+.slide:hover + .nav label {
+	opacity: 0.5;
+}
+.slide:hover ~ .properties {
+	display: block;
+}
+.nav label:hover {
+	opacity: 1;
+}
+.nav .next {
+	right: 0;
+}
+input:checked + .slide-container .slide {
+	opacity: 1;
+	transform: scale(1);
+	transition: opacity 1s ease-in-out;
+}
+input:checked + .slide-container .nav label {
+	display: block;
+}
+
 /*=== DIVERS */
 /*===========*/
 .category .title:not([data-unread="0"]):after {

From 91388c5b7602af44894e8283c18ca76b5b06ed43 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 16 Nov 2014 08:55:19 -0500
Subject: [PATCH 168/363] Theme properties are more visible

---
 app/views/configure/display.phtml |  4 +++-
 p/themes/base-theme/template.css  | 27 ++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 39582249e..1c925a5ca 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -38,7 +38,9 @@
 								<?php } ?>
 							</div>
 							<div class="properties">
-								<?php echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author']?>
+								<div><?php echo sprintf('%s - %s %s', $theme['name'], _t('by'), $theme['author']) ?></div>
+								<div><?php echo $theme['description'] ?></div>
+								<div class="page-number"><?php echo sprintf('%d/%d', $i, $slides) ?></div>
 							</div>
 						</li>
 						<?php $i++ ?>
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index aab511fb9..80f76e80b 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -692,6 +692,7 @@ br + br + br {
 	position: relative;
 	min-width: 260px;
 	max-width: 640px;
+	margin-bottom: 30px;
 }
 .slides * {
 	user-select: none;
@@ -740,26 +741,19 @@ br + br + br {
 	padding: 0;
 }
 .properties {
-	bottom: 15px;
-	display: none;
-	left: 15%;
-	padding: 5px;
+	bottom: -35px;
+	position: absolute;
+	width: 100%;
+	display: none;
+}
+.properties .page-number {
+	right: 0;
+	top: 0;
 	position: absolute;
-	text-align: center;
-	width: 70%;
-	font-size: 15pt;
-	text-shadow: 0px 0px 15px rgb(119, 119, 119);
-	border-radius: 5px;
-	box-shadow: 5px 5px 10px;
-	border: 1px solid;
-	background-color: #fff;
 }
 .slide:hover + .nav label {
 	opacity: 0.5;
 }
-.slide:hover ~ .properties {
-	display: block;
-}
 .nav label:hover {
 	opacity: 1;
 }
@@ -774,6 +768,9 @@ input:checked + .slide-container .slide {
 input:checked + .slide-container .nav label {
 	display: block;
 }
+input:checked + .slide-container .properties {
+	display: block;
+}
 
 /*=== DIVERS */
 /*===========*/

From a3a77b09e96f66eec4e31e638b58c785cfb369a3 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 22 Nov 2014 08:01:31 -0500
Subject: [PATCH 169/363] Add an automatic sticky post configuration

Before, when the article while marked as read while scrolling and auto removed after reading, the display was in the middle of the following article.
Now, the article is forced to be a sticky article so the user display is forced to be on top of the following article.
---
 app/Models/Context.php                  | 18 ++++++++++++++++++
 app/views/helpers/javascript_vars.phtml |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/Models/Context.php b/app/Models/Context.php
index cbd6a5888..3dc5349ad 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -287,4 +287,22 @@ class FreshRSS_Context {
 		}
 		return true;
 	}
+
+	/**
+	 * Determine if the "sticky post" option is enabled. It can be enable
+	 * by the user when it is selected in the configuration page or by the
+	 * application when the context allows to auto-remove articles when they
+	 * are read.
+	 *
+	 * @return boolean
+	 */
+	public static function isStickyPostEnabled() {
+		if (self::$conf->sticky_post) {
+			return true;
+		}
+		if (self::isAutoRemoveAvailable()) {
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 6424d8d04..0961ac3fe 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -27,7 +27,7 @@ echo 'var context={',
 	'auto_load_more:', FreshRSS_Context::$conf->auto_load_more ? 'true' : 'false', ',',
 	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
 	'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',',
-	'sticky_post:', FreshRSS_Context::$conf->sticky_post ? 'true' : 'false', ',',
+	'sticky_post:', FreshRSS_Context::isStickyPostEnabled() ? 'true' : 'false', ',',
 	'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',',
 	'auth_type:"', Minz_Configuration::authType(), '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',

From 7781add6dab45e890bb873e7fd42f83a6227e62c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 24 Nov 2014 15:45:47 +0100
Subject: [PATCH 170/363] Update Screwdriver theme

---
 .../Screwdriver/icons/favicon-16-32-48-64.ico | Bin 0 -> 1150 bytes
 p/themes/Screwdriver/icons/favicon-256.png    | Bin 0 -> 15724 bytes
 p/themes/Screwdriver/icons/favicon.svg        | 280 ++++++++++++++++++
 p/themes/Screwdriver/icons/icon.svg           | 271 +++++++++++++++++
 p/themes/Screwdriver/screwdriver.css          | 105 ++++---
 5 files changed, 610 insertions(+), 46 deletions(-)
 create mode 100644 p/themes/Screwdriver/icons/favicon-16-32-48-64.ico
 create mode 100644 p/themes/Screwdriver/icons/favicon-256.png
 create mode 100644 p/themes/Screwdriver/icons/favicon.svg
 create mode 100644 p/themes/Screwdriver/icons/icon.svg

diff --git a/p/themes/Screwdriver/icons/favicon-16-32-48-64.ico b/p/themes/Screwdriver/icons/favicon-16-32-48-64.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7c5eb55170c4960949e95b6047d9eada23bffc2f
GIT binary patch
literal 1150
zcmaiyZAep57{|}(MF}#a<4Z<po5-BOri}GrFJxR+F+%3hjbTh_i@pehArT{3G*+ft
zHvCWog9r<ywDL=#l2l+=9}2WI1vhKDF`Xt#%fj3L%m%)o-plVk=RD{CKj(Q4mk<Ho
z%uIrB0lBoBkZeMT7$AkrY94_QtYs)yNzQlp*lf0sH8nLoPN&lzkH<51kZ)R+$z%_N
zLg5(T)oOL5p`qc-Cebztx7&R+5C|9)3WW-L3>Fs`FPqI~-8PnWOQofyL3XxQtNrS5
zIHVZA!X7i#)zydA3AdO)F97W95%dz&Xf($#o)e43t}QIdbT}N&MXwJn7E7nc<B^C&
zqN89DXFDVkNh|gk+Rl$VZ-a(s!1I}Di;9XaVt%2ltW1H}3<NA+S6BC5r_(v>>+9_m
z6%{X84t;ks?|%}Agy(r;?u<@zZIS-Lspb6B9r2}8?eiX~RN95w9?Ru&E#fbO!H^BT
z1}uOTaGmY>Vsue{*carfce35}Zh@ozC{J5wE~6i7VPWB1Wo6|-Xor+aW#7QS02}WI
zxy*~R_f~aGy`fD>zoDut-m>bCX-Y~;_CXg`sZ{q6kAn#Ql{vj$&%q}ci6u^0o`&CM
zHIDPNX`=5_^mm>t5M6+Og0{wXvHjsWi`xI1OeVk4Xw1jl3(grIP0R|LM|gT;l&6j3
zul4QIIp?3x^wO3op86xT%$s_kH-RON<3e`3-R<>y3q-euKT!AZGwK;Nh35a{*}7xB
zS-$T){2la8BzgZSKa23Q=RTMPR@8q4^_O4iiTc!m$)CyoeUne<?Qr^9-^MY#?7vG>
z-~E=z@q9_u{{#J7sW-Ig+>QR!T-Z45NB!4Ozn0z{+mp(#jVt+ttQ-Jo0Jq6VFv<x@
VuZ8j?Z~;6noZJtBY@O-h{Rb-%8nplb

literal 0
HcmV?d00001

diff --git a/p/themes/Screwdriver/icons/favicon-256.png b/p/themes/Screwdriver/icons/favicon-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..235b18c9772a087f28b26b9af862dfba34f1ecee
GIT binary patch
literal 15724
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
KQWetb#s2_=?tm)*

literal 0
HcmV?d00001

diff --git a/p/themes/Screwdriver/icons/favicon.svg b/p/themes/Screwdriver/icons/favicon.svg
new file mode 100644
index 000000000..aaab5de99
--- /dev/null
+++ b/p/themes/Screwdriver/icons/favicon.svg
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3039"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="256"
+   height="256"
+   sodipodi:docname="favicon.svg"
+   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/favicon-256.png"
+   inkscape:export-xdpi="384"
+   inkscape:export-ydpi="384">
+  <metadata
+     id="metadata3045">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3043">
+    <linearGradient
+       id="linearGradient4149">
+      <stop
+         style="stop-color:#d18114;stop-opacity:1;"
+         offset="0"
+         id="stop4151" />
+      <stop
+         style="stop-color:#ed9514;stop-opacity:1;"
+         offset="1"
+         id="stop4153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4149"
+       id="linearGradient4155"
+       x1="64.10247"
+       y1="28.285242"
+       x2="144.5123"
+       y2="28.285242"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4149"
+       id="linearGradient4159"
+       gradientUnits="userSpaceOnUse"
+       x1="64.10247"
+       y1="69.53215"
+       x2="126.83504"
+       y2="-11.652239" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4149"
+       id="linearGradient3247"
+       gradientUnits="userSpaceOnUse"
+       x1="64.10247"
+       y1="28.285242"
+       x2="144.5123"
+       y2="28.285242" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview3041"
+     showgrid="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="1.3665434"
+     inkscape:cx="300.59761"
+     inkscape:cy="69.818202"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3039">
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,85.377907"
+       id="guide3049" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,51.485465"
+       id="guide3051" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="46.828488,67.526163"
+       id="guide3053" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81.238372,67.784884"
+       id="guide3055" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64.162791,98.831395"
+       id="guide3057" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,110.73256"
+       id="guide3059" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="63.90407,105.29942"
+       id="guide3061" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,120.30523"
+       id="guide3063" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,131.68895"
+       id="guide3065" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="-0.25872093,68.561047"
+       id="guide3067" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="128.06686,68.043605"
+       id="guide3069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="115.90698,68.043605"
+       id="guide3071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,4.3982558"
+       id="guide3073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="11.642442,68.043605"
+       id="guide3081" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="115.90698,68.043605"
+       id="guide3083" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="67.526163,16.040698"
+       id="guide3089" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,25.09593"
+       id="guide3091" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,36.738372"
+       id="guide3093" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="21.473837,68.043605"
+       id="guide3100" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="32.598837,68.043605"
+       id="guide3102" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="107.11047,68.043605"
+       id="guide3110" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="94.691861,68.043605"
+       id="guide3112" />
+  </sodipodi:namedview>
+  <g
+     id="g3988-3"
+     transform="matrix(1.7556028,0,0,1.7556028,2.4536682,156.92143)"
+     style="fill:#ffffff;fill-opacity:1">
+    <g
+       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
+       id="g3984-3"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+         id="path3975-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+         id="path3971-3"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(-4.1395349,-75.482558)"
+       id="g3977-7"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+         id="path3973-1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+         id="path3969-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+         id="path3967-2" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+         id="path3965-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+         id="path3095-6" />
+    </g>
+  </g>
+  <g
+     id="g3984"
+     transform="matrix(1.7160619,0,0,1.7160619,5.3998589,23.251436)"
+     style="fill:url(#linearGradient4159);fill-opacity:1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3975"
+       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+       style="fill:url(#linearGradient3247);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3971"
+       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+       style="fill:url(#linearGradient4155);fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     id="g3977"
+     transform="matrix(1.7556028,0,0,1.7556028,-3.4937681,21.015289)">
+    <path
+       id="path3973"
+       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3969"
+       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3967"
+       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3965"
+       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3095"
+       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/p/themes/Screwdriver/icons/icon.svg b/p/themes/Screwdriver/icons/icon.svg
new file mode 100644
index 000000000..7f3d76af2
--- /dev/null
+++ b/p/themes/Screwdriver/icons/icon.svg
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3039"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="60"
+   height="60"
+   sodipodi:docname="icon.svg"
+   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/logo.svg.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata3045">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3043">
+    <linearGradient
+       id="linearGradient4149">
+      <stop
+         style="stop-color:#d18114;stop-opacity:1;"
+         offset="0"
+         id="stop4151" />
+      <stop
+         style="stop-color:#ed9514;stop-opacity:1;"
+         offset="1"
+         id="stop4153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4149"
+       id="linearGradient4155"
+       x1="64.102467"
+       y1="28.285242"
+       x2="144.5123"
+       y2="28.285242"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4149"
+       id="linearGradient4159"
+       gradientUnits="userSpaceOnUse"
+       x1="64.10247"
+       y1="69.53215"
+       x2="126.83504"
+       y2="-11.652239" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview3041"
+     showgrid="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.48314606"
+     inkscape:cx="76.646731"
+     inkscape:cy="144.12468"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3039">
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,85.377907"
+       id="guide3049" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,51.485465"
+       id="guide3051" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="46.828488,67.526163"
+       id="guide3053" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81.238372,67.784884"
+       id="guide3055" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64.162791,98.831395"
+       id="guide3057" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,110.73256"
+       id="guide3059" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="63.90407,105.29942"
+       id="guide3061" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,120.30523"
+       id="guide3063" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,131.68895"
+       id="guide3065" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="-0.25872093,68.561047"
+       id="guide3067" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="128.06686,68.043605"
+       id="guide3069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="115.90698,68.043605"
+       id="guide3071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,4.3982558"
+       id="guide3073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="11.642442,68.043605"
+       id="guide3081" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="115.90698,68.043605"
+       id="guide3083" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="67.526163,16.040698"
+       id="guide3089" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,25.09593"
+       id="guide3091" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,36.738372"
+       id="guide3093" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="21.473837,68.043605"
+       id="guide3100" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="32.598837,68.043605"
+       id="guide3102" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="107.11047,68.043605"
+       id="guide3110" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="94.691861,68.043605"
+       id="guide3112" />
+  </sodipodi:namedview>
+  <g
+     id="g3988-3"
+     transform="matrix(0.40427237,0,0,0.40427237,0.65228897,36.70875)"
+     style="fill:#ffffff;fill-opacity:1">
+    <g
+       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
+       id="g3984-3"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+         id="path3975-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+         id="path3971-3"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(-4.1395349,-75.482558)"
+       id="g3977-7"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+         id="path3973-1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+         id="path3969-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+         id="path3967-2" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+         id="path3965-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+         id="path3095-6" />
+    </g>
+  </g>
+  <g
+     id="g3984"
+     transform="matrix(0.39516706,0,0,0.39516706,1.3307246,5.9278164)"
+     style="fill:url(#linearGradient4159);fill-opacity:1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3975"
+       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+       style="fill:url(#linearGradient4155);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3971"
+       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+       style="fill:url(#linearGradient4155);fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     id="g3977"
+     transform="matrix(0.40427237,0,0,0.40427237,-0.71726009,5.4128854)">
+    <path
+       id="path3973"
+       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3969"
+       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3967"
+       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3965"
+       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3095"
+       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index b6c2e670e..8dbd2ec34 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -52,7 +52,7 @@ input, select, textarea {
 	color: #222;
 	line-height: 25px;
 	vertical-align: middle;
-	box-shadow: 0 2px 2px #eee inset, 0 1px #fff;
+	box-shadow: 0 1px 2px #ccc inset, 0 1px #fff;
 }
 option {
 	padding: 0 .5em;
@@ -121,30 +121,14 @@ form th {
 }
 
 /*=== Buttons */
-form#add_rss .stick input, .dropdown-menu select{
-    background:#393939;
-    box-shadow: 0 2px  2px #171717 inset,0 1px rgba(255,255,255,0.08);
-    border-left:solid 1px #171717;
-    border-top:solid 1px #171717;
-    border-bottom:solid 1px #171717;
-    border-right:none;
+
+.dropdown-menu .input select, .dropdown-menu .input input {
+    background:#444;
     color:#fff;
+    box-shadow:0 2px 2px #222 inset, 0px 1px rgba(255, 255, 255, 0.08);
+    border:solid 1px #171717;
 }
-form#add_rss .stick .btn{
-    background:linear-gradient(180deg, #222 0%, #171717 100%) #171717;
-    background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
-    box-shadow:0 1px rgba(255,255,255,0.08), 0px 1px rgba(255, 255, 255, 0.08) inset;
-    border-right:solid 1px #171717;
-    border-top:solid 1px #171717;
-    border-bottom:solid 1px #171717;
-    border-left:none;
-}
-form#add_rss .stick .btn.dropdown-toggle{
-    border-right:solid 1px #171717;
-    border-top:solid 1px #171717;
-    border-bottom:solid 1px #171717;
-    border-left:solid 1px #171717;
-}
+
 .stick {
 	vertical-align: middle;
 	font-size: 0;
@@ -206,14 +190,13 @@ a.btn {
 	background: linear-gradient(180deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
 	background: -webkit-linear-gradient(top, #EDE7DE 0%, #FFF 100%);
 }
-#loginButton.btn{
-	border:none;
-	box-shadow: 0px 1px rgba(255, 255, 255, 0.08) inset,0 -1px #171717,0px 1px rgba(255, 255, 255, 0.08);
-}
+
 .nav_menu .btn.active, .nav_menu .btn:active, .nav_menu .dropdown-target:target ~ .btn.dropdown-toggle{
-	box-shadow: 0px 2px #E2972A;
-	border-radius: 0;
-	background:transparent;
+	box-shadow: 0 1px #fff;
+	border-radius: 4px;
+	background: linear-gradient(180deg, #EDE7DE 0%, #F6F6F6 100%) #EDE7DE;
+	background: -webkit-linear-gradient(top, #EDE7DE 0%, #F6F6F6 100%);
+	border: solid 1px #ccc;
 }
 .nav_menu .btn {
 	border: 0;
@@ -500,7 +483,8 @@ a.btn {
 /*=== Boxes */
 .box {
 	background: #EDE7DE;
-	border-radius: 4px 4px 0 0;
+	border-radius: 4px;
+	box-shadow: 0 1px #fff;
 }
 .box .box-title {
 	margin: 0;
@@ -575,6 +559,7 @@ a.btn {
 .tree-folder-items > .item > a {
 	text-decoration: none;
 	color: #fff;
+	font-size: 0.92em;
 }
 .tree-folder-items > .item.active > a {
 }
@@ -593,7 +578,8 @@ a.btn {
 	text-align: center;
 }
 .header > .item.title .logo {
-	display: none;
+	height: 60px;
+	width: 60px;
 }
 .header > .item.title{
 	width: 250px;
@@ -603,9 +589,9 @@ a.btn {
 }
 .header > .item.title h1 a {
 	text-decoration: none;
-	font-size: 38px;
-	color:#ccc;
-	text-shadow: 0 1px #fff, 0 -1px rgba(162, 162, 162, 1);
+	font-size: 28px;
+	color:#222;
+	text-shadow: 0 1px #fff;
 }
 .header > .item.search input {
 	width: 230px;
@@ -681,11 +667,8 @@ a.btn {
 /*=== Prompt (centered) */
 .prompt {
 	text-align: center;
-	color: #FFF;
-	background: #222;
 	padding: 14px 0px;
-	box-shadow: 0px -1px #FFF, 0px 1px #FFF, 0px 2px 2px #171717 inset, 0px -2px 2px #171717 inset;
-	text-shadow: 0 -1px #171717, 0 1px rgba(255,255,255,0.08);
+	text-shadow: 0 1px rgba(255,255,255,0.08);
 }
 .prompt label {
 	text-align: left;
@@ -702,9 +685,9 @@ a.btn {
 	margin: 20px 0;
 }
 .prompt input#username,.prompt input#passwordPlain{
-	border:none;
-	box-shadow: 0px 1px rgba(255, 255, 255, 0.08) inset,0 -1px #171717,0px 1px rgba(255, 255, 255, 0.08);
-	background:#EDE7DE;
+	border:solid 1px #ccc;
+	box-shadow: 0 4px -4px #ccc inset,0px 1px rgba(255, 255, 255, 0.08);
+	background:#fff;
 }
 .prompt input#username:focus,.prompt input#passwordPlain:focus{
 	border: solid 1px #E7AB34;
@@ -734,7 +717,11 @@ a.btn {
 	padding: 0 10px;
 	font-style:italic;
 	line-height: 3em;
-	background: #fff;
+	box-shadow: 0 1px #BDB7AE inset, 0 -1px rgba(255,255,255,0.28) inset;
+	background: linear-gradient(0deg, #EDE7DE 0%, #C2BCB3 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #C2BCB3 0%, #FFF 100%);
+	color: #666;
+	text-shadow: 0 1px rgba(255,255,255,0.28);
 	text-align: center;
 }
 #new-article + .day {
@@ -748,10 +735,26 @@ a.btn {
 .nav_menu {
 	background: #EDE7DE;
 	border-bottom: 1px solid #ccc;
-	box-shadow:0 -1px #fff inset;
+	box-shadow:0 -1px rgba(255, 255, 255, 0.28) inset;
 	text-align: center;
 	padding: 5px 0;
 }
+#panel >.nav_menu{
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+}
+#panel > .nav_menu > #nav_menu_read_all{
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+	border-radius: 4px;
+	border: 1px solid #CCC;
+	box-shadow: 0px 1px #FFF;
+}
+#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{
+	border-radius: 0 4px 4px 0;
+	border:none;
+	border-left: solid 1px #ccc;
+}
 
 /*=== Feed articles */
 .flux_content {
@@ -810,6 +813,7 @@ opacity: 1;
 	border-top: 1px solid #ddd;
 	font-size: 0.8rem;
 	cursor: pointer;
+	box-shadow: 0 -1px rgba(255,255,255,0.28) inset;
 }
 .flux_header .title {
 	font-size: 0.9rem;
@@ -917,6 +921,7 @@ opacity: 1;
 	text-shadow: 0 -1px 0 #aaa;
 	color: #666;
 	background: #EDE7DE;
+	box-shadow: 0 1px rgba(255,255,255,0.28)inset;
 }
 #bigMarkAsRead:hover {
 	color: #000;
@@ -956,9 +961,8 @@ opacity: 1;
 /*=== GLOBAL VIEW */
 /*================*/
 #stream.global {
-	background: #222;
 	padding: 24px 0;
-	box-shadow: 0 1px #fff, 0 -2px 2px #171717 inset, 0 2px 2px #171717 inset;
+	box-shadow: 0px 8px 8px #C2BCB3 inset;
 }
 
 .box.category .box-title {
@@ -1004,6 +1008,7 @@ opacity: 1;
 #panel {
 	box-shadow: 0px 0px 4px #000;
 	border-radius: 8px;
+	background:#EDE7DE;
 }
 /*=== DIVERS */
 /*===========*/
@@ -1084,6 +1089,14 @@ opacity: 1;
 	color: #eee;
 }
 
+#slider.active {
+    box-shadow: -4px 0 4px rgba(15, 15, 15, 0.55);
+    background: #F8F8F8;
+}
+#close-slider.active {
+    background: rgba(15, 15, 15, 0.35);
+}
+
 /*=== MOBILE */
 /*===========*/
 @media screen and (max-width: 840px) {

From b9b3e963b49b255dd694b001b303e75f58519b67 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 24 Nov 2014 15:49:13 +0100
Subject: [PATCH 171/363] Add BlueLagoon theme

---
 p/themes/BlueLagoon/BlueLagoon.css            | 1210 +++++++++++++++++
 p/themes/BlueLagoon/README.md                 |   38 +
 p/themes/BlueLagoon/icons/bookmark.svg        |   61 +
 .../BlueLagoon/icons/favicon-16-32-48-64.ico  |  Bin 0 -> 1150 bytes
 p/themes/BlueLagoon/icons/favicon-256.png     |  Bin 0 -> 16517 bytes
 p/themes/BlueLagoon/icons/favicon.svg         |  273 ++++
 p/themes/BlueLagoon/icons/icon.svg            |  291 ++++
 p/themes/BlueLagoon/icons/non-starred.svg     |   59 +
 p/themes/BlueLagoon/icons/read.svg            |   72 +
 p/themes/BlueLagoon/icons/starred.svg         |   60 +
 p/themes/BlueLagoon/icons/unread.svg          |   65 +
 p/themes/BlueLagoon/loader.gif                |  Bin 0 -> 3164 bytes
 p/themes/BlueLagoon/metadata.json             |    7 +
 p/themes/BlueLagoon/template.css              |  695 ++++++++++
 p/themes/BlueLagoon/thumbs/original.png       |  Bin 0 -> 153829 bytes
 15 files changed, 2831 insertions(+)
 create mode 100644 p/themes/BlueLagoon/BlueLagoon.css
 create mode 100644 p/themes/BlueLagoon/README.md
 create mode 100644 p/themes/BlueLagoon/icons/bookmark.svg
 create mode 100644 p/themes/BlueLagoon/icons/favicon-16-32-48-64.ico
 create mode 100644 p/themes/BlueLagoon/icons/favicon-256.png
 create mode 100644 p/themes/BlueLagoon/icons/favicon.svg
 create mode 100644 p/themes/BlueLagoon/icons/icon.svg
 create mode 100644 p/themes/BlueLagoon/icons/non-starred.svg
 create mode 100644 p/themes/BlueLagoon/icons/read.svg
 create mode 100644 p/themes/BlueLagoon/icons/starred.svg
 create mode 100644 p/themes/BlueLagoon/icons/unread.svg
 create mode 100644 p/themes/BlueLagoon/loader.gif
 create mode 100644 p/themes/BlueLagoon/metadata.json
 create mode 100644 p/themes/BlueLagoon/template.css
 create mode 100644 p/themes/BlueLagoon/thumbs/original.png

diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
new file mode 100644
index 000000000..ae1c24604
--- /dev/null
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -0,0 +1,1210 @@
+@charset "UTF-8";
+
+/*=== FONTS */
+@font-face {
+	font-family: "OpenSans";
+	src: url("../fonts/openSans.woff") format("woff");
+}
+
+/*=== GENERAL */
+/*============*/
+html, body {
+	height: 100%;
+	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+	background: #fafafa;
+	font-size: 92%;
+}
+
+/*=== Links */
+a, button.as-link {
+	color: #0062BE;
+	outline: none;
+}
+
+/*=== Forms */
+.form-group{
+	width: 100%;
+	float: left;
+	height: auto;
+	display: inline-block;
+}
+legend {
+	margin: 20px 0 5px;
+	padding: 5px 0;
+	border-bottom: 1px solid #ddd;
+	font-size: 1.4em;
+}
+label {
+	min-height: 25px;
+	padding: 5px 0;
+	cursor: pointer;
+}
+textarea {
+	width: 360px;
+	height: 100px;
+}
+input, select, textarea {
+	min-height: 25px;
+	padding: 5px;
+	background: #fff;
+	border: 1px solid #ccc;
+	border-radius: 3px;
+	color: #222;
+	line-height: 25px;
+	vertical-align: middle;
+	box-shadow: 0 1px 2px #ccc inset, 0 1px #fff;
+}
+option {
+	padding: 0 .5em;
+}
+input:focus, select:focus, textarea:focus {
+	color: #0F0F0F;
+	box-shadow: 0 0 3px #0062BF;
+	border: solid 1px #0062BF;
+}
+input:invalid, select:invalid {
+	border-color: #f00;
+	box-shadow: 0 0 2px 2px #fdd inset;
+}
+input:disabled, select:disabled {
+	background: #eee;
+}
+input.extend {
+	transition: width 200ms linear;
+	-moz-transition: width 200ms linear;
+	-webkit-transition: width 200ms linear;
+	-o-transition: width 200ms linear;
+	-ms-transition: width 200ms linear;
+}
+
+/*=== Tables */
+table {
+	border-collapse: collapse;
+}
+
+tr, th, td {
+	padding: 0.5em;
+	border: 1px solid #ddd;
+}
+th {
+	background: #f6f6f6;
+}
+form td,
+form th {
+	font-weight: normal;
+	text-align: center;
+}
+
+/*=== COMPONENTS */
+/*===============*/
+/*=== Forms */
+.form-group.form-actions {
+	padding: 5px 0;
+	background: #f4f4f4;
+	border-top: 1px solid #ddd;
+}
+.form-group.form-actions .btn {
+	margin: 0 10px;
+	border-radius: 4px;
+	box-shadow:0 1px rgba(255,255,255,0.08) inset;
+}
+.form-group .group-name {
+	padding: 10px 0;
+	text-align: right;
+}
+.form-group .group-controls {
+	min-height: 25px;
+	padding: 5px 0;
+}
+.form-group table {
+	margin: 10px 0 0 220px;
+}
+
+/*=== Buttons */
+
+.dropdown-menu .input select, .dropdown-menu .input input {
+    background:#444;
+    color:#fff;
+    box-shadow:0 2px 2px #222 inset, 0px 1px rgba(255, 255, 255, 0.08);
+    border:solid 1px #171717;
+}
+
+.stick {
+	vertical-align: middle;
+	font-size: 0;
+}
+.stick input,
+.stick .btn {
+	border-radius: 0;
+}
+.stick .btn:first-child,.stick input:first-child {
+	border-radius: 6px 0 0 6px;
+}
+.stick .btn-important:first-child {
+}
+.stick .btn:last-child, .stick input:last-child {
+	border-radius: 0 6px 6px 0;
+}
+.stick .btn + .btn,
+.stick .btn + input,
+.stick .btn + .dropdown > .btn,
+.stick input + .btn,
+.stick input + input,
+.stick input + .dropdown > .btn,
+.stick .dropdown + .btn,
+.stick .dropdown + input,
+.stick .dropdown + .dropdown > .btn {
+	border-left: none;
+}
+.stick .btn + .dropdown > .btn {
+	border-left: none;
+	border-radius: 0 3px 3px 0;
+}
+
+.btn {
+	display: inline-block;
+	min-height: 37px;
+	min-width: 15px;
+	margin: 0;
+	padding: 5px 10px;
+	color:#222;
+	border: solid 1px #ccc;
+	border-radius: 4px;
+    background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+	text-shadow: 0px -1px rgba(255,255,255,0.08);
+	font-size: 0.9rem;
+	vertical-align: middle;
+	cursor: pointer;
+	overflow: hidden;
+}
+a.btn {
+	min-height: 25px;
+	line-height: 25px;
+}
+.btn:hover {
+	text-shadow: 0 0 2px #fff;
+	text-decoration:none;
+}
+.btn.active,.btn:active,.dropdown-target:target ~ .btn.dropdown-toggle {
+	background: linear-gradient(180deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+	background: -webkit-linear-gradient(top, #EDE7DE 0%, #FFF 100%);
+}
+
+.nav_menu .btn.active, .nav_menu .btn:active, .nav_menu .dropdown-target:target ~ .btn.dropdown-toggle{
+	box-shadow: 0 1px #fff;
+	border-radius: 4px;
+	background: linear-gradient(180deg, #EDE7DE 0%, #F6F6F6 100%) #EDE7DE;
+	background: -webkit-linear-gradient(top, #EDE7DE 0%, #F6F6F6 100%);
+	border: solid 1px #ccc;
+}
+.nav_menu .btn {
+	border: 0;
+	background:transparent;
+}
+
+.read_all {
+	color:#222;
+}
+.btn.dropdown-toggle[href="#dropdown-configure"]{
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+	border-radius: 4px;
+	border: solid 1px #ccc;
+	box-shadow: 0 1px #fff;
+}
+.btn.dropdown-toggle:active {
+	background:transparent;
+}
+.btn-important {
+	background: linear-gradient(180deg,  #0090FF 0%, #0062BE 100%) #E4992C;
+	background: -webkit-linear-gradient(top,  #0090FF 0%, #0062BE 100%);
+	color: #FFF;
+	box-shadow: 0 1px rgba(255,255,255,0.08) inset;
+	border-radius: 4px;
+	text-shadow: 0px -1px rgba(255,255,255,0.08);
+	font-weight: normal;
+}
+.btn-important:hover {
+}
+.btn-important:active {
+	background: linear-gradient(0deg, #E4992C 0%, #D18114 100%) #E4992C;
+	background: -webkit-linear-gradient(bottom, #E4992C 0%, #D18114 100%);
+}
+
+.btn-attention {
+	background: #E95B57;
+	background: linear-gradient(to bottom, #E95B57, #BD362F);
+	background: -webkit-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+	color: #fff;
+	border: 1px solid #C44742;
+	text-shadow: 0px -1px 0px #666;
+}
+.btn-attention:hover {
+	background: linear-gradient(to bottom, #D14641, #BD362F);
+	background: -webkit-linear-gradient(top, #D14641 0%, #BD362F 100%);
+}
+.btn-attention:active {
+	background: #BD362F;
+	box-shadow: none;
+}
+.btn[type="reset"]{
+	color: #fff;
+    background:linear-gradient(180deg, #222 0%, #171717 100%) #171717;
+    background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
+    box-shadow:0 -1px rgba(255,255,255,0.08) inset;
+}
+/*=== Navigation */
+.nav-list .nav-header,
+.nav-list .item {
+	height: 2.5em;
+	line-height: 2.5em;
+	font-size: 0.9rem;
+}
+.nav-list .item:hover {
+	text-shadow: 0 0 2px rgba(255,255,255,0.28);
+	color:#fff;
+}
+
+.nav-list .item.active {
+	background: linear-gradient(180deg,  #0090FF 0%, #0062BE 100%) #E4992C;
+	background: -webkit-linear-gradient(top,  #0090FF 0%, #0062BE 100%);
+	border-width: medium medium 1px;
+	border-style: none none solid;
+	border-color: -moz-use-text-color -moz-use-text-color #171717;
+	box-shadow: -1px 2px 2px #171717, 0px 1px rgba(255, 255, 255, 0.08) inset;
+	margin: 0;
+}
+.nav-list .item.active a {
+	color: #fff;
+}
+.nav-list .disable {
+	color: #aaa;
+	background: #fafafa;
+	text-align: center;
+}
+.nav-list .item > a {
+	padding: 0 10px;
+	color:#ccc;
+}
+.nav-list a:hover {
+	text-decoration: none;
+}
+.nav-list .item.empty a {
+	color: #f39c12;
+}
+.nav-list .item.active.empty a {
+	color: #fff;
+	background: linear-gradient(180deg, #E4992C 0%, #D18114 100%) #E4992C;
+	background: -webkit-linear-gradient(180deg, #E4992C 0%, #D18114 100%);
+}
+.nav-list .item.error a {
+	color: #BD362F;
+}
+.nav-list .item.active.error a {
+	color: #fff;
+	background: #BD362F;
+}
+
+.nav-list .nav-header {
+	padding: 0 10px;
+	color: #222;
+	background: transparent;
+}
+
+.nav-list .nav-form {
+	padding: 3px;
+	text-align: center;
+}
+
+.nav-head {
+	margin: 0;
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+	text-align: right;
+}
+.nav-head .item {
+	padding: 5px 10px;
+	font-size: 0.9rem;
+	line-height: 1.5rem;
+}
+
+/*=== Horizontal-list */
+.horizontal-list {
+	margin: 0;
+	padding: 0;
+}
+.horizontal-list .item {
+	vertical-align: middle;
+}
+
+/*=== Dropdown */
+.dropdown-menu {
+	margin: 5px 0 0;
+	padding: 5px 0;
+	border: 1px solid #171717;
+	border-radius: 4px;
+	box-shadow: 0 0 3px #000;
+	font-size: 0.8rem;
+	text-align: left;
+	background: #222;
+}
+.dropdown-menu:after {
+	content: "";
+	position: absolute;
+	top: -6px;
+	right: 13px;
+	width: 10px;
+	height: 10px;
+	background: #222;
+	border-top: 1px solid #171717;
+	border-left: 1px solid #171717;
+	z-index: -10;
+	transform: rotate(45deg);
+	-moz-transform: rotate(45deg);
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+}
+.dropdown-header {
+	display:none;
+}
+.dropdown-menu > .item > a {
+	padding: 0 25px;
+	line-height: 2.5em;
+	color: #ccc;
+}
+.dropdown-menu > .item > span,
+.dropdown-menu > .item > .as-link {
+	padding: 0 22px;
+	line-height: 2em;
+	color: #ccc;
+}
+.dropdown-menu > .item:hover {
+	background: linear-gradient(180deg,  #0090FF 0%, #0062BE 100%) #E4992C;
+	background: -webkit-linear-gradient(top,  #0090FF 0%, #0062BE 100%);
+	color: #fff;
+}
+.dropdown-menu > .item[aria-checked="true"] > a:before {
+	font-weight: bold;
+	margin: 0 0 0 -14px;
+}
+.dropdown-menu > .item:hover > a {
+	color: #fff;
+	text-decoration: none;
+}
+.dropdown-menu .input select,
+.dropdown-menu .input input {
+	margin: 0 auto 5px;
+	padding: 2px 5px;
+	border-radius: 3px;
+}
+
+.separator {
+	margin: 5px 0;
+	border-bottom: 1px solid #171717;
+	box-shadow: 0 1px rgba(255,255,255,0.08);
+}
+
+/*=== Alerts */
+.alert {
+	margin: 15px auto;
+	padding: 10px 15px;
+	background: #f4f4f4;
+	border: 1px solid #ccc;
+	border-right: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+	border-radius: 5px;
+	color: #aaa;
+	text-shadow: 0 0 1px #eee;
+	font-size: 0.9em;
+}
+.alert-head {
+	font-size: 1.15em;
+}
+.alert > a {
+	color: inherit;
+	text-decoration: underline;
+}
+.alert-warn {
+	background: #ffe;
+	border: 1px solid #eeb;
+	color: #c95;
+}
+.alert-success {
+	background: #dfd;
+	border: 1px solid #cec;
+	color: #484;
+}
+.alert-error {
+	background: #fdd;
+	border: 1px solid #ecc;
+	color: #844;
+}
+
+/*=== Pagination */
+.pagination {
+	background: #fafafa;
+	text-align: center;
+	color: #333;
+	font-size: 0.8em;
+}
+.content .pagination {
+	margin: 0;
+	padding: 0;
+}
+.pagination .item.pager-current {
+	font-weight: bold;
+	font-size: 1.5em;
+}
+.pagination .item a {
+	display: block;
+	color: #333;
+	font-style: italic;
+	line-height: 3em;
+	text-decoration: none;
+}
+.pagination .item a:hover {
+	background: #ddd;
+}
+.pagination:first-child .item {
+	border-bottom: 1px solid #aaa;
+}
+.pagination:last-child .item {
+	border-top: 1px solid #ddd;
+}
+
+.pagination .loading,
+.pagination a:hover.loading {
+	background: url("loader.gif") center center no-repeat #fff;
+	font-size: 0;
+	height:55px
+}
+
+/*=== Boxes */
+.box {
+	background: #F9F7F4;
+	border-radius: 4px;
+	box-shadow: 0 1px #fff;
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+	background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717;
+	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%);
+	box-shadow: 0px -1px #fff inset,0 -2px #ccc inset;
+	color: #888;
+	text-shadow: 0 1px #ccc;
+	border-radius: 4px 4px 0 0;
+	font-size: 1.1rem;
+	font-weight: normal;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.9rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+	color: #fff;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	background: linear-gradient(180deg, #222 0%, #171717 100%) #171717;
+	background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
+	box-shadow: 0px 1px #171717, 0px 1px rgba(255, 255, 255, 0.08) inset;
+	text-shadow: 0 0 2px rgba(255,255,255,0.28);
+	color: #fff;
+}
+.tree-folder.active > .tree-folder-title  > a.title{
+	color: #0090FF;
+	text-shadow: 0 1px rgba(255,255,255,0.08);
+}
+.tree-folder-items {
+    background: #171717;
+    padding: 8px 0;
+	box-shadow: 0 4px 4px #171717 inset, 0 1px rgba(255,255,255,0.08),0 -1px rgba(255,255,255,0.08);
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+	background: linear-gradient(180deg, #222 0%, #171717 100%) #171717;
+	background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
+	border-radius: 4px;
+	margin: 0px 8px;
+	box-shadow: 0px 1px #171717, 0px 1px rgba(255, 255, 255, 0.08) inset, 0 2px 2px #111;
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+	color: #fff;
+	font-size: 0.92em;
+}
+.tree-folder-items > .item.active > a {
+	color: #0090FF
+}
+
+/*=== STRUCTURE */
+/*===============*/
+/*=== Header */
+.header {
+	height: 55px;
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+	border-bottom: solid 1px #BDB7AE;
+	box-shadow: 0 -1px rgba(255,255,255,0.28) inset;
+}
+.header > .item {
+	padding: 0;
+	vertical-align: middle;
+	text-align: center;
+}
+.header > .item.title .logo {
+	height: 60px;
+	width: 60px;
+}
+.header > .item.title{
+	width: 250px;
+}
+.header > .item.title h1 {
+	margin: 0.5em 0;
+}
+.header > .item.title h1 a {
+	text-decoration: none;
+	font-size: 28px;
+	color:#222;
+	text-shadow: 0 1px #fff;
+}
+.header > .item.search input {
+	width: 230px;
+}
+.header .item.search input:focus {
+	width: 350px;
+}
+
+/*=== Body */
+#global {
+	background:#F9F7F4;
+	height: calc(100% - 60px);
+}
+.aside {
+	box-shadow: 0 2px 2px #171717 inset;
+	background: #222;
+	width: 235px;
+}
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	right: 3px;
+	padding: 1px 5px;
+	color: #fff;
+	text-shadow: 0 1px rgba(255,255,255,0.08);
+}
+.aside_feed .btn-important {
+	border: none;
+}
+
+/*=== Aside main page (feeds) */
+.feed.item.empty,
+.feed.item.empty > a {
+	color: #e67e22;
+}
+.feed.item.error,
+.feed.item.error > a {
+	color: #BD362F;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+}
+
+/*=== Configuration pages */
+.post {
+	padding: 10px 50px;
+	font-size: 0.9em;
+}
+.post form {
+	margin: 10px 0;
+}
+.post.content {
+	max-width: 550px;
+}
+
+/*=== Prompt (centered) */
+.prompt {
+	text-align: center;
+	padding: 14px 0px;
+	text-shadow: 0 1px rgba(255,255,255,0.08);
+}
+.prompt label {
+	text-align: left;
+}
+.prompt form {
+	margin: 10px auto 20px auto;
+	width: 180px;
+}
+.prompt input {
+	margin: 5px auto;
+	width: 100%;
+}
+.prompt p {
+	margin: 20px 0;
+}
+.prompt input#username,.prompt input#passwordPlain{
+	border:solid 1px #ccc;
+	box-shadow: 0 4px -4px #ccc inset,0px 1px rgba(255, 255, 255, 0.08);
+	background:#fff;
+}
+.prompt input#username:focus,.prompt input#passwordPlain:focus{
+	border: solid 1px #0062BE;
+	box-shadow: 0 0 3px #0062BE;
+}
+
+/*=== New article notification */
+#new-article {
+	background: #0084CC;
+	text-align: center;
+	font-size: 0.9em;
+}
+#new-article:hover {
+	background: #0066CC;
+}
+#new-article > a {
+	line-height: 3em;
+	color: #fff;
+	font-weight: bold;
+}
+#new-article > a:hover {
+	text-decoration: none;
+}
+
+/*=== Day indication */
+.day {
+	padding: 0 10px;
+	font-style:italic;
+	line-height: 3em;
+	box-shadow: 0 -1px #ccc, 0 -1px rgba(255,255,255,0.28) inset;
+	background: #F9F7F4;
+	color: #666;
+	text-shadow: 0 1px rgba(255,255,255,0.28);
+	text-align: center;
+}
+#new-article + .day {
+	border-top: none;
+}
+.day .name {
+	display: none;
+}
+
+/*=== Index menu */
+.nav_menu {
+	background: linear-gradient(0deg, #EDE7DE 0%, #C2BCB3 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #C2BCB3 100%);
+	border-bottom: 1px solid #ccc;
+	box-shadow:0 -1px rgba(255, 255, 255, 0.28) inset;
+	text-align: center;
+	padding: 5px 0;
+}
+#panel >.nav_menu{
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+}
+#panel > .nav_menu > #nav_menu_read_all{
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+	border-radius: 4px;
+	border: 1px solid #CCC;
+	box-shadow: 0px 1px #FFF;
+}
+#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{
+	border-radius: 0 4px 4px 0;
+	border:none;
+	border-left: solid 1px #ccc;
+}
+
+/*=== Feed articles */
+.flux_content {
+    background: #FFF;
+}
+.flux {
+	background: #F9F7F4;
+}
+.flux:hover {
+	background: #F9F7F4;
+}
+.flux:not(.current):hover .item.title {
+	background: #F9F7F4;
+}
+.flux.current .flux .item.title a {
+	text-shadow:0 0 2px #ccc;
+}
+.flux.not_read:not(.current):hover .item.title {
+	opacity:0.85;
+}
+.flux.favorite {
+	background: #FFF6DA;
+}
+.flux.favorite:not(.current):hover{
+	background: #F9F7F4;
+}
+.flux.favorite:not(.current):hover .item.title {
+	background: #F9F7F4;
+}
+.flux.current {
+    background: linear-gradient(0deg, #DAD4CB 0%, #FFF  100%) #DAD4CB;
+	background: -webkit-linear-gradient(bottom, #DAD4CB 0%, #FFF  100%);
+	box-shadow: 0 -1px #fff inset, 0 2px #ccc;
+	border-left: solid 4px #0062BF;
+}
+
+.flux .item.title {
+opacity: 0.35;
+}
+.flux.favorite .item.title {
+opacity: 1;
+}
+.flux.not_read .item.title {
+opacity: 1;
+}
+.flux.current .item.title a {
+	color: #0f0f0f;
+}
+.flux .item.title a {
+	color: #333;
+}
+
+.flux_header {
+	border-top: 1px solid #ddd;
+	font-size: 0.8rem;
+	cursor: pointer;
+	box-shadow: 0 -1px rgba(255,255,255,0.28) inset;
+}
+.flux_header .title {
+	font-size: 0.9rem;
+}
+.flux .website .favicon {
+	padding: 5px;
+}
+.flux .date {
+	color: #666;
+	font-size: 0.7rem;
+}
+
+.flux .bottom {
+	font-size: 0.8rem;
+	text-align: center;
+}
+
+/*=== Content of feed articles */
+.content {
+	padding: 20px 10px;
+}
+.content > h1.title > a {
+	color: #000;
+}
+
+.content hr {
+	margin: 30px 10px;
+	height: 1px;
+	background: #ddd;
+	border: 0;
+	box-shadow: 0 2px 5px #ccc;
+}
+
+.content pre {
+	margin: 10px auto;
+	padding: 10px 20px;
+	overflow: auto;
+	background: #222;
+	color: #fff;
+	font-size: 0.9rem;
+	border-radius: 3px;
+}
+.content code {
+	padding: 2px 5px;
+	color: #dd1144;
+	background: #fafafa;
+	border: 1px solid #eee;
+	border-radius: 3px;
+}
+.content pre code {
+	background: transparent;
+	color: #fff;
+	border: none;
+}
+
+.content blockquote {
+	display: block;
+	margin: 0;
+	padding: 5px 20px;
+	border-top: 1px solid #ddd;
+	border-bottom: 1px solid #ddd;
+	background: #fafafa;
+	color: #333;
+}
+.content blockquote p {
+	margin: 0;
+}
+
+/*=== Notification and actualize notification */
+.notification {
+	padding: 0 0 0 5px;
+	text-align: center;
+	background:#222;
+	border: none;
+	border-radius: 0 0 6px 6px;
+	box-shadow: 0px 0px 4px rgba(0,0,0,0.45), 0 -1px rgba(255,255,255,0.08) inset, 0 2px 2px #171717 inset;
+	color:#fff;
+	font-weight: bold;
+	font-size: 0.9em;
+	line-height: 3em;
+	position:absolute;
+	top:0;
+	z-index: 10;
+	vertical-align: middle;
+}
+.notification.good {
+	color: #fff;
+}
+.notification.bad {
+	background: #222222;
+	color: #EB2901;
+}
+.notification a.close {
+	padding: 0 15px;
+	line-height: 3em;
+}
+.notification#actualizeProgress {
+	line-height: 2em;
+}
+
+/*=== "Load more" part */
+#bigMarkAsRead {
+	text-align: center;
+	text-decoration: none;
+	text-shadow: 0 -1px 0 #aaa;
+	color: #666;
+	background: #F9F7F4;
+	box-shadow: 0 1px rgba(255,255,255,0.28)inset;
+}
+#bigMarkAsRead:hover {
+	color: #000;
+	background: #F9F7F4;
+	background: radial-gradient(circle at 50% -25% , #ccc 0%, #F9F7F4 50%);
+}
+#bigMarkAsRead:hover .bigTick {
+	text-shadow: 0 0 10px #666;
+}
+
+/*=== Navigation menu (for articles) */
+#nav_entries {
+	background: linear-gradient(180deg, #222 0%, #171717 100%) #222;
+	background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
+	border-top: 1px solid #171717;
+	text-align: center;
+	line-height: 3em;
+	table-layout: fixed;
+	box-shadow: 0 1px rgba(255,255,255,0.08) inset, 0 -2px 2px #171717;
+	width:235px;
+}
+
+/*=== READER VIEW */
+/*================*/
+#stream.reader .flux {
+	padding: 0 0 50px;
+	border: none;
+	background: #f0f0f0;
+	color: #333;
+}
+#stream.reader .flux .author {
+	margin: 0 0 10px;
+	font-size: 90%;
+	color: #666;
+}
+
+/*=== GLOBAL VIEW */
+/*================*/
+#stream.global {
+	padding: 24px 0;
+}
+
+.box.category .box-title {
+	background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717;
+	background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%);
+	box-shadow: 0px -1px #fff inset,0 -2px #ccc inset;
+	border-radius: none;
+	line-height: 2em;
+	font-size: 1.2rem;
+	text-shadow:0 1px #ccc;
+}
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
+	text-align: left;
+	color: #888;
+}
+.box.category:not([data-unread="0"]) .box-title {
+}
+.box.category:not([data-unread="0"]) .box-title:active {
+}
+.box.category:not([data-unread="0"]) .box-title .title {
+	color: #222;
+	font-weight: bold;
+}
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
+	border: 0;
+	background: none;
+	font-weight: bold;
+}
+.box.category .item.feed {
+	padding: 2px 10px;
+	font-size: 0.8rem;
+}
+.box.category .item.feed:not(.empty):not(.error) .item-title {
+	color: #222;
+}
+
+/*=== PANEL */
+/*===========*/
+#panel {
+	box-shadow: 0px 0px 4px #000;
+	border-radius: 8px;
+	background:#F9F7F4;
+}
+/*=== DIVERS */
+/*===========*/
+.aside.aside_feed .nav-form input,.aside.aside_feed .nav-form select {
+	width: 130px;
+}
+.aside.aside_feed .nav-form .dropdown .dropdown-menu {
+	right: -20px;
+}
+.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+	right: 33px;
+}
+
+/*=== STATISTICS */
+/*===============*/
+.stat {
+	margin: 10px 0 20px;
+}
+
+.stat th,
+.stat td,
+.stat tr {
+	border: none;
+}
+.stat > table td,
+.stat > table th {
+	border-bottom: 1px solid #ccc;
+	background: rgba(255,255,255,0.38);
+	box-shadow: 0 1px #fff;
+}
+
+.stat > .horizontal-list {
+	margin: 0 0 5px;
+}
+.stat > .horizontal-list .item {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.stat > .horizontal-list .item:first-child {
+	width: 250px;
+}
+
+/*=== LOGS */
+/*=========*/
+.logs {
+	border: 1px solid #aaa;
+	border-radius: 5px;
+	overflow: hidden;
+}
+.log {
+	padding: 5px 10px;
+	background: #fafafa;
+	color: #333;
+	font-size: 0.8rem;
+}
+.log+.log {
+	border-top: 1px solid #aaa;
+}
+.log .date {
+	display: block;
+	font-weight: bold;
+}
+.log.error {
+	background: #fdd;
+	color: #844;
+}
+.log.warning {
+	background: #ffe;
+	color: #c95;
+}
+.log.notice {
+	background: #f4f4f4;
+	color: #aaa;
+}
+.log.debug {
+	background: #333;
+	color: #eee;
+}
+
+#slider.active {
+    box-shadow: -4px 0 4px rgba(15, 15, 15, 0.55);
+    background: #F8F8F8;
+}
+#close-slider.active {
+    background: rgba(15, 15, 15, 0.35);
+}
+
+/*=== MOBILE */
+/*===========*/
+@media screen and (max-width: 840px) {
+	.header {
+		display: table;
+	}
+	.nav-login {
+		display: none;
+	}
+
+	.aside {
+		width: 0;
+		border-top: none;
+		box-shadow: 3px 0 3px #000;
+		transition: width 200ms linear;
+		-moz-transition: width 200ms linear;
+		-webkit-transition: width 200ms linear;
+		-o-transition: width 200ms linear;
+		-ms-transition: width 200ms linear;
+	}
+	.aside:target {
+		width: 235px;
+	}
+	.aside .toggle_aside,
+	#panel .close {
+		display: block;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
+		text-align: center;
+		background: #171717;
+		box-shadow: 0 1px rgba(255,255,255,0.08);
+	}
+	.aside .btn-important {
+		display: inline-block;
+		margin: 20px 0 0;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
+	}
+
+	.nav_menu .btn {
+		margin: 5px 10px;
+	}
+	.nav_menu .stick {
+		margin: 0 10px;
+	}
+	.nav_menu .stick .btn {
+		margin: 5px 0;
+	}
+	.nav_menu .search {
+		display: inline-block;
+		max-width: 97%;
+	}
+	.nav_menu .search input {
+		max-width: 97%;
+		width: 90px;
+	}
+	.nav_menu .search input:focus {
+		width: 400px;
+	}
+
+	.day .name {
+		display: none;
+	}
+
+	.pagination {
+		margin: 0 0 3.5em;
+	}
+
+	.notification a.close {
+		display: block;
+		left: 0;
+		background: transparent;
+	}
+	.notification a.close:hover {
+		opacity: 0.5;
+	}
+	.notification a.close .icon {
+		display: none;
+	}
+	.nav_menu .search {
+		display: none;
+	}
+
+	#nav_entries {
+		width: 100%;
+	}
+}
+
+@media (max-width: 700px) {
+	.header{
+		display: none;
+	}
+	.nav-login {
+		display: inline-block;
+		width: 100%;
+	}
+	.nav_menu .search {
+		display: inline-block;
+	}
+	.aside .btn-important {
+		display: none;
+	}
+}
diff --git a/p/themes/BlueLagoon/README.md b/p/themes/BlueLagoon/README.md
new file mode 100644
index 000000000..62afc234b
--- /dev/null
+++ b/p/themes/BlueLagoon/README.md
@@ -0,0 +1,38 @@
+Blue Lagoon
+=======
+
+**C'est un cocktail (bis)! C'est la version plus "fresh" de [Screwdriver](https://github.com/misterair/Screwdriver). C'est... c'est... un thème pour l'agrégateur de flux RSS [FreshRSS](https://github.com/marienfressinaud/FreshRSS/)**
+
+
+En toute modestie, ce thème tue du Nyan Cat.
+
+![screenshot](https://raw.githubusercontent.com/misterair/BlueLagoon/master/screenshot.png)
+
+
+Installation
+-----------------
+1. Placez le dossier du thème dans ledossier /FreshRSS/p/themes/Screwdriver de votre FreshRSS;
+2. Allez dans les paramètres d'Affichage et changez de thème;
+3. Profitez de votre Blue Laggon sans modération!
+4. Remontez les problèmes sur Github (*facultatif mais fortement apprécié*)
+
+
+
+Blue Lagoon est distribué sous license AlcoholWare:
+-----------------
+
+« LICENCE ALCOHOLWARE » (Révision 42):
+
+mister.air@gmail.com a créé ce fichier. Tant que vous conservez cet avertissement,
+
+vous pouvez faire ce que vous voulez de ce truc. Si on se rencontre un jour et
+
+que vous pensez que ce truc vaut le coup, vous pouvez me payer un verre (rempli) en retour.
+
+*Mister aiR*
+
+
+
+
+
+
diff --git a/p/themes/BlueLagoon/icons/bookmark.svg b/p/themes/BlueLagoon/icons/bookmark.svg
new file mode 100644
index 000000000..b77dc5518
--- /dev/null
+++ b/p/themes/BlueLagoon/icons/bookmark.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="bookmark.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-12.983051"
+     inkscape:cy="13.423729"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <g
+     transform="translate(-41.000202,-397)"
+     id="g4"
+     style="fill:#0062bf;fill-opacity:1">
+    <path
+       style="enable-background:accumulate;color:#000000;fill:#0062bf;fill-opacity:1"
+       d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z"
+       fill-rule="nonzero"
+       transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)"
+       fill="#f1c40f"
+       id="path6" />
+  </g>
+</svg>
diff --git a/p/themes/BlueLagoon/icons/favicon-16-32-48-64.ico b/p/themes/BlueLagoon/icons/favicon-16-32-48-64.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7c5eb55170c4960949e95b6047d9eada23bffc2f
GIT binary patch
literal 1150
zcmaiyZAep57{|}(MF}#a<4Z<po5-BOri}GrFJxR+F+%3hjbTh_i@pehArT{3G*+ft
zHvCWog9r<ywDL=#l2l+=9}2WI1vhKDF`Xt#%fj3L%m%)o-plVk=RD{CKj(Q4mk<Ho
z%uIrB0lBoBkZeMT7$AkrY94_QtYs)yNzQlp*lf0sH8nLoPN&lzkH<51kZ)R+$z%_N
zLg5(T)oOL5p`qc-Cebztx7&R+5C|9)3WW-L3>Fs`FPqI~-8PnWOQofyL3XxQtNrS5
zIHVZA!X7i#)zydA3AdO)F97W95%dz&Xf($#o)e43t}QIdbT}N&MXwJn7E7nc<B^C&
zqN89DXFDVkNh|gk+Rl$VZ-a(s!1I}Di;9XaVt%2ltW1H}3<NA+S6BC5r_(v>>+9_m
z6%{X84t;ks?|%}Agy(r;?u<@zZIS-Lspb6B9r2}8?eiX~RN95w9?Ru&E#fbO!H^BT
z1}uOTaGmY>Vsue{*carfce35}Zh@ozC{J5wE~6i7VPWB1Wo6|-Xor+aW#7QS02}WI
zxy*~R_f~aGy`fD>zoDut-m>bCX-Y~;_CXg`sZ{q6kAn#Ql{vj$&%q}ci6u^0o`&CM
zHIDPNX`=5_^mm>t5M6+Og0{wXvHjsWi`xI1OeVk4Xw1jl3(grIP0R|LM|gT;l&6j3
zul4QIIp?3x^wO3op86xT%$s_kH-RON<3e`3-R<>y3q-euKT!AZGwK;Nh35a{*}7xB
zS-$T){2la8BzgZSKa23Q=RTMPR@8q4^_O4iiTc!m$)CyoeUne<?Qr^9-^MY#?7vG>
z-~E=z@q9_u{{#J7sW-Ig+>QR!T-Z45NB!4Ozn0z{+mp(#jVt+ttQ-Jo0Jq6VFv<x@
VuZ8j?Z~;6noZJtBY@O-h{Rb-%8nplb

literal 0
HcmV?d00001

diff --git a/p/themes/BlueLagoon/icons/favicon-256.png b/p/themes/BlueLagoon/icons/favicon-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbe4ec4b7d85e84cc865c23c09b201bcdbd018ff
GIT binary patch
literal 16517
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

literal 0
HcmV?d00001

diff --git a/p/themes/BlueLagoon/icons/favicon.svg b/p/themes/BlueLagoon/icons/favicon.svg
new file mode 100644
index 000000000..ac816d68c
--- /dev/null
+++ b/p/themes/BlueLagoon/icons/favicon.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3039"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="256"
+   height="256"
+   sodipodi:docname="favicon.svg"
+   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/favicon-256.png"
+   inkscape:export-xdpi="384"
+   inkscape:export-ydpi="384">
+  <metadata
+     id="metadata3045">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3043">
+    <linearGradient
+       id="linearGradient3796">
+      <stop
+         style="stop-color:#0090ff;stop-opacity:1;"
+         offset="0"
+         id="stop3798" />
+      <stop
+         style="stop-color:#0062be;stop-opacity:1;"
+         offset="1"
+         id="stop3800" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4149">
+      <stop
+         style="stop-color:#d18114;stop-opacity:1;"
+         offset="0"
+         id="stop4151" />
+      <stop
+         style="stop-color:#ed9514;stop-opacity:1;"
+         offset="1"
+         id="stop4153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3796"
+       id="linearGradient3802"
+       x1="115.70001"
+       y1="14.639612"
+       x2="72.872742"
+       y2="53.017948"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview3041"
+     showgrid="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="1.3665434"
+     inkscape:cx="240.85477"
+     inkscape:cy="97.549233"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3039">
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,85.377907"
+       id="guide3049" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,51.485465"
+       id="guide3051" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="46.828488,67.526163"
+       id="guide3053" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81.238372,67.784884"
+       id="guide3055" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64.162791,98.831395"
+       id="guide3057" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,110.73256"
+       id="guide3059" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="63.90407,105.29942"
+       id="guide3061" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,120.30523"
+       id="guide3063" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,131.68895"
+       id="guide3065" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="-0.25872093,68.561047"
+       id="guide3067" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="128.06686,68.043605"
+       id="guide3069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="115.90698,68.043605"
+       id="guide3071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,4.3982558"
+       id="guide3073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="11.642442,68.043605"
+       id="guide3081" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="115.90698,68.043605"
+       id="guide3083" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="67.526163,16.040698"
+       id="guide3089" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,25.09593"
+       id="guide3091" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,36.738372"
+       id="guide3093" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="21.473837,68.043605"
+       id="guide3100" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="32.598837,68.043605"
+       id="guide3102" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="107.11047,68.043605"
+       id="guide3110" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="94.691861,68.043605"
+       id="guide3112" />
+  </sodipodi:namedview>
+  <g
+     id="g3988-3"
+     transform="matrix(1.7556028,0,0,1.7556028,2.4536682,156.92143)"
+     style="fill:#ffffff;fill-opacity:1">
+    <g
+       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
+       id="g3984-3"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+         id="path3975-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+         id="path3971-3"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(-4.1395349,-75.482558)"
+       id="g3977-7"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+         id="path3973-1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+         id="path3969-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+         id="path3967-2" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+         id="path3965-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+         id="path3095-6" />
+    </g>
+  </g>
+  <g
+     id="g3984"
+     transform="matrix(1.7160619,0,0,1.7160619,5.3998589,23.251436)"
+     style="fill:url(#linearGradient3802);fill-opacity:1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3975"
+       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+       style="fill:url(#linearGradient3802);fill-opacity:1.0;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3971"
+       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+       style="fill:url(#linearGradient3802);fill-opacity:1.0;stroke:none" />
+  </g>
+  <g
+     id="g3977"
+     transform="matrix(1.7556028,0,0,1.7556028,-3.4937681,21.015289)">
+    <path
+       id="path3973"
+       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3969"
+       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3967"
+       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3965"
+       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3095"
+       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/p/themes/BlueLagoon/icons/icon.svg b/p/themes/BlueLagoon/icons/icon.svg
new file mode 100644
index 000000000..083eeb685
--- /dev/null
+++ b/p/themes/BlueLagoon/icons/icon.svg
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3039"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="60"
+   height="60"
+   sodipodi:docname="favicon.svg"
+   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/favicon-256.png"
+   inkscape:export-xdpi="384"
+   inkscape:export-ydpi="384">
+  <metadata
+     id="metadata3045">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3043">
+    <linearGradient
+       id="linearGradient3796">
+      <stop
+         style="stop-color:#0090ff;stop-opacity:1;"
+         offset="0"
+         id="stop3798" />
+      <stop
+         style="stop-color:#0062be;stop-opacity:1;"
+         offset="1"
+         id="stop3800" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4149">
+      <stop
+         style="stop-color:#d18114;stop-opacity:1;"
+         offset="0"
+         id="stop4151" />
+      <stop
+         style="stop-color:#ed9514;stop-opacity:1;"
+         offset="1"
+         id="stop4153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3796"
+       id="linearGradient3802"
+       x1="115.70001"
+       y1="14.639612"
+       x2="72.872742"
+       y2="53.017948"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3796"
+       id="linearGradient3804"
+       gradientUnits="userSpaceOnUse"
+       x1="115.70001"
+       y1="14.639612"
+       x2="72.872742"
+       y2="53.017948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3796"
+       id="linearGradient3806"
+       gradientUnits="userSpaceOnUse"
+       x1="115.70001"
+       y1="14.639612"
+       x2="72.872742"
+       y2="53.017948" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview3041"
+     showgrid="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="7.7303368"
+     inkscape:cx="52.046987"
+     inkscape:cy="33.951186"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3039">
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,85.377907"
+       id="guide3049" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.386628,51.485465"
+       id="guide3051" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="46.828488,67.526163"
+       id="guide3053" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81.238372,67.784884"
+       id="guide3055" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64.162791,98.831395"
+       id="guide3057" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,110.73256"
+       id="guide3059" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="63.90407,105.29942"
+       id="guide3061" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,120.30523"
+       id="guide3063" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,131.68895"
+       id="guide3065" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="-0.25872093,68.561047"
+       id="guide3067" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="128.06686,68.043605"
+       id="guide3069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="115.90698,68.043605"
+       id="guide3071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,4.3982558"
+       id="guide3073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="11.642442,68.043605"
+       id="guide3081" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="115.90698,68.043605"
+       id="guide3083" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="67.526163,16.040698"
+       id="guide3089" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,25.09593"
+       id="guide3091" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="63.90407,36.738372"
+       id="guide3093" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="21.473837,68.043605"
+       id="guide3100" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="32.598837,68.043605"
+       id="guide3102" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="107.11047,68.043605"
+       id="guide3110" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="94.691861,68.043605"
+       id="guide3112" />
+  </sodipodi:namedview>
+  <g
+     id="g3988-3"
+     transform="matrix(0.41471269,0,0,0.41471269,0.4367596,36.849335)"
+     style="fill:#ffffff;fill-opacity:1">
+    <g
+       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
+       id="g3984-3"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+         id="path3975-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+         id="path3971-3"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(-4.1395349,-75.482558)"
+       id="g3977-7"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+         id="path3973-1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+         id="path3969-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+         id="path3967-2" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+         id="path3965-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+         id="path3095-6" />
+    </g>
+  </g>
+  <g
+     id="g3984"
+     transform="matrix(0.40537224,0,0,0.40537224,1.1327158,5.273491)"
+     style="fill:url(#linearGradient3802);fill-opacity:1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3975"
+       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
+       style="fill:url(#linearGradient3804);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3971"
+       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
+       style="fill:url(#linearGradient3806);fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     id="g3977"
+     transform="matrix(0.41471269,0,0,0.41471269,-0.96815804,4.7452623)">
+    <path
+       id="path3973"
+       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3969"
+       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3967"
+       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3965"
+       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3095"
+       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
+       style="fill:#222222;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/p/themes/BlueLagoon/icons/non-starred.svg b/p/themes/BlueLagoon/icons/non-starred.svg
new file mode 100644
index 000000000..2762b060a
--- /dev/null
+++ b/p/themes/BlueLagoon/icons/non-starred.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   id="svg3003"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="non-starred.svg">
+  <metadata
+     id="metadata3013">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3011" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview3009"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-2.779661"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3003" />
+  <g
+     transform="translate(-61.000202,-397)"
+     id="g3005"
+     style="fill:#666666;fill-opacity:1">
+    <path
+       style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;fill:#666666;fill-opacity:1"
+       fill="#bebebe"
+       d="m69.003,398.01c-0.2659-0.00099-0.49859,0.1006-0.6647,0.2393-0.16611,0.13869-0.27742,0.32137-0.38968,0.50028-0.22453,0.35782-0.39269,0.76873-0.56546,1.2036-0.17277,0.43483-0.34713,0.88766-0.5046,1.2323-0.15747,0.34465-0.3456,0.57871-0.35862,0.58776-0.01287,0.009-0.30722,0.117-0.69576,0.15181-0.38855,0.0348-0.88122,0.0492-1.3632,0.0694-0.48202,0.0202-0.9703,0.0362-1.393,0.12817-0.21138,0.046-0.4154,0.10148-0.60434,0.20956s-0.36689,0.28631-0.45004,0.53002-0.04901,0.50627,0.03636,0.70157c0.08537,0.19531,0.22656,0.36514,0.3682,0.52344,0.2833,0.31663,0.6327,0.60557,1.0079,0.89849s0.77671,0.55926,1.0678,0.81027c0.29104,0.25101,0.45422,0.50796,0.45912,0.52271,0.0048,0.0146,0.03119,0.33498-0.05456,0.70231-0.08575,0.36732-0.2238,0.81174-0.35282,1.2603-0.12902,0.44861-0.25176,0.90196-0.2917,1.3184-0.01997,0.20819-0.04285,0.40729,0.0053,0.61409,0.04814,0.20679,0.1845,0.43007,0.39902,0.58168,0.21451,0.15161,0.44936,0.1881,0.66823,0.1701s0.43535-0.0703,0.63515-0.15132c0.39961-0.16214,0.80177-0.42851,1.2064-0.68231,0.40465-0.2538,0.80822-0.52155,1.1456-0.71107,0.33734-0.18952,0.6484-0.2686,0.66445-0.26854,0.01586,0.00006,0.30338,0.0951,0.63894,0.28732,0.33556,0.19221,0.72532,0.46503,1.1276,0.72205,0.40229,0.25702,0.81996,0.49752,1.218,0.66284,0.19903,0.0827,0.38893,0.15086,0.60762,0.17059,0.2187,0.0197,0.47978-0.031,0.69551-0.18105,0.21572-0.15001,0.33928-0.35235,0.38918-0.55877s0.04291-0.43517,0.02476-0.64358c-0.03632-0.41683-0.15899-0.86394-0.2841-1.3137-0.12511-0.44978-0.26165-0.88661-0.34421-1.2548-0.08256-0.36813-0.07169-0.68662-0.06666-0.70133,0.005-0.0145,0.18746-0.25247,0.4806-0.50101,0.29313-0.24854,0.67599-0.53755,1.0536-0.82731,0.37764-0.28976,0.76716-0.57158,1.0531-0.88579,0.14298-0.1571,0.2418-0.33444,0.32882-0.52904s0.136-0.42874,0.05481-0.67306-0.27108-0.41314-0.45912-0.52272-0.36679-0.18158-0.57782-0.22931c-0.42206-0.0955-0.91359-0.14009-1.3956-0.16426-0.48198-0.0242-0.94584-0.039-1.3342-0.077s-0.71565-0.13122-0.72859-0.14037c-0.01279-0.009-0.18402-0.23636-0.3384-0.58217s-0.32658-0.78819-0.49548-1.2243c-0.1689-0.4361-0.33477-0.86429-0.55609-1.2238-0.11067-0.17977-0.23335-0.35397-0.39826-0.49396s-0.40309-0.25684-0.66899-0.25783zm0.0086,0.99424c0.0422,0.0358,0.10671,0.13602,0.1841,0.26173,0.15477,0.25141,0.33068,0.6272,0.49397,1.0488,0.16329,0.42163,0.31905,0.88645,0.49598,1.2828,0.17693,0.39633,0.31456,0.73379,0.6753,0.98889,0.36072,0.25509,0.77019,0.29763,1.2152,0.34118,0.44506,0.0435,0.92882,0.0532,1.3948,0.0765,0.46599,0.0234,0.91824,0.0697,1.2135,0.13647,0.14763,0.0334,0.25558,0.0572,0.30381,0.0853-0.02227,0.0498-0.07958,0.15478-0.17956,0.26464-0.19997,0.21973-0.53749,0.48746-0.90261,0.7676-0.36511,0.28015-0.77804,0.57219-1.114,0.85704-0.33595,0.28485-0.63992,0.53221-0.77987,0.94209-0.13995,0.40986-0.05396,0.77681,0.04065,1.1987s0.25406,0.87813,0.37502,1.313c0.12096,0.43486,0.22688,0.84692,0.25228,1.1385,0.01156,0.13264-0.01699,0.23485-0.02778,0.29267-0.05993-0.008-0.1764-0.0324-0.30381-0.0853-0.27836-0.11561-0.64649-0.32808-1.0354-0.57657-0.38894-0.24849-0.8039-0.53053-1.1885-0.75081-0.38457-0.22028-0.70791-0.39837-1.1551-0.40015-0.44722-0.002-0.79205,0.17245-1.1786,0.38965-0.38659,0.21719-0.78438,0.49517-1.1756,0.74055-0.39123,0.24538-0.77636,0.4507-1.0559,0.56412-0.13977,0.0567-0.24616,0.0856-0.3023,0.0902-0.01026-0.0578-0.01522-0.16008-0.0025-0.29243,0.02793-0.29118,0.13818-0.70893,0.26291-1.1426,0.12473-0.43372,0.25404-0.89785,0.35232-1.3188,0.09828-0.42099,0.18672-0.78846,0.05027-1.1994-0.13644-0.41097-0.43218-0.64202-0.76571-0.92967-0.33353-0.28766-0.70551-0.58555-1.0683-0.86876-0.36275-0.2832-0.7178-0.56075-0.91597-0.78224-0.09908-0.11075-0.16221-0.21163-0.1841-0.26173,0.04834-0.0276,0.15448-0.058,0.3023-0.0902,0.29562-0.0643,0.74518-0.10714,1.2112-0.1267,0.46603-0.0196,0.94824-0.0298,1.3935-0.0697,0.44531-0.0399,0.84679-0.0499,1.2097-0.30216,0.36289-0.25221,0.5383-0.60511,0.71876-1.0001,0.18046-0.39497,0.33731-0.84115,0.50435-1.2616,0.16704-0.42041,0.31848-0.83556,0.47556-1.0859,0.07853-0.12515,0.16751-0.20007,0.21012-0.23565z"
+       id="path3007" />
+  </g>
+</svg>
diff --git a/p/themes/BlueLagoon/icons/read.svg b/p/themes/BlueLagoon/icons/read.svg
new file mode 100644
index 000000000..28980576b
--- /dev/null
+++ b/p/themes/BlueLagoon/icons/read.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="read.svg">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview10"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="20.85965"
+     inkscape:cx="1.4146405"
+     inkscape:cy="1.9030696"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <sodipodi:guide
+       orientation="0,1"
+       position="18.02523,13.039528"
+       id="guide4011" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="10.738435,2.1093355"
+       id="guide4013" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#666666;fill-opacity:1"
+     d="M 7.96875 3.53125 C 4.5348428 3.53125 1.5876066 5.5165625 0.125 8.4375 C 0.82219215 9.8298459 1.8542852 11.018132 3.125 11.875 L 4.1875 10.8125 C 4.1557149 10.792908 4.1252734 10.770107 4.09375 10.75 C 3.1686838 10.159963 2.4013362 9.3681638 1.8125 8.4375 C 2.4013064 7.5068362 3.1686838 6.7150381 4.09375 6.125 C 4.153999 6.086558 4.2200207 6.0678159 4.28125 6.03125 C 4.1281272 6.4514645 4.03125 6.9017961 4.03125 7.375 C 4.03125 8.3743663 4.4176287 9.2745486 5.03125 9.96875 L 6.6875 8.3125 C 6.6279286 8.3198156 6.5615492 8.34375 6.5 8.34375 C 5.6847243 8.34375 5.03125 7.6902761 5.03125 6.875 C 5.03125 6.0597241 5.6847243 5.40625 6.5 5.40625 C 7.315274 5.40625 7.96875 6.0597241 7.96875 6.875 C 7.96875 6.9365493 7.9448156 7.0029284 7.9375 7.0625 L 10.9375 4.0625 C 10.012284 3.7268614 9.0067293 3.53125 7.96875 3.53125 z M 13.9375 5.875 L 12.875 6.9375 C 13.361343 7.384153 13.800475 7.875184 14.15625 8.4375 C 13.567444 9.3681312 12.800096 10.159902 11.875 10.75 C 10.712608 11.491404 9.3458636 11.90625 7.96875 11.90625 C 7.9474196 11.90625 7.9275631 11.906438 7.90625 11.90625 L 6.5625 13.25 C 7.0252716 13.326399 7.484852 13.375 7.96875 13.375 C 11.402597 13.375 14.381083 11.358437 15.84375 8.4375 C 15.35848 7.4683588 14.717496 6.6019095 13.9375 5.875 z M 11.875 7.9375 L 8.5625 11.25 C 10.272165 10.995832 11.624635 9.6484033 11.875 7.9375 z "
+     id="path3167" />
+  <path
+     style="fill:#666666;fill-opacity:1;stroke:none"
+     d="M 2.4921273,13.890664 13.300845,3.0127581 15.437224,2.9604715 4.3408683,13.890664 z"
+     id="path2990"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="12.094976"
+     inkscape:transform-center-y="-3.2041508"
+     sodipodi:nodetypes="ccccc" />
+</svg>
diff --git a/p/themes/BlueLagoon/icons/starred.svg b/p/themes/BlueLagoon/icons/starred.svg
new file mode 100644
index 000000000..4c749ce26
--- /dev/null
+++ b/p/themes/BlueLagoon/icons/starred.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="starred.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-2.779661"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4" />
+  <g
+     transform="translate(-41.000202,-397)"
+     id="g4">
+    <path
+       style="enable-background:accumulate;color:#000000;fill:#0062bf;fill-opacity:1"
+       d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z"
+       fill-rule="nonzero"
+       transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)"
+       fill="#f1c40f"
+       id="path6" />
+  </g>
+</svg>
diff --git a/p/themes/BlueLagoon/icons/unread.svg b/p/themes/BlueLagoon/icons/unread.svg
new file mode 100644
index 000000000..596dec0ac
--- /dev/null
+++ b/p/themes/BlueLagoon/icons/unread.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="unread.svg">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="745"
+     id="namedview10"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="20.85965"
+     inkscape:cx="3.2842788"
+     inkscape:cy="5.738225"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <sodipodi:guide
+       orientation="0,1"
+       position="18.02523,13.039528"
+       id="guide4011" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="10.738435,2.1093355"
+       id="guide4013" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#666666;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     d="m 7.9824408,3.5290339 c -3.4339072,0 -6.4102945,1.9996258 -7.87290106,4.9205633 C 1.5721463,11.370534 4.5485336,13.37016 7.9824408,13.37016 c 3.4338472,0 6.4102342,-1.999626 7.8729012,-4.9205628 C 14.392765,5.5286597 11.416288,3.5290339 7.9824408,3.5290339 z m 3.8818632,2.6094964 c 0.925096,0.590068 1.709004,1.3804357 2.29781,2.3110669 -0.588806,0.9306312 -1.372744,1.7209988 -2.29784,2.3110968 -1.162392,0.741404 -2.5047196,1.133295 -3.8818332,1.133295 -1.377143,0 -2.7194718,-0.391891 -3.8818628,-1.133326 C 3.1755118,10.170626 2.3916036,9.380261 1.8027674,8.4495972 2.3915738,7.5189334 3.1755118,6.7285684 4.100578,6.1385303 4.160827,6.1000883 4.221686,6.0628483 4.2829153,6.0262824 c -0.1531228,0.4202145 -0.236925,0.873738 -0.236925,1.3469419 0,2.1740274 1.7624231,3.9364497 3.9364505,3.9364497 2.1740272,0 3.9364512,-1.7624223 3.9364512,-3.9364497 0,-0.4732039 -0.0838,-0.9267274 -0.236925,-1.3469745 0.0612,0.036566 0.122061,0.073839 0.182337,0.1122805 z M 7.9824408,6.8811665 c 0,0.8152761 -0.660894,1.4761705 -1.476168,1.4761705 -0.8152757,0 -1.4761697,-0.6608944 -1.4761697,-1.4761705 0,-0.8152759 0.660894,-1.4761676 1.4761697,-1.4761676 0.815274,0 1.476168,0.6608917 1.476168,1.4761676 z"
+     id="path3167" />
+</svg>
diff --git a/p/themes/BlueLagoon/loader.gif b/p/themes/BlueLagoon/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a0839dcc79b0eb10452429cdf53daf3e6c25d62f
GIT binary patch
literal 3164
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
ZI2T^;ickW_KJD)HxWt|z$~s{Ce*tRDPz?Y8

literal 0
HcmV?d00001

diff --git a/p/themes/BlueLagoon/metadata.json b/p/themes/BlueLagoon/metadata.json
new file mode 100644
index 000000000..2c415a613
--- /dev/null
+++ b/p/themes/BlueLagoon/metadata.json
@@ -0,0 +1,7 @@
+{
+  "name": "Blue Lagoon",
+  "author": "Mister aiR",
+  "description": "C'est un cocktail (bis)! C'est la version plus fresh de Screwdriver. C'est... c'est... un thème pour l'agrégateur de flux RSS FreshRSS. En toute modestie, ce thème tue du Nyan Cat.",
+  "version": 1.0,
+  "files": ["_template.css","BlueLagoon.css"]
+}
diff --git a/p/themes/BlueLagoon/template.css b/p/themes/BlueLagoon/template.css
new file mode 100644
index 000000000..bf421e322
--- /dev/null
+++ b/p/themes/BlueLagoon/template.css
@@ -0,0 +1,695 @@
+@charset "UTF-8";
+
+/*=== GENERAL */
+/*============*/
+html, body { 
+	margin: 0;
+	padding: 0;
+	font-size: 92%;
+}
+
+/*=== Links */
+a {
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: underline;
+}
+
+/*=== Lists */
+ul, ol, dd {
+	margin: 0;
+	padding: 0;
+}
+
+/*=== Titles */
+h1 {
+	margin: 0.6em 0 0.3em;
+	font-size: 1.5em;
+	line-height: 1.6em;
+}
+h2 {
+	margin: 0.5em 0 0.25em;
+	font-size: 1.3em;
+	line-height: 2em;
+}
+h3 {
+	margin: 0.5em 0 0.25em;
+	font-size: 1.1em;
+	line-height: 2em;
+}
+
+/*=== Paragraphs */
+p {
+	margin: 1em 0 0.5em;
+	font-size: 1em;
+}
+
+/*=== Images */
+img {
+	height: auto;
+	max-width: 100%;
+}
+img.favicon {
+	height: 16px;
+	width: 16px;
+	vertical-align: middle;
+}
+
+/*=== Videos */
+iframe, embed, object, video {
+	max-width: 100%;
+}
+
+/*=== Forms */
+legend {
+	display: block;
+	width: 100%;
+	clear: both;
+}
+label {
+	display: block;
+}
+input {
+	width: 180px;
+}
+textarea {
+	width: 300px;
+}
+input, select, textarea {
+	display: inline-block;
+	max-width: 100%;
+}
+input[type="radio"],
+input[type="checkbox"] {
+	width: 15px !important;
+	min-height: 15px !important;
+}
+input.extend:focus {
+	width: 300px;
+}
+
+/*=== COMPONENTS */
+/*===============*/
+/*=== Forms */
+.form-group:after {
+	content: "";
+	display: block;
+	clear: both;
+}
+.form-group.form-actions {
+	min-width: 250px;
+}
+.form-group .group-name {
+	display: block;
+	float: left;
+	width: 200px;
+}
+.form-group .group-controls {
+	min-width: 250px;
+	margin: 0 0 0 220px;
+}
+.form-group .group-controls .control {
+	display: block;
+}
+
+/*=== Buttons */
+.stick {
+	display: inline-block;
+	white-space: nowrap;
+}
+.btn,
+a.btn {
+	display: inline-block;
+	cursor: pointer;
+	overflow: hidden;
+}
+.btn-important {
+	font-weight: bold;
+}
+
+/*=== Navigation */
+.nav-list .nav-header,
+.nav-list .item {
+	display: block;
+}
+.nav-list .item,
+.nav-list .item > a {
+	display: block;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.nav-head {
+	display: block;
+}
+.nav-head .item {
+	display: inline-block;
+}
+
+/*=== Horizontal-list */
+.horizontal-list {
+	display: table;
+	table-layout: fixed;
+	width: 100%;
+}
+.horizontal-list .item {
+	display: table-cell;
+}
+
+/*=== Dropdown */
+.dropdown {
+	position: relative;
+	display: inline-block;
+}
+.dropdown-target {
+	display: none;
+}
+.dropdown-menu {
+	display: none;
+	min-width: 200px;
+	margin: 0;
+	position: absolute;
+	right: 0;
+	background: #fff;
+	border: 1px solid #aaa;
+}
+.dropdown-header {
+	display: block;
+}
+.dropdown-menu > .item {
+	display: block;
+}
+.dropdown-menu > .item > a,
+.dropdown-menu > .item > span {
+	display: block;
+}
+.dropdown-menu > .item[aria-checked="true"] > a:before {
+	content: '✓';
+}
+.dropdown-menu .input {
+	display: block;
+}
+.dropdown-menu .input select,
+.dropdown-menu .input input {
+	display: block;
+	max-width: 95%;
+}
+.dropdown-target:target ~ .dropdown-menu {
+	display: block;
+	z-index: 10;
+}
+.dropdown-close {
+	display: inline;
+}
+.dropdown-close a {
+	font-size: 0;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 0; right: 0;
+	display: block;
+	z-index: -10;
+}
+.separator {
+	display: block;
+	height: 0;
+	border-bottom: 1px solid #aaa;
+}
+
+/*=== Alerts */
+.alert {
+	display: block;
+	width: 90%;
+}
+.group-controls .alert {
+	width: 100%
+}
+.alert-head {
+	margin: 0;
+	font-weight: bold;
+}
+.alert ul {
+	margin: 5px 20px;
+}
+
+/*=== Icons */
+.icon {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: middle;
+	line-height: 16px;
+}
+
+/*=== Pagination */
+.pagination {
+	display: table;
+	width: 100%;
+	margin: 0;
+	padding: 0;
+	table-layout: fixed;
+}
+.pagination .item {
+	display: table-cell;
+}
+.pagination .pager-first,
+.pagination .pager-previous,
+.pagination .pager-next,
+.pagination .pager-last {
+	width: 100px;
+}
+
+/*=== STRUCTURE */
+/*===============*/
+/*=== Header */
+.header {
+	display: table;
+	width: 100%;
+	table-layout: fixed;
+}
+.header > .item {
+	display: table-cell;
+}
+.header > .item.title {
+	width: 250px;
+	white-space: nowrap;
+}
+.header > .item.title h1 {
+	display: inline-block;
+}
+.header > .item.title .logo {
+	display: inline-block;
+	height: 32px;
+	width: 32px;
+	vertical-align: middle;
+}
+.header > .item.configure {
+	width: 100px;
+}
+
+/*=== Body */
+#global {
+	display: table;
+	width: 100%;
+	height: 100%;
+	table-layout: fixed;
+}
+.aside {
+	display: table-cell;
+	height: 100%;
+	width: 250px;
+	vertical-align: top;
+}
+.aside.aside_flux {
+	background: #fff;
+}
+
+/*=== Aside main page (categories) */
+.categories {
+	list-style: none;
+	margin: 0;
+}
+.category {
+	display: block;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.category .btn:not([data-unread="0"]):after {
+	content: attr(data-unread);
+}
+
+/*=== Aside main page (feeds) */
+.categories .feeds {
+	width: 100%;
+	list-style: none;
+}
+.categories .feeds:not(.active) {
+	display: none;
+}
+.categories .feeds .feed {
+	display: inline-block;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	vertical-align: middle;
+}
+.categories .feeds .feed:not([data-unread="0"]):before {
+	content: "(" attr(data-unread) ") ";
+}
+.categories .feeds .dropdown-menu {
+	left: 0;
+}
+.categories .feeds .item .dropdown-toggle > .icon {
+	visibility: hidden;
+	cursor: pointer;
+	vertical-align: top;
+}
+.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.categories .feeds .item:hover .dropdown-toggle > .icon,
+.categories .feeds .item.active .dropdown-toggle > .icon {
+	visibility: visible;
+}
+
+/*=== New article notification */
+#new-article {
+	display: none;
+}
+#new-article > a {
+	display: block;
+}
+
+/*=== Day indication */
+.day .name {
+	position: absolute;
+	right: 0;
+	width: 50%;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+/*=== Feed article header and footer */
+.flux_header {
+	position: relative;
+}
+.flux .item {
+	line-height: 40px;
+	white-space: nowrap;
+}
+.flux .item.manage,
+.flux .item.link {
+	width: 40px;
+	text-align: center;
+}
+.flux .item.website {
+	width: 200px;
+}
+.flux.not_read .item.title,
+.flux.current .item.title {
+	font-weight: bold;
+}
+.flux:not(.current):hover .item.title {
+	position: absolute;
+	max-width: calc(100% - 320px);
+	background: #fff;
+}
+.flux .item.title a {
+	color: #000;
+	text-decoration: none;
+}
+.flux .item.date {
+	width: 145px;
+	text-align: right;
+}
+.flux .item > a {
+	display: block;
+}
+.flux .item > a {
+	display: block;
+	text-decoration: none;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.flux .item.share > a {
+	display: list-item;
+	list-style-position: inside;
+	list-style-type: decimal;
+}
+
+/*=== Feed article content */
+.hide_posts > .flux:not(.active) > .flux_content {
+	display: none;
+}
+.content {
+	min-height: 20em;
+	margin: auto;
+	line-height: 1.7em;
+	word-wrap: break-word;
+}
+.content.large {
+	max-width: 1000px;
+}
+.content.medium {
+	max-width: 800px;
+}
+.content.thin {
+	max-width: 550px;
+}
+.content ul,
+.content ol,
+.content dd {
+	margin: 0 0 0 15px;
+	padding: 0 0 5px 15px;
+}
+.content pre {
+	overflow: auto;
+}
+
+/*=== Notification and actualize notification */
+.notification {
+	position: absolute;
+	top: 1em;
+	left: 25%; right: 25%;
+	z-index: 10;
+	background: #fff;
+	border: 1px solid #aaa;
+}
+.notification.closed {
+	display: none;
+}
+.notification a.close {
+	position: absolute;
+	top: 0; bottom: 0;
+	right: 0;
+	display: inline-block;
+}
+
+#actualizeProgress {
+	position: fixed;
+}
+#actualizeProgress progress {
+	max-width: 100%;
+	vertical-align: middle;
+}
+#actualizeProgress .progress {
+	vertical-align: middle;
+}
+
+/*=== Navigation menu (for articles) */
+#nav_entries {
+	position: fixed;
+	bottom: 0; left: 0;
+	display: table;
+	width: 250px;
+	background: #fff;
+	table-layout: fixed;
+}
+#nav_entries .item {
+	display: table-cell;
+	width: 30%;
+}
+#nav_entries a {
+	display: block;
+}
+
+/*=== "Load more" part */
+#load_more {
+	min-height: 40px;
+}
+.loading {
+	background: url("loader.gif") center center no-repeat;
+	font-size: 0;
+}
+#bigMarkAsRead {
+	display: block;
+	padding: 3em 0;
+	text-align: center;
+}
+.bigTick {
+	font-size: 7em;
+	line-height: 1.6em;
+}
+
+/*=== Statistiques */
+.stat > table {
+	width: 100%;
+}
+
+/*=== GLOBAL VIEW */
+/*================*/
+/*=== Category boxes */
+#stream.global .box-category {
+	display: inline-block;
+	width: 19em;
+	max-width: 95%;
+	margin: 20px 10px;
+	border: 1px solid #ccc;
+	vertical-align: top;
+}
+#stream.global .category {
+	width: 100%;
+}
+#stream.global .btn {
+	display: block;
+}
+#stream.global .box-category .feeds {
+	display: block;
+	overflow: auto;
+}
+#stream.global .box-category .feed {
+	width: 19em;
+	max-width: 90%;
+}
+
+/*=== Panel */
+#overlay {
+	display: none;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 0; right: 0;
+	background: rgba(0, 0, 0, 0.9);
+}
+#panel {
+	display: none;
+	position: fixed;
+	top: 1em; bottom: 1em;
+	left: 2em; right: 2em;
+	overflow: auto;
+	background: #fff;
+}
+#panel .close {
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 0; right: 0;
+	display: block;
+}
+#panel .close img {
+	display: none;
+}
+
+/*=== DIVERS */
+/*===========*/
+.nav-login,
+.nav_menu .search,
+.nav_menu .toggle_aside {
+	display: none;
+}
+
+.aside .toggle_aside {
+	position: absolute;
+	right: 0;
+	display: none;
+	width: 30px;
+	height: 30px;
+	line-height: 30px;
+	text-align: center;
+}
+
+/*=== MOBILE */
+/*===========*/
+@media(max-width: 840px) {
+	.header,
+	.aside .btn-important,
+	.aside .feeds .dropdown,
+	.flux_header .item.website span,
+	.item.date, .day .date,
+	.dropdown-menu > .no-mobile,
+	.no-mobile {
+		display: none;
+	}
+	.nav-login {
+		display: block;
+	}
+	.nav_menu .toggle_aside,
+	.aside .toggle_aside,
+	.nav_menu .search,
+	#panel .close img {
+		display: inline-block;
+	}
+
+	.aside {
+		position: fixed;
+		top: 0; bottom: 0;
+		left: 0;
+		width: 0;
+		overflow: hidden;
+		z-index: 100;
+	}
+	.aside:target {
+		width: 90%;
+		overflow: auto;
+	}
+	.aside .categories {
+		margin: 10px 0 75px;
+	}
+
+	.flux_header .item.website {
+		width: 40px;
+	}
+
+	.flux:not(.current):hover .item.title {
+		position: relative;
+		width: auto;
+		white-space: nowrap;
+	}
+
+	.notification {
+		top: 0;
+		left: 0;
+		right: 0;
+	}
+
+	#nav_entries {
+		width: 100%;
+	}
+
+	#stream.global .box-category {
+		margin: 10px 0;
+	}
+
+	#panel {
+		top: 0; bottom: 0;
+		left: 0; right: 0;
+	}
+	#panel .close {
+		top: 0; right: 0;
+		left: auto; bottom: auto;
+		display: inline-block;
+		width: 30px;
+		height: 30px;
+	}
+}
+
+/*=== PRINTER */
+/*============*/
+@media print {
+	.header, .aside,
+	.nav_menu, .day,
+	.flux_header,
+	.flux_content .bottom,
+	.pagination,
+	#nav_entries {
+		display: none;
+	}
+	html, body {
+		background: #fff;
+		color: #000;
+		font-family: Serif;
+	}
+	#global,
+	.flux_content {
+		display: block !important;
+	}
+	.flux_content .content {
+		width: 100% !important;
+	}
+	.flux_content .content a {
+		color: #000;
+	}
+	.flux_content .content a:after {
+		content: " [" attr(href) "] ";
+		font-style: italic;
+	}
+}
diff --git a/p/themes/BlueLagoon/thumbs/original.png b/p/themes/BlueLagoon/thumbs/original.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb8695945abbd929ec5d70abbdf98485d24fa0f4
GIT binary patch
literal 153829
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%0DWnbpPgIclPHaqfh&_<ayol@h$2m
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
O6Qm@s_6h*O!~PG|<4i*U

literal 0
HcmV?d00001


From 498f8315f724a5e85b28907c3bc4dc08699d679e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 26 Nov 2014 17:54:41 -0500
Subject: [PATCH 172/363] Optimize bluelagoon theme icons.

In the future, we should pay attention to those icons since I've done that a couple of time now. We should have some documentation for new contributions.
---
 p/themes/BlueLagoon/icons/bookmark.svg    |  64 +----
 p/themes/BlueLagoon/icons/favicon.svg     | 303 +++-----------------
 p/themes/BlueLagoon/icons/icon.svg        | 321 +++-------------------
 p/themes/BlueLagoon/icons/non-starred.svg |  62 +----
 p/themes/BlueLagoon/icons/read.svg        |  74 +----
 p/themes/BlueLagoon/icons/starred.svg     |  63 +----
 p/themes/BlueLagoon/icons/unread.svg      |  66 +----
 7 files changed, 80 insertions(+), 873 deletions(-)

diff --git a/p/themes/BlueLagoon/icons/bookmark.svg b/p/themes/BlueLagoon/icons/bookmark.svg
index b77dc5518..7f33d9753 100644
--- a/p/themes/BlueLagoon/icons/bookmark.svg
+++ b/p/themes/BlueLagoon/icons/bookmark.svg
@@ -1,61 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="bookmark.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-12.983051"
-     inkscape:cy="13.423729"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <g
-     transform="translate(-41.000202,-397)"
-     id="g4"
-     style="fill:#0062bf;fill-opacity:1">
-    <path
-       style="enable-background:accumulate;color:#000000;fill:#0062bf;fill-opacity:1"
-       d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z"
-       fill-rule="nonzero"
-       transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)"
-       fill="#f1c40f"
-       id="path6" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg">
+<g fill="#0062bf" transform="translate(-41.000202,-397)">
+<path style="color:#000000;enable-background:accumulate;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#0062bf"/>
+</g>
 </svg>
diff --git a/p/themes/BlueLagoon/icons/favicon.svg b/p/themes/BlueLagoon/icons/favicon.svg
index ac816d68c..1b6801a26 100644
--- a/p/themes/BlueLagoon/icons/favicon.svg
+++ b/p/themes/BlueLagoon/icons/favicon.svg
@@ -1,273 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3039"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="256"
-   height="256"
-   sodipodi:docname="favicon.svg"
-   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/favicon-256.png"
-   inkscape:export-xdpi="384"
-   inkscape:export-ydpi="384">
-  <metadata
-     id="metadata3045">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3043">
-    <linearGradient
-       id="linearGradient3796">
-      <stop
-         style="stop-color:#0090ff;stop-opacity:1;"
-         offset="0"
-         id="stop3798" />
-      <stop
-         style="stop-color:#0062be;stop-opacity:1;"
-         offset="1"
-         id="stop3800" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4149">
-      <stop
-         style="stop-color:#d18114;stop-opacity:1;"
-         offset="0"
-         id="stop4151" />
-      <stop
-         style="stop-color:#ed9514;stop-opacity:1;"
-         offset="1"
-         id="stop4153" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3796"
-       id="linearGradient3802"
-       x1="115.70001"
-       y1="14.639612"
-       x2="72.872742"
-       y2="53.017948"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3041"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="1.3665434"
-     inkscape:cx="240.85477"
-     inkscape:cy="97.549233"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3039">
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,85.377907"
-       id="guide3049" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,51.485465"
-       id="guide3051" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.828488,67.526163"
-       id="guide3053" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="81.238372,67.784884"
-       id="guide3055" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="64.162791,98.831395"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,110.73256"
-       id="guide3059" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="63.90407,105.29942"
-       id="guide3061" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,120.30523"
-       id="guide3063" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,131.68895"
-       id="guide3065" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-0.25872093,68.561047"
-       id="guide3067" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="128.06686,68.043605"
-       id="guide3069" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="115.90698,68.043605"
-       id="guide3071" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,4.3982558"
-       id="guide3073" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.642442,68.043605"
-       id="guide3081" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="115.90698,68.043605"
-       id="guide3083" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="67.526163,16.040698"
-       id="guide3089" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,25.09593"
-       id="guide3091" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,36.738372"
-       id="guide3093" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="21.473837,68.043605"
-       id="guide3100" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="32.598837,68.043605"
-       id="guide3102" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="107.11047,68.043605"
-       id="guide3110" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="94.691861,68.043605"
-       id="guide3112" />
-  </sodipodi:namedview>
-  <g
-     id="g3988-3"
-     transform="matrix(1.7556028,0,0,1.7556028,2.4536682,156.92143)"
-     style="fill:#ffffff;fill-opacity:1">
-    <g
-       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
-       id="g3984-3"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-         id="path3975-8"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-         id="path3971-3"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-4.1395349,-75.482558)"
-       id="g3977-7"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-         id="path3973-1" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-         id="path3969-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-         id="path3967-2" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-         id="path3965-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-         id="path3095-6" />
-    </g>
-  </g>
-  <g
-     id="g3984"
-     transform="matrix(1.7160619,0,0,1.7160619,5.3998589,23.251436)"
-     style="fill:url(#linearGradient3802);fill-opacity:1">
-    <path
-       inkscape:connector-curvature="0"
-       id="path3975"
-       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-       style="fill:url(#linearGradient3802);fill-opacity:1.0;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3971"
-       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-       style="fill:url(#linearGradient3802);fill-opacity:1.0;stroke:none" />
-  </g>
-  <g
-     id="g3977"
-     transform="matrix(1.7556028,0,0,1.7556028,-3.4937681,21.015289)">
-    <path
-       id="path3973"
-       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3969"
-       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3967"
-       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3965"
-       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3095"
-       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+<linearGradient id="linearGradient3802" y2="53.018" gradientUnits="userSpaceOnUse" x2="72.873" y1="14.64" x1="115.7">
+<stop stop-color="#0090ff" offset="0"/>
+<stop stop-color="#0062be" offset="1"/>
+</linearGradient>
+</defs>
+<g fill="#FFF" transform="matrix(1.7556028,0,0,1.7556028,2.4536682,156.92143)">
+<g transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g transform="translate(-4.1395349,-75.482558)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</g>
+<g fill="url(#linearGradient3802)" transform="matrix(1.7160619,0,0,1.7160619,5.3998589,23.251436)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g fill="#222" transform="matrix(1.7556028,0,0,1.7556028,-3.4937681,21.015289)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
 </svg>
diff --git a/p/themes/BlueLagoon/icons/icon.svg b/p/themes/BlueLagoon/icons/icon.svg
index 083eeb685..8abfea179 100644
--- a/p/themes/BlueLagoon/icons/icon.svg
+++ b/p/themes/BlueLagoon/icons/icon.svg
@@ -1,291 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3039"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="60"
-   height="60"
-   sodipodi:docname="favicon.svg"
-   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/favicon-256.png"
-   inkscape:export-xdpi="384"
-   inkscape:export-ydpi="384">
-  <metadata
-     id="metadata3045">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3043">
-    <linearGradient
-       id="linearGradient3796">
-      <stop
-         style="stop-color:#0090ff;stop-opacity:1;"
-         offset="0"
-         id="stop3798" />
-      <stop
-         style="stop-color:#0062be;stop-opacity:1;"
-         offset="1"
-         id="stop3800" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4149">
-      <stop
-         style="stop-color:#d18114;stop-opacity:1;"
-         offset="0"
-         id="stop4151" />
-      <stop
-         style="stop-color:#ed9514;stop-opacity:1;"
-         offset="1"
-         id="stop4153" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3796"
-       id="linearGradient3802"
-       x1="115.70001"
-       y1="14.639612"
-       x2="72.872742"
-       y2="53.017948"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3796"
-       id="linearGradient3804"
-       gradientUnits="userSpaceOnUse"
-       x1="115.70001"
-       y1="14.639612"
-       x2="72.872742"
-       y2="53.017948" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3796"
-       id="linearGradient3806"
-       gradientUnits="userSpaceOnUse"
-       x1="115.70001"
-       y1="14.639612"
-       x2="72.872742"
-       y2="53.017948" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3041"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="7.7303368"
-     inkscape:cx="52.046987"
-     inkscape:cy="33.951186"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3039">
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,85.377907"
-       id="guide3049" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,51.485465"
-       id="guide3051" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.828488,67.526163"
-       id="guide3053" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="81.238372,67.784884"
-       id="guide3055" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="64.162791,98.831395"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,110.73256"
-       id="guide3059" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="63.90407,105.29942"
-       id="guide3061" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,120.30523"
-       id="guide3063" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,131.68895"
-       id="guide3065" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-0.25872093,68.561047"
-       id="guide3067" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="128.06686,68.043605"
-       id="guide3069" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="115.90698,68.043605"
-       id="guide3071" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,4.3982558"
-       id="guide3073" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.642442,68.043605"
-       id="guide3081" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="115.90698,68.043605"
-       id="guide3083" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="67.526163,16.040698"
-       id="guide3089" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,25.09593"
-       id="guide3091" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,36.738372"
-       id="guide3093" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="21.473837,68.043605"
-       id="guide3100" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="32.598837,68.043605"
-       id="guide3102" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="107.11047,68.043605"
-       id="guide3110" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="94.691861,68.043605"
-       id="guide3112" />
-  </sodipodi:namedview>
-  <g
-     id="g3988-3"
-     transform="matrix(0.41471269,0,0,0.41471269,0.4367596,36.849335)"
-     style="fill:#ffffff;fill-opacity:1">
-    <g
-       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
-       id="g3984-3"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-         id="path3975-8"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-         id="path3971-3"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-4.1395349,-75.482558)"
-       id="g3977-7"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-         id="path3973-1" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-         id="path3969-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-         id="path3967-2" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-         id="path3965-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-         id="path3095-6" />
-    </g>
-  </g>
-  <g
-     id="g3984"
-     transform="matrix(0.40537224,0,0,0.40537224,1.1327158,5.273491)"
-     style="fill:url(#linearGradient3802);fill-opacity:1">
-    <path
-       inkscape:connector-curvature="0"
-       id="path3975"
-       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-       style="fill:url(#linearGradient3804);fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3971"
-       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-       style="fill:url(#linearGradient3806);fill-opacity:1;stroke:none" />
-  </g>
-  <g
-     id="g3977"
-     transform="matrix(0.41471269,0,0,0.41471269,-0.96815804,4.7452623)">
-    <path
-       id="path3973"
-       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3969"
-       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3967"
-       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3965"
-       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3095"
-       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<linearGradient id="linearGradient3796">
+<stop stop-color="#0090ff" offset="0"/>
+<stop stop-color="#0062be" offset="1"/>
+</linearGradient>
+<linearGradient id="linearGradient3802" y2="53.018" xlink:href="#linearGradient3796" gradientUnits="userSpaceOnUse" x2="72.873" y1="14.64" x1="115.7"/>
+</defs>
+<g fill="#FFF" transform="matrix(0.41471269,0,0,0.41471269,0.4367596,36.849335)">
+<g transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g transform="translate(-4.1395349,-75.482558)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</g>
+<g fill="url(#linearGradient3802)" transform="matrix(0.40537224,0,0,0.40537224,1.1327158,5.273491)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g fill="#222" transform="matrix(0.41471269,0,0,0.41471269,-0.96815804,4.7452623)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
 </svg>
diff --git a/p/themes/BlueLagoon/icons/non-starred.svg b/p/themes/BlueLagoon/icons/non-starred.svg
index 2762b060a..d5c1f5ee0 100644
--- a/p/themes/BlueLagoon/icons/non-starred.svg
+++ b/p/themes/BlueLagoon/icons/non-starred.svg
@@ -1,59 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   id="svg3003"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="non-starred.svg">
-  <metadata
-     id="metadata3013">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3011" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3009"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-2.779661"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3003" />
-  <g
-     transform="translate(-61.000202,-397)"
-     id="g3005"
-     style="fill:#666666;fill-opacity:1">
-    <path
-       style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;fill:#666666;fill-opacity:1"
-       fill="#bebebe"
-       d="m69.003,398.01c-0.2659-0.00099-0.49859,0.1006-0.6647,0.2393-0.16611,0.13869-0.27742,0.32137-0.38968,0.50028-0.22453,0.35782-0.39269,0.76873-0.56546,1.2036-0.17277,0.43483-0.34713,0.88766-0.5046,1.2323-0.15747,0.34465-0.3456,0.57871-0.35862,0.58776-0.01287,0.009-0.30722,0.117-0.69576,0.15181-0.38855,0.0348-0.88122,0.0492-1.3632,0.0694-0.48202,0.0202-0.9703,0.0362-1.393,0.12817-0.21138,0.046-0.4154,0.10148-0.60434,0.20956s-0.36689,0.28631-0.45004,0.53002-0.04901,0.50627,0.03636,0.70157c0.08537,0.19531,0.22656,0.36514,0.3682,0.52344,0.2833,0.31663,0.6327,0.60557,1.0079,0.89849s0.77671,0.55926,1.0678,0.81027c0.29104,0.25101,0.45422,0.50796,0.45912,0.52271,0.0048,0.0146,0.03119,0.33498-0.05456,0.70231-0.08575,0.36732-0.2238,0.81174-0.35282,1.2603-0.12902,0.44861-0.25176,0.90196-0.2917,1.3184-0.01997,0.20819-0.04285,0.40729,0.0053,0.61409,0.04814,0.20679,0.1845,0.43007,0.39902,0.58168,0.21451,0.15161,0.44936,0.1881,0.66823,0.1701s0.43535-0.0703,0.63515-0.15132c0.39961-0.16214,0.80177-0.42851,1.2064-0.68231,0.40465-0.2538,0.80822-0.52155,1.1456-0.71107,0.33734-0.18952,0.6484-0.2686,0.66445-0.26854,0.01586,0.00006,0.30338,0.0951,0.63894,0.28732,0.33556,0.19221,0.72532,0.46503,1.1276,0.72205,0.40229,0.25702,0.81996,0.49752,1.218,0.66284,0.19903,0.0827,0.38893,0.15086,0.60762,0.17059,0.2187,0.0197,0.47978-0.031,0.69551-0.18105,0.21572-0.15001,0.33928-0.35235,0.38918-0.55877s0.04291-0.43517,0.02476-0.64358c-0.03632-0.41683-0.15899-0.86394-0.2841-1.3137-0.12511-0.44978-0.26165-0.88661-0.34421-1.2548-0.08256-0.36813-0.07169-0.68662-0.06666-0.70133,0.005-0.0145,0.18746-0.25247,0.4806-0.50101,0.29313-0.24854,0.67599-0.53755,1.0536-0.82731,0.37764-0.28976,0.76716-0.57158,1.0531-0.88579,0.14298-0.1571,0.2418-0.33444,0.32882-0.52904s0.136-0.42874,0.05481-0.67306-0.27108-0.41314-0.45912-0.52272-0.36679-0.18158-0.57782-0.22931c-0.42206-0.0955-0.91359-0.14009-1.3956-0.16426-0.48198-0.0242-0.94584-0.039-1.3342-0.077s-0.71565-0.13122-0.72859-0.14037c-0.01279-0.009-0.18402-0.23636-0.3384-0.58217s-0.32658-0.78819-0.49548-1.2243c-0.1689-0.4361-0.33477-0.86429-0.55609-1.2238-0.11067-0.17977-0.23335-0.35397-0.39826-0.49396s-0.40309-0.25684-0.66899-0.25783zm0.0086,0.99424c0.0422,0.0358,0.10671,0.13602,0.1841,0.26173,0.15477,0.25141,0.33068,0.6272,0.49397,1.0488,0.16329,0.42163,0.31905,0.88645,0.49598,1.2828,0.17693,0.39633,0.31456,0.73379,0.6753,0.98889,0.36072,0.25509,0.77019,0.29763,1.2152,0.34118,0.44506,0.0435,0.92882,0.0532,1.3948,0.0765,0.46599,0.0234,0.91824,0.0697,1.2135,0.13647,0.14763,0.0334,0.25558,0.0572,0.30381,0.0853-0.02227,0.0498-0.07958,0.15478-0.17956,0.26464-0.19997,0.21973-0.53749,0.48746-0.90261,0.7676-0.36511,0.28015-0.77804,0.57219-1.114,0.85704-0.33595,0.28485-0.63992,0.53221-0.77987,0.94209-0.13995,0.40986-0.05396,0.77681,0.04065,1.1987s0.25406,0.87813,0.37502,1.313c0.12096,0.43486,0.22688,0.84692,0.25228,1.1385,0.01156,0.13264-0.01699,0.23485-0.02778,0.29267-0.05993-0.008-0.1764-0.0324-0.30381-0.0853-0.27836-0.11561-0.64649-0.32808-1.0354-0.57657-0.38894-0.24849-0.8039-0.53053-1.1885-0.75081-0.38457-0.22028-0.70791-0.39837-1.1551-0.40015-0.44722-0.002-0.79205,0.17245-1.1786,0.38965-0.38659,0.21719-0.78438,0.49517-1.1756,0.74055-0.39123,0.24538-0.77636,0.4507-1.0559,0.56412-0.13977,0.0567-0.24616,0.0856-0.3023,0.0902-0.01026-0.0578-0.01522-0.16008-0.0025-0.29243,0.02793-0.29118,0.13818-0.70893,0.26291-1.1426,0.12473-0.43372,0.25404-0.89785,0.35232-1.3188,0.09828-0.42099,0.18672-0.78846,0.05027-1.1994-0.13644-0.41097-0.43218-0.64202-0.76571-0.92967-0.33353-0.28766-0.70551-0.58555-1.0683-0.86876-0.36275-0.2832-0.7178-0.56075-0.91597-0.78224-0.09908-0.11075-0.16221-0.21163-0.1841-0.26173,0.04834-0.0276,0.15448-0.058,0.3023-0.0902,0.29562-0.0643,0.74518-0.10714,1.2112-0.1267,0.46603-0.0196,0.94824-0.0298,1.3935-0.0697,0.44531-0.0399,0.84679-0.0499,1.2097-0.30216,0.36289-0.25221,0.5383-0.60511,0.71876-1.0001,0.18046-0.39497,0.33731-0.84115,0.50435-1.2616,0.16704-0.42041,0.31848-0.83556,0.47556-1.0859,0.07853-0.12515,0.16751-0.20007,0.21012-0.23565z"
-       id="path3007" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg">
+<g fill="#666" transform="translate(-61.000202,-397)">
+<path style="direction:ltr;baseline-shift:baseline;block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none;text-align:start;" d="m69.003,398.01c-0.2659-0.00099-0.49859,0.1006-0.6647,0.2393-0.16611,0.13869-0.27742,0.32137-0.38968,0.50028-0.22453,0.35782-0.39269,0.76873-0.56546,1.2036-0.17277,0.43483-0.34713,0.88766-0.5046,1.2323-0.15747,0.34465-0.3456,0.57871-0.35862,0.58776-0.01287,0.009-0.30722,0.117-0.69576,0.15181-0.38855,0.0348-0.88122,0.0492-1.3632,0.0694-0.48202,0.0202-0.9703,0.0362-1.393,0.12817-0.21138,0.046-0.4154,0.10148-0.60434,0.20956s-0.36689,0.28631-0.45004,0.53002-0.04901,0.50627,0.03636,0.70157c0.08537,0.19531,0.22656,0.36514,0.3682,0.52344,0.2833,0.31663,0.6327,0.60557,1.0079,0.89849s0.77671,0.55926,1.0678,0.81027c0.29104,0.25101,0.45422,0.50796,0.45912,0.52271,0.0048,0.0146,0.03119,0.33498-0.05456,0.70231-0.08575,0.36732-0.2238,0.81174-0.35282,1.2603-0.12902,0.44861-0.25176,0.90196-0.2917,1.3184-0.01997,0.20819-0.04285,0.40729,0.0053,0.61409,0.04814,0.20679,0.1845,0.43007,0.39902,0.58168,0.21451,0.15161,0.44936,0.1881,0.66823,0.1701s0.43535-0.0703,0.63515-0.15132c0.39961-0.16214,0.80177-0.42851,1.2064-0.68231,0.40465-0.2538,0.80822-0.52155,1.1456-0.71107,0.33734-0.18952,0.6484-0.2686,0.66445-0.26854,0.01586,0.00006,0.30338,0.0951,0.63894,0.28732,0.33556,0.19221,0.72532,0.46503,1.1276,0.72205,0.40229,0.25702,0.81996,0.49752,1.218,0.66284,0.19903,0.0827,0.38893,0.15086,0.60762,0.17059,0.2187,0.0197,0.47978-0.031,0.69551-0.18105,0.21572-0.15001,0.33928-0.35235,0.38918-0.55877s0.04291-0.43517,0.02476-0.64358c-0.03632-0.41683-0.15899-0.86394-0.2841-1.3137-0.12511-0.44978-0.26165-0.88661-0.34421-1.2548-0.08256-0.36813-0.07169-0.68662-0.06666-0.70133,0.005-0.0145,0.18746-0.25247,0.4806-0.50101,0.29313-0.24854,0.67599-0.53755,1.0536-0.82731,0.37764-0.28976,0.76716-0.57158,1.0531-0.88579,0.14298-0.1571,0.2418-0.33444,0.32882-0.52904s0.136-0.42874,0.05481-0.67306-0.27108-0.41314-0.45912-0.52272-0.36679-0.18158-0.57782-0.22931c-0.42206-0.0955-0.91359-0.14009-1.3956-0.16426-0.48198-0.0242-0.94584-0.039-1.3342-0.077s-0.71565-0.13122-0.72859-0.14037c-0.01279-0.009-0.18402-0.23636-0.3384-0.58217s-0.32658-0.78819-0.49548-1.2243c-0.1689-0.4361-0.33477-0.86429-0.55609-1.2238-0.11067-0.17977-0.23335-0.35397-0.39826-0.49396s-0.40309-0.25684-0.66899-0.25783zm0.0086,0.99424c0.0422,0.0358,0.10671,0.13602,0.1841,0.26173,0.15477,0.25141,0.33068,0.6272,0.49397,1.0488,0.16329,0.42163,0.31905,0.88645,0.49598,1.2828,0.17693,0.39633,0.31456,0.73379,0.6753,0.98889,0.36072,0.25509,0.77019,0.29763,1.2152,0.34118,0.44506,0.0435,0.92882,0.0532,1.3948,0.0765,0.46599,0.0234,0.91824,0.0697,1.2135,0.13647,0.14763,0.0334,0.25558,0.0572,0.30381,0.0853-0.02227,0.0498-0.07958,0.15478-0.17956,0.26464-0.19997,0.21973-0.53749,0.48746-0.90261,0.7676-0.36511,0.28015-0.77804,0.57219-1.114,0.85704-0.33595,0.28485-0.63992,0.53221-0.77987,0.94209-0.13995,0.40986-0.05396,0.77681,0.04065,1.1987s0.25406,0.87813,0.37502,1.313c0.12096,0.43486,0.22688,0.84692,0.25228,1.1385,0.01156,0.13264-0.01699,0.23485-0.02778,0.29267-0.05993-0.008-0.1764-0.0324-0.30381-0.0853-0.27836-0.11561-0.64649-0.32808-1.0354-0.57657-0.38894-0.24849-0.8039-0.53053-1.1885-0.75081-0.38457-0.22028-0.70791-0.39837-1.1551-0.40015-0.44722-0.002-0.79205,0.17245-1.1786,0.38965-0.38659,0.21719-0.78438,0.49517-1.1756,0.74055-0.39123,0.24538-0.77636,0.4507-1.0559,0.56412-0.13977,0.0567-0.24616,0.0856-0.3023,0.0902-0.01026-0.0578-0.01522-0.16008-0.0025-0.29243,0.02793-0.29118,0.13818-0.70893,0.26291-1.1426,0.12473-0.43372,0.25404-0.89785,0.35232-1.3188,0.09828-0.42099,0.18672-0.78846,0.05027-1.1994-0.13644-0.41097-0.43218-0.64202-0.76571-0.92967-0.33353-0.28766-0.70551-0.58555-1.0683-0.86876-0.36275-0.2832-0.7178-0.56075-0.91597-0.78224-0.09908-0.11075-0.16221-0.21163-0.1841-0.26173,0.04834-0.0276,0.15448-0.058,0.3023-0.0902,0.29562-0.0643,0.74518-0.10714,1.2112-0.1267,0.46603-0.0196,0.94824-0.0298,1.3935-0.0697,0.44531-0.0399,0.84679-0.0499,1.2097-0.30216,0.36289-0.25221,0.5383-0.60511,0.71876-1.0001,0.18046-0.39497,0.33731-0.84115,0.50435-1.2616,0.16704-0.42041,0.31848-0.83556,0.47556-1.0859,0.07853-0.12515,0.16751-0.20007,0.21012-0.23565z" fill="#666"/>
+</g>
 </svg>
diff --git a/p/themes/BlueLagoon/icons/read.svg b/p/themes/BlueLagoon/icons/read.svg
index 28980576b..269b75738 100644
--- a/p/themes/BlueLagoon/icons/read.svg
+++ b/p/themes/BlueLagoon/icons/read.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="read.svg">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview10"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="20.85965"
-     inkscape:cx="1.4146405"
-     inkscape:cy="1.9030696"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <sodipodi:guide
-       orientation="0,1"
-       position="18.02523,13.039528"
-       id="guide4011" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="10.738435,2.1093355"
-       id="guide4013" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#666666;fill-opacity:1"
-     d="M 7.96875 3.53125 C 4.5348428 3.53125 1.5876066 5.5165625 0.125 8.4375 C 0.82219215 9.8298459 1.8542852 11.018132 3.125 11.875 L 4.1875 10.8125 C 4.1557149 10.792908 4.1252734 10.770107 4.09375 10.75 C 3.1686838 10.159963 2.4013362 9.3681638 1.8125 8.4375 C 2.4013064 7.5068362 3.1686838 6.7150381 4.09375 6.125 C 4.153999 6.086558 4.2200207 6.0678159 4.28125 6.03125 C 4.1281272 6.4514645 4.03125 6.9017961 4.03125 7.375 C 4.03125 8.3743663 4.4176287 9.2745486 5.03125 9.96875 L 6.6875 8.3125 C 6.6279286 8.3198156 6.5615492 8.34375 6.5 8.34375 C 5.6847243 8.34375 5.03125 7.6902761 5.03125 6.875 C 5.03125 6.0597241 5.6847243 5.40625 6.5 5.40625 C 7.315274 5.40625 7.96875 6.0597241 7.96875 6.875 C 7.96875 6.9365493 7.9448156 7.0029284 7.9375 7.0625 L 10.9375 4.0625 C 10.012284 3.7268614 9.0067293 3.53125 7.96875 3.53125 z M 13.9375 5.875 L 12.875 6.9375 C 13.361343 7.384153 13.800475 7.875184 14.15625 8.4375 C 13.567444 9.3681312 12.800096 10.159902 11.875 10.75 C 10.712608 11.491404 9.3458636 11.90625 7.96875 11.90625 C 7.9474196 11.90625 7.9275631 11.906438 7.90625 11.90625 L 6.5625 13.25 C 7.0252716 13.326399 7.484852 13.375 7.96875 13.375 C 11.402597 13.375 14.381083 11.358437 15.84375 8.4375 C 15.35848 7.4683588 14.717496 6.6019095 13.9375 5.875 z M 11.875 7.9375 L 8.5625 11.25 C 10.272165 10.995832 11.624635 9.6484033 11.875 7.9375 z "
-     id="path3167" />
-  <path
-     style="fill:#666666;fill-opacity:1;stroke:none"
-     d="M 2.4921273,13.890664 13.300845,3.0127581 15.437224,2.9604715 4.3408683,13.890664 z"
-     id="path2990"
-     inkscape:connector-curvature="0"
-     inkscape:transform-center-x="12.094976"
-     inkscape:transform-center-y="-3.2041508"
-     sodipodi:nodetypes="ccccc" />
+<svg xmlns="http://www.w3.org/2000/svg">
+<path fill="#666" d="M7.9688,3.5312c-3.434,0-6.3812,1.9854-7.8438,4.9063,0.69719,1.3923,1.7293,2.5805,3,3.4375l1.0625-1.063c-0.0318-0.019-0.0622-0.042-0.0937-0.062-0.9251-0.59-1.6925-1.3818-2.2813-2.3125,0.5888-0.9307,1.3562-1.7225,2.2813-2.3125,0.0602-0.0384,0.1262-0.0572,0.1874-0.0938-0.1531,0.4203-0.25,0.8706-0.25,1.3438,0,0.9994,0.3864,1.8995,1,2.5938l1.6563-1.6563c-0.0596,0.0073-0.126,0.0313-0.1875,0.0313-0.8153,0-1.4688-0.6535-1.4688-1.4688s0.6535-1.4688,1.4688-1.4688,1.4688,0.6535,1.4688,1.4688c0,0.0615-0.024,0.1279-0.0313,0.1875l3.0005-3c-0.926-0.3356-1.9313-0.5313-2.9692-0.5313zm5.9692,2.3438l-1.063,1.0625c0.486,0.4467,0.925,0.9377,1.281,1.5-0.589,0.9306-1.356,1.7225-2.281,2.3125-1.162,0.741-2.5291,1.156-3.9062,1.156h-0.0626l-1.3437,1.344c0.4628,0.076,0.9224,0.125,1.4063,0.125,3.4342,0,6.4122-2.017,7.8752-4.9375-0.486-0.9691-1.127-1.8356-1.906-2.5625zm-2.063,2.0625l-3.3125,3.3125c1.7095-0.254,3.0625-1.6016,3.3125-3.3125z"/>
+<path d="M2.4921,13.891,13.301,3.0128,15.437,2.9605,4.3409,13.891z" fill="#666"/>
 </svg>
diff --git a/p/themes/BlueLagoon/icons/starred.svg b/p/themes/BlueLagoon/icons/starred.svg
index 4c749ce26..10a16f04a 100644
--- a/p/themes/BlueLagoon/icons/starred.svg
+++ b/p/themes/BlueLagoon/icons/starred.svg
@@ -1,60 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="starred.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-2.779661"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4" />
-  <g
-     transform="translate(-41.000202,-397)"
-     id="g4">
-    <path
-       style="enable-background:accumulate;color:#000000;fill:#0062bf;fill-opacity:1"
-       d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z"
-       fill-rule="nonzero"
-       transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)"
-       fill="#f1c40f"
-       id="path6" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(-41.000202,-397)">
+<path style="color:#000000;enable-background:accumulate;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#0062bf"/>
+</g>
 </svg>
diff --git a/p/themes/BlueLagoon/icons/unread.svg b/p/themes/BlueLagoon/icons/unread.svg
index 596dec0ac..bd39d683a 100644
--- a/p/themes/BlueLagoon/icons/unread.svg
+++ b/p/themes/BlueLagoon/icons/unread.svg
@@ -1,65 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="unread.svg">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     id="namedview10"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="20.85965"
-     inkscape:cx="3.2842788"
-     inkscape:cy="5.738225"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <sodipodi:guide
-       orientation="0,1"
-       position="18.02523,13.039528"
-       id="guide4011" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="10.738435,2.1093355"
-       id="guide4013" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#666666;fill-opacity:1"
-     inkscape:connector-curvature="0"
-     d="m 7.9824408,3.5290339 c -3.4339072,0 -6.4102945,1.9996258 -7.87290106,4.9205633 C 1.5721463,11.370534 4.5485336,13.37016 7.9824408,13.37016 c 3.4338472,0 6.4102342,-1.999626 7.8729012,-4.9205628 C 14.392765,5.5286597 11.416288,3.5290339 7.9824408,3.5290339 z m 3.8818632,2.6094964 c 0.925096,0.590068 1.709004,1.3804357 2.29781,2.3110669 -0.588806,0.9306312 -1.372744,1.7209988 -2.29784,2.3110968 -1.162392,0.741404 -2.5047196,1.133295 -3.8818332,1.133295 -1.377143,0 -2.7194718,-0.391891 -3.8818628,-1.133326 C 3.1755118,10.170626 2.3916036,9.380261 1.8027674,8.4495972 2.3915738,7.5189334 3.1755118,6.7285684 4.100578,6.1385303 4.160827,6.1000883 4.221686,6.0628483 4.2829153,6.0262824 c -0.1531228,0.4202145 -0.236925,0.873738 -0.236925,1.3469419 0,2.1740274 1.7624231,3.9364497 3.9364505,3.9364497 2.1740272,0 3.9364512,-1.7624223 3.9364512,-3.9364497 0,-0.4732039 -0.0838,-0.9267274 -0.236925,-1.3469745 0.0612,0.036566 0.122061,0.073839 0.182337,0.1122805 z M 7.9824408,6.8811665 c 0,0.8152761 -0.660894,1.4761705 -1.476168,1.4761705 -0.8152757,0 -1.4761697,-0.6608944 -1.4761697,-1.4761705 0,-0.8152759 0.660894,-1.4761676 1.4761697,-1.4761676 0.815274,0 1.476168,0.6608917 1.476168,1.4761676 z"
-     id="path3167" />
+<svg xmlns="http://www.w3.org/2000/svg">
+<path fill="#666" d="m7.9824,3.529c-3.4339,0-6.4103,1.9996-7.8729,4.9206,1.4626,2.9214,4.439,4.9204,7.8729,4.9204,3.4338,0,6.4102-1.9996,7.8729-4.9206-1.462-2.9207-4.439-4.9204-7.8726-4.9204zm3.8819,2.6095c0.9251,0.59007,1.709,1.3804,2.2978,2.3111-0.58881,0.93063-1.3727,1.721-2.2978,2.3111-1.1624,0.7414-2.5047,1.1333-3.8818,1.1333s-2.7195-0.39189-3.8819-1.1333c-0.9248-0.59-1.7087-1.3807-2.2975-2.3114,0.5888-0.9307,1.3727-1.721,2.2978-2.3111,0.0602-0.0384,0.1211-0.0757,0.1823-0.1122-0.15312,0.42021-0.23692,0.87374-0.23692,1.3469,0,2.174,1.7624,3.9364,3.9365,3.9364,2.174,0,3.9365-1.7624,3.9365-3.9364,0-0.4732-0.0838-0.92673-0.23692-1.347,0.0612,0.036566,0.12206,0.073839,0.18234,0.11228zm-3.8816,0.7427c0,0.81528-0.66089,1.4762-1.4762,1.4762-0.81528,0-1.4762-0.66089-1.4762-1.4762,0-0.81528,0.66089-1.4762,1.4762-1.4762,0.81527,0,1.4762,0.66089,1.4762,1.4762z"/>
 </svg>

From 82745a509a1284a9fe6a7f8d5d153eda953d9e11 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 26 Nov 2014 18:14:17 -0500
Subject: [PATCH 173/363] Optimize screwdriver theme icons.

---
 p/themes/Screwdriver/icons/favicon.svg | 312 +++----------------------
 p/themes/Screwdriver/icons/icon.svg    | 303 +++---------------------
 2 files changed, 66 insertions(+), 549 deletions(-)

diff --git a/p/themes/Screwdriver/icons/favicon.svg b/p/themes/Screwdriver/icons/favicon.svg
index aaab5de99..895a727bb 100644
--- a/p/themes/Screwdriver/icons/favicon.svg
+++ b/p/themes/Screwdriver/icons/favicon.svg
@@ -1,280 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3039"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="256"
-   height="256"
-   sodipodi:docname="favicon.svg"
-   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/favicon-256.png"
-   inkscape:export-xdpi="384"
-   inkscape:export-ydpi="384">
-  <metadata
-     id="metadata3045">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3043">
-    <linearGradient
-       id="linearGradient4149">
-      <stop
-         style="stop-color:#d18114;stop-opacity:1;"
-         offset="0"
-         id="stop4151" />
-      <stop
-         style="stop-color:#ed9514;stop-opacity:1;"
-         offset="1"
-         id="stop4153" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4149"
-       id="linearGradient4155"
-       x1="64.10247"
-       y1="28.285242"
-       x2="144.5123"
-       y2="28.285242"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4149"
-       id="linearGradient4159"
-       gradientUnits="userSpaceOnUse"
-       x1="64.10247"
-       y1="69.53215"
-       x2="126.83504"
-       y2="-11.652239" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4149"
-       id="linearGradient3247"
-       gradientUnits="userSpaceOnUse"
-       x1="64.10247"
-       y1="28.285242"
-       x2="144.5123"
-       y2="28.285242" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3041"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="1.3665434"
-     inkscape:cx="300.59761"
-     inkscape:cy="69.818202"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3039">
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,85.377907"
-       id="guide3049" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,51.485465"
-       id="guide3051" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.828488,67.526163"
-       id="guide3053" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="81.238372,67.784884"
-       id="guide3055" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="64.162791,98.831395"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,110.73256"
-       id="guide3059" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="63.90407,105.29942"
-       id="guide3061" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,120.30523"
-       id="guide3063" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,131.68895"
-       id="guide3065" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-0.25872093,68.561047"
-       id="guide3067" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="128.06686,68.043605"
-       id="guide3069" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="115.90698,68.043605"
-       id="guide3071" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,4.3982558"
-       id="guide3073" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.642442,68.043605"
-       id="guide3081" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="115.90698,68.043605"
-       id="guide3083" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="67.526163,16.040698"
-       id="guide3089" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,25.09593"
-       id="guide3091" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,36.738372"
-       id="guide3093" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="21.473837,68.043605"
-       id="guide3100" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="32.598837,68.043605"
-       id="guide3102" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="107.11047,68.043605"
-       id="guide3110" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="94.691861,68.043605"
-       id="guide3112" />
-  </sodipodi:namedview>
-  <g
-     id="g3988-3"
-     transform="matrix(1.7556028,0,0,1.7556028,2.4536682,156.92143)"
-     style="fill:#ffffff;fill-opacity:1">
-    <g
-       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
-       id="g3984-3"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-         id="path3975-8"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-         id="path3971-3"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-4.1395349,-75.482558)"
-       id="g3977-7"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-         id="path3973-1" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-         id="path3969-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-         id="path3967-2" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-         id="path3965-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-         id="path3095-6" />
-    </g>
-  </g>
-  <g
-     id="g3984"
-     transform="matrix(1.7160619,0,0,1.7160619,5.3998589,23.251436)"
-     style="fill:url(#linearGradient4159);fill-opacity:1">
-    <path
-       inkscape:connector-curvature="0"
-       id="path3975"
-       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-       style="fill:url(#linearGradient3247);fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3971"
-       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-       style="fill:url(#linearGradient4155);fill-opacity:1;stroke:none" />
-  </g>
-  <g
-     id="g3977"
-     transform="matrix(1.7556028,0,0,1.7556028,-3.4937681,21.015289)">
-    <path
-       id="path3973"
-       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3969"
-       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3967"
-       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3965"
-       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3095"
-       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<linearGradient id="linearGradient4149">
+<stop stop-color="#d18114" offset="0"/>
+<stop stop-color="#ed9514" offset="1"/>
+</linearGradient>
+<linearGradient id="linearGradient4155" y2="28.285" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="144.51" y1="28.285" x1="64.102"/>
+<linearGradient id="linearGradient4159" y2="-11.652" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="126.84" y1="69.532" x1="64.102"/>
+</defs>
+<g fill="#FFF" transform="matrix(1.7556028,0,0,1.7556028,2.4536682,156.92143)">
+<g transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g transform="translate(-4.1395349,-75.482558)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</g>
+<g fill="url(#linearGradient4155)" transform="matrix(1.7160619,0,0,1.7160619,5.3998589,23.251436)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g fill="#222" transform="matrix(1.7556028,0,0,1.7556028,-3.4937681,21.015289)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
 </svg>
diff --git a/p/themes/Screwdriver/icons/icon.svg b/p/themes/Screwdriver/icons/icon.svg
index 7f3d76af2..268814463 100644
--- a/p/themes/Screwdriver/icons/icon.svg
+++ b/p/themes/Screwdriver/icons/icon.svg
@@ -1,271 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3039"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="60"
-   height="60"
-   sodipodi:docname="icon.svg"
-   inkscape:export-filename="/home/MisteraiR/Documents/Screwdriver/icons/logo.svg.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata3045">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3043">
-    <linearGradient
-       id="linearGradient4149">
-      <stop
-         style="stop-color:#d18114;stop-opacity:1;"
-         offset="0"
-         id="stop4151" />
-      <stop
-         style="stop-color:#ed9514;stop-opacity:1;"
-         offset="1"
-         id="stop4153" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4149"
-       id="linearGradient4155"
-       x1="64.102467"
-       y1="28.285242"
-       x2="144.5123"
-       y2="28.285242"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4149"
-       id="linearGradient4159"
-       gradientUnits="userSpaceOnUse"
-       x1="64.10247"
-       y1="69.53215"
-       x2="126.83504"
-       y2="-11.652239" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="746"
-     id="namedview3041"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="0.48314606"
-     inkscape:cx="76.646731"
-     inkscape:cy="144.12468"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3039">
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,85.377907"
-       id="guide3049" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.386628,51.485465"
-       id="guide3051" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="46.828488,67.526163"
-       id="guide3053" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="81.238372,67.784884"
-       id="guide3055" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="64.162791,98.831395"
-       id="guide3057" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,110.73256"
-       id="guide3059" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="63.90407,105.29942"
-       id="guide3061" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,120.30523"
-       id="guide3063" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,131.68895"
-       id="guide3065" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-0.25872093,68.561047"
-       id="guide3067" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="128.06686,68.043605"
-       id="guide3069" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="115.90698,68.043605"
-       id="guide3071" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,4.3982558"
-       id="guide3073" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="11.642442,68.043605"
-       id="guide3081" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="115.90698,68.043605"
-       id="guide3083" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="67.526163,16.040698"
-       id="guide3089" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,25.09593"
-       id="guide3091" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="63.90407,36.738372"
-       id="guide3093" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="21.473837,68.043605"
-       id="guide3100" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="32.598837,68.043605"
-       id="guide3102" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="107.11047,68.043605"
-       id="guide3110" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="94.691861,68.043605"
-       id="guide3112" />
-  </sodipodi:namedview>
-  <g
-     id="g3988-3"
-     transform="matrix(0.40427237,0,0,0.40427237,0.65228897,36.70875)"
-     style="fill:#ffffff;fill-opacity:1">
-    <g
-       transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)"
-       id="g3984-3"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-         id="path3975-8"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-         id="path3971-3"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-4.1395349,-75.482558)"
-       id="g3977-7"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-         id="path3973-1" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-         id="path3969-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-         id="path3967-2" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-         id="path3965-8" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-         id="path3095-6" />
-    </g>
-  </g>
-  <g
-     id="g3984"
-     transform="matrix(0.39516706,0,0,0.39516706,1.3307246,5.9278164)"
-     style="fill:url(#linearGradient4159);fill-opacity:1">
-    <path
-       inkscape:connector-curvature="0"
-       id="path3975"
-       d="m 64.102471,-11.469475 0,14.2498468 C 100.12178,2.8227751 129.30171,32.015688 129.3229,68.039971 l 15.1894,0 c -0.46275,-43.994344 -36.22756,-79.509446 -80.331533,-79.509446 -0.02635,0 -0.05196,-2.5e-5 -0.0783,0 z"
-       style="fill:url(#linearGradient4155);fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3971"
-       d="m 64.102471,14.798787 0,14.876213 c 21.187717,0.12639 38.346359,17.21667 38.638999,38.364971 l 15.58087,0 C 118.11211,38.59527 94.14478,14.798787 64.650543,14.798787 c -0.184677,0 -0.363836,-0.0019 -0.548072,0 z"
-       style="fill:url(#linearGradient4155);fill-opacity:1;stroke:none" />
-  </g>
-  <g
-     id="g3977"
-     transform="matrix(0.40427237,0,0,0.40427237,-0.71726009,5.4128854)">
-    <path
-       id="path3973"
-       d="M 61.077035,4.2013081 C 29.008113,7.6721658 4.0154509,34.738284 3.8895349,67.701308 l 11.9062501,0 c -0.001,-0.135691 0,-0.270315 0,-0.40625 0,-26.471753 19.725067,-48.305528 45.28125,-51.65625 l 0,-11.4374999 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3969"
-       d="m 61.077035,25.420058 c -20.10477,3.477576 -35.408628,20.9455 -35.46875,42.03125 l 11.125,0 c 0.117106,-14.723686 10.508725,-27.001539 24.34375,-30.0625 l 0,-11.96875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3967"
-       d="m 68.170785,50.107558 c -9.502027,0 -17.1875,7.685473 -17.1875,17.1875 0,9.502027 7.685473,17.21875 17.1875,17.21875 9.502027,0 17.21875,-7.716723 17.21875,-17.21875 0,-9.502027 -7.716723,-17.1875 -17.21875,-17.1875 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3965"
-       d="m 98.139535,74.170058 c -2.960687,13.954487 -15.281224,24.444949 -30.09375,24.5625 l 0,11.656252 c 0.12455,10e-4 0.250198,0 0.375,0 21.409537,0 39.173375,-15.696688 42.343745,-36.218752 l -12.624995,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3095"
-       d="m 119.57703,74.170058 c -3.35869,25.45931 -25.061905,45.157032 -51.406245,45.281252 l 0,12.65625 c 33.284435,-0.0636 60.599825,-25.45665 63.718745,-57.937502 l -12.3125,0 z"
-       style="fill:#222222;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<linearGradient id="linearGradient4149">
+<stop stop-color="#d18114" offset="0"/>
+<stop stop-color="#ed9514" offset="1"/>
+</linearGradient>
+<linearGradient id="linearGradient4155" y2="28.285" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="144.51" y1="28.285" x1="64.102"/>
+<linearGradient id="linearGradient4159" y2="-11.652" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="126.84" y1="69.532" x1="64.102"/>
+</defs>
+<g fill="#FFF" transform="matrix(0.40427237,0,0,0.40427237,0.65228897,36.70875)">
+<g transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g transform="translate(-4.1395349,-75.482558)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</g>
+<g fill="url(#linearGradient4155)" transform="matrix(0.39516706,0,0,0.39516706,1.3307246,5.9278164)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g fill="#222" transform="matrix(0.40427237,0,0,0.40427237,-0.71726009,5.4128854)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
 </svg>

From adaec6176ca04ee38306bd348eba9a8350f19405 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Tue, 2 Dec 2014 23:34:31 -0500
Subject: [PATCH 174/363] Add article auto-remove after clicking on the read
 link

---
 p/scripts/main.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index d1d31c801..19eba206d 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -690,6 +690,9 @@ function init_stream(divStream) {
 	divStream.on('click', '.flux a.read', function () {
 		var active = $(this).parents(".flux");
 		mark_read(active, false);
+		if (context['auto_remove_article']) {
+			active.remove();
+		}
 		return false;
 	});
 

From aa232d8fd52cf548c0b2e7d96e026e684eadda53 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 3 Dec 2014 16:45:51 +0100
Subject: [PATCH 175/363] Update the i18n system.

Follow recommendations from https://github.com/FreshRSS/FreshRSS/issues/334
---
 app/i18n/en.php          | 533 ---------------------------------------
 app/i18n/en/admin.php    |  92 +++++++
 app/i18n/en/conf.php     |   7 +
 app/i18n/en/feedback.php |  14 +
 app/i18n/en/gen.php      | 487 +++++++++++++++++++++++++++++++++++
 app/i18n/en/index.php    |   5 +
 app/i18n/en/install.php  |   5 +
 app/i18n/en/sub.php      |  10 +
 app/i18n/fr.php          | 533 ---------------------------------------
 app/i18n/fr/admin.php    |  92 +++++++
 app/i18n/fr/conf.php     |   7 +
 app/i18n/fr/feedback.php |  14 +
 app/i18n/fr/gen.php      | 487 +++++++++++++++++++++++++++++++++++
 app/i18n/fr/index.php    |   5 +
 app/i18n/fr/install.php  |   5 +
 app/i18n/fr/sub.php      |  10 +
 lib/Minz/Translate.php   | 114 ++++++---
 17 files changed, 1320 insertions(+), 1100 deletions(-)
 delete mode 100644 app/i18n/en.php
 create mode 100644 app/i18n/en/admin.php
 create mode 100644 app/i18n/en/conf.php
 create mode 100644 app/i18n/en/feedback.php
 create mode 100644 app/i18n/en/gen.php
 create mode 100644 app/i18n/en/index.php
 create mode 100644 app/i18n/en/install.php
 create mode 100644 app/i18n/en/sub.php
 delete mode 100644 app/i18n/fr.php
 create mode 100644 app/i18n/fr/admin.php
 create mode 100644 app/i18n/fr/conf.php
 create mode 100644 app/i18n/fr/feedback.php
 create mode 100644 app/i18n/fr/gen.php
 create mode 100644 app/i18n/fr/index.php
 create mode 100644 app/i18n/fr/install.php
 create mode 100644 app/i18n/fr/sub.php

diff --git a/app/i18n/en.php b/app/i18n/en.php
deleted file mode 100644
index a35a6ccf1..000000000
--- a/app/i18n/en.php
+++ /dev/null
@@ -1,533 +0,0 @@
-<?php
- return array (
-  'Apr' => '\\A\\p\\r\\i\\l',
-  'Aug' => '\\A\\u\\g\\u\\s\\t',
-  'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
-  'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
-  'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
-  'Jul' => '\\J\\u\\l\\y',
-  'Jun' => '\\J\\u\\n\\e',
-  'Mar' => '\\M\\a\\r\\c\\h',
-  'May' => '\\M\\a\\y',
-  'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
-  'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
-  'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
-  'about' => 'About',
-  'about_freshrss' => 'About FreshRSS',
-  'access_denied' => 'You don’t have permission to access this page',
-  'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
-  'activate_sharing' => 'Activate sharing',
-  'actualize' => 'Actualize',
-  'add_category' => 'Add a category',
-  'add_query' => 'Add a query',
-  'add_rss_feed' => 'Add a RSS feed',
-  'admin.check_install.cache.nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
-  'admin.check_install.cache.ok' => 'Permissions on cache directory are good.',
-  'admin.check_install.categories.nok' => 'Category table is bad configured.',
-  'admin.check_install.categories.ok' => 'Category table is ok.',
-  'admin.check_install.connection.nok' => 'Connection to the database cannot being established.',
-  'admin.check_install.connection.ok' => 'Connection to the database is ok.',
-  'admin.check_install.ctype.nok' => 'You lack a required library for character type checking (php-ctype).',
-  'admin.check_install.ctype.ok' => 'You have the required library for character type checking (ctype).',
-  'admin.check_install.curl.nok' => 'You lack cURL (php5-curl package).',
-  'admin.check_install.curl.ok' => 'You have cURL extension.',
-  'admin.check_install.data.nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
-  'admin.check_install.data.ok' => 'Permissions on data directory are good.',
-  'admin.check_install.database' => 'Database installation',
-  'admin.check_install.dom.nok' => 'You lack a required library to browse the DOM (php-xml package).',
-  'admin.check_install.dom.ok' => 'You have the required library to browse the DOM.',
-  'admin.check_install.entries.nok' => 'Entry table is bad configured.',
-  'admin.check_install.entries.ok' => 'Entry table is ok.',
-  'admin.check_install.favicons.nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',
-  'admin.check_install.favicons.ok' => 'Permissions on favicons directory are good.',
-  'admin.check_install.feeds.nok' => 'Feed table is bad configured.',
-  'admin.check_install.feeds.ok' => 'Feed table is ok.',
-  'admin.check_install.files' => 'File installation',
-  'admin.check_install.json.nok' => 'You lack JSON (php5-json package).',
-  'admin.check_install.json.ok' => 'You have JSON extension.',
-  'admin.check_install.logs.nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
-  'admin.check_install.logs.ok' => 'Permissions on logs directory are good.',
-  'admin.check_install.minz.nok' => 'You lack the Minz framework.',
-  'admin.check_install.minz.ok' => 'You have the Minz framework.',
-  'admin.check_install.pcre.nok' => 'You lack a required library for regular expressions (php-pcre).',
-  'admin.check_install.pcre.ok' => 'You have the required library for regular expressions (PCRE).',
-  'admin.check_install.pdo.nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.pdo.ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.persona.nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
-  'admin.check_install.persona.ok' => 'Permissions on Mozilla Persona directory are good.',
-  'admin.check_install.php' => 'PHP installation',
-  'admin.check_install.php.nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
-  'admin.check_install.php.ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
-  'admin.check_install.tables.nok' => 'There is one or more lacking tables in the database.',
-  'admin.check_install.tables.ok' => 'Tables are existing in the database.',
-  'admin.check_install.tokens.nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
-  'admin.check_install.tokens.ok' => 'Permissions on tokens directory are good.',
-  'admin.check_install.zip.nok' => 'You lack ZIP extension (php5-zip package).',
-  'admin.check_install.zip.ok' => 'You have ZIP extension.',
-  'admin.users.articles_and_size' => '%s articles (%s)',
-  'administration' => 'Manage',
-  'advanced' => 'Advanced',
-  'after_onread' => 'After “mark all as read”,',
-  'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-  'all_feeds' => 'All feeds',
-  'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
-  'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
-  'already_subscribed' => 'You have already subscribed to <em>%s</em>',
-  'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
-  'apr' => 'apr',
-  'april' => 'Apr',
-  'archiving_configuration' => 'Archiving',
-  'archiving_configuration_help' => 'More options are available in the individual stream settings',
-  'article' => 'Article',
-  'article_icons' => 'Article icons',
-  'article_open_on_website' => 'when article is opened on its original website',
-  'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
-  'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
-  'article_viewed' => 'when article is viewed',
-  'articles' => 'articles',
-  'articles_per_page' => 'Number of articles per page',
-  'articles_to_display' => 'Articles to display',
-  'ask_empty' => 'Clear?',
-  'attention' => 'Attention!',
-  'aug' => 'aug',
-  'august' => 'Aug',
-  'auth_form' => 'Web form (traditional, requires JavaScript)',
-  'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
-  'auth_form_set' => 'Form is now your default authentication system.',
-  'auth_no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
-  'auth_none' => 'None (dangerous)',
-  'auth_not_persona' => 'Only Persona system can be reset.',
-  'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
-  'auth_reset' => 'Authentication reset',
-  'auth_token' => 'Authentication token',
-  'auth_type' => 'Authentication method',
-  'auth_will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
-  'author' => 'Author',
-  'auto_load_more' => 'Load next articles at the page bottom',
-  'auto_read_when' => 'Mark article as read…',
-  'auto_share' => 'Share',
-  'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-  'back_to_rss_feeds' => '← Go back to your RSS feeds',
-  'bad_opml_file' => 'Your OPML file is invalid',
-  'base_url' => 'Base URL',
-  'bdd' => 'Database',
-  'bdd_conf_is_ko' => 'Verify your database information.',
-  'bdd_conf_is_ok' => 'Database configuration has been saved.',
-  'bdd_configuration' => 'Database configuration',
-  'bdd_type' => 'Type of database',
-  'before_one_day' => 'Before one day',
-  'before_one_week' => 'Before one week',
-  'before_yesterday' => 'Before yesterday',
-  'blank_to_disable' => 'Leave blank to disable',
-  'blogotext' => 'Blogotext',
-  'bookmark' => 'Subscribe (FreshRSS bookmark)',
-  'bottom_line' => 'Bottom line',
-  'bugs_reports' => 'Bugs reports',
-  'by' => 'by',
-  'by_author' => 'By <em>%s</em>',
-  'by_default' => 'By default',
-  'by_email' => 'By email',
-  'by_feed' => 'by feed',
-  'cache_is_ok' => 'Permissions on cache directory are good',
-  'can_not_be_deleted' => 'Cannot be deleted',
-  'cancel' => 'Cancel',
-  'categories' => 'Categories',
-  'categories_management' => 'Categories management',
-  'categories_updated' => 'Categories have been updated',
-  'categorize' => 'Store in a category',
-  'category' => 'Category',
-  'category_created' => 'Category %s has been created.',
-  'category_deleted' => 'Category has been deleted.',
-  'category_emptied' => 'Category has been emptied',
-  'category_empty' => 'Empty category',
-  'category_name_exists' => 'Category name already exists.',
-  'category_no_id' => 'You must precise the id of the category.',
-  'category_no_name' => 'Category name cannot be empty.',
-  'category_not_delete_default' => 'You cannot delete the default category!',
-  'category_not_exist' => 'The category does not exist!',
-  'category_number' => 'Category n°%d',
-  'category_updated' => 'Category has been updated.',
-  'change_value' => 'You should change this value by any other',
-  'checks' => 'Checks',
-  'choose_language' => 'Choose a language for FreshRSS',
-  'clear_logs' => 'Clear the logs',
-  'collapse_article' => 'Collapse',
-  'conf.users.articles_and_size' => '%s articles (%s)',
-  'configuration' => 'Configuration',
-  'configuration_updated' => 'Configuration has been updated',
-  'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
-  'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
-  'congratulations' => 'Congratulations!',
-  'content_width' => 'Content width',
-  'create' => 'Create',
-  'create_user' => 'Create new user',
-  'credits' => 'Credits',
-  'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
-  'css_path_on_website' => 'Articles CSS path on original website',
-  'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
-  'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
-  'curl_is_nok' => 'You lack cURL (php5-curl package)',
-  'curl_is_ok' => 'You have version %s of cURL',
-  'current_user' => 'Current user',
-  'damn' => 'Damn!',
-  'data_is_ok' => 'Permissions on data directory are good',
-  'dec' => 'dec',
-  'december' => 'Dec',
-  'default_category' => 'Uncategorized',
-  'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
-  'default_view' => 'Default view',
-  'delete' => 'Delete',
-  'delete_articles_every' => 'Remove articles after',
-  'diaspora' => 'Diaspora*',
-  'display' => 'Display',
-  'display_articles_unfolded' => 'Show articles unfolded by default',
-  'display_categories_unfolded' => 'Show categories folded by default',
-  'display_configuration' => 'Display',
-  'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
-  'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
-  'dom_is_ok' => 'You have the required library to browse the DOM',
-  'email' => 'Email',
-  'error_occurred' => 'An error occurred',
-  'error_occurred_update' => 'Nothing was changed',
-  'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
-  'export' => 'Export',
-  'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
-  'export_opml' => 'Export list of feeds (OPML)',
-  'export_starred' => 'Export your favourites',
-  'facebook' => 'Facebook',
-  'favicons_is_ok' => 'Permissions on favicons directory are good',
-  'favorite_feeds' => 'Favourites (%s)',
-  'feb' => 'feb',
-  'february' => 'Feb',
-  'feed' => 'Feed',
-  'feed_actualized' => '<em>%s</em> has been updated',
-  'feed_added' => 'RSS feed <em>%s</em> has been added',
-  'feed_deleted' => 'Feed has been deleted',
-  'feed_description' => 'Description',
-  'feed_empty' => 'This feed is empty. Please verify that it is still maintained.',
-  'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
-  'feed_list' => 'List of %s articles',
-  'feed_not_added' => '<em>%s</em> could not be added',
-  'feed_updated' => 'Feed has been updated',
-  'feed_url' => 'Feed URL',
-  'feed_validator' => 'Check the validity of the feed',
-  'feedback.login.error' => 'Login is invalid',
-  'feedback.login.success' => 'You are connected',
-  'feedback.logout.success' => 'You are disconnected',
-  'feedback.user_profile.updated' => 'Your profile has been modified',
-  'feeds' => 'Feeds',
-  'feeds_actualized' => 'RSS feeds have been updated',
-  'feeds_imported' => 'Your feeds have been imported and will now be updated',
-  'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
-  'feeds_marked_read' => 'Feeds have been marked as read',
-  'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
-  'file_cannot_be_uploaded' => 'File cannot be uploaded!',
-  'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
-  'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
-  'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
-  'filter' => 'Filter',
-  'finish_installation' => 'Complete installation',
-  'first' => 'First',
-  'first_article' => 'Skip to the first article',
-  'fix_errors_before' => 'Fix errors before skip to the next step.',
-  'focus_search' => 'Access search box',
-  'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
-  'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
-  'freshrss' => 'FreshRSS',
-  'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
-  'freshrss_installation' => 'Installation · FreshRSS',
-  'fri' => 'Fri',
-  'g+' => 'Google+',
-  'gen.menu.admin' => 'Administration',
-  'gen.menu.authentication' => 'Authentication',
-  'gen.menu.check_install' => 'Installation checking',
-  'gen.menu.user_management' => 'Manage users',
-  'gen.menu.user_profile' => 'Profile',
-  'gen.title.authentication' => 'Authentication',
-  'gen.title.check_install' => 'Installation checking',
-  'gen.title.global_view' => 'Global view',
-  'gen.title.user_management' => 'Manage users',
-  'gen.title.user_profile' => 'Profile',
-  'general_conf_is_ok' => 'General configuration has been saved.',
-  'general_configuration' => 'General configuration',
-  'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
-  'global_view' => 'Global view',
-  'help' => 'Display documentation',
-  'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
-  'host' => 'Host',
-  'html5_notif_timeout' => 'HTML5 notification timeout',
-  'http_auth' => 'HTTP (for advanced users with HTTPS)',
-  'http_authentication' => 'HTTP Authentication',
-  'http_password' => 'HTTP password',
-  'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
-  'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
-  'http_username' => 'HTTP username',
-  'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
-  'import' => 'Import',
-  'import_export' => 'Import / export',
-  'informations' => 'Information',
-  'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
-  'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
-  'installation_step' => 'Installation — step %d · FreshRSS',
-  'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
-  'invalid_login' => 'Login is invalid',
-  'invalid_url' => 'URL <em>%s</em> is invalid',
-  'is_admin' => 'is administrator',
-  'jan' => 'jan',
-  'january' => 'Jan',
-  'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
-  'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
-  'javascript_should_be_activated' => 'JavaScript must be enabled',
-  'jul' => 'jul',
-  'july' => 'Jul',
-  'jump_next' => 'jump to next unread sibling (feed or category)',
-  'jun' => 'jun',
-  'june' => 'Jun',
-  'keep_history' => 'Minimum number of articles to keep',
-  'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
-  'language' => 'Language',
-  'language_defined' => 'Language has been defined.',
-  'last' => 'Last',
-  'last_3_month' => 'Last three months',
-  'last_6_month' => 'Last six months',
-  'last_article' => 'Skip to the last article',
-  'last_month' => 'Last month',
-  'last_week' => 'Last week',
-  'last_year' => 'Last year',
-  'lead_developer' => 'Lead developer',
-  'license' => 'License',
-  'load_more' => 'Load more articles',
-  'log_is_ok' => 'Permissions on logs directory are good',
-  'login' => 'Login',
-  'login_configuration' => 'Login',
-  'login_persona_problem' => 'Connection problem with Persona?',
-  'login_required' => 'Login required:',
-  'login_with_persona' => 'Login with Persona',
-  'logout' => 'Logout',
-  'logs' => 'Logs',
-  'logs_empty' => 'Log file is empty',
-  'main_stream' => 'Main stream',
-  'mar' => 'mar',
-  'march' => 'Mar',
-  'mark_all_read' => 'Mark all as read',
-  'mark_cat_read' => 'Mark category as read',
-  'mark_favorite' => 'Mark as favourite',
-  'mark_feed_read' => 'Mark feed as read',
-  'mark_read' => 'Mark as read',
-  'may' => 'May',
-  'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
-  'minz_is_ok' => 'You have the Minz framework',
-  'mon' => 'Mon',
-  'month' => 'months',
-  'more_information' => 'More information',
-  'n_entries_deleted' => '%d articles have been deleted',
-  'n_feeds_actualized' => '%d feeds have been updated',
-  'new_article' => 'There are new available articles, click to refresh the page.',
-  'new_category' => 'New category',
-  'newer_first' => 'Newer first',
-  'next' => 'Next',
-  'next_article' => 'Skip to the next article',
-  'next_page' => 'Skip to the next page',
-  'next_step' => 'Go to the next step',
-  'no' => 'No',
-  'no_feed_actualized' => 'No RSS feed has been updated',
-  'no_feed_to_display' => 'There is no article to show.',
-  'no_feed_to_refresh' => 'There is no feed to refresh…',
-  'no_query' => 'You haven’t created any user query yet.',
-  'no_query_filter' => 'No filter',
-  'no_rss_feed' => 'No RSS feed',
-  'no_selected_feed' => 'No feed selected.',
-  'no_update' => 'No update to apply',
-  'no_zip_extension' => 'Zip extension is not present on your server.',
-  'normal_view' => 'Normal view',
-  'not_read' => '%d unread',
-  'not_reads' => '%d unread',
-  'not_yet_implemented' => 'Not yet implemented',
-  'nothing_to_load' => 'There are no more articles',
-  'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
-  'notif_title_new_articles' => 'FreshRSS: new articles!',
-  'nov' => 'nov',
-  'november' => 'Nov',
-  'number_articles' => '%d articles',
-  'number_divided_when_reader' => 'Divided by 2 in the reading view.',
-  'number_feeds' => '%d feeds',
-  'oct' => 'oct',
-  'october' => 'Oct',
-  'ok' => 'Ok!',
-  'older_first' => 'Oldest first',
-  'oops' => 'Oops!',
-  'optimization_complete' => 'Optimization complete',
-  'optimize_bdd' => 'Optimize database',
-  'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-  'or' => 'or',
-  'page_not_found' => 'You are looking for a page which doesn’t exist',
-  'password' => 'Password',
-  'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
-  'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
-  'pcre_is_nok' => 'You lack a required library for regular expressions (php-pcre)',
-  'pcre_is_ok' => 'You have the required library for regular expressions (PCRE)',
-  'pdo_is_nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite)',
-  'pdo_is_ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite)',
-  'persona_connection_email' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-  'persona_is_ok' => 'Permissions on Mozilla Persona directory are good',
-  'php_is_nok' => 'Your PHP version is %s but FreshRSS requires at least version %s',
-  'php_is_ok' => 'Your PHP version is %s, which is compatible with FreshRSS',
-  'prefix' => 'Table prefix',
-  'previous' => 'Previous',
-  'previous_article' => 'Skip to the previous article',
-  'previous_page' => 'Skip to the previous page',
-  'print' => 'Print',
-  'project_website' => 'Project website',
-  'public' => 'Public',
-  'publication_date' => 'Date of publication',
-  'purge_completed' => 'Purge completed (%d articles deleted)',
-  'purge_now' => 'Purge now',
-  'queries' => 'User queries',
-  'query_created' => 'Query "%s" has been created.',
-  'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
-  'query_filter' => 'Filter applied:',
-  'query_get_all' => 'Display all articles',
-  'query_get_category' => 'Display "%s" category',
-  'query_get_favorite' => 'Display favorite articles',
-  'query_get_feed' => 'Display "%s" feed',
-  'query_number' => 'Query n°%d',
-  'query_order_asc' => 'Display oldest articles first',
-  'query_order_desc' => 'Display newest articles first',
-  'query_search' => 'Search for "%s"',
-  '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',
-  'random_string' => 'Random string',
-  'reader_view' => 'Reading view',
-  'reading_configuration' => 'Reading',
-  'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
-  'refresh' => 'Refresh',
-  'related_tags' => 'Related tags',
-  'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
-  'rss_feed_management' => 'RSS feeds management',
-  'rss_feeds_of' => 'RSS feed of %s',
-  'rss_view' => 'RSS feed',
-  'sat' => 'Sat',
-  'save' => 'Save',
-  'scroll' => 'while scrolling',
-  'search' => 'Search words or #tags',
-  'search_short' => 'Search',
-  'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
-  'see_on_website' => 'See on original website',
-  'see_website' => 'See website',
-  'sep' => 'sep',
-  'september' => 'Sep',
-  'shaarli' => 'Shaarli',
-  'share' => 'Share',
-  'share_name' => 'Share name to display',
-  'share_url' => 'Share URL to use',
-  'sharing' => 'Sharing',
-  'sharing_management' => 'Sharing options management',
-  'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
-  'shortcuts' => 'Shortcuts',
-  'shortcuts_article_action' => 'Article actions',
-  'shortcuts_navigation' => 'Navigation',
-  'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
-  'shortcuts_other_action' => 'Other actions',
-  'shortcuts_updated' => 'Shortcuts have been updated',
-  'show_adaptive' => 'Adjust showing',
-  'show_all_articles' => 'Show all articles',
-  'show_favorite' => 'Show only favorites',
-  'show_in_all_flux' => 'Show in main stream',
-  'show_not_favorite' => 'Show all but favorites',
-  'show_not_reads' => 'Show only unread',
-  'show_read' => 'Show only read',
-  'sort_order' => 'Sort order',
-  'starred_list' => 'List of favourite articles',
-  'stats' => 'Statistics',
-  'stats_entry_count' => 'Entry count',
-  'stats_entry_per_category' => 'Entries per category',
-  'stats_entry_per_day' => 'Entries per day (last 30 days)',
-  'stats_entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
-  'stats_entry_per_hour' => 'Per hour (average: %.2f messages)',
-  'stats_entry_per_month' => 'Per month (average: %.2f messages)',
-  'stats_entry_repartition' => 'Entries repartition',
-  'stats_feed_per_category' => 'Feeds per category',
-  'stats_idle' => 'Idle feeds',
-  'stats_main' => 'Main statistics',
-  'stats_no_idle' => 'There is no idle feed!',
-  'stats_percent_of_total' => '%% of total',
-  'stats_repartition' => 'Articles repartition',
-  'stats_top_feed' => 'Top ten feeds',
-  'status_favorites' => 'Favourites',
-  'status_read' => 'Read',
-  'status_total' => 'Total',
-  'status_unread' => 'Unread',
-  'steps' => 'Steps',
-  'sticky_post' => 'Stick the article to the top when opened',
-  'sub.categories.over_max' => 'You have reached your limit of categories (%d)',
-  'sub.feeds.over_max' => 'You have reached your limit of feeds (%d)',
-  'submit' => 'Submit',
-  'subscription_management' => 'Subscriptions management',
-  'sun' => 'Sun',
-  'theme' => 'Theme',
-  'think_to_add' => 'You may add some feeds.',
-  'this_is_the_end' => 'This is the end',
-  'thu' => 'Thu',
-  'title' => 'Title',
-  'today' => 'Today',
-  'top_line' => 'Top line',
-  'truncate' => 'Delete all articles',
-  'ttl' => 'Do not automatically refresh more often than',
-  'tue' => 'Tue',
-  'twitter' => 'Twitter',
-  'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
-  'update' => 'Update',
-  'update_apply' => 'Apply',
-  'update_can_apply' => 'An update is available.',
-  'update_check' => 'Check for new updates',
-  'update_end' => 'Update process is completed, now you can go to the final step.',
-  'update_finished' => 'Update completed!',
-  'update_last' => 'Last verification: %s',
-  'update_long' => 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
-  'update_problem' => 'The update process has encountered an error: %s',
-  'update_server_not_found' => 'Update server cannot be found. [%s]',
-  'update_start' => 'Start update process',
-  'update_system' => 'Update system',
-  'updated' => 'Modifications have been updated',
-  'upon_reception' => 'upon reception of the article',
-  'user_created' => 'User %s has been created',
-  'user_deleted' => 'User %s has been deleted',
-  'user_filter' => 'Access user filters',
-  'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-  'username' => 'Username',
-  'username_admin' => 'Administrator username',
-  'users' => 'Users',
-  'users_list' => 'List of users',
-  'version' => 'Version',
-  'version_update' => 'Update',
-  'wallabag' => 'wallabag',
-  'website' => 'Website',
-  'website_url' => 'Website URL',
-  'wed' => 'Wed',
-  'width_large' => 'Large',
-  'width_medium' => 'Medium',
-  'width_no_limit' => 'No limit',
-  'width_thin' => 'Thin',
-  'yes' => 'Yes',
-  'yesterday' => 'Yesterday',
-  'your_diaspora_pod' => 'Your Diaspora* pod',
-  'your_favorites' => 'Your favourites',
-  'your_rss_feeds' => 'Your RSS feeds',
-  'your_shaarli' => 'Your Shaarli',
-  'your_wallabag' => 'Your wallabag',
-  'zip_error' => 'An error occured during Zip import.',
-);
\ No newline at end of file
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
new file mode 100644
index 000000000..74f01ae06
--- /dev/null
+++ b/app/i18n/en/admin.php
@@ -0,0 +1,92 @@
+<?php
+
+return array(
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on cache directory are good.',
+		),
+		'categories' => array(
+			'nok' => 'Category table is bad configured.',
+			'ok' => 'Category table is ok.',
+		),
+		'connection' => array(
+			'nok' => 'Connection to the database cannot being established.',
+			'ok' => 'Connection to the database is ok.',
+		),
+		'ctype' => array(
+			'nok' => 'You lack a required library for character type checking (php-ctype).',
+			'ok' => 'You have the required library for character type checking (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'You lack cURL (php5-curl package).',
+			'ok' => 'You have cURL extension.',
+		),
+		'data' => array(
+			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on data directory are good.',
+		),
+		'database' => 'Database installation',
+		'dom' => array(
+			'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+			'ok' => 'You have the required library to browse the DOM.',
+		),
+		'entries' => array(
+			'nok' => 'Entry table is bad configured.',
+			'ok' => 'Entry table is ok.',
+		),
+		'favicons' => array(
+			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on favicons directory are good.',
+		),
+		'feeds' => array(
+			'nok' => 'Feed table is bad configured.',
+			'ok' => 'Feed table is ok.',
+		),
+		'files' => 'File installation',
+		'json' => array(
+			'nok' => 'You lack JSON (php5-json package).',
+			'ok' => 'You have JSON extension.',
+		),
+		'logs' => array(
+			'nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on logs directory are good.',
+		),
+		'minz' => array(
+			'nok' => 'You lack the Minz framework.',
+			'ok' => 'You have the Minz framework.',
+		),
+		'pcre' => array(
+			'nok' => 'You lack a required library for regular expressions (php-pcre).',
+			'ok' => 'You have the required library for regular expressions (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
+			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on Mozilla Persona directory are good.',
+		),
+		'php' => array(
+			'_' => 'PHP installation',
+			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
+			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'There is one or more lacking tables in the database.',
+			'ok' => 'Tables are existing in the database.',
+		),
+		'tokens' => array(
+			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on tokens directory are good.',
+		),
+		'zip' => array(
+			'nok' => 'You lack ZIP extension (php5-zip package).',
+			'ok' => 'You have ZIP extension.',
+		),
+	),
+	'users' => array(
+		'articles_and_size' => '%s articles (%s)',
+	),
+);
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
new file mode 100644
index 000000000..460804774
--- /dev/null
+++ b/app/i18n/en/conf.php
@@ -0,0 +1,7 @@
+<?php
+
+return array(
+	'users' => array(
+		'articles_and_size' => '%s articles (%s)',
+	),
+);
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
new file mode 100644
index 000000000..b3866f1dc
--- /dev/null
+++ b/app/i18n/en/feedback.php
@@ -0,0 +1,14 @@
+<?php
+
+return array(
+	'login' => array(
+		'error' => 'Login is invalid',
+		'success' => 'You are connected',
+	),
+	'logout' => array(
+		'success' => 'You are disconnected',
+	),
+	'user_profile' => array(
+		'updated' => 'Your profile has been modified',
+	),
+);
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
new file mode 100644
index 000000000..9e06357bc
--- /dev/null
+++ b/app/i18n/en/gen.php
@@ -0,0 +1,487 @@
+<?php
+
+return array(
+	'Apr' => '\\A\\p\\r\\i\\l',
+	'Aug' => '\\A\\u\\g\\u\\s\\t',
+	'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+	'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
+	'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+	'Jul' => '\\J\\u\\l\\y',
+	'Jun' => '\\J\\u\\n\\e',
+	'Mar' => '\\M\\a\\r\\c\\h',
+	'May' => '\\M\\a\\y',
+	'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+	'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+	'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+	'about' => 'About',
+	'about_freshrss' => 'About FreshRSS',
+	'access_denied' => 'You don’t have permission to access this page',
+	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
+	'activate_sharing' => 'Activate sharing',
+	'actualize' => 'Actualize',
+	'add_category' => 'Add a category',
+	'add_query' => 'Add a query',
+	'add_rss_feed' => 'Add a RSS feed',
+	'administration' => 'Manage',
+	'advanced' => 'Advanced',
+	'after_onread' => 'After “mark all as read”,',
+	'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+	'all_feeds' => 'All feeds',
+	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
+	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
+	'already_subscribed' => 'You have already subscribed to <em>%s</em>',
+	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
+	'apr' => 'apr',
+	'april' => 'Apr',
+	'archiving_configuration' => 'Archiving',
+	'archiving_configuration_help' => 'More options are available in the individual stream settings',
+	'article' => 'Article',
+	'article_icons' => 'Article icons',
+	'article_open_on_website' => 'when article is opened on its original website',
+	'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
+	'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
+	'article_viewed' => 'when article is viewed',
+	'articles' => 'articles',
+	'articles_per_page' => 'Number of articles per page',
+	'articles_to_display' => 'Articles to display',
+	'ask_empty' => 'Clear?',
+	'attention' => 'Attention!',
+	'aug' => 'aug',
+	'august' => 'Aug',
+	'auth_form' => 'Web form (traditional, requires JavaScript)',
+	'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
+	'auth_form_set' => 'Form is now your default authentication system.',
+	'auth_no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
+	'auth_none' => 'None (dangerous)',
+	'auth_not_persona' => 'Only Persona system can be reset.',
+	'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
+	'auth_reset' => 'Authentication reset',
+	'auth_token' => 'Authentication token',
+	'auth_type' => 'Authentication method',
+	'auth_will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+	'author' => 'Author',
+	'auto_load_more' => 'Load next articles at the page bottom',
+	'auto_read_when' => 'Mark article as read…',
+	'auto_share' => 'Share',
+	'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+	'back_to_rss_feeds' => '← Go back to your RSS feeds',
+	'bad_opml_file' => 'Your OPML file is invalid',
+	'base_url' => 'Base URL',
+	'bdd' => 'Database',
+	'bdd_conf_is_ko' => 'Verify your database information.',
+	'bdd_conf_is_ok' => 'Database configuration has been saved.',
+	'bdd_configuration' => 'Database configuration',
+	'bdd_type' => 'Type of database',
+	'before_one_day' => 'Before one day',
+	'before_one_week' => 'Before one week',
+	'before_yesterday' => 'Before yesterday',
+	'blank_to_disable' => 'Leave blank to disable',
+	'blogotext' => 'Blogotext',
+	'bookmark' => 'Subscribe (FreshRSS bookmark)',
+	'bottom_line' => 'Bottom line',
+	'bugs_reports' => 'Bugs reports',
+	'by' => 'by',
+	'by_author' => 'By <em>%s</em>',
+	'by_default' => 'By default',
+	'by_email' => 'By email',
+	'by_feed' => 'by feed',
+	'cache_is_ok' => 'Permissions on cache directory are good',
+	'can_not_be_deleted' => 'Cannot be deleted',
+	'cancel' => 'Cancel',
+	'categories' => 'Categories',
+	'categories_management' => 'Categories management',
+	'categories_updated' => 'Categories have been updated',
+	'categorize' => 'Store in a category',
+	'category' => 'Category',
+	'category_created' => 'Category %s has been created.',
+	'category_deleted' => 'Category has been deleted.',
+	'category_emptied' => 'Category has been emptied',
+	'category_empty' => 'Empty category',
+	'category_name_exists' => 'Category name already exists.',
+	'category_no_id' => 'You must precise the id of the category.',
+	'category_no_name' => 'Category name cannot be empty.',
+	'category_not_delete_default' => 'You cannot delete the default category!',
+	'category_not_exist' => 'The category does not exist!',
+	'category_number' => 'Category n°%d',
+	'category_updated' => 'Category has been updated.',
+	'change_value' => 'You should change this value by any other',
+	'checks' => 'Checks',
+	'choose_language' => 'Choose a language for FreshRSS',
+	'clear_logs' => 'Clear the logs',
+	'collapse_article' => 'Collapse',
+	'configuration' => 'Configuration',
+	'configuration_updated' => 'Configuration has been updated',
+	'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
+	'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+	'congratulations' => 'Congratulations!',
+	'content_width' => 'Content width',
+	'create' => 'Create',
+	'create_user' => 'Create new user',
+	'credits' => 'Credits',
+	'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
+	'css_path_on_website' => 'Articles CSS path on original website',
+	'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
+	'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
+	'curl_is_nok' => 'You lack cURL (php5-curl package)',
+	'curl_is_ok' => 'You have version %s of cURL',
+	'current_user' => 'Current user',
+	'damn' => 'Damn!',
+	'data_is_ok' => 'Permissions on data directory are good',
+	'dec' => 'dec',
+	'december' => 'Dec',
+	'default_category' => 'Uncategorized',
+	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
+	'default_view' => 'Default view',
+	'delete' => 'Delete',
+	'delete_articles_every' => 'Remove articles after',
+	'diaspora' => 'Diaspora*',
+	'display' => 'Display',
+	'display_articles_unfolded' => 'Show articles unfolded by default',
+	'display_categories_unfolded' => 'Show categories folded by default',
+	'display_configuration' => 'Display',
+	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
+	'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
+	'dom_is_ok' => 'You have the required library to browse the DOM',
+	'email' => 'Email',
+	'error_occurred' => 'An error occurred',
+	'error_occurred_update' => 'Nothing was changed',
+	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
+	'export' => 'Export',
+	'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
+	'export_opml' => 'Export list of feeds (OPML)',
+	'export_starred' => 'Export your favourites',
+	'facebook' => 'Facebook',
+	'favicons_is_ok' => 'Permissions on favicons directory are good',
+	'favorite_feeds' => 'Favourites (%s)',
+	'feb' => 'feb',
+	'february' => 'Feb',
+	'feed' => 'Feed',
+	'feed_actualized' => '<em>%s</em> has been updated',
+	'feed_added' => 'RSS feed <em>%s</em> has been added',
+	'feed_deleted' => 'Feed has been deleted',
+	'feed_description' => 'Description',
+	'feed_empty' => 'This feed is empty. Please verify that it is still maintained.',
+	'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
+	'feed_list' => 'List of %s articles',
+	'feed_not_added' => '<em>%s</em> could not be added',
+	'feed_updated' => 'Feed has been updated',
+	'feed_url' => 'Feed URL',
+	'feed_validator' => 'Check the validity of the feed',
+	'feeds' => 'Feeds',
+	'feeds_actualized' => 'RSS feeds have been updated',
+	'feeds_imported' => 'Your feeds have been imported and will now be updated',
+	'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
+	'feeds_marked_read' => 'Feeds have been marked as read',
+	'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
+	'file_cannot_be_uploaded' => 'File cannot be uploaded!',
+	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
+	'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
+	'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
+	'filter' => 'Filter',
+	'finish_installation' => 'Complete installation',
+	'first' => 'First',
+	'first_article' => 'Skip to the first article',
+	'fix_errors_before' => 'Fix errors before skip to the next step.',
+	'focus_search' => 'Access search box',
+	'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+	'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+	'freshrss' => 'FreshRSS',
+	'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
+	'freshrss_installation' => 'Installation · FreshRSS',
+	'fri' => 'Fri',
+	'g+' => 'Google+',
+	'menu' => array(
+		'admin' => 'Administration',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'title' => array(
+		'_' => 'Title',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'global_view' => 'Global view',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'general_conf_is_ok' => 'General configuration has been saved.',
+	'general_configuration' => 'General configuration',
+	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
+	'global_view' => 'Global view',
+	'help' => 'Display documentation',
+	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
+	'host' => 'Host',
+	'html5_notif_timeout' => 'HTML5 notification timeout',
+	'http_auth' => 'HTTP (for advanced users with HTTPS)',
+	'http_authentication' => 'HTTP Authentication',
+	'http_password' => 'HTTP password',
+	'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
+	'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
+	'http_username' => 'HTTP username',
+	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
+	'import' => 'Import',
+	'import_export' => 'Import / export',
+	'informations' => 'Information',
+	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
+	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
+	'installation_step' => 'Installation — step %d · FreshRSS',
+	'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
+	'invalid_login' => 'Login is invalid',
+	'invalid_url' => 'URL <em>%s</em> is invalid',
+	'is_admin' => 'is administrator',
+	'jan' => 'jan',
+	'january' => 'Jan',
+	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
+	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
+	'javascript_should_be_activated' => 'JavaScript must be enabled',
+	'jul' => 'jul',
+	'july' => 'Jul',
+	'jump_next' => 'jump to next unread sibling (feed or category)',
+	'jun' => 'jun',
+	'june' => 'Jun',
+	'keep_history' => 'Minimum number of articles to keep',
+	'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
+	'language' => 'Language',
+	'language_defined' => 'Language has been defined.',
+	'last' => 'Last',
+	'last_3_month' => 'Last three months',
+	'last_6_month' => 'Last six months',
+	'last_article' => 'Skip to the last article',
+	'last_month' => 'Last month',
+	'last_week' => 'Last week',
+	'last_year' => 'Last year',
+	'lead_developer' => 'Lead developer',
+	'license' => 'License',
+	'load_more' => 'Load more articles',
+	'log_is_ok' => 'Permissions on logs directory are good',
+	'login' => 'Login',
+	'login_configuration' => 'Login',
+	'login_persona_problem' => 'Connection problem with Persona?',
+	'login_required' => 'Login required:',
+	'login_with_persona' => 'Login with Persona',
+	'logout' => 'Logout',
+	'logs' => 'Logs',
+	'logs_empty' => 'Log file is empty',
+	'main_stream' => 'Main stream',
+	'mar' => 'mar',
+	'march' => 'Mar',
+	'mark_all_read' => 'Mark all as read',
+	'mark_cat_read' => 'Mark category as read',
+	'mark_favorite' => 'Mark as favourite',
+	'mark_feed_read' => 'Mark feed as read',
+	'mark_read' => 'Mark as read',
+	'may' => 'May',
+	'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
+	'minz_is_ok' => 'You have the Minz framework',
+	'mon' => 'Mon',
+	'month' => 'months',
+	'more_information' => 'More information',
+	'n_entries_deleted' => '%d articles have been deleted',
+	'n_feeds_actualized' => '%d feeds have been updated',
+	'new_article' => 'There are new available articles, click to refresh the page.',
+	'new_category' => 'New category',
+	'newer_first' => 'Newer first',
+	'next' => 'Next',
+	'next_article' => 'Skip to the next article',
+	'next_page' => 'Skip to the next page',
+	'next_step' => 'Go to the next step',
+	'no' => 'No',
+	'no_feed_actualized' => 'No RSS feed has been updated',
+	'no_feed_to_display' => 'There is no article to show.',
+	'no_feed_to_refresh' => 'There is no feed to refresh…',
+	'no_query' => 'You haven’t created any user query yet.',
+	'no_query_filter' => 'No filter',
+	'no_rss_feed' => 'No RSS feed',
+	'no_selected_feed' => 'No feed selected.',
+	'no_update' => 'No update to apply',
+	'no_zip_extension' => 'Zip extension is not present on your server.',
+	'normal_view' => 'Normal view',
+	'not_read' => '%d unread',
+	'not_reads' => '%d unread',
+	'not_yet_implemented' => 'Not yet implemented',
+	'nothing_to_load' => 'There are no more articles',
+	'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+	'notif_title_new_articles' => 'FreshRSS: new articles!',
+	'nov' => 'nov',
+	'november' => 'Nov',
+	'number_articles' => '%d articles',
+	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
+	'number_feeds' => '%d feeds',
+	'oct' => 'oct',
+	'october' => 'Oct',
+	'ok' => 'Ok!',
+	'older_first' => 'Oldest first',
+	'oops' => 'Oops!',
+	'optimization_complete' => 'Optimization complete',
+	'optimize_bdd' => 'Optimize database',
+	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
+	'or' => 'or',
+	'page_not_found' => 'You are looking for a page which doesn’t exist',
+	'password' => 'Password',
+	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
+	'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+	'pcre_is_nok' => 'You lack a required library for regular expressions (php-pcre)',
+	'pcre_is_ok' => 'You have the required library for regular expressions (PCRE)',
+	'pdo_is_nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite)',
+	'pdo_is_ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite)',
+	'persona_connection_email' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+	'persona_is_ok' => 'Permissions on Mozilla Persona directory are good',
+	'php_is_nok' => 'Your PHP version is %s but FreshRSS requires at least version %s',
+	'php_is_ok' => 'Your PHP version is %s, which is compatible with FreshRSS',
+	'prefix' => 'Table prefix',
+	'previous' => 'Previous',
+	'previous_article' => 'Skip to the previous article',
+	'previous_page' => 'Skip to the previous page',
+	'print' => 'Print',
+	'project_website' => 'Project website',
+	'public' => 'Public',
+	'publication_date' => 'Date of publication',
+	'purge_completed' => 'Purge completed (%d articles deleted)',
+	'purge_now' => 'Purge now',
+	'queries' => 'User queries',
+	'query_created' => 'Query "%s" has been created.',
+	'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
+	'query_filter' => 'Filter applied:',
+	'query_get_all' => 'Display all articles',
+	'query_get_category' => 'Display "%s" category',
+	'query_get_favorite' => 'Display favorite articles',
+	'query_get_feed' => 'Display "%s" feed',
+	'query_number' => 'Query n°%d',
+	'query_order_asc' => 'Display oldest articles first',
+	'query_order_desc' => 'Display newest articles first',
+	'query_search' => 'Search for "%s"',
+	'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',
+	'random_string' => 'Random string',
+	'reader_view' => 'Reading view',
+	'reading_configuration' => 'Reading',
+	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
+	'refresh' => 'Refresh',
+	'related_tags' => 'Related tags',
+	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
+	'rss_feed_management' => 'RSS feeds management',
+	'rss_feeds_of' => 'RSS feed of %s',
+	'rss_view' => 'RSS feed',
+	'sat' => 'Sat',
+	'save' => 'Save',
+	'scroll' => 'while scrolling',
+	'search' => 'Search words or #tags',
+	'search_short' => 'Search',
+	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
+	'see_on_website' => 'See on original website',
+	'see_website' => 'See website',
+	'sep' => 'sep',
+	'september' => 'Sep',
+	'shaarli' => 'Shaarli',
+	'share' => 'Share',
+	'share_name' => 'Share name to display',
+	'share_url' => 'Share URL to use',
+	'sharing' => 'Sharing',
+	'sharing_management' => 'Sharing options management',
+	'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
+	'shortcuts' => 'Shortcuts',
+	'shortcuts_article_action' => 'Article actions',
+	'shortcuts_navigation' => 'Navigation',
+	'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
+	'shortcuts_other_action' => 'Other actions',
+	'shortcuts_updated' => 'Shortcuts have been updated',
+	'show_adaptive' => 'Adjust showing',
+	'show_all_articles' => 'Show all articles',
+	'show_favorite' => 'Show only favorites',
+	'show_in_all_flux' => 'Show in main stream',
+	'show_not_favorite' => 'Show all but favorites',
+	'show_not_reads' => 'Show only unread',
+	'show_read' => 'Show only read',
+	'sort_order' => 'Sort order',
+	'starred_list' => 'List of favourite articles',
+	'stats' => 'Statistics',
+	'stats_entry_count' => 'Entry count',
+	'stats_entry_per_category' => 'Entries per category',
+	'stats_entry_per_day' => 'Entries per day (last 30 days)',
+	'stats_entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
+	'stats_entry_per_hour' => 'Per hour (average: %.2f messages)',
+	'stats_entry_per_month' => 'Per month (average: %.2f messages)',
+	'stats_entry_repartition' => 'Entries repartition',
+	'stats_feed_per_category' => 'Feeds per category',
+	'stats_idle' => 'Idle feeds',
+	'stats_main' => 'Main statistics',
+	'stats_no_idle' => 'There is no idle feed!',
+	'stats_percent_of_total' => '%% of total',
+	'stats_repartition' => 'Articles repartition',
+	'stats_top_feed' => 'Top ten feeds',
+	'status_favorites' => 'Favourites',
+	'status_read' => 'Read',
+	'status_total' => 'Total',
+	'status_unread' => 'Unread',
+	'steps' => 'Steps',
+	'sticky_post' => 'Stick the article to the top when opened',
+	'submit' => 'Submit',
+	'subscription_management' => 'Subscriptions management',
+	'sun' => 'Sun',
+	'theme' => 'Theme',
+	'think_to_add' => 'You may add some feeds.',
+	'this_is_the_end' => 'This is the end',
+	'thu' => 'Thu',
+	'today' => 'Today',
+	'top_line' => 'Top line',
+	'truncate' => 'Delete all articles',
+	'ttl' => 'Do not automatically refresh more often than',
+	'tue' => 'Tue',
+	'twitter' => 'Twitter',
+	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
+	'update' => 'Update',
+	'update_apply' => 'Apply',
+	'update_can_apply' => 'An update is available.',
+	'update_check' => 'Check for new updates',
+	'update_end' => 'Update process is completed, now you can go to the final step.',
+	'update_finished' => 'Update completed!',
+	'update_last' => 'Last verification: %s',
+	'update_long' => 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
+	'update_problem' => 'The update process has encountered an error: %s',
+	'update_server_not_found' => 'Update server cannot be found. [%s]',
+	'update_start' => 'Start update process',
+	'update_system' => 'Update system',
+	'updated' => 'Modifications have been updated',
+	'upon_reception' => 'upon reception of the article',
+	'user_created' => 'User %s has been created',
+	'user_deleted' => 'User %s has been deleted',
+	'user_filter' => 'Access user filters',
+	'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
+	'username' => 'Username',
+	'username_admin' => 'Administrator username',
+	'users' => 'Users',
+	'users_list' => 'List of users',
+	'version' => 'Version',
+	'version_update' => 'Update',
+	'wallabag' => 'wallabag',
+	'website' => 'Website',
+	'website_url' => 'Website URL',
+	'wed' => 'Wed',
+	'width_large' => 'Large',
+	'width_medium' => 'Medium',
+	'width_no_limit' => 'No limit',
+	'width_thin' => 'Thin',
+	'yes' => 'Yes',
+	'yesterday' => 'Yesterday',
+	'your_diaspora_pod' => 'Your Diaspora* pod',
+	'your_favorites' => 'Your favourites',
+	'your_rss_feeds' => 'Your RSS feeds',
+	'your_shaarli' => 'Your Shaarli',
+	'your_wallabag' => 'Your wallabag',
+	'zip_error' => 'An error occured during Zip import.',
+);
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
new file mode 100644
index 000000000..afca37ed3
--- /dev/null
+++ b/app/i18n/en/index.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+
+);
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
new file mode 100644
index 000000000..afca37ed3
--- /dev/null
+++ b/app/i18n/en/install.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+
+);
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
new file mode 100644
index 000000000..e64b6ca4b
--- /dev/null
+++ b/app/i18n/en/sub.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'categories' => array(
+		'over_max' => 'You have reached your limit of categories (%d)',
+	),
+	'feeds' => array(
+		'over_max' => 'You have reached your limit of feeds (%d)',
+	),
+);
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
deleted file mode 100644
index c29b6c9ac..000000000
--- a/app/i18n/fr.php
+++ /dev/null
@@ -1,533 +0,0 @@
-<?php
- return array (
-  'Apr' => '\\a\\v\\r\\i\\l',
-  'Aug' => '\\a\\o\\û\\t',
-  'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
-  'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
-  'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
-  'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
-  'Jun' => '\\j\\u\\i\\n',
-  'Mar' => '\\m\\a\\r\\s',
-  'May' => '\\m\\a\\i',
-  'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
-  'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
-  'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
-  'about' => 'À propos',
-  'about_freshrss' => 'À propos de FreshRSS',
-  'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
-  'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
-  'activate_sharing' => 'Activer le partage',
-  'actualize' => 'Actualiser',
-  'add_category' => 'Ajouter une catégorie',
-  'add_query' => 'Créer un filtre',
-  'add_rss_feed' => 'Ajouter un flux RSS',
-  'admin.check_install.cache.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
-  'admin.check_install.cache.ok' => 'Les droits sur le répertoire de cache sont bons.',
-  'admin.check_install.categories.nok' => 'La table category est mal configurée.',
-  'admin.check_install.categories.ok' => 'La table category est bien configurée.',
-  'admin.check_install.connection.nok' => 'La connexion à la base de données est impossible.',
-  'admin.check_install.connection.ok' => 'La connexion à la base de données est bonne.',
-  'admin.check_install.ctype.nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype).',
-  'admin.check_install.ctype.ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype).',
-  'admin.check_install.curl.nok' => 'Vous ne disposez pas de cURL (paquet php5-curl).',
-  'admin.check_install.curl.ok' => 'Vous disposez de cURL.',
-  'admin.check_install.data.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data</em>. Le serveur HTTP doit être capable d’écrire dedans',
-  'admin.check_install.data.ok' => 'Les droits sur le répertoire de data sont bons.',
-  'admin.check_install.database' => 'Installation de la base de données',
-  'admin.check_install.dom.nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml).',
-  'admin.check_install.dom.ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
-  'admin.check_install.entries.nok' => 'La table entry est mal configurée.',
-  'admin.check_install.entries.ok' => 'La table entry est bien configurée.',
-  'admin.check_install.favicons.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/favicons</em>. Le serveur HTTP doit être capable d’écrire dedans',
-  'admin.check_install.favicons.ok' => 'Les droits sur le répertoire des favicons sont bons.',
-  'admin.check_install.feeds.nok' => 'La table feed est mal configurée.',
-  'admin.check_install.feeds.ok' => 'La table feed est bien configurée.',
-  'admin.check_install.files' => 'Installation des fichiers',
-  'admin.check_install.json.nok' => 'Vous ne disposez pas de JSON (paquet php5-json).',
-  'admin.check_install.json.ok' => 'Vous disposez de l\'extension JSON.',
-  'admin.check_install.logs.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/logs</em>. Le serveur HTTP doit être capable d’écrire dedans',
-  'admin.check_install.logs.ok' => 'Les droits sur le répertoire des logs sont bons.',
-  'admin.check_install.minz.nok' => 'Vous ne disposez pas de la librairie Minz.',
-  'admin.check_install.minz.ok' => 'Vous disposez du framework Minz',
-  'admin.check_install.pcre.nok' => 'Il manque une librairie pour les expressions régulières (php-pcre).',
-  'admin.check_install.pcre.ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE).',
-  'admin.check_install.pdo.nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.pdo.ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite).',
-  'admin.check_install.persona.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/persona</em>. Le serveur HTTP doit être capable d’écrire dedans',
-  'admin.check_install.persona.ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons.',
-  'admin.check_install.php' => 'Installation de PHP',
-  'admin.check_install.php.nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
-  'admin.check_install.php.ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
-  'admin.check_install.tables.nok' => 'Il manque une ou plusieurs tables en base de données.',
-  'admin.check_install.tables.ok' => 'Les tables sont bien présentes en base de données.',
-  'admin.check_install.tokens.nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/tokens</em>. Le serveur HTTP doit être capable d’écrire dedans',
-  'admin.check_install.tokens.ok' => 'Les droits sur le répertoire des tokens sont bons.',
-  'admin.check_install.zip.nok' => 'Vous ne disposez pas de l\'extension ZIP (paquet php5-zip).',
-  'admin.check_install.zip.ok' => 'Vous disposez de l\'extension ZIP.',
-  'admin.users.articles_and_size' => '%s articles (%s)',
-  'administration' => 'Gérer',
-  'advanced' => 'Avancé',
-  'after_onread' => 'Après “marquer tout comme lu”,',
-  'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-  'all_feeds' => 'Tous les flux',
-  'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
-  'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
-  'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
-  'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-  'apr' => 'avr.',
-  'april' => 'avril',
-  'archiving_configuration' => 'Archivage',
-  'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
-  'article' => 'Article',
-  'article_icons' => 'Icônes d’article',
-  'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
-  'article_published_on' => 'Article publié initialement sur <a href="%s">%s</a>',
-  'article_published_on_author' => 'Article publié initialement sur <a href="%s">%s</a> par %s',
-  'article_viewed' => 'lorsque l’article est affiché',
-  'articles' => 'articles',
-  'articles_per_page' => 'Nombre d’articles par page',
-  'articles_to_display' => 'Articles à afficher',
-  'ask_empty' => 'Vider ?',
-  'attention' => 'Attention !',
-  'aug' => 'août',
-  'august' => 'août',
-  'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
-  'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
-  'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
-  'auth_no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
-  'auth_none' => 'Aucune (dangereux)',
-  'auth_not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
-  'auth_persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
-  'auth_reset' => 'Réinitialisation de l’authentification',
-  'auth_token' => 'Jeton d’identification',
-  'auth_type' => 'Méthode d’authentification',
-  'auth_will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
-  'author' => 'Auteur',
-  'auto_load_more' => 'Charger les articles suivants en bas de page',
-  'auto_read_when' => 'Marquer un article comme lu…',
-  'auto_share' => 'Partager',
-  'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-  'back_to_rss_feeds' => '← Retour à vos flux RSS',
-  'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
-  'base_url' => 'Base de l’URL',
-  'bdd' => 'Base de données',
-  'bdd_conf_is_ko' => 'Vérifiez les informations d’accès à la base de données.',
-  'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
-  'bdd_configuration' => 'Base de données',
-  'bdd_type' => 'Type de base de données',
-  'before_one_day' => 'Antérieurs à 1 jour',
-  'before_one_week' => 'Antérieurs à 1 semaine',
-  'before_yesterday' => 'À partir d’avant-hier',
-  'blank_to_disable' => 'Laissez vide pour désactiver',
-  'blogotext' => 'Blogotext',
-  'bookmark' => 'S’abonner (bookmark FreshRSS)',
-  'bottom_line' => 'Ligne du bas',
-  'bugs_reports' => 'Rapports de bugs',
-  'by' => 'par',
-  'by_author' => 'Par <em>%s</em>',
-  'by_default' => 'Par défaut',
-  'by_email' => 'Par courriel',
-  'by_feed' => 'par flux',
-  'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons',
-  'can_not_be_deleted' => 'Ne peut pas être supprimée.',
-  'cancel' => 'Annuler',
-  'categories' => 'Catégories',
-  'categories_management' => 'Gestion des catégories',
-  'categories_updated' => 'Les catégories ont été mises à jour.',
-  'categorize' => 'Ranger dans une catégorie',
-  'category' => 'Catégorie',
-  'category_created' => 'La catégorie %s a été créée.',
-  'category_deleted' => 'La catégorie a été supprimée.',
-  'category_emptied' => 'La catégorie a été vidée.',
-  'category_empty' => 'Catégorie vide',
-  'category_name_exists' => 'Une catégorie possède déjà ce nom.',
-  'category_no_id' => 'Vous devez préciser l’id de la catégorie.',
-  'category_no_name' => 'Vous devez préciser un nom pour la catégorie.',
-  'category_not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
-  'category_not_exist' => 'Cette catégorie n’existe pas !',
-  'category_number' => 'Catégorie n°%d',
-  'category_updated' => 'La catégorie a été mise à jour.',
-  'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
-  'checks' => 'Vérifications',
-  'choose_language' => 'Choisissez la langue pour FreshRSS',
-  'clear_logs' => 'Effacer les logs',
-  'collapse_article' => 'Refermer',
-  'conf.users.articles_and_size' => '%s articles (%s)',
-  'configuration' => 'Configuration',
-  'configuration_updated' => 'La configuration a été mise à jour.',
-  'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
-  'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
-  'congratulations' => 'Félicitations !',
-  'content_width' => 'Largeur du contenu',
-  'create' => 'Créer',
-  'create_user' => 'Créer un nouvel utilisateur',
-  'credits' => 'Crédits',
-  'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
-  'css_path_on_website' => 'Sélecteur CSS des articles sur le site d’origine',
-  'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
-  'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
-  'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
-  'curl_is_ok' => 'Vous disposez de cURL dans sa version %s',
-  'current_user' => 'Utilisateur actuel',
-  'damn' => 'Arf !',
-  'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
-  'dec' => 'déc.',
-  'december' => 'décembre',
-  'default_category' => 'Sans catégorie',
-  'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
-  'default_view' => 'Vue par défaut',
-  'delete' => 'Supprimer',
-  'delete_articles_every' => 'Supprimer les articles après',
-  'diaspora' => 'Diaspora*',
-  'display' => 'Affichage',
-  'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
-  'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
-  'display_configuration' => 'Affichage',
-  'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
-  'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
-  'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
-  'email' => 'Courriel',
-  'error_occurred' => 'Une erreur est survenue !',
-  'error_occurred_update' => 'Rien n’a été modifié !',
-  'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
-  'export' => 'Exporter',
-  'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
-  'export_opml' => 'Exporter la liste des flux (OPML)',
-  'export_starred' => 'Exporter les favoris',
-  'facebook' => 'Facebook',
-  'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
-  'favorite_feeds' => 'Favoris (%s)',
-  'feb' => 'fév.',
-  'february' => 'février',
-  'feed' => 'Flux',
-  'feed_actualized' => '<em>%s</em> a été mis à jour.',
-  'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
-  'feed_deleted' => 'Le flux a été supprimé.',
-  'feed_description' => 'Description',
-  'feed_empty' => 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
-  'feed_in_error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
-  'feed_list' => 'Liste des articles de %s',
-  'feed_not_added' => '<em>%s</em> n’a pas pu être ajouté.',
-  'feed_updated' => 'Le flux a été mis à jour.',
-  'feed_url' => 'URL du flux',
-  'feed_validator' => 'Vérifier la valididé du flux',
-  'feedback.login.error' => 'L’identifiant est invalide !',
-  'feedback.login.success' => 'Vous êtes désormais connecté',
-  'feedback.logout.success' => 'Vous avez été déconnecté',
-  'feedback.user_profile.updated' => 'Votre profil a été mis à jour',
-  'feeds' => 'Flux',
-  'feeds_actualized' => 'Les flux ont été mis à jour.',
-  'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
-  'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
-  'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
-  'feeds_moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
-  'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
-  'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
-  'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
-  'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
-  'filter' => 'Filtrer',
-  'finish_installation' => 'Terminer l’installation',
-  'first' => 'Début',
-  'first_article' => 'Passer au premier article',
-  'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
-  'focus_search' => 'Accéder à la recherche',
-  'format_date' => 'j %s Y',
-  'format_date_hour' => 'j %s Y \\à H\\:i',
-  'freshrss' => 'FreshRSS',
-  'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
-  'freshrss_installation' => 'Installation · FreshRSS',
-  'fri' => 'ven.',
-  'g+' => 'Google+',
-  'gen.menu.admin' => 'Administration',
-  'gen.menu.authentication' => 'Authentification',
-  'gen.menu.check_install' => 'Vérification de l\'installation',
-  'gen.menu.user_management' => 'Gestion des utilisateurs',
-  'gen.menu.user_profile' => 'Profil',
-  'gen.title.authentication' => 'Authentification',
-  'gen.title.check_install' => 'Vérification de l\'installation',
-  'gen.title.global_view' => 'Vue globale',
-  'gen.title.user_management' => 'Gestion des utilisateurs',
-  'gen.title.user_profile' => 'Profil',
-  'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
-  'general_configuration' => 'Configuration générale',
-  'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
-  'global_view' => 'Vue globale',
-  'help' => 'Afficher la documentation',
-  'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
-  'host' => 'Hôte',
-  'html5_notif_timeout' => 'Temps d’affichage de la notification HTML5',
-  'http_auth' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
-  'http_authentication' => 'Authentification HTTP',
-  'http_password' => 'Mot de passe HTTP',
-  'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
-  'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
-  'http_username' => 'Identifiant HTTP',
-  'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
-  'import' => 'Importer',
-  'import_export' => 'Importer / exporter',
-  'informations' => 'Informations',
-  'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
-  'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
-  'installation_step' => 'Installation — étape %d · FreshRSS',
-  'internal_problem_feed' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
-  'invalid_login' => 'L’identifiant est invalide !',
-  'invalid_url' => 'L’url <em>%s</em> est invalide.',
-  'is_admin' => 'est administrateur',
-  'jan' => 'jan.',
-  'january' => 'janvier',
-  'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
-  'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
-  'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
-  'jul' => 'jui.',
-  'july' => 'juillet',
-  'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-  'jun' => 'juin',
-  'june' => 'juin',
-  'keep_history' => 'Nombre minimum d’articles à conserver',
-  'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
-  'language' => 'Langue',
-  'language_defined' => 'La langue a bien été définie.',
-  'last' => 'Fin',
-  'last_3_month' => 'Depuis les trois derniers mois',
-  'last_6_month' => 'Depuis les six derniers mois',
-  'last_article' => 'Passer au dernier article',
-  'last_month' => 'Depuis le mois dernier',
-  'last_week' => 'Depuis la semaine dernière',
-  'last_year' => 'Depuis l’année dernière',
-  'lead_developer' => 'Développeur principal',
-  'license' => 'Licence',
-  'load_more' => 'Charger plus d’articles',
-  'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
-  'login' => 'Connexion',
-  'login_configuration' => 'Identification',
-  'login_persona_problem' => 'Problème de connexion à Persona ?',
-  'login_required' => 'Accès protégé par mot de passe :',
-  'login_with_persona' => 'Connexion avec Persona',
-  'logout' => 'Déconnexion',
-  'logs' => 'Logs',
-  'logs_empty' => 'Les logs sont vides.',
-  'main_stream' => 'Flux principal',
-  'mar' => 'mar.',
-  'march' => 'mars',
-  'mark_all_read' => 'Tout marquer comme lu',
-  'mark_cat_read' => 'Marquer la catégorie comme lue',
-  'mark_favorite' => 'Mettre en favori',
-  'mark_feed_read' => 'Marquer le flux comme lu',
-  'mark_read' => 'Marquer comme lu',
-  'may' => 'mai.',
-  'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
-  'minz_is_ok' => 'Vous disposez du framework Minz',
-  'mon' => 'lun.',
-  'month' => 'mois',
-  'more_information' => 'Plus d’informations',
-  'n_entries_deleted' => '%d articles ont été supprimés.',
-  'n_feeds_actualized' => '%d flux ont été mis à jour.',
-  'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
-  'new_category' => 'Nouvelle catégorie',
-  'newer_first' => 'Plus récents en premier',
-  'next' => 'Suivant',
-  'next_article' => 'Passer à l’article suivant',
-  'next_page' => 'Passer à la page suivante',
-  'next_step' => 'Passer à l’étape suivante',
-  'no' => 'Non',
-  'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
-  'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
-  'no_feed_to_refresh' => 'Il n’y a aucun flux à actualiser…',
-  'no_query' => 'Vous n’avez pas encore créé de filtre.',
-  'no_query_filter' => 'Aucun filtre appliqué',
-  'no_rss_feed' => 'Aucun flux RSS',
-  'no_selected_feed' => 'Aucun flux sélectionné.',
-  'no_update' => 'Aucune mise à jour à appliquer',
-  'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
-  'normal_view' => 'Vue normale',
-  'not_read' => '%d non lu',
-  'not_reads' => '%d non lus',
-  'not_yet_implemented' => 'Pas encore implémenté',
-  'nothing_to_load' => 'Fin des articles',
-  'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
-  'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
-  'nov' => 'nov.',
-  'november' => 'novembre',
-  'number_articles' => '%d articles',
-  'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
-  'number_feeds' => '%d flux',
-  'oct' => 'oct.',
-  'october' => 'octobre',
-  'ok' => 'Ok !',
-  'older_first' => 'Plus anciens en premier',
-  'oops' => 'Oups !',
-  'optimization_complete' => 'Optimisation terminée.',
-  'optimize_bdd' => 'Optimiser la base de données',
-  'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD',
-  'or' => 'ou',
-  'page_not_found' => 'La page que vous cherchez n’existe pas !',
-  'password' => 'Mot de passe',
-  'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
-  'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
-  'pcre_is_nok' => 'Il manque une librairie pour les expressions régulières (php-pcre)',
-  'pcre_is_ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE)',
-  'pdo_is_nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite)',
-  'pdo_is_ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite)',
-  'persona_connection_email' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-  'persona_is_ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons',
-  'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
-  'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
-  'prefix' => 'Préfixe des tables',
-  'previous' => 'Précédent',
-  'previous_article' => 'Passer à l’article précédent',
-  'previous_page' => 'Passer à la page précédente',
-  'print' => 'Imprimer',
-  'project_website' => 'Site du projet',
-  'public' => 'Public',
-  'publication_date' => 'Date de publication',
-  'purge_completed' => 'Purge effectuée (%d articles supprimés).',
-  'purge_now' => 'Purger maintenant',
-  'queries' => 'Filtres utilisateurs',
-  'query_created' => 'Le filtre "%s" a bien été créé.',
-  'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
-  'query_filter' => 'Filtres appliqués :',
-  'query_get_all' => 'Afficher tous les articles',
-  'query_get_category' => 'Afficher la catégorie "%s"',
-  'query_get_favorite' => 'Afficher les articles favoris',
-  'query_get_feed' => 'Afficher le flux "%s"',
-  'query_number' => 'Filtre n°%d',
-  'query_order_asc' => 'Afficher les articles les plus anciens en premier',
-  'query_order_desc' => 'Afficher les articles les plus récents en premier',
-  'query_search' => 'Recherche de "%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',
-  'random_string' => 'Chaîne aléatoire',
-  'reader_view' => 'Vue lecture',
-  'reading_configuration' => 'Lecture',
-  'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
-  'refresh' => 'Actualisation',
-  'related_tags' => 'Tags associés',
-  'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
-  'rss_feed_management' => 'Gestion des flux RSS',
-  'rss_feeds_of' => 'Flux RSS de %s',
-  'rss_view' => 'Flux RSS',
-  'sat' => 'sam.',
-  'save' => 'Enregistrer',
-  'scroll' => 'au défilement de la page',
-  'search' => 'Rechercher des mots ou des #tags',
-  'search_short' => 'Rechercher',
-  'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
-  'see_on_website' => 'Voir sur le site d’origine',
-  'see_website' => 'Voir le site',
-  'sep' => 'sep.',
-  'september' => 'septembre',
-  'shaarli' => 'Shaarli',
-  'share' => 'Partager',
-  'share_name' => 'Nom du partage à afficher',
-  'share_url' => 'URL du partage à utiliser',
-  'sharing' => 'Partage',
-  'sharing_management' => 'Gestion des options de partage',
-  'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
-  'shortcuts' => 'Raccourcis',
-  'shortcuts_article_action' => 'Actions associées à l’article courant',
-  'shortcuts_navigation' => 'Navigation',
-  'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
-  'shortcuts_other_action' => 'Autres actions',
-  'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
-  'show_adaptive' => 'Adapter l’affichage',
-  'show_all_articles' => 'Afficher tous les articles',
-  'show_favorite' => 'Afficher les favoris',
-  'show_in_all_flux' => 'Afficher dans le flux principal',
-  'show_not_favorite' => 'Afficher tout sauf les favoris',
-  'show_not_reads' => 'Afficher les non lus',
-  'show_read' => 'Afficher les lus',
-  'sort_order' => 'Ordre de tri',
-  'starred_list' => 'Liste des articles favoris',
-  'stats' => 'Statistiques',
-  'stats_entry_count' => 'Nombre d’articles',
-  'stats_entry_per_category' => 'Articles par catégorie',
-  'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
-  'stats_entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
-  'stats_entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
-  'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
-  'stats_entry_repartition' => 'Répartition des articles',
-  'stats_feed_per_category' => 'Flux par catégorie',
-  'stats_idle' => 'Flux inactifs',
-  'stats_main' => 'Statistiques principales',
-  'stats_no_idle' => 'Il n’y a aucun flux inactif !',
-  'stats_percent_of_total' => '%% du total',
-  'stats_repartition' => 'Répartition des articles',
-  'stats_top_feed' => 'Les dix plus gros flux',
-  'status_favorites' => 'favoris',
-  'status_read' => 'lus',
-  'status_total' => 'total',
-  'status_unread' => 'non lus',
-  'steps' => 'Étapes',
-  'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
-  'sub.categories.over_max' => 'Vous avez atteint votre limite de catégories (%d)',
-  'sub.feeds.over_max' => 'Vous avez atteint votre limite de flux (%d)',
-  'submit' => 'Valider',
-  'subscription_management' => 'Gestion des abonnements',
-  'sun' => 'dim.',
-  'theme' => 'Thème',
-  'think_to_add' => 'Vous pouvez ajouter des flux.',
-  'this_is_the_end' => 'This is the end',
-  'thu' => 'jeu.',
-  'title' => 'Titre',
-  'today' => 'Aujourd’hui',
-  'top_line' => 'Ligne du haut',
-  'truncate' => 'Supprimer tous les articles',
-  'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
-  'tue' => 'mar.',
-  'twitter' => 'Twitter',
-  'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
-  'update' => 'Mise à jour',
-  'update_apply' => 'Appliquer la mise à jour',
-  'update_can_apply' => 'Une mise à jour est disponible.',
-  'update_check' => 'Vérifier les mises à jour',
-  'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
-  'update_finished' => 'La mise à jour est terminée !',
-  'update_last' => 'Dernière vérification : %s',
-  'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
-  'update_problem' => 'La mise à jour a rencontré un problème : %s',
-  'update_server_not_found' => 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
-  'update_start' => 'Lancer la mise à jour',
-  'update_system' => 'Système de mise à jour',
-  'updated' => 'Modifications enregistrées.',
-  'upon_reception' => 'dès la réception du nouvel article',
-  'user_created' => 'L’utilisateur %s a été créé.',
-  'user_deleted' => 'L’utilisateur %s a été supprimé.',
-  'user_filter' => 'Accéder aux filtres utilisateur',
-  'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-  'username' => 'Nom d’utilisateur',
-  'username_admin' => 'Nom d’utilisateur administrateur',
-  'users' => 'Utilisateurs',
-  'users_list' => 'Liste des utilisateurs',
-  'version' => 'Version',
-  'version_update' => 'Mise à jour',
-  'wallabag' => 'wallabag',
-  'website' => 'Site Internet',
-  'website_url' => 'URL du site',
-  'wed' => 'mer.',
-  'width_large' => 'Large',
-  'width_medium' => 'Moyenne',
-  'width_no_limit' => 'Pas de limite',
-  'width_thin' => 'Fine',
-  'yes' => 'Oui',
-  'yesterday' => 'Hier',
-  'your_diaspora_pod' => 'Votre pod Diaspora*',
-  'your_favorites' => 'Vos favoris',
-  'your_rss_feeds' => 'Vos flux RSS',
-  'your_shaarli' => 'Votre Shaarli',
-  'your_wallabag' => 'Votre wallabag',
-  'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
-);
\ No newline at end of file
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
new file mode 100644
index 000000000..ad1fae6c0
--- /dev/null
+++ b/app/i18n/fr/admin.php
@@ -0,0 +1,92 @@
+<?php
+
+return array(
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de cache sont bons.',
+		),
+		'categories' => array(
+			'nok' => 'La table category est mal configurée.',
+			'ok' => 'La table category est bien configurée.',
+		),
+		'connection' => array(
+			'nok' => 'La connexion à la base de données est impossible.',
+			'ok' => 'La connexion à la base de données est bonne.',
+		),
+		'ctype' => array(
+			'nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype).',
+			'ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Vous ne disposez pas de cURL (paquet php5-curl).',
+			'ok' => 'Vous disposez de cURL.',
+		),
+		'data' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de data sont bons.',
+		),
+		'database' => 'Installation de la base de données',
+		'dom' => array(
+			'nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml).',
+			'ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
+		),
+		'entries' => array(
+			'nok' => 'La table entry est mal configurée.',
+			'ok' => 'La table entry est bien configurée.',
+		),
+		'favicons' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/favicons</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des favicons sont bons.',
+		),
+		'feeds' => array(
+			'nok' => 'La table feed est mal configurée.',
+			'ok' => 'La table feed est bien configurée.',
+		),
+		'files' => 'Installation des fichiers',
+		'json' => array(
+			'nok' => 'Vous ne disposez pas de JSON (paquet php5-json).',
+			'ok' => 'Vous disposez de l\'extension JSON.',
+		),
+		'logs' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/logs</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des logs sont bons.',
+		),
+		'minz' => array(
+			'nok' => 'Vous ne disposez pas de la librairie Minz.',
+			'ok' => 'Vous disposez du framework Minz',
+		),
+		'pcre' => array(
+			'nok' => 'Il manque une librairie pour les expressions régulières (php-pcre).',
+			'ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/persona</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons.',
+		),
+		'php' => array(
+			'_' => 'Installation de PHP',
+			'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
+			'ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'Il manque une ou plusieurs tables en base de données.',
+			'ok' => 'Les tables sont bien présentes en base de données.',
+		),
+		'tokens' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/tokens</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des tokens sont bons.',
+		),
+		'zip' => array(
+			'nok' => 'Vous ne disposez pas de l\'extension ZIP (paquet php5-zip).',
+			'ok' => 'Vous disposez de l\'extension ZIP.',
+		),
+	),
+	'users' => array(
+		'articles_and_size' => '%s articles (%s)',
+	),
+);
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
new file mode 100644
index 000000000..460804774
--- /dev/null
+++ b/app/i18n/fr/conf.php
@@ -0,0 +1,7 @@
+<?php
+
+return array(
+	'users' => array(
+		'articles_and_size' => '%s articles (%s)',
+	),
+);
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
new file mode 100644
index 000000000..f4bb7cccf
--- /dev/null
+++ b/app/i18n/fr/feedback.php
@@ -0,0 +1,14 @@
+<?php
+
+return array(
+	'login' => array(
+		'error' => 'L’identifiant est invalide !',
+		'success' => 'Vous êtes désormais connecté',
+	),
+	'logout' => array(
+		'success' => 'Vous avez été déconnecté',
+	),
+	'user_profile' => array(
+		'updated' => 'Votre profil a été mis à jour',
+	),
+);
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
new file mode 100644
index 000000000..8a4a9750b
--- /dev/null
+++ b/app/i18n/fr/gen.php
@@ -0,0 +1,487 @@
+<?php
+
+return array(
+	'Apr' => '\\a\\v\\r\\i\\l',
+	'Aug' => '\\a\\o\\û\\t',
+	'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
+	'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
+	'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
+	'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
+	'Jun' => '\\j\\u\\i\\n',
+	'Mar' => '\\m\\a\\r\\s',
+	'May' => '\\m\\a\\i',
+	'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
+	'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
+	'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
+	'about' => 'À propos',
+	'about_freshrss' => 'À propos de FreshRSS',
+	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
+	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
+	'activate_sharing' => 'Activer le partage',
+	'actualize' => 'Actualiser',
+	'add_category' => 'Ajouter une catégorie',
+	'add_query' => 'Créer un filtre',
+	'add_rss_feed' => 'Ajouter un flux RSS',
+	'administration' => 'Gérer',
+	'advanced' => 'Avancé',
+	'after_onread' => 'Après “marquer tout comme lu”,',
+	'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+	'all_feeds' => 'Tous les flux',
+	'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
+	'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
+	'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
+	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
+	'apr' => 'avr.',
+	'april' => 'avril',
+	'archiving_configuration' => 'Archivage',
+	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
+	'article' => 'Article',
+	'article_icons' => 'Icônes d’article',
+	'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
+	'article_published_on' => 'Article publié initialement sur <a href="%s">%s</a>',
+	'article_published_on_author' => 'Article publié initialement sur <a href="%s">%s</a> par %s',
+	'article_viewed' => 'lorsque l’article est affiché',
+	'articles' => 'articles',
+	'articles_per_page' => 'Nombre d’articles par page',
+	'articles_to_display' => 'Articles à afficher',
+	'ask_empty' => 'Vider ?',
+	'attention' => 'Attention !',
+	'aug' => 'août',
+	'august' => 'août',
+	'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
+	'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
+	'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
+	'auth_no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
+	'auth_none' => 'Aucune (dangereux)',
+	'auth_not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
+	'auth_persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
+	'auth_reset' => 'Réinitialisation de l’authentification',
+	'auth_token' => 'Jeton d’identification',
+	'auth_type' => 'Méthode d’authentification',
+	'auth_will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
+	'author' => 'Auteur',
+	'auto_load_more' => 'Charger les articles suivants en bas de page',
+	'auto_read_when' => 'Marquer un article comme lu…',
+	'auto_share' => 'Partager',
+	'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+	'back_to_rss_feeds' => '← Retour à vos flux RSS',
+	'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
+	'base_url' => 'Base de l’URL',
+	'bdd' => 'Base de données',
+	'bdd_conf_is_ko' => 'Vérifiez les informations d’accès à la base de données.',
+	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
+	'bdd_configuration' => 'Base de données',
+	'bdd_type' => 'Type de base de données',
+	'before_one_day' => 'Antérieurs à 1 jour',
+	'before_one_week' => 'Antérieurs à 1 semaine',
+	'before_yesterday' => 'À partir d’avant-hier',
+	'blank_to_disable' => 'Laissez vide pour désactiver',
+	'blogotext' => 'Blogotext',
+	'bookmark' => 'S’abonner (bookmark FreshRSS)',
+	'bottom_line' => 'Ligne du bas',
+	'bugs_reports' => 'Rapports de bugs',
+	'by' => 'par',
+	'by_author' => 'Par <em>%s</em>',
+	'by_default' => 'Par défaut',
+	'by_email' => 'Par courriel',
+	'by_feed' => 'par flux',
+	'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons',
+	'can_not_be_deleted' => 'Ne peut pas être supprimée.',
+	'cancel' => 'Annuler',
+	'categories' => 'Catégories',
+	'categories_management' => 'Gestion des catégories',
+	'categories_updated' => 'Les catégories ont été mises à jour.',
+	'categorize' => 'Ranger dans une catégorie',
+	'category' => 'Catégorie',
+	'category_created' => 'La catégorie %s a été créée.',
+	'category_deleted' => 'La catégorie a été supprimée.',
+	'category_emptied' => 'La catégorie a été vidée.',
+	'category_empty' => 'Catégorie vide',
+	'category_name_exists' => 'Une catégorie possède déjà ce nom.',
+	'category_no_id' => 'Vous devez préciser l’id de la catégorie.',
+	'category_no_name' => 'Vous devez préciser un nom pour la catégorie.',
+	'category_not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
+	'category_not_exist' => 'Cette catégorie n’existe pas !',
+	'category_number' => 'Catégorie n°%d',
+	'category_updated' => 'La catégorie a été mise à jour.',
+	'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
+	'checks' => 'Vérifications',
+	'choose_language' => 'Choisissez la langue pour FreshRSS',
+	'clear_logs' => 'Effacer les logs',
+	'collapse_article' => 'Refermer',
+	'configuration' => 'Configuration',
+	'configuration_updated' => 'La configuration a été mise à jour.',
+	'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
+	'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
+	'congratulations' => 'Félicitations !',
+	'content_width' => 'Largeur du contenu',
+	'create' => 'Créer',
+	'create_user' => 'Créer un nouvel utilisateur',
+	'credits' => 'Crédits',
+	'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
+	'css_path_on_website' => 'Sélecteur CSS des articles sur le site d’origine',
+	'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
+	'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
+	'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
+	'curl_is_ok' => 'Vous disposez de cURL dans sa version %s',
+	'current_user' => 'Utilisateur actuel',
+	'damn' => 'Arf !',
+	'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
+	'dec' => 'déc.',
+	'december' => 'décembre',
+	'default_category' => 'Sans catégorie',
+	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
+	'default_view' => 'Vue par défaut',
+	'delete' => 'Supprimer',
+	'delete_articles_every' => 'Supprimer les articles après',
+	'diaspora' => 'Diaspora*',
+	'display' => 'Affichage',
+	'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
+	'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
+	'display_configuration' => 'Affichage',
+	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
+	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
+	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
+	'email' => 'Courriel',
+	'error_occurred' => 'Une erreur est survenue !',
+	'error_occurred_update' => 'Rien n’a été modifié !',
+	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
+	'export' => 'Exporter',
+	'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
+	'export_opml' => 'Exporter la liste des flux (OPML)',
+	'export_starred' => 'Exporter les favoris',
+	'facebook' => 'Facebook',
+	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
+	'favorite_feeds' => 'Favoris (%s)',
+	'feb' => 'fév.',
+	'february' => 'février',
+	'feed' => 'Flux',
+	'feed_actualized' => '<em>%s</em> a été mis à jour.',
+	'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
+	'feed_deleted' => 'Le flux a été supprimé.',
+	'feed_description' => 'Description',
+	'feed_empty' => 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
+	'feed_in_error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
+	'feed_list' => 'Liste des articles de %s',
+	'feed_not_added' => '<em>%s</em> n’a pas pu être ajouté.',
+	'feed_updated' => 'Le flux a été mis à jour.',
+	'feed_url' => 'URL du flux',
+	'feed_validator' => 'Vérifier la valididé du flux',
+	'feeds' => 'Flux',
+	'feeds_actualized' => 'Les flux ont été mis à jour.',
+	'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
+	'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
+	'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
+	'feeds_moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
+	'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
+	'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
+	'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
+	'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
+	'filter' => 'Filtrer',
+	'finish_installation' => 'Terminer l’installation',
+	'first' => 'Début',
+	'first_article' => 'Passer au premier article',
+	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
+	'focus_search' => 'Accéder à la recherche',
+	'format_date' => 'j %s Y',
+	'format_date_hour' => 'j %s Y \\à H\\:i',
+	'freshrss' => 'FreshRSS',
+	'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
+	'freshrss_installation' => 'Installation · FreshRSS',
+	'fri' => 'ven.',
+	'g+' => 'Google+',
+	'menu' => array(
+		'admin' => 'Administration',
+		'authentication' => 'Authentification',
+		'check_install' => 'Vérification de l’installation',
+		'user_management' => 'Gestion des utilisateurs',
+		'user_profile' => 'Profil',
+	),
+	'title' => array(
+		'_' => 'Titre',
+		'authentication' => 'Authentification',
+		'check_install' => 'Vérification de l’installation',
+		'global_view' => 'Vue globale',
+		'user_management' => 'Gestion des utilisateurs',
+		'user_profile' => 'Profil',
+	),
+	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
+	'general_configuration' => 'Configuration générale',
+	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
+	'global_view' => 'Vue globale',
+	'help' => 'Afficher la documentation',
+	'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
+	'host' => 'Hôte',
+	'html5_notif_timeout' => 'Temps d’affichage de la notification HTML5',
+	'http_auth' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
+	'http_authentication' => 'Authentification HTTP',
+	'http_password' => 'Mot de passe HTTP',
+	'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
+	'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
+	'http_username' => 'Identifiant HTTP',
+	'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
+	'import' => 'Importer',
+	'import_export' => 'Importer / exporter',
+	'informations' => 'Informations',
+	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
+	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
+	'installation_step' => 'Installation — étape %d · FreshRSS',
+	'internal_problem_feed' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+	'invalid_login' => 'L’identifiant est invalide !',
+	'invalid_url' => 'L’url <em>%s</em> est invalide.',
+	'is_admin' => 'est administrateur',
+	'jan' => 'jan.',
+	'january' => 'janvier',
+	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
+	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
+	'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
+	'jul' => 'jui.',
+	'july' => 'juillet',
+	'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
+	'jun' => 'juin',
+	'june' => 'juin',
+	'keep_history' => 'Nombre minimum d’articles à conserver',
+	'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
+	'language' => 'Langue',
+	'language_defined' => 'La langue a bien été définie.',
+	'last' => 'Fin',
+	'last_3_month' => 'Depuis les trois derniers mois',
+	'last_6_month' => 'Depuis les six derniers mois',
+	'last_article' => 'Passer au dernier article',
+	'last_month' => 'Depuis le mois dernier',
+	'last_week' => 'Depuis la semaine dernière',
+	'last_year' => 'Depuis l’année dernière',
+	'lead_developer' => 'Développeur principal',
+	'license' => 'Licence',
+	'load_more' => 'Charger plus d’articles',
+	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
+	'login' => 'Connexion',
+	'login_configuration' => 'Identification',
+	'login_persona_problem' => 'Problème de connexion à Persona ?',
+	'login_required' => 'Accès protégé par mot de passe :',
+	'login_with_persona' => 'Connexion avec Persona',
+	'logout' => 'Déconnexion',
+	'logs' => 'Logs',
+	'logs_empty' => 'Les logs sont vides.',
+	'main_stream' => 'Flux principal',
+	'mar' => 'mar.',
+	'march' => 'mars',
+	'mark_all_read' => 'Tout marquer comme lu',
+	'mark_cat_read' => 'Marquer la catégorie comme lue',
+	'mark_favorite' => 'Mettre en favori',
+	'mark_feed_read' => 'Marquer le flux comme lu',
+	'mark_read' => 'Marquer comme lu',
+	'may' => 'mai.',
+	'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
+	'minz_is_ok' => 'Vous disposez du framework Minz',
+	'mon' => 'lun.',
+	'month' => 'mois',
+	'more_information' => 'Plus d’informations',
+	'n_entries_deleted' => '%d articles ont été supprimés.',
+	'n_feeds_actualized' => '%d flux ont été mis à jour.',
+	'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
+	'new_category' => 'Nouvelle catégorie',
+	'newer_first' => 'Plus récents en premier',
+	'next' => 'Suivant',
+	'next_article' => 'Passer à l’article suivant',
+	'next_page' => 'Passer à la page suivante',
+	'next_step' => 'Passer à l’étape suivante',
+	'no' => 'Non',
+	'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
+	'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
+	'no_feed_to_refresh' => 'Il n’y a aucun flux à actualiser…',
+	'no_query' => 'Vous n’avez pas encore créé de filtre.',
+	'no_query_filter' => 'Aucun filtre appliqué',
+	'no_rss_feed' => 'Aucun flux RSS',
+	'no_selected_feed' => 'Aucun flux sélectionné.',
+	'no_update' => 'Aucune mise à jour à appliquer',
+	'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
+	'normal_view' => 'Vue normale',
+	'not_read' => '%d non lu',
+	'not_reads' => '%d non lus',
+	'not_yet_implemented' => 'Pas encore implémenté',
+	'nothing_to_load' => 'Fin des articles',
+	'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+	'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
+	'nov' => 'nov.',
+	'november' => 'novembre',
+	'number_articles' => '%d articles',
+	'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
+	'number_feeds' => '%d flux',
+	'oct' => 'oct.',
+	'october' => 'octobre',
+	'ok' => 'Ok !',
+	'older_first' => 'Plus anciens en premier',
+	'oops' => 'Oups !',
+	'optimization_complete' => 'Optimisation terminée.',
+	'optimize_bdd' => 'Optimiser la base de données',
+	'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD',
+	'or' => 'ou',
+	'page_not_found' => 'La page que vous cherchez n’existe pas !',
+	'password' => 'Mot de passe',
+	'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
+	'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+	'pcre_is_nok' => 'Il manque une librairie pour les expressions régulières (php-pcre)',
+	'pcre_is_ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE)',
+	'pdo_is_nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite)',
+	'pdo_is_ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite)',
+	'persona_connection_email' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+	'persona_is_ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons',
+	'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
+	'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
+	'prefix' => 'Préfixe des tables',
+	'previous' => 'Précédent',
+	'previous_article' => 'Passer à l’article précédent',
+	'previous_page' => 'Passer à la page précédente',
+	'print' => 'Imprimer',
+	'project_website' => 'Site du projet',
+	'public' => 'Public',
+	'publication_date' => 'Date de publication',
+	'purge_completed' => 'Purge effectuée (%d articles supprimés).',
+	'purge_now' => 'Purger maintenant',
+	'queries' => 'Filtres utilisateurs',
+	'query_created' => 'Le filtre "%s" a bien été créé.',
+	'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
+	'query_filter' => 'Filtres appliqués :',
+	'query_get_all' => 'Afficher tous les articles',
+	'query_get_category' => 'Afficher la catégorie "%s"',
+	'query_get_favorite' => 'Afficher les articles favoris',
+	'query_get_feed' => 'Afficher le flux "%s"',
+	'query_number' => 'Filtre n°%d',
+	'query_order_asc' => 'Afficher les articles les plus anciens en premier',
+	'query_order_desc' => 'Afficher les articles les plus récents en premier',
+	'query_search' => 'Recherche de "%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',
+	'random_string' => 'Chaîne aléatoire',
+	'reader_view' => 'Vue lecture',
+	'reading_configuration' => 'Lecture',
+	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
+	'refresh' => 'Actualisation',
+	'related_tags' => 'Tags associés',
+	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
+	'rss_feed_management' => 'Gestion des flux RSS',
+	'rss_feeds_of' => 'Flux RSS de %s',
+	'rss_view' => 'Flux RSS',
+	'sat' => 'sam.',
+	'save' => 'Enregistrer',
+	'scroll' => 'au défilement de la page',
+	'search' => 'Rechercher des mots ou des #tags',
+	'search_short' => 'Rechercher',
+	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
+	'see_on_website' => 'Voir sur le site d’origine',
+	'see_website' => 'Voir le site',
+	'sep' => 'sep.',
+	'september' => 'septembre',
+	'shaarli' => 'Shaarli',
+	'share' => 'Partager',
+	'share_name' => 'Nom du partage à afficher',
+	'share_url' => 'URL du partage à utiliser',
+	'sharing' => 'Partage',
+	'sharing_management' => 'Gestion des options de partage',
+	'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
+	'shortcuts' => 'Raccourcis',
+	'shortcuts_article_action' => 'Actions associées à l’article courant',
+	'shortcuts_navigation' => 'Navigation',
+	'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
+	'shortcuts_other_action' => 'Autres actions',
+	'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
+	'show_adaptive' => 'Adapter l’affichage',
+	'show_all_articles' => 'Afficher tous les articles',
+	'show_favorite' => 'Afficher les favoris',
+	'show_in_all_flux' => 'Afficher dans le flux principal',
+	'show_not_favorite' => 'Afficher tout sauf les favoris',
+	'show_not_reads' => 'Afficher les non lus',
+	'show_read' => 'Afficher les lus',
+	'sort_order' => 'Ordre de tri',
+	'starred_list' => 'Liste des articles favoris',
+	'stats' => 'Statistiques',
+	'stats_entry_count' => 'Nombre d’articles',
+	'stats_entry_per_category' => 'Articles par catégorie',
+	'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
+	'stats_entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
+	'stats_entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
+	'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
+	'stats_entry_repartition' => 'Répartition des articles',
+	'stats_feed_per_category' => 'Flux par catégorie',
+	'stats_idle' => 'Flux inactifs',
+	'stats_main' => 'Statistiques principales',
+	'stats_no_idle' => 'Il n’y a aucun flux inactif !',
+	'stats_percent_of_total' => '%% du total',
+	'stats_repartition' => 'Répartition des articles',
+	'stats_top_feed' => 'Les dix plus gros flux',
+	'status_favorites' => 'favoris',
+	'status_read' => 'lus',
+	'status_total' => 'total',
+	'status_unread' => 'non lus',
+	'steps' => 'Étapes',
+	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
+	'submit' => 'Valider',
+	'subscription_management' => 'Gestion des abonnements',
+	'sun' => 'dim.',
+	'theme' => 'Thème',
+	'think_to_add' => 'Vous pouvez ajouter des flux.',
+	'this_is_the_end' => 'This is the end',
+	'thu' => 'jeu.',
+	'today' => 'Aujourd’hui',
+	'top_line' => 'Ligne du haut',
+	'truncate' => 'Supprimer tous les articles',
+	'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
+	'tue' => 'mar.',
+	'twitter' => 'Twitter',
+	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
+	'update' => 'Mise à jour',
+	'update_apply' => 'Appliquer la mise à jour',
+	'update_can_apply' => 'Une mise à jour est disponible.',
+	'update_check' => 'Vérifier les mises à jour',
+	'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
+	'update_finished' => 'La mise à jour est terminée !',
+	'update_last' => 'Dernière vérification : %s',
+	'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
+	'update_problem' => 'La mise à jour a rencontré un problème : %s',
+	'update_server_not_found' => 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
+	'update_start' => 'Lancer la mise à jour',
+	'update_system' => 'Système de mise à jour',
+	'updated' => 'Modifications enregistrées.',
+	'upon_reception' => 'dès la réception du nouvel article',
+	'user_created' => 'L’utilisateur %s a été créé.',
+	'user_deleted' => 'L’utilisateur %s a été supprimé.',
+	'user_filter' => 'Accéder aux filtres utilisateur',
+	'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+	'username' => 'Nom d’utilisateur',
+	'username_admin' => 'Nom d’utilisateur administrateur',
+	'users' => 'Utilisateurs',
+	'users_list' => 'Liste des utilisateurs',
+	'version' => 'Version',
+	'version_update' => 'Mise à jour',
+	'wallabag' => 'wallabag',
+	'website' => 'Site Internet',
+	'website_url' => 'URL du site',
+	'wed' => 'mer.',
+	'width_large' => 'Large',
+	'width_medium' => 'Moyenne',
+	'width_no_limit' => 'Pas de limite',
+	'width_thin' => 'Fine',
+	'yes' => 'Oui',
+	'yesterday' => 'Hier',
+	'your_diaspora_pod' => 'Votre pod Diaspora*',
+	'your_favorites' => 'Vos favoris',
+	'your_rss_feeds' => 'Vos flux RSS',
+	'your_shaarli' => 'Votre Shaarli',
+	'your_wallabag' => 'Votre wallabag',
+	'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
+);
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
new file mode 100644
index 000000000..afca37ed3
--- /dev/null
+++ b/app/i18n/fr/index.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+
+);
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
new file mode 100644
index 000000000..afca37ed3
--- /dev/null
+++ b/app/i18n/fr/install.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+
+);
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
new file mode 100644
index 000000000..6ef4002a6
--- /dev/null
+++ b/app/i18n/fr/sub.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'categories' => array(
+		'over_max' => 'Vous avez atteint votre limite de catégories (%d)',
+	),
+	'feeds' => array(
+		'over_max' => 'Vous avez atteint votre limite de flux (%d)',
+	),
+);
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index 8c2f90041..084bd7e07 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -5,71 +5,117 @@
  */
 
 /**
- * La classe Translate se charge de la traduction
- * Utilise les fichiers du répertoire /app/i18n/
+ * This class is used for the internationalization.
+ * It uses files in `./app/i18n/`
  */
 class Minz_Translate {
 	/**
-	 * $language est la langue à afficher
+	 * $lang_name is the name of the current language to use.
 	 */
-	private static $language;
-	
+	private static $lang_name;
+
 	/**
-	 * $translates est le tableau de correspondance
-	 * 	$key => $traduction
+	 * $lang_path is the pathname of i18n files (e.g. ./app/i18n/en/).
+	 */
+	private static $lang_path;
+
+	/**
+	 * $translates is a cache for i18n translation.
 	 */
 	private static $translates = array();
-	
+
 	/**
-	 * Inclus le fichier de langue qui va bien
-	 * l'enregistre dans $translates
+	 * Load $lang_name and $lang_path based on configuration and selected language.
 	 */
 	public static function init() {
 		$l = Minz_Configuration::language();
-		self::$language = Minz_Session::param('language', $l);
-		
-		$l_path = APP_PATH . '/i18n/' . self::$language . '.php';
-		
-		if (file_exists($l_path)) {
-			self::$translates = include($l_path);
-		}
+		self::$lang_name = Minz_Session::param('language', $l);
+		self::$lang_path = APP_PATH . '/i18n/' . self::$lang_name . '/';
 	}
-	
+
 	/**
-	 * Alias de init
+	 * Alias for init().
 	 */
 	public static function reset() {
 		self::init();
 	}
-	
+
 	/**
-	 * Traduit une clé en sa valeur du tableau $translates
-	 * @param $key la clé à traduire
-	 * @return la valeur correspondante à la clé
-	 *       > si non présente dans le tableau, on retourne la clé elle-même
+	 * Translate a key into its corresponding value based on selected language.
+	 * @param $key the key to translate.
+	 * @param additional parameters for variable keys.
+	 * @return the value corresponding to the key.
+	 *         If no value is found, return the key itself.
 	 */ 
 	public static function t($key) {
-		$translate = $key;
-		
-		if (isset(self::$translates[$key])) {
-			$translate = self::$translates[$key];
+		$group = explode('.', $key);
+
+		if (count($group) < 2) {
+			// Minz_Log::debug($key . ' is not in a valid format');
+			$top_level = 'gen';
+		} else {
+			$top_level = array_shift($group);
 		}
 
+		$filename = self::$lang_path . $top_level . '.php';
+
+		// Try to load the i18n file if it's not done yet.
+		if (!isset(self::$translates[$top_level])) {
+			if (!file_exists($filename)) {
+				Minz_Log::debug($top_level . ' is not a valid top level key');
+				return $key;
+			}
+
+			self::$translates[$top_level] = include($filename);
+		}
+
+		// Go through the i18n keys to get the correct translation value.
+		$translates = self::$translates[$top_level];
+		$size_group = count($group);
+		$level_processed = 0;
+		$translation_value = $key;
+		foreach ($group as $i18n_level) {
+			$level_processed++;
+			if (!isset($translates[$i18n_level])) {
+				Minz_Log::debug($key . ' is not a valid key');
+				return $key;
+			}
+
+			if ($level_processed < $size_group) {
+				$translates = $translates[$i18n_level];
+			} else {
+				$translation_value = $translates[$i18n_level];
+			}
+		}
+
+		if (is_array($translation_value)) {
+			if (isset($translation_value['_'])) {
+				$translation_value = $translation_value['_'];
+			} else {
+				Minz_Log::debug($key . ' is not a valid key');
+				return $key;
+			}
+		}
+
+		// Get the facultative arguments to replace i18n variables.
 		$args = func_get_args();
 		unset($args[0]);
-		
-		return vsprintf($translate, $args);
+
+		return vsprintf($translation_value, $args);
 	}
-	
+
 	/**
-	 * Retourne la langue utilisée actuellement
-	 * @return la langue
+	 * Return the current language.
 	 */
 	public static function language() {
-		return self::$language;
+		return self::$lang_name;
 	}
 }
 
+
+/**
+ * Alias for Minz_Translate::t()
+ */
 function _t($key) {
 	$args = func_get_args();
 	unset($args[0]);

From ddc50090b55cd744e24995c872435a3fed7092da Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 3 Dec 2014 16:58:12 +0100
Subject: [PATCH 176/363] Fix i18n for installation script

See https://github.com/FreshRSS/FreshRSS/issues/334
---
 app/install.php | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/app/install.php b/app/install.php
index cfdd733ce..f54565c73 100644
--- a/app/install.php
+++ b/app/install.php
@@ -42,18 +42,12 @@ function param($key, $default = false) {
 
 
 // gestion internationalisation
-$translates = array();
-$actual = 'en';
 function initTranslate() {
-	global $translates;
-	global $actual;
-
-	$actual = isset($_SESSION['language']) ? $_SESSION['language'] : getBetterLanguage('en');
-
-	$file = APP_PATH . '/i18n/' . $actual . '.php';
-	if (file_exists($file)) {
-		$translates = array_merge($translates, include($file));
+	if (!isset($_SESSION['language'])) {
+		$_SESSION['language'] = getBetterLanguage('en');
 	}
+
+	Minz_Translate::init();
 }
 
 function getBetterLanguage($fallback) {
@@ -75,19 +69,6 @@ function availableLanguages() {
 	);
 }
 
-function _t($key) {
-	global $translates;
-	$translate = $key;
-	if (isset($translates[$key])) {
-		$translate = $translates[$key];
-	}
-
-	$args = func_get_args();
-	unset($args[0]);
-
-	return vsprintf($translate, $args);
-}
-
 
 /*** SAUVEGARDES ***/
 function saveLanguage() {

From 7161eacb4042de4fd994b727800038d3ec286374 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Wed, 3 Dec 2014 23:42:38 +0100
Subject: [PATCH 177/363] Add i18n (french) for auto_remove_article #2

Reference : #694
---
 app/i18n/fr/gen.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 8a4a9750b..0b2395bd0 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -62,6 +62,7 @@ return array(
 	'author' => 'Auteur',
 	'auto_load_more' => 'Charger les articles suivants en bas de page',
 	'auto_read_when' => 'Marquer un article comme lu…',
+	'auto_remove_article' => 'Cacher les articles après lecture',
 	'auto_share' => 'Partager',
 	'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	'back_to_rss_feeds' => '← Retour à vos flux RSS',

From 93af0cf61e6e9368888eedb2d2e36397da3f87bd Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 3 Dec 2014 18:13:59 -0500
Subject: [PATCH 178/363] Fix behavior when marking an article as unread

---
 p/scripts/main.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 19eba206d..32cf55a3c 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -144,6 +144,7 @@ function mark_read(active, only_not_read) {
 			inc = 0;
 		if (active.hasClass("not_read")) {
 			active.removeClass("not_read");
+			hide_article(active);
 			inc--;
 		} else if (only_not_read !== true || active.hasClass("not_read")) {
 			active.addClass("not_read");
@@ -231,14 +232,7 @@ function toggleContent(new_active, old_active) {
 		}
 		old_active.removeClass("active current");
 		new_active.addClass("current");
-		if (context['auto_remove_article'] && !old_active.hasClass('not_read')) {
-			var p = old_active.prev();
-			var n = old_active.next();
-			if (p.hasClass('day') && n.hasClass('day')) {
-				p.remove();
-			}
-			old_active.remove();
-		}
+		hide_article(old_active);
 	} else {
 		new_active.toggleClass('active');
 	}
@@ -283,6 +277,17 @@ function toggleContent(new_active, old_active) {
 	}
 }
 
+function hide_article(article) {
+	if (context['auto_remove_article'] && !article.hasClass('not_read')) {
+		var p = article.prev();
+		var n = article.next();
+		if (p.hasClass('day') && n.hasClass('day')) {
+			p.remove();
+		}
+		article.remove();
+	}
+}
+
 function prev_entry() {
 	var old_active = $(".flux.current"),
 		new_active = old_active.length === 0 ? $(".flux:last") : old_active.prevAll(".flux:first");
@@ -690,9 +695,6 @@ function init_stream(divStream) {
 	divStream.on('click', '.flux a.read', function () {
 		var active = $(this).parents(".flux");
 		mark_read(active, false);
-		if (context['auto_remove_article']) {
-			active.remove();
-		}
 		return false;
 	});
 

From 5617911644bf85718430bb096c4ae9a0a0e8c75c Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 3 Dec 2014 18:35:42 -0500
Subject: [PATCH 179/363] Revert "Fix behavior when marking an article as
 unread"

This reverts commit 93af0cf61e6e9368888eedb2d2e36397da3f87bd.
---
 p/scripts/main.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 32cf55a3c..19eba206d 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -144,7 +144,6 @@ function mark_read(active, only_not_read) {
 			inc = 0;
 		if (active.hasClass("not_read")) {
 			active.removeClass("not_read");
-			hide_article(active);
 			inc--;
 		} else if (only_not_read !== true || active.hasClass("not_read")) {
 			active.addClass("not_read");
@@ -232,7 +231,14 @@ function toggleContent(new_active, old_active) {
 		}
 		old_active.removeClass("active current");
 		new_active.addClass("current");
-		hide_article(old_active);
+		if (context['auto_remove_article'] && !old_active.hasClass('not_read')) {
+			var p = old_active.prev();
+			var n = old_active.next();
+			if (p.hasClass('day') && n.hasClass('day')) {
+				p.remove();
+			}
+			old_active.remove();
+		}
 	} else {
 		new_active.toggleClass('active');
 	}
@@ -277,17 +283,6 @@ function toggleContent(new_active, old_active) {
 	}
 }
 
-function hide_article(article) {
-	if (context['auto_remove_article'] && !article.hasClass('not_read')) {
-		var p = article.prev();
-		var n = article.next();
-		if (p.hasClass('day') && n.hasClass('day')) {
-			p.remove();
-		}
-		article.remove();
-	}
-}
-
 function prev_entry() {
 	var old_active = $(".flux.current"),
 		new_active = old_active.length === 0 ? $(".flux:last") : old_active.prevAll(".flux:first");
@@ -695,6 +690,9 @@ function init_stream(divStream) {
 	divStream.on('click', '.flux a.read', function () {
 		var active = $(this).parents(".flux");
 		mark_read(active, false);
+		if (context['auto_remove_article']) {
+			active.remove();
+		}
 		return false;
 	});
 

From 53410887c94157f3d11f2c30d92ff5d3d8a3a9bd Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 3 Dec 2014 18:57:53 -0500
Subject: [PATCH 180/363] Fix behavior to hide articles

I do not like it since it is partly duplicated. We need to find something better.
---
 p/scripts/main.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 19eba206d..e48630d89 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -689,10 +689,15 @@ function init_stream(divStream) {
 
 	divStream.on('click', '.flux a.read', function () {
 		var active = $(this).parents(".flux");
-		mark_read(active, false);
-		if (context['auto_remove_article']) {
+		if (context['auto_remove_article'] && active.hasClass('not_read')) {
+			var p = active.prev();
+			var n = active.next();
+			if (p.hasClass('day') && n.hasClass('day')) {
+				p.remove();
+			}
 			active.remove();
 		}
+		mark_read(active, false);
 		return false;
 	});
 

From 86f69ca396572ca4d7668a33e84cb4f3b523fc4e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 4 Dec 2014 19:33:29 +0100
Subject: [PATCH 181/363] First draft for the new extension feature

- Only system extensions can be loaded for the moment by adding them in the config.php
  file.
- Remove previous system (it will be added properly in the new system in the next step).
---
 app/FreshRSS.php                      |  42 ++++----
 constants.php                         |   3 +-
 extensions/{Read-me.txt => README.md} |   0
 lib/Minz/Configuration.php            |  10 ++
 lib/Minz/Extension.php                |  96 +++++++++++++++++
 lib/Minz/ExtensionException.php       |  15 +++
 lib/Minz/ExtensionManager.php         | 150 ++++++++++++++++++++++++++
 7 files changed, 295 insertions(+), 21 deletions(-)
 rename extensions/{Read-me.txt => README.md} (100%)
 create mode 100644 lib/Minz/Extension.php
 create mode 100644 lib/Minz/ExtensionException.php
 create mode 100644 lib/Minz/ExtensionManager.php

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 6114a5d1a..2db811a71 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -6,6 +6,9 @@ class FreshRSS extends Minz_FrontController {
 			Minz_Session::init('FreshRSS');
 		}
 
+		// Load list of extensions and initialize the "system" ones.
+		Minz_ExtensionManager::init();
+
 		// Need to be called just after session init because it initializes
 		// current user.
 		FreshRSS_Auth::init();
@@ -32,7 +35,6 @@ class FreshRSS extends Minz_FrontController {
 
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
-		$this->loadExtensions();
 	}
 
 	private function loadStylesAndScripts() {
@@ -74,23 +76,23 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
-	private function loadExtensions() {
-		$extensionPath = FRESHRSS_PATH . '/extensions/';
-		//TODO: Add a preference to load only user-selected extensions
-		foreach (scandir($extensionPath) as $key => $extension) {
-			if (ctype_alpha($extension)) {
-				$mtime = @filemtime($extensionPath . $extension . '/style.css');
-				if ($mtime !== false) {
-					Minz_View::appendStyle(Minz_Url::display('/ext.php?c&amp;e=' . $extension . '&amp;' . $mtime));
-				}
-				$mtime = @filemtime($extensionPath . $extension . '/script.js');
-				if ($mtime !== false) {
-					Minz_View::appendScript(Minz_Url::display('/ext.php?j&amp;e=' . $extension . '&amp;' . $mtime));
-				}
-				if (file_exists($extensionPath . $extension . '/module.php')) {
-					//TODO: include
-				} 
-			}
-		}
-	}
+	// private function loadExtensions() {
+	// 	$extensionPath = FRESHRSS_PATH . '/extensions/';
+	// 	//TODO: Add a preference to load only user-selected extensions
+	// 	foreach (scandir($extensionPath) as $key => $extension) {
+	// 		if (ctype_alpha($extension)) {
+	// 			$mtime = @filemtime($extensionPath . $extension . '/style.css');
+	// 			if ($mtime !== false) {
+	// 				Minz_View::appendStyle(Minz_Url::display('/ext.php?c&amp;e=' . $extension . '&amp;' . $mtime));
+	// 			}
+	// 			$mtime = @filemtime($extensionPath . $extension . '/script.js');
+	// 			if ($mtime !== false) {
+	// 				Minz_View::appendScript(Minz_Url::display('/ext.php?j&amp;e=' . $extension . '&amp;' . $mtime));
+	// 			}
+	// 			if (file_exists($extensionPath . $extension . '/module.php')) {
+	// 				//TODO: include
+	// 			} 
+	// 		}
+	// 	}
+	// }
 }
diff --git a/constants.php b/constants.php
index f66a012b0..999e703ba 100644
--- a/constants.php
+++ b/constants.php
@@ -20,6 +20,7 @@ define('FRESHRSS_PATH', dirname(__FILE__));
 		define('CACHE_PATH', DATA_PATH . '/cache');
 
 	define('LIB_PATH', FRESHRSS_PATH . '/lib');
-		define('APP_PATH', FRESHRSS_PATH . '/app');
+	define('APP_PATH', FRESHRSS_PATH . '/app');
+	define('EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions');
 
 define('TMP_PATH', sys_get_temp_dir());
diff --git a/extensions/Read-me.txt b/extensions/README.md
similarity index 100%
rename from extensions/Read-me.txt
rename to extensions/README.md
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 6cbc9fc0b..4d3ab0964 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -69,6 +69,8 @@ class Minz_Configuration {
 		'max_categories' => Minz_Configuration::MAX_SMALL_INT,
 	);
 
+	private static $extensions_enabled = array();
+
 	/*
 	 * Getteurs
 	 */
@@ -133,6 +135,9 @@ class Minz_Configuration {
 	public static function unsafeAutologinEnabled() {
 		return self::$unsafe_autologin_enabled;
 	}
+	public static function extensionsEnabled() {
+		return self::$extensions_enabled;
+	}
 
 	public static function _allowAnonymous($allow = false) {
 		self::$allow_anonymous = ((bool)$allow) && self::canLogIn();
@@ -338,6 +343,11 @@ class Minz_Configuration {
 			}
 		}
 
+		// Extensions
+		if (isset($ini_array['extensions']) && is_array($ini_array['extensions'])) {
+			self::$extensions_enabled = $ini_array['extensions'];
+		}
+
 		// Base de données
 		if (isset ($ini_array['db'])) {
 			$db = $ini_array['db'];
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
new file mode 100644
index 000000000..f442344a3
--- /dev/null
+++ b/lib/Minz/Extension.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * The extension base class.
+ */
+class Minz_Extension {
+	private $name;
+	private $entrypoint;
+	private $path;
+	private $author;
+	private $description;
+	private $version;
+	private $type;
+
+	public static $authorized_types = array(
+		'system',
+		'user',
+	);
+
+	/**
+	 * The constructor to assign specific information to the extension.
+	 *
+	 * Available fields are:
+	 * - name: the name of the extension (required).
+	 * - entrypoint: the extension class name (required).
+	 * - path: the pathname to the extension files (required).
+	 * - author: the name and / or email address of the extension author.
+	 * - description: a short description to describe the extension role.
+	 * - version: a version for the current extension.
+	 * - type: "system" or "user" (default).
+	 *
+	 * It must not be redefined by child classes.
+	 *
+	 * @param $meta_info contains information about the extension.
+	 */
+	public function __construct($meta_info) {
+		$this->name = $meta_info['name'];
+		$this->entrypoint = $meta_info['entrypoint'];
+		$this->path = $meta_info['path'];
+		$this->author = isset($meta_info['author']) ? $meta_info['author'] : '';
+		$this->description = isset($meta_info['description']) ? $meta_info['description'] : '';
+		$this->version = isset($meta_info['version']) ? $meta_info['version'] : '0.1';
+		$this->setType(isset($meta_info['type']) ? $meta_info['type'] : 'user');
+	}
+
+	/**
+	 * Used when installing an extension (e.g. update the database scheme).
+	 *
+	 * It must be redefined by child classes.
+	 */
+	public function install() {}
+
+	/**
+	 * Used when uninstalling an extension (e.g. revert the database scheme to
+	 * cancel changes from install).
+	 *
+	 * It must be redefined by child classes.
+	 */
+	public function uninstall() {}
+
+	/**
+	 * Call at the initialization of the extension (i.e. when the extension is
+	 * enabled by the extension manager).
+	 *
+	 * It must be redefined by child classes.
+	 */
+	public function init() {}
+
+	/**
+	 * Getters and setters.
+	 */
+	public function getName() {
+		return $this->name;
+	}
+	public function getEntrypoint() {
+		return $this->entrypoint;
+	}
+	public function getAuthor() {
+		return $this->author;
+	}
+	public function getDescription() {
+		return $this->description;
+	}
+	public function getVersion() {
+		return $this->version;
+	}
+	public function getType() {
+		return $this->type;
+	}
+	private function setType($type) {
+		if (!in_array($type, self::$authorized_types)) {
+			throw new Minz_ExtensionException('invalid `type` info', $this->name);
+		}
+		$this->type = $type;
+	}
+}
diff --git a/lib/Minz/ExtensionException.php b/lib/Minz/ExtensionException.php
new file mode 100644
index 000000000..647f1a9b9
--- /dev/null
+++ b/lib/Minz/ExtensionException.php
@@ -0,0 +1,15 @@
+<?php
+
+class Minz_ExtensionException extends Minz_Exception {
+	public function __construct ($message, $extension_name = false, $code = self::ERROR) {
+		if ($extension_name) {
+			$message = 'An error occured in `' . $extension_name
+			         . '` extension with the message: ' . $message;
+		} else {
+			$message = 'An error occured in an unnamed '
+			         . 'extension with the message: ' . $message;
+		}
+
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
new file mode 100644
index 000000000..ae648fe0d
--- /dev/null
+++ b/lib/Minz/ExtensionManager.php
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * An extension manager to load extensions present in EXTENSIONS_PATH.
+ */
+class Minz_ExtensionManager {
+	private static $ext_metaname = 'metadata.json';
+	private static $ext_entry_point = 'extension.php';
+	private static $ext_list = array();
+	private static $ext_list_enabled = array();
+
+	private static $ext_auto_enabled = array();
+
+	/**
+	 * Initialize the extension manager by loading extensions in EXTENSIONS_PATH.
+	 *
+	 * A valid extension is a directory containing metadata.json and
+	 * extension.php files.
+	 * metadata.json is a JSON structure where the only required fields are
+	 * `name` and `entry_point`.
+	 * extension.php should contain at least a class named <name>Extension where
+	 * <name> must match with the entry point in metadata.json. This class must
+	 * inherit from Minz_Extension class.
+	 */
+	public static function init() {
+		$list_potential_extensions = array_values(array_diff(
+			scandir(EXTENSIONS_PATH),
+			array('..', '.')
+		));
+
+		self::$ext_auto_enabled = Minz_Configuration::extensionsEnabled();
+
+		foreach ($list_potential_extensions as $ext_dir) {
+			$ext_pathname = EXTENSIONS_PATH . '/' . $ext_dir;
+			$metadata_filename = $ext_pathname . '/' . self::$ext_metaname;
+
+			// Try to load metadata file.
+			if (!file_exists($metadata_filename)) {
+				// No metadata file? Invalid!
+				continue;
+			}
+			$meta_raw_content = file_get_contents($metadata_filename);
+			$meta_json = json_decode($meta_raw_content, true);
+			if (!$meta_json || !self::is_valid_metadata($meta_json)) {
+				// metadata.json is not a json file? Invalid!
+				// or metadata.json is invalid (no required information), invalid!
+				Minz_Log::warning('`' . $metadata_filename . '` is not a valid metadata file');
+				continue;
+			}
+
+			$meta_json['path'] = $ext_pathname;
+
+			// Try to load extension itself
+			$extension = self::load($meta_json);
+			if (!is_null($extension)) {
+				self::register($extension);
+			}
+		}
+	}
+
+	/**
+	 * Indicates if the given parameter is a valid metadata array.
+	 *
+	 * Required fields are:
+	 * - `name`: the name of the extension
+	 * - `entry_point`: a class name to load the extension source code
+	 * If the extension class name is `TestExtension`, entry point will be `Test`.
+	 * `entry_point` must be composed of alphanumeric characters.
+	 *
+	 * @param $meta is an array of values.
+	 * @return true if the array is valid, false else.
+	 */
+	public static function is_valid_metadata($meta) {
+		return !(empty($meta['name']) ||
+		         empty($meta['entrypoint']) ||
+		         !ctype_alnum($meta['entrypoint']));
+	}
+
+	/**
+	 * Load the extension source code based on info metadata.
+	 *
+	 * @param $info an array containing information about extension.
+	 * @return an extension inheriting from Minz_Extension.
+	 */
+	public static function load($info) {
+		$entry_point_filename = $info['path'] . '/' . self::$ext_entry_point;
+		$ext_class_name = $info['entrypoint'] . 'Extension';
+
+		include($entry_point_filename);
+
+		// Test if the given extension class exists.
+		if (!class_exists($ext_class_name)) {
+			Minz_Log::warning('`' . $ext_class_name .
+			                  '` cannot be found in `' . $entry_point_filename . '`');
+			return null;
+		}
+
+		// Try to load the class.
+		$extension = null;
+		try {
+			$extension = new $ext_class_name($info);
+		} catch (Minz_ExtensionException $e) {
+			// We cannot load the extension? Invalid!
+			Minz_Log::warning('In `' . $metadata_filename . '`: ' . $e->getMessage());
+			return null;
+		}
+
+		// Test if class is correct.
+		if (!($extension instanceof Minz_Extension)) {
+			Minz_Log::warning('`' . $ext_class_name .
+			                  '` is not an instance of `Minz_Extension`');
+			return null;
+		}
+
+		return $extension;
+	}
+
+	/**
+	 * Add the extension to the list of the known extensions ($ext_list).
+	 *
+	 * If the extension is present in $ext_auto_enabled and if its type is "system",
+	 * it will be enabled in the same time.
+	 *
+	 * @param $ext a valid extension.
+	 */
+	public static function register($ext) {
+		$name = $ext->getName();
+		self::$ext_list[$name] = $ext;
+
+		if ($ext->getType() === 'system' &&
+				in_array($name, self::$ext_auto_enabled)) {
+			self::enable($ext->getName());
+		}
+	}
+
+	/**
+	 * Enable an extension so it will be called when necessary.
+	 *
+	 * The extension init() method will be called.
+	 *
+	 * @param $ext_name is the name of a valid extension present in $ext_list.
+	 */
+	public static function enable($ext_name) {
+		if (isset(self::$ext_list[$ext_name])) {
+			$ext = self::$ext_list[$ext_name];
+			self::$ext_list_enabled[$ext_name] = $ext;
+			$ext->init();
+		}
+	}
+}

From 1086ba4a2bbe43a0101105624f831516b59ba9e9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 4 Dec 2014 19:47:43 +0100
Subject: [PATCH 182/363] Enable extensions for users

---
 app/FreshRSS.php              |  6 +++++-
 app/Models/Configuration.php  |  8 ++++++++
 lib/Minz/ExtensionManager.php | 11 +++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 2db811a71..166ee1709 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -6,7 +6,7 @@ class FreshRSS extends Minz_FrontController {
 			Minz_Session::init('FreshRSS');
 		}
 
-		// Load list of extensions and initialize the "system" ones.
+		// Load list of extensions and enable the "system" ones.
 		Minz_ExtensionManager::init();
 
 		// Need to be called just after session init because it initializes
@@ -29,6 +29,10 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
+		// Enable extensions for the current user.
+		$ext_list = FreshRSS_Context::$conf->extensions_enabled;
+		Minz_ExtensionManager::enable_by_list($ext_list);
+
 		// Init i18n.
 		Minz_Session::_param('language', FreshRSS_Context::$conf->language);
 		Minz_Translate::init();
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 8668470b0..13ce43990 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -64,6 +64,7 @@ class FreshRSS_Configuration {
 		'sharing' => array(),
 		'queries' => array(),
 		'html5_notif_timeout' => 0,
+		'extensions_enabled' => array(),
 	);
 
 	private $available_languages = array(
@@ -342,4 +343,11 @@ class FreshRSS_Configuration {
 	public function _bottomline_link($value) {
 		$this->data['bottomline_link'] = ((bool)$value) && $value !== 'no';
 	}
+
+	public function _extensions_enabled($value) {
+		if (!is_array($value)) {
+			$value = array($value);
+		}
+		$this->data['extensions_enabled'] = $value;
+	}
 }
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index ae648fe0d..789557b9e 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -147,4 +147,15 @@ class Minz_ExtensionManager {
 			$ext->init();
 		}
 	}
+
+	/**
+	 * Enable a list of extensions.
+	 *
+	 * @param $ext_list the names of extensions we want to load.
+	 */
+	public static function enable_by_list($ext_list) {
+		foreach ($ext_list as $ext_name) {
+			self::enable($ext_name);
+		}
+	}
 }

From 0316badf649ef285f068847ef094ace80dd51290 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 4 Dec 2014 19:52:07 +0100
Subject: [PATCH 183/363] Update gitignore for extensions

---
 extensions/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/.gitignore b/extensions/.gitignore
index d93e5e396..cd5592022 100644
--- a/extensions/.gitignore
+++ b/extensions/.gitignore
@@ -1 +1 @@
-/[xX]
+[xX]*

From f9b037742a0aeb49cab86782d1a59913c2de47bf Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 4 Dec 2014 20:41:01 +0100
Subject: [PATCH 184/363] Update ext.php to serve any file from extensions

Add an extension->getFileUrl() method to facilitate url generation
---
 lib/Minz/Extension.php | 23 +++++++++++++++++++++++
 p/ext.php              | 37 +++++++++++++++++++------------------
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index f442344a3..72a375a6d 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -75,6 +75,9 @@ class Minz_Extension {
 	public function getEntrypoint() {
 		return $this->entrypoint;
 	}
+	public function getPath() {
+		return $this->path;
+	}
 	public function getAuthor() {
 		return $this->author;
 	}
@@ -93,4 +96,24 @@ class Minz_Extension {
 		}
 		$this->type = $type;
 	}
+
+	/**
+	 * Return the url for a given file.
+	 *
+	 * @param $filename name of the file to serve.
+	 * @param $type the type (js or css) of the file to serve.
+	 * @return the url corresponding to the file.
+	 */
+	public function getFileUrl($filename, $type) {
+		$dir = end(explode('/', $this->path));
+		$file_name_url = urlencode($dir . '/' . $filename);
+
+		$absolute_path = $this->path . '/' . $filename;
+		$mtime = @filemtime($absolute_path);
+
+		$url = '/ext.php?f=' . $file_name_url .
+		       '&amp;t=' . $type .
+		       '&amp;' . $mtime;
+		return Minz_Url::display($url);
+	}
 }
diff --git a/p/ext.php b/p/ext.php
index a1dde2f93..39c224a84 100644
--- a/p/ext.php
+++ b/p/ext.php
@@ -1,32 +1,33 @@
 <?php
-if (!isset($_GET['e'])) {
-	header('HTTP/1.1 400 Bad Request');
-	die();
-}
-$extension = substr($_GET['e'], 0, 64);
-if (!ctype_alpha($extension)) {
+if (!isset($_GET['f']) ||
+		!isset($_GET['t'])) {
 	header('HTTP/1.1 400 Bad Request');
 	die();
 }
 
 require('../constants.php');
-$filename = FRESHRSS_PATH . '/extensions/' . $extension . '/';
 
-if (isset($_GET['j'])) {
-	header('Content-Type: application/javascript; charset=UTF-8');
-	header('Content-Disposition: inline; filename="script.js"');
-	$filename .= 'script.js';
-} elseif (isset($_GET['c'])) {
+$file_name = urldecode($_GET['f']);
+$file_type = $_GET['t'];
+
+$absolute_filename = EXTENSIONS_PATH . '/' . $file_name;
+
+switch ($file_type) {
+case 'css':
 	header('Content-Type: text/css; charset=UTF-8');
-	header('Content-Disposition: inline; filename="style.css"');
-	$filename .= 'style.css';
-} else {
+	header('Content-Disposition: inline; filename="' . $file_name . '"');
+	break;
+case 'js':
+	header('Content-Type: application/javascript; charset=UTF-8');
+	header('Content-Disposition: inline; filename="' . $file_name . '"');
+	break;
+default:
 	header('HTTP/1.1 400 Bad Request');
 	die();
 }
 
-$mtime = @filemtime($filename);
-if ($mtime == false) {
+$mtime = @filemtime($absolute_filename);
+if ($mtime === false) {
 	header('HTTP/1.1 404 Not Found');
 	die();
 }
@@ -34,5 +35,5 @@ if ($mtime == false) {
 require(LIB_PATH . '/http-conditional.php');
 
 if (!httpConditional($mtime, 604800, 2)) {
-	readfile($filename);
+	readfile($absolute_filename);
 }

From f1fd1091b9ef0cb0818659e0ce1c9699506cac97 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 4 Dec 2014 20:43:05 +0100
Subject: [PATCH 185/363] Remove old code for extensions

---
 app/FreshRSS.php | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 166ee1709..dc7d0b375 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -79,24 +79,4 @@ class FreshRSS extends Minz_FrontController {
 			Minz_Session::_param('notification');
 		}
 	}
-
-	// private function loadExtensions() {
-	// 	$extensionPath = FRESHRSS_PATH . '/extensions/';
-	// 	//TODO: Add a preference to load only user-selected extensions
-	// 	foreach (scandir($extensionPath) as $key => $extension) {
-	// 		if (ctype_alpha($extension)) {
-	// 			$mtime = @filemtime($extensionPath . $extension . '/style.css');
-	// 			if ($mtime !== false) {
-	// 				Minz_View::appendStyle(Minz_Url::display('/ext.php?c&amp;e=' . $extension . '&amp;' . $mtime));
-	// 			}
-	// 			$mtime = @filemtime($extensionPath . $extension . '/script.js');
-	// 			if ($mtime !== false) {
-	// 				Minz_View::appendScript(Minz_Url::display('/ext.php?j&amp;e=' . $extension . '&amp;' . $mtime));
-	// 			}
-	// 			if (file_exists($extensionPath . $extension . '/module.php')) {
-	// 				//TODO: include
-	// 			} 
-	// 		}
-	// 	}
-	// }
 }

From 2a74b9e9a69fcfe74b513c487430669540ef18fc Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Fri, 5 Dec 2014 09:41:54 +0100
Subject: [PATCH 186/363] Add i18n (english) for auto_remove_article #2

Reference : https://github.com/FreshRSS/FreshRSS/pull/694
---
 app/i18n/en/gen.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 9e06357bc..5dc2c3e28 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -62,6 +62,7 @@ return array(
 	'author' => 'Author',
 	'auto_load_more' => 'Load next articles at the page bottom',
 	'auto_read_when' => 'Mark article as read…',
+	'auto_remove_article' => 'Hide articles after reading'
 	'auto_share' => 'Share',
 	'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
 	'back_to_rss_feeds' => '← Go back to your RSS feeds',

From a2da70fd119cc43438f8dd88de54a7d19fafbe1a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 5 Dec 2014 10:51:34 +0100
Subject: [PATCH 187/363] Fix security hole from ext.php script.

Now, ext.php can only serve file under a EXTENSIONS_PATH/ext_dir/static/ directory.
A 400 Bad Request error will be returned for other files.

See https://github.com/FreshRSS/FreshRSS/issues/252
And https://github.com/FreshRSS/FreshRSS/commit/f9b037742a0aeb49cab86782d1a59913c2de47b
---
 lib/Minz/Extension.php |  4 ++--
 p/ext.php              | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index 72a375a6d..ecf510ea2 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -106,9 +106,9 @@ class Minz_Extension {
 	 */
 	public function getFileUrl($filename, $type) {
 		$dir = end(explode('/', $this->path));
-		$file_name_url = urlencode($dir . '/' . $filename);
+		$file_name_url = urlencode($dir . '/static/' . $filename);
 
-		$absolute_path = $this->path . '/' . $filename;
+		$absolute_path = $this->path . '/static/' . $filename;
 		$mtime = @filemtime($absolute_path);
 
 		$url = '/ext.php?f=' . $file_name_url .
diff --git a/p/ext.php b/p/ext.php
index 39c224a84..5c9f9125f 100644
--- a/p/ext.php
+++ b/p/ext.php
@@ -7,10 +7,42 @@ if (!isset($_GET['f']) ||
 
 require('../constants.php');
 
+/**
+ * Check if a file can be served by ext.php. A valid file is under a
+ * EXTENSIONS_PATH/extension_name/static/ directory.
+ *
+ * You should sanitize path by using the realpath() function.
+ *
+ * @param $path the path to the file we want to serve.
+ * @return true if it can be served, false else.
+ *
+ */
+function is_valid_path($path) {
+	// It must be under the extension path.
+	$in_ext_path = (substr($path, 0, strlen(EXTENSIONS_PATH)) === EXTENSIONS_PATH);
+	if (!$in_ext_path) {
+		return false;
+	}
+
+	// File to serve must be under a `ext_dir/static/` directory.
+	$path_relative_to_ext = substr($path, strlen(EXTENSIONS_PATH) + 1);
+	$path_splitted = explode('/', $path_relative_to_ext);
+	if (count($path_splitted) < 3 || $path_splitted[1] !== 'static') {
+		return false;
+	}
+
+	return true;
+}
+
 $file_name = urldecode($_GET['f']);
 $file_type = $_GET['t'];
 
-$absolute_filename = EXTENSIONS_PATH . '/' . $file_name;
+$absolute_filename = realpath(EXTENSIONS_PATH . '/' . $file_name);
+
+if (!is_valid_path($absolute_filename)) {
+	header('HTTP/1.1 400 Bad Request');
+	die();
+}
 
 switch ($file_type) {
 case 'css':

From 6a706c95df557d1897608c89d3f5e0d0e9cd20ac Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 5 Dec 2014 07:07:23 -0500
Subject: [PATCH 188/363] fix typo

---
 app/i18n/en/gen.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 5dc2c3e28..a7f51e8f9 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -62,7 +62,7 @@ return array(
 	'author' => 'Author',
 	'auto_load_more' => 'Load next articles at the page bottom',
 	'auto_read_when' => 'Mark article as read…',
-	'auto_remove_article' => 'Hide articles after reading'
+	'auto_remove_article' => 'Hide articles after reading',
 	'auto_share' => 'Share',
 	'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
 	'back_to_rss_feeds' => '← Go back to your RSS feeds',

From 9fc60317eecba785b66011f04b9a5150296f2df6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 5 Dec 2014 14:17:02 +0100
Subject: [PATCH 189/363] First draft for listing and manipulate extensions

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 43 +++++++++++++++++++++++++
 app/layout/aside_configure.phtml        |  4 +++
 app/layout/header.phtml                 |  1 +
 app/views/extension/index.phtml         | 35 ++++++++++++++++++++
 lib/Minz/Extension.php                  | 20 ++++++++++++
 lib/Minz/ExtensionManager.php           | 17 ++++++++++
 6 files changed, 120 insertions(+)
 create mode 100644 app/Controllers/extensionController.php
 create mode 100644 app/views/extension/index.phtml

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
new file mode 100644
index 000000000..504be56d3
--- /dev/null
+++ b/app/Controllers/extensionController.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * The controller to manage extensions.
+ */
+class FreshRSS_extension_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
+	public function firstAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
+		}
+	}
+
+	/**
+	 * This action lists all the extensions available to the current user.
+	 */
+	public function indexAction() {
+		Minz_View::prependTitle(_t('admin.extensions.title') . ' · ');
+		$this->view->extension_list = Minz_ExtensionManager::list_extensions();
+	}
+
+	public function configureAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		}
+	}
+
+	public function enableAction() {
+		
+	}
+
+	public function disableAction() {
+		
+	}
+
+	public function removeAction() {
+		
+	}
+}
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 53c52d3e3..f7f3617c4 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -22,6 +22,10 @@
 	                          Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
 		<a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a>
 	</li>
+	<li class="item<?php echo Minz_Request::controllerName() === 'extension' &&
+	                          Minz_Request::actionName() === 'index'? ' active' : ''; ?>">
+		<a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a>
+	</li>
 	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 	<li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index c73d9cdbb..0ff367d0b 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -63,6 +63,7 @@ if (Minz_Configuration::canLogIn()) {
 				<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="item"><a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a></li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 				<li class="separator"></li>
 				<li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
new file mode 100644
index 000000000..c6b7c84a1
--- /dev/null
+++ b/app/views/extension/index.phtml
@@ -0,0 +1,35 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.back_to_rss_feeds'); ?></a>
+
+	<h1><?php echo _t('admin.extensions.title'); ?></h1>
+
+	<?php if (!empty($this->extension_list)) { ?>
+	<form id="form-extension" method="post" style="display: none"></form>
+	<?php foreach ($this->extension_list as $ext) { ?>
+	<ul class="horizontal-list">
+		<li class="item">
+			<?php $name_encoded = urlencode($ext->getName()); ?>
+			<div class="stick">
+				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('admin.extensions.manage'); ?></a>
+				<?php if ($ext->is_enabled()) { ?>
+				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
+				<?php } else { ?>
+				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.enable'); ?></button>
+				<?php } ?>
+				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.remove'); ?></button>
+				<?php } ?>
+			</div>
+		</li>
+		<li class="item"><?php echo $ext->getName(); ?></li>
+	</ul>
+	<?php } ?>
+	<?php } else { ?>
+	<p class="alert alert-warn"><?php echo _t('admin.extensions.empty_list'); ?></p>
+	<?php } ?>
+</div>
+
+<a href="#" id="close-slider"></a>
+<div id="slider"></div>
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index ecf510ea2..a1fdd659b 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -17,6 +17,8 @@ class Minz_Extension {
 		'user',
 	);
 
+	private $is_enabled;
+
 	/**
 	 * The constructor to assign specific information to the extension.
 	 *
@@ -41,6 +43,8 @@ class Minz_Extension {
 		$this->description = isset($meta_info['description']) ? $meta_info['description'] : '';
 		$this->version = isset($meta_info['version']) ? $meta_info['version'] : '0.1';
 		$this->setType(isset($meta_info['type']) ? $meta_info['type'] : 'user');
+
+		$this->is_enabled = false;
 	}
 
 	/**
@@ -66,6 +70,22 @@ class Minz_Extension {
 	 */
 	public function init() {}
 
+	/**
+	 * Set the current extension to enable.
+	 */
+	public function enable() {
+		$this->is_enabled = true;
+	}
+
+	/**
+	 * Return if the extension is currently enabled.
+	 *
+	 * @return true if extension is enabled, false else.
+	 */
+	public function is_enabled() {
+		return $this->is_enabled;
+	}
+
 	/**
 	 * Getters and setters.
 	 */
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 789557b9e..6c32ccf19 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -144,6 +144,7 @@ class Minz_ExtensionManager {
 		if (isset(self::$ext_list[$ext_name])) {
 			$ext = self::$ext_list[$ext_name];
 			self::$ext_list_enabled[$ext_name] = $ext;
+			$ext->enable();
 			$ext->init();
 		}
 	}
@@ -158,4 +159,20 @@ class Minz_ExtensionManager {
 			self::enable($ext_name);
 		}
 	}
+
+
+
+	/**
+	 * Returns a list of extensions.
+	 *
+	 * @param $only_enabled if true returns only the enabled extensions (false by default).
+	 * @return an array of extensions.
+	 */
+	public static function list_extensions($only_enabled = false) {
+		if ($only_enabled) {
+			return self::$ext_list_enabled;
+		} else {
+			return self::$ext_list;
+		}
+	}
 }

From f8aa66152fcab24ae7cd9663dab0c0c96a45ca24 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 5 Dec 2014 14:48:09 +0100
Subject: [PATCH 190/363] Give possibility to register a new Controller.

- Add a Extension->registerController(name) method
- Controllers must be written in extension_dir/controllers/nameController.php
- Controllers must be named as FreshExtension_name_Controller
- Controllers must extend Minz_ActionController

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 lib/Minz/Dispatcher.php | 47 ++++++++++++++++++++++++++++++++++++++---
 lib/Minz/Extension.php  | 13 ++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/lib/Minz/Dispatcher.php b/lib/Minz/Dispatcher.php
index f62a92911..66789a3d3 100644
--- a/lib/Minz/Dispatcher.php
+++ b/lib/Minz/Dispatcher.php
@@ -15,6 +15,7 @@ class Minz_Dispatcher {
 	/* singleton */
 	private static $instance = null;
 	private static $needsReset;
+	private static $registrations = array();
 
 	private $controller;
 
@@ -38,7 +39,7 @@ class Minz_Dispatcher {
 			self::$needsReset = false;
 
 			try {
-				$this->createController ('FreshRSS_' . Minz_Request::controllerName () . '_Controller');
+				$this->createController (Minz_Request::controllerName ());
 				$this->controller->init ();
 				$this->controller->firstAction ();
 				if (!self::$needsReset) {
@@ -73,8 +74,11 @@ class Minz_Dispatcher {
 	 *          > pas une instance de ActionController
 	 */
 	private function createController ($controller_name) {
-		$filename = APP_PATH . self::CONTROLLERS_PATH_NAME . '/'
-		          . $controller_name . '.php';
+		if (self::isRegistered($controller_name)) {
+			$controller_name = self::loadController($controller_name);
+		} else {
+			$controller_name = 'FreshRSS_' . $controller_name . '_Controller';
+		}
 
 		if (!class_exists ($controller_name)) {
 			throw new Minz_ControllerNotExistException (
@@ -114,4 +118,41 @@ class Minz_Dispatcher {
 			$action_name
 		));
 	}
+
+	/**
+	 * Register a controller file.
+	 *
+	 * @param $base_name the base name of the controller (i.e. ./?c=<base_name>)
+	 * @param $controller_name the name of the controller (e.g. HelloWorldController).
+	 * @param $filename the file which contains the controller.
+	 */
+	public static function registerController($base_name, $controller_name, $filename) {
+		if (file_exists($filename)) {
+			self::$registrations[$base_name] = array(
+				$controller_name,
+				$filename,
+			);
+		}
+	}
+
+	/**
+	 * Return if a controller is registered.
+	 *
+	 * @param $base_name the base name of the controller.
+	 * @return true if the controller has been registered, false else.
+	 */
+	public static function isRegistered($base_name) {
+		return isset(self::$registrations[$base_name]);
+	}
+
+	/**
+	 * Load a controller file (include) and return its name.
+	 *
+	 * @param $base_name the base name of the controller.
+	 */
+	private static function loadController($base_name) {
+		list($controller_name, $filename) = self::$registrations[$base_name];
+		include($filename);
+		return $controller_name;
+	}
 }
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index a1fdd659b..ad3465640 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -136,4 +136,17 @@ class Minz_Extension {
 		       '&amp;' . $mtime;
 		return Minz_Url::display($url);
 	}
+
+	/**
+	 * Register a controller in the Dispatcher.
+	 *
+	 * @param @base_name the base name of the controller. Final name will be:
+	 *                   FreshExtension_<base_name>_Controller.
+	 */
+	public function registerController($base_name) {
+		$controller_name = 'FreshExtension_' . $base_name . '_Controller';
+		$filename = $this->path . '/controllers/' . $base_name . 'Controller.php';
+
+		Minz_Dispatcher::registerController($base_name, $controller_name, $filename);
+	}
 }

From c6a682deb94111c1e14cf10e565da3f4214f02dc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 5 Dec 2014 15:27:56 +0100
Subject: [PATCH 191/363] Extensions can define new views

- View base pathname is set to the extension directory
- An extension can now override an existing controller / view

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 lib/Minz/Dispatcher.php | 40 +++++++++++++++++++++++-----------------
 lib/Minz/Extension.php  |  5 +----
 lib/Minz/View.php       | 10 +++++++---
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/lib/Minz/Dispatcher.php b/lib/Minz/Dispatcher.php
index 66789a3d3..edd59c7cc 100644
--- a/lib/Minz/Dispatcher.php
+++ b/lib/Minz/Dispatcher.php
@@ -68,16 +68,17 @@ class Minz_Dispatcher {
 
 	/**
 	 * Instancie le Controller
-	 * @param $controller_name le nom du controller à instancier
+	 * @param $base_name le nom du controller à instancier
 	 * @exception ControllerNotExistException le controller n'existe pas
 	 * @exception ControllerNotActionControllerException controller n'est
 	 *          > pas une instance de ActionController
 	 */
-	private function createController ($controller_name) {
-		if (self::isRegistered($controller_name)) {
-			$controller_name = self::loadController($controller_name);
+	private function createController ($base_name) {
+		if (self::isRegistered($base_name)) {
+			self::loadController($base_name);
+			$controller_name = 'FreshExtension_' . $base_name . '_Controller';
 		} else {
-			$controller_name = 'FreshRSS_' . $controller_name . '_Controller';
+			$controller_name = 'FreshRSS_' . $base_name . '_Controller';
 		}
 
 		if (!class_exists ($controller_name)) {
@@ -94,6 +95,10 @@ class Minz_Dispatcher {
 				Minz_Exception::ERROR
 			);
 		}
+
+		if (self::isRegistered($base_name)) {
+			$this->setViewPath($this->controller, $base_name);
+		}
 	}
 
 	/**
@@ -123,15 +128,11 @@ class Minz_Dispatcher {
 	 * Register a controller file.
 	 *
 	 * @param $base_name the base name of the controller (i.e. ./?c=<base_name>)
-	 * @param $controller_name the name of the controller (e.g. HelloWorldController).
-	 * @param $filename the file which contains the controller.
+	 * @param $base_path the base path where we should look into to find info.
 	 */
-	public static function registerController($base_name, $controller_name, $filename) {
-		if (file_exists($filename)) {
-			self::$registrations[$base_name] = array(
-				$controller_name,
-				$filename,
-			);
+	public static function registerController($base_name, $base_path) {
+		if (!self::isRegistered($base_name)) {
+			self::$registrations[$base_name] = $base_path;
 		}
 	}
 
@@ -146,13 +147,18 @@ class Minz_Dispatcher {
 	}
 
 	/**
-	 * Load a controller file (include) and return its name.
+	 * Load a controller file (include).
 	 *
 	 * @param $base_name the base name of the controller.
 	 */
 	private static function loadController($base_name) {
-		list($controller_name, $filename) = self::$registrations[$base_name];
-		include($filename);
-		return $controller_name;
+		$base_path = self::$registrations[$base_name];
+		$controller_filename = $base_path . '/controllers/' . $base_name . 'Controller.php';
+		include($controller_filename);
+	}
+
+	private static function setViewPath($controller, $base_name) {
+		$base_path = self::$registrations[$base_name];
+		$controller->view()->setBasePathname($base_path);
 	}
 }
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index ad3465640..5a61ba2e0 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -144,9 +144,6 @@ class Minz_Extension {
 	 *                   FreshExtension_<base_name>_Controller.
 	 */
 	public function registerController($base_name) {
-		$controller_name = 'FreshExtension_' . $base_name . '_Controller';
-		$filename = $this->path . '/controllers/' . $base_name . 'Controller.php';
-
-		Minz_Dispatcher::registerController($base_name, $controller_name, $filename);
+		Minz_Dispatcher::registerController($base_name, $this->path);
 	}
 }
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index b40448491..bdfbbe63c 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -12,6 +12,7 @@ class Minz_View {
 	const LAYOUT_PATH_NAME = '/layout';
 	const LAYOUT_FILENAME = '/layout.phtml';
 
+	private $base_pathname = APP_PATH;
 	private $view_filename = '';
 	private $use_layout = null;
 
@@ -35,12 +36,15 @@ class Minz_View {
 	 * 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 . '/'
+		$this->view_filename = self::VIEWS_PATH_NAME . '/'
 		                     . $controller_name . '/'
 		                     . $action_name . '.phtml';
 	}
 
+	public function setBasePathname($base_pathname) {
+		$this->base_pathname = $base_pathname;
+	}
+
 	/**
 	 * Construit la vue
 	 */
@@ -70,7 +74,7 @@ class Minz_View {
 	 * Affiche la Vue en elle-même
 	 */
 	public function render () {
-		if ((include($this->view_filename)) === false) {
+		if ((include($this->base_pathname . $this->view_filename)) === false) {
 			Minz_Log::notice('File not found: `' . $this->view_filename . '`');
 		}
 	}

From a08c382e0651f22a7db06feba225f3d49289763d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 15:20:20 +0100
Subject: [PATCH 192/363] Separate views registration from controllers one.

- Add an Extension->registerViews() method.
- Views are first searched in extension paths, then in APP_PATH.
- It gives a way to override easily existing controllers / views.
- Change include into an include_once in Dispatcher for new controllers.

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 lib/Minz/Dispatcher.php |  6 +-----
 lib/Minz/Extension.php  |  7 +++++++
 lib/Minz/View.php       | 28 ++++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/lib/Minz/Dispatcher.php b/lib/Minz/Dispatcher.php
index edd59c7cc..125ce5757 100644
--- a/lib/Minz/Dispatcher.php
+++ b/lib/Minz/Dispatcher.php
@@ -95,10 +95,6 @@ class Minz_Dispatcher {
 				Minz_Exception::ERROR
 			);
 		}
-
-		if (self::isRegistered($base_name)) {
-			$this->setViewPath($this->controller, $base_name);
-		}
 	}
 
 	/**
@@ -154,7 +150,7 @@ class Minz_Dispatcher {
 	private static function loadController($base_name) {
 		$base_path = self::$registrations[$base_name];
 		$controller_filename = $base_path . '/controllers/' . $base_name . 'Controller.php';
-		include($controller_filename);
+		include_once $controller_filename;
 	}
 
 	private static function setViewPath($controller, $base_name) {
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index 5a61ba2e0..490a5c5cb 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -146,4 +146,11 @@ class Minz_Extension {
 	public function registerController($base_name) {
 		Minz_Dispatcher::registerController($base_name, $this->path);
 	}
+
+	/**
+	 * Register the views in order to be accessible by the application.
+	 */
+	public function registerViews() {
+		Minz_View::addBasePathname($this->path);
+	}
 }
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index bdfbbe63c..1bc2e862d 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -12,10 +12,10 @@ class Minz_View {
 	const LAYOUT_PATH_NAME = '/layout';
 	const LAYOUT_FILENAME = '/layout.phtml';
 
-	private $base_pathname = APP_PATH;
 	private $view_filename = '';
 	private $use_layout = null;
 
+	private static $base_pathnames = array(APP_PATH);
 	private static $title = '';
 	private static $styles = array ();
 	private static $scripts = array ();
@@ -41,8 +41,15 @@ class Minz_View {
 		                     . $action_name . '.phtml';
 	}
 
-	public function setBasePathname($base_pathname) {
-		$this->base_pathname = $base_pathname;
+	/**
+	 * Add a base pathname to search views.
+	 *
+	 * New pathnames will be added at the beginning of the list.
+	 *
+	 * @param $base_pathname the new base pathname.
+	 */
+	public static function addBasePathname($base_pathname) {
+		array_unshift(self::$base_pathnames, $base_pathname);
 	}
 
 	/**
@@ -74,7 +81,20 @@ class Minz_View {
 	 * Affiche la Vue en elle-même
 	 */
 	public function render () {
-		if ((include($this->base_pathname . $this->view_filename)) === false) {
+		$view_found = false;
+
+		// We search the view in the list of base pathnames. Only the first view
+		// found is considered.
+		foreach (self::$base_pathnames as $base) {
+			$filename = $base . $this->view_filename;
+			if (file_exists($filename)) {
+				include $filename;
+				$view_found = true;
+				break;
+			}
+		}
+
+		if (!$view_found) {
 			Minz_Log::notice('File not found: `' . $this->view_filename . '`');
 		}
 	}

From 2e4682ebd451f8dd291e11141553add9164cbbef Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 16:17:11 +0100
Subject: [PATCH 193/363] Add enable / disable extension features

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 72 ++++++++++++++++++++++++-
 app/Models/Configuration.php            | 12 +++++
 lib/Minz/ExtensionManager.php           | 18 +++++--
 3 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 504be56d3..415f489a6 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -29,12 +29,80 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This action enables a disabled extension for the current user.
+	 *
+	 * System extensions can only be enabled by an administrator.
+	 *
+	 * Parameter is:
+	 * - e: the extension name (urlencoded).
+	 */
 	public function enableAction() {
-		
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+			}
+
+			if ($ext->is_enabled()) {
+				Minz_Request::bad('feedback.extension.already_enabled', $url_redirect);
+			}
+
+			if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
+				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+			}
+
+			$ext->install();
+
+			FreshRSS_Context::$conf->addExtension($ext_name);
+			FreshRSS_Context::$conf->save();
+
+			Minz_Request::good('feedback.extension.enabled', $url_redirect);
+		}
+
+		Minz_Request::forward($url_redirect, true);
 	}
 
+	/**
+	 * This action disables an enabled extension for the current user.
+	 *
+	 * System extensions can only be disabled by an administrator.
+	 *
+	 * Parameter is:
+	 * - e: the extension name (urlencoded).
+	 */
 	public function disableAction() {
-		
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+			}
+
+			if (!$ext->is_enabled()) {
+				Minz_Request::bad('feedback.extension.not_enabled', $url_redirect);
+			}
+
+			if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
+				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+			}
+
+			$ext->uninstall();
+
+			FreshRSS_Context::$conf->removeExtension($ext_name);
+			FreshRSS_Context::$conf->save();
+
+			Minz_Request::good('feedback.extension.disabled', $url_redirect);
+		}
+
+		Minz_Request::forward($url_redirect, true);
 	}
 
 	public function removeAction() {
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 13ce43990..83a00d4bb 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -350,4 +350,16 @@ class FreshRSS_Configuration {
 		}
 		$this->data['extensions_enabled'] = $value;
 	}
+	public function removeExtension($ext_name) {
+		$this->data['extensions_enabled'] = array_diff(
+			$this->data['extensions_enabled'],
+			array($ext_name)
+		);
+	}
+	public function addExtension($ext_name) {
+		$found = array_search($ext_name, $this->data['extensions_enabled']) !== false;
+		if (!$found) {
+			$this->data['extensions_enabled'][] = $ext_name;
+		}
+	}
 }
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 6c32ccf19..46e421bac 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -160,10 +160,8 @@ class Minz_ExtensionManager {
 		}
 	}
 
-
-
 	/**
-	 * Returns a list of extensions.
+	 * Return a list of extensions.
 	 *
 	 * @param $only_enabled if true returns only the enabled extensions (false by default).
 	 * @return an array of extensions.
@@ -175,4 +173,18 @@ class Minz_ExtensionManager {
 			return self::$ext_list;
 		}
 	}
+
+	/**
+	 * Return an extension by its name.
+	 *
+	 * @param $ext_name the name of the extension.
+	 * @return the corresponding extension or null if it doesn't exist.
+	 */
+	public static function find_extension($ext_name) {
+		if (!isset(self::$ext_list[$ext_name])) {
+			return null;
+		}
+
+		return self::$ext_list[$ext_name];
+	}
 }

From eaaf8cdbf1e87ad22d25257eb99a4b80b579e661 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 6 Dec 2014 10:15:34 -0500
Subject: [PATCH 194/363] Add comments

---
 app/Models/EntryDAO.php       | 77 +++++++++++++++++++++++++++++++++++
 app/Models/EntryDAOSQLite.php | 45 ++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 5d2909c62..4d06ac028 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -80,6 +80,16 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return -1;
 	}
 
+	/**
+	 * Toggle favorite marker on one or more article
+	 *
+	 * @todo simplify the query by removing the str_repeat. I am pretty sure
+	 * there is an other way to do that.
+	 *
+	 * @param integer|array $ids
+	 * @param boolean $is_favorite
+	 * @return false|integer
+	 */
 	public function markFavorite($ids, $is_favorite = true) {
 		if (!is_array($ids)) {
 			$ids = array($ids);
@@ -99,6 +109,17 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		}
 	}
 
+	/**
+	 * Update the unread article cache held on every feed details.
+	 * Depending on the parameters, it updates the cache on one feed, on all
+	 * feeds from one category or on all feeds.
+	 *
+	 * @todo It can use the query builder refactoring to build that query
+	 *
+	 * @param false|integer $catId category ID
+	 * @param false|integer $feedId feed ID
+	 * @return boolean
+	 */
 	protected function updateCacheUnreads($catId = false, $feedId = false) {
 		$sql = 'UPDATE `' . $this->prefix . 'feed` f '
 		 . 'LEFT OUTER JOIN ('
@@ -129,6 +150,19 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		}
 	}
 
+	/**
+	 * Toggle the read marker on one or more article.
+	 * Then the cache is updated.
+	 *
+	 * @todo change the way the query is build because it seems there is
+	 * unnecessary code in here. For instance, the part with the str_repeat.
+	 * @todo remove code duplication. It seems the code is basically the
+	 * same if it is an array or not.
+	 *
+	 * @param integer|array $ids
+	 * @param boolean $is_read
+	 * @return integer affected rows
+	 */
 	public function markRead($ids, $is_read = true) {
 		if (is_array($ids)) {	//Many IDs at once (used by API)
 			if (count($ids) < 6) {	//Speed heuristics
@@ -172,6 +206,27 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		}
 	}
 
+	/**
+	 * Mark all entries as read depending on parameters.
+	 * If $onlyFavorites is true, it is used when the user mark as read in
+	 * the favorite pseudo-category.
+	 * If $priorityMin is greater than 0, it is used when the user mark as
+	 * read in the main feed pseudo-category.
+	 * Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @todo refactor this method along with markReadCat and markReadFeed
+	 * since they are all doing the same thing. I think we need to build a
+	 * tool to generate the query instead of having queries all over the
+	 * place. It will be reused also for the filtering making every thing
+	 * separated.
+	 *
+	 * @param integer $idMax fail safe article ID
+	 * @param boolean $onlyFavorites
+	 * @param integer $priorityMin
+	 * @return integer affected rows
+	 */
 	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
@@ -200,6 +255,17 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return $affected;
 	}
 
+	/**
+	 * Mark all the articles in a category as read.
+	 * There is a fail safe to prevent to mark as read articles that are
+	 * loaded during the mark as read action. Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @param integer $id category ID
+	 * @param integer $idMax fail safe article ID
+	 * @return integer affected rows
+	 */
 	public function markReadCat($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
@@ -223,6 +289,17 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return $affected;
 	}
 
+	/**
+	 * Mark all the articles in a feed as read.
+	 * There is a fail safe to prevent to mark as read articles that are
+	 * loaded during the mark as read action. Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @param integer $id feed ID
+	 * @param integer $idMax fail safe article ID
+	 * @return integer affected rows
+	 */
 	public function markReadFeed($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index 4a3fe24a2..bb1539e0c 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -31,6 +31,19 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		}
 	}
 
+	/**
+	 * Toggle the read marker on one or more article.
+	 * Then the cache is updated.
+	 *
+	 * @todo change the way the query is build because it seems there is
+	 * unnecessary code in here. For instance, the part with the str_repeat.
+	 * @todo remove code duplication. It seems the code is basically the
+	 * same if it is an array or not.
+	 *
+	 * @param integer|array $ids
+	 * @param boolean $is_read
+	 * @return integer affected rows
+	 */
 	public function markRead($ids, $is_read = true) {
 		if (is_array($ids)) {	//Many IDs at once (used by API)
 			if (true) {	//Speed heuristics	//TODO: Not implemented yet for SQLite (so always call IDs one by one)
@@ -69,6 +82,27 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		}
 	}
 
+	/**
+	 * Mark all entries as read depending on parameters.
+	 * If $onlyFavorites is true, it is used when the user mark as read in
+	 * the favorite pseudo-category.
+	 * If $priorityMin is greater than 0, it is used when the user mark as
+	 * read in the main feed pseudo-category.
+	 * Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @todo refactor this method along with markReadCat and markReadFeed
+	 * since they are all doing the same thing. I think we need to build a
+	 * tool to generate the query instead of having queries all over the
+	 * place. It will be reused also for the filtering making every thing
+	 * separated.
+	 *
+	 * @param integer $idMax fail safe article ID
+	 * @param boolean $onlyFavorites
+	 * @param integer $priorityMin
+	 * @return integer affected rows
+	 */
 	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
@@ -95,6 +129,17 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		return $affected;
 	}
 
+	/**
+	 * Mark all the articles in a category as read.
+	 * There is a fail safe to prevent to mark as read articles that are
+	 * loaded during the mark as read action. Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @param integer $id category ID
+	 * @param integer $idMax fail safe article ID
+	 * @return integer affected rows
+	 */
 	public function markReadCat($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';

From 4c888590e6f0fd89fc1dccebb5e815883eeaa54c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 16:39:10 +0100
Subject: [PATCH 195/363] Improve system/user types for extensions

- system extensions can only be managed by an administrator
- system extensions are loaded for all users (even if not logged)
- user extensions are loaded for logged users only
- system extensions loading is saved in global config.php file

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 46 ++++++++++++++++---------
 app/FreshRSS.php                        |  8 +++--
 app/views/extension/index.phtml         |  4 +++
 lib/Minz/Configuration.php              | 19 ++++++++--
 4 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 415f489a6..e348d9f31 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -52,16 +52,23 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Request::bad('feedback.extension.already_enabled', $url_redirect);
 			}
 
-			if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$ext->install();
+
+				Minz_Configuration::addExtension($ext_name);
+				Minz_Configuration::writeFile();
+
+				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+			} elseif ($ext->getType() === 'user') {
+				$ext->install();
+
+				FreshRSS_Context::$conf->addExtension($ext_name);
+				FreshRSS_Context::$conf->save();
+
+				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+			} else {
 				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
 			}
-
-			$ext->install();
-
-			FreshRSS_Context::$conf->addExtension($ext_name);
-			FreshRSS_Context::$conf->save();
-
-			Minz_Request::good('feedback.extension.enabled', $url_redirect);
 		}
 
 		Minz_Request::forward($url_redirect, true);
@@ -90,16 +97,23 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Request::bad('feedback.extension.not_enabled', $url_redirect);
 			}
 
-			if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$ext->uninstall();
+
+				Minz_Configuration::removeExtension($ext_name);
+				Minz_Configuration::writeFile();
+
+				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+			} elseif ($ext->getType() === 'user') {
+				$ext->uninstall();
+
+				FreshRSS_Context::$conf->removeExtension($ext_name);
+				FreshRSS_Context::$conf->save();
+
+				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+			} else {
 				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
 			}
-
-			$ext->uninstall();
-
-			FreshRSS_Context::$conf->removeExtension($ext_name);
-			FreshRSS_Context::$conf->save();
-
-			Minz_Request::good('feedback.extension.disabled', $url_redirect);
 		}
 
 		Minz_Request::forward($url_redirect, true);
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index dc7d0b375..b91dfcc46 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -29,9 +29,11 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
-		// Enable extensions for the current user.
-		$ext_list = FreshRSS_Context::$conf->extensions_enabled;
-		Minz_ExtensionManager::enable_by_list($ext_list);
+		// Enable extensions for the current (logged) user.
+		if (FreshRSS_Auth::hasAccess()) {
+			$ext_list = FreshRSS_Context::$conf->extensions_enabled;
+			Minz_ExtensionManager::enable_by_list($ext_list);
+		}
 
 		// Init i18n.
 		Minz_Session::_param('language', FreshRSS_Context::$conf->language);
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index c6b7c84a1..0be03d7b5 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -10,6 +10,7 @@
 	<?php foreach ($this->extension_list as $ext) { ?>
 	<ul class="horizontal-list">
 		<li class="item">
+			<?php if ($ext->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
 			<?php $name_encoded = urlencode($ext->getName()); ?>
 			<div class="stick">
 				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('admin.extensions.manage'); ?></a>
@@ -22,6 +23,9 @@
 				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.remove'); ?></button>
 				<?php } ?>
 			</div>
+			<?php } else { ?>
+			<?php echo _t('admin.extensions.system'); ?>
+			<?php } ?>
 		</li>
 		<li class="item"><?php echo $ext->getName(); ?></li>
 	</ul>
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 4d3ab0964..4a3221ef5 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -165,6 +165,19 @@ class Minz_Configuration {
 		self::$unsafe_autologin_enabled = (bool)$value;
 	}
 
+	public function removeExtension($ext_name) {
+		self::$extensions_enabled = array_diff(
+			self::$extensions_enabled,
+			array($ext_name)
+		);
+	}
+	public function addExtension($ext_name) {
+		$found = array_search($ext_name, self::$extensions_enabled) !== false;
+		if (!$found) {
+			self::$extensions_enabled[] = $ext_name;
+		}
+	}
+
 	/**
 	 * Initialise les variables de configuration
 	 * @exception Minz_FileNotExistException si le CONF_PATH_NAME n'existe pas
@@ -197,6 +210,7 @@ class Minz_Configuration {
 			),
 			'limits' => self::$limits,
 			'db' => self::$db,
+			'extensions_enabled' => self::$extensions_enabled,
 		);
 		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak.php');
 		$result = file_put_contents(DATA_PATH . self::CONF_PATH_NAME, "<?php\n return " . var_export($ini_array, true) . ';');
@@ -344,8 +358,9 @@ class Minz_Configuration {
 		}
 
 		// Extensions
-		if (isset($ini_array['extensions']) && is_array($ini_array['extensions'])) {
-			self::$extensions_enabled = $ini_array['extensions'];
+		if (isset($ini_array['extensions_enabled']) &&
+				is_array($ini_array['extensions_enabled'])) {
+			self::$extensions_enabled = $ini_array['extensions_enabled'];
 		}
 
 		// Base de données

From 9d66462c1d7e901cebb9c0b43e4203607045fdf3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 16:48:13 +0100
Subject: [PATCH 196/363] Fix typo (extensions)

- change feedback.extension into feedback.extensions
- disable button is pushed by default

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 20 ++++++++++----------
 app/views/extension/index.phtml         |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index e348d9f31..543398b05 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -45,11 +45,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
 			}
 
 			if ($ext->is_enabled()) {
-				Minz_Request::bad('feedback.extension.already_enabled', $url_redirect);
+				Minz_Request::bad('feedback.extensions.already_enabled', $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -58,16 +58,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::addExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->install();
 
 				FreshRSS_Context::$conf->addExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
 			}
 		}
 
@@ -90,11 +90,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
 			}
 
 			if (!$ext->is_enabled()) {
-				Minz_Request::bad('feedback.extension.not_enabled', $url_redirect);
+				Minz_Request::bad('feedback.extensions.not_enabled', $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -103,16 +103,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::removeExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->uninstall();
 
 				FreshRSS_Context::$conf->removeExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
 			}
 		}
 
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 0be03d7b5..142ee4bc2 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -15,7 +15,7 @@
 			<div class="stick">
 				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('admin.extensions.manage'); ?></a>
 				<?php if ($ext->is_enabled()) { ?>
-				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
+				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
 				<?php } else { ?>
 				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.enable'); ?></button>
 				<?php } ?>

From 2da7c05fa6768b95a5cd0bd1c8f9934bbff05a03 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 17:15:20 +0100
Subject: [PATCH 197/363] Update i18n (extensions)

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 30 ++++++++++++++++---------
 app/i18n/en/admin.php                   |  5 +++++
 app/i18n/en/feedback.php                |  8 +++++++
 app/i18n/en/gen.php                     |  7 ++++++
 app/i18n/fr/admin.php                   |  5 +++++
 app/i18n/fr/feedback.php                |  8 +++++++
 app/i18n/fr/gen.php                     |  7 ++++++
 app/views/extension/index.phtml         |  8 +++----
 8 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 543398b05..35b001094 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -45,11 +45,13 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
 			}
 
 			if ($ext->is_enabled()) {
-				Minz_Request::bad('feedback.extensions.already_enabled', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name),
+				                  $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -58,16 +60,19 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::addExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
+				                  $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->install();
 
 				FreshRSS_Context::$conf->addExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
+				                  $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+				                  $url_redirect);
 			}
 		}
 
@@ -90,11 +95,13 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
 			}
 
 			if (!$ext->is_enabled()) {
-				Minz_Request::bad('feedback.extensions.not_enabled', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name),
+				                  $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -103,16 +110,19 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::removeExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
+				                  $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->uninstall();
 
 				FreshRSS_Context::$conf->removeExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
+				                  $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+				                  $url_redirect);
 			}
 		}
 
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 74f01ae06..d73775d96 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -86,6 +86,11 @@ return array(
 			'ok' => 'You have ZIP extension.',
 		),
 	),
+	'extensions' => array(
+		'empty_list' => 'There is no installed extension',
+		'system' => 'System extension (you have no rights on it)',
+		'title' => 'Extensions',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index b3866f1dc..df1dc5725 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -1,6 +1,14 @@
 <?php
 
 return array(
+	'extensions' => array(
+		'already_enabled' => '%s is already enabled',
+		'disabled' => '%s is now disabled',
+		'enabled' => '%s is now enabled',
+		'no_access' => 'You have no access on %s',
+		'not_enabled' => '%s is not enabled yet',
+		'not_found' => '%s does not exist',
+	),
 	'login' => array(
 		'error' => 'Login is invalid',
 		'success' => 'You are connected',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 9e06357bc..ba5f0c86d 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -190,10 +190,17 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'Fri',
 	'g+' => 'Google+',
+	'actions' => array(
+		'disable' => 'Disable',
+		'enable' => 'Enable',
+		'manage' => 'Manage',
+		'remove' => 'Remove',
+	),
 	'menu' => array(
 		'admin' => 'Administration',
 		'authentication' => 'Authentication',
 		'check_install' => 'Installation checking',
+		'extensions' => 'Extensions',
 		'user_management' => 'Manage users',
 		'user_profile' => 'Profile',
 	),
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index ad1fae6c0..e46a5a7b0 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -86,6 +86,11 @@ return array(
 			'ok' => 'Vous disposez de l\'extension ZIP.',
 		),
 	),
+	'extensions' => array(
+		'empty_list' => 'Il n’y a aucune extension installée.',
+		'system' => 'Extension système (vous n’avez aucun droit dessus)',
+		'title' => 'Extensions',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index f4bb7cccf..7d3ab9db7 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -1,6 +1,14 @@
 <?php
 
 return array(
+	'extensions' => array(
+		'already_enabled' => '%s est déjà activée',
+		'disabled' => '%s est désormais désactivée',
+		'enabled' => '%s est désormais activée',
+		'no_access' => 'Vous n’avez aucun accès sur %s',
+		'not_enabled' => '%s n’est pas encore activée',
+		'not_found' => '%s n’existe pas',
+	),
 	'login' => array(
 		'error' => 'L’identifiant est invalide !',
 		'success' => 'Vous êtes désormais connecté',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 0b2395bd0..44d8fb837 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -191,10 +191,17 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'ven.',
 	'g+' => 'Google+',
+	'actions' => array(
+		'disable' => 'Désactiver',
+		'enable' => 'Activer',
+		'manage' => 'Gérer',
+		'remove' => 'Supprimer',
+	),
 	'menu' => array(
 		'admin' => 'Administration',
 		'authentication' => 'Authentification',
 		'check_install' => 'Vérification de l’installation',
+		'extensions' => 'Extensions',
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
 	),
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 142ee4bc2..d34a84452 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -13,14 +13,14 @@
 			<?php if ($ext->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
 			<?php $name_encoded = urlencode($ext->getName()); ?>
 			<div class="stick">
-				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('admin.extensions.manage'); ?></a>
+				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.actions.manage'); ?></a>
 				<?php if ($ext->is_enabled()) { ?>
-				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
+				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.disable'); ?></button>
 				<?php } else { ?>
-				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.enable'); ?></button>
+				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.enable'); ?></button>
 				<?php } ?>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.remove'); ?></button>
+				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.remove'); ?></button>
 				<?php } ?>
 			</div>
 			<?php } else { ?>

From bc81979a6b25554c4832d5ccb41b427023096463 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 17:25:01 +0100
Subject: [PATCH 198/363] Add default behaviour for configure / remove ext

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php |  7 ++++++-
 app/views/extension/configure.phtml     | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/views/extension/configure.phtml

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 35b001094..a1e39af37 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -130,6 +130,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	}
 
 	public function removeAction() {
-		
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+		Minz_Request::bad('not implemented yet!', $url_redirect);
 	}
 }
diff --git a/app/views/extension/configure.phtml b/app/views/extension/configure.phtml
new file mode 100644
index 000000000..a79e9baac
--- /dev/null
+++ b/app/views/extension/configure.phtml
@@ -0,0 +1,12 @@
+<?php
+
+if (!Minz_Request::param('ajax')) {
+	$this->partial('aside_configure');
+}
+
+?>
+
+<div class="post">
+	<h1>Extension name</h1>
+	Not implemented yet!
+</div>
\ No newline at end of file

From 08546af75ff9a25eac3409649ea4660fe070720c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 18:48:00 +0100
Subject: [PATCH 199/363] Add a first draft for hooks

- New Extension->registerHook($hook_name, $hook_function) method to register a new hook
- Only one hook works for the moment: entry_before_insert
- ExtensionManager::callHook will need to evolve based on future hooks

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/feedController.php | 11 ++++--
 lib/Minz/Extension.php             | 10 ++++++
 lib/Minz/ExtensionManager.php      | 55 ++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 9990a852c..dce79c57a 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -329,9 +329,16 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						$id = min(time(), $entry_date) . uSecString();
 					}
 
+					$entry->_id($id);
+					$entry->_isRead($is_read);
+
+					$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+					if (is_null($entry)) {
+						// An extension has returned a null value, there is nothing to insert.
+						continue;
+					}
+
 					$values = $entry->toArray();
-					$values['id'] = $id;
-					$values['is_read'] = $is_read;
 					$entryDAO->addEntry($values, $prepared_statement);
 				}
 			}
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index 490a5c5cb..c93ba2520 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -153,4 +153,14 @@ class Minz_Extension {
 	public function registerViews() {
 		Minz_View::addBasePathname($this->path);
 	}
+
+	/**
+	 * Register a new hook.
+	 *
+	 * @param $hook_name the hook name (must exist).
+	 * @param $hook_function the function name to call (must be callable).
+	 */
+	public function registerHook($hook_name, $hook_function) {
+		Minz_ExtensionManager::addHook($hook_name, $hook_function, $this);
+	}
 }
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 46e421bac..7557e178f 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -2,6 +2,8 @@
 
 /**
  * An extension manager to load extensions present in EXTENSIONS_PATH.
+ *
+ * @todo see coding style for methods!!
  */
 class Minz_ExtensionManager {
 	private static $ext_metaname = 'metadata.json';
@@ -11,6 +13,11 @@ class Minz_ExtensionManager {
 
 	private static $ext_auto_enabled = array();
 
+	private static $hook_list = array(
+		'entry_before_insert' => array(),  // function($entry)
+	);
+	private static $ext_to_hooks = array();
+
 	/**
 	 * Initialize the extension manager by loading extensions in EXTENSIONS_PATH.
 	 *
@@ -131,6 +138,8 @@ class Minz_ExtensionManager {
 				in_array($name, self::$ext_auto_enabled)) {
 			self::enable($ext->getName());
 		}
+
+		self::$ext_to_hooks[$name] = array();
 	}
 
 	/**
@@ -187,4 +196,50 @@ class Minz_ExtensionManager {
 
 		return self::$ext_list[$ext_name];
 	}
+
+	/**
+	 * Add a hook function to a given hook.
+	 *
+	 * The hook name must be a valid one. For the valid list, see self::$hook_list
+	 * array keys.
+	 *
+	 * @param $hook_name the hook name (must exist).
+	 * @param $hook_function the function name to call (must be callable).
+	 * @param $ext the extension which register the hook.
+	 */
+	public static function addHook($hook_name, $hook_function, $ext) {
+		if (isset(self::$hook_list[$hook_name]) && is_callable($hook_function)) {
+			self::$hook_list[$hook_name][] = $hook_function;
+			self::$ext_to_hooks[$ext->getName()][] = $hook_name;
+		}
+	}
+
+	/**
+	 * Call functions related to a given hook.
+	 *
+	 * The hook name must be a valid one. For the valid list, see self::$hook_list
+	 * array keys.
+	 *
+	 * @param $hook_name the hook to call.
+	 * @param additionnal parameters (for signature, please see self::$hook_list comments)
+	 * @todo hook functions will have different signatures. So the $res = func($args);
+	 *       $args = $res; will not work for all of them in the future. We must
+	 *       find a better way to call hooks.
+	 */
+	public static function callHook($hook_name) {
+		$args = func_get_args();
+		unset($args[0]);
+
+		$result = $args;
+		foreach (self::$hook_list[$hook_name] as $function) {
+			$result = call_user_func_array($function, $args);
+
+			if (is_null($result)) {
+				break;
+			}
+
+			$args = $result;
+		}
+		return $result;
+	}
 }

From 5932c3427b060d4f0aeab92d7ed17c8e8d4fd1d7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 7 Dec 2014 14:31:50 +0100
Subject: [PATCH 200/363] Add entry_before_display hook

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/views/index/normal.phtml  |  5 +++++
 app/views/index/reader.phtml  | 11 +++++++----
 lib/Minz/ExtensionManager.php |  6 ++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 02d621bd0..9cbd367d0 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -35,6 +35,11 @@ if (!empty($this->entries)) {
 		<a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
+		$item = Minz_ExtensionManager::callHook('entry_before_display', $item);
+		if (is_null($item)) {
+			continue;
+		}
+
 		if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $today)) {
 			?><div class="day" id="day_today"><?php
 				echo _t('today');
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index f07868488..75bea9743 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -6,10 +6,13 @@ if (!empty($this->entries)) {
 	$content_width = FreshRSS_Context::$conf->content_width;
 ?>
 
-<div id="stream" class="reader">
-	<?php foreach ($this->entries as $item) { ?>
-
-	<div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
+<div id="stream" class="reader"><?php
+	foreach ($this->entries as $item) {
+		$item = Minz_ExtensionManager::callHook('entry_before_display', $item);
+		if (is_null($item)) {
+			continue;
+		}
+	?><div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
 		<div class="flux_content">
 			<div class="content <?php echo $content_width; ?>">
 				<?php
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 7557e178f..5491c7cf6 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -13,8 +13,10 @@ class Minz_ExtensionManager {
 
 	private static $ext_auto_enabled = array();
 
+	// List of available hooks. Please keep this list sorted.
 	private static $hook_list = array(
-		'entry_before_insert' => array(),  // function($entry)
+		'entry_before_display' => array(),  // function($entry) -> Entry | null
+		'entry_before_insert' => array(),  // function($entry) -> Entry | null
 	);
 	private static $ext_to_hooks = array();
 
@@ -230,7 +232,7 @@ class Minz_ExtensionManager {
 		$args = func_get_args();
 		unset($args[0]);
 
-		$result = $args;
+		$result = $args[1];
 		foreach (self::$hook_list[$hook_name] as $function) {
 			$result = call_user_func_array($function, $args);
 

From 7ef4d6c033d6d12a644b6cf39940591901fdcb3b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 7 Dec 2014 14:39:02 +0100
Subject: [PATCH 201/363] Fix entry_before_insert hook

The hook must be called also in:
- feedController->addAction()
- importExportController->importJson()

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/feedController.php         | 13 ++++++++++---
 app/Controllers/importExportController.php |  6 ++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index dce79c57a..0a7edbee3 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -174,10 +174,17 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feedDAO->beginTransaction();
 			foreach ($entries as $entry) {
 				// Entries are added without any verification.
+				$entry->_feed($feed->id());
+				$entry->_id(min(time(), $entry->date(true)) . uSecString());
+				$entry->_isRead($is_read);
+
+				$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+				if (is_null($entry)) {
+					// An extension has returned a null value, there is nothing to insert.
+					continue;
+				}
+
 				$values = $entry->toArray();
-				$values['id_feed'] = $feed->id();
-				$values['id'] = min(time(), $entry->date(true)) . uSecString();
-				$values['is_read'] = $is_read;
 				$entryDAO->addEntry($values, $prepared_statement);
 			}
 			$feedDAO->updateLastUpdate($feed->id());
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 4e2dbd157..c67b30431 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -385,6 +385,12 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$entry->_id(min(time(), $entry->date(true)) . uSecString());
 			$entry->_tags($tags);
 
+			$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+			if (is_null($entry)) {
+				// An extension has returned a null value, there is nothing to insert.
+				continue;
+			}
+
 			$values = $entry->toArray();
 			$id = $this->entryDAO->addEntry($values, $prepared_statement);
 

From ea849d7c68cc3de33825c1daafd06b9f8bbf747c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 7 Dec 2014 15:03:42 +0100
Subject: [PATCH 202/363] Prepare better organization of view files for exts

View files must be well-splitted to simplify work for extensions.

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 .../helpers/index/normal/entry_bottom.phtml   |  84 ++++++++++
 .../helpers/index/normal/entry_header.phtml   |  40 +++++
 app/views/index/index.phtml                   |  23 ---
 app/views/index/normal.phtml                  | 157 +++---------------
 4 files changed, 144 insertions(+), 160 deletions(-)
 create mode 100644 app/views/helpers/index/normal/entry_bottom.phtml
 create mode 100644 app/views/helpers/index/normal/entry_header.phtml

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
new file mode 100644
index 000000000..704644f99
--- /dev/null
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -0,0 +1,84 @@
+<?php
+	$sharing = array();
+	if (FreshRSS_Auth::hasAccess()) {
+		$sharing = FreshRSS_Context::$conf->sharing;
+	}
+
+	$bottomline_read = FreshRSS_Context::$conf->bottomline_read;
+	$bottomline_favorite = FreshRSS_Context::$conf->bottomline_favorite;
+	$bottomline_sharing = FreshRSS_Context::$conf->bottomline_sharing && (count($sharing) > 0);
+	$bottomline_tags = FreshRSS_Context::$conf->bottomline_tags;
+	$bottomline_date = FreshRSS_Context::$conf->bottomline_date;
+	$bottomline_link = FreshRSS_Context::$conf->bottomline_link;
+?><ul class="horizontal-list bottom"><?php
+	if (FreshRSS_Auth::hasAccess()) {
+		if ($bottomline_read) {
+			?><li class="item manage"><?php
+				$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $this->entry->id()));
+				if ($this->entry->isRead()) {
+					$arUrl['params']['is_read'] = 0;
+				}
+				?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
+					echo _i($this->entry->isRead() ? 'read' : 'unread'); ?></a><?php
+			?></li><?php
+		}
+		if ($bottomline_favorite) {
+			?><li class="item manage"><?php
+				$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $this->entry->id()));
+				if ($this->entry->isFavorite()) {
+					$arUrl['params']['is_favorite'] = 0;
+				}
+				?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
+					echo _i($this->entry->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
+			?></li><?php
+		}
+	} ?>
+	<li class="item"><?php
+			if ($bottomline_sharing) {
+				$link = urlencode($this->entry->link());
+				$title = urlencode($this->entry->title() . ' · ' . $feed->name());
+		?><div class="dropdown">
+			<div id="dropdown-share-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
+			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $this->entry->id();?>">
+				<?php echo _i('share'); ?>
+				<?php echo _t('share'); ?>
+			</a>
+
+			<ul class="dropdown-menu">
+				<li class="dropdown-close"><a href="#close">❌</a></li>
+				<?php foreach ($sharing as $share) :?>
+					<li class="item share">
+						<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $this->entry->link(), $this->entry->title() . ' . ' . $feed->name())?>">
+							<?php echo _t($share['name']);?>
+						</a>
+					</li>
+				<?php endforeach;?>
+			</ul>
+		</div>
+		<?php } ?>
+	</li><?php
+	$tags = $bottomline_tags ? $this->entry->tags() : null;
+	if (!empty($tags)) {
+	?><li class="item">
+		<div class="dropdown">
+			<div id="dropdown-tags-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
+			<?php echo _i('tag'); ?>
+			<a class="dropdown-toggle" href="#dropdown-tags-<?php echo $this->entry->id();?>"><?php
+				echo _t('related_tags');
+			?></a>
+			<ul class="dropdown-menu">
+				<li class="dropdown-close"><a href="#close">❌</a></li><?php
+				foreach($tags as $tag) {
+					?><li class="item"><a href="<?php echo _url('index', 'index', 'search', urlencode('#' . $tag)); ?>"><?php echo $tag; ?></a></li><?php
+				} ?>
+			</ul>
+		</div>
+	</li><?php
+	}
+	if ($bottomline_date) {
+		?><li class="item date"><?php echo $this->entry->date(); ?></li><?php
+	}
+	if ($bottomline_link) {
+		?><li class="item link"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php
+	} ?>
+</ul>
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
new file mode 100644
index 000000000..b751b884f
--- /dev/null
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -0,0 +1,40 @@
+<?php
+	$topline_read = FreshRSS_Context::$conf->topline_read;
+	$topline_favorite = FreshRSS_Context::$conf->topline_favorite;
+	$topline_date = FreshRSS_Context::$conf->topline_date;
+	$topline_link = FreshRSS_Context::$conf->topline_link;
+?><ul class="horizontal-list flux_header"><?php
+	if (FreshRSS_Auth::hasAccess()) {
+		if ($topline_read) {
+			?><li class="item manage"><?php
+				$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $this->entry->id()));
+				if ($this->entry->isRead()) {
+					$arUrl['params']['is_read'] = 0;
+				}
+				?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
+					echo _i($this->entry->isRead() ? 'read' : 'unread'); ?></a><?php
+			?></li><?php
+		}
+		if ($topline_favorite) {
+			?><li class="item manage"><?php
+				$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $this->entry->id()));
+				if ($this->entry->isFavorite()) {
+					$arUrl['params']['is_favorite'] = 0;
+				}
+				?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
+					echo _i($this->entry->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
+			?></li><?php
+		}
+	}
+	$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $this->entry->feed());	//We most likely already have the feed object in cache
+	if ($feed == null) {
+		$feed = $this->entry->feed(true);
+		if ($feed == null) {
+			$feed = FreshRSS_Feed::example();
+		}
+	}
+	?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
+	<li class="item title"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></li>
+	<?php if ($topline_date) { ?><li class="item date"><?php echo $this->entry->date(); ?> </li><?php } ?>
+	<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
+</ul>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 8b93461dd..e69de29bb 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,23 +0,0 @@
-<?php
-
-$output = Minz_Request::param('output', 'normal');
-
-if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymous()) {
-	if ($output === 'normal') {
-		$this->renderHelper('view/normal_view');
-	} elseif ($output === 'reader') {
-		$this->renderHelper('view/reader_view');
-	} elseif ($output === 'rss') {
-		$this->renderHelper('view/rss_view');
-	} else {
-		Minz_Request::_param('output', 'normal');
-		$output = 'normal';
-		$this->renderHelper('view/normal_view');
-	}
-} elseif ($output === 'rss') {
-	// token has already been checked in the controller so we can show the view
-	$this->renderHelper('view/rss_view');
-} else {
-	// Normally, it should not happen, but log it anyway
-	Minz_Log::error('Something is wrong in ' . __FILE__ . ' line ' . __LINE__);
-}
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 9cbd367d0..fd2289365 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -7,23 +7,8 @@ if (!empty($this->entries)) {
 	$display_today = true;
 	$display_yesterday = true;
 	$display_others = true;
-	if (FreshRSS_Auth::hasAccess()) {
-		$sharing = FreshRSS_Context::$conf->sharing;
-	} else {
-		$sharing = array();
-	}
 	$hidePosts = !FreshRSS_Context::$conf->display_posts;
 	$lazyload = FreshRSS_Context::$conf->lazyload;
-	$topline_read = FreshRSS_Context::$conf->topline_read;
-	$topline_favorite = FreshRSS_Context::$conf->topline_favorite;
-	$topline_date = FreshRSS_Context::$conf->topline_date;
-	$topline_link = FreshRSS_Context::$conf->topline_link;
-	$bottomline_read = FreshRSS_Context::$conf->bottomline_read;
-	$bottomline_favorite = FreshRSS_Context::$conf->bottomline_favorite;
-	$bottomline_sharing = FreshRSS_Context::$conf->bottomline_sharing && (count($sharing));
-	$bottomline_tags = FreshRSS_Context::$conf->bottomline_tags;
-	$bottomline_date = FreshRSS_Context::$conf->bottomline_date;
-	$bottomline_link = FreshRSS_Context::$conf->bottomline_link;
 
 	$content_width = FreshRSS_Context::$conf->content_width;
 
@@ -35,12 +20,12 @@ if (!empty($this->entries)) {
 		<a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
-		$item = Minz_ExtensionManager::callHook('entry_before_display', $item);
-		if (is_null($item)) {
+		$this->entry = Minz_ExtensionManager::callHook('entry_before_display', $item);
+		if (is_null($this->entry)) {
 			continue;
 		}
 
-		if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $today)) {
+		if ($display_today && $this->entry->isDay(FreshRSS_Days::TODAY, $today)) {
 			?><div class="day" id="day_today"><?php
 				echo _t('today');
 				?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
@@ -48,7 +33,7 @@ if (!empty($this->entries)) {
 			?></div><?php
 			$display_today = false;
 		}
-		if ($display_yesterday && $item->isDay(FreshRSS_Days::YESTERDAY, $today)) {
+		if ($display_yesterday && $this->entry->isDay(FreshRSS_Days::YESTERDAY, $today)) {
 			?><div class="day" id="day_yesterday"><?php
 				echo _t('yesterday');
 				?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
@@ -56,137 +41,35 @@ if (!empty($this->entries)) {
 			?></div><?php
 			$display_yesterday = false;
 		}
-		if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $today)) {
+		if ($display_others && $this->entry->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $today)) {
 			?><div class="day" id="day_before_yesterday"><?php
 				echo _t('before_yesterday');
 				?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
 			?></div><?php
 			$display_others = false;
 		}
-	?><div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
-		<ul class="horizontal-list flux_header"><?php
-			if (FreshRSS_Auth::hasAccess()) {
-				if ($topline_read) {
-					?><li class="item manage"><?php
-						$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
-						if ($item->isRead()) {
-							$arUrl['params']['is_read'] = 0;
-						}
-						?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
-					?></li><?php
-				}
-				if ($topline_favorite) {
-					?><li class="item manage"><?php
-						$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
-						if ($item->isFavorite()) {
-							$arUrl['params']['is_favorite'] = 0;
-						}
-						?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
-					?></li><?php
-				}
-			}
-			$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $item->feed());	//We most likely already have the feed object in cache
-			if ($feed == null) {
-				$feed = $item->feed(true);
-				if ($feed == null) {
-					$feed = FreshRSS_Feed::example();
-				}
-			}
-			?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
-			<li class="item title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></li>
-			<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date(); ?> </li><?php } ?>
-			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
-		</ul>
+	?><div class="flux<?php echo !$this->entry->isRead() ? ' not_read' : ''; ?><?php echo $this->entry->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $this->entry->id(); ?>"><?php
 
-		<div class="flux_content">
+			$this->renderHelper('index/normal/entry_header');
+
+		?><div class="flux_content">
 			<div class="content <?php echo $content_width; ?>">
-				<h1 class="title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></h1>
+				<h1 class="title"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></h1>
 				<?php
-					$author = $item->author();
+					$author = $this->entry->author();
 					echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
-						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->content();
+						$lazyload && $hidePosts ? lazyimg($this->entry->content()) : $this->entry->content();
 				?>
-			</div>
-			<ul class="horizontal-list bottom"><?php
-				if (FreshRSS_Auth::hasAccess()) {
-					if ($bottomline_read) {
-						?><li class="item manage"><?php
-							$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
-							if ($item->isRead()) {
-								$arUrl['params']['is_read'] = 0;
-							}
-							?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
-						?></li><?php
-					}
-					if ($bottomline_favorite) {
-						?><li class="item manage"><?php
-							$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
-							if ($item->isFavorite()) {
-								$arUrl['params']['is_favorite'] = 0;
-							}
-							?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
-						?></li><?php
-					}
-				} ?>
-				<li class="item"><?php
-						if ($bottomline_sharing) {
-							$link = urlencode($item->link());
-							$title = urlencode($item->title() . ' · ' . $feed->name());
-					?><div class="dropdown">
-						<div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
-						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
-							<?php echo _i('share'); ?>
-							<?php echo _t('share'); ?>
-						</a>
+			</div><?php
 
-						<ul class="dropdown-menu">
-							<li class="dropdown-close"><a href="#close">❌</a></li>
-							<?php foreach ($sharing as $share) :?>
-								<li class="item share">
-									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo _t($share['name']);?>
-									</a>
-								</li>
-							<?php endforeach;?>
-						</ul>
-					</div>
-					<?php } ?>
-				</li><?php
-				$tags = $bottomline_tags ? $item->tags() : null;
-				if (!empty($tags)) {
-				?><li class="item">
-					<div class="dropdown">
-						<div id="dropdown-tags-<?php echo $item->id();?>" class="dropdown-target"></div>
-						<?php echo _i('tag'); ?>
-						<a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id();?>"><?php
-							echo _t('related_tags');
-						?></a>
-						<ul class="dropdown-menu">
-							<li class="dropdown-close"><a href="#close">❌</a></li><?php
-							foreach($tags as $tag) {
-								?><li class="item"><a href="<?php echo _url('index', 'index', 'search', urlencode('#' . $tag)); ?>"><?php echo $tag; ?></a></li><?php
-							} ?>
-						</ul>
-					</div>
-				</li><?php
-				}
-				if ($bottomline_date) {
-					?><li class="item date"><?php echo $item->date(); ?></li><?php
-				}
-				if ($bottomline_link) {
-					?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php
-				} ?>
-			</ul>
-		</div>
-	</div>
-	<?php } ?>
+			$this->renderHelper('index/normal/entry_bottom');
 
-	<?php $this->renderHelper('pagination'); ?>
-</div>
+		?></div>
+	</div><?php
+	}
+
+	$this->renderHelper('pagination');
+?></div>
 
 <?php $this->partial('nav_entries'); ?>
 

From 198b154064a12cfbeefd494afaa69378e77ffce9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 7 Dec 2014 15:30:24 +0100
Subject: [PATCH 203/363] Fix View files inclusion.

Now, each part of the view (layout, partials, helpers, views) is included based
on the $base_pathnames attribute.
Extensions can now override all of these files.

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 lib/Minz/View.php | 62 ++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index 1bc2e862d..44034ae9a 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -13,7 +13,7 @@ class Minz_View {
 	const LAYOUT_FILENAME = '/layout.phtml';
 
 	private $view_filename = '';
-	private $use_layout = null;
+	private $use_layout = true;
 
 	private static $base_pathnames = array(APP_PATH);
 	private static $title = '';
@@ -56,9 +56,6 @@ class Minz_View {
 	 * Construit la vue
 	 */
 	public function build () {
-		if ($this->use_layout === null) {	//TODO: avoid file_exists and require views to be explicit
-			$this->use_layout = file_exists (APP_PATH . self::LAYOUT_PATH_NAME . self::LAYOUT_FILENAME);
-		}
 		if ($this->use_layout) {
 			$this->buildLayout ();
 		} else {
@@ -66,35 +63,40 @@ class Minz_View {
 		}
 	}
 
+	/**
+	 * Include a view file.
+	 *
+	 * The file is searched inside list of $base_pathnames.
+	 *
+	 * @param $filename the name of the file to include.
+	 * @return true if the file has been included, false else.
+	 */
+	private function includeFile($filename) {
+		// We search the filename in the list of base pathnames. Only the first view
+		// found is considered.
+		foreach (self::$base_pathnames as $base) {
+			$absolute_filename = $base . $filename;
+			if (file_exists($absolute_filename)) {
+				include $absolute_filename;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Construit le layout
 	 */
 	public function buildLayout () {
-		include (
-			APP_PATH
-			. self::LAYOUT_PATH_NAME
-			. self::LAYOUT_FILENAME
-		);
+		$this->includeFile(self::LAYOUT_PATH_NAME . self::LAYOUT_FILENAME);
 	}
 
 	/**
 	 * Affiche la Vue en elle-même
 	 */
 	public function render () {
-		$view_found = false;
-
-		// We search the view in the list of base pathnames. Only the first view
-		// found is considered.
-		foreach (self::$base_pathnames as $base) {
-			$filename = $base . $this->view_filename;
-			if (file_exists($filename)) {
-				include $filename;
-				$view_found = true;
-				break;
-			}
-		}
-
-		if (!$view_found) {
+		if (!$this->includeFile($this->view_filename)) {
 			Minz_Log::notice('File not found: `' . $this->view_filename . '`');
 		}
 	}
@@ -104,11 +106,8 @@ class Minz_View {
 	 * @param $part l'élément partial à ajouter
 	 */
 	public function partial ($part) {
-		$fic_partial = APP_PATH
-		             . self::LAYOUT_PATH_NAME . '/'
-		             . $part . '.phtml';
-
-		if ((include($fic_partial)) === false) {
+		$fic_partial = self::LAYOUT_PATH_NAME . '/' . $part . '.phtml';
+		if (!$this->includeFile($fic_partial)) {
 			Minz_Log::warning('File not found: `' . $fic_partial . '`');
 		}
 	}
@@ -118,11 +117,8 @@ class Minz_View {
 	 * @param $helper l'élément à afficher
 	 */
 	public function renderHelper ($helper) {
-		$fic_helper = APP_PATH
-		            . '/views/helpers/'
-		            . $helper . '.phtml';
-
-		if ((include($fic_helper)) === false) {;
+		$fic_helper = '/views/helpers/' . $helper . '.phtml';
+		if (!$this->includeFile($fic_helper)) {
 			Minz_Log::warning('File not found: `' . $fic_helper . '`');
 		}
 	}

From 2232d1e02a4bc9dbaa99cdbd22efad116ec01403 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 7 Dec 2014 15:45:34 +0100
Subject: [PATCH 204/363] Load user extensions after all the global inits

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/FreshRSS.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index b91dfcc46..88fe60850 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -29,18 +29,18 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
-		// Enable extensions for the current (logged) user.
-		if (FreshRSS_Auth::hasAccess()) {
-			$ext_list = FreshRSS_Context::$conf->extensions_enabled;
-			Minz_ExtensionManager::enable_by_list($ext_list);
-		}
-
 		// Init i18n.
 		Minz_Session::_param('language', FreshRSS_Context::$conf->language);
 		Minz_Translate::init();
 
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
+
+		// Enable extensions for the current (logged) user.
+		if (FreshRSS_Auth::hasAccess()) {
+			$ext_list = FreshRSS_Context::$conf->extensions_enabled;
+			Minz_ExtensionManager::enable_by_list($ext_list);
+		}
 	}
 
 	private function loadStylesAndScripts() {

From c6dfec3ad351ee3b828c6a2c0a273bad5d9ac0df Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 12:01:47 +0100
Subject: [PATCH 205/363] Add behaviour to configure action (extensions)

- Put extension configure view in dir_ext/configure.phtml
- Handle POST action in Extension->handleConfigureAction() method

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 16 ++++++++++++++++
 app/views/extension/configure.phtml     | 17 ++++++++++++++---
 lib/Minz/Extension.php                  | 21 +++++++++++++++++++++
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index a1e39af37..73b8070cb 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -27,6 +27,22 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		if (Minz_Request::param('ajax')) {
 			$this->view->_useLayout(false);
 		}
+
+		$ext_name = urldecode(Minz_Request::param('e'));
+		$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+		if (is_null($ext)) {
+			Minz_Error::error(404);
+		}
+		if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+
+		$this->view->extension = $ext;
+
+		if (Minz_Request::isPost()) {
+			$this->view->extension->handleConfigureAction();
+		}
 	}
 
 	/**
diff --git a/app/views/extension/configure.phtml b/app/views/extension/configure.phtml
index a79e9baac..295080d5e 100644
--- a/app/views/extension/configure.phtml
+++ b/app/views/extension/configure.phtml
@@ -7,6 +7,17 @@ if (!Minz_Request::param('ajax')) {
 ?>
 
 <div class="post">
-	<h1>Extension name</h1>
-	Not implemented yet!
-</div>
\ No newline at end of file
+	<h1><?php echo $this->extension->getName(); ?> (<?php echo $this->extension->getVersion(); ?>) — <?php echo $this->extension->getType(); ?></h1>
+
+	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.by'), ' ', $this->extension->getAuthor(); ?></p>
+
+	<h2><?php echo _t('gen.actions.manage'); ?></h2>
+	<?php
+		$configure_view = $this->extension->getConfigureView();
+		if ($configure_view !== false) {
+			echo $configure_view;
+		} else {
+	?>
+	<p class="alert alert-warn"><?php echo _t('admin.extensions.no_configure_view'); ?></p>
+	<?php } ?>
+</div>
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index c93ba2520..1d706ed80 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -86,6 +86,27 @@ class Minz_Extension {
 		return $this->is_enabled;
 	}
 
+	/**
+	 * Return the content of the configure view for the current extension.
+	 *
+	 * @return the html content from ext_dir/configure.phtml, false if it does
+	 *         not exist.
+	 */
+	public function getConfigureView() {
+		$filename = $this->path . '/configure.phtml';
+		if (!file_exists($filename)) {
+			return false;
+		}
+		return @file_get_contents($filename);
+	}
+
+	/**
+	 * Handle the configure POST action.
+	 *
+	 * It must be redefined by child classes.
+	 */
+	public function handleConfigureAction() {}
+
 	/**
 	 * Getters and setters.
 	 */

From a596385343a0307bb81d1662f78106d8f7e2dbfb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 12:37:06 +0100
Subject: [PATCH 206/363] Fix a security issue in Minz_Error::error()

Mehtod must redirect automatically by default to avoid code execution after
calling the method.
---
 lib/Minz/Error.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php
index c8222a430..e5f3dff07 100644
--- a/lib/Minz/Error.php
+++ b/lib/Minz/Error.php
@@ -19,7 +19,7 @@ class Minz_Error {
 	*      > $logs['notice']
 	* @param $redirect indique s'il faut forcer la redirection (les logs ne seront pas transmis)
 	*/
-	public static function error ($code = 404, $logs = array (), $redirect = false) {
+	public static function error ($code = 404, $logs = array (), $redirect = true) {
 		$logs = self::processLogs ($logs);
 		$error_filename = APP_PATH . '/Controllers/errorController.php';
 

From 188b517daa174ce494f31dec02ae2cff122488ff Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 13:05:56 +0100
Subject: [PATCH 207/363] Add a feed_before_insert hook

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/feedController.php         |  6 +++++
 app/Controllers/importExportController.php | 30 ++++++++++++++--------
 lib/Minz/ExtensionManager.php              |  1 +
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0a7edbee3..7dda3840e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -138,6 +138,12 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feed->_category($cat);
 			$feed->_httpAuth($http_auth);
 
+			// Call the extension hook
+			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
+			if (is_null($feed)) {
+				Minz_Request::bad(_t('feed_not_added', $feed->name()), $url_redirect);
+			}
+
 			$values = array(
 				'url' => $feed->url(),
 				'category' => $feed->category(),
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index c67b30431..52df5bf8b 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -259,10 +259,16 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$feed->_website($website);
 			$feed->_description($description);
 
-			// addFeedObject checks if feed is already in DB so nothing else to
-			// check here
-			$id = $this->feedDAO->addFeedObject($feed);
-			$error = ($id === false);
+			// Call the extension hook
+			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
+			if (!is_null($feed)) {
+				// addFeedObject checks if feed is already in DB so nothing else to
+				// check here
+				$id = $this->feedDAO->addFeedObject($feed);
+				$error = ($id === false);
+			} else {
+				$error = true;
+			}
 		} catch (FreshRSS_Feed_Exception $e) {
 			Minz_Log::warning($e->getMessage());
 			$error = true;
@@ -427,13 +433,17 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$feed->_name($name);
 			$feed->_website($website);
 
-			// addFeedObject checks if feed is already in DB so nothing else to
-			// check here.
-			$id = $this->feedDAO->addFeedObject($feed);
+			// Call the extension hook
+			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
+			if (!is_null($feed)) {
+				// addFeedObject checks if feed is already in DB so nothing else to
+				// check here.
+				$id = $this->feedDAO->addFeedObject($feed);
 
-			if ($id !== false) {
-				$feed->_id($id);
-				$return = $feed;
+				if ($id !== false) {
+					$feed->_id($id);
+					$return = $feed;
+				}
 			}
 		} catch (FreshRSS_Feed_Exception $e) {
 			Minz_Log::warning($e->getMessage());
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 5491c7cf6..9e6a3155a 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -17,6 +17,7 @@ class Minz_ExtensionManager {
 	private static $hook_list = array(
 		'entry_before_display' => array(),  // function($entry) -> Entry | null
 		'entry_before_insert' => array(),  // function($entry) -> Entry | null
+		'feed_before_insert' => array(),  // function($feed) -> Feed | null
 	);
 	private static $ext_to_hooks = array();
 

From 28c77f22900a10ac43c6d61b2b2d1a146feac42a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 13:12:12 +0100
Subject: [PATCH 208/363] Fix a bug with feed_before_insert hook

$feed->name() was called on a null value.

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/feedController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 7dda3840e..379b8d8da 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -139,9 +139,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feed->_httpAuth($http_auth);
 
 			// Call the extension hook
+			$name = $feed->name();
 			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
 			if (is_null($feed)) {
-				Minz_Request::bad(_t('feed_not_added', $feed->name()), $url_redirect);
+				Minz_Request::bad(_t('feed_not_added', $name), $url_redirect);
 			}
 
 			$values = array(

From 0543f96a97fa860fdec38d61b117e6b5addf94b6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 13:22:11 +0100
Subject: [PATCH 209/363] Update comments for ExtensionController

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 73b8070cb..cd56de9eb 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -23,6 +23,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		$this->view->extension_list = Minz_ExtensionManager::list_extensions();
 	}
 
+	/**
+	 * This action handles configuration of a given extension.
+	 *
+	 * Only administrator can configure a system extension.
+	 *
+	 * Parameters are:
+	 * - e: the extension name (urlencoded)
+	 * - additional parameters which should be handle by the extension
+	 *   handleConfigureAction() method (POST request).
+	 */
 	public function configureAction() {
 		if (Minz_Request::param('ajax')) {
 			$this->view->_useLayout(false);
@@ -49,6 +59,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	 * This action enables a disabled extension for the current user.
 	 *
 	 * System extensions can only be enabled by an administrator.
+	 * This action must be reached by a POST request.
 	 *
 	 * Parameter is:
 	 * - e: the extension name (urlencoded).
@@ -99,6 +110,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	 * This action disables an enabled extension for the current user.
 	 *
 	 * System extensions can only be disabled by an administrator.
+	 * This action must be reached by a POST request.
 	 *
 	 * Parameter is:
 	 * - e: the extension name (urlencoded).
@@ -145,6 +157,15 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		Minz_Request::forward($url_redirect, true);
 	}
 
+	/**
+	 * This action handles deletion of an extension.
+	 *
+	 * Only administrator can remove an extension.
+	 * This action must be reached by a POST request.
+	 *
+	 * Parameter is:
+	 * -e: extension name (urlencoded)
+	 */
 	public function removeAction() {
 		if (!FreshRSS_Auth::hasAccess('admin')) {
 			Minz_Error::error(403);

From 76358846abe2eba95668d66d3847cbdfe3f8bcdc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 13:36:08 +0100
Subject: [PATCH 210/363] Implement extension deletion

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 22 ++++++++++++++++++++-
 lib/lib_rss.php                         | 26 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index cd56de9eb..adb3e1864 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -172,6 +172,26 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 
 		$url_redirect = array('c' => 'extension', 'a' => 'index');
-		Minz_Request::bad('not implemented yet!', $url_redirect);
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
+			}
+
+			$res = recursive_unlink($ext->getPath());
+			if ($res) {
+				Minz_Request::good(_t('feedback.extensions.removed', $ext_name),
+				                  $url_redirect);
+			} else {
+				Minz_Request::bad(_t('feedback.extensions.cannot_delete', $ext_name),
+				                  $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
 	}
 }
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8170c7fd9..e466bcb15 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -319,3 +319,29 @@ function check_install_database() {
 
 	return $status;
 }
+
+/**
+ * Remove a directory recursively.
+ *
+ * From http://php.net/rmdir#110489
+ *
+ * @param $dir the directory to remove
+ */
+function recursive_unlink($dir) {
+	if (!is_dir($dir)) {
+		return true;
+	}
+
+	$files = array_diff(scandir($dir), array('.', '..'));
+	foreach ($files as $filename) {
+		$filename = $dir . '/' . $filename;
+		if (is_dir($filename)) {
+			@chmod($filename, 0777);
+			recursive_unlink($filename);
+		} else {
+			unlink($filename);
+		}
+	}
+
+	return rmdir($dir);
+}

From 70c1f0ebb08e2edf1721e2d3f8f98837c5910da4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 9 Dec 2014 12:43:33 +0100
Subject: [PATCH 211/363] Fix redirection after feed refresh

Fix https://github.com/FreshRSS/FreshRSS/issues/716
---
 app/Controllers/feedController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 9990a852c..c8727c727 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -392,8 +392,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		// Redirect to the main page with correct notification.
 		if ($updated_feeds === 1) {
 			$feed = reset($feeds);
-			Minz_Request::good(_t('feed_actualized', $feed->name()),
-			                   array('get' => 'f_' . $feed->id()));
+			Minz_Request::good(_t('feed_actualized', $feed->name()), array(
+				'params' => array('get' => 'f_' . $feed->id())
+			));
 		} elseif ($updated_feeds > 1) {
 			Minz_Request::good(_t('n_feeds_actualized', $updated_feeds), array());
 		} else {

From 0b9fa9896ed3b12b7e0d6300f0122d25d9576aa3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 9 Dec 2014 15:44:13 +0100
Subject: [PATCH 212/363] Update CHANGELOG

---
 CHANGELOG | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index e09b55d21..15582e82a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,24 @@
 # Journal des modifications
 
-## Dev
+## 2014-12-xx FreshRSS 0.9.3 (beta)
 
 * SimplePie
 	* Support for content-type application/x-rss+xml
 	* New force_feed option (for feeds sent with the wrong content-type / MIME) by adding #force_feed at the end of the feed URL
 	* Improved error messages
+* Statistics
+	* Add information on feed repartition pages
+	* Add percent repartition for the bigger feeds
+* UI
+	* New theme selector
+	* Update Screwdriver theme
+	* Add BlueLagoon theme by Mister aiR
+* Misc.
+	* Add option to remove articles after reading them
+	* Add comments
+	* Refactor i18n system to not load unnecessary strings
+	* Fix security issue in Minz_Error::error() method
+	* Fix redirection after refreshing a given feed
 
 
 ## 2014-10-31 FreshRSS 0.9.2 (beta)

From f807a6f5c1e9aa5aadf338c5242e54e1930b4088 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 22:10:01 +0100
Subject: [PATCH 213/363] Fix i18n for header and aside_configure

---
 app/i18n/en/gen.php              | 58 +++++++++++++++++---------------
 app/i18n/fr/gen.php              | 58 +++++++++++++++++---------------
 app/layout/aside_configure.phtml | 16 ++++-----
 app/layout/header.phtml          | 32 +++++++++---------
 4 files changed, 84 insertions(+), 80 deletions(-)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index a7f51e8f9..bd386f6a0 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -1,6 +1,36 @@
 <?php
 
 return array(
+	'auth' => array(
+		'login' => 'Login',
+		'logout' => 'Logout',
+	),
+	'menu' => array(
+		'about' => 'About',
+		'admin' => 'Administration',
+		'archiving' => 'Archiving',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'configuration' => 'Configuration',
+		'display' => 'Display',
+		'logs' => 'Logs',
+		'queries' => 'User queries',
+		'reading' => 'Reading',
+		'sharing' => 'Sharing',
+		'shortcuts' => 'Shortcuts',
+		'stats' => 'Statistics',
+		'update' => 'Update',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'title' => array(
+		'_' => 'Title',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'global_view' => 'Global view',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
 	'Apr' => '\\A\\p\\r\\i\\l',
 	'Aug' => '\\A\\u\\g\\u\\s\\t',
 	'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
@@ -13,7 +43,6 @@ return array(
 	'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 	'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 	'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
-	'about' => 'About',
 	'about_freshrss' => 'About FreshRSS',
 	'access_denied' => 'You don’t have permission to access this page',
 	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
@@ -33,7 +62,6 @@ return array(
 	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
 	'apr' => 'apr',
 	'april' => 'Apr',
-	'archiving_configuration' => 'Archiving',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
 	'article' => 'Article',
 	'article_icons' => 'Article icons',
@@ -110,7 +138,6 @@ return array(
 	'choose_language' => 'Choose a language for FreshRSS',
 	'clear_logs' => 'Clear the logs',
 	'collapse_article' => 'Collapse',
-	'configuration' => 'Configuration',
 	'configuration_updated' => 'Configuration has been updated',
 	'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
 	'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
@@ -136,7 +163,6 @@ return array(
 	'delete' => 'Delete',
 	'delete_articles_every' => 'Remove articles after',
 	'diaspora' => 'Diaspora*',
-	'display' => 'Display',
 	'display_articles_unfolded' => 'Show articles unfolded by default',
 	'display_categories_unfolded' => 'Show categories folded by default',
 	'display_configuration' => 'Display',
@@ -191,21 +217,6 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'Fri',
 	'g+' => 'Google+',
-	'menu' => array(
-		'admin' => 'Administration',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
-	'title' => array(
-		'_' => 'Title',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'global_view' => 'Global view',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -256,13 +267,10 @@ return array(
 	'license' => 'License',
 	'load_more' => 'Load more articles',
 	'log_is_ok' => 'Permissions on logs directory are good',
-	'login' => 'Login',
 	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
-	'logout' => 'Logout',
-	'logs' => 'Logs',
 	'logs_empty' => 'Log file is empty',
 	'main_stream' => 'Main stream',
 	'mar' => 'mar',
@@ -340,7 +348,6 @@ return array(
 	'publication_date' => 'Date of publication',
 	'purge_completed' => 'Purge completed (%d articles deleted)',
 	'purge_now' => 'Purge now',
-	'queries' => 'User queries',
 	'query_created' => 'Query "%s" has been created.',
 	'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
 	'query_filter' => 'Filter applied:',
@@ -370,7 +377,6 @@ return array(
 	'query_state_15' => 'Display all articles',
 	'random_string' => 'Random string',
 	'reader_view' => 'Reading view',
-	'reading_configuration' => 'Reading',
 	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
 	'refresh' => 'Refresh',
 	'related_tags' => 'Related tags',
@@ -392,10 +398,8 @@ return array(
 	'share' => 'Share',
 	'share_name' => 'Share name to display',
 	'share_url' => 'Share URL to use',
-	'sharing' => 'Sharing',
 	'sharing_management' => 'Sharing options management',
 	'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
-	'shortcuts' => 'Shortcuts',
 	'shortcuts_article_action' => 'Article actions',
 	'shortcuts_navigation' => 'Navigation',
 	'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
@@ -410,7 +414,6 @@ return array(
 	'show_read' => 'Show only read',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
-	'stats' => 'Statistics',
 	'stats_entry_count' => 'Entry count',
 	'stats_entry_per_category' => 'Entries per category',
 	'stats_entry_per_day' => 'Entries per day (last 30 days)',
@@ -445,7 +448,6 @@ return array(
 	'tue' => 'Tue',
 	'twitter' => 'Twitter',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
-	'update' => 'Update',
 	'update_apply' => 'Apply',
 	'update_can_apply' => 'An update is available.',
 	'update_check' => 'Check for new updates',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 0b2395bd0..b33dc49bc 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -1,6 +1,36 @@
 <?php
 
 return array(
+	'auth' => array(
+		'login' => 'Connexion',
+		'logout' => 'Déconnexion',
+	),
+	'menu' => array(
+		'about' => 'À propos',
+		'admin' => 'Administration',
+		'archiving' => 'Archivage',
+		'authentication' => 'Authentification',
+		'check_install' => 'Vérification de l’installation',
+		'configuration' => 'Configuration',
+		'display' => 'Affichage',
+		'logs' => 'Logs',
+		'queries' => 'Filtres utilisateurs',
+		'reading' => 'Lecture',
+		'sharing' => 'Partage',
+		'shortcuts' => 'Raccourcis',
+		'stats' => 'Statistiques',
+		'update' => 'Mise à jour',
+		'user_management' => 'Gestion des utilisateurs',
+		'user_profile' => 'Profil',
+	),
+	'title' => array(
+		'_' => 'Titre',
+		'authentication' => 'Authentification',
+		'check_install' => 'Vérification de l’installation',
+		'global_view' => 'Vue globale',
+		'user_management' => 'Gestion des utilisateurs',
+		'user_profile' => 'Profil',
+	),
 	'Apr' => '\\a\\v\\r\\i\\l',
 	'Aug' => '\\a\\o\\û\\t',
 	'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
@@ -13,7 +43,6 @@ return array(
 	'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
 	'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
 	'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
-	'about' => 'À propos',
 	'about_freshrss' => 'À propos de FreshRSS',
 	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
 	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
@@ -33,7 +62,6 @@ return array(
 	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
 	'apr' => 'avr.',
 	'april' => 'avril',
-	'archiving_configuration' => 'Archivage',
 	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 	'article' => 'Article',
 	'article_icons' => 'Icônes d’article',
@@ -110,7 +138,6 @@ return array(
 	'choose_language' => 'Choisissez la langue pour FreshRSS',
 	'clear_logs' => 'Effacer les logs',
 	'collapse_article' => 'Refermer',
-	'configuration' => 'Configuration',
 	'configuration_updated' => 'La configuration a été mise à jour.',
 	'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
 	'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
@@ -139,7 +166,6 @@ return array(
 	'display' => 'Affichage',
 	'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
 	'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
-	'display_configuration' => 'Affichage',
 	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
 	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
@@ -191,21 +217,6 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'ven.',
 	'g+' => 'Google+',
-	'menu' => array(
-		'admin' => 'Administration',
-		'authentication' => 'Authentification',
-		'check_install' => 'Vérification de l’installation',
-		'user_management' => 'Gestion des utilisateurs',
-		'user_profile' => 'Profil',
-	),
-	'title' => array(
-		'_' => 'Titre',
-		'authentication' => 'Authentification',
-		'check_install' => 'Vérification de l’installation',
-		'global_view' => 'Vue globale',
-		'user_management' => 'Gestion des utilisateurs',
-		'user_profile' => 'Profil',
-	),
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -256,13 +267,10 @@ return array(
 	'license' => 'Licence',
 	'load_more' => 'Charger plus d’articles',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
-	'login' => 'Connexion',
 	'login_configuration' => 'Identification',
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
-	'logout' => 'Déconnexion',
-	'logs' => 'Logs',
 	'logs_empty' => 'Les logs sont vides.',
 	'main_stream' => 'Flux principal',
 	'mar' => 'mar.',
@@ -340,7 +348,6 @@ return array(
 	'publication_date' => 'Date de publication',
 	'purge_completed' => 'Purge effectuée (%d articles supprimés).',
 	'purge_now' => 'Purger maintenant',
-	'queries' => 'Filtres utilisateurs',
 	'query_created' => 'Le filtre "%s" a bien été créé.',
 	'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
 	'query_filter' => 'Filtres appliqués :',
@@ -370,7 +377,6 @@ return array(
 	'query_state_15' => 'Afficher tous les articles',
 	'random_string' => 'Chaîne aléatoire',
 	'reader_view' => 'Vue lecture',
-	'reading_configuration' => 'Lecture',
 	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 	'refresh' => 'Actualisation',
 	'related_tags' => 'Tags associés',
@@ -392,10 +398,8 @@ return array(
 	'share' => 'Partager',
 	'share_name' => 'Nom du partage à afficher',
 	'share_url' => 'URL du partage à utiliser',
-	'sharing' => 'Partage',
 	'sharing_management' => 'Gestion des options de partage',
 	'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
-	'shortcuts' => 'Raccourcis',
 	'shortcuts_article_action' => 'Actions associées à l’article courant',
 	'shortcuts_navigation' => 'Navigation',
 	'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
@@ -410,7 +414,6 @@ return array(
 	'show_read' => 'Afficher les lus',
 	'sort_order' => 'Ordre de tri',
 	'starred_list' => 'Liste des articles favoris',
-	'stats' => 'Statistiques',
 	'stats_entry_count' => 'Nombre d’articles',
 	'stats_entry_per_category' => 'Articles par catégorie',
 	'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
@@ -445,7 +448,6 @@ return array(
 	'tue' => 'mar.',
 	'twitter' => 'Twitter',
 	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
-	'update' => 'Mise à jour',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_can_apply' => 'Une mise à jour est disponible.',
 	'update_check' => 'Vérifier les mises à jour',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 53c52d3e3..25b8037e6 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,22 +1,22 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo _t('configuration'); ?></li>
+	<li class="nav-header"><?php echo _t('gen.menu.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>
+		<a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'reading' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'archiving' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'sharing' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a>
+		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.sharing'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'shortcut' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a>
+		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'queries' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
+		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
@@ -37,7 +37,7 @@
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'update' &&
 	                          Minz_Request::actionName() === 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
+		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a>
 	</li>
 	<?php } ?>
 </ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index c73d9cdbb..429cfc1d2 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -2,9 +2,9 @@
 if (Minz_Configuration::canLogIn()) {
 	?><ul class="nav nav-head nav-login"><?php
 		if (FreshRSS_Auth::hasAccess()) {
-			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('logout'); ?></a></li><?php
+			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('gen.auth.logout'); ?></a></li><?php
 		} else {
-			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('login'); ?></a></li><?php
+			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a></li><?php
 		}
 	?></ul><?php
 }
@@ -25,7 +25,7 @@ if (Minz_Configuration::canLogIn()) {
 		<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 _t('search'); ?>" />
+				<input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('gen.search'); ?>" />
 
 				<?php $get = Minz_Request::param('get', ''); ?>
 				<?php if ($get != '') { ?>
@@ -55,13 +55,13 @@ if (Minz_Configuration::canLogIn()) {
 			<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 _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="dropdown-header"><?php echo _t('gen.menu.configuration'); ?></li>
+				<li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.sharing'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a></li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 				<li class="separator"></li>
@@ -69,23 +69,23 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.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>
-				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('gen.menu.stats'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('gen.menu.logs'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.menu.about'); ?></a></li>
 				<?php
 				if (Minz_Configuration::canLogIn()) {
 					?><li class="separator"></li>
-				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
+				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('gen.auth.logout'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
 	</div>
 	<?php } elseif (Minz_Configuration::canLogIn()) { ?>
 	<div class="item configure">
-		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('login'); ?></a>
+		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a>
 	</div>
 	<?php } ?>
 </div>

From 7dee863577aff2103277e08bf6db2f8e16b029a7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 22:29:13 +0100
Subject: [PATCH 214/363] Fix i18n for aside_feed

---
 app/i18n/en/gen.php         | 14 ++++++--------
 app/i18n/en/index.php       | 13 ++++++++++++-
 app/i18n/fr/gen.php         | 14 ++++++--------
 app/i18n/fr/index.php       | 13 ++++++++++++-
 app/layout/aside_feed.phtml | 20 ++++++++++----------
 5 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index bd386f6a0..3bc2c5ac6 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -1,6 +1,12 @@
 <?php
 
 return array(
+	'action' => array(
+		'disable' => 'Disable',
+		'enable' => 'Enable',
+		'manage' => 'Manage',
+		'remove' => 'Remove',
+	),
 	'auth' => array(
 		'login' => 'Login',
 		'logout' => 'Logout',
@@ -43,11 +49,9 @@ return array(
 	'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 	'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 	'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
-	'about_freshrss' => 'About FreshRSS',
 	'access_denied' => 'You don’t have permission to access this page',
 	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
 	'activate_sharing' => 'Activate sharing',
-	'actualize' => 'Actualize',
 	'add_category' => 'Add a category',
 	'add_query' => 'Add a query',
 	'add_rss_feed' => 'Add a RSS feed',
@@ -179,7 +183,6 @@ return array(
 	'export_starred' => 'Export your favourites',
 	'facebook' => 'Facebook',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
-	'favorite_feeds' => 'Favourites (%s)',
 	'feb' => 'feb',
 	'february' => 'Feb',
 	'feed' => 'Feed',
@@ -204,7 +207,6 @@ return array(
 	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
 	'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
-	'filter' => 'Filter',
 	'finish_installation' => 'Complete installation',
 	'first' => 'First',
 	'first_article' => 'Skip to the first article',
@@ -272,14 +274,12 @@ return array(
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
 	'logs_empty' => 'Log file is empty',
-	'main_stream' => 'Main stream',
 	'mar' => 'mar',
 	'march' => 'Mar',
 	'mark_all_read' => 'Mark all as read',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
-	'mark_read' => 'Mark as read',
 	'may' => 'May',
 	'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
 	'minz_is_ok' => 'You have the Minz framework',
@@ -391,7 +391,6 @@ return array(
 	'search_short' => 'Search',
 	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
 	'see_on_website' => 'See on original website',
-	'see_website' => 'See website',
 	'sep' => 'sep',
 	'september' => 'Sep',
 	'shaarli' => 'Shaarli',
@@ -435,7 +434,6 @@ return array(
 	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
 	'submit' => 'Submit',
-	'subscription_management' => 'Subscriptions management',
 	'sun' => 'Sun',
 	'theme' => 'Theme',
 	'think_to_add' => 'You may add some feeds.',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index afca37ed3..ca15bcc25 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -1,5 +1,16 @@
 <?php
 
 return array(
-
+	'menu' => array(
+		'about' => 'About FreshRSS',
+		'actualize' => 'Actualize',
+		'favorites' => 'Favourites (%s)',
+		'filter' => 'Filter',
+		'main_stream' => 'Main stream',
+		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
+		'see_website' => 'See website',
+		'stats' => 'Statistics',
+		'subscription' => 'Subscriptions management',
+	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index b33dc49bc..9d9624cc8 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -1,6 +1,12 @@
 <?php
 
 return array(
+	'action' => array(
+		'disable' => 'Désactiver',
+		'enable' => 'Activer',
+		'manage' => 'Gérer',
+		'remove' => 'Supprimer',
+	),
 	'auth' => array(
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
@@ -43,11 +49,9 @@ return array(
 	'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
 	'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
 	'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
-	'about_freshrss' => 'À propos de FreshRSS',
 	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
 	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
 	'activate_sharing' => 'Activer le partage',
-	'actualize' => 'Actualiser',
 	'add_category' => 'Ajouter une catégorie',
 	'add_query' => 'Créer un filtre',
 	'add_rss_feed' => 'Ajouter un flux RSS',
@@ -179,7 +183,6 @@ return array(
 	'export_starred' => 'Exporter les favoris',
 	'facebook' => 'Facebook',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
-	'favorite_feeds' => 'Favoris (%s)',
 	'feb' => 'fév.',
 	'february' => 'février',
 	'feed' => 'Flux',
@@ -204,7 +207,6 @@ return array(
 	'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
 	'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
 	'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
-	'filter' => 'Filtrer',
 	'finish_installation' => 'Terminer l’installation',
 	'first' => 'Début',
 	'first_article' => 'Passer au premier article',
@@ -272,14 +274,12 @@ return array(
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
 	'logs_empty' => 'Les logs sont vides.',
-	'main_stream' => 'Flux principal',
 	'mar' => 'mar.',
 	'march' => 'mars',
 	'mark_all_read' => 'Tout marquer comme lu',
 	'mark_cat_read' => 'Marquer la catégorie comme lue',
 	'mark_favorite' => 'Mettre en favori',
 	'mark_feed_read' => 'Marquer le flux comme lu',
-	'mark_read' => 'Marquer comme lu',
 	'may' => 'mai.',
 	'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
 	'minz_is_ok' => 'Vous disposez du framework Minz',
@@ -391,7 +391,6 @@ return array(
 	'search_short' => 'Rechercher',
 	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
 	'see_on_website' => 'Voir sur le site d’origine',
-	'see_website' => 'Voir le site',
 	'sep' => 'sep.',
 	'september' => 'septembre',
 	'shaarli' => 'Shaarli',
@@ -435,7 +434,6 @@ return array(
 	'steps' => 'Étapes',
 	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 	'submit' => 'Valider',
-	'subscription_management' => 'Gestion des abonnements',
 	'sun' => 'dim.',
 	'theme' => 'Thème',
 	'think_to_add' => 'Vous pouvez ajouter des flux.',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index afca37ed3..408d7ee4a 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -1,5 +1,16 @@
 <?php
 
 return array(
-
+	'menu' => array(
+		'about' => 'À propos de FreshRSS',
+		'actualize' => 'Actualiser',
+		'favorites' => 'Favoris (%s)',
+		'filter' => 'Filtrer',
+		'main_stream' => 'Flux principal',
+		'manage' => 'Gérer',
+		'mark_read' => 'Marquer comme lu',
+		'see_website' => 'Voir le site',
+		'stats' => 'Statistiques',
+		'subscription' => 'Gestion des abonnements',
+	),
 );
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 3c23e0178..ca220dcd4 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -12,11 +12,11 @@
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
 	<div class="stick configure-feeds no-mobile">
-		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.menu.subscription'); ?></a>
 		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
 	</div>
 	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
-	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a>
+	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
 	<?php } ?>
 
 	<form id="mark-read-aside" method="post" style="display: none"></form>
@@ -24,13 +24,13 @@
 	<ul class="tree">
 		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('index.menu.main_stream'); ?></a>
 			</div>
 		</li>
 
 		<li class="tree-folder category favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('index.menu.favorites', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
 			</div>
 		</li>
 
@@ -74,21 +74,21 @@
 <script id="feed_config_template" type="text/html">
 	<ul class="dropdown-menu">
 		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('index.menu.filter'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
 		<?php } ?>
-		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
+		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('index.menu.see_website'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.manage'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.actualize'); ?></a></li>
 		<li class="item">
 			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
 			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
-			        type="submit"><?php echo _t('mark_read'); ?></button>
+			        type="submit"><?php echo _t('index.menu.mark_read'); ?></button>
 		</li>
 		<?php } ?>
 	</ul>

From c1b48c4bc015e267f1e28693dfa0a25bf33332b5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 22:32:55 +0100
Subject: [PATCH 215/363] Fix i18n for aside_stats

---
 app/i18n/en/admin.php        | 5 +++++
 app/i18n/en/gen.php          | 3 ---
 app/i18n/fr/admin.php        | 5 +++++
 app/layout/aside_stats.phtml | 8 ++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 74f01ae06..cf8d8bd00 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -86,6 +86,11 @@ return array(
 			'ok' => 'You have ZIP extension.',
 		),
 	),
+	'stats' => array(
+		'idle' => 'Idle feeds',
+		'main' => 'Main statistics',
+		'repartition' => 'Articles repartition',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 3bc2c5ac6..c762713c1 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -421,11 +421,8 @@ return array(
 	'stats_entry_per_month' => 'Per month (average: %.2f messages)',
 	'stats_entry_repartition' => 'Entries repartition',
 	'stats_feed_per_category' => 'Feeds per category',
-	'stats_idle' => 'Idle feeds',
-	'stats_main' => 'Main statistics',
 	'stats_no_idle' => 'There is no idle feed!',
 	'stats_percent_of_total' => '%% of total',
-	'stats_repartition' => 'Articles repartition',
 	'stats_top_feed' => 'Top ten feeds',
 	'status_favorites' => 'Favourites',
 	'status_read' => 'Read',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index ad1fae6c0..3d7201439 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -86,6 +86,11 @@ return array(
 			'ok' => 'Vous disposez de l\'extension ZIP.',
 		),
 	),
+	'stats' => array(
+		'idle' => 'Flux inactifs',
+		'main' => 'Statistiques principales',
+		'repartition' => 'Répartition des articles',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
index 1cd31a99c..559087df1 100644
--- a/app/layout/aside_stats.phtml
+++ b/app/layout/aside_stats.phtml
@@ -1,12 +1,12 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo _t('stats'); ?></li>
+	<li class="nav-header"><?php echo _t('admin.stats'); ?></li>
 	<li class="item<?php echo Minz_Request::actionName() == 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('stats_main'); ?></a>
+		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('admin.stats.main'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() == 'idle' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('stats_idle'); ?></a>
+		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('admin.stats.idle'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() == 'repartition' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('stats_repartition'); ?></a>
+		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('admin.stats.repartition'); ?></a>
 	</li>
 </ul>

From 2f24f0fe882af0be6c893b16d9adae48e06bac1f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 22:37:49 +0100
Subject: [PATCH 216/363] Fix i18n for aside subscription

---
 app/i18n/en/gen.php                 | 2 --
 app/i18n/en/sub.php                 | 5 +++++
 app/i18n/fr/gen.php                 | 5 -----
 app/i18n/fr/sub.php                 | 5 +++++
 app/layout/aside_subscription.phtml | 8 ++++----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index c762713c1..f98c40c5b 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -110,7 +110,6 @@ return array(
 	'before_yesterday' => 'Before yesterday',
 	'blank_to_disable' => 'Leave blank to disable',
 	'blogotext' => 'Blogotext',
-	'bookmark' => 'Subscribe (FreshRSS bookmark)',
 	'bottom_line' => 'Bottom line',
 	'bugs_reports' => 'Bugs reports',
 	'by' => 'by',
@@ -235,7 +234,6 @@ return array(
 	'http_username' => 'HTTP username',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
 	'import' => 'Import',
-	'import_export' => 'Import / export',
 	'informations' => 'Information',
 	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
 	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index e64b6ca4b..d915a18a7 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -7,4 +7,9 @@ return array(
 	'feeds' => array(
 		'over_max' => 'You have reached your limit of feeds (%d)',
 	),
+	'menu' => array(
+		'bookmark' => 'Subscribe (FreshRSS bookmark)',
+		'import_export' => 'Import / export',
+		'subscription_management' => 'Subscriptions management',
+	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 9d9624cc8..06a08eb0a 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -110,7 +110,6 @@ return array(
 	'before_yesterday' => 'À partir d’avant-hier',
 	'blank_to_disable' => 'Laissez vide pour désactiver',
 	'blogotext' => 'Blogotext',
-	'bookmark' => 'S’abonner (bookmark FreshRSS)',
 	'bottom_line' => 'Ligne du bas',
 	'bugs_reports' => 'Rapports de bugs',
 	'by' => 'par',
@@ -235,7 +234,6 @@ return array(
 	'http_username' => 'Identifiant HTTP',
 	'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
 	'import' => 'Importer',
-	'import_export' => 'Importer / exporter',
 	'informations' => 'Informations',
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
@@ -421,11 +419,8 @@ return array(
 	'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
 	'stats_entry_repartition' => 'Répartition des articles',
 	'stats_feed_per_category' => 'Flux par catégorie',
-	'stats_idle' => 'Flux inactifs',
-	'stats_main' => 'Statistiques principales',
 	'stats_no_idle' => 'Il n’y a aucun flux inactif !',
 	'stats_percent_of_total' => '%% du total',
-	'stats_repartition' => 'Répartition des articles',
 	'stats_top_feed' => 'Les dix plus gros flux',
 	'status_favorites' => 'favoris',
 	'status_read' => 'lus',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index 6ef4002a6..7bb52b113 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -7,4 +7,9 @@ return array(
 	'feeds' => array(
 		'over_max' => 'Vous avez atteint votre limite de flux (%d)',
 	),
+	'menu' => array(
+		'bookmark' => 'S’abonner (bookmark FreshRSS)',
+		'import_export' => 'Importer / exporter',
+		'subscription_management' => 'Gestion des abonnements',
+	),
 );
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index cbf5df67d..8a54e2dc2 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -1,17 +1,17 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
+	<li class="nav-header"><?php echo _t('sub.menu.subscription_management'); ?></li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+		<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('sub.menu.subscription_management'); ?></a>
 	</li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('import_export'); ?></a>
+		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('sub.menu.import_export'); ?></a>
 	</li>
 
 	<li class="item">
 		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
-			<?php echo _t('bookmark'); ?>
+			<?php echo _t('sub.menu.bookmark'); ?>
 		</a>
 	</li>
 </ul>

From 89d0f98fafc3354cbfc55460f3d795d4c1b7af8a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 22:56:36 +0100
Subject: [PATCH 217/363] Fix i18n for nav menu

---
 app/i18n/en/gen.php       | 14 --------------
 app/i18n/en/index.php     | 15 +++++++++++++++
 app/i18n/fr/gen.php       | 14 --------------
 app/i18n/fr/index.php     | 15 +++++++++++++++
 app/layout/nav_menu.phtml | 34 +++++++++++++++++-----------------
 5 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index f98c40c5b..eadc80360 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -53,7 +53,6 @@ return array(
 	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
 	'activate_sharing' => 'Activate sharing',
 	'add_category' => 'Add a category',
-	'add_query' => 'Add a query',
 	'add_rss_feed' => 'Add a RSS feed',
 	'administration' => 'Manage',
 	'advanced' => 'Advanced',
@@ -105,8 +104,6 @@ return array(
 	'bdd_conf_is_ok' => 'Database configuration has been saved.',
 	'bdd_configuration' => 'Database configuration',
 	'bdd_type' => 'Type of database',
-	'before_one_day' => 'Before one day',
-	'before_one_week' => 'Before one week',
 	'before_yesterday' => 'Before yesterday',
 	'blank_to_disable' => 'Leave blank to disable',
 	'blogotext' => 'Blogotext',
@@ -221,7 +218,6 @@ return array(
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
-	'global_view' => 'Global view',
 	'help' => 'Display documentation',
 	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
 	'host' => 'Host',
@@ -274,7 +270,6 @@ return array(
 	'logs_empty' => 'Log file is empty',
 	'mar' => 'mar',
 	'march' => 'Mar',
-	'mark_all_read' => 'Mark all as read',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
@@ -288,7 +283,6 @@ return array(
 	'n_feeds_actualized' => '%d feeds have been updated',
 	'new_article' => 'There are new available articles, click to refresh the page.',
 	'new_category' => 'New category',
-	'newer_first' => 'Newer first',
 	'next' => 'Next',
 	'next_article' => 'Skip to the next article',
 	'next_page' => 'Skip to the next page',
@@ -303,7 +297,6 @@ return array(
 	'no_selected_feed' => 'No feed selected.',
 	'no_update' => 'No update to apply',
 	'no_zip_extension' => 'Zip extension is not present on your server.',
-	'normal_view' => 'Normal view',
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
@@ -318,7 +311,6 @@ return array(
 	'oct' => 'oct',
 	'october' => 'Oct',
 	'ok' => 'Ok!',
-	'older_first' => 'Oldest first',
 	'oops' => 'Oops!',
 	'optimization_complete' => 'Optimization complete',
 	'optimize_bdd' => 'Optimize database',
@@ -374,14 +366,12 @@ return array(
 	'query_state_14' => 'Display unread articles',
 	'query_state_15' => 'Display all articles',
 	'random_string' => 'Random string',
-	'reader_view' => 'Reading view',
 	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
 	'refresh' => 'Refresh',
 	'related_tags' => 'Related tags',
 	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
 	'rss_feed_management' => 'RSS feeds management',
 	'rss_feeds_of' => 'RSS feed of %s',
-	'rss_view' => 'RSS feed',
 	'sat' => 'Sat',
 	'save' => 'Save',
 	'scroll' => 'while scrolling',
@@ -404,11 +394,7 @@ return array(
 	'shortcuts_updated' => 'Shortcuts have been updated',
 	'show_adaptive' => 'Adjust showing',
 	'show_all_articles' => 'Show all articles',
-	'show_favorite' => 'Show only favorites',
 	'show_in_all_flux' => 'Show in main stream',
-	'show_not_favorite' => 'Show all but favorites',
-	'show_not_reads' => 'Show only unread',
-	'show_read' => 'Show only read',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
 	'stats_entry_count' => 'Entry count',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index ca15bcc25..5e05657d1 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -4,13 +4,28 @@ return array(
 	'menu' => array(
 		'about' => 'About FreshRSS',
 		'actualize' => 'Actualize',
+		'add_query' => 'Add a query',
+		'before_one_day' => 'Before one day',
+		'before_one_week' => 'Before one week',
 		'favorites' => 'Favourites (%s)',
 		'filter' => 'Filter',
+		'global_view' => 'Global view',
 		'main_stream' => 'Main stream',
 		'manage' => 'Manage',
+		'mark_all_read' => 'Mark all as read',
 		'mark_read' => 'Mark as read',
+		'newer_first' => 'Newer first',
+		'non-starred' => 'Show all but favorites',
+		'normal_view' => 'Normal view',
+		'older_first' => 'Oldest first',
+		'queries' => 'User queries',
+		'read' => 'Show only unread',
+		'reader_view' => 'Reading view',
+		'rss_view' => 'RSS feed',
 		'see_website' => 'See website',
+		'starred' => 'Show only favorites',
 		'stats' => 'Statistics',
 		'subscription' => 'Subscriptions management',
+		'unread' => 'Show only read',
 	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 06a08eb0a..d22e51f2d 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -53,7 +53,6 @@ return array(
 	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
 	'activate_sharing' => 'Activer le partage',
 	'add_category' => 'Ajouter une catégorie',
-	'add_query' => 'Créer un filtre',
 	'add_rss_feed' => 'Ajouter un flux RSS',
 	'administration' => 'Gérer',
 	'advanced' => 'Avancé',
@@ -105,8 +104,6 @@ return array(
 	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
 	'bdd_configuration' => 'Base de données',
 	'bdd_type' => 'Type de base de données',
-	'before_one_day' => 'Antérieurs à 1 jour',
-	'before_one_week' => 'Antérieurs à 1 semaine',
 	'before_yesterday' => 'À partir d’avant-hier',
 	'blank_to_disable' => 'Laissez vide pour désactiver',
 	'blogotext' => 'Blogotext',
@@ -221,7 +218,6 @@ return array(
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
-	'global_view' => 'Vue globale',
 	'help' => 'Afficher la documentation',
 	'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
 	'host' => 'Hôte',
@@ -274,7 +270,6 @@ return array(
 	'logs_empty' => 'Les logs sont vides.',
 	'mar' => 'mar.',
 	'march' => 'mars',
-	'mark_all_read' => 'Tout marquer comme lu',
 	'mark_cat_read' => 'Marquer la catégorie comme lue',
 	'mark_favorite' => 'Mettre en favori',
 	'mark_feed_read' => 'Marquer le flux comme lu',
@@ -288,7 +283,6 @@ return array(
 	'n_feeds_actualized' => '%d flux ont été mis à jour.',
 	'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 	'new_category' => 'Nouvelle catégorie',
-	'newer_first' => 'Plus récents en premier',
 	'next' => 'Suivant',
 	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
@@ -303,7 +297,6 @@ return array(
 	'no_selected_feed' => 'Aucun flux sélectionné.',
 	'no_update' => 'Aucune mise à jour à appliquer',
 	'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
-	'normal_view' => 'Vue normale',
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
@@ -318,7 +311,6 @@ return array(
 	'oct' => 'oct.',
 	'october' => 'octobre',
 	'ok' => 'Ok !',
-	'older_first' => 'Plus anciens en premier',
 	'oops' => 'Oups !',
 	'optimization_complete' => 'Optimisation terminée.',
 	'optimize_bdd' => 'Optimiser la base de données',
@@ -374,14 +366,12 @@ return array(
 	'query_state_14' => 'Afficher les articles non lus',
 	'query_state_15' => 'Afficher tous les articles',
 	'random_string' => 'Chaîne aléatoire',
-	'reader_view' => 'Vue lecture',
 	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 	'refresh' => 'Actualisation',
 	'related_tags' => 'Tags associés',
 	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
 	'rss_feed_management' => 'Gestion des flux RSS',
 	'rss_feeds_of' => 'Flux RSS de %s',
-	'rss_view' => 'Flux RSS',
 	'sat' => 'sam.',
 	'save' => 'Enregistrer',
 	'scroll' => 'au défilement de la page',
@@ -404,11 +394,7 @@ return array(
 	'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
 	'show_adaptive' => 'Adapter l’affichage',
 	'show_all_articles' => 'Afficher tous les articles',
-	'show_favorite' => 'Afficher les favoris',
 	'show_in_all_flux' => 'Afficher dans le flux principal',
-	'show_not_favorite' => 'Afficher tout sauf les favoris',
-	'show_not_reads' => 'Afficher les non lus',
-	'show_read' => 'Afficher les lus',
 	'sort_order' => 'Ordre de tri',
 	'starred_list' => 'Liste des articles favoris',
 	'stats_entry_count' => 'Nombre d’articles',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 408d7ee4a..3fea1b879 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -4,13 +4,28 @@ return array(
 	'menu' => array(
 		'about' => 'À propos de FreshRSS',
 		'actualize' => 'Actualiser',
+		'add_query' => 'Créer un filtre',
+		'before_one_day' => 'Antérieurs à 1 jour',
+		'before_one_week' => 'Antérieurs à 1 semaine',
 		'favorites' => 'Favoris (%s)',
 		'filter' => 'Filtrer',
+		'global_view' => 'Vue globale',
 		'main_stream' => 'Flux principal',
 		'manage' => 'Gérer',
+		'mark_all_read' => 'Tout marquer comme lu',
 		'mark_read' => 'Marquer comme lu',
+		'newer_first' => 'Plus récents en premier',
+		'non-starred' => 'Afficher tout sauf les favoris',
+		'normal_view' => 'Vue normale',
+		'older_first' => 'Plus anciens en premier',
+		'queries' => 'Filtres utilisateurs',
+		'read' => 'Afficher les non lus',
+		'reader_view' => 'Vue lecture',
+		'rss_view' => 'Flux RSS',
 		'see_website' => 'Voir le site',
+		'starred' => 'Afficher les favoris',
 		'stats' => 'Statistiques',
 		'subscription' => 'Gestion des abonnements',
+		'unread' => 'Afficher les lus',
 	),
 );
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index dd7cbea30..cdcc926a3 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -23,7 +23,7 @@
 		<a id="toggle-<?php echo $state_str; ?>"
 		   class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
 		   aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
-		   title="<?php echo _t($state_str); ?>"
+		   title="<?php echo _t('index.menu.' . $state_str); ?>"
 		   href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
 		<?php } ?>
 
@@ -35,7 +35,7 @@
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 
 				<li class="dropdown-header">
-					<?php echo _t('queries'); ?>
+					<?php echo _t('index.menu.queries'); ?>
 					<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
 				</li>
 
@@ -54,18 +54,18 @@
 					$url_query['c'] = 'configure';
 					$url_query['a'] = 'addQuery';
 				?>
-				<li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('add_query'); ?></a></li>
+				<li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('index.menu.add_query'); ?></a></li>
 			</ul>
 		</div>
 	</div>
 
 	<?php
 		$get = FreshRSS_Context::currentGet();
-		$string_mark = _t('mark_all_read');
+		$string_mark = _t('index.menu.mark_all_read');
 		if ($get[0] == 'f') {
-			$string_mark = _t('mark_feed_read');
+			$string_mark = _t('index.menu.mark_feed_read');
 		} elseif ($get[0] == 'c') {
-			$string_mark = _t('mark_cat_read');
+			$string_mark = _t('index.menu.mark_cat_read');
 		}
 
 		$mark_read_url = array(
@@ -86,7 +86,7 @@
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
 		        formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
-		        type="submit"><?php echo _t('mark_read'); ?></button>
+		        type="submit"><?php echo _t('index.menu.mark_read'); ?></button>
 
 		<div class="dropdown">
 			<div id="dropdown-read" class="dropdown-target"></div>
@@ -113,13 +113,13 @@
 					<button class="as-link <?php echo $confirm; ?>"
 					        form="mark-read-menu"
 					        formaction="<?php echo Minz_Url::display($mark_before_today); ?>"
-					        type="submit"><?php echo _t('before_one_day'); ?></button>
+					        type="submit"><?php echo _t('index.menu.before_one_day'); ?></button>
 				</li>
 				<li class="item">
 					<button class="as-link <?php echo $confirm; ?>"
 					        form="mark-read-menu"
 					        formaction="<?php echo Minz_Url::display($mark_before_one_week); ?>"
-					        type="submit"><?php echo _t('before_one_week'); ?></button>
+					        type="submit"><?php echo _t('index.menu.before_one_week'); ?></button>
 				</li>
 			</ul>
 		</div>
@@ -129,17 +129,17 @@
 	<?php $url_output = Minz_Request::currentRequest(); ?>
 	<div class="stick" id="nav_menu_views">
 		<?php $url_output['a'] = 'normal'; ?>
-		<a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('index.menu.normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-normal"); ?>
 		</a>
 
 		<?php $url_output['a'] = 'global'; ?>
-		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('index.menu.global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-global"); ?>
 		</a>
 
 		<?php $url_output['a'] = 'reader'; ?>
-		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('index.menu.reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-reader"); ?>
 		</a>
 
@@ -149,7 +149,7 @@
 				$url_output['params']['token'] = FreshRSS_Context::$conf->token;
 			}
 		?>
-		<a class="view_rss btn" target="_blank" title="<?php echo _t('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_rss btn" target="_blank" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
 		</a>
 	</div>
@@ -157,7 +157,7 @@
 	<div class="item search">
 		<form action="<?php echo _url('index', 'index'); ?>" method="get">
 			<?php $search = Minz_Request::param('search', ''); ?>
-			<input type="search" name="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search_short'); ?>" />
+			<input type="search" name="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
 
 			<?php $get = Minz_Request::param('get', ''); ?>
 			<?php if($get != '') { ?>
@@ -180,11 +180,11 @@
 		if (FreshRSS_Context::$order === 'DESC') {
 			$order = 'ASC';
 			$icon = 'up';
-			$title = 'older_first';
+			$title = 'index.menu.older_first';
 		} else {
 			$order = 'DESC';
 			$icon = 'down';
-			$title = 'newer_first';
+			$title = 'index.menu.newer_first';
 		}
 		$url_order = Minz_Request::currentRequest();
 		$url_order['params']['order'] = $order;
@@ -194,6 +194,6 @@
 	</a>
 	
 	<?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymousRefresh()) { ?>
-	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>"><?php echo _i('refresh'); ?></a>
+	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('index.menu.actualize'); ?>"><?php echo _i('refresh'); ?></a>
 	<?php } ?>
 </div>

From aa54f437950eb05d719d10b8be4e0f2648951845 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 22:57:43 +0100
Subject: [PATCH 218/363] Verbose for unvalid key format

---
 lib/Minz/Translate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index 084bd7e07..e7efb8665 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -51,7 +51,7 @@ class Minz_Translate {
 		$group = explode('.', $key);
 
 		if (count($group) < 2) {
-			// Minz_Log::debug($key . ' is not in a valid format');
+			Minz_Log::debug($key . ' is not in a valid format');
 			$top_level = 'gen';
 		} else {
 			$top_level = array_shift($group);

From 8a40a726575947c074216ad9084275e0195f9c30 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 23:16:12 +0100
Subject: [PATCH 219/363] Fix i18n for logs, pagination and javascript vars

Logs first to avoid annoying message when refreshing log page
---
 app/Controllers/indexController.php     |  2 +-
 app/i18n/en/gen.php                     | 26 +++++++++++++------------
 app/i18n/en/index.php                   |  6 ++++++
 app/i18n/fr/gen.php                     | 26 +++++++++++++------------
 app/i18n/fr/index.php                   |  6 ++++++
 app/views/helpers/javascript_vars.phtml |  8 ++++----
 app/views/helpers/logs_pagination.phtml |  8 ++++----
 app/views/index/logs.phtml              |  8 ++++----
 8 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 1cf618f7f..eff47ed58 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -217,7 +217,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
-		Minz_View::prependTitle(_t('logs') . ' · ');
+		Minz_View::prependTitle(_t('index.logs.title') . ' · ');
 
 		if (Minz_Request::isPost()) {
 			FreshRSS_LogDAO::truncate();
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index eadc80360..28659cccb 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -2,6 +2,7 @@
 
 return array(
 	'action' => array(
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',
 		'disable' => 'Disable',
 		'enable' => 'Enable',
 		'manage' => 'Manage',
@@ -11,6 +12,13 @@ return array(
 		'login' => 'Login',
 		'logout' => 'Logout',
 	),
+	'js' => array(
+		'category_empty' => 'Empty category',
+		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
+		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+		'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+		'notif_title_new_articles' => 'FreshRSS: new articles!',
+	),
 	'menu' => array(
 		'about' => 'About',
 		'admin' => 'Administration',
@@ -29,6 +37,12 @@ return array(
 		'user_management' => 'Manage users',
 		'user_profile' => 'Profile',
 	),
+	'pagination' => array(
+		'first' => 'First',
+		'last' => 'Last',
+		'next' => 'Next',
+		'previous' => 'Previous',
+	),
 	'title' => array(
 		'_' => 'Title',
 		'authentication' => 'Authentication',
@@ -96,7 +110,6 @@ return array(
 	'auto_remove_article' => 'Hide articles after reading',
 	'auto_share' => 'Share',
 	'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-	'back_to_rss_feeds' => '← Go back to your RSS feeds',
 	'bad_opml_file' => 'Your OPML file is invalid',
 	'base_url' => 'Base URL',
 	'bdd' => 'Database',
@@ -125,7 +138,6 @@ return array(
 	'category_created' => 'Category %s has been created.',
 	'category_deleted' => 'Category has been deleted.',
 	'category_emptied' => 'Category has been emptied',
-	'category_empty' => 'Empty category',
 	'category_name_exists' => 'Category name already exists.',
 	'category_no_id' => 'You must precise the id of the category.',
 	'category_no_name' => 'Category name cannot be empty.',
@@ -136,11 +148,8 @@ return array(
 	'change_value' => 'You should change this value by any other',
 	'checks' => 'Checks',
 	'choose_language' => 'Choose a language for FreshRSS',
-	'clear_logs' => 'Clear the logs',
 	'collapse_article' => 'Collapse',
 	'configuration_updated' => 'Configuration has been updated',
-	'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
-	'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
 	'congratulations' => 'Congratulations!',
 	'content_width' => 'Content width',
 	'create' => 'Create',
@@ -204,7 +213,6 @@ return array(
 	'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
 	'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
 	'finish_installation' => 'Complete installation',
-	'first' => 'First',
 	'first_article' => 'Skip to the first article',
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
 	'focus_search' => 'Access search box',
@@ -252,7 +260,6 @@ return array(
 	'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 	'language' => 'Language',
 	'language_defined' => 'Language has been defined.',
-	'last' => 'Last',
 	'last_3_month' => 'Last three months',
 	'last_6_month' => 'Last six months',
 	'last_article' => 'Skip to the last article',
@@ -267,7 +274,6 @@ return array(
 	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
-	'logs_empty' => 'Log file is empty',
 	'mar' => 'mar',
 	'march' => 'Mar',
 	'mark_cat_read' => 'Mark category as read',
@@ -283,7 +289,6 @@ return array(
 	'n_feeds_actualized' => '%d feeds have been updated',
 	'new_article' => 'There are new available articles, click to refresh the page.',
 	'new_category' => 'New category',
-	'next' => 'Next',
 	'next_article' => 'Skip to the next article',
 	'next_page' => 'Skip to the next page',
 	'next_step' => 'Go to the next step',
@@ -301,8 +306,6 @@ return array(
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
 	'nothing_to_load' => 'There are no more articles',
-	'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
-	'notif_title_new_articles' => 'FreshRSS: new articles!',
 	'nov' => 'nov',
 	'november' => 'Nov',
 	'number_articles' => '%d articles',
@@ -329,7 +332,6 @@ return array(
 	'php_is_nok' => 'Your PHP version is %s but FreshRSS requires at least version %s',
 	'php_is_ok' => 'Your PHP version is %s, which is compatible with FreshRSS',
 	'prefix' => 'Table prefix',
-	'previous' => 'Previous',
 	'previous_article' => 'Skip to the previous article',
 	'previous_page' => 'Skip to the previous page',
 	'print' => 'Print',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 5e05657d1..97df646c4 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -1,6 +1,12 @@
 <?php
 
 return array(
+	'logs' => array(
+		'_' => 'Logs',
+		'clear' => 'Clear the logs',
+		'empty' => 'Log file is empty',
+		'title' => 'Logs',
+	),
 	'menu' => array(
 		'about' => 'About FreshRSS',
 		'actualize' => 'Actualize',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index d22e51f2d..3d3878eb1 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -2,6 +2,7 @@
 
 return array(
 	'action' => array(
+		'back_to_rss_feeds' => '← Retour à vos flux RSS',
 		'disable' => 'Désactiver',
 		'enable' => 'Activer',
 		'manage' => 'Gérer',
@@ -11,6 +12,13 @@ return array(
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
 	),
+	'js' => array(
+		'category_empty' => 'Catégorie vide',
+		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
+		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
+		'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+		'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
+	),
 	'menu' => array(
 		'about' => 'À propos',
 		'admin' => 'Administration',
@@ -29,6 +37,12 @@ return array(
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
 	),
+	'pagination' => array(
+		'first' => 'Début',
+		'last' => 'Fin',
+		'next' => 'Suivant',
+		'previous' => 'Précédent',
+	),
 	'title' => array(
 		'_' => 'Titre',
 		'authentication' => 'Authentification',
@@ -96,7 +110,6 @@ return array(
 	'auto_remove_article' => 'Cacher les articles après lecture',
 	'auto_share' => 'Partager',
 	'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-	'back_to_rss_feeds' => '← Retour à vos flux RSS',
 	'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
 	'base_url' => 'Base de l’URL',
 	'bdd' => 'Base de données',
@@ -125,7 +138,6 @@ return array(
 	'category_created' => 'La catégorie %s a été créée.',
 	'category_deleted' => 'La catégorie a été supprimée.',
 	'category_emptied' => 'La catégorie a été vidée.',
-	'category_empty' => 'Catégorie vide',
 	'category_name_exists' => 'Une catégorie possède déjà ce nom.',
 	'category_no_id' => 'Vous devez préciser l’id de la catégorie.',
 	'category_no_name' => 'Vous devez préciser un nom pour la catégorie.',
@@ -136,11 +148,8 @@ return array(
 	'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
 	'checks' => 'Vérifications',
 	'choose_language' => 'Choisissez la langue pour FreshRSS',
-	'clear_logs' => 'Effacer les logs',
 	'collapse_article' => 'Refermer',
 	'configuration_updated' => 'La configuration a été mise à jour.',
-	'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
-	'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
 	'congratulations' => 'Félicitations !',
 	'content_width' => 'Largeur du contenu',
 	'create' => 'Créer',
@@ -204,7 +213,6 @@ return array(
 	'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
 	'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
 	'finish_installation' => 'Terminer l’installation',
-	'first' => 'Début',
 	'first_article' => 'Passer au premier article',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
 	'focus_search' => 'Accéder à la recherche',
@@ -252,7 +260,6 @@ return array(
 	'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
 	'language' => 'Langue',
 	'language_defined' => 'La langue a bien été définie.',
-	'last' => 'Fin',
 	'last_3_month' => 'Depuis les trois derniers mois',
 	'last_6_month' => 'Depuis les six derniers mois',
 	'last_article' => 'Passer au dernier article',
@@ -267,7 +274,6 @@ return array(
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
-	'logs_empty' => 'Les logs sont vides.',
 	'mar' => 'mar.',
 	'march' => 'mars',
 	'mark_cat_read' => 'Marquer la catégorie comme lue',
@@ -283,7 +289,6 @@ return array(
 	'n_feeds_actualized' => '%d flux ont été mis à jour.',
 	'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 	'new_category' => 'Nouvelle catégorie',
-	'next' => 'Suivant',
 	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
 	'next_step' => 'Passer à l’étape suivante',
@@ -301,8 +306,6 @@ return array(
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
 	'nothing_to_load' => 'Fin des articles',
-	'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
-	'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
 	'nov' => 'nov.',
 	'november' => 'novembre',
 	'number_articles' => '%d articles',
@@ -329,7 +332,6 @@ return array(
 	'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
 	'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
 	'prefix' => 'Préfixe des tables',
-	'previous' => 'Précédent',
 	'previous_article' => 'Passer à l’article précédent',
 	'previous_page' => 'Passer à la page précédente',
 	'print' => 'Imprimer',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 3fea1b879..4b8c85033 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -1,6 +1,12 @@
 <?php
 
 return array(
+	'logs' => array(
+		'_' => 'Logs',
+		'clear' => 'Effacer les logs',
+		'empty' => 'Les logs sont vides.',
+		'title' => 'Logs',
+	),
 	'menu' => array(
 		'about' => 'À propos de FreshRSS',
 		'actualize' => 'Actualiser',
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 0961ac3fe..6577e0109 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -59,10 +59,10 @@ echo 'url={',
 "},\n";
 
 echo 'i18n={',
-	'confirmation_default:"', _t('confirm_action'), '",',
-	'notif_title_articles:"', _t('notif_title_new_articles'), '",',
-	'notif_body_articles:"', _t('notif_body_new_articles'), '",',
-	'category_empty:"', _t('category_empty'), '"',
+	'confirmation_default:"', _t('gen.js.confirm_action'), '",',
+	'notif_title_articles:"', _t('gen.js.notif_title_new_articles'), '",',
+	'notif_body_articles:"', _t('gen.js.notif_body_new_articles'), '",',
+	'category_empty:"', _t('gen.js.category_empty'), '"',
 "},\n";
 
 echo 'icons={',
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
index ad46279c7..58b3c68f4 100755
--- a/app/views/helpers/logs_pagination.phtml
+++ b/app/views/helpers/logs_pagination.phtml
@@ -9,14 +9,14 @@
 	<?php $params[$getteur] = 1; ?>
 	<li class="item pager-first">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('first'); ?></a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('gen.pagination.first'); ?></a>
 		<?php } ?>
 	</li>
 
 	<?php $params[$getteur] = $this->currentPage - 1; ?>
 	<li class="item pager-previous">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('previous'); ?></a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('gen.pagination.previous'); ?></a>
 		<?php } ?>
 	</li>
 
@@ -34,13 +34,13 @@
 	<?php $params[$getteur] = $this->currentPage + 1; ?>
 	<li class="item pager-next">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('next'); ?> ›</a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('gen.pagination.next'); ?> ›</a>
 		<?php } ?>
 	</li>
 	<?php $params[$getteur] = $this->nbPage; ?>
 	<li class="item pager-last">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('last'); ?> »</a>
+		<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('gen.pagination.last'); ?> »</a>
 		<?php } ?>
 	</li>
 </ul>
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 101692daf..0262325f5 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -1,10 +1,10 @@
 <div class="post content">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('logs'); ?></h1>
+	<h1><?php echo _t('index.logs'); ?></h1>
 	<form method="post" action="<?php echo _url('index', 'logs'); ?>"><p>
 		<input type="hidden" name="clearLogs" />
-		<button type="submit" class="btn"><?php echo _t('clear_logs'); ?></button>
+		<button type="submit" class="btn"><?php echo _t('index.logs.clear'); ?></button>
 	</p></form>
 
 	<?php $items = $this->logsPaginator->items(); ?>
@@ -20,6 +20,6 @@
 		<?php $this->logsPaginator->render('logs_pagination.phtml','page'); ?>
 	</div>
 	<?php } else { ?>
-	<p class="alert alert-warn"><?php echo _t('logs_empty'); ?></p>
+	<p class="alert alert-warn"><?php echo _t('index.logs.empty'); ?></p>
 	<?php } ?>
 </div>

From d455837c6d6e3ad3d64d06f40c947c93fc4e2086 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 00:00:15 +0100
Subject: [PATCH 220/363] Fix i18n for normal view

---
 app/Controllers/indexController.php |  2 +-
 app/Models/Context.php              |  4 +-
 app/i18n/en/gen.php                 | 62 ++++++++++++-----------------
 app/i18n/en/index.php               | 25 +++++++++++-
 app/i18n/fr/gen.php                 | 62 ++++++++++++-----------------
 app/i18n/fr/index.php               | 25 +++++++++++-
 app/layout/header.phtml             |  2 +-
 app/views/helpers/pagination.phtml  |  8 ++--
 app/views/index/logs.phtml          |  6 +--
 app/views/index/normal.phtml        | 16 ++++----
 lib/lib_rss.php                     |  8 ++--
 11 files changed, 121 insertions(+), 99 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index eff47ed58..2759ab289 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -217,7 +217,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
-		Minz_View::prependTitle(_t('index.logs.title') . ' · ');
+		Minz_View::prependTitle(_t('index.log.title') . ' · ');
 
 		if (Minz_Request::isPost()) {
 			FreshRSS_LogDAO::truncate();
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 3dc5349ad..c8a65063a 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -138,12 +138,12 @@ class FreshRSS_Context {
 		switch($type) {
 		case 'a':
 			self::$current_get['all'] = true;
-			self::$name = _t('your_rss_feeds');
+			self::$name = _t('index.feed.title');
 			self::$get_unread = self::$total_unread;
 			break;
 		case 's':
 			self::$current_get['starred'] = true;
-			self::$name = _t('your_favorites');
+			self::$name = _t('index.feed.title_fav');
 			self::$get_unread = self::$total_starred['unread'];
 
 			// Update state if favorite is not yet enabled.
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 28659cccb..a9045c299 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -12,10 +12,30 @@ return array(
 		'login' => 'Login',
 		'logout' => 'Logout',
 	),
+	'date' => array(
+		'Apr' => '\\A\\p\\r\\i\\l',
+		'Aug' => '\\A\\u\\g\\u\\s\\t',
+		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
+		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+		'Jul' => '\\J\\u\\l\\y',
+		'Jun' => '\\J\\u\\n\\e',
+		'Mar' => '\\M\\a\\r\\c\\h',
+		'May' => '\\M\\a\\y',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'before_yesterday' => 'Before yesterday',
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'today' => 'Today',
+		'yesterday' => 'Yesterday',
+	),
 	'js' => array(
 		'category_empty' => 'Empty category',
 		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
 		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+		'new_article' => 'There are new available articles, click to refresh the page.',
 		'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS: new articles!',
 	),
@@ -30,6 +50,7 @@ return array(
 		'logs' => 'Logs',
 		'queries' => 'User queries',
 		'reading' => 'Reading',
+		'search' => 'Search words or #tags',
 		'sharing' => 'Sharing',
 		'shortcuts' => 'Shortcuts',
 		'stats' => 'Statistics',
@@ -40,7 +61,10 @@ return array(
 	'pagination' => array(
 		'first' => 'First',
 		'last' => 'Last',
+		'load_more' => 'Load more articles',
+		'mark_all_read' => 'Mark all as read',
 		'next' => 'Next',
+		'nothing_to_load' => 'There are no more articles',
 		'previous' => 'Previous',
 	),
 	'title' => array(
@@ -51,18 +75,7 @@ return array(
 		'user_management' => 'Manage users',
 		'user_profile' => 'Profile',
 	),
-	'Apr' => '\\A\\p\\r\\i\\l',
-	'Aug' => '\\A\\u\\g\\u\\s\\t',
-	'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
-	'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
-	'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
-	'Jul' => '\\J\\u\\l\\y',
-	'Jun' => '\\J\\u\\n\\e',
-	'Mar' => '\\M\\a\\r\\c\\h',
-	'May' => '\\M\\a\\y',
-	'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
-	'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
-	'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+	'freshrss' => 'FreshRSS',
 	'access_denied' => 'You don’t have permission to access this page',
 	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
 	'activate_sharing' => 'Activate sharing',
@@ -117,13 +130,10 @@ return array(
 	'bdd_conf_is_ok' => 'Database configuration has been saved.',
 	'bdd_configuration' => 'Database configuration',
 	'bdd_type' => 'Type of database',
-	'before_yesterday' => 'Before yesterday',
 	'blank_to_disable' => 'Leave blank to disable',
-	'blogotext' => 'Blogotext',
 	'bottom_line' => 'Bottom line',
 	'bugs_reports' => 'Bugs reports',
 	'by' => 'by',
-	'by_author' => 'By <em>%s</em>',
 	'by_default' => 'By default',
 	'by_email' => 'By email',
 	'by_feed' => 'by feed',
@@ -171,14 +181,12 @@ return array(
 	'default_view' => 'Default view',
 	'delete' => 'Delete',
 	'delete_articles_every' => 'Remove articles after',
-	'diaspora' => 'Diaspora*',
 	'display_articles_unfolded' => 'Show articles unfolded by default',
 	'display_categories_unfolded' => 'Show categories folded by default',
 	'display_configuration' => 'Display',
 	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
 	'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
 	'dom_is_ok' => 'You have the required library to browse the DOM',
-	'email' => 'Email',
 	'error_occurred' => 'An error occurred',
 	'error_occurred_update' => 'Nothing was changed',
 	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
@@ -186,7 +194,6 @@ return array(
 	'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
 	'export_opml' => 'Export list of feeds (OPML)',
 	'export_starred' => 'Export your favourites',
-	'facebook' => 'Facebook',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feb' => 'feb',
 	'february' => 'Feb',
@@ -216,13 +223,9 @@ return array(
 	'first_article' => 'Skip to the first article',
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
 	'focus_search' => 'Access search box',
-	'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
-	'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
-	'freshrss' => 'FreshRSS',
 	'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'Fri',
-	'g+' => 'Google+',
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -268,7 +271,6 @@ return array(
 	'last_year' => 'Last year',
 	'lead_developer' => 'Lead developer',
 	'license' => 'License',
-	'load_more' => 'Load more articles',
 	'log_is_ok' => 'Permissions on logs directory are good',
 	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
@@ -287,7 +289,6 @@ return array(
 	'more_information' => 'More information',
 	'n_entries_deleted' => '%d articles have been deleted',
 	'n_feeds_actualized' => '%d feeds have been updated',
-	'new_article' => 'There are new available articles, click to refresh the page.',
 	'new_category' => 'New category',
 	'next_article' => 'Skip to the next article',
 	'next_page' => 'Skip to the next page',
@@ -305,7 +306,6 @@ return array(
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
-	'nothing_to_load' => 'There are no more articles',
 	'nov' => 'nov',
 	'november' => 'Nov',
 	'number_articles' => '%d articles',
@@ -334,7 +334,6 @@ return array(
 	'prefix' => 'Table prefix',
 	'previous_article' => 'Skip to the previous article',
 	'previous_page' => 'Skip to the previous page',
-	'print' => 'Print',
 	'project_website' => 'Project website',
 	'public' => 'Public',
 	'publication_date' => 'Date of publication',
@@ -370,21 +369,16 @@ return array(
 	'random_string' => 'Random string',
 	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
 	'refresh' => 'Refresh',
-	'related_tags' => 'Related tags',
 	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
 	'rss_feed_management' => 'RSS feeds management',
 	'rss_feeds_of' => 'RSS feed of %s',
 	'sat' => 'Sat',
 	'save' => 'Save',
 	'scroll' => 'while scrolling',
-	'search' => 'Search words or #tags',
-	'search_short' => 'Search',
 	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
 	'see_on_website' => 'See on original website',
 	'sep' => 'sep',
 	'september' => 'Sep',
-	'shaarli' => 'Shaarli',
-	'share' => 'Share',
 	'share_name' => 'Share name to display',
 	'share_url' => 'Share URL to use',
 	'sharing_management' => 'Sharing options management',
@@ -422,12 +416,10 @@ return array(
 	'think_to_add' => 'You may add some feeds.',
 	'this_is_the_end' => 'This is the end',
 	'thu' => 'Thu',
-	'today' => 'Today',
 	'top_line' => 'Top line',
 	'truncate' => 'Delete all articles',
 	'ttl' => 'Do not automatically refresh more often than',
 	'tue' => 'Tue',
-	'twitter' => 'Twitter',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
 	'update_can_apply' => 'An update is available.',
@@ -452,7 +444,6 @@ return array(
 	'users_list' => 'List of users',
 	'version' => 'Version',
 	'version_update' => 'Update',
-	'wallabag' => 'wallabag',
 	'website' => 'Website',
 	'website_url' => 'Website URL',
 	'wed' => 'Wed',
@@ -461,10 +452,7 @@ return array(
 	'width_no_limit' => 'No limit',
 	'width_thin' => 'Thin',
 	'yes' => 'Yes',
-	'yesterday' => 'Yesterday',
 	'your_diaspora_pod' => 'Your Diaspora* pod',
-	'your_favorites' => 'Your favourites',
-	'your_rss_feeds' => 'Your RSS feeds',
 	'your_shaarli' => 'Your Shaarli',
 	'your_wallabag' => 'Your wallabag',
 	'zip_error' => 'An error occured during Zip import.',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 97df646c4..723feefd7 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -1,7 +1,14 @@
 <?php
 
 return array(
-	'logs' => array(
+	'entry' => array(
+		'by_author' => 'By <em>%s</em>',
+	),
+	'feed' => array(
+		'title' => 'Your RSS feeds',
+		'title_fav' => 'Your favourites',
+	),
+	'log' => array(
 		'_' => 'Logs',
 		'clear' => 'Clear the logs',
 		'empty' => 'Log file is empty',
@@ -28,10 +35,26 @@ return array(
 		'read' => 'Show only unread',
 		'reader_view' => 'Reading view',
 		'rss_view' => 'RSS feed',
+		'search_short' => 'Search',
 		'see_website' => 'See website',
 		'starred' => 'Show only favorites',
 		'stats' => 'Statistics',
 		'subscription' => 'Subscriptions management',
 		'unread' => 'Show only read',
 	),
+	'share' => array(
+		'_' => 'Share',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'tag' => array(
+		'related' => 'Related tags',
+	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 3d3878eb1..b999b130c 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -12,10 +12,30 @@ return array(
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
 	),
+	'date' => array(
+		'Apr' => '\\a\\v\\r\\i\\l',
+		'Aug' => '\\a\\o\\û\\t',
+		'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
+		'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
+		'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
+		'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
+		'Jun' => '\\j\\u\\i\\n',
+		'Mar' => '\\m\\a\\r\\s',
+		'May' => '\\m\\a\\i',
+		'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
+		'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
+		'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
+		'before_yesterday' => 'À partir d’avant-hier',
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\à H\\:i',
+		'today' => 'Aujourd’hui',
+		'yesterday' => 'Hier',
+	),
 	'js' => array(
 		'category_empty' => 'Catégorie vide',
 		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
 		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
+		'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 		'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
 	),
@@ -30,6 +50,7 @@ return array(
 		'logs' => 'Logs',
 		'queries' => 'Filtres utilisateurs',
 		'reading' => 'Lecture',
+		'search' => 'Rechercher des mots ou des #tags',
 		'sharing' => 'Partage',
 		'shortcuts' => 'Raccourcis',
 		'stats' => 'Statistiques',
@@ -40,7 +61,10 @@ return array(
 	'pagination' => array(
 		'first' => 'Début',
 		'last' => 'Fin',
+		'load_more' => 'Charger plus d’articles',
+		'mark_all_read' => 'Tout marquer comme lu',
 		'next' => 'Suivant',
+		'nothing_to_load' => 'Fin des articles',
 		'previous' => 'Précédent',
 	),
 	'title' => array(
@@ -51,18 +75,7 @@ return array(
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
 	),
-	'Apr' => '\\a\\v\\r\\i\\l',
-	'Aug' => '\\a\\o\\û\\t',
-	'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
-	'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
-	'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
-	'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
-	'Jun' => '\\j\\u\\i\\n',
-	'Mar' => '\\m\\a\\r\\s',
-	'May' => '\\m\\a\\i',
-	'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
-	'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
-	'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
+	'freshrss' => 'FreshRSS',
 	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
 	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
 	'activate_sharing' => 'Activer le partage',
@@ -117,13 +130,10 @@ return array(
 	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
 	'bdd_configuration' => 'Base de données',
 	'bdd_type' => 'Type de base de données',
-	'before_yesterday' => 'À partir d’avant-hier',
 	'blank_to_disable' => 'Laissez vide pour désactiver',
-	'blogotext' => 'Blogotext',
 	'bottom_line' => 'Ligne du bas',
 	'bugs_reports' => 'Rapports de bugs',
 	'by' => 'par',
-	'by_author' => 'Par <em>%s</em>',
 	'by_default' => 'Par défaut',
 	'by_email' => 'Par courriel',
 	'by_feed' => 'par flux',
@@ -171,14 +181,12 @@ return array(
 	'default_view' => 'Vue par défaut',
 	'delete' => 'Supprimer',
 	'delete_articles_every' => 'Supprimer les articles après',
-	'diaspora' => 'Diaspora*',
 	'display' => 'Affichage',
 	'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
 	'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
 	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
 	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
-	'email' => 'Courriel',
 	'error_occurred' => 'Une erreur est survenue !',
 	'error_occurred_update' => 'Rien n’a été modifié !',
 	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
@@ -186,7 +194,6 @@ return array(
 	'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
 	'export_opml' => 'Exporter la liste des flux (OPML)',
 	'export_starred' => 'Exporter les favoris',
-	'facebook' => 'Facebook',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
 	'feb' => 'fév.',
 	'february' => 'février',
@@ -216,13 +223,9 @@ return array(
 	'first_article' => 'Passer au premier article',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
 	'focus_search' => 'Accéder à la recherche',
-	'format_date' => 'j %s Y',
-	'format_date_hour' => 'j %s Y \\à H\\:i',
-	'freshrss' => 'FreshRSS',
 	'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'ven.',
-	'g+' => 'Google+',
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -268,7 +271,6 @@ return array(
 	'last_year' => 'Depuis l’année dernière',
 	'lead_developer' => 'Développeur principal',
 	'license' => 'Licence',
-	'load_more' => 'Charger plus d’articles',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
 	'login_configuration' => 'Identification',
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
@@ -287,7 +289,6 @@ return array(
 	'more_information' => 'Plus d’informations',
 	'n_entries_deleted' => '%d articles ont été supprimés.',
 	'n_feeds_actualized' => '%d flux ont été mis à jour.',
-	'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 	'new_category' => 'Nouvelle catégorie',
 	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
@@ -305,7 +306,6 @@ return array(
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
-	'nothing_to_load' => 'Fin des articles',
 	'nov' => 'nov.',
 	'november' => 'novembre',
 	'number_articles' => '%d articles',
@@ -334,7 +334,6 @@ return array(
 	'prefix' => 'Préfixe des tables',
 	'previous_article' => 'Passer à l’article précédent',
 	'previous_page' => 'Passer à la page précédente',
-	'print' => 'Imprimer',
 	'project_website' => 'Site du projet',
 	'public' => 'Public',
 	'publication_date' => 'Date de publication',
@@ -370,21 +369,16 @@ return array(
 	'random_string' => 'Chaîne aléatoire',
 	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 	'refresh' => 'Actualisation',
-	'related_tags' => 'Tags associés',
 	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
 	'rss_feed_management' => 'Gestion des flux RSS',
 	'rss_feeds_of' => 'Flux RSS de %s',
 	'sat' => 'sam.',
 	'save' => 'Enregistrer',
 	'scroll' => 'au défilement de la page',
-	'search' => 'Rechercher des mots ou des #tags',
-	'search_short' => 'Rechercher',
 	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
 	'see_on_website' => 'Voir sur le site d’origine',
 	'sep' => 'sep.',
 	'september' => 'septembre',
-	'shaarli' => 'Shaarli',
-	'share' => 'Partager',
 	'share_name' => 'Nom du partage à afficher',
 	'share_url' => 'URL du partage à utiliser',
 	'sharing_management' => 'Gestion des options de partage',
@@ -422,12 +416,10 @@ return array(
 	'think_to_add' => 'Vous pouvez ajouter des flux.',
 	'this_is_the_end' => 'This is the end',
 	'thu' => 'jeu.',
-	'today' => 'Aujourd’hui',
 	'top_line' => 'Ligne du haut',
 	'truncate' => 'Supprimer tous les articles',
 	'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
 	'tue' => 'mar.',
-	'twitter' => 'Twitter',
 	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_can_apply' => 'Une mise à jour est disponible.',
@@ -452,7 +444,6 @@ return array(
 	'users_list' => 'Liste des utilisateurs',
 	'version' => 'Version',
 	'version_update' => 'Mise à jour',
-	'wallabag' => 'wallabag',
 	'website' => 'Site Internet',
 	'website_url' => 'URL du site',
 	'wed' => 'mer.',
@@ -461,10 +452,7 @@ return array(
 	'width_no_limit' => 'Pas de limite',
 	'width_thin' => 'Fine',
 	'yes' => 'Oui',
-	'yesterday' => 'Hier',
 	'your_diaspora_pod' => 'Votre pod Diaspora*',
-	'your_favorites' => 'Vos favoris',
-	'your_rss_feeds' => 'Vos flux RSS',
 	'your_shaarli' => 'Votre Shaarli',
 	'your_wallabag' => 'Votre wallabag',
 	'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 4b8c85033..e21cc4410 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -1,7 +1,14 @@
 <?php
 
 return array(
-	'logs' => array(
+	'entry' => array(
+		'by_author' => 'Par <em>%s</em>',
+	),
+	'feed' => array(
+		'title' => 'Vos flux RSS',
+		'title_fav' => 'Vos favoris',
+	),
+	'log' => array(
 		'_' => 'Logs',
 		'clear' => 'Effacer les logs',
 		'empty' => 'Les logs sont vides.',
@@ -28,10 +35,26 @@ return array(
 		'read' => 'Afficher les non lus',
 		'reader_view' => 'Vue lecture',
 		'rss_view' => 'Flux RSS',
+		'search_short' => 'Rechercher',
 		'see_website' => 'Voir le site',
 		'starred' => 'Afficher les favoris',
 		'stats' => 'Statistiques',
 		'subscription' => 'Gestion des abonnements',
 		'unread' => 'Afficher les lus',
 	),
+	'share' => array(
+		'_' => 'Partager',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Courriel',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Imprimer',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'tag' => array(
+		'related' => 'Tags associés',
+	),
 );
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 429cfc1d2..ba13c2a45 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -25,7 +25,7 @@ if (Minz_Configuration::canLogIn()) {
 		<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 _t('gen.search'); ?>" />
+				<input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('gen.menu.search'); ?>" />
 
 				<?php $get = Minz_Request::param('get', ''); ?>
 				<?php if ($get != '') { ?>
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index 3ea6c3582..8b40e4336 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -20,7 +20,7 @@
 	<li class="item pager-next">
 	<?php if (FreshRSS_Context::$next_id) { ?>
 		<a id="load_more" href="<?php echo Minz_Url::display($url_next); ?>">
-			<?php echo _t('load_more'); ?>
+			<?php echo _t('gen.pagination.load_more'); ?>
 		</a>
 	<?php } elseif ($url_mark_read) { ?>
 		<button id="bigMarkAsRead"
@@ -28,13 +28,13 @@
 		        form="mark-read-pagination"
 		        formaction="<?php echo Minz_Url::display($url_mark_read); ?>"
 		        type="submit">
-			<?php echo _t('nothing_to_load'); ?><br />
+			<?php echo _t('gen.pagination.nothing_to_load'); ?><br />
 			<span class="bigTick">✓</span><br />
-			<?php echo _t('mark_all_read'); ?>
+			<?php echo _t('gen.pagination.mark_all_read'); ?>
 		</button>
 	<?php } else { ?>
 		<a id="bigMarkAsRead" href=".">
-			<?php echo _t('nothing_to_load'); ?><br />
+			<?php echo _t('gen.pagination.nothing_to_load'); ?><br />
 		</a>
 	<?php } ?>
 	</li>
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 0262325f5..02256bd98 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -1,10 +1,10 @@
 <div class="post content">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('index.logs'); ?></h1>
+	<h1><?php echo _t('index.log'); ?></h1>
 	<form method="post" action="<?php echo _url('index', 'logs'); ?>"><p>
 		<input type="hidden" name="clearLogs" />
-		<button type="submit" class="btn"><?php echo _t('index.logs.clear'); ?></button>
+		<button type="submit" class="btn"><?php echo _t('index.log.clear'); ?></button>
 	</p></form>
 
 	<?php $items = $this->logsPaginator->items(); ?>
@@ -20,6 +20,6 @@
 		<?php $this->logsPaginator->render('logs_pagination.phtml','page'); ?>
 	</div>
 	<?php } else { ?>
-	<p class="alert alert-warn"><?php echo _t('index.logs.empty'); ?></p>
+	<p class="alert alert-warn"><?php echo _t('index.log.empty'); ?></p>
 	<?php } ?>
 </div>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 02d621bd0..62fb68931 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -32,12 +32,12 @@ if (!empty($this->entries)) {
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
 	?><div id="new-article">
-		<a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('new_article'); ?></a>
+		<a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('gen.js.new_article'); /* TODO: move string in JS*/ ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
 		if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $today)) {
 			?><div class="day" id="day_today"><?php
-				echo _t('today');
+				echo _t('gen.date.today');
 				?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
 				?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
 			?></div><?php
@@ -45,7 +45,7 @@ if (!empty($this->entries)) {
 		}
 		if ($display_yesterday && $item->isDay(FreshRSS_Days::YESTERDAY, $today)) {
 			?><div class="day" id="day_yesterday"><?php
-				echo _t('yesterday');
+				echo _t('gen.date.yesterday');
 				?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
 				?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
 			?></div><?php
@@ -53,7 +53,7 @@ if (!empty($this->entries)) {
 		}
 		if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $today)) {
 			?><div class="day" id="day_before_yesterday"><?php
-				echo _t('before_yesterday');
+				echo _t('gen.date.before_yesterday');
 				?><span class="name"><?php echo FreshRSS_Context::$name; ?></span><?php
 			?></div><?php
 			$display_others = false;
@@ -100,7 +100,7 @@ if (!empty($this->entries)) {
 				<h1 class="title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></h1>
 				<?php
 					$author = $item->author();
-					echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
+					echo $author != '' ? '<div class="author">' . _t('index.entry.by_author', $author) . '</div>' : '',
 						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->content();
 				?>
 			</div>
@@ -135,7 +135,7 @@ if (!empty($this->entries)) {
 						<div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
 						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
 							<?php echo _i('share'); ?>
-							<?php echo _t('share'); ?>
+							<?php echo _t('index.share'); ?>
 						</a>
 
 						<ul class="dropdown-menu">
@@ -143,7 +143,7 @@ if (!empty($this->entries)) {
 							<?php foreach ($sharing as $share) :?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo _t($share['name']);?>
+										<?php echo _t('index.share.' . $share['name']);?>
 									</a>
 								</li>
 							<?php endforeach;?>
@@ -158,7 +158,7 @@ if (!empty($this->entries)) {
 						<div id="dropdown-tags-<?php echo $item->id();?>" class="dropdown-target"></div>
 						<?php echo _i('tag'); ?>
 						<a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id();?>"><?php
-							echo _t('related_tags');
+							echo _t('index.tag.related');
 						?></a>
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li><?php
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8170c7fd9..264c69d58 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -79,11 +79,11 @@ function format_bytes($bytes, $precision = 2, $system = 'IEC') {
 }
 
 function timestamptodate ($t, $hour = true) {
-	$month = _t(date('M', $t));
+	$month = _t('gen.date.' . date('M', $t));
 	if ($hour) {
-		$date = _t('format_date_hour', $month);
+		$date = _t('gen.date.format_date_hour', $month);
 	} else {
-		$date = _t('format_date', $month);
+		$date = _t('gen.date.format_date', $month);
 	}
 
 	return @date ($date, $t);
@@ -110,7 +110,7 @@ function html_only_entity_decode($text) {
 function customSimplePie() {
 	$limits = Minz_Configuration::limits();
 	$simplePie = new SimplePie();
-	$simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
+	$simplePie->set_useragent(_t('gen.freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration($limits['cache_duration']);
 	$simplePie->set_timeout($limits['timeout']);

From 57bffe83eb396580d08633af93d6cd10a443bf09 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 00:25:02 +0100
Subject: [PATCH 221/363] Fix i18n for index Controller

Fix strings for:

- about page
- rss and reader views
- fix title of global view
---
 app/Controllers/indexController.php |  4 ++--
 app/i18n/en/gen.php                 | 15 ---------------
 app/i18n/en/index.php               | 19 +++++++++++++++++++
 app/i18n/fr/gen.php                 | 14 --------------
 app/i18n/fr/index.php               | 19 +++++++++++++++++++
 app/views/index/about.phtml         | 26 +++++++++++++-------------
 app/views/index/normal.phtml        |  4 ++--
 app/views/index/reader.phtml        |  6 +++---
 app/views/index/rss.phtml           |  2 +-
 9 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 2759ab289..33cd2843c 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -98,7 +98,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		$this->view->categories = FreshRSS_Context::$categories;
 
 		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
-		$title = _t('gen.title.global_view');
+		$title = _t('index.feed.title_global');
 		if (FreshRSS_Context::$get_unread > 0) {
 			$title = '(' . FreshRSS_Context::$get_unread . ') ' . $title;
 		}
@@ -206,7 +206,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the about page of FreshRSS.
 	 */
 	public function aboutAction() {
-		Minz_View::prependTitle(_t('about') . ' · ');
+		Minz_View::prependTitle(_t('index.about.title') . ' · ');
 	}
 
 	/**
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index a9045c299..18e63a335 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -71,7 +71,6 @@ return array(
 		'_' => 'Title',
 		'authentication' => 'Authentication',
 		'check_install' => 'Installation checking',
-		'global_view' => 'Global view',
 		'user_management' => 'Manage users',
 		'user_profile' => 'Profile',
 	),
@@ -84,7 +83,6 @@ return array(
 	'administration' => 'Manage',
 	'advanced' => 'Advanced',
 	'after_onread' => 'After “mark all as read”,',
-	'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 	'all_feeds' => 'All feeds',
 	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
 	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
@@ -132,7 +130,6 @@ return array(
 	'bdd_type' => 'Type of database',
 	'blank_to_disable' => 'Leave blank to disable',
 	'bottom_line' => 'Bottom line',
-	'bugs_reports' => 'Bugs reports',
 	'by' => 'by',
 	'by_default' => 'By default',
 	'by_email' => 'By email',
@@ -164,8 +161,6 @@ return array(
 	'content_width' => 'Content width',
 	'create' => 'Create',
 	'create_user' => 'Create new user',
-	'credits' => 'Credits',
-	'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
 	'css_path_on_website' => 'Articles CSS path on original website',
 	'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
 	'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
@@ -223,12 +218,10 @@ return array(
 	'first_article' => 'Skip to the first article',
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
 	'focus_search' => 'Access search box',
-	'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'Fri',
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
-	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
 	'help' => 'Display documentation',
 	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
 	'host' => 'Host',
@@ -269,8 +262,6 @@ return array(
 	'last_month' => 'Last month',
 	'last_week' => 'Last week',
 	'last_year' => 'Last year',
-	'lead_developer' => 'Lead developer',
-	'license' => 'License',
 	'log_is_ok' => 'Permissions on logs directory are good',
 	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
@@ -295,7 +286,6 @@ return array(
 	'next_step' => 'Go to the next step',
 	'no' => 'No',
 	'no_feed_actualized' => 'No RSS feed has been updated',
-	'no_feed_to_display' => 'There is no article to show.',
 	'no_feed_to_refresh' => 'There is no feed to refresh…',
 	'no_query' => 'You haven’t created any user query yet.',
 	'no_query_filter' => 'No filter',
@@ -334,7 +324,6 @@ return array(
 	'prefix' => 'Table prefix',
 	'previous_article' => 'Skip to the previous article',
 	'previous_page' => 'Skip to the previous page',
-	'project_website' => 'Project website',
 	'public' => 'Public',
 	'publication_date' => 'Date of publication',
 	'purge_completed' => 'Purge completed (%d articles deleted)',
@@ -371,7 +360,6 @@ return array(
 	'refresh' => 'Refresh',
 	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
 	'rss_feed_management' => 'RSS feeds management',
-	'rss_feeds_of' => 'RSS feed of %s',
 	'sat' => 'Sat',
 	'save' => 'Save',
 	'scroll' => 'while scrolling',
@@ -413,7 +401,6 @@ return array(
 	'submit' => 'Submit',
 	'sun' => 'Sun',
 	'theme' => 'Theme',
-	'think_to_add' => 'You may add some feeds.',
 	'this_is_the_end' => 'This is the end',
 	'thu' => 'Thu',
 	'top_line' => 'Top line',
@@ -442,9 +429,7 @@ return array(
 	'username_admin' => 'Administrator username',
 	'users' => 'Users',
 	'users_list' => 'List of users',
-	'version' => 'Version',
 	'version_update' => 'Update',
-	'website' => 'Website',
 	'website_url' => 'Website URL',
 	'wed' => 'Wed',
 	'width_large' => 'Large',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 723feefd7..338f589ed 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -1,11 +1,30 @@
 <?php
 
 return array(
+	'about' => array(
+		'_' => 'About',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Bugs reports',
+		'credits' => 'Credits',
+		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
+		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
+		'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
+		'lead_developer' => 'Lead developer',
+		'license' => 'License',
+		'project_website' => 'Project website',
+		'title' => 'About',
+		'version' => 'Version',
+		'website' => 'Website',
+	),
 	'entry' => array(
 		'by_author' => 'By <em>%s</em>',
 	),
 	'feed' => array(
+		'add' => 'You may add some feeds.',
+		'empty' => 'There is no article to show.',
+		'rss_of' => 'RSS feed of %s',
 		'title' => 'Your RSS feeds',
+		'title_global' => 'Global view',
 		'title_fav' => 'Your favourites',
 	),
 	'log' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index b999b130c..e7c1c0d09 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -84,7 +84,6 @@ return array(
 	'administration' => 'Gérer',
 	'advanced' => 'Avancé',
 	'after_onread' => 'Après “marquer tout comme lu”,',
-	'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 	'all_feeds' => 'Tous les flux',
 	'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
 	'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
@@ -132,7 +131,6 @@ return array(
 	'bdd_type' => 'Type de base de données',
 	'blank_to_disable' => 'Laissez vide pour désactiver',
 	'bottom_line' => 'Ligne du bas',
-	'bugs_reports' => 'Rapports de bugs',
 	'by' => 'par',
 	'by_default' => 'Par défaut',
 	'by_email' => 'Par courriel',
@@ -164,8 +162,6 @@ return array(
 	'content_width' => 'Largeur du contenu',
 	'create' => 'Créer',
 	'create_user' => 'Créer un nouvel utilisateur',
-	'credits' => 'Crédits',
-	'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
 	'css_path_on_website' => 'Sélecteur CSS des articles sur le site d’origine',
 	'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
 	'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
@@ -223,12 +219,10 @@ return array(
 	'first_article' => 'Passer au premier article',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
 	'focus_search' => 'Accéder à la recherche',
-	'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'ven.',
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
-	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
 	'help' => 'Afficher la documentation',
 	'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
 	'host' => 'Hôte',
@@ -269,8 +263,6 @@ return array(
 	'last_month' => 'Depuis le mois dernier',
 	'last_week' => 'Depuis la semaine dernière',
 	'last_year' => 'Depuis l’année dernière',
-	'lead_developer' => 'Développeur principal',
-	'license' => 'Licence',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
 	'login_configuration' => 'Identification',
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
@@ -295,7 +287,6 @@ return array(
 	'next_step' => 'Passer à l’étape suivante',
 	'no' => 'Non',
 	'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
-	'no_feed_to_display' => 'Il n’y a aucun article à afficher.',
 	'no_feed_to_refresh' => 'Il n’y a aucun flux à actualiser…',
 	'no_query' => 'Vous n’avez pas encore créé de filtre.',
 	'no_query_filter' => 'Aucun filtre appliqué',
@@ -334,7 +325,6 @@ return array(
 	'prefix' => 'Préfixe des tables',
 	'previous_article' => 'Passer à l’article précédent',
 	'previous_page' => 'Passer à la page précédente',
-	'project_website' => 'Site du projet',
 	'public' => 'Public',
 	'publication_date' => 'Date de publication',
 	'purge_completed' => 'Purge effectuée (%d articles supprimés).',
@@ -371,7 +361,6 @@ return array(
 	'refresh' => 'Actualisation',
 	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
 	'rss_feed_management' => 'Gestion des flux RSS',
-	'rss_feeds_of' => 'Flux RSS de %s',
 	'sat' => 'sam.',
 	'save' => 'Enregistrer',
 	'scroll' => 'au défilement de la page',
@@ -413,7 +402,6 @@ return array(
 	'submit' => 'Valider',
 	'sun' => 'dim.',
 	'theme' => 'Thème',
-	'think_to_add' => 'Vous pouvez ajouter des flux.',
 	'this_is_the_end' => 'This is the end',
 	'thu' => 'jeu.',
 	'top_line' => 'Ligne du haut',
@@ -442,9 +430,7 @@ return array(
 	'username_admin' => 'Nom d’utilisateur administrateur',
 	'users' => 'Utilisateurs',
 	'users_list' => 'Liste des utilisateurs',
-	'version' => 'Version',
 	'version_update' => 'Mise à jour',
-	'website' => 'Site Internet',
 	'website_url' => 'URL du site',
 	'wed' => 'mer.',
 	'width_large' => 'Large',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index e21cc4410..bcc95a72f 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -1,11 +1,30 @@
 <?php
 
 return array(
+	'about' => array(
+		'_' => 'À propos',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Rapports de bugs',
+		'credits' => 'Crédits',
+		'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
+		'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
+		'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
+		'lead_developer' => 'Développeur principal',
+		'license' => 'Licence',
+		'project_website' => 'Site du projet',
+		'title' => 'À propos',
+		'version' => 'Version',
+		'website' => 'Site Internet',
+	),
 	'entry' => array(
 		'by_author' => 'Par <em>%s</em>',
 	),
 	'feed' => array(
+		'add' => 'Vous pouvez ajouter des flux.',
+		'empty' => 'Il n’y a aucun article à afficher.',
+		'rss_of' => 'Flux RSS de %s',
 		'title' => 'Vos flux RSS',
+		'title_global' => 'Vue globale',
 		'title_fav' => 'Vos favoris',
 	),
 	'log' => array(
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index 407d13ae9..ff2c538a2 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -1,27 +1,27 @@
 <div class="post content">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('about_freshrss'); ?></h1>
+	<h1><?php echo _t('index.about'); ?></h1>
 
 	<dl class="infos">
-		<dt><?php echo _t('project_website'); ?></dt>
+		<dt><?php echo _t('index.about.project_website'); ?></dt>
 		<dd><a href="<?php echo FRESHRSS_WEBSITE; ?>"><?php echo FRESHRSS_WEBSITE; ?></a></dd>
 
-		<dt><?php echo _t('lead_developer'); ?></dt>
-		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo _t('website'); ?></a></dd>
+		<dt><?php echo _t('index.about.lead_developer'); ?></dt>
+		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo _t('index.about.website'); ?></a></dd>
 
-		<dt><?php echo _t('bugs_reports'); ?></dt>
-		<dd><?php echo _t('github_or_email'); ?></dd>
+		<dt><?php echo _t('index.about.bugs_reports'); ?></dt>
+		<dd><?php echo _t('index.about.github_or_email'); ?></dd>
 
-		<dt><?php echo _t('license'); ?></dt>
-		<dd><?php echo _t('agpl3'); ?></dd>
+		<dt><?php echo _t('index.about.license'); ?></dt>
+		<dd><?php echo _t('index.about.agpl3'); ?></dd>
 
-		<dt><?php echo _t('version'); ?></dt>
+		<dt><?php echo _t('index.about.version'); ?></dt>
 		<dd><?php echo FRESHRSS_VERSION; ?></dd>
 	</dl>
 
-	<p><?php echo _t('freshrss_description'); ?></p>
+	<p><?php echo _t('index.about.freshrss_description'); ?></p>
 
-	<h1><?php echo _t('credits'); ?></h1>
-	<p><?php echo _t('credits_content'); ?></p>
+	<h1><?php echo _t('index.about.credits'); ?></h1>
+	<p><?php echo _t('index.about.credits_content'); ?></p>
 </div>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 62fb68931..e2963a9cc 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -187,7 +187,7 @@ if (!empty($this->entries)) {
 
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn normal">
-	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<h2><?php echo _t('index.feed.empty'); ?></h2>
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.feed.add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index f07868488..d87550f77 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -23,7 +23,7 @@ if (!empty($this->entries)) {
 
 				<div class="author"><?php
 					$author = $item->author();
-					echo $author != '' ? _t('by_author', $author) . ' — ' : '',
+					echo $author != '' ? _t('index.entry.by_author', $author) . ' — ' : '',
 						$item->date();
 				?></div>
 
@@ -38,7 +38,7 @@ if (!empty($this->entries)) {
 
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn reader">
-	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<h2><?php echo _t('index.feed.empty'); ?></h2>
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.feed.add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/index/rss.phtml b/app/views/index/rss.phtml
index e34b15ab1..86074517c 100755
--- a/app/views/index/rss.phtml
+++ b/app/views/index/rss.phtml
@@ -3,7 +3,7 @@
 	<channel>
 		<title><?php echo $this->rss_title; ?></title>
 		<link><?php echo Minz_Url::display(null, 'html', true); ?></link>
-		<description><?php echo _t('rss_feeds_of', $this->rss_title); ?></description>
+		<description><?php echo _t('index.feed.rss_of', $this->rss_title); ?></description>
 		<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
 		<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
 		<atom:link href="<?php echo Minz_Url::display($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />

From f43b2737065c0fdb2759839d0179ac6730c1bd54 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 16:10:39 +0100
Subject: [PATCH 222/363] Update i18n for statistics

---
 app/Controllers/statsController.php |  2 +-
 app/Models/StatsDAO.php             |  2 +-
 app/i18n/en/admin.php               | 27 +++++++++
 app/i18n/en/gen.php                 | 88 ++++++++++++----------------
 app/i18n/fr/admin.php               | 27 +++++++++
 app/i18n/fr/gen.php                 | 89 ++++++++++++-----------------
 app/layout/aside_stats.phtml        |  6 +-
 app/views/stats/idle.phtml          | 16 +++---
 app/views/stats/index.phtml         | 34 +++++------
 app/views/stats/repartition.phtml   | 22 +++----
 10 files changed, 167 insertions(+), 146 deletions(-)

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 578df9434..4a597ae7d 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -15,7 +15,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
-		Minz_View::prependTitle(_t('stats') . ' · ');
+		Minz_View::prependTitle(_t('admin.stats.title') . ' · ');
 	}
 
 	/**
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 255a2b1ff..80caccc49 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -418,7 +418,7 @@ SQL;
 	 */
 	private function convertToTranslatedJson($data = array()) {
 		$translated = array_map(function($a) {
-			return _t($a);
+			return _t('gen.date.' . $a);
 		}, $data);
 
 		return json_encode($translated);
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index cf8d8bd00..3ac36a914 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -87,9 +87,36 @@ return array(
 		),
 	),
 	'stats' => array(
+		'_' => 'Statistics',
+		'all_feeds' => 'All feeds',
+		'category' => 'Category',
+		'entry_count' => 'Entry count',
+		'entry_per_category' => 'Entries per category',
+		'entry_per_day' => 'Entries per day (last 30 days)',
+		'entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
+		'entry_per_hour' => 'Per hour (average: %.2f messages)',
+		'entry_per_month' => 'Per month (average: %.2f messages)',
+		'entry_repartition' => 'Entries repartition',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds per category',
 		'idle' => 'Idle feeds',
 		'main' => 'Main statistics',
+		'main_stream' => 'Main stream',
+		'menu' => array(
+			'idle' => 'Idle feeds',
+			'main' => 'Main statistics',
+			'repartition' => 'Articles repartition',
+		),
+		'no_idle' => 'There is no idle feed!',
+		'number_articles' => '%d articles',
+		'percent_of_total' => '%% of total',
 		'repartition' => 'Articles repartition',
+		'status_favorites' => 'Favourites',
+		'status_read' => 'Read',
+		'status_total' => 'Total',
+		'status_unread' => 'Unread',
+		'title' => 'Statistics',
+		'top_feed' => 'Top ten feeds',
 	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 18e63a335..17fef12c7 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -5,6 +5,7 @@ return array(
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',
 		'disable' => 'Disable',
 		'enable' => 'Enable',
+		'filter' => 'Filtrer',
 		'manage' => 'Manage',
 		'remove' => 'Remove',
 	),
@@ -25,10 +26,45 @@ return array(
 		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'apr' => 'apr',
+		'april' => 'Apr',
+		'aug' => 'aug',
+		'august' => 'Aug',
 		'before_yesterday' => 'Before yesterday',
+		'dec' => 'dec',
+		'december' => 'Dec',
+		'feb' => 'feb',
+		'february' => 'Feb',
 		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
 		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'fri' => 'Fri',
+		'jan' => 'jan',
+		'january' => 'Jan',
+		'jul' => 'jul',
+		'july' => 'Jul',
+		'jun' => 'jun',
+		'june' => 'Jun',
+		'last_3_month' => 'Last three months',
+		'last_6_month' => 'Last six months',
+		'last_month' => 'Last month',
+		'last_week' => 'Last week',
+		'last_year' => 'Last year',
+		'mar' => 'mar',
+		'march' => 'Mar',
+		'may' => 'May',
+		'mon' => 'Mon',
+		'nov' => 'nov',
+		'november' => 'Nov',
+		'oct' => 'oct',
+		'october' => 'Oct',
+		'sat' => 'Sat',
+		'sep' => 'sep',
+		'september' => 'Sep',
+		'sun' => 'Sun',
+		'thu' => 'Thu',
 		'today' => 'Today',
+		'tue' => 'Tue',
+		'wed' => 'Wed',
 		'yesterday' => 'Yesterday',
 	),
 	'js' => array(
@@ -83,13 +119,10 @@ return array(
 	'administration' => 'Manage',
 	'advanced' => 'Advanced',
 	'after_onread' => 'After “mark all as read”,',
-	'all_feeds' => 'All feeds',
 	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
 	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
 	'already_subscribed' => 'You have already subscribed to <em>%s</em>',
 	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
-	'apr' => 'apr',
-	'april' => 'Apr',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
 	'article' => 'Article',
 	'article_icons' => 'Article icons',
@@ -102,8 +135,6 @@ return array(
 	'articles_to_display' => 'Articles to display',
 	'ask_empty' => 'Clear?',
 	'attention' => 'Attention!',
-	'aug' => 'aug',
-	'august' => 'Aug',
 	'auth_form' => 'Web form (traditional, requires JavaScript)',
 	'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
 	'auth_form_set' => 'Form is now your default authentication system.',
@@ -169,8 +200,6 @@ return array(
 	'current_user' => 'Current user',
 	'damn' => 'Damn!',
 	'data_is_ok' => 'Permissions on data directory are good',
-	'dec' => 'dec',
-	'december' => 'Dec',
 	'default_category' => 'Uncategorized',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'default_view' => 'Default view',
@@ -190,8 +219,6 @@ return array(
 	'export_opml' => 'Export list of feeds (OPML)',
 	'export_starred' => 'Export your favourites',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
-	'feb' => 'feb',
-	'february' => 'Feb',
 	'feed' => 'Feed',
 	'feed_actualized' => '<em>%s</em> has been updated',
 	'feed_added' => 'RSS feed <em>%s</em> has been added',
@@ -219,7 +246,6 @@ return array(
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
 	'focus_search' => 'Access search box',
 	'freshrss_installation' => 'Installation · FreshRSS',
-	'fri' => 'Fri',
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
 	'help' => 'Display documentation',
@@ -242,40 +268,25 @@ return array(
 	'invalid_login' => 'Login is invalid',
 	'invalid_url' => 'URL <em>%s</em> is invalid',
 	'is_admin' => 'is administrator',
-	'jan' => 'jan',
-	'january' => 'Jan',
 	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'javascript_should_be_activated' => 'JavaScript must be enabled',
-	'jul' => 'jul',
-	'july' => 'Jul',
 	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'jun' => 'jun',
-	'june' => 'Jun',
 	'keep_history' => 'Minimum number of articles to keep',
 	'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 	'language' => 'Language',
 	'language_defined' => 'Language has been defined.',
-	'last_3_month' => 'Last three months',
-	'last_6_month' => 'Last six months',
 	'last_article' => 'Skip to the last article',
-	'last_month' => 'Last month',
-	'last_week' => 'Last week',
-	'last_year' => 'Last year',
 	'log_is_ok' => 'Permissions on logs directory are good',
 	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
-	'mar' => 'mar',
-	'march' => 'Mar',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
-	'may' => 'May',
 	'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
 	'minz_is_ok' => 'You have the Minz framework',
-	'mon' => 'Mon',
 	'month' => 'months',
 	'more_information' => 'More information',
 	'n_entries_deleted' => '%d articles have been deleted',
@@ -296,13 +307,8 @@ return array(
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
-	'nov' => 'nov',
-	'november' => 'Nov',
-	'number_articles' => '%d articles',
 	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
 	'number_feeds' => '%d feeds',
-	'oct' => 'oct',
-	'october' => 'Oct',
 	'ok' => 'Ok!',
 	'oops' => 'Oops!',
 	'optimization_complete' => 'Optimization complete',
@@ -360,13 +366,10 @@ return array(
 	'refresh' => 'Refresh',
 	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
 	'rss_feed_management' => 'RSS feeds management',
-	'sat' => 'Sat',
 	'save' => 'Save',
 	'scroll' => 'while scrolling',
 	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
 	'see_on_website' => 'See on original website',
-	'sep' => 'sep',
-	'september' => 'Sep',
 	'share_name' => 'Share name to display',
 	'share_url' => 'Share URL to use',
 	'sharing_management' => 'Sharing options management',
@@ -381,32 +384,14 @@ return array(
 	'show_in_all_flux' => 'Show in main stream',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
-	'stats_entry_count' => 'Entry count',
-	'stats_entry_per_category' => 'Entries per category',
-	'stats_entry_per_day' => 'Entries per day (last 30 days)',
-	'stats_entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
-	'stats_entry_per_hour' => 'Per hour (average: %.2f messages)',
-	'stats_entry_per_month' => 'Per month (average: %.2f messages)',
-	'stats_entry_repartition' => 'Entries repartition',
-	'stats_feed_per_category' => 'Feeds per category',
-	'stats_no_idle' => 'There is no idle feed!',
-	'stats_percent_of_total' => '%% of total',
-	'stats_top_feed' => 'Top ten feeds',
-	'status_favorites' => 'Favourites',
-	'status_read' => 'Read',
-	'status_total' => 'Total',
-	'status_unread' => 'Unread',
 	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
 	'submit' => 'Submit',
-	'sun' => 'Sun',
 	'theme' => 'Theme',
 	'this_is_the_end' => 'This is the end',
-	'thu' => 'Thu',
 	'top_line' => 'Top line',
 	'truncate' => 'Delete all articles',
 	'ttl' => 'Do not automatically refresh more often than',
-	'tue' => 'Tue',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
 	'update_can_apply' => 'An update is available.',
@@ -431,7 +416,6 @@ return array(
 	'users_list' => 'List of users',
 	'version_update' => 'Update',
 	'website_url' => 'Website URL',
-	'wed' => 'Wed',
 	'width_large' => 'Large',
 	'width_medium' => 'Medium',
 	'width_no_limit' => 'No limit',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 3d7201439..1e9eb03af 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -87,9 +87,36 @@ return array(
 		),
 	),
 	'stats' => array(
+		'_' => 'Statistiques',
+		'all_feeds' => 'Tous les flux',
+		'category' => 'Catégorie',
+		'entry_count' => 'Nombre d’articles',
+		'entry_per_category' => 'Articles par catégorie',
+		'entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
+		'entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
+		'entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
+		'entry_per_month' => 'Par mois (moyenne : %.2f messages)',
+		'entry_repartition' => 'Répartition des articles',
+		'feed' => 'Flux',
+		'feed_per_category' => 'Flux par catégorie',
 		'idle' => 'Flux inactifs',
 		'main' => 'Statistiques principales',
+		'main_stream' => 'Flux principal',
+		'menu' => array(
+			'idle' => 'Flux inactifs',
+			'main' => 'Statistiques principales',
+			'repartition' => 'Répartition des articles',
+		),
+		'no_idle' => 'Il n’y a aucun flux inactif !',
+		'number_articles' => '%d articles',
+		'percent_of_total' => '%% du total',
 		'repartition' => 'Répartition des articles',
+		'status_favorites' => 'favoris',
+		'status_read' => 'lus',
+		'status_total' => 'total',
+		'status_unread' => 'non lus',
+		'title' => 'Statistiques',
+		'top_feed' => 'Les dix plus gros flux',
 	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index e7c1c0d09..af595c20b 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -5,6 +5,7 @@ return array(
 		'back_to_rss_feeds' => '← Retour à vos flux RSS',
 		'disable' => 'Désactiver',
 		'enable' => 'Activer',
+		'filter' => 'Filtrer',
 		'manage' => 'Gérer',
 		'remove' => 'Supprimer',
 	),
@@ -25,10 +26,45 @@ return array(
 		'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
 		'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
 		'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
+		'apr' => 'avr.',
+		'april' => 'avril',
+		'aug' => 'août',
+		'august' => 'août',
 		'before_yesterday' => 'À partir d’avant-hier',
+		'dec' => 'déc.',
+		'december' => 'décembre',
+		'feb' => 'fév.',
+		'february' => 'février',
+		'fri' => 'ven.',
+		'jan' => 'jan.',
+		'january' => 'janvier',
+		'jul' => 'jui.',
+		'july' => 'juillet',
+		'jun' => 'juin',
+		'june' => 'juin',
 		'format_date' => 'j %s Y',
 		'format_date_hour' => 'j %s Y \\à H\\:i',
+		'last_3_month' => 'Depuis les trois derniers mois',
+		'last_6_month' => 'Depuis les six derniers mois',
+		'last_month' => 'Depuis le mois dernier',
+		'last_week' => 'Depuis la semaine dernière',
+		'last_year' => 'Depuis l’année dernière',
+		'mar' => 'mar.',
+		'march' => 'mars',
+		'may' => 'mai.',
+		'mon' => 'lun.',
+		'nov' => 'nov.',
+		'november' => 'novembre',
+		'oct' => 'oct.',
+		'october' => 'octobre',
+		'sat' => 'sam.',
+		'sep' => 'sep.',
+		'september' => 'septembre',
+		'sun' => 'dim.',
+		'thu' => 'jeu.',
 		'today' => 'Aujourd’hui',
+		'tue' => 'mar.',
+		'wed' => 'mer.',
 		'yesterday' => 'Hier',
 	),
 	'js' => array(
@@ -71,7 +107,6 @@ return array(
 		'_' => 'Titre',
 		'authentication' => 'Authentification',
 		'check_install' => 'Vérification de l’installation',
-		'global_view' => 'Vue globale',
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
 	),
@@ -84,13 +119,10 @@ return array(
 	'administration' => 'Gérer',
 	'advanced' => 'Avancé',
 	'after_onread' => 'Après “marquer tout comme lu”,',
-	'all_feeds' => 'Tous les flux',
 	'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
 	'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
 	'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
 	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-	'apr' => 'avr.',
-	'april' => 'avril',
 	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 	'article' => 'Article',
 	'article_icons' => 'Icônes d’article',
@@ -103,8 +135,6 @@ return array(
 	'articles_to_display' => 'Articles à afficher',
 	'ask_empty' => 'Vider ?',
 	'attention' => 'Attention !',
-	'aug' => 'août',
-	'august' => 'août',
 	'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
 	'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
 	'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
@@ -170,8 +200,6 @@ return array(
 	'current_user' => 'Utilisateur actuel',
 	'damn' => 'Arf !',
 	'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
-	'dec' => 'déc.',
-	'december' => 'décembre',
 	'default_category' => 'Sans catégorie',
 	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
 	'default_view' => 'Vue par défaut',
@@ -191,8 +219,6 @@ return array(
 	'export_opml' => 'Exporter la liste des flux (OPML)',
 	'export_starred' => 'Exporter les favoris',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
-	'feb' => 'fév.',
-	'february' => 'février',
 	'feed' => 'Flux',
 	'feed_actualized' => '<em>%s</em> a été mis à jour.',
 	'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
@@ -220,7 +246,6 @@ return array(
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
 	'focus_search' => 'Accéder à la recherche',
 	'freshrss_installation' => 'Installation · FreshRSS',
-	'fri' => 'ven.',
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
 	'help' => 'Afficher la documentation',
@@ -243,40 +268,25 @@ return array(
 	'invalid_login' => 'L’identifiant est invalide !',
 	'invalid_url' => 'L’url <em>%s</em> est invalide.',
 	'is_admin' => 'est administrateur',
-	'jan' => 'jan.',
-	'january' => 'janvier',
 	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
 	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
 	'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
-	'jul' => 'jui.',
-	'july' => 'juillet',
 	'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-	'jun' => 'juin',
-	'june' => 'juin',
 	'keep_history' => 'Nombre minimum d’articles à conserver',
 	'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
 	'language' => 'Langue',
 	'language_defined' => 'La langue a bien été définie.',
-	'last_3_month' => 'Depuis les trois derniers mois',
-	'last_6_month' => 'Depuis les six derniers mois',
 	'last_article' => 'Passer au dernier article',
-	'last_month' => 'Depuis le mois dernier',
-	'last_week' => 'Depuis la semaine dernière',
-	'last_year' => 'Depuis l’année dernière',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
 	'login_configuration' => 'Identification',
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
-	'mar' => 'mar.',
-	'march' => 'mars',
 	'mark_cat_read' => 'Marquer la catégorie comme lue',
 	'mark_favorite' => 'Mettre en favori',
 	'mark_feed_read' => 'Marquer le flux comme lu',
-	'may' => 'mai.',
 	'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
 	'minz_is_ok' => 'Vous disposez du framework Minz',
-	'mon' => 'lun.',
 	'month' => 'mois',
 	'more_information' => 'Plus d’informations',
 	'n_entries_deleted' => '%d articles ont été supprimés.',
@@ -297,13 +307,8 @@ return array(
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
-	'nov' => 'nov.',
-	'november' => 'novembre',
-	'number_articles' => '%d articles',
 	'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
 	'number_feeds' => '%d flux',
-	'oct' => 'oct.',
-	'october' => 'octobre',
 	'ok' => 'Ok !',
 	'oops' => 'Oups !',
 	'optimization_complete' => 'Optimisation terminée.',
@@ -361,13 +366,10 @@ return array(
 	'refresh' => 'Actualisation',
 	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
 	'rss_feed_management' => 'Gestion des flux RSS',
-	'sat' => 'sam.',
 	'save' => 'Enregistrer',
 	'scroll' => 'au défilement de la page',
 	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
 	'see_on_website' => 'Voir sur le site d’origine',
-	'sep' => 'sep.',
-	'september' => 'septembre',
 	'share_name' => 'Nom du partage à afficher',
 	'share_url' => 'URL du partage à utiliser',
 	'sharing_management' => 'Gestion des options de partage',
@@ -382,32 +384,14 @@ return array(
 	'show_in_all_flux' => 'Afficher dans le flux principal',
 	'sort_order' => 'Ordre de tri',
 	'starred_list' => 'Liste des articles favoris',
-	'stats_entry_count' => 'Nombre d’articles',
-	'stats_entry_per_category' => 'Articles par catégorie',
-	'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
-	'stats_entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
-	'stats_entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
-	'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
-	'stats_entry_repartition' => 'Répartition des articles',
-	'stats_feed_per_category' => 'Flux par catégorie',
-	'stats_no_idle' => 'Il n’y a aucun flux inactif !',
-	'stats_percent_of_total' => '%% du total',
-	'stats_top_feed' => 'Les dix plus gros flux',
-	'status_favorites' => 'favoris',
-	'status_read' => 'lus',
-	'status_total' => 'total',
-	'status_unread' => 'non lus',
 	'steps' => 'Étapes',
 	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 	'submit' => 'Valider',
-	'sun' => 'dim.',
 	'theme' => 'Thème',
 	'this_is_the_end' => 'This is the end',
-	'thu' => 'jeu.',
 	'top_line' => 'Ligne du haut',
 	'truncate' => 'Supprimer tous les articles',
 	'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
-	'tue' => 'mar.',
 	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_can_apply' => 'Une mise à jour est disponible.',
@@ -432,7 +416,6 @@ return array(
 	'users_list' => 'Liste des utilisateurs',
 	'version_update' => 'Mise à jour',
 	'website_url' => 'URL du site',
-	'wed' => 'mer.',
 	'width_large' => 'Large',
 	'width_medium' => 'Moyenne',
 	'width_no_limit' => 'Pas de limite',
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
index 559087df1..4bdaf7165 100644
--- a/app/layout/aside_stats.phtml
+++ b/app/layout/aside_stats.phtml
@@ -1,12 +1,12 @@
 <ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo _t('admin.stats'); ?></li>
 	<li class="item<?php echo Minz_Request::actionName() == 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('admin.stats.main'); ?></a>
+		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('admin.stats.menu.main'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() == 'idle' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('admin.stats.idle'); ?></a>
+		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('admin.stats.menu.idle'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() == 'repartition' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('admin.stats.repartition'); ?></a>
+		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('admin.stats.menu.repartition'); ?></a>
 	</li>
 </ul>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 75cba1081..bfee4366c 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -1,9 +1,9 @@
 <?php $this->partial('aside_stats'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('stats_idle'); ?></h1>
+	<h1><?php echo _t('admin.stats.idle'); ?></h1>
 
 	<?php
 		$current_url = urlencode(Minz_Url::display(
@@ -16,7 +16,7 @@
 				$nothing = false;
 	?>
 		<div class="stat">
-			<h2><?php echo _t($period); ?></h2>
+			<h2><?php echo _t('gen.date.' . $period); ?></h2>
 
 			<form id="form-delete" method="post" style="display: none"></form>
 
@@ -24,13 +24,13 @@
 			<ul class="horizontal-list">
 				<li class="item">
 					<div class="stick">
-						<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
-						<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
-						<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id'], 'r', $current_url); ?>"><?php echo _t('delete'); ?></button>
+						<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('gen.action.filter'); ?></a>
+						<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?></a>
+						<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id'], 'r', $current_url); ?>"><?php echo _t('gen.action.remove'); ?></button>
 					</div>
 				</li>
 				<li class="item">
-					<span title="<?php echo timestamptodate($feed['last_date'], false); ?>"><?php echo $feed['name']; ?> (<?php echo _t('number_articles', $feed['nb_articles']); ?>)</span>
+					<span title="<?php echo timestamptodate($feed['last_date'], false); ?>"><?php echo $feed['name']; ?> (<?php echo _t('admin.stats.number_articles', $feed['nb_articles']); ?>)</span>
 				</li>
 			</ul>
 			<?php } ?>
@@ -42,7 +42,7 @@
 		if ($nothing) {
 	?>
 	<p class="alert alert-warn">
-		<span class="alert-head"><?php echo _t('stats_no_idle'); ?></span>
+		<span class="alert-head"><?php echo _t('admin.stats.no_idle'); ?></span>
 	</p>
 	<?php } ?>
 </div>
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 1300cb2c7..c13c5d26c 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -1,38 +1,38 @@
 <?php $this->partial('aside_stats'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('stats_main'); ?></h1>
+	<h1><?php echo _t('admin.stats.main'); ?></h1>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_entry_repartition'); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_repartition'); ?></h2>
 		<table>
 			<thead>
 				<tr>
 					<th> </th>
-					<th><?php echo _t('main_stream'); ?></th>
-					<th><?php echo _t('all_feeds'); ?></th>
+					<th><?php echo _t('admin.stats.main_stream'); ?></th>
+					<th><?php echo _t('admin.stats.all_feeds'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr>
-					<th><?php echo _t('status_total'); ?></th>
+					<th><?php echo _t('admin.stats.status_total'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['total']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['total']); ?></td>
 				</tr>
 				<tr>
-					<th><?php echo _t('status_read'); ?></th>
+					<th><?php echo _t('admin.stats.status_read'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['read']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['read']); ?></td>
 				</tr>
 				<tr>
-					<th><?php echo _t('status_unread'); ?></th>
+					<th><?php echo _t('admin.stats.status_unread'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['unread']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['unread']); ?></td>
 				</tr>
 				<tr>
-					<th><?php echo _t('status_favorites'); ?></th>
+					<th><?php echo _t('admin.stats.status_favorites'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['favorite']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['favorite']); ?></td>
 				</tr>
@@ -41,14 +41,14 @@
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_top_feed'); ?></h2>
+		<h2><?php echo _t('admin.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>
-					<th><?php echo _t('stats_percent_of_total'); ?></th>
+					<th><?php echo _t('admin.stats.feed'); ?></th>
+					<th><?php echo _t('admin.stats.category'); ?></th>
+					<th><?php echo _t('admin.stats.entry_count'); ?></th>
+					<th><?php echo _t('admin.stats.percent_of_total'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -65,18 +65,18 @@
 	</div>
 
 	<div class="stat">
-		<h2><?php echo _t('stats_entry_per_day'); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_day'); ?></h2>
 		<div id="statsEntryPerDay" style="height: 300px"></div>
 	</div>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_feed_per_category'); ?></h2>
+		<h2><?php echo _t('admin.stats.feed_per_category'); ?></h2>
 		<div id="statsFeedPerCategory" style="height: 300px"></div>
 		<div id="statsFeedPerCategoryLegend"></div>
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_entry_per_category'); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_category'); ?></h2>
 		<div id="statsEntryPerCategory" style="height: 300px"></div>
 		<div id="statsEntryPerCategoryLegend"></div>
 	</div>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 4ea71cfb5..b20d9bbd0 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -1,12 +1,12 @@
 <?php $this->partial('aside_stats'); ?>
 
 <div class="post ">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('stats_repartition'); ?></h1>
+	<h1><?php echo _t('admin.stats.repartition'); ?></h1>
 
 	<select id="feed_select" class="select-change">
-		<option data-url="<?php echo _url('stats', 'repartition')?>"><?php echo _t('all_feeds')?></option>
+		<option data-url="<?php echo _url('stats', 'repartition')?>"><?php echo _t('admin.stats.all_feeds')?></option>
 	<?php foreach ($this->categories as $category) {
 		$feeds = $category->feeds();
 		if (!empty($feeds)) {
@@ -25,17 +25,17 @@
 
 	<?php if ($this->feed) {?>
 		<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $this->feed->id()); ?>">
-			<?php echo _i('configure'); ?> <?php echo _t('administration'); ?>
+			<?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?>
 		</a>
 	<?php }?>
 
 	<div class="stat">
 	    <table>
 		<tr>
-		    <th><?php echo _t('status_total'); ?></th>
-		    <th><?php echo _t('status_read'); ?></th>
-		    <th><?php echo _t('status_unread'); ?></th>
-		    <th><?php echo _t('status_favorites'); ?></th>
+		    <th><?php echo _t('admin.stats.status_total'); ?></th>
+		    <th><?php echo _t('admin.stats.status_read'); ?></th>
+		    <th><?php echo _t('admin.stats.status_unread'); ?></th>
+		    <th><?php echo _t('admin.stats.status_favorites'); ?></th>
 		</tr>
 		<tr>
 		    <td class="numeric"><?php echo $this->repartition['total']; ?></td>
@@ -47,17 +47,17 @@
 	</div>
 
 	<div class="stat">
-		<h2><?php echo _t('stats_entry_per_hour', $this->averageHour); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_hour', $this->averageHour); ?></h2>
 		<div id="statsEntryPerHour" style="height: 300px"></div>
 	</div>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
 		<div id="statsEntryPerDayOfWeek" style="height: 300px"></div>
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_entry_per_month', $this->averageMonth); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_month', $this->averageMonth); ?></h2>
 		<div id="statsEntryPerMonth" style="height: 300px"></div>
 	</div>
 </div>

From cad4259e627a016a44e48395b242f973c1e4d502 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 17:26:01 +0100
Subject: [PATCH 223/363] Fix i18n for subscription pages

---
 app/Controllers/subscriptionController.php |  8 +--
 app/i18n/en/admin.php                      |  2 +-
 app/i18n/en/feedback.php                   |  4 ++
 app/i18n/en/gen.php                        | 62 +++++-------------
 app/i18n/en/index.php                      |  5 --
 app/i18n/en/sub.php                        | 38 ++++++++++-
 app/i18n/fr/admin.php                      |  2 +-
 app/i18n/fr/feedback.php                   |  6 +-
 app/i18n/fr/gen.php                        | 62 +++++-------------
 app/i18n/fr/index.php                      |  5 --
 app/i18n/fr/sub.php                        | 38 ++++++++++-
 app/layout/aside_feed.phtml                | 10 +--
 app/layout/nav_menu.phtml                  |  4 +-
 app/views/helpers/feed/update.phtml        | 76 +++++++++++-----------
 app/views/stats/idle.phtml                 |  2 +-
 app/views/subscription/index.phtml         | 38 +++++------
 16 files changed, 188 insertions(+), 174 deletions(-)

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 67b95eba6..1ed2b6bbf 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -29,7 +29,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 	public function indexAction() {
 		Minz_View::appendScript(Minz_Url::display('/scripts/category.js?' .
 		                        @filemtime(PUBLIC_PATH . '/scripts/category.js')));
-		Minz_View::prependTitle(_t('subscription_management') . ' · ');
+		Minz_View::prependTitle(_t('sub.title') . ' · ');
 
 		$id = Minz_Request::param('id');
 		if ($id !== false) {
@@ -74,7 +74,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 
 		$this->view->feed = $this->view->feeds[$id];
 
-		Minz_View::prependTitle(_t('rss_feed_management') . ' · ' . $this->view->feed->name() . ' · ');
+		Minz_View::prependTitle(_t('sub.title.feed_management') . ' · ' . $this->view->feed->name() . ' · ');
 
 		if (Minz_Request::isPost()) {
 			$user = Minz_Request::param('http_user', '');
@@ -106,9 +106,9 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 				$this->view->feed->_category($cat);
 				$this->view->feed->faviconPrepare();
 
-				Minz_Request::good(_t('feed_updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
+				Minz_Request::good(_t('feedback.sub.feed_updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
 			} else {
-				Minz_Request::bad(_t('error_occurred_update'), array('c' => 'subscription'));
+				Minz_Request::bad(_t('feedback.sub.error_occurred'), array('c' => 'subscription'));
 			}
 		}
 	}
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 3ac36a914..2dac57d91 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -108,7 +108,7 @@ return array(
 			'repartition' => 'Articles repartition',
 		),
 		'no_idle' => 'There is no idle feed!',
-		'number_articles' => '%d articles',
+		'number_entries' => '%d articles',
 		'percent_of_total' => '%% of total',
 		'repartition' => 'Articles repartition',
 		'status_favorites' => 'Favourites',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index b3866f1dc..2eae1d839 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -8,6 +8,10 @@ return array(
 	'logout' => array(
 		'success' => 'You are disconnected',
 	),
+	'sub' => array(
+		'error_occurred' => 'Feed cannot be updated',
+		'feed_updated' => 'Feed has been updated',
+	),
 	'user_profile' => array(
 		'updated' => 'Your profile has been modified',
 	),
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 17fef12c7..a3c409c31 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -2,12 +2,19 @@
 
 return array(
 	'action' => array(
+		'actualize' => 'Actualize',
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',
+		'cancel' => 'Cancel',
 		'disable' => 'Disable',
+		'empty' => 'Empty',
 		'enable' => 'Enable',
 		'filter' => 'Filtrer',
 		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
 		'remove' => 'Remove',
+		'see_website' => 'See website',
+		'submit' => 'Submit',
+		'truncate' => 'Delete all articles',
 	),
 	'auth' => array(
 		'login' => 'Login',
@@ -103,8 +110,18 @@ return array(
 		'nothing_to_load' => 'There are no more articles',
 		'previous' => 'Previous',
 	),
+	'short' => array(
+		'attention' => 'Attention!',
+		'blank_to_disable' => 'Leave blank to disable',
+		'by_default' => 'By default',
+		'damn' => 'Damn!',
+		'no' => 'No',
+		'ok' => 'Ok!',
+		'oops' => 'Oops!',
+		'or' => 'or',
+		'yes' => 'Yes',
+	),
 	'title' => array(
-		'_' => 'Title',
 		'authentication' => 'Authentication',
 		'check_install' => 'Installation checking',
 		'user_management' => 'Manage users',
@@ -112,12 +129,7 @@ return array(
 	),
 	'freshrss' => 'FreshRSS',
 	'access_denied' => 'You don’t have permission to access this page',
-	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
 	'activate_sharing' => 'Activate sharing',
-	'add_category' => 'Add a category',
-	'add_rss_feed' => 'Add a RSS feed',
-	'administration' => 'Manage',
-	'advanced' => 'Advanced',
 	'after_onread' => 'After “mark all as read”,',
 	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
 	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
@@ -133,8 +145,6 @@ return array(
 	'articles' => 'articles',
 	'articles_per_page' => 'Number of articles per page',
 	'articles_to_display' => 'Articles to display',
-	'ask_empty' => 'Clear?',
-	'attention' => 'Attention!',
 	'auth_form' => 'Web form (traditional, requires JavaScript)',
 	'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
 	'auth_form_set' => 'Form is now your default authentication system.',
@@ -159,20 +169,16 @@ return array(
 	'bdd_conf_is_ok' => 'Database configuration has been saved.',
 	'bdd_configuration' => 'Database configuration',
 	'bdd_type' => 'Type of database',
-	'blank_to_disable' => 'Leave blank to disable',
 	'bottom_line' => 'Bottom line',
 	'by' => 'by',
-	'by_default' => 'By default',
 	'by_email' => 'By email',
 	'by_feed' => 'by feed',
 	'cache_is_ok' => 'Permissions on cache directory are good',
 	'can_not_be_deleted' => 'Cannot be deleted',
-	'cancel' => 'Cancel',
 	'categories' => 'Categories',
 	'categories_management' => 'Categories management',
 	'categories_updated' => 'Categories have been updated',
 	'categorize' => 'Store in a category',
-	'category' => 'Category',
 	'category_created' => 'Category %s has been created.',
 	'category_deleted' => 'Category has been deleted.',
 	'category_emptied' => 'Category has been emptied',
@@ -192,18 +198,15 @@ return array(
 	'content_width' => 'Content width',
 	'create' => 'Create',
 	'create_user' => 'Create new user',
-	'css_path_on_website' => 'Articles CSS path on original website',
 	'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
 	'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
 	'curl_is_nok' => 'You lack cURL (php5-curl package)',
 	'curl_is_ok' => 'You have version %s of cURL',
 	'current_user' => 'Current user',
-	'damn' => 'Damn!',
 	'data_is_ok' => 'Permissions on data directory are good',
 	'default_category' => 'Uncategorized',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'default_view' => 'Default view',
-	'delete' => 'Delete',
 	'delete_articles_every' => 'Remove articles after',
 	'display_articles_unfolded' => 'Show articles unfolded by default',
 	'display_categories_unfolded' => 'Show categories folded by default',
@@ -212,7 +215,6 @@ return array(
 	'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
 	'dom_is_ok' => 'You have the required library to browse the DOM',
 	'error_occurred' => 'An error occurred',
-	'error_occurred_update' => 'Nothing was changed',
 	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'export' => 'Export',
 	'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
@@ -223,20 +225,13 @@ return array(
 	'feed_actualized' => '<em>%s</em> has been updated',
 	'feed_added' => 'RSS feed <em>%s</em> has been added',
 	'feed_deleted' => 'Feed has been deleted',
-	'feed_description' => 'Description',
-	'feed_empty' => 'This feed is empty. Please verify that it is still maintained.',
-	'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
 	'feed_list' => 'List of %s articles',
 	'feed_not_added' => '<em>%s</em> could not be added',
-	'feed_updated' => 'Feed has been updated',
-	'feed_url' => 'Feed URL',
-	'feed_validator' => 'Check the validity of the feed',
 	'feeds' => 'Feeds',
 	'feeds_actualized' => 'RSS feeds have been updated',
 	'feeds_imported' => 'Your feeds have been imported and will now be updated',
 	'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
 	'feeds_marked_read' => 'Feeds have been marked as read',
-	'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
 	'file_cannot_be_uploaded' => 'File cannot be uploaded!',
 	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
@@ -253,14 +248,10 @@ return array(
 	'host' => 'Host',
 	'html5_notif_timeout' => 'HTML5 notification timeout',
 	'http_auth' => 'HTTP (for advanced users with HTTPS)',
-	'http_authentication' => 'HTTP Authentication',
-	'http_password' => 'HTTP password',
 	'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
 	'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
-	'http_username' => 'HTTP username',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
 	'import' => 'Import',
-	'informations' => 'Information',
 	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
 	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
 	'installation_step' => 'Installation — step %d · FreshRSS',
@@ -272,13 +263,11 @@ return array(
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'javascript_should_be_activated' => 'JavaScript must be enabled',
 	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'keep_history' => 'Minimum number of articles to keep',
 	'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 	'language' => 'Language',
 	'language_defined' => 'Language has been defined.',
 	'last_article' => 'Skip to the last article',
 	'log_is_ok' => 'Permissions on logs directory are good',
-	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
@@ -291,11 +280,9 @@ return array(
 	'more_information' => 'More information',
 	'n_entries_deleted' => '%d articles have been deleted',
 	'n_feeds_actualized' => '%d feeds have been updated',
-	'new_category' => 'New category',
 	'next_article' => 'Skip to the next article',
 	'next_page' => 'Skip to the next page',
 	'next_step' => 'Go to the next step',
-	'no' => 'No',
 	'no_feed_actualized' => 'No RSS feed has been updated',
 	'no_feed_to_refresh' => 'There is no feed to refresh…',
 	'no_query' => 'You haven’t created any user query yet.',
@@ -309,12 +296,9 @@ return array(
 	'not_yet_implemented' => 'Not yet implemented',
 	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
 	'number_feeds' => '%d feeds',
-	'ok' => 'Ok!',
-	'oops' => 'Oops!',
 	'optimization_complete' => 'Optimization complete',
 	'optimize_bdd' => 'Optimize database',
 	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-	'or' => 'or',
 	'page_not_found' => 'You are looking for a page which doesn’t exist',
 	'password' => 'Password',
 	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
@@ -363,10 +347,6 @@ return array(
 	'query_state_15' => 'Display all articles',
 	'random_string' => 'Random string',
 	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
-	'refresh' => 'Refresh',
-	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
-	'rss_feed_management' => 'RSS feeds management',
-	'save' => 'Save',
 	'scroll' => 'while scrolling',
 	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
 	'see_on_website' => 'See on original website',
@@ -381,17 +361,13 @@ return array(
 	'shortcuts_updated' => 'Shortcuts have been updated',
 	'show_adaptive' => 'Adjust showing',
 	'show_all_articles' => 'Show all articles',
-	'show_in_all_flux' => 'Show in main stream',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
 	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
-	'submit' => 'Submit',
 	'theme' => 'Theme',
 	'this_is_the_end' => 'This is the end',
 	'top_line' => 'Top line',
-	'truncate' => 'Delete all articles',
-	'ttl' => 'Do not automatically refresh more often than',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
 	'update_can_apply' => 'An update is available.',
@@ -415,12 +391,10 @@ return array(
 	'users' => 'Users',
 	'users_list' => 'List of users',
 	'version_update' => 'Update',
-	'website_url' => 'Website URL',
 	'width_large' => 'Large',
 	'width_medium' => 'Medium',
 	'width_no_limit' => 'No limit',
 	'width_thin' => 'Thin',
-	'yes' => 'Yes',
 	'your_diaspora_pod' => 'Your Diaspora* pod',
 	'your_shaarli' => 'Your Shaarli',
 	'your_wallabag' => 'Your wallabag',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 338f589ed..a1a276feb 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -35,17 +35,13 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'About FreshRSS',
-		'actualize' => 'Actualize',
 		'add_query' => 'Add a query',
 		'before_one_day' => 'Before one day',
 		'before_one_week' => 'Before one week',
 		'favorites' => 'Favourites (%s)',
-		'filter' => 'Filter',
 		'global_view' => 'Global view',
 		'main_stream' => 'Main stream',
-		'manage' => 'Manage',
 		'mark_all_read' => 'Mark all as read',
-		'mark_read' => 'Mark as read',
 		'newer_first' => 'Newer first',
 		'non-starred' => 'Show all but favorites',
 		'normal_view' => 'Normal view',
@@ -55,7 +51,6 @@ return array(
 		'reader_view' => 'Reading view',
 		'rss_view' => 'RSS feed',
 		'search_short' => 'Search',
-		'see_website' => 'See website',
 		'starred' => 'Show only favorites',
 		'stats' => 'Statistics',
 		'subscription' => 'Subscriptions management',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index d915a18a7..b8bc3d33d 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -1,15 +1,49 @@
 <?php
 
 return array(
-	'categories' => array(
+	'category' => array(
+		'_' => 'Category',
+		'add' => 'Add a category',
+		'empty' => 'Empty category',
+		'new' => 'New category',
 		'over_max' => 'You have reached your limit of categories (%d)',
 	),
-	'feeds' => array(
+	'feed' => array(
+		'add' => 'Add a RSS feed',
+		'advanced' => 'Advanced',
+		'archiving' => 'Archivage',
+		'auth' => array(
+			'configuration' => 'Login',
+			'help' => 'Connection allows to access HTTP protected RSS feeds',
+			'http' => 'HTTP Authentication',
+			'password' => 'HTTP password',
+			'username' => 'HTTP username',
+		),
+		'css_help' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
+		'css_path' => 'Articles CSS path on original website',
+		'description' => 'Description',
+		'empty' => 'This feed is empty. Please verify that it is still maintained.',
+		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
+		'in_main_stream' => 'Show in main stream',
+		'informations' => 'Information',
+		'keep_history' => 'Minimum number of articles to keep',
+		'moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
+		'number_entries' => '%d articles',
 		'over_max' => 'You have reached your limit of feeds (%d)',
+		'stats' => 'Statistics',
+		'title' => 'Title',
+		'ttl' => 'Do not automatically refresh more often than',
+		'url' => 'Feed URL',
+		'validator' => 'Check the validity of the feed',
+		'website' => 'Website URL',
 	),
 	'menu' => array(
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
 		'subscription_management' => 'Subscriptions management',
 	),
+	'title' => array(
+		'_' => 'Subscriptions management',
+		'feed_management' => 'RSS feeds management',
+	),
 );
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 1e9eb03af..3132458b9 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -108,7 +108,7 @@ return array(
 			'repartition' => 'Répartition des articles',
 		),
 		'no_idle' => 'Il n’y a aucun flux inactif !',
-		'number_articles' => '%d articles',
+		'number_entries' => '%d articles',
 		'percent_of_total' => '%% du total',
 		'repartition' => 'Répartition des articles',
 		'status_favorites' => 'favoris',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index f4bb7cccf..98d3c3eb2 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -2,12 +2,16 @@
 
 return array(
 	'login' => array(
-		'error' => 'L’identifiant est invalide !',
+		'error' => 'L’identifiant est invalide',
 		'success' => 'Vous êtes désormais connecté',
 	),
 	'logout' => array(
 		'success' => 'Vous avez été déconnecté',
 	),
+	'sub' => array(
+		'error_occurred' => 'Le flux n’a pas pu être modifié',
+		'feed_updated' => 'Le flux a été mis à jour',
+	),
 	'user_profile' => array(
 		'updated' => 'Votre profil a été mis à jour',
 	),
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index af595c20b..9d663680c 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -2,12 +2,19 @@
 
 return array(
 	'action' => array(
+		'actualize' => 'Actualiser',
 		'back_to_rss_feeds' => '← Retour à vos flux RSS',
+		'cancel' => 'Annuler',
 		'disable' => 'Désactiver',
+		'empty' => 'Vider',
 		'enable' => 'Activer',
 		'filter' => 'Filtrer',
 		'manage' => 'Gérer',
+		'mark_read' => 'Marquer comme lu',
 		'remove' => 'Supprimer',
+		'see_website' => 'Voir le site',
+		'truncate' => 'Supprimer tous les articles',
+		'submit' => 'Valider',
 	),
 	'auth' => array(
 		'login' => 'Connexion',
@@ -103,8 +110,18 @@ return array(
 		'nothing_to_load' => 'Fin des articles',
 		'previous' => 'Précédent',
 	),
+	'short' => array(
+		'attention' => 'Attention !',
+		'blank_to_disable' => 'Laissez vide pour désactiver',
+		'by_default' => 'Par défaut',
+		'damn' => 'Arf !',
+		'no' => 'Non',
+		'ok' => 'Ok !',
+		'oops' => 'Oups !',
+		'or' => 'ou',
+		'yes' => 'Oui',
+	),
 	'title' => array(
-		'_' => 'Titre',
 		'authentication' => 'Authentification',
 		'check_install' => 'Vérification de l’installation',
 		'user_management' => 'Gestion des utilisateurs',
@@ -112,12 +129,7 @@ return array(
 	),
 	'freshrss' => 'FreshRSS',
 	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
-	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
 	'activate_sharing' => 'Activer le partage',
-	'add_category' => 'Ajouter une catégorie',
-	'add_rss_feed' => 'Ajouter un flux RSS',
-	'administration' => 'Gérer',
-	'advanced' => 'Avancé',
 	'after_onread' => 'Après “marquer tout comme lu”,',
 	'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
 	'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
@@ -133,8 +145,6 @@ return array(
 	'articles' => 'articles',
 	'articles_per_page' => 'Nombre d’articles par page',
 	'articles_to_display' => 'Articles à afficher',
-	'ask_empty' => 'Vider ?',
-	'attention' => 'Attention !',
 	'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
 	'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
 	'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
@@ -159,20 +169,16 @@ return array(
 	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
 	'bdd_configuration' => 'Base de données',
 	'bdd_type' => 'Type de base de données',
-	'blank_to_disable' => 'Laissez vide pour désactiver',
 	'bottom_line' => 'Ligne du bas',
 	'by' => 'par',
-	'by_default' => 'Par défaut',
 	'by_email' => 'Par courriel',
 	'by_feed' => 'par flux',
 	'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons',
 	'can_not_be_deleted' => 'Ne peut pas être supprimée.',
-	'cancel' => 'Annuler',
 	'categories' => 'Catégories',
 	'categories_management' => 'Gestion des catégories',
 	'categories_updated' => 'Les catégories ont été mises à jour.',
 	'categorize' => 'Ranger dans une catégorie',
-	'category' => 'Catégorie',
 	'category_created' => 'La catégorie %s a été créée.',
 	'category_deleted' => 'La catégorie a été supprimée.',
 	'category_emptied' => 'La catégorie a été vidée.',
@@ -192,18 +198,15 @@ return array(
 	'content_width' => 'Largeur du contenu',
 	'create' => 'Créer',
 	'create_user' => 'Créer un nouvel utilisateur',
-	'css_path_on_website' => 'Sélecteur CSS des articles sur le site d’origine',
 	'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
 	'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
 	'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
 	'curl_is_ok' => 'Vous disposez de cURL dans sa version %s',
 	'current_user' => 'Utilisateur actuel',
-	'damn' => 'Arf !',
 	'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
 	'default_category' => 'Sans catégorie',
 	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
 	'default_view' => 'Vue par défaut',
-	'delete' => 'Supprimer',
 	'delete_articles_every' => 'Supprimer les articles après',
 	'display' => 'Affichage',
 	'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
@@ -212,7 +215,6 @@ return array(
 	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
 	'error_occurred' => 'Une erreur est survenue !',
-	'error_occurred_update' => 'Rien n’a été modifié !',
 	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'export' => 'Exporter',
 	'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
@@ -223,20 +225,13 @@ return array(
 	'feed_actualized' => '<em>%s</em> a été mis à jour.',
 	'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
 	'feed_deleted' => 'Le flux a été supprimé.',
-	'feed_description' => 'Description',
-	'feed_empty' => 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
-	'feed_in_error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
 	'feed_list' => 'Liste des articles de %s',
 	'feed_not_added' => '<em>%s</em> n’a pas pu être ajouté.',
-	'feed_updated' => 'Le flux a été mis à jour.',
-	'feed_url' => 'URL du flux',
-	'feed_validator' => 'Vérifier la valididé du flux',
 	'feeds' => 'Flux',
 	'feeds_actualized' => 'Les flux ont été mis à jour.',
 	'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
 	'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
 	'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
-	'feeds_moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
 	'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
 	'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
 	'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
@@ -253,14 +248,10 @@ return array(
 	'host' => 'Hôte',
 	'html5_notif_timeout' => 'Temps d’affichage de la notification HTML5',
 	'http_auth' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
-	'http_authentication' => 'Authentification HTTP',
-	'http_password' => 'Mot de passe HTTP',
 	'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
 	'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
-	'http_username' => 'Identifiant HTTP',
 	'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
 	'import' => 'Importer',
-	'informations' => 'Informations',
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
 	'installation_step' => 'Installation — étape %d · FreshRSS',
@@ -272,13 +263,11 @@ return array(
 	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
 	'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
 	'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-	'keep_history' => 'Nombre minimum d’articles à conserver',
 	'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
 	'language' => 'Langue',
 	'language_defined' => 'La langue a bien été définie.',
 	'last_article' => 'Passer au dernier article',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
-	'login_configuration' => 'Identification',
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
@@ -291,11 +280,9 @@ return array(
 	'more_information' => 'Plus d’informations',
 	'n_entries_deleted' => '%d articles ont été supprimés.',
 	'n_feeds_actualized' => '%d flux ont été mis à jour.',
-	'new_category' => 'Nouvelle catégorie',
 	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
 	'next_step' => 'Passer à l’étape suivante',
-	'no' => 'Non',
 	'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
 	'no_feed_to_refresh' => 'Il n’y a aucun flux à actualiser…',
 	'no_query' => 'Vous n’avez pas encore créé de filtre.',
@@ -309,12 +296,9 @@ return array(
 	'not_yet_implemented' => 'Pas encore implémenté',
 	'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
 	'number_feeds' => '%d flux',
-	'ok' => 'Ok !',
-	'oops' => 'Oups !',
 	'optimization_complete' => 'Optimisation terminée.',
 	'optimize_bdd' => 'Optimiser la base de données',
 	'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD',
-	'or' => 'ou',
 	'page_not_found' => 'La page que vous cherchez n’existe pas !',
 	'password' => 'Mot de passe',
 	'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
@@ -363,10 +347,6 @@ return array(
 	'query_state_15' => 'Afficher tous les articles',
 	'random_string' => 'Chaîne aléatoire',
 	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
-	'refresh' => 'Actualisation',
-	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
-	'rss_feed_management' => 'Gestion des flux RSS',
-	'save' => 'Enregistrer',
 	'scroll' => 'au défilement de la page',
 	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
 	'see_on_website' => 'Voir sur le site d’origine',
@@ -381,17 +361,13 @@ return array(
 	'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
 	'show_adaptive' => 'Adapter l’affichage',
 	'show_all_articles' => 'Afficher tous les articles',
-	'show_in_all_flux' => 'Afficher dans le flux principal',
 	'sort_order' => 'Ordre de tri',
 	'starred_list' => 'Liste des articles favoris',
 	'steps' => 'Étapes',
 	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
-	'submit' => 'Valider',
 	'theme' => 'Thème',
 	'this_is_the_end' => 'This is the end',
 	'top_line' => 'Ligne du haut',
-	'truncate' => 'Supprimer tous les articles',
-	'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
 	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_can_apply' => 'Une mise à jour est disponible.',
@@ -415,12 +391,10 @@ return array(
 	'users' => 'Utilisateurs',
 	'users_list' => 'Liste des utilisateurs',
 	'version_update' => 'Mise à jour',
-	'website_url' => 'URL du site',
 	'width_large' => 'Large',
 	'width_medium' => 'Moyenne',
 	'width_no_limit' => 'Pas de limite',
 	'width_thin' => 'Fine',
-	'yes' => 'Oui',
 	'your_diaspora_pod' => 'Votre pod Diaspora*',
 	'your_shaarli' => 'Votre Shaarli',
 	'your_wallabag' => 'Votre wallabag',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index bcc95a72f..0156d4cae 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -35,17 +35,13 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'À propos de FreshRSS',
-		'actualize' => 'Actualiser',
 		'add_query' => 'Créer un filtre',
 		'before_one_day' => 'Antérieurs à 1 jour',
 		'before_one_week' => 'Antérieurs à 1 semaine',
 		'favorites' => 'Favoris (%s)',
-		'filter' => 'Filtrer',
 		'global_view' => 'Vue globale',
 		'main_stream' => 'Flux principal',
-		'manage' => 'Gérer',
 		'mark_all_read' => 'Tout marquer comme lu',
-		'mark_read' => 'Marquer comme lu',
 		'newer_first' => 'Plus récents en premier',
 		'non-starred' => 'Afficher tout sauf les favoris',
 		'normal_view' => 'Vue normale',
@@ -55,7 +51,6 @@ return array(
 		'reader_view' => 'Vue lecture',
 		'rss_view' => 'Flux RSS',
 		'search_short' => 'Rechercher',
-		'see_website' => 'Voir le site',
 		'starred' => 'Afficher les favoris',
 		'stats' => 'Statistiques',
 		'subscription' => 'Gestion des abonnements',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index 7bb52b113..9d7317db7 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -1,15 +1,49 @@
 <?php
 
 return array(
-	'categories' => array(
+	'category' => array(
+		'_' => 'Catégorie',
+		'add' => 'Ajouter une catégorie',
+		'empty' => 'Catégorie vide',
+		'new' => 'Nouvelle catégorie',
 		'over_max' => 'Vous avez atteint votre limite de catégories (%d)',
 	),
-	'feeds' => array(
+	'feed' => array(
+		'add' => 'Ajouter un flux RSS',
+		'advanced' => 'Avancé',
+		'archiving' => 'Archivage',
+		'auth' => array(
+			'configuration' => 'Identification',
+			'help' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
+			'http' => 'Authentification HTTP',
+			'password' => 'Mot de passe HTTP',
+			'username' => 'Identifiant HTTP',
+		),
+		'css_help' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
+		'css_path' => 'Sélecteur CSS des articles sur le site d’origine',
+		'description' => 'Description',
+		'empty' => 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
+		'error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
+		'in_main_stream' => 'Afficher dans le flux principal',
+		'informations' => 'Informations',
+		'keep_history' => 'Nombre minimum d’articles à conserver',
+		'moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
+		'number_entries' => '%d articles',
 		'over_max' => 'Vous avez atteint votre limite de flux (%d)',
+		'stats' => 'Statistiques',
+		'title' => 'Titre',
+		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
+		'url' => 'URL du flux',
+		'validator' => 'Vérifier la valididé du flux',
+		'website' => 'URL du site',
 	),
 	'menu' => array(
 		'bookmark' => 'S’abonner (bookmark FreshRSS)',
 		'import_export' => 'Importer / exporter',
 		'subscription_management' => 'Gestion des abonnements',
 	),
+	'title' => array(
+		'_' => 'Gestion des abonnements',
+		'feed_management' => 'Gestion des flux RSS',
+	),
 );
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index ca220dcd4..a39aea327 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -74,21 +74,21 @@
 <script id="feed_config_template" type="text/html">
 	<ul class="dropdown-menu">
 		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('index.menu.filter'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
 		<?php } ?>
-		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('index.menu.see_website'); ?></a></li>
+		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.manage'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.actualize'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
 		<li class="item">
 			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
 			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
-			        type="submit"><?php echo _t('index.menu.mark_read'); ?></button>
+			        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 		</li>
 		<?php } ?>
 	</ul>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index cdcc926a3..f8abf9032 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -86,7 +86,7 @@
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
 		        formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
-		        type="submit"><?php echo _t('index.menu.mark_read'); ?></button>
+		        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 
 		<div class="dropdown">
 			<div id="dropdown-read" class="dropdown-target"></div>
@@ -194,6 +194,6 @@
 	</a>
 	
 	<?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymousRefresh()) { ?>
-	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('index.menu.actualize'); ?>"><?php echo _i('refresh'); ?></a>
+	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('gen.action.actualize'); ?>"><?php echo _i('refresh'); ?></a>
 	<?php } ?>
 </div>
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index d79ef2666..0b08d036c 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -2,9 +2,9 @@
 	<h1><?php echo $this->feed->name(); ?></h1>
 
 	<div>
-		<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
-		<?php echo _t('or'); ?>
-		<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>"><?php echo _i('stats'); ?> <?php echo _t('stats'); ?></a>
+		<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><?php echo _i('link'); ?> <?php echo _t('gen.action.filter'); ?></a>
+		<?php echo _t('gen.short.or'); ?>
+		<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>"><?php echo _i('stats'); ?> <?php echo _t('sub.feed.stats'); ?></a>
 	</div>
 
 	<p><?php echo $this->feed->description(); ?></p>
@@ -12,27 +12,27 @@
 	<?php $nbEntries = $this->feed->nbEntries(); ?>
 
 	<?php if ($this->feed->inError()) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('feed_in_error'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('sub.feed.error'); ?></p>
 	<?php } elseif ($nbEntries === 0) { ?>
-	<p class="alert alert-warn"><?php echo _t('feed_empty'); ?></p>
+	<p class="alert alert-warn"><?php echo _t('sub.feed.empty'); ?></p>
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url('subscription', 'feed', 'id', $this->feed->id()); ?>" autocomplete="off">
-		<legend><?php echo _t('informations'); ?></legend>
+		<legend><?php echo _t('sub.feed.informations'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="name"><?php echo _t('title'); ?></label>
+			<label class="group-name" for="name"><?php echo _t('sub.feed.title'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name() ; ?>" />
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="description"><?php echo _t('feed_description'); ?></label>
+			<label class="group-name" for="description"><?php echo _t('sub.feed.description'); ?></label>
 			<div class="group-controls">
 				<textarea name="description" id="description"><?php echo htmlspecialchars($this->feed->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="website"><?php echo _t('website_url'); ?></label>
+			<label class="group-name" for="website"><?php echo _t('sub.feed.website'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website(); ?>" />
@@ -41,18 +41,18 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
+			<label class="group-name" for="url"><?php echo _t('sub.feed.url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
 					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo _i('link'); ?></a>
 				</div>
 
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('sub.feed.validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="category"><?php echo _t('category'); ?></label>
+			<label class="group-name" for="category"><?php echo _t('sub.category'); ?></label>
 			<div class="group-controls">
 				<select name="category" id="category">
 				<?php foreach ($this->categories as $cat) { ?>
@@ -64,53 +64,53 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="priority"><?php echo _t('show_in_all_flux'); ?></label>
+			<label class="group-name" for="priority"><?php echo _t('sub.feed.in_main_stream'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="priority">
 					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority() > 0 ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('yes'); ?>
+					<?php echo _t('gen.short.yes'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
 				<button class="btn btn-attention confirm"
-				        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+				        data-str-confirm="<?php echo _t('gen.js.confirm_action_feed_cat'); ?>"
 				        formaction="<?php echo _url('feed', 'delete', 'id', $this->feed->id()); ?>"
-				        formmethod="post"><?php echo _t('delete'); ?></button>
+				        formmethod="post"><?php echo _t('gen.action.remove'); ?></button>
 			</div>
 		</div>
 
-		<legend><?php echo _t('archiving_configuration'); ?></legend>
+		<legend><?php echo _t('sub.feed.archiving'); ?></legend>
 
 		<div class="form-group">
 			<div class="group-controls">
 				<div class="stick">
-					<input type="text" value="<?php echo _t('number_articles', $nbEntries); ?>" disabled="disabled" />
+					<input type="text" value="<?php echo _t('sub.feed.number_entries', $nbEntries); ?>" disabled="disabled" />
 					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->feed->id()); ?>">
-						<?php echo _i('refresh'); ?> <?php echo _t('actualize'); ?>
+						<?php echo _i('refresh'); ?> <?php echo _t('gen.action.actualize'); ?>
 					</a>
 				</div>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history"><?php echo _t('keep_history'); ?></label>
+			<label class="group-name" for="keep_history"><?php echo _t('sub.feed.keep_history'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history" id="keep_history" required="required"><?php
-					foreach (array('' => '', -2 => _t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+					foreach (array('' => '', -2 => _t('gen.short.by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . ($this->feed->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
 					}
 				?></select>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl"><?php echo _t('ttl'); ?></label>
+			<label class="group-name" for="ttl"><?php echo _t('sub.feed.ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl" id="ttl" required="required"><?php
 					$found = false;
-					foreach (array(-2 => _t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
+					foreach (array(-2 => _t('gen.short.by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
 					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
 					                36000 => '10h', 43200 => '12h', 64800 => '18h',
 					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
@@ -128,21 +128,21 @@
 		</div>
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo _url('feed', 'truncate', 'id', $this->feed->id()); ?>"><?php echo _t('truncate'); ?></button>
+				<button class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo _url('feed', 'truncate', 'id', $this->feed->id()); ?>"><?php echo _t('gen.action.truncate'); ?></button>
 			</div>
 		</div>
 
-		<legend><?php echo _t('login_configuration'); ?></legend>
+		<legend><?php echo _t('sub.feed.auth.configuration'); ?></legend>
 		<?php $auth = $this->feed->httpAuth(false); ?>
 		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
+			<label class="group-name" for="http_user"><?php echo _t('sub.feed.auth.username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
-				<?php echo _i('help'); ?> <?php echo _t('access_protected_feeds'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('sub.feed.auth.help'); ?>
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
+			<label class="group-name" for="http_pass"><?php echo _t('sub.feed.auth.password'); ?></label>
 			<div class="group-controls">
 				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
@@ -150,24 +150,24 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 
-		<legend><?php echo _t('advanced'); ?></legend>
+		<legend><?php echo _t('sub.feed.advanced'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="path_entries"><?php echo _t('css_path_on_website'); ?></label>
+			<label class="group-name" for="path_entries"><?php echo _t('sub.feed.css_path'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries(); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
-				<?php echo _i('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
+				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries(); ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>" />
+				<?php echo _i('help'); ?> <?php echo _t('sub.feed.css_help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index bfee4366c..22117792d 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -30,7 +30,7 @@
 					</div>
 				</li>
 				<li class="item">
-					<span title="<?php echo timestamptodate($feed['last_date'], false); ?>"><?php echo $feed['name']; ?> (<?php echo _t('admin.stats.number_articles', $feed['nb_articles']); ?>)</span>
+					<span title="<?php echo timestamptodate($feed['last_date'], false); ?>"><?php echo $feed['name']; ?> (<?php echo _t('admin.stats.number_entries', $feed['nb_articles']); ?>)</span>
 				</li>
 			</ul>
 			<?php } ?>
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 2c56f79ed..b9e40988c 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -1,13 +1,13 @@
 <?php $this->partial('aside_subscription'); ?>
 
 <div class="post drop-section">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h2><?php echo _t('subscription_management'); ?></h2>
+	<h2><?php echo _t('sub.title'); ?></h2>
 
 	<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
 		<div class="stick">
-			<input type="url" name="url_rss" class="extend" placeholder="<?php echo _t('add_rss_feed'); ?>" />
+			<input type="url" name="url_rss" class="extend" placeholder="<?php echo _t('sub.feed.add'); ?>" />
 			<div class="dropdown">
 				<div id="dropdown-cat" class="dropdown-target"></div>
 
@@ -15,7 +15,7 @@
 				<ul class="dropdown-menu">
 					<li class="dropdown-close"><a href="#close">❌</a></li>
 
-					<li class="dropdown-header"><?php echo _t('category'); ?></li>
+					<li class="dropdown-header"><?php echo _t('sub.category'); ?></li>
 
 					<li class="input">
 						<select name="category" id="category">
@@ -24,22 +24,22 @@
 							<?php echo $cat->name(); ?>
 						</option>
 						<?php } ?>
-						<option value="nc"><?php echo _t('new_category'); ?></option>
+						<option value="nc"><?php echo _t('sub.category.new'); ?></option>
 						</select>
 					</li>
 
 					<li class="input" style="display:none">
-						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
+						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('sub.category.new'); ?>" />
 					</li>
 
 					<li class="separator"></li>
 
-					<li class="dropdown-header"><?php echo _t('http_authentication'); ?></li>
+					<li class="dropdown-header"><?php echo _t('sub.feed.auth.http'); ?></li>
 					<li class="input">
-						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo _t('username'); ?>" />
+						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo _t('sub.feed.auth.username'); ?>" />
 					</li>
 					<li class="input">
-						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo _t('password'); ?>" />
+						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo _t('sub.feed.auth.password'); ?>" />
 					</li>
 				</ul>
 			</div>
@@ -48,16 +48,16 @@
 	</form>
 
 	<p class="alert alert-warn">
-		<?php echo _t('feeds_moved_category_deleted', $this->default_category->name()); ?>
+		<?php echo _t('sub.feed.moved_category_deleted', $this->default_category->name()); ?>
 	</p>
 
 	<div class="box">
-		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>
+		<div class="box-title"><label for="new-category"><?php echo _t('sub.category.add'); ?></label></div>
 
 		<ul class="box-content box-content-centered">
 			<form action="<?php echo _url('category', 'create'); ?>" method="post">
-				<li class="item"><input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" /></li>
-				<li class="item"><button class="btn btn-important" type="submit"><?php echo _t('submit'); ?></button></li>
+				<li class="item"><input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('sub.category.new'); ?>" /></li>
+				<li class="item"><button class="btn btn-important" type="submit"><?php echo _t('gen.action.submit'); ?></button></li>
 			</form>
 		</ul>
 	</div>
@@ -80,7 +80,7 @@
 					<ul class="dropdown-menu">
 						<li class="dropdown-close"><a href="#close">❌</a></li>
 
-						<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _t('filter'); ?></a></li>
+						<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
 
 						<?php
 							$no_feed = empty($feeds);
@@ -92,20 +92,20 @@
 						<?php } if (!$no_feed) { ?>
 						<li class="item">
 							<button class="as-link confirm"
-							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+							        data-str-confirm="<?php echo _t('gen.js.confirm_action_feed_cat'); ?>"
 							        type="submit"
 							        form="controller-category"
 							        formaction="<?php echo _url('category', 'empty', 'id', $cat->id()); ?>">
-							        <?php echo _t('ask_empty'); ?></button>
+							        <?php echo _t('gen.action.empty'); ?></button>
 						</li>
 						<?php } if (!$is_default) { ?>
 						<li class="item">
 							<button class="as-link confirm"
-							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+							        data-str-confirm="<?php echo _t('gen.js.confirm_action_feed_cat'); ?>"
 							        type="submit"
 							        form="controller-category"
 							        formaction="<?php echo _url('category', 'delete', 'id', $cat->id()); ?>">
-							        <?php echo _t('delete'); ?></button>
+							        <?php echo _t('gen.action.remove'); ?></button>
 						</li>
 						<?php } ?>
 					</ul>
@@ -130,7 +130,7 @@
 			<?php 	}
 				} else {
 			?>
-			<li class="item disabled" dropzone="move"><?php echo _t('category_empty'); ?></li>
+			<li class="item disabled" dropzone="move"><?php echo _t('sub.category.empty'); ?></li>
 			<?php } ?>
 		</ul>
 	</div>

From 0ee16a7d6acb0c0158272fbbdd9ee876d9fb4a4a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 17:46:05 +0100
Subject: [PATCH 224/363] Fix i18n for import/export

---
 app/Controllers/importExportController.php | 24 +++++++++++-----------
 app/i18n/en/feedback.php                   |  8 ++++++++
 app/i18n/en/gen.php                        | 16 ++-------------
 app/i18n/en/sub.php                        | 11 ++++++++++
 app/i18n/fr/feedback.php                   |  8 ++++++++
 app/i18n/fr/gen.php                        | 16 ++-------------
 app/i18n/fr/sub.php                        | 11 ++++++++++
 app/views/importExport/index.phtml         | 16 +++++++--------
 8 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 4e2dbd157..2360ce53b 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -26,7 +26,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 */
 	public function indexAction() {
 		$this->view->feeds = $this->feedDAO->listFeeds();
-		Minz_View::prependTitle(_t('import_export') . ' · ');
+		Minz_View::prependTitle(_t('sub.import_export.title') . ' · ');
 	}
 
 	/**
@@ -48,7 +48,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		if ($status_file !== 0) {
 			Minz_Log::error('File cannot be uploaded. Error code: ' . $status_file);
-			Minz_Request::bad(_t('file_cannot_be_uploaded'),
+			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'),
 			                  array('c' => 'importExport', 'a' => 'index'));
 		}
 
@@ -70,7 +70,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			if (!is_resource($zip)) {
 				// zip_open cannot open file: something is wrong
 				Minz_Log::error('Zip archive cannot be imported. Error code: ' . $zip);
-				Minz_Request::bad(_t('zip_error'),
+				Minz_Request::bad(_t('feedback.import_export.zip_error'),
 				                  array('c' => 'importExport', 'a' => 'index'));
 			}
 
@@ -92,7 +92,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			zip_close($zip);
 		} elseif ($type_file === 'zip') {
 			// Zip extension is not loaded
-			Minz_Request::bad(_t('no_zip_extension'),
+			Minz_Request::bad(_t('feedback.import_export.no_zip_extension'),
 			                  array('c' => 'importExport', 'a' => 'index'));
 		} elseif ($type_file !== 'unknown') {
 			$list_files[$type_file][] = file_get_contents($file['tmp_name']);
@@ -115,8 +115,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		// And finally, we get import status and redirect to the home page
 		Minz_Session::_param('actualize_feeds', true);
-		$content_notif = $error === true ? _t('feeds_imported_with_errors') :
-		                                   _t('feeds_imported');
+		$content_notif = $error === true ? _t('feedback.import_export.feeds_imported_with_errors') :
+		                                   _t('feedback.import_export.feeds_imported');
 		Minz_Request::good($content_notif);
 	}
 
@@ -183,7 +183,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			if (isset($elt['xmlUrl'])) {
 				// If xmlUrl exists, it means it is a feed
 				if ($nb_feeds >= $limits['max_feeds']) {
-					Minz_Log::warning(_t('sub.feeds.over_max',
+					Minz_Log::warning(_t('sub.feed.over_max',
 					                  $limits['max_feeds']));
 					$is_error = true;
 					continue;
@@ -197,7 +197,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				// No xmlUrl? It should be a category!
 				$limit_reached = ($nb_cats >= $limits['max_categories']);
 				if ($limit_reached) {
-					Minz_Log::warning(_t('sub.categories.over_max',
+					Minz_Log::warning(_t('sub.category.over_max',
 					                  $limits['max_categories']));
 				}
 
@@ -337,7 +337,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				// Feed does not exist in DB,we should to try to add it.
 				if ($nb_feeds >= $limits['max_feeds']) {
 					// Oops, no more place!
-					Minz_Log::warning(_t('sub.feeds.over_max', $limits['max_feeds']));
+					Minz_Log::warning(_t('sub.feed.over_max', $limits['max_feeds']));
 				} else {
 					$feed = $this->addFeedJson($item['origin'], $google_compliant);
 				}
@@ -482,7 +482,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				$this->exportZip($export_files);
 			} catch (Exception $e) {
 				# Oops, there is no Zip extension!
-				Minz_Request::bad(_t('export_no_zip_extension'),
+				Minz_Request::bad(_t('feedback.import_export.export_no_zip_extension'),
 				                  array('c' => 'importExport', 'a' => 'index'));
 			}
 		} elseif ($nb_files === 1) {
@@ -523,14 +523,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$this->view->categories = $this->catDAO->listCategories();
 
 		if ($type == 'starred') {
-			$this->view->list_title = _t('starred_list');
+			$this->view->list_title = _t('sub.import_export.starred_list');
 			$this->view->type = 'starred';
 			$unread_fav = $this->entryDAO->countUnreadReadFavorites();
 			$this->view->entries = $this->entryDAO->listWhere(
 				's', '', FreshRSS_Entry::STATE_ALL, 'ASC', $unread_fav['all']
 			);
 		} elseif ($type == 'feed' && !is_null($feed)) {
-			$this->view->list_title = _t('feed_list', $feed->name());
+			$this->view->list_title = _t('sub.import_export.feed_list', $feed->name());
 			$this->view->type = 'feed/' . $feed->id();
 			$this->view->entries = $this->entryDAO->listWhere(
 				'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 2eae1d839..62fac81eb 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -1,6 +1,14 @@
 <?php
 
 return array(
+	'import_export' => array(
+		'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
+		'feeds_imported' => 'Your feeds have been imported and will now be updated',
+		'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
+		'file_cannot_be_uploaded' => 'File cannot be uploaded!',
+		'no_zip_extension' => 'Zip extension is not present on your server.',
+		'zip_error' => 'An error occured during Zip import.',
+	),
 	'login' => array(
 		'error' => 'Login is invalid',
 		'success' => 'You are connected',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index a3c409c31..856c91b3b 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -8,7 +8,9 @@ return array(
 		'disable' => 'Disable',
 		'empty' => 'Empty',
 		'enable' => 'Enable',
+		'export' => 'Export',
 		'filter' => 'Filtrer',
+		'import' => 'Import',
 		'manage' => 'Manage',
 		'mark_read' => 'Mark as read',
 		'remove' => 'Remove',
@@ -216,26 +218,16 @@ return array(
 	'dom_is_ok' => 'You have the required library to browse the DOM',
 	'error_occurred' => 'An error occurred',
 	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
-	'export' => 'Export',
-	'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
-	'export_opml' => 'Export list of feeds (OPML)',
-	'export_starred' => 'Export your favourites',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feed' => 'Feed',
 	'feed_actualized' => '<em>%s</em> has been updated',
 	'feed_added' => 'RSS feed <em>%s</em> has been added',
 	'feed_deleted' => 'Feed has been deleted',
-	'feed_list' => 'List of %s articles',
 	'feed_not_added' => '<em>%s</em> could not be added',
 	'feeds' => 'Feeds',
 	'feeds_actualized' => 'RSS feeds have been updated',
-	'feeds_imported' => 'Your feeds have been imported and will now be updated',
-	'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
 	'feeds_marked_read' => 'Feeds have been marked as read',
-	'file_cannot_be_uploaded' => 'File cannot be uploaded!',
 	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
-	'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
-	'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
 	'finish_installation' => 'Complete installation',
 	'first_article' => 'Skip to the first article',
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
@@ -251,7 +243,6 @@ return array(
 	'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
 	'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
-	'import' => 'Import',
 	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
 	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
 	'installation_step' => 'Installation — step %d · FreshRSS',
@@ -290,7 +281,6 @@ return array(
 	'no_rss_feed' => 'No RSS feed',
 	'no_selected_feed' => 'No feed selected.',
 	'no_update' => 'No update to apply',
-	'no_zip_extension' => 'Zip extension is not present on your server.',
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
@@ -362,7 +352,6 @@ return array(
 	'show_adaptive' => 'Adjust showing',
 	'show_all_articles' => 'Show all articles',
 	'sort_order' => 'Sort order',
-	'starred_list' => 'List of favourite articles',
 	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
 	'theme' => 'Theme',
@@ -398,5 +387,4 @@ return array(
 	'your_diaspora_pod' => 'Your Diaspora* pod',
 	'your_shaarli' => 'Your Shaarli',
 	'your_wallabag' => 'Your wallabag',
-	'zip_error' => 'An error occured during Zip import.',
 );
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index b8bc3d33d..dbd148dee 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -37,6 +37,17 @@ return array(
 		'validator' => 'Check the validity of the feed',
 		'website' => 'Website URL',
 	),
+	'import_export' => array(
+		'export' => 'Export',
+		'export_opml' => 'Export list of feeds (OPML)',
+		'export_starred' => 'Export your favourites',
+		'feed_list' => 'List of %s articles',
+		'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
+		'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
+		'import' => 'Import',
+		'starred_list' => 'List of favourite articles',
+		'title' => 'Import / export',
+	),
 	'menu' => array(
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index 98d3c3eb2..7c4619ebc 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -1,6 +1,14 @@
 <?php
 
 return array(
+	'import_export' => array(
+		'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
+		'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
+		'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
+		'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
+		'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
+		'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
+	),
 	'login' => array(
 		'error' => 'L’identifiant est invalide',
 		'success' => 'Vous êtes désormais connecté',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 9d663680c..a8f60979e 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -8,7 +8,9 @@ return array(
 		'disable' => 'Désactiver',
 		'empty' => 'Vider',
 		'enable' => 'Activer',
+		'export' => 'Exporter',
 		'filter' => 'Filtrer',
+		'import' => 'Importer',
 		'manage' => 'Gérer',
 		'mark_read' => 'Marquer comme lu',
 		'remove' => 'Supprimer',
@@ -216,26 +218,16 @@ return array(
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
 	'error_occurred' => 'Une erreur est survenue !',
 	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
-	'export' => 'Exporter',
-	'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
-	'export_opml' => 'Exporter la liste des flux (OPML)',
-	'export_starred' => 'Exporter les favoris',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
 	'feed' => 'Flux',
 	'feed_actualized' => '<em>%s</em> a été mis à jour.',
 	'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
 	'feed_deleted' => 'Le flux a été supprimé.',
-	'feed_list' => 'Liste des articles de %s',
 	'feed_not_added' => '<em>%s</em> n’a pas pu être ajouté.',
 	'feeds' => 'Flux',
 	'feeds_actualized' => 'Les flux ont été mis à jour.',
-	'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
-	'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
 	'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
-	'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
 	'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
-	'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
-	'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
 	'finish_installation' => 'Terminer l’installation',
 	'first_article' => 'Passer au premier article',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
@@ -251,7 +243,6 @@ return array(
 	'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
 	'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
 	'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
-	'import' => 'Importer',
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
 	'installation_step' => 'Installation — étape %d · FreshRSS',
@@ -290,7 +281,6 @@ return array(
 	'no_rss_feed' => 'Aucun flux RSS',
 	'no_selected_feed' => 'Aucun flux sélectionné.',
 	'no_update' => 'Aucune mise à jour à appliquer',
-	'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
@@ -362,7 +352,6 @@ return array(
 	'show_adaptive' => 'Adapter l’affichage',
 	'show_all_articles' => 'Afficher tous les articles',
 	'sort_order' => 'Ordre de tri',
-	'starred_list' => 'Liste des articles favoris',
 	'steps' => 'Étapes',
 	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 	'theme' => 'Thème',
@@ -398,5 +387,4 @@ return array(
 	'your_diaspora_pod' => 'Votre pod Diaspora*',
 	'your_shaarli' => 'Votre Shaarli',
 	'your_wallabag' => 'Votre wallabag',
-	'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
 );
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index 9d7317db7..a58392ff4 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -37,6 +37,17 @@ return array(
 		'validator' => 'Vérifier la valididé du flux',
 		'website' => 'URL du site',
 	),
+	'import_export' => array(
+		'export' => 'Exporter',
+		'export_opml' => 'Exporter la liste des flux (OPML)',
+		'export_starred' => 'Exporter les favoris',
+		'feed_list' => 'Liste des articles de %s',
+		'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
+		'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
+		'import' => 'Importer',
+		'starred_list' => 'Liste des articles favoris',
+		'title' => 'Importer / exporter',
+	),
 	'menu' => array(
 		'bookmark' => 'S’abonner (bookmark FreshRSS)',
 		'import_export' => 'Importer / exporter',
diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml
index 36c0eab4e..a64524bf1 100644
--- a/app/views/importExport/index.phtml
+++ b/app/views/importExport/index.phtml
@@ -1,13 +1,13 @@
 <?php $this->partial('aside_subscription'); ?>
 
 <div class="post ">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('importExport', 'import'); ?>" enctype="multipart/form-data">
-		<legend><?php echo _t('import'); ?></legend>
+		<legend><?php echo _t('sub.import_export.import'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="file">
-				<?php echo extension_loaded('zip') ? _t('file_to_import') : _t('file_to_import_no_zip'); ?>
+				<?php echo extension_loaded('zip') ? _t('sub.import_export.file_to_import') : _t('sub.import_export.file_to_import_no_zip'); ?>
 			</label>
 			<div class="group-controls">
 				<input type="file" name="file" id="file" />
@@ -16,24 +16,24 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('import'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.import'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<?php if (count($this->feeds) > 0) { ?>
 	<form method="post" action="<?php echo _url('importExport', 'export'); ?>">
-		<legend><?php echo _t('export'); ?></legend>
+		<legend><?php echo _t('sub.import_export.export'); ?></legend>
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="export_opml">
 					<input type="checkbox" name="export_opml" id="export_opml" value="1" checked="checked" />
-					<?php echo _t('export_opml'); ?>
+					<?php echo _t('sub.import_export.export_opml'); ?>
 				</label>
 
 				<label class="checkbox" for="export_starred">
 					<input type="checkbox" name="export_starred" id="export_starred" value="1" <?php echo extension_loaded('zip') ? 'checked="checked"' : ''; ?> />
-					<?php echo _t('export_starred'); ?>
+					<?php echo _t('sub.import_export.export_starred'); ?>
 				</label>
 
 				<?php
@@ -53,7 +53,7 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('export'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.export'); ?></button>
 			</div>
 		</div>
 	</form>

From c1a3412b97d5f19e6c1102902156b098598e7ce9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 18:15:41 +0100
Subject: [PATCH 225/363] Fix i18n for auth and category controllers

---
 app/Controllers/authController.php         | 36 ++++++++---------
 app/Controllers/categoryController.php     | 34 ++++++++--------
 app/Controllers/importExportController.php |  6 +--
 app/i18n/en/feedback.php                   | 46 +++++++++++++++++-----
 app/i18n/en/gen.php                        | 16 --------
 app/i18n/en/sub.php                        |  2 -
 app/i18n/fr/feedback.php                   | 46 +++++++++++++++++-----
 app/i18n/fr/gen.php                        | 20 +---------
 app/i18n/fr/sub.php                        |  2 -
 9 files changed, 114 insertions(+), 94 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 44496cd3e..55481f859 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -22,7 +22,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
-		Minz_View::prependTitle(_t('gen.title.authentication') . ' · ');
+		Minz_View::prependTitle(_t('gen.auth.title') . ' · ');
 
 		if (Minz_Request::isPost()) {
 			$ok = true;
@@ -56,10 +56,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			if ($ok) {
-				Minz_Request::good(_t('configuration_updated'),
+				Minz_Request::good(_t('feedback.configuration.updated'),
 				                   array('c' => 'auth', 'a' => 'index'));
 			} else {
-				Minz_Request::bad(_t('error_occurred'),
+				Minz_Request::bad(_t('feedback.configuration.error'),
 				                  array('c' => 'auth', 'a' => 'index'));
 			}
 		}
@@ -123,7 +123,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			} catch(Minz_Exception $e) {
 				// $username is not a valid user, nor the configuration file!
 				Minz_Log::warning('Login failure: ' . $e->getMessage());
-				Minz_Request::bad(_t('invalid_login'),
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
 
@@ -144,14 +144,14 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				}
 
 				// All is good, go back to the index.
-				Minz_Request::good(_t('feedback.login.success'),
+				Minz_Request::good(_t('feedback.auth.login.success'),
 				                   array('c' => 'index', 'a' => 'index'));
 			} else {
 				Minz_Log::warning('Password mismatch for' .
 				                  ' user=' . $username .
 				                  ', nonce=' . $nonce .
 				                  ', c=' . $challenge);
-				Minz_Request::bad(_t('invalid_login'),
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
 		} elseif (Minz_Configuration::unsafeAutologinEnabled()) {
@@ -183,11 +183,11 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Session::_param('passwordHash', $s);
 				FreshRSS_Auth::giveAccess();
 
-				Minz_Request::good(_t('feedback.login.success'),
+				Minz_Request::good(_t('feedback.auth.login.success'),
 				                   array('c' => 'index', 'a' => 'index'));
 			} else {
 				Minz_Log::warning('Unsafe password mismatch for user ' . $username);
-				Minz_Request::bad(_t('invalid_login'),
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
 		}
@@ -261,7 +261,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 
 				$res = array();
 				$res['status'] = 'failure';
-				$res['reason'] = _t('invalid_login');
+				$res['reason'] = _t('feedback.auth.login.invalid');
 			}
 
 			header('Content-Type: application/json; charset=UTF-8');
@@ -275,7 +275,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	public function logoutAction() {
 		invalidateHttpCache();
 		FreshRSS_Auth::removeAccess();
-		Minz_Request::good(_t('feedback.logout.success'),
+		Minz_Request::good(_t('feedback.auth.logout.success'),
 		                   array('c' => 'index', 'a' => 'index'));
 	}
 
@@ -285,7 +285,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	 * After reseting, form auth is set by default.
 	 */
 	public function resetAction() {
-		Minz_View::prependTitle(_t('auth_reset') . ' · ');
+		Minz_View::prependTitle(_t('feedback.auth.title_reset') . ' · ');
 
 		Minz_View::appendScript(Minz_Url::display(
 			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
@@ -296,8 +296,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (Minz_Configuration::authType() != 'persona') {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('auth_not_persona')
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.auth.not_persona')
 			);
 			$this->view->no_form = true;
 			return;
@@ -308,8 +308,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (!$conf->passwordHash) {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('auth_no_password_set')
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.auth.no_password_set')
 			);
 			$this->view->no_form = true;
 			return;
@@ -331,9 +331,9 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				$ok = Minz_Configuration::writeFile();
 
 				if ($ok) {
-					Minz_Request::good(_t('auth_form_set'));
+					Minz_Request::good(_t('feedback.auth.form.set'));
 				} else {
-					Minz_Request::bad(_t('auth_form_not_set'),
+					Minz_Request::bad(_t('feedback.auth.form.not_set'),
 				                      array('c' => 'auth', 'a' => 'reset'));
 				}
 			} else {
@@ -341,7 +341,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				                  ' user=' . $username .
 				                  ', nonce=' . $nonce .
 				                  ', c=' . $challenge);
-				Minz_Request::bad(_t('invalid_login'),
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'reset'));
 			}
 		}
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 50b1d841a..5f1beae90 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -34,7 +34,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 		$this->view->categories = $catDAO->listCategories(false);
 
 		if (count($this->view->categories) >= $limits['max_categories']) {
-			Minz_Request::bad(_t('sub.categories.over_max', $limits['max_categories']),
+			Minz_Request::bad(_t('feedback.sub.category.over_max', $limits['max_categories']),
 			                  $url_redirect);
 		}
 
@@ -43,13 +43,13 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 			$cat_name = Minz_Request::param('new-category');
 			if (!$cat_name) {
-				Minz_Request::bad(_t('category_no_name'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.no_name'), $url_redirect);
 			}
 
 			$cat = new FreshRSS_Category($cat_name);
 
 			if ($catDAO->searchByName($cat->name()) != null) {
-				Minz_Request::bad(_t('category_name_exists'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.name_exists'), $url_redirect);
 			}
 
 			$values = array(
@@ -58,9 +58,9 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			);
 
 			if ($catDAO->addCategory($values)) {
-				Minz_Request::good(_t('category_created', $cat->name()), $url_redirect);
+				Minz_Request::good(_t('feedback.sub.category.created', $cat->name()), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
 		}
 
@@ -84,11 +84,11 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			$id = Minz_Request::param('id');
 			$name = Minz_Request::param('name', '');
 			if (strlen($name) <= 0) {
-				Minz_Request::bad(_t('category_no_name'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.no_name'), $url_redirect);
 			}
 
 			if ($catDAO->searchById($id) == null) {
-				Minz_Request::bad(_t('category_not_exist'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.not_exist'), $url_redirect);
 			}
 
 			$cat = new FreshRSS_Category($name);
@@ -97,9 +97,9 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			);
 
 			if ($catDAO->updateCategory($id, $values)) {
-				Minz_Request::good(_t('category_updated'), $url_redirect);
+				Minz_Request::good(_t('feedback.sub.category.updated'), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
 		}
 
@@ -125,26 +125,26 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 			$id = Minz_Request::param('id');
 			if (!$id) {
-				Minz_Request::bad(_t('category_no_id'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.no_id'), $url_redirect);
 			}
 
 			if ($id === $default_category->id()) {
-				Minz_Request::bad(_t('category_not_delete_default'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.not_delete_default'), $url_redirect);
 			}
 
 			if ($feedDAO->changeCategory($id, $default_category->id()) === false) {
-				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
 
 			if ($catDAO->deleteCategory($id) === false) {
-				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
 
 			// Remove related queries.
 			FreshRSS_Context::$conf->remove_query_by_get('c_' . $id);
 			FreshRSS_Context::$conf->save();
 
-			Minz_Request::good(_t('category_deleted'), $url_redirect);
+			Minz_Request::good(_t('feedback.sub.category.deleted'), $url_redirect);
 		}
 
 		Minz_Request::forward($url_redirect, true);
@@ -166,7 +166,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 			$id = Minz_Request::param('id');
 			if (!$id) {
-				Minz_Request::bad(_t('category_no_id'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.no_id'), $url_redirect);
 			}
 
 			// List feeds to remove then related user queries.
@@ -181,9 +181,9 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 				}
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good(_t('category_emptied'), $url_redirect);
+				Minz_Request::good(_t('feedback.sub.category.emptied'), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('error_occurred'), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
 		}
 
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 2360ce53b..f29051f34 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -183,7 +183,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			if (isset($elt['xmlUrl'])) {
 				// If xmlUrl exists, it means it is a feed
 				if ($nb_feeds >= $limits['max_feeds']) {
-					Minz_Log::warning(_t('sub.feed.over_max',
+					Minz_Log::warning(_t('feedback.sub.feed.over_max',
 					                  $limits['max_feeds']));
 					$is_error = true;
 					continue;
@@ -197,7 +197,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				// No xmlUrl? It should be a category!
 				$limit_reached = ($nb_cats >= $limits['max_categories']);
 				if ($limit_reached) {
-					Minz_Log::warning(_t('sub.category.over_max',
+					Minz_Log::warning(_t('feedback.sub.category.over_max',
 					                  $limits['max_categories']));
 				}
 
@@ -337,7 +337,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				// Feed does not exist in DB,we should to try to add it.
 				if ($nb_feeds >= $limits['max_feeds']) {
 					// Oops, no more place!
-					Minz_Log::warning(_t('sub.feed.over_max', $limits['max_feeds']));
+					Minz_Log::warning(_t('feedback.sub.feed.over_max', $limits['max_feeds']));
 				} else {
 					$feed = $this->addFeedJson($item['origin'], $google_compliant);
 				}
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 62fac81eb..148ec1acc 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -1,6 +1,25 @@
 <?php
 
 return array(
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'A problem occured during authentication system configuration. Please retry later.',
+			'set' => 'Form is now your default authentication system.',
+		),
+		'login' => array(
+			'invalid' => 'Login is invalid',
+			'success' => 'You are connected',
+		),
+		'logout' => array(
+			'success' => 'You are disconnected',
+		),
+		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
+		'not_persona' => 'Only Persona system can be reset.',
+	),
+	'configuration' => array(
+		'updated' => 'Configuration has been updated',
+		'error' => 'An error occurred during configuration saving',
+	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
 		'feeds_imported' => 'Your feeds have been imported and will now be updated',
@@ -9,16 +28,25 @@ return array(
 		'no_zip_extension' => 'Zip extension is not present on your server.',
 		'zip_error' => 'An error occured during Zip import.',
 	),
-	'login' => array(
-		'error' => 'Login is invalid',
-		'success' => 'You are connected',
-	),
-	'logout' => array(
-		'success' => 'You are disconnected',
-	),
 	'sub' => array(
-		'error_occurred' => 'Feed cannot be updated',
-		'feed_updated' => 'Feed has been updated',
+		'category' => array(
+			'created' => 'Category %s has been created.',
+			'deleted' => 'Category has been deleted.',
+			'emptied' => 'Category has been emptied',
+			'error' => 'Category cannot be updated',
+			'name_exists' => 'Category name already exists.',
+			'no_id' => 'You must precise the id of the category.',
+			'no_name' => 'Category name cannot be empty.',
+			'not_delete_default' => 'You cannot delete the default category!',
+			'not_exist' => 'The category does not exist!',
+			'over_max' => 'You have reached your limit of categories (%d)',
+			'updated' => 'Category has been updated.',
+		),
+		'feed' => array(
+			'error' => 'Feed cannot be updated',
+			'over_max' => 'You have reached your limit of feeds (%d)',
+			'updated' => 'Feed has been updated',
+		),
 	),
 	'user_profile' => array(
 		'updated' => 'Your profile has been modified',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 856c91b3b..48bda04a1 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -148,11 +148,7 @@ return array(
 	'articles_per_page' => 'Number of articles per page',
 	'articles_to_display' => 'Articles to display',
 	'auth_form' => 'Web form (traditional, requires JavaScript)',
-	'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
-	'auth_form_set' => 'Form is now your default authentication system.',
-	'auth_no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
 	'auth_none' => 'None (dangerous)',
-	'auth_not_persona' => 'Only Persona system can be reset.',
 	'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
 	'auth_reset' => 'Authentication reset',
 	'auth_token' => 'Authentication token',
@@ -181,21 +177,11 @@ return array(
 	'categories_management' => 'Categories management',
 	'categories_updated' => 'Categories have been updated',
 	'categorize' => 'Store in a category',
-	'category_created' => 'Category %s has been created.',
-	'category_deleted' => 'Category has been deleted.',
-	'category_emptied' => 'Category has been emptied',
-	'category_name_exists' => 'Category name already exists.',
-	'category_no_id' => 'You must precise the id of the category.',
-	'category_no_name' => 'Category name cannot be empty.',
-	'category_not_delete_default' => 'You cannot delete the default category!',
-	'category_not_exist' => 'The category does not exist!',
 	'category_number' => 'Category n°%d',
-	'category_updated' => 'Category has been updated.',
 	'change_value' => 'You should change this value by any other',
 	'checks' => 'Checks',
 	'choose_language' => 'Choose a language for FreshRSS',
 	'collapse_article' => 'Collapse',
-	'configuration_updated' => 'Configuration has been updated',
 	'congratulations' => 'Congratulations!',
 	'content_width' => 'Content width',
 	'create' => 'Create',
@@ -216,7 +202,6 @@ return array(
 	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
 	'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
 	'dom_is_ok' => 'You have the required library to browse the DOM',
-	'error_occurred' => 'An error occurred',
 	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feed' => 'Feed',
@@ -247,7 +232,6 @@ return array(
 	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
 	'installation_step' => 'Installation — step %d · FreshRSS',
 	'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
-	'invalid_login' => 'Login is invalid',
 	'invalid_url' => 'URL <em>%s</em> is invalid',
 	'is_admin' => 'is administrator',
 	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index dbd148dee..14268c72c 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -6,7 +6,6 @@ return array(
 		'add' => 'Add a category',
 		'empty' => 'Empty category',
 		'new' => 'New category',
-		'over_max' => 'You have reached your limit of categories (%d)',
 	),
 	'feed' => array(
 		'add' => 'Add a RSS feed',
@@ -29,7 +28,6 @@ return array(
 		'keep_history' => 'Minimum number of articles to keep',
 		'moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
 		'number_entries' => '%d articles',
-		'over_max' => 'You have reached your limit of feeds (%d)',
 		'stats' => 'Statistics',
 		'title' => 'Title',
 		'ttl' => 'Do not automatically refresh more often than',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index 7c4619ebc..d79d3eccd 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -1,6 +1,25 @@
 <?php
 
 return array(
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
+			'set' => 'Le formulaire est désormais votre système d’authentification.',
+		),
+		'login' => array(
+			'invalid' => 'L’identifiant est invalide',
+			'success' => 'Vous êtes désormais connecté',
+		),
+		'logout' => array(
+			'success' => 'Vous avez été déconnecté',
+		),
+		'no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
+		'not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
+	),
+	'configuration' => array(
+		'updated' => 'La configuration a été mise à jour',
+		'error' => 'Une erreur est survenue en sauvegardant la configuration',
+	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
 		'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
@@ -9,16 +28,25 @@ return array(
 		'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
 		'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
 	),
-	'login' => array(
-		'error' => 'L’identifiant est invalide',
-		'success' => 'Vous êtes désormais connecté',
-	),
-	'logout' => array(
-		'success' => 'Vous avez été déconnecté',
-	),
 	'sub' => array(
-		'error_occurred' => 'Le flux n’a pas pu être modifié',
-		'feed_updated' => 'Le flux a été mis à jour',
+		'category' => array(
+			'created' => 'La catégorie %s a été créée.',
+			'deleted' => 'La catégorie a été supprimée.',
+			'emptied' => 'La catégorie a été vidée.',
+			'error' => 'La catégorie n’a pas pu être modifiée',
+			'name_exists' => 'Une catégorie possède déjà ce nom.',
+			'no_id' => 'Vous devez préciser l’id de la catégorie.',
+			'no_name' => 'Vous devez préciser un nom pour la catégorie.',
+			'not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
+			'not_exist' => 'Cette catégorie n’existe pas !',
+			'over_max' => 'Vous avez atteint votre limite de catégories (%d)',
+			'updated' => 'La catégorie a été mise à jour.',
+		),
+		'feed' => array(
+			'error' => 'Le flux n’a pas pu être modifié',
+			'over_max' => 'Vous avez atteint votre limite de flux (%d)',
+			'updated' => 'Le flux a été mis à jour',
+		),
 	),
 	'user_profile' => array(
 		'updated' => 'Votre profil a été mis à jour',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index a8f60979e..55941c39d 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -21,6 +21,8 @@ return array(
 	'auth' => array(
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
+		'title' => 'Authentification',
+		'title_reset' => 'Réinitialisation de l’authentification',
 	),
 	'date' => array(
 		'Apr' => '\\a\\v\\r\\i\\l',
@@ -124,7 +126,6 @@ return array(
 		'yes' => 'Oui',
 	),
 	'title' => array(
-		'authentication' => 'Authentification',
 		'check_install' => 'Vérification de l’installation',
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
@@ -148,13 +149,8 @@ return array(
 	'articles_per_page' => 'Nombre d’articles par page',
 	'articles_to_display' => 'Articles à afficher',
 	'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
-	'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
-	'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
-	'auth_no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
 	'auth_none' => 'Aucune (dangereux)',
-	'auth_not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
 	'auth_persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
-	'auth_reset' => 'Réinitialisation de l’authentification',
 	'auth_token' => 'Jeton d’identification',
 	'auth_type' => 'Méthode d’authentification',
 	'auth_will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
@@ -181,21 +177,11 @@ return array(
 	'categories_management' => 'Gestion des catégories',
 	'categories_updated' => 'Les catégories ont été mises à jour.',
 	'categorize' => 'Ranger dans une catégorie',
-	'category_created' => 'La catégorie %s a été créée.',
-	'category_deleted' => 'La catégorie a été supprimée.',
-	'category_emptied' => 'La catégorie a été vidée.',
-	'category_name_exists' => 'Une catégorie possède déjà ce nom.',
-	'category_no_id' => 'Vous devez préciser l’id de la catégorie.',
-	'category_no_name' => 'Vous devez préciser un nom pour la catégorie.',
-	'category_not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
-	'category_not_exist' => 'Cette catégorie n’existe pas !',
 	'category_number' => 'Catégorie n°%d',
-	'category_updated' => 'La catégorie a été mise à jour.',
 	'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
 	'checks' => 'Vérifications',
 	'choose_language' => 'Choisissez la langue pour FreshRSS',
 	'collapse_article' => 'Refermer',
-	'configuration_updated' => 'La configuration a été mise à jour.',
 	'congratulations' => 'Félicitations !',
 	'content_width' => 'Largeur du contenu',
 	'create' => 'Créer',
@@ -216,7 +202,6 @@ return array(
 	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
 	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
-	'error_occurred' => 'Une erreur est survenue !',
 	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
 	'feed' => 'Flux',
@@ -247,7 +232,6 @@ return array(
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
 	'installation_step' => 'Installation — étape %d · FreshRSS',
 	'internal_problem_feed' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
-	'invalid_login' => 'L’identifiant est invalide !',
 	'invalid_url' => 'L’url <em>%s</em> est invalide.',
 	'is_admin' => 'est administrateur',
 	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index a58392ff4..0257c8b4d 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -6,7 +6,6 @@ return array(
 		'add' => 'Ajouter une catégorie',
 		'empty' => 'Catégorie vide',
 		'new' => 'Nouvelle catégorie',
-		'over_max' => 'Vous avez atteint votre limite de catégories (%d)',
 	),
 	'feed' => array(
 		'add' => 'Ajouter un flux RSS',
@@ -29,7 +28,6 @@ return array(
 		'keep_history' => 'Nombre minimum d’articles à conserver',
 		'moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
 		'number_entries' => '%d articles',
-		'over_max' => 'Vous avez atteint votre limite de flux (%d)',
 		'stats' => 'Statistiques',
 		'title' => 'Titre',
 		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',

From fee1ae997af678cb834d9db25a636032f43a5674 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 19:02:05 +0100
Subject: [PATCH 226/363] Fix i18n for conf, entry, error, feed Controllers

---
 app/Controllers/authController.php         |  8 ++---
 app/Controllers/configureController.php    | 30 +++++++++---------
 app/Controllers/entryController.php        |  6 ++--
 app/Controllers/errorController.php        |  4 +--
 app/Controllers/feedController.php         | 37 ++++++++++++----------
 app/Controllers/subscriptionController.php |  4 +--
 app/i18n/en/admin.php                      |  4 +++
 app/i18n/en/conf.php                       | 21 +++++++++++-
 app/i18n/en/feedback.php                   | 26 +++++++++++++--
 app/i18n/en/gen.php                        | 20 ------------
 app/i18n/en/sub.php                        |  1 +
 app/i18n/fr/admin.php                      |  4 +++
 app/i18n/fr/conf.php                       | 21 +++++++++++-
 app/i18n/fr/feedback.php                   | 28 ++++++++++++++--
 app/i18n/fr/gen.php                        | 23 +-------------
 app/i18n/fr/sub.php                        |  1 +
 16 files changed, 146 insertions(+), 92 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 55481f859..ccc32ec0d 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -22,7 +22,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
-		Minz_View::prependTitle(_t('gen.auth.title') . ' · ');
+		Minz_View::prependTitle(_t('admin.auth.title') . ' · ');
 
 		if (Minz_Request::isPost()) {
 			$ok = true;
@@ -56,10 +56,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			if ($ok) {
-				Minz_Request::good(_t('feedback.configuration.updated'),
+				Minz_Request::good(_t('feedback.conf.updated'),
 				                   array('c' => 'auth', 'a' => 'index'));
 			} else {
-				Minz_Request::bad(_t('feedback.configuration.error'),
+				Minz_Request::bad(_t('feedback.conf.error'),
 				                  array('c' => 'auth', 'a' => 'index'));
 			}
 		}
@@ -285,7 +285,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	 * After reseting, form auth is set by default.
 	 */
 	public function resetAction() {
-		Minz_View::prependTitle(_t('feedback.auth.title_reset') . ' · ');
+		Minz_View::prependTitle(_t('admin.auth.title_reset') . ' · ');
 
 		Minz_View::appendScript(Minz_Url::display(
 			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 561544578..feb5483fb 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -61,13 +61,13 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'display'));
 		}
 
 		$this->view->themes = FreshRSS_Themes::get();
 
-		Minz_View::prependTitle(_t('display_configuration') . ' · ');
+		Minz_View::prependTitle(_t('conf.display.title') . ' · ');
 	}
 
 	/**
@@ -125,11 +125,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'reading'));
 		}
 
-		Minz_View::prependTitle(_t('reading_configuration') . ' · ');
+		Minz_View::prependTitle(_t('conf.reading.title') . ' · ');
 	}
 
 	/**
@@ -146,11 +146,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'sharing'));
 		}
 
-		Minz_View::prependTitle(_t('sharing') . ' · ');
+		Minz_View::prependTitle(_t('conf.sharing.title') . ' · ');
 	}
 
 	/**
@@ -188,11 +188,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('shortcuts_updated'),
+			Minz_Request::good(_t('feedback.conf.shortcuts_updated'),
 			                   array('c' => 'configure', 'a' => 'shortcut'));
 		}
 
-		Minz_View::prependTitle(_t('shortcuts') . ' · ');
+		Minz_View::prependTitle(_t('conf.shortcut.title') . ' · ');
 	}
 
 	/**
@@ -218,11 +218,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'archiving'));
 		}
 
-		Minz_View::prependTitle(_t('archiving_configuration') . ' · ');
+		Minz_View::prependTitle(_t('conf.archiving.title') . ' · ');
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 		$this->view->nb_total = $entryDAO->count();
@@ -249,13 +249,13 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 			foreach ($queries as $key => $query) {
 				if (!$query['name']) {
-					$query['name'] = _t('query_number', $key + 1);
+					$query['name'] = _t('conf.query.number', $key + 1);
 				}
 			}
 			FreshRSS_Context::$conf->_queries($queries);
 			FreshRSS_Context::$conf->save();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'queries'));
 		} else {
 			$this->view->query_get = array();
@@ -317,7 +317,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			}
 		}
 
-		Minz_View::prependTitle(_t('queries') . ' · ');
+		Minz_View::prependTitle(_t('conf.query.title') . ' · ');
 	}
 
 	/**
@@ -331,7 +331,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		$whitelist = array('get', 'order', 'name', 'search', 'state');
 		$queries = FreshRSS_Context::$conf->queries;
 		$query = Minz_Request::params();
-		$query['name'] = _t('query_number', count($queries) + 1);
+		$query['name'] = _t('conf.query.number', count($queries) + 1);
 		foreach ($query as $key => $value) {
 			if (!in_array($key, $whitelist)) {
 				unset($query[$key]);
@@ -341,7 +341,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		FreshRSS_Context::$conf->_queries($queries);
 		FreshRSS_Context::$conf->save();
 
-		Minz_Request::good(_t('query_created', $query['name']),
+		Minz_Request::good(_t('feedback.conf.query_created', $query['name']),
 		                   array('c' => 'configure', 'a' => 'queries'));
 	}
 }
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index b4beed619..c894ae9aa 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -85,7 +85,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		}
 
 		if (!$this->ajax) {
-			Minz_Request::good(_t('feeds_marked_read'), array(
+			Minz_Request::good(_t('feedback.sub.feed.marked_read'), array(
 				'c' => 'index',
 				'a' => 'index',
 				'params' => $params,
@@ -144,7 +144,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$feedDAO->updateCachedValues();
 
 		invalidateHttpCache();
-		Minz_Request::good(_t('optimization_complete'), $url_redirect);
+		Minz_Request::good(_t('feedback.admin.optimization_complete'), $url_redirect);
 	}
 
 	/**
@@ -185,7 +185,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$feedDAO->updateCachedValues();
 
 		invalidateHttpCache();
-		Minz_Request::good(_t('purge_completed', $nb_total), array(
+		Minz_Request::good(_t('feedback.sub.purge_completed', $nb_total), array(
 			'c' => 'configure',
 			'a' => 'archiving'
 		));
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 6c080bea8..06fa186cf 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -37,11 +37,11 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 		if ($this->view->errorMessage == '') {
 			switch($code_int) {
 			case 403:
-				$this->view->errorMessage = _t('access_denied');
+				$this->view->errorMessage = _t('feedback.access.denied');
 				break;
 			case 404:
 			default:
-				$this->view->errorMessage = _t('page_not_found');
+				$this->view->errorMessage = _t('feedback.access.not_found');
 				break;
 			}
 		}
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c8727c727..121cb8921 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -68,7 +68,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$limits = Minz_Configuration::limits();
 		$this->view->feeds = $feedDAO->listFeeds();
 		if (count($this->view->feeds) >= $limits['max_feeds']) {
-			Minz_Request::bad(_t('sub.feeds.over_max', $limits['max_feeds']),
+			Minz_Request::bad(_t('feedback.sub.feed.over_max', $limits['max_feeds']),
 			                  $url_redirect);
 		}
 
@@ -110,7 +110,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			} catch (FreshRSS_BadUrl_Exception $e) {
 				// Given url was not a valid url!
 				Minz_Log::warning($e->getMessage());
-				Minz_Request::bad(_t('invalid_url', $url), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.feed.invalid_url', $url), $url_redirect);
 			}
 
 			try {
@@ -119,20 +119,23 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				// Something went bad (timeout, server not found, etc.)
 				Minz_Log::warning($e->getMessage());
 				Minz_Request::bad(
-					_t('internal_problem_feed', _url('index', 'logs')),
+					_t('feedback.sub.feed.internal_problem', _url('index', 'logs')),
 					$url_redirect
 				);
 			} catch (Minz_FileNotExistException $e) {
 				// Cache directory doesn't exist!
 				Minz_Log::error($e->getMessage());
 				Minz_Request::bad(
-					_t('internal_problem_feed', _url('index', 'logs')),
+					_t('feedback.sub.feed.internal_problem', _url('index', 'logs')),
 					$url_redirect
 				);
 			}
 
 			if ($feedDAO->searchByUrl($feed->url())) {
-				Minz_Request::bad(_t('already_subscribed', $feed->name()), $url_redirect);
+				Minz_Request::bad(
+					_t('feedback.sub.feed.already_subscribed', $feed->name()),
+					$url_redirect
+				);
 			}
 
 			$feed->_category($cat);
@@ -151,7 +154,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$id = $feedDAO->addFeed($values);
 			if (!$id) {
 				// There was an error in database... we cannot say what here.
-				Minz_Request::bad(_t('feed_not_added', $feed->name()), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.feed.not_added', $feed->name()), $url_redirect);
 			}
 
 			// Ok, feed has been added in database. Now we have to refresh entries.
@@ -185,10 +188,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			// Entries are in DB, we redirect to feed configuration page.
 			$url_redirect['params']['id'] = $feed->id();
-			Minz_Request::good(_t('feed_added', $feed->name()), $url_redirect);
+			Minz_Request::good(_t('feedback.sub.feed.added', $feed->name()), $url_redirect);
 		} else {
 			// GET request: we must ask confirmation to user before adding feed.
-			Minz_View::prependTitle(_t('add_rss_feed') . ' · ');
+			Minz_View::prependTitle(_t('sub.feed.title_add') . ' · ');
 
 			$this->view->categories = $this->catDAO->listCategories(false);
 			$this->view->feed = new FreshRSS_Feed($url);
@@ -204,7 +207,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($feed) {
 				// Already subscribe so we redirect to the feed configuration page.
 				$url_redirect['params']['id'] = $feed->id();
-				Minz_Request::good(_t('already_subscribed', $feed->name()), $url_redirect);
+				Minz_Request::good(_t('feedback.sub.feed.already_subscribed', $feed->name()), $url_redirect);
 			}
 		}
 	}
@@ -234,9 +237,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		invalidateHttpCache();
 		if ($n === false) {
-			Minz_Request::bad(_t('error_occurred'), $url_redirect);
+			Minz_Request::bad(_t('feedback.sub.feed.error'), $url_redirect);
 		} else {
-			Minz_Request::good(_t('n_entries_deleted', $n), $url_redirect);
+			Minz_Request::good(_t('feedback.sub.feed.n_entries_deleted', $n), $url_redirect);
 		}
 	}
 
@@ -381,7 +384,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// are several updated feeds.
 			$notif = array(
 				'type' => 'good',
-				'content' => _t('feeds_actualized')
+				'content' => _t('feedback.sub.feed.actualizeds')
 			);
 			Minz_Session::_param('notification', $notif);
 			// No layout in ajax request.
@@ -392,13 +395,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		// Redirect to the main page with correct notification.
 		if ($updated_feeds === 1) {
 			$feed = reset($feeds);
-			Minz_Request::good(_t('feed_actualized', $feed->name()), array(
+			Minz_Request::good(_t('feedback.sub.feed.actualized', $feed->name()), array(
 				'params' => array('get' => 'f_' . $feed->id())
 			));
 		} elseif ($updated_feeds > 1) {
-			Minz_Request::good(_t('n_feeds_actualized', $updated_feeds), array());
+			Minz_Request::good(_t('feedback.sub.feed.n_actualized', $updated_feeds), array());
 		} else {
-			Minz_Request::good(_t('no_feed_to_refresh'), array());
+			Minz_Request::good(_t('feedback.sub.feed.no_refresh'), array());
 		}
 	}
 
@@ -476,9 +479,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			FreshRSS_Context::$conf->remove_query_by_get('f_' . $id);
 			FreshRSS_Context::$conf->save();
 
-			Minz_Request::good(_t('feed_deleted'), $redirect_url);
+			Minz_Request::good(_t('feedback.sub.feed.deleted'), $redirect_url);
 		} else {
-			Minz_Request::bad(_t('error_occurred'), $redirect_url);
+			Minz_Request::bad(_t('feedback.sub.feed.error'), $redirect_url);
 		}
 	}
 }
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 1ed2b6bbf..6152b7252 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -106,9 +106,9 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 				$this->view->feed->_category($cat);
 				$this->view->feed->faviconPrepare();
 
-				Minz_Request::good(_t('feedback.sub.feed_updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
+				Minz_Request::good(_t('feedback.sub.feed.updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
 			} else {
-				Minz_Request::bad(_t('feedback.sub.error_occurred'), array('c' => 'subscription'));
+				Minz_Request::bad(_t('feedback.sub.error'), array('c' => 'subscription'));
 			}
 		}
 	}
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 2dac57d91..05077cf66 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -1,6 +1,10 @@
 <?php
 
 return array(
+	'auth' => array(
+		'title' => 'Authentication',
+		'title_reset' => 'Authentication reset',
+	),
 	'check_install' => array(
 		'cache' => array(
 			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 460804774..0a1aa9f8e 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -1,7 +1,26 @@
 <?php
 
 return array(
-	'users' => array(
+	'archiving' => array(
+		'title' => 'Archiving',
+	),
+	'display' => array(
+		'title' => 'Display',
+	),
+	'query' => array(
+		'number' => 'Query n°%d',
+		'title' => 'User queries',
+	),
+	'reading' => array(
+		'title' => 'Reading',
+	),
+	'sharing' => array(
+		'title' => 'Sharing',
+	),
+	'shortcut' => array(
+		'title' => 'Shortcuts',
+	),
+	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
 );
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 148ec1acc..0dcbbe44d 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -1,6 +1,13 @@
 <?php
 
 return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimization complete',
+	),
+	'access' => array(
+		'denied' => 'You don’t have permission to access this page',
+		'not_found' => 'You are looking for a page which doesn’t exist',
+	),
 	'auth' => array(
 		'form' => array(
 			'not_set' => 'A problem occured during authentication system configuration. Please retry later.',
@@ -16,9 +23,11 @@ return array(
 		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
 		'not_persona' => 'Only Persona system can be reset.',
 	),
-	'configuration' => array(
-		'updated' => 'Configuration has been updated',
+	'conf' => array(
 		'error' => 'An error occurred during configuration saving',
+		'query_created' => 'Query "%s" has been created.',
+		'shortcuts_updated' => 'Shortcuts have been updated',
+		'updated' => 'Configuration has been updated',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
@@ -43,10 +52,23 @@ return array(
 			'updated' => 'Category has been updated.',
 		),
 		'feed' => array(
+			'actualized' => '<em>%s</em> has been updated',
+			'actualizeds' => 'RSS feeds have been updated',
+			'added' => 'RSS feed <em>%s</em> has been added',
+			'already_subscribed' => 'You have already subscribed to <em>%s</em>',
+			'deleted' => 'Feed has been deleted',
 			'error' => 'Feed cannot be updated',
+			'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
+			'invalid_url' => 'URL <em>%s</em> is invalid',
+			'marked_read' => 'Feeds have been marked as read',
+			'n_actualized' => '%d feeds have been updated',
+			'n_entries_deleted' => '%d articles have been deleted',
+			'no_refresh' => 'There is no feed to refresh…',
+			'not_added' => '<em>%s</em> could not be added',
 			'over_max' => 'You have reached your limit of feeds (%d)',
 			'updated' => 'Feed has been updated',
 		),
+		'purge_completed' => 'Purge completed (%d articles deleted)',
 	),
 	'user_profile' => array(
 		'updated' => 'Your profile has been modified',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 48bda04a1..2a858d6a6 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -130,12 +130,10 @@ return array(
 		'user_profile' => 'Profile',
 	),
 	'freshrss' => 'FreshRSS',
-	'access_denied' => 'You don’t have permission to access this page',
 	'activate_sharing' => 'Activate sharing',
 	'after_onread' => 'After “mark all as read”,',
 	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
 	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
-	'already_subscribed' => 'You have already subscribed to <em>%s</em>',
 	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
 	'article' => 'Article',
@@ -150,7 +148,6 @@ return array(
 	'auth_form' => 'Web form (traditional, requires JavaScript)',
 	'auth_none' => 'None (dangerous)',
 	'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
-	'auth_reset' => 'Authentication reset',
 	'auth_token' => 'Authentication token',
 	'auth_type' => 'Authentication method',
 	'auth_will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
@@ -205,13 +202,7 @@ return array(
 	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feed' => 'Feed',
-	'feed_actualized' => '<em>%s</em> has been updated',
-	'feed_added' => 'RSS feed <em>%s</em> has been added',
-	'feed_deleted' => 'Feed has been deleted',
-	'feed_not_added' => '<em>%s</em> could not be added',
 	'feeds' => 'Feeds',
-	'feeds_actualized' => 'RSS feeds have been updated',
-	'feeds_marked_read' => 'Feeds have been marked as read',
 	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'finish_installation' => 'Complete installation',
 	'first_article' => 'Skip to the first article',
@@ -231,8 +222,6 @@ return array(
 	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
 	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
 	'installation_step' => 'Installation — step %d · FreshRSS',
-	'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
-	'invalid_url' => 'URL <em>%s</em> is invalid',
 	'is_admin' => 'is administrator',
 	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
@@ -253,13 +242,10 @@ return array(
 	'minz_is_ok' => 'You have the Minz framework',
 	'month' => 'months',
 	'more_information' => 'More information',
-	'n_entries_deleted' => '%d articles have been deleted',
-	'n_feeds_actualized' => '%d feeds have been updated',
 	'next_article' => 'Skip to the next article',
 	'next_page' => 'Skip to the next page',
 	'next_step' => 'Go to the next step',
 	'no_feed_actualized' => 'No RSS feed has been updated',
-	'no_feed_to_refresh' => 'There is no feed to refresh…',
 	'no_query' => 'You haven’t created any user query yet.',
 	'no_query_filter' => 'No filter',
 	'no_rss_feed' => 'No RSS feed',
@@ -270,10 +256,8 @@ return array(
 	'not_yet_implemented' => 'Not yet implemented',
 	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
 	'number_feeds' => '%d feeds',
-	'optimization_complete' => 'Optimization complete',
 	'optimize_bdd' => 'Optimize database',
 	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-	'page_not_found' => 'You are looking for a page which doesn’t exist',
 	'password' => 'Password',
 	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
 	'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
@@ -290,16 +274,13 @@ return array(
 	'previous_page' => 'Skip to the previous page',
 	'public' => 'Public',
 	'publication_date' => 'Date of publication',
-	'purge_completed' => 'Purge completed (%d articles deleted)',
 	'purge_now' => 'Purge now',
-	'query_created' => 'Query "%s" has been created.',
 	'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
 	'query_filter' => 'Filter applied:',
 	'query_get_all' => 'Display all articles',
 	'query_get_category' => 'Display "%s" category',
 	'query_get_favorite' => 'Display favorite articles',
 	'query_get_feed' => 'Display "%s" feed',
-	'query_number' => 'Query n°%d',
 	'query_order_asc' => 'Display oldest articles first',
 	'query_order_desc' => 'Display newest articles first',
 	'query_search' => 'Search for "%s"',
@@ -332,7 +313,6 @@ return array(
 	'shortcuts_navigation' => 'Navigation',
 	'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
 	'shortcuts_other_action' => 'Other actions',
-	'shortcuts_updated' => 'Shortcuts have been updated',
 	'show_adaptive' => 'Adjust showing',
 	'show_all_articles' => 'Show all articles',
 	'sort_order' => 'Sort order',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 14268c72c..27559bbc4 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -30,6 +30,7 @@ return array(
 		'number_entries' => '%d articles',
 		'stats' => 'Statistics',
 		'title' => 'Title',
+		'title_add' => 'Add a RSS feed',
 		'ttl' => 'Do not automatically refresh more often than',
 		'url' => 'Feed URL',
 		'validator' => 'Check the validity of the feed',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 3132458b9..25c62c6ea 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -1,6 +1,10 @@
 <?php
 
 return array(
+	'auth' => array(
+		'title' => 'Authentification',
+		'title_reset' => 'Réinitialisation de l’authentification',
+	),
 	'check_install' => array(
 		'cache' => array(
 			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 460804774..deba4509e 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -1,7 +1,26 @@
 <?php
 
 return array(
-	'users' => array(
+	'archiving' => array(
+		'title' => 'Archivage',
+	),
+	'display' => array(
+		'title' => 'Affichage',
+	),
+	'query' => array(
+		'number' => 'Filtre n°%d',
+		'title' => 'Filtres utilisateurs',
+	),
+	'reading' => array(
+		'title' => 'Lecture',
+	),
+	'sharing' => array(
+		'title' => 'Partage',
+	),
+	'shortcut' => array(
+		'title' => 'Raccourcis',
+	),
+	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
 );
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index d79d3eccd..539fce55d 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -1,6 +1,13 @@
 <?php
 
 return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimisation terminée.',
+	),
+	'access' => array(
+		'denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
+		'not_found' => 'La page que vous cherchez n’existe pas !',
+	),
 	'auth' => array(
 		'form' => array(
 			'not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
@@ -16,9 +23,11 @@ return array(
 		'no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
 		'not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
 	),
-	'configuration' => array(
+	'conf' => array(
+		'error' => 'Une erreur est survenue durant la sauvegarde de la configuration',
+		'query_created' => 'Le filtre "%s" a bien été créé.',
+		'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
 		'updated' => 'La configuration a été mise à jour',
-		'error' => 'Une erreur est survenue en sauvegardant la configuration',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
@@ -43,10 +52,23 @@ return array(
 			'updated' => 'La catégorie a été mise à jour.',
 		),
 		'feed' => array(
-			'error' => 'Le flux n’a pas pu être modifié',
+			'actualized' => '<em>%s</em> a été mis à jour.',
+			'actualizeds' => 'Les flux ont été mis à jour.',
+			'added' => 'Le flux <em>%s</em> a bien été ajouté.',
+			'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
+			'deleted' => 'Le flux a été supprimé.',
+			'error' => 'Une erreur est survenue',
+			'internal_problem' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+			'invalid_url' => 'L’url <em>%s</em> est invalide.',
+			'marked_read' => 'Les flux ont été marqués comme lus.',
+			'n_actualized' => '%d flux ont été mis à jour.',
+			'n_entries_deleted' => '%d articles ont été supprimés.',
+			'no_refresh' => 'Il n’y a aucun flux à actualiser…',
+			'not_added' => '<em>%s</em> n’a pas pu être ajouté.',
 			'over_max' => 'Vous avez atteint votre limite de flux (%d)',
 			'updated' => 'Le flux a été mis à jour',
 		),
+		'purge_completed' => 'Purge effectuée (%d articles supprimés).',
 	),
 	'user_profile' => array(
 		'updated' => 'Votre profil a été mis à jour',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 55941c39d..f67ee3d52 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -15,14 +15,12 @@ return array(
 		'mark_read' => 'Marquer comme lu',
 		'remove' => 'Supprimer',
 		'see_website' => 'Voir le site',
-		'truncate' => 'Supprimer tous les articles',
 		'submit' => 'Valider',
+		'truncate' => 'Supprimer tous les articles',
 	),
 	'auth' => array(
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
-		'title' => 'Authentification',
-		'title_reset' => 'Réinitialisation de l’authentification',
 	),
 	'date' => array(
 		'Apr' => '\\a\\v\\r\\i\\l',
@@ -131,12 +129,10 @@ return array(
 		'user_profile' => 'Profil',
 	),
 	'freshrss' => 'FreshRSS',
-	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
 	'activate_sharing' => 'Activer le partage',
 	'after_onread' => 'Après “marquer tout comme lu”,',
 	'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
 	'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
-	'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
 	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
 	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 	'article' => 'Article',
@@ -205,13 +201,7 @@ return array(
 	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
 	'feed' => 'Flux',
-	'feed_actualized' => '<em>%s</em> a été mis à jour.',
-	'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
-	'feed_deleted' => 'Le flux a été supprimé.',
-	'feed_not_added' => '<em>%s</em> n’a pas pu être ajouté.',
 	'feeds' => 'Flux',
-	'feeds_actualized' => 'Les flux ont été mis à jour.',
-	'feeds_marked_read' => 'Les flux ont été marqués comme lus.',
 	'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
 	'finish_installation' => 'Terminer l’installation',
 	'first_article' => 'Passer au premier article',
@@ -231,8 +221,6 @@ return array(
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
 	'installation_step' => 'Installation — étape %d · FreshRSS',
-	'internal_problem_feed' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
-	'invalid_url' => 'L’url <em>%s</em> est invalide.',
 	'is_admin' => 'est administrateur',
 	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
 	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
@@ -253,13 +241,10 @@ return array(
 	'minz_is_ok' => 'Vous disposez du framework Minz',
 	'month' => 'mois',
 	'more_information' => 'Plus d’informations',
-	'n_entries_deleted' => '%d articles ont été supprimés.',
-	'n_feeds_actualized' => '%d flux ont été mis à jour.',
 	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
 	'next_step' => 'Passer à l’étape suivante',
 	'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
-	'no_feed_to_refresh' => 'Il n’y a aucun flux à actualiser…',
 	'no_query' => 'Vous n’avez pas encore créé de filtre.',
 	'no_query_filter' => 'Aucun filtre appliqué',
 	'no_rss_feed' => 'Aucun flux RSS',
@@ -270,10 +255,8 @@ return array(
 	'not_yet_implemented' => 'Pas encore implémenté',
 	'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
 	'number_feeds' => '%d flux',
-	'optimization_complete' => 'Optimisation terminée.',
 	'optimize_bdd' => 'Optimiser la base de données',
 	'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD',
-	'page_not_found' => 'La page que vous cherchez n’existe pas !',
 	'password' => 'Mot de passe',
 	'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 	'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
@@ -290,16 +273,13 @@ return array(
 	'previous_page' => 'Passer à la page précédente',
 	'public' => 'Public',
 	'publication_date' => 'Date de publication',
-	'purge_completed' => 'Purge effectuée (%d articles supprimés).',
 	'purge_now' => 'Purger maintenant',
-	'query_created' => 'Le filtre "%s" a bien été créé.',
 	'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
 	'query_filter' => 'Filtres appliqués :',
 	'query_get_all' => 'Afficher tous les articles',
 	'query_get_category' => 'Afficher la catégorie "%s"',
 	'query_get_favorite' => 'Afficher les articles favoris',
 	'query_get_feed' => 'Afficher le flux "%s"',
-	'query_number' => 'Filtre n°%d',
 	'query_order_asc' => 'Afficher les articles les plus anciens en premier',
 	'query_order_desc' => 'Afficher les articles les plus récents en premier',
 	'query_search' => 'Recherche de "%s"',
@@ -332,7 +312,6 @@ return array(
 	'shortcuts_navigation' => 'Navigation',
 	'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
 	'shortcuts_other_action' => 'Autres actions',
-	'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
 	'show_adaptive' => 'Adapter l’affichage',
 	'show_all_articles' => 'Afficher tous les articles',
 	'sort_order' => 'Ordre de tri',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index 0257c8b4d..b9d9f4bc2 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -30,6 +30,7 @@ return array(
 		'number_entries' => '%d articles',
 		'stats' => 'Statistiques',
 		'title' => 'Titre',
+		'title_add' => 'Ajouter un flux RSS',
 		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
 		'url' => 'URL du flux',
 		'validator' => 'Vérifier la valididé du flux',

From 59fc73baa9cbd87fdc2d63e83533a36533c740bf Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 19:32:59 +0100
Subject: [PATCH 227/363] Fix i18n for update and user controllers

---
 app/Controllers/updateController.php | 30 ++++++++++++++--------------
 app/Controllers/userController.php   | 12 +++++------
 app/i18n/en/admin.php                |  5 +++++
 app/i18n/en/conf.php                 |  3 +++
 app/i18n/en/feedback.php             | 21 ++++++++++++++++++-
 app/i18n/en/gen.php                  | 15 --------------
 app/i18n/fr/admin.php                |  7 ++++++-
 app/i18n/fr/conf.php                 |  3 +++
 app/i18n/fr/feedback.php             | 21 ++++++++++++++++++-
 app/i18n/fr/gen.php                  | 14 -------------
 10 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 0896b13ac..1b44a739c 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -20,21 +20,21 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	}
 
 	public function indexAction() {
-		Minz_View::prependTitle(_t('update_system') . ' · ');
+		Minz_View::prependTitle(_t('admin.update.title') . ' · ');
 
 		if (file_exists(UPDATE_FILENAME) && !is_writable(FRESHRSS_PATH)) {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('file_is_nok', FRESHRSS_PATH)
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.update.file_is_nok', FRESHRSS_PATH)
 			);
 		} elseif (file_exists(UPDATE_FILENAME)) {
 			// There is an update file to apply!
 			$this->view->update_to_apply = true;
 			$this->view->message = array(
 				'status' => 'good',
-				'title' => _t('ok'),
-				'body' => _t('update_can_apply')
+				'title' => _t('gen.short.ok'),
+				'body' => _t('feedback.update.can_apply')
 			);
 		}
 	}
@@ -67,8 +67,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.update.server_not_found', FRESHRSS_UPDATE_WEBSITE)
 			);
 			return;
 		}
@@ -78,8 +78,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		if (strpos($status, 'UPDATE') !== 0) {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('no_update')
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.update.none')
 			);
 
 			@file_put_contents(DATA_PATH . '/last_update.txt', time());
@@ -93,8 +93,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		} else {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('update_problem', 'Cannot save the update script')
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.update.error', 'Cannot save the update script')
 			);
 		}
 	}
@@ -112,9 +112,9 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			if ($res === true) {
 				@unlink(UPDATE_FILENAME);
 				@file_put_contents(DATA_PATH . '/last_update.txt', time());
-				Minz_Request::good(_t('update_finished'));
+				Minz_Request::good(_t('feedback.update.finished'));
 			} else {
-				Minz_Request::bad(_t('update_problem', $res),
+				Minz_Request::bad(_t('feedback.update.error', $res),
 				                  array('c' => 'update', 'a' => 'index'));
 			}
 		}
@@ -133,7 +133,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 					'params' => array('post_conf' => true)
 				), true);
 			} else {
-				Minz_Request::bad(_t('update_problem', $res),
+				Minz_Request::bad(_t('feedback.update.error', $res),
 				                  array('c' => 'update', 'a' => 'index'));
 			}
 		}
@@ -143,7 +143,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	 * This action displays information about installation.
 	 */
 	public function checkInstallAction() {
-		Minz_View::prependTitle(_t('gen.title.check_install') . ' · ');
+		Minz_View::prependTitle(_t('admin.check_install.title') . ' · ');
 
 		$this->view->status_php = check_install_php();
 		$this->view->status_files = check_install_files();
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 5050571a9..3b40e42dc 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -23,7 +23,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 * This action displays the user profile page.
 	 */
 	public function profileAction() {
-		Minz_View::prependTitle(_t('gen.title.user_profile') . ' · ');
+		Minz_View::prependTitle(_t('conf.profile.title') . ' · ');
 
 		if (Minz_Request::isPost()) {
 			$ok = true;
@@ -71,10 +71,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			}
 
 			if ($ok) {
-				Minz_Request::good(_t('feedback.user_profile.updated'),
+				Minz_Request::good(_t('feedback.profile.updated'),
 				                   array('c' => 'user', 'a' => 'profile'));
 			} else {
-				Minz_Request::bad(_t('error_occurred'),
+				Minz_Request::bad(_t('feedback.profile.error'),
 				                  array('c' => 'user', 'a' => 'profile'));
 			}
 		}
@@ -88,7 +88,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
-		Minz_View::prependTitle(_t('gen.title.user_management') . ' · ');
+		Minz_View::prependTitle(_t('admin.user.title') . ' · ');
 
 		// Get the correct current user.
 		$username = Minz_Request::param('u', Minz_Session::param('currentUser'));
@@ -168,7 +168,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => _t($ok ? 'user_created' : 'error_occurred', $new_user_name)
+				'content' => _t('feedback.user.created' . (!$ok ? '.error' : ''), $new_user_name)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
@@ -201,7 +201,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => _t($ok ? 'user_deleted' : 'error_occurred', $username)
+				'content' => _t('feedback.user.deleted' . (!$ok ? '.error' : ''), $username)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 05077cf66..7778c56a7 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -81,6 +81,7 @@ return array(
 			'nok' => 'There is one or more lacking tables in the database.',
 			'ok' => 'Tables are existing in the database.',
 		),
+		'title' => 'Installation checking',
 		'tokens' => array(
 			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
 			'ok' => 'Permissions on tokens directory are good.',
@@ -122,7 +123,11 @@ return array(
 		'title' => 'Statistics',
 		'top_feed' => 'Top ten feeds',
 	),
+	'update' => array(
+		'title' => 'Update system',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'title' => 'Manage users',
 	),
 );
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 0a1aa9f8e..09f9fa9ce 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -11,6 +11,9 @@ return array(
 		'number' => 'Query n°%d',
 		'title' => 'User queries',
 	),
+	'profile' => array(
+		'title' => 'Profile',
+	),
 	'reading' => array(
 		'title' => 'Reading',
 	),
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 0dcbbe44d..192a33fcf 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -70,7 +70,26 @@ return array(
 		),
 		'purge_completed' => 'Purge completed (%d articles deleted)',
 	),
-	'user_profile' => array(
+	'update' => array(
+		'can_apply' => 'An update is available.',
+		'error' => 'The update process has encountered an error: %s',
+		'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
+		'finished' => 'Update completed!',
+		'none' => 'No update to apply',
+		'server_not_found' => 'Update server cannot be found. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'User %s has been created',
+			'error' => 'User %s cannot be created',
+		),
+		'deleted' => array(
+			'_' => 'User %s has been deleted',
+			'error' => 'User %s cannot be deleted',
+		),
+	),
+	'profile' => array(
+		'error' => 'Your profile cannot be modified',
 		'updated' => 'Your profile has been modified',
 	),
 );
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 2a858d6a6..761d566bf 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -123,12 +123,6 @@ return array(
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
-	'title' => array(
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
 	'freshrss' => 'FreshRSS',
 	'activate_sharing' => 'Activate sharing',
 	'after_onread' => 'After “mark all as read”,',
@@ -203,7 +197,6 @@ return array(
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feed' => 'Feed',
 	'feeds' => 'Feeds',
-	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'finish_installation' => 'Complete installation',
 	'first_article' => 'Skip to the first article',
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
@@ -250,7 +243,6 @@ return array(
 	'no_query_filter' => 'No filter',
 	'no_rss_feed' => 'No RSS feed',
 	'no_selected_feed' => 'No feed selected.',
-	'no_update' => 'No update to apply',
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
@@ -323,20 +315,13 @@ return array(
 	'top_line' => 'Top line',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
-	'update_can_apply' => 'An update is available.',
 	'update_check' => 'Check for new updates',
 	'update_end' => 'Update process is completed, now you can go to the final step.',
-	'update_finished' => 'Update completed!',
 	'update_last' => 'Last verification: %s',
 	'update_long' => 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
-	'update_problem' => 'The update process has encountered an error: %s',
-	'update_server_not_found' => 'Update server cannot be found. [%s]',
 	'update_start' => 'Start update process',
-	'update_system' => 'Update system',
 	'updated' => 'Modifications have been updated',
 	'upon_reception' => 'upon reception of the article',
-	'user_created' => 'User %s has been created',
-	'user_deleted' => 'User %s has been deleted',
 	'user_filter' => 'Access user filters',
 	'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
 	'username' => 'Username',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 25c62c6ea..ffb390876 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -81,6 +81,7 @@ return array(
 			'nok' => 'Il manque une ou plusieurs tables en base de données.',
 			'ok' => 'Les tables sont bien présentes en base de données.',
 		),
+		'title' => 'Vérification de l’installation',
 		'tokens' => array(
 			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/tokens</em>. Le serveur HTTP doit être capable d’écrire dedans',
 			'ok' => 'Les droits sur le répertoire des tokens sont bons.',
@@ -122,7 +123,11 @@ return array(
 		'title' => 'Statistiques',
 		'top_feed' => 'Les dix plus gros flux',
 	),
-	'users' => array(
+	'update' => array(
+		'title' => 'Système de mise à jour',
+	),
+	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'title' => 'Gestion des utilisateurs',
 	),
 );
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index deba4509e..9f78fde87 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -11,6 +11,9 @@ return array(
 		'number' => 'Filtre n°%d',
 		'title' => 'Filtres utilisateurs',
 	),
+	'profile' => array(
+		'title' => 'Profil',
+	),
 	'reading' => array(
 		'title' => 'Lecture',
 	),
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index 539fce55d..992300c7d 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -70,7 +70,26 @@ return array(
 		),
 		'purge_completed' => 'Purge effectuée (%d articles supprimés).',
 	),
-	'user_profile' => array(
+	'update' => array(
+		'can_apply' => 'Une mise à jour est disponible.',
+		'error' => 'La mise à jour a rencontré un problème : %s',
+		'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
+		'finished' => 'La mise à jour est terminée !',
+		'none' => 'Aucune mise à jour à appliquer',
+		'server_not_found' => 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'L’utilisateur %s a été créé.',
+			'error' => 'L’utilisateur %s ne peut pas être créé.',
+		),
+		'deleted' => array(
+			'_' => 'L’utilisateur %s a été supprimé.',
+			'error' => 'L’utilisateur %s ne peut pas être supprimé.',
+		),
+	),
+	'profile' => array(
+		'error' => 'Votre profil n’a pas pu être mis à jour',
 		'updated' => 'Votre profil a été mis à jour',
 	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index f67ee3d52..1866f8e22 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -123,11 +123,6 @@ return array(
 		'or' => 'ou',
 		'yes' => 'Oui',
 	),
-	'title' => array(
-		'check_install' => 'Vérification de l’installation',
-		'user_management' => 'Gestion des utilisateurs',
-		'user_profile' => 'Profil',
-	),
 	'freshrss' => 'FreshRSS',
 	'activate_sharing' => 'Activer le partage',
 	'after_onread' => 'Après “marquer tout comme lu”,',
@@ -202,7 +197,6 @@ return array(
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
 	'feed' => 'Flux',
 	'feeds' => 'Flux',
-	'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
 	'finish_installation' => 'Terminer l’installation',
 	'first_article' => 'Passer au premier article',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
@@ -249,7 +243,6 @@ return array(
 	'no_query_filter' => 'Aucun filtre appliqué',
 	'no_rss_feed' => 'Aucun flux RSS',
 	'no_selected_feed' => 'Aucun flux sélectionné.',
-	'no_update' => 'Aucune mise à jour à appliquer',
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
@@ -322,20 +315,13 @@ return array(
 	'top_line' => 'Ligne du haut',
 	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	'update_apply' => 'Appliquer la mise à jour',
-	'update_can_apply' => 'Une mise à jour est disponible.',
 	'update_check' => 'Vérifier les mises à jour',
 	'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
-	'update_finished' => 'La mise à jour est terminée !',
 	'update_last' => 'Dernière vérification : %s',
 	'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
-	'update_problem' => 'La mise à jour a rencontré un problème : %s',
-	'update_server_not_found' => 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
 	'update_start' => 'Lancer la mise à jour',
-	'update_system' => 'Système de mise à jour',
 	'updated' => 'Modifications enregistrées.',
 	'upon_reception' => 'dès la réception du nouvel article',
-	'user_created' => 'L’utilisateur %s a été créé.',
-	'user_deleted' => 'L’utilisateur %s a été supprimé.',
 	'user_filter' => 'Accéder aux filtres utilisateur',
 	'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	'username' => 'Nom d’utilisateur',

From a84e9e50bfe17ab1c84ff22ec7accdfd0b9a76db Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 21:15:01 +0100
Subject: [PATCH 228/363] Fix french i18n for auth and configure views

---
 app/i18n/en/admin.php               |  11 +++
 app/i18n/en/gen.php                 |  34 +++----
 app/i18n/en/index.php               |   4 +-
 app/i18n/fr/admin.php               |  11 +++
 app/i18n/fr/conf.php                | 133 ++++++++++++++++++++++++++++
 app/i18n/fr/gen.php                 | 130 ++++-----------------------
 app/i18n/fr/index.php               |   9 +-
 app/views/auth/formLogin.phtml      |  14 +--
 app/views/auth/index.phtml          |  32 +++----
 app/views/auth/personaLogin.phtml   |   8 +-
 app/views/auth/reset.phtml          |  14 +--
 app/views/configure/archiving.phtml |  36 ++++----
 app/views/configure/display.phtml   |  44 ++++-----
 app/views/configure/queries.phtml   |  26 +++---
 app/views/configure/reading.phtml   |  78 ++++++++--------
 app/views/configure/sharing.phtml   |  24 ++---
 app/views/configure/shortcut.phtml  |  52 +++++------
 app/views/index/normal.phtml        |   2 +-
 app/views/index/reader.phtml        |   2 +-
 19 files changed, 358 insertions(+), 306 deletions(-)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 7778c56a7..b79b17bc4 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -2,8 +2,19 @@
 
 return array(
 	'auth' => array(
+		'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
+		'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
+		'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
+		'form' => 'Web form (traditional, requires JavaScript)',
+		'http' => 'HTTP (for advanced users with HTTPS)',
+		'none' => 'None (dangerous)',
+		'persona' => 'Mozilla Persona (modern, requires JavaScript)',
 		'title' => 'Authentication',
 		'title_reset' => 'Authentication reset',
+		'token' => 'Authentication token',
+		'token_help' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
+		'type' => 'Authentication method',
+		'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	),
 	'check_install' => array(
 		'cache' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 761d566bf..a460910bd 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -19,8 +19,16 @@ return array(
 		'truncate' => 'Delete all articles',
 	),
 	'auth' => array(
+		'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 		'login' => 'Login',
+		'login_persona' => 'Login with Persona',
+		'login_persona_problem' => 'Connection problem with Persona?',
 		'logout' => 'Logout',
+		'password' => 'Password',
+		'reset' => 'Authentication reset',
+		'username' => 'Username',
+		'username_admin' => 'Administrator username',
+		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\A\\p\\r\\i\\l',
@@ -76,6 +84,10 @@ return array(
 		'wed' => 'Wed',
 		'yesterday' => 'Yesterday',
 	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'About FreshRSS',
+	),
 	'js' => array(
 		'category_empty' => 'Empty category',
 		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
@@ -83,6 +95,7 @@ return array(
 		'new_article' => 'There are new available articles, click to refresh the page.',
 		'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS: new articles!',
+		'should_be_activated' => 'JavaScript must be enabled',
 	),
 	'menu' => array(
 		'about' => 'About',
@@ -123,12 +136,9 @@ return array(
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
-	'freshrss' => 'FreshRSS',
+
 	'activate_sharing' => 'Activate sharing',
 	'after_onread' => 'After “mark all as read”,',
-	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
-	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
-	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
 	'article' => 'Article',
 	'article_icons' => 'Article icons',
@@ -139,12 +149,6 @@ return array(
 	'articles' => 'articles',
 	'articles_per_page' => 'Number of articles per page',
 	'articles_to_display' => 'Articles to display',
-	'auth_form' => 'Web form (traditional, requires JavaScript)',
-	'auth_none' => 'None (dangerous)',
-	'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
-	'auth_token' => 'Authentication token',
-	'auth_type' => 'Authentication method',
-	'auth_will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	'author' => 'Author',
 	'auto_load_more' => 'Load next articles at the page bottom',
 	'auto_read_when' => 'Mark article as read…',
@@ -193,7 +197,6 @@ return array(
 	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
 	'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
 	'dom_is_ok' => 'You have the required library to browse the DOM',
-	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feed' => 'Feed',
 	'feeds' => 'Feeds',
@@ -208,7 +211,6 @@ return array(
 	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
 	'host' => 'Host',
 	'html5_notif_timeout' => 'HTML5 notification timeout',
-	'http_auth' => 'HTTP (for advanced users with HTTPS)',
 	'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
 	'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
@@ -218,16 +220,12 @@ return array(
 	'is_admin' => 'is administrator',
 	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
-	'javascript_should_be_activated' => 'JavaScript must be enabled',
 	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 	'language' => 'Language',
 	'language_defined' => 'Language has been defined.',
 	'last_article' => 'Skip to the last article',
 	'log_is_ok' => 'Permissions on logs directory are good',
-	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
-	'login_with_persona' => 'Login with Persona',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
@@ -250,7 +248,6 @@ return array(
 	'number_feeds' => '%d feeds',
 	'optimize_bdd' => 'Optimize database',
 	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-	'password' => 'Password',
 	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
 	'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 	'pcre_is_nok' => 'You lack a required library for regular expressions (php-pcre)',
@@ -313,7 +310,6 @@ return array(
 	'theme' => 'Theme',
 	'this_is_the_end' => 'This is the end',
 	'top_line' => 'Top line',
-	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
 	'update_check' => 'Check for new updates',
 	'update_end' => 'Update process is completed, now you can go to the final step.',
@@ -324,8 +320,6 @@ return array(
 	'upon_reception' => 'upon reception of the article',
 	'user_filter' => 'Access user filters',
 	'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-	'username' => 'Username',
-	'username_admin' => 'Administrator username',
 	'users' => 'Users',
 	'users_list' => 'List of users',
 	'version_update' => 'Update',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index a1a276feb..b4d48ca73 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -47,14 +47,14 @@ return array(
 		'normal_view' => 'Normal view',
 		'older_first' => 'Oldest first',
 		'queries' => 'User queries',
-		'read' => 'Show only unread',
+		'read' => 'Show only read',
 		'reader_view' => 'Reading view',
 		'rss_view' => 'RSS feed',
 		'search_short' => 'Search',
 		'starred' => 'Show only favorites',
 		'stats' => 'Statistics',
 		'subscription' => 'Subscriptions management',
-		'unread' => 'Show only read',
+		'unread' => 'Show only unread',
 	),
 	'share' => array(
 		'_' => 'Share',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index ffb390876..2268a8a38 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -2,8 +2,19 @@
 
 return array(
 	'auth' => array(
+		'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
+		'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
+		'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
+		'form' => 'Formulaire (traditionnel, requiert JavaScript)',
+		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
+		'none' => 'Aucune (dangereux)',
+		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
 		'title' => 'Authentification',
 		'title_reset' => 'Réinitialisation de l’authentification',
+		'token' => 'Jeton d’identification',
+		'token_help' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
+		'type' => 'Méthode d’authentification',
+		'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	),
 	'check_install' => array(
 		'cache' => array(
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 9f78fde87..1c8ad6d9e 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -2,28 +2,161 @@
 
 return array(
 	'archiving' => array(
+		'_' => 'Archivage',
+		'advanced' => 'Avancé',
+		'delete_after' => 'Supprimer les articles après',
+		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
+		'keep_history_by_feed' => 'Nombre minimum d’articles à conserver',
+		'optimize' => 'Optimiser la base de données',
+		'optimize_help' => 'À faire de temps en temps pour réduire la taille de la BDD',
+		'purge_now' => 'Purger maintenant',
 		'title' => 'Archivage',
+		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
 	),
 	'display' => array(
+		'_' => 'Affichage',
+		'icon' => array(
+			'bottom_line' => 'Ligne du bas',
+			'entry' => 'Icônes d’article',
+			'publication_date' => 'Date de publication',
+			'related_tags' => 'Tags associés',
+			'sharing' => 'Partage',
+			'top_line' => 'Ligne du haut',
+		),
+		'language' => 'Langue',
 		'title' => 'Affichage',
+		'notif_html5' => array(
+			'seconds' => 'secondes (0 signifie aucun timeout)',
+			'timeout' => 'Temps d’affichage de la notification HTML5',
+		),
+		'theme' => 'Thème',
+		'width' => array(
+			'content' => 'Largeur du contenu',
+			'large' => 'Large',
+			'medium' => 'Moyenne',
+			'no_limit' => 'Pas de limite',
+			'thin' => 'Fine',
+		),
 	),
 	'query' => array(
+		'_' => 'Filtres utilisateurs',
+		'deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
+		'filter' => 'Filtres appliqués :',
+		'get_all' => 'Afficher tous les articles',
+		'get_category' => 'Afficher la catégorie "%s"',
+		'get_favorite' => 'Afficher les articles favoris',
+		'get_feed' => 'Afficher le flux "%s"',
 		'number' => 'Filtre n°%d',
+		'no_filter' => 'Aucun filtre appliqué',
+		'none' => 'Vous n’avez pas encore créé de filtre.',
+		'order_asc' => 'Afficher les articles les plus anciens en premier',
+		'order_desc' => 'Afficher les articles les plus récents en premier',
+		'search' => 'Recherche de "%s"',
+		'state_0' => 'Afficher tous les articles',
+		'state_1' => 'Afficher les articles lus',
+		'state_2' => 'Afficher les articles non lus',
+		'state_3' => 'Afficher tous les articles',
+		'state_4' => 'Afficher les articles favoris',
+		'state_5' => 'Afficher les articles lus et favoris',
+		'state_6' => 'Afficher les articles non lus et favoris',
+		'state_7' => 'Afficher les articles favoris',
+		'state_8' => 'Afficher les articles non favoris',
+		'state_9' => 'Afficher les articles lus et non favoris',
+		'state_10' => 'Afficher les articles non lus et non favoris',
+		'state_11' => 'Afficher les articles non favoris',
+		'state_12' => 'Afficher tous les articles',
+		'state_13' => 'Afficher les articles lus',
+		'state_14' => 'Afficher les articles non lus',
+		'state_15' => 'Afficher tous les articles',
 		'title' => 'Filtres utilisateurs',
 	),
 	'profile' => array(
 		'title' => 'Profil',
 	),
 	'reading' => array(
+		'_' => 'Lecture',
+		'after_onread' => 'Après “marquer tout comme lu”,',
+		'articles_per_page' => 'Nombre d’articles par page',
+		'auto_load_more' => 'Charger les articles suivants en bas de page',
+		'auto_remove_article' => 'Cacher les articles après lecture',
+		'confirm_enabled' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
+		'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
+		'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
+		'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
+		'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
+		'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
+		'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
+		'read' => array(
+			'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
+			'article_viewed' => 'lorsque l’article est affiché',
+			'scroll' => 'au défilement de la page',
+			'upon_reception' => 'dès la réception du nouvel article',
+			'when' => 'Marquer un article comme lu…',
+		),
+		'show' => array(
+			'_' => 'Articles à afficher',
+			'adaptive' => 'Adapter l’affichage',
+			'all_articles' => 'Afficher tous les articles',
+			'unread' => 'Afficher les non lus',
+		),
+		'sort' => array(
+			'_' => 'Ordre de tri',
+			'newer_first' => 'Plus récents en premier',
+			'older_first' => 'Plus anciens en premier',
+		),
+		'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 		'title' => 'Lecture',
+		'view' => array(
+			'default' => 'Vue par défaut',
+			'global' => 'Vue globale',
+			'normal' => 'Vue normale',
+			'reader' => 'Vue lecture',
+		),
 	),
 	'sharing' => array(
+		'_' => 'Partage',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Plus d’informations',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Nom du partage à afficher',
+		'share_url' => 'URL du partage à utiliser',
 		'title' => 'Partage',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
+		'_' => 'Raccourcis',
+		'article_action' => 'Actions associées à l’article courant',
+		'auto_share' => 'Partager',
+		'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+		'close_dropdown' => 'Fermer les menus',
+		'collapse_article' => 'Refermer',
+		'first_article' => 'Passer au premier article',
+		'focus_search' => 'Accéder à la recherche',
+		'help' => 'Afficher la documentation',
+		'last_article' => 'Passer au dernier article',
+		'load_more' => 'Charger plus d’articles',
+		'mark_read' => 'Marquer comme lu',
+		'mark_favorite' => 'Mettre en favori',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
+		'next_article' => 'Passer à l’article suivant',
+		'other_action' => 'Autres actions',
+		'previous_article' => 'Passer à l’article précédent',
+		'see_on_website' => 'Voir sur le site d’origine',
+		'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
 		'title' => 'Raccourcis',
+		'user_filter' => 'Accéder aux filtres utilisateur',
+		'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'current' => 'Utilisateur actuel',
+		'users' => 'Utilisateurs',
 	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 1866f8e22..c2eb0e394 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -13,14 +13,23 @@ return array(
 		'import' => 'Importer',
 		'manage' => 'Gérer',
 		'mark_read' => 'Marquer comme lu',
+		'mark_favorite' => 'Mettre en favori',
 		'remove' => 'Supprimer',
 		'see_website' => 'Voir le site',
 		'submit' => 'Valider',
 		'truncate' => 'Supprimer tous les articles',
 	),
 	'auth' => array(
+		'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
 		'login' => 'Connexion',
+		'login_persona' => 'Connexion avec Persona',
+		'login_persona_problem' => 'Problème de connexion à Persona ?',
 		'logout' => 'Déconnexion',
+		'password' => 'Mot de passe',
+		'reset' => 'Réinitialisation de l’authentification',
+		'username' => 'Nom d’utilisateur',
+		'username_admin' => 'Nom d’utilisateur administrateur',
+		'will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\a\\v\\r\\i\\l',
@@ -62,6 +71,7 @@ return array(
 		'march' => 'mars',
 		'may' => 'mai.',
 		'mon' => 'lun.',
+		'month' => 'mois',
 		'nov' => 'nov.',
 		'november' => 'novembre',
 		'oct' => 'oct.',
@@ -76,6 +86,10 @@ return array(
 		'wed' => 'mer.',
 		'yesterday' => 'Hier',
 	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'À propos de FreshRSS',
+	),
 	'js' => array(
 		'category_empty' => 'Catégorie vide',
 		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
@@ -83,6 +97,7 @@ return array(
 		'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 		'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
+		'should_be_activated' => 'Le JavaScript doit être activé.',
 	),
 	'menu' => array(
 		'about' => 'À propos',
@@ -115,6 +130,7 @@ return array(
 	'short' => array(
 		'attention' => 'Attention !',
 		'blank_to_disable' => 'Laissez vide pour désactiver',
+		'by_author' => 'Par <em>%s</em>',
 		'by_default' => 'Par défaut',
 		'damn' => 'Arf !',
 		'no' => 'Non',
@@ -123,34 +139,13 @@ return array(
 		'or' => 'ou',
 		'yes' => 'Oui',
 	),
-	'freshrss' => 'FreshRSS',
+
 	'activate_sharing' => 'Activer le partage',
-	'after_onread' => 'Après “marquer tout comme lu”,',
-	'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
-	'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
-	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 	'article' => 'Article',
-	'article_icons' => 'Icônes d’article',
-	'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
 	'article_published_on' => 'Article publié initialement sur <a href="%s">%s</a>',
 	'article_published_on_author' => 'Article publié initialement sur <a href="%s">%s</a> par %s',
-	'article_viewed' => 'lorsque l’article est affiché',
 	'articles' => 'articles',
-	'articles_per_page' => 'Nombre d’articles par page',
-	'articles_to_display' => 'Articles à afficher',
-	'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
-	'auth_none' => 'Aucune (dangereux)',
-	'auth_persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
-	'auth_token' => 'Jeton d’identification',
-	'auth_type' => 'Méthode d’authentification',
-	'auth_will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
 	'author' => 'Auteur',
-	'auto_load_more' => 'Charger les articles suivants en bas de page',
-	'auto_read_when' => 'Marquer un article comme lu…',
-	'auto_remove_article' => 'Cacher les articles après lecture',
-	'auto_share' => 'Partager',
-	'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
 	'base_url' => 'Base de l’URL',
 	'bdd' => 'Base de données',
@@ -158,7 +153,6 @@ return array(
 	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
 	'bdd_configuration' => 'Base de données',
 	'bdd_type' => 'Type de base de données',
-	'bottom_line' => 'Ligne du bas',
 	'by' => 'par',
 	'by_email' => 'Par courriel',
 	'by_feed' => 'par flux',
@@ -172,85 +166,51 @@ return array(
 	'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
 	'checks' => 'Vérifications',
 	'choose_language' => 'Choisissez la langue pour FreshRSS',
-	'collapse_article' => 'Refermer',
 	'congratulations' => 'Félicitations !',
-	'content_width' => 'Largeur du contenu',
 	'create' => 'Créer',
 	'create_user' => 'Créer un nouvel utilisateur',
 	'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
 	'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
 	'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
 	'curl_is_ok' => 'Vous disposez de cURL dans sa version %s',
-	'current_user' => 'Utilisateur actuel',
 	'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
 	'default_category' => 'Sans catégorie',
 	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
-	'default_view' => 'Vue par défaut',
-	'delete_articles_every' => 'Supprimer les articles après',
 	'display' => 'Affichage',
-	'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
-	'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
 	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
 	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
-	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
 	'feed' => 'Flux',
 	'feeds' => 'Flux',
 	'finish_installation' => 'Terminer l’installation',
-	'first_article' => 'Passer au premier article',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
-	'focus_search' => 'Accéder à la recherche',
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
-	'help' => 'Afficher la documentation',
-	'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
 	'host' => 'Hôte',
-	'html5_notif_timeout' => 'Temps d’affichage de la notification HTML5',
-	'http_auth' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
 	'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
 	'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
-	'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
 	'installation_step' => 'Installation — étape %d · FreshRSS',
 	'is_admin' => 'est administrateur',
 	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
 	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
-	'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
-	'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-	'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
-	'language' => 'Langue',
 	'language_defined' => 'La langue a bien été définie.',
-	'last_article' => 'Passer au dernier article',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
-	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
-	'login_with_persona' => 'Connexion avec Persona',
-	'mark_cat_read' => 'Marquer la catégorie comme lue',
-	'mark_favorite' => 'Mettre en favori',
-	'mark_feed_read' => 'Marquer le flux comme lu',
 	'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
 	'minz_is_ok' => 'Vous disposez du framework Minz',
-	'month' => 'mois',
-	'more_information' => 'Plus d’informations',
-	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
 	'next_step' => 'Passer à l’étape suivante',
 	'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
-	'no_query' => 'Vous n’avez pas encore créé de filtre.',
-	'no_query_filter' => 'Aucun filtre appliqué',
 	'no_rss_feed' => 'Aucun flux RSS',
 	'no_selected_feed' => 'Aucun flux sélectionné.',
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
-	'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
 	'number_feeds' => '%d flux',
-	'optimize_bdd' => 'Optimiser la base de données',
-	'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD',
-	'password' => 'Mot de passe',
 	'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 	'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 	'pcre_is_nok' => 'Il manque une librairie pour les expressions régulières (php-pcre)',
@@ -262,58 +222,12 @@ return array(
 	'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
 	'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
 	'prefix' => 'Préfixe des tables',
-	'previous_article' => 'Passer à l’article précédent',
 	'previous_page' => 'Passer à la page précédente',
 	'public' => 'Public',
-	'publication_date' => 'Date de publication',
-	'purge_now' => 'Purger maintenant',
-	'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
-	'query_filter' => 'Filtres appliqués :',
-	'query_get_all' => 'Afficher tous les articles',
-	'query_get_category' => 'Afficher la catégorie "%s"',
-	'query_get_favorite' => 'Afficher les articles favoris',
-	'query_get_feed' => 'Afficher le flux "%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_search' => 'Recherche de "%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',
 	'random_string' => 'Chaîne aléatoire',
-	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
-	'scroll' => 'au défilement de la page',
-	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
-	'see_on_website' => 'Voir sur le site d’origine',
-	'share_name' => 'Nom du partage à afficher',
-	'share_url' => 'URL du partage à utiliser',
 	'sharing_management' => 'Gestion des options de partage',
-	'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
-	'shortcuts_article_action' => 'Actions associées à l’article courant',
-	'shortcuts_navigation' => 'Navigation',
-	'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
-	'shortcuts_other_action' => 'Autres actions',
-	'show_adaptive' => 'Adapter l’affichage',
-	'show_all_articles' => 'Afficher tous les articles',
-	'sort_order' => 'Ordre de tri',
 	'steps' => 'Étapes',
-	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
-	'theme' => 'Thème',
 	'this_is_the_end' => 'This is the end',
-	'top_line' => 'Ligne du haut',
-	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_check' => 'Vérifier les mises à jour',
 	'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
@@ -321,18 +235,8 @@ return array(
 	'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
 	'update_start' => 'Lancer la mise à jour',
 	'updated' => 'Modifications enregistrées.',
-	'upon_reception' => 'dès la réception du nouvel article',
-	'user_filter' => 'Accéder aux filtres utilisateur',
-	'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-	'username' => 'Nom d’utilisateur',
-	'username_admin' => 'Nom d’utilisateur administrateur',
-	'users' => 'Utilisateurs',
 	'users_list' => 'Liste des utilisateurs',
 	'version_update' => 'Mise à jour',
-	'width_large' => 'Large',
-	'width_medium' => 'Moyenne',
-	'width_no_limit' => 'Pas de limite',
-	'width_thin' => 'Fine',
 	'your_diaspora_pod' => 'Votre pod Diaspora*',
 	'your_shaarli' => 'Votre Shaarli',
 	'your_wallabag' => 'Votre wallabag',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 0156d4cae..3279543bd 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -16,9 +16,6 @@ return array(
 		'version' => 'Version',
 		'website' => 'Site Internet',
 	),
-	'entry' => array(
-		'by_author' => 'Par <em>%s</em>',
-	),
 	'feed' => array(
 		'add' => 'Vous pouvez ajouter des flux.',
 		'empty' => 'Il n’y a aucun article à afficher.',
@@ -42,19 +39,21 @@ return array(
 		'global_view' => 'Vue globale',
 		'main_stream' => 'Flux principal',
 		'mark_all_read' => 'Tout marquer comme lu',
+		'mark_cat_read' => 'Marquer la catégorie comme lue',
+		'mark_feed_read' => 'Marquer le flux comme lu',
 		'newer_first' => 'Plus récents en premier',
 		'non-starred' => 'Afficher tout sauf les favoris',
 		'normal_view' => 'Vue normale',
 		'older_first' => 'Plus anciens en premier',
 		'queries' => 'Filtres utilisateurs',
-		'read' => 'Afficher les non lus',
+		'read' => 'Afficher les lus',
 		'reader_view' => 'Vue lecture',
 		'rss_view' => 'Flux RSS',
 		'search_short' => 'Rechercher',
 		'starred' => 'Afficher les favoris',
 		'stats' => 'Statistiques',
 		'subscription' => 'Gestion des abonnements',
-		'unread' => 'Afficher les lus',
+		'unread' => 'Afficher les non lus',
 	),
 	'share' => array(
 		'_' => 'Partager',
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 0194a11a5..979e17349 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -1,28 +1,28 @@
 <div class="prompt">
-	<h1><?php echo _t('login'); ?></h1>
+	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
-			<label for="username"><?php echo _t('username'); ?></label>
+			<label for="username"><?php echo _t('gen.auth.username'); ?></label>
 			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
 		</div>
 		<div>
-			<label for="passwordPlain"><?php echo _t('password'); ?></label>
+			<label for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
 				<input type="password" id="passwordPlain" required="required" />
 				<input type="hidden" id="challenge" name="challenge" /><br />
-				<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+				<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 		</div>
 		<div>
 			<label class="checkbox" for="keep_logged_in">
 				<input type="checkbox" name="keep_logged_in" id="keep_logged_in" value="1" />
-				<?php echo _t('keep_logged_in'); ?>
+				<?php echo _t('gen.auth.keep_logged_in'); ?>
 			</label>
 			<br />
 		</div>
 		<div>
-			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('login'); ?></button>
+			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('gen.auth.login'); ?></button>
 		</div>
 	</form>
 
-	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></p>
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
 </div>
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index 17a81f08b..420937042 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -1,22 +1,22 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('auth', 'index'); ?>">
-		<legend><?php echo _t('auth_type'); ?></legend>
+		<legend><?php echo _t('admin.auth.type'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
+			<label class="group-name" for="auth_type"><?php echo _t('admin.auth.type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type" required="required">
 					<?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?>
 						<option selected="selected"></option>
 					<?php } ?>
-					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
-					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
+					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('admin.auth.form'); ?></option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.persona'); ?></option>
+					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.http'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('admin.auth.none'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -26,7 +26,7 @@
 				<label class="checkbox" for="anon_access">
 					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
+					<?php echo _t('admin.auth.allow_anonymous', Minz_Configuration::defaultUser()); ?>
 				</label>
 			</div>
 		</div>
@@ -36,7 +36,7 @@
 				<label class="checkbox" for="anon_refresh">
 					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo Minz_Configuration::allowAnonymousRefresh() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('allow_anonymous_refresh'); ?>
+					<?php echo _t('admin.auth.allow_anonymous_refresh'); ?>
 				</label>
 			</div>
 		</div>
@@ -46,7 +46,7 @@
 				<label class="checkbox" for="unsafe_autologin">
 					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('unsafe_autologin'); ?>
+					<?php echo _t('admin.auth.unsafe_autologin'); ?>
 					<kbd>p/i/?a=formLogin&amp;u=Alice&amp;p=1234</kbd>
 				</label>
 			</div>
@@ -54,12 +54,12 @@
 
 		<?php if (Minz_Configuration::canLogIn()) { ?>
 		<div class="form-group">
-			<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
+			<label class="group-name" for="token"><?php echo _t('admin.auth.token'); ?></label>
 			<?php $token = FreshRSS_Context::$conf->token; ?>
 			<div class="group-controls">
-				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo _i('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
+				<?php echo _i('help'); ?> <?php echo _t('admin.auth.token_help', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
 		<?php } ?>
@@ -69,15 +69,15 @@
 				<label class="checkbox" for="api_enabled">
 					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo Minz_Configuration::apiEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::needsLogin() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('api_enabled'); ?>
+					<?php echo _t('admin.auth.api_enabled'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
index dd3e22b52..545ed2eac 100644
--- a/app/views/auth/personaLogin.phtml
+++ b/app/views/auth/personaLogin.phtml
@@ -1,21 +1,21 @@
 <?php if ($this->res === false) { ?>
 <div class="prompt">
-	<h1><?php echo _t('login'); ?></h1>
+	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
 	<p>
 		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
-			<?php echo _i('login'); ?> <?php echo _t('login_with_persona'); ?>
+			<?php echo _i('login'); ?> <?php echo _t('gen.auth.login_persona'); ?>
 		</a>
 
 		<br /><br />
 
 		<?php echo _i('help'); ?>
 		<small>
-			<a href="<?php echo _url('auth', 'reset'); ?>"><?php echo _t('login_persona_problem'); ?></a>
+			<a href="<?php echo _url('auth', 'reset'); ?>"><?php echo _t('gen.auth.login_persona_problem'); ?></a>
 		</small>
 	</p>
 
-	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></p>
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
 </div>
 <?php
 } else {
diff --git a/app/views/auth/reset.phtml b/app/views/auth/reset.phtml
index e501555c4..6e9816ad3 100644
--- a/app/views/auth/reset.phtml
+++ b/app/views/auth/reset.phtml
@@ -1,5 +1,5 @@
 <div class="prompt">
-	<h1><?php echo _t('auth_reset'); ?></h1>
+	<h1><?php echo _t('gen.auth.reset'); ?></h1>
 
 	<?php if (!empty($this->message)) { ?>
 	<p class="alert <?php echo $this->message['status'] === 'bad' ? 'alert-error' : 'alert-warn'; ?>">
@@ -11,22 +11,22 @@
 	<?php if (!$this->no_form) { ?>
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'reset'); ?>">
 		<p class="alert alert-warn">
-			<span class="alert-head"><?php echo _t('attention'); ?></span><br />
-			<?php echo _t('auth_will_reset'); ?>
+			<span class="alert-head"><?php echo _t('gen.short.attention'); ?></span><br />
+			<?php echo _t('gen.auth.will_reset'); ?>
 		</p>
 
 		<div>
-			<label for="username"><?php echo _t('username_admin'); ?></label>
+			<label for="username"><?php echo _t('gen.auth.username_admin'); ?></label>
 			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
 		</div>
 		<div>
-			<label for="passwordPlain"><?php echo _t('password'); ?></label>
+			<label for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
 				<input type="password" id="passwordPlain" required="required" />
 				<input type="hidden" id="challenge" name="challenge" /><br />
-				<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+				<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 		</div>
 		<div>
-			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('submit'); ?></button>
+			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
 		</div>
 	</form>
 	<?php } ?>
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 7c2d79343..4e8dfd385 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -1,31 +1,31 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'archiving'); ?>">
-		<legend><?php echo _t('archiving_configuration'); ?></legend>
-		<p><?php echo _i('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
+		<legend><?php echo _t('conf.archiving'); ?></legend>
+		<p><?php echo _i('help'); ?> <?php echo _t('conf.archiving.help'); ?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
+			<label class="group-name" for="old_entries"><?php echo _t('conf.archiving.delete_after'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$conf->old_entries; ?>" /> <?php echo _t('month'); ?>
-				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('purge_now'); ?></a>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$conf->old_entries; ?>" /> <?php echo _t('gen.date.month'); ?>
+				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('conf.archiving.purge_now'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history_default"><?php echo _t('keep_history'), ' ', _t('by_feed'); ?></label>
+			<label class="group-name" for="keep_history_default"><?php echo _t('conf.archiving.keep_history_by_feed'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
 					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . (FreshRSS_Context::$conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
-				?></select> (<?php echo _t('by_default'); ?>)
+				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl_default"><?php echo _t('ttl'); ?></label>
+			<label class="group-name" for="ttl_default"><?php echo _t('conf.archiving.ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
 					$found = false;
@@ -42,31 +42,31 @@
 					if (!$found) {
 						echo '<option value="' . intval(FreshRSS_Context::$conf->ttl_default) . '" selected="selected">' . intval(FreshRSS_Context::$conf->ttl_default) . 's</option>';
 					}
-				?></select> (<?php echo _t('by_default'); ?>)
+				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('entry', 'optimize'); ?>">
-		<legend><?php echo _t('advanced'); ?></legend>
+		<legend><?php echo _t('conf.archiving.advanced'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('current_user'); ?></label>
+			<label class="group-name"><?php echo _t('conf.user.current'); ?></label>
 			<div class="group-controls">
-				<?php echo _t('conf.users.articles_and_size', format_number($this->nb_total), format_bytes($this->size_user)); ?>
+				<?php echo _t('conf.user.articles_and_size', format_number($this->nb_total), format_bytes($this->size_user)); ?>
 			</div>
 		</div>
 
 		<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('users'); ?></label>
+			<label class="group-name"><?php echo _t('conf.user.users'); ?></label>
 			<div class="group-controls">
 				<?php echo format_bytes($this->size_total); ?>
 			</div>
@@ -75,8 +75,8 @@
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<input type="hidden" name="optimiseDatabase" value="1" />
-				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
-				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
+				<button type="submit" class="btn btn-important"><?php echo _t('conf.archiving.optimize'); ?></button>
+				<?php echo _i('help'); ?> <?php echo _t('conf.archiving.optimize_help'); ?>
 			</div>
 		</div>
 		<?php } ?>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 1c925a5ca..a245c8f5e 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -1,13 +1,13 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'display'); ?>">
-		<legend><?php echo _t('display_configuration'); ?></legend>
+		<legend><?php echo _t('conf.display'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
+			<label class="group-name" for="language"><?php echo _t('conf.display.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
 				<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
@@ -19,7 +19,7 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo _t('theme'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('conf.display.theme'); ?></label>
 			<div class="group-controls">
 				<ul class="slides">
 					<?php $slides = count($this->themes); $i = 1; ?>
@@ -38,7 +38,7 @@
 								<?php } ?>
 							</div>
 							<div class="properties">
-								<div><?php echo sprintf('%s - %s %s', $theme['name'], _t('by'), $theme['author']) ?></div>
+								<div><?php echo sprintf('%s — %s', $theme['name'], _t('gen.short.by_author', $theme['author'])); ?></div>
 								<div><?php echo $theme['description'] ?></div>
 								<div class="page-number"><?php echo sprintf('%d/%d', $i, $slides) ?></div>
 							</div>
@@ -51,42 +51,42 @@
 
 		<?php $width = FreshRSS_Context::$conf->content_width; ?>
 		<div class="form-group">
-			<label class="group-name" for="content_width"><?php echo _t('content_width'); ?></label>
+			<label class="group-name" for="content_width"><?php echo _t('conf.display.width.content'); ?></label>
 			<div class="group-controls">
 				<select name="content_width" id="content_width" required="">
 					<option value="thin" <?php echo $width === 'thin'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_thin'); ?>
+						<?php echo _t('conf.display.width.thin'); ?>
 					</option>
 					<option value="medium" <?php echo $width === 'medium'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_medium'); ?>
+						<?php echo _t('conf.display.width.medium'); ?>
 					</option>
 					<option value="large" <?php echo $width === 'large'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_large'); ?>
+						<?php echo _t('conf.display.width.large'); ?>
 					</option>
 					<option value="no_limit" <?php echo $width === 'no_limit'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_no_limit'); ?>
+						<?php echo _t('conf.display.width.no_limit'); ?>
 					</option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo _t('article_icons'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('conf.display.icon.entry'); ?></label>
 			<table>
 				<thead>
 					<tr>
 						<th> </th>
-						<th title="<?php echo _t('mark_read'); ?>"><?php echo _i('read'); ?></th>
-						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
-						<th><?php echo _t('sharing'); ?></th>
-						<th><?php echo _t('related_tags'); ?></th>
-						<th><?php echo _t('publication_date'); ?></th>
+						<th title="<?php echo _t('gen.action.mark_read'); ?>"><?php echo _i('read'); ?></th>
+						<th title="<?php echo _t('gen.action.mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
+						<th><?php echo _t('conf.display.icon.sharing'); ?></th>
+						<th><?php echo _t('conf.display.icon.related_tags'); ?></th>
+						<th><?php echo _t('conf.display.icon.publication_date'); ?></th>
 						<th><?php echo _i('link'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						<th><?php echo _t('top_line'); ?></th>
+						<th><?php echo _t('conf.display.icon.top_line'); ?></th>
 						<td><input type="checkbox" name="topline_read" value="1"<?php echo FreshRSS_Context::$conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
@@ -94,7 +94,7 @@
 						<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
-						<th><?php echo _t('bottom_line'); ?></th>
+						<th><?php echo _t('conf.display.icon.bottom_line'); ?></th>
 						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
@@ -107,16 +107,16 @@
 		</div>
 		
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo _t('html5_notif_timeout'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('conf.display.notif_html5.timeout'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$conf->html5_notif_timeout; ?>" /> <?php echo _t('conf.display.notif_html5.seconds'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index 994dfc11b..1b3a08c91 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -1,15 +1,15 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'queries'); ?>">
-		<legend><?php echo _t('queries'); ?></legend>
+		<legend><?php echo _t('conf.query'); ?></legend>
 
 		<?php foreach (FreshRSS_Context::$conf->queries as $key => $query) { ?>
 		<div class="form-group" id="query-group-<?php echo $key; ?>">
 			<label class="group-name" for="queries_<?php echo $key; ?>_name">
-				<?php echo _t('query_number', $key + 1); ?>
+				<?php echo _t('conf.query.number', $key + 1); ?>
 			</label>
 
 			<div class="group-controls">
@@ -49,31 +49,31 @@
 
 				<?php if ($exist === 0) { ?>
 				<div class="alert alert-warn">
-					<div class="alert-head"><?php echo _t('no_query_filter'); ?></div>
+					<div class="alert-head"><?php echo _t('conf.query.no_filter'); ?></div>
 				</div>
 				<?php } elseif ($deprecated) { ?>
 				<div class="alert alert-error">
-					<div class="alert-head"><?php echo _t('query_deprecated'); ?></div>
+					<div class="alert-head"><?php echo _t('conf.query.deprecated'); ?></div>
 				</div>
 				<?php } else { ?>
 				<div class="alert alert-success">
-					<div class="alert-head"><?php echo _t('query_filter'); ?></div>
+					<div class="alert-head"><?php echo _t('conf.query.filter'); ?></div>
 
 					<ul>
 						<?php if (isset($query['search'])) { ?>
-						<li class="item"><?php echo _t('query_search', $query['search']); ?></li>
+						<li class="item"><?php echo _t('conf.query.search', $query['search']); ?></li>
 						<?php } ?>
 
 						<?php if (isset($query['state'])) { ?>
-						<li class="item"><?php echo _t('query_state_' . $query['state']); ?></li>
+						<li class="item"><?php echo _t('conf.query.state_' . $query['state']); ?></li>
 						<?php } ?>
 
 						<?php if (isset($query['order'])) { ?>
-						<li class="item"><?php echo _t('query_order_' . strtolower($query['order'])); ?></li>
+						<li class="item"><?php echo _t('conf.query.order_' . strtolower($query['order'])); ?></li>
 						<?php } ?>
 
 						<?php if (isset($query['get'])) { ?>
-						<li class="item"><?php echo _t('query_get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
+						<li class="item"><?php echo _t('conf.query.get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
 						<?php } ?>
 					</ul>
 				</div>
@@ -85,12 +85,12 @@
 		<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 		<?php } else { ?>
-		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('no_query'); ?></p>
+		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('conf.query.none'); ?></p>
 		<?php } ?>
 	</form>
 
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 0f7a3347a..440ad1df8 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -1,47 +1,47 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'reading'); ?>">
-		<legend><?php echo _t('reading_configuration'); ?></legend>
+		<legend><?php echo _t('conf.reading'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo _t('articles_per_page'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('conf.reading.articles_per_page'); ?></label>
 			<div class="group-controls">
 				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$conf->posts_per_page; ?>" min="5" max="50" />
-				<?php echo _i('help'); ?> <?php echo _t('number_divided_when_reader'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('conf.reading.number_divided_when_reader'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="sort_order"><?php echo _t('sort_order'); ?></label>
+			<label class="group-name" for="sort_order"><?php echo _t('conf.reading.sort'); ?></label>
 			<div class="group-controls">
 				<select name="sort_order" id="sort_order">
-					<option value="DESC"<?php echo FreshRSS_Context::$conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
-					<option value="ASC"<?php echo FreshRSS_Context::$conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
+					<option value="DESC"<?php echo FreshRSS_Context::$conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.newer_first'); ?></option>
+					<option value="ASC"<?php echo FreshRSS_Context::$conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.older_first'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="view_mode"><?php echo _t('default_view'); ?></label>
+			<label class="group-name" for="view_mode"><?php echo _t('conf.reading.view.default'); ?></label>
 			<div class="group-controls">
 				<select name="view_mode" id="view_mode">
-					<option value="normal"<?php echo FreshRSS_Context::$conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
-					<option value="reader"<?php echo FreshRSS_Context::$conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
-					<option value="global"<?php echo FreshRSS_Context::$conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
+					<option value="normal"<?php echo FreshRSS_Context::$conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.normal'); ?></option>
+					<option value="reader"<?php echo FreshRSS_Context::$conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.reader'); ?></option>
+					<option value="global"<?php echo FreshRSS_Context::$conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.global'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="view_mode"><?php echo _t('articles_to_display'); ?></label>
+			<label class="group-name" for="view_mode"><?php echo _t('conf.reading.show'); ?></label>
 			<div class="group-controls">
 				<select name="default_view" id="default_view">
-					<option value="adaptive"<?php echo FreshRSS_Context::$conf->default_view === 'adaptive' ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
-					<option value="all"<?php echo FreshRSS_Context::$conf->default_view === 'all' ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
-					<option value="unread"<?php echo FreshRSS_Context::$conf->default_view === 'unread' ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
+					<option value="adaptive"<?php echo FreshRSS_Context::$conf->default_view === 'adaptive' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.adaptive'); ?></option>
+					<option value="all"<?php echo FreshRSS_Context::$conf->default_view === 'all' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.all_articles'); ?></option>
+					<option value="unread"<?php echo FreshRSS_Context::$conf->default_view === 'unread' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.unread'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -50,7 +50,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="hide_read_feeds">
 					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo FreshRSS_Context::$conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('hide_read_feeds'); ?>
+					<?php echo _t('conf.reading.hide_read_feeds'); ?>
 				</label>
 			</div>
 		</div>
@@ -59,8 +59,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_posts">
 					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo FreshRSS_Context::$conf->display_posts ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('display_articles_unfolded'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.display_articles_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -69,8 +69,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_categories">
 					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo FreshRSS_Context::$conf->display_categories ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('display_categories_unfolded'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.display_categories_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -79,8 +79,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="sticky_post">
 					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo FreshRSS_Context::$conf->sticky_post ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('sticky_post'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.sticky_post'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -89,8 +89,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">
 					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo FreshRSS_Context::$conf->auto_load_more ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('auto_load_more'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.auto_load_more'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -99,8 +99,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
 					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo FreshRSS_Context::$conf->lazyload ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('img_with_lazyload'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.img_with_lazyload'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -109,8 +109,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="reading_confirm">
 					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo FreshRSS_Context::$conf->reading_confirm ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('reading_confirm'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.confirm_enabled'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -119,48 +119,48 @@
 			<div class="group-controls">
 				<label class="checkbox" for="auto_remove_article">
 					<input type="checkbox" name="auto_remove_article" id="auto_remove_article" value="1"<?php echo FreshRSS_Context::$conf->auto_remove_article ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('auto_remove_article'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.auto_remove_article'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('auto_read_when'); ?></label>
+			<label class="group-name"><?php echo _t('conf.reading.read.when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
 					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo FreshRSS_Context::$conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('article_viewed'); ?>
+					<?php echo _t('conf.reading.read.article_viewed'); ?>
 				</label>
 				<label class="checkbox" for="check_open_site">
 					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo FreshRSS_Context::$conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('article_open_on_website'); ?>
+					<?php echo _t('conf.reading.read.article_open_on_website'); ?>
 				</label>
 				<label class="checkbox" for="check_scroll">
 					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo FreshRSS_Context::$conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('scroll'); ?>
+					<?php echo _t('conf.reading.read.scroll'); ?>
 				</label>
 				<label class="checkbox" for="check_reception">
 					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo FreshRSS_Context::$conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('upon_reception'); ?>
+					<?php echo _t('conf.reading.read.upon_reception'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('after_onread'); ?></label>
+			<label class="group-name"><?php echo _t('conf.reading.after_onread'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="onread_jump_next">
 					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo FreshRSS_Context::$conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('jump_next'); ?>
+					<?php echo _t('conf.reading.jump_next'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index ef5e85a0c..b42825382 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -1,7 +1,7 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'sharing'); ?>"
 		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a>
@@ -9,28 +9,28 @@
 		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
 			<div class="stick">
-			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('share_name'); ?>" size="64" />
-			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('share_url'); ?>" size="64" />
+			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('conf.sharing.share_name'); ?>" size="64" />
+			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('conf.sharing.share_url'); ?>" size="64" />
 			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a></div>
-			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
+			<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
-		<legend><?php echo _t('sharing'); ?></legend>
+		<legend><?php echo _t('conf.sharing'); ?></legend>
 		<?php foreach (FreshRSS_Context::$conf->sharing as $key => $sharing): ?>
 			<?php $share = FreshRSS_Context::$conf->shares[$sharing['type']]; ?>
 			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
-					<?php echo _t($sharing['type']); ?>
+					<?php echo _t('conf.sharing.' . $sharing['type']); ?>
 				</label>
 				<div class="group-controls">
 					<input type='hidden' id='share_<?php echo $key;?>_type' name="share[<?php echo $key;?>][type]" value='<?php echo $sharing['type']?>' />
 					<?php if ($share['form'] === 'advanced') { ?>
 						<div class="stick">
-							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('share_name'); ?>" size="64" />
-							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('share_url'); ?>" size="64" />
+							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('conf.sharing.share_name'); ?>" size="64" />
+							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('conf.sharing.share_url'); ?>" size="64" />
 							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 						</div>
 
-						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo _i('help'); ?></a>
+						<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="<?php echo $share['help']?>"><?php echo _i('help'); ?></a>
 					<?php } else { ?>
 					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 					<?php } ?>
@@ -42,7 +42,7 @@
 			<div class="group-controls">
 				<select>
 					<?php foreach(FreshRSS_Context::$conf->shares as $key => $params):?>
-						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
+						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t('conf.sharing.' . $key) ?></option>
 					<?php endforeach; ?>
 				</select>
 				<a href='#' class='share add btn'><?php echo _i('add'); ?></a>
@@ -51,8 +51,8 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 66a23877e..dca8b6ef8 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -1,7 +1,7 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<datalist id="keys">
 		<?php foreach ($this->list_keys as $key) { ?>
@@ -12,114 +12,114 @@
 	<?php $s = FreshRSS_Context::$conf->shortcuts; ?>
 
 	<form method="post" action="<?php echo _url('configure', 'shortcut'); ?>">
-		<legend><?php echo _t('shortcuts'); ?></legend>
+		<legend><?php echo _t('conf.shortcut'); ?></legend>
 
-		<noscript><p class="alert alert-error"><?php echo _t('javascript_for_shortcuts'); ?></p></noscript>
+		<noscript><p class="alert alert-error"><?php echo _t('conf.shortcut.javascript'); ?></p></noscript>
 
-		<legend><?php echo _t('shortcuts_navigation'); ?></legend>
+		<legend><?php echo _t('conf.shortcut.navigation'); ?></legend>
 
-		<p class="alert alert-warn"><?php echo _t('shortcuts_navigation_help');?></p>
+		<p class="alert alert-warn"><?php echo _t('conf.shortcut.navigation_help');?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="next_entry"><?php echo _t('next_article'); ?></label>
+			<label class="group-name" for="next_entry"><?php echo _t('conf.shortcut.next_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?php echo $s['next_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="prev_entry"><?php echo _t('previous_article'); ?></label>
+			<label class="group-name" for="prev_entry"><?php echo _t('conf.shortcut.previous_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?php echo $s['prev_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="first_entry"><?php echo _t('first_article'); ?></label>
+			<label class="group-name" for="first_entry"><?php echo _t('conf.shortcut.first_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="first_entry" name="shortcuts[first_entry]" list="keys" value="<?php echo $s['first_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="last_entry"><?php echo _t('last_article'); ?></label>
+			<label class="group-name" for="last_entry"><?php echo _t('conf.shortcut.last_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="last_entry" name="shortcuts[last_entry]" list="keys" value="<?php echo $s['last_entry']; ?>" />
 			</div>
 		</div>
 
-		<legend><?php echo _t('shortcuts_article_action');?></legend>
+		<legend><?php echo _t('conf.shortcut.article_action');?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="mark_read"><?php echo _t('mark_read'); ?></label>
+			<label class="group-name" for="mark_read"><?php echo _t('conf.shortcut.mark_read'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?php echo $s['mark_read']; ?>" />
-				<?php echo _t('shift_for_all_read'); ?>
+				<?php echo _t('conf.shortcut.shift_for_all_read'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="mark_favorite"><?php echo _t('mark_favorite'); ?></label>
+			<label class="group-name" for="mark_favorite"><?php echo _t('conf.shortcut.mark_favorite'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?php echo $s['mark_favorite']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="go_website"><?php echo _t('see_on_website'); ?></label>
+			<label class="group-name" for="go_website"><?php echo _t('conf.shortcut.see_on_website'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?php echo $s['go_website']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="auto_share_shortcut"><?php echo _t('auto_share'); ?></label>
+			<label class="group-name" for="auto_share_shortcut"><?php echo _t('conf.shortcut.auto_share'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?php echo $s['auto_share']; ?>" />
-				<?php echo _t('auto_share_help'); ?>
+				<?php echo _t('conf.shortcut.auto_share_help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="collapse_entry"><?php echo _t('collapse_article'); ?></label>
+			<label class="group-name" for="collapse_entry"><?php echo _t('conf.shortcut.collapse_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?php echo $s['collapse_entry']; ?>" />
 			</div>
 		</div>
 
-		<legend><?php echo _t('shortcuts_other_action');?></legend>
+		<legend><?php echo _t('conf.shortcut.other_action');?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="load_more_shortcut"><?php echo _t('load_more'); ?></label>
+			<label class="group-name" for="load_more_shortcut"><?php echo _t('conf.shortcut.load_more'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?php echo $s['load_more']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="focus_search_shortcut"><?php echo _t('focus_search'); ?></label>
+			<label class="group-name" for="focus_search_shortcut"><?php echo _t('conf.shortcut.focus_search'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="focus_search_shortcut" name="shortcuts[focus_search]" list="keys" value="<?php echo $s['focus_search']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="user_filter_shortcut"><?php echo _t('user_filter'); ?></label>
+			<label class="group-name" for="user_filter_shortcut"><?php echo _t('conf.shortcut.user_filter'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="user_filter_shortcut" name="shortcuts[user_filter]" list="keys" value="<?php echo $s['user_filter']; ?>" />
-				<?php echo _t('user_filter_help'); ?>
+				<?php echo _t('conf.shortcut.user_filter_help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="close_dropdown_shortcut"><?php echo _t('close_dropdown'); ?></label>
+			<label class="group-name" for="close_dropdown_shortcut"><?php echo _t('conf.shortcut.close_dropdown'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="help_shortcut"><?php echo _t('help'); ?></label>
+			<label class="group-name" for="help_shortcut"><?php echo _t('conf.shortcut.help'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="help_shortcut" name="shortcuts[help]" list="keys" value="<?php echo $s['help']; ?>" />
 			</div>
@@ -127,8 +127,8 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index e2963a9cc..3a27a702b 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -100,7 +100,7 @@ if (!empty($this->entries)) {
 				<h1 class="title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></h1>
 				<?php
 					$author = $item->author();
-					echo $author != '' ? '<div class="author">' . _t('index.entry.by_author', $author) . '</div>' : '',
+					echo $author != '' ? '<div class="author">' . _t('gen.short.by_author', $author) . '</div>' : '',
 						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->content();
 				?>
 			</div>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index d87550f77..1eab86dd2 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -23,7 +23,7 @@ if (!empty($this->entries)) {
 
 				<div class="author"><?php
 					$author = $item->author();
-					echo $author != '' ? _t('index.entry.by_author', $author) . ' — ' : '',
+					echo $author != '' ? _t('gen.short.by_author', $author) . ' — ' : '',
 						$item->date();
 				?></div>
 

From a1faa826bf04326a073b918f0ff76ac90c9acd31 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 21:44:11 +0100
Subject: [PATCH 229/363] Fix french i18n for last views

---
 app/i18n/fr/admin.php                | 11 +++++++++
 app/i18n/fr/conf.php                 |  5 ++++
 app/i18n/fr/feedback.php             |  1 +
 app/i18n/fr/gen.php                  | 12 +---------
 app/views/error/index.phtml          |  2 +-
 app/views/feed/add.phtml             | 34 ++++++++++++++--------------
 app/views/javascript/actualize.phtml |  4 ++--
 app/views/update/apply.phtml         |  4 ++--
 app/views/update/checkInstall.phtml  |  2 +-
 app/views/update/index.phtml         | 14 ++++++------
 app/views/user/manage.phtml          | 26 ++++++++++-----------
 app/views/user/profile.phtml         | 22 +++++++++---------
 12 files changed, 72 insertions(+), 65 deletions(-)

diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 2268a8a38..b822a867d 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -135,10 +135,21 @@ return array(
 		'top_feed' => 'Les dix plus gros flux',
 	),
 	'update' => array(
+		'_' => 'Système de mise à jour',
+		'apply' => 'Appliquer la mise à jour',
+		'check' => 'Vérifier les mises à jour',
+		'last' => 'Dernière vérification : %s',
 		'title' => 'Système de mise à jour',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'create' => 'Créer un nouvel utilisateur',
+		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Langue',
+		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 		'title' => 'Gestion des utilisateurs',
+		'user_list' => 'Liste des utilisateurs',
+		'username' => 'Nom d’utilisateur',
+		'users' => 'Utilisateurs',
 	),
 );
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 1c8ad6d9e..2e3414081 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -71,6 +71,10 @@ return array(
 		'title' => 'Filtres utilisateurs',
 	),
 	'profile' => array(
+		'_' => 'Gestion du profil',
+		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
+		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 		'title' => 'Profil',
 	),
 	'reading' => array(
@@ -157,6 +161,7 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
 		'current' => 'Utilisateur actuel',
+		'is_admin' => 'est administrateur',
 		'users' => 'Utilisateurs',
 	),
 );
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index 992300c7d..b9d1f6c99 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -38,6 +38,7 @@ return array(
 		'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
 	),
 	'sub' => array(
+		'actualize' => 'Actualiser',
 		'category' => array(
 			'created' => 'La catégorie %s a été créée.',
 			'deleted' => 'La catégorie a été supprimée.',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index c2eb0e394..26990b4fe 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -5,6 +5,7 @@ return array(
 		'actualize' => 'Actualiser',
 		'back_to_rss_feeds' => '← Retour à vos flux RSS',
 		'cancel' => 'Annuler',
+		'create' => 'Créer',
 		'disable' => 'Désactiver',
 		'empty' => 'Vider',
 		'enable' => 'Activer',
@@ -153,7 +154,6 @@ return array(
 	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
 	'bdd_configuration' => 'Base de données',
 	'bdd_type' => 'Type de base de données',
-	'by' => 'par',
 	'by_email' => 'Par courriel',
 	'by_feed' => 'par flux',
 	'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons',
@@ -167,8 +167,6 @@ return array(
 	'checks' => 'Vérifications',
 	'choose_language' => 'Choisissez la langue pour FreshRSS',
 	'congratulations' => 'Félicitations !',
-	'create' => 'Créer',
-	'create_user' => 'Créer un nouvel utilisateur',
 	'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
 	'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
 	'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
@@ -194,7 +192,6 @@ return array(
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
 	'installation_step' => 'Installation — étape %d · FreshRSS',
-	'is_admin' => 'est administrateur',
 	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
 	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
 	'language_defined' => 'La langue a bien été définie.',
@@ -211,13 +208,10 @@ return array(
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
 	'number_feeds' => '%d flux',
-	'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
-	'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 	'pcre_is_nok' => 'Il manque une librairie pour les expressions régulières (php-pcre)',
 	'pcre_is_ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE)',
 	'pdo_is_nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite)',
 	'pdo_is_ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite)',
-	'persona_connection_email' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 	'persona_is_ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons',
 	'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
 	'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
@@ -228,14 +222,10 @@ return array(
 	'sharing_management' => 'Gestion des options de partage',
 	'steps' => 'Étapes',
 	'this_is_the_end' => 'This is the end',
-	'update_apply' => 'Appliquer la mise à jour',
-	'update_check' => 'Vérifier les mises à jour',
 	'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
-	'update_last' => 'Dernière vérification : %s',
 	'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
 	'update_start' => 'Lancer la mise à jour',
 	'updated' => 'Modifications enregistrées.',
-	'users_list' => 'Liste des utilisateurs',
 	'version_update' => 'Mise à jour',
 	'your_diaspora_pod' => 'Votre pod Diaspora*',
 	'your_shaarli' => 'Votre Shaarli',
diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml
index 5e1949800..fe3abf8c4 100644
--- a/app/views/error/index.phtml
+++ b/app/views/error/index.phtml
@@ -3,7 +3,7 @@
 		<h1 class="alert-head"><?php echo $this->code; ?></h1>
 		<p>
 			<?php echo $this->errorMessage; ?><br />
-			<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+			<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 		</p>
 	</div>
 </div>
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 1db053b52..4cdd3f390 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -1,16 +1,16 @@
 <?php if ($this->feed) { ?>
 <div class="post">
-	<h1><?php echo _t('add_rss_feed'); ?></h1>
+	<h1><?php echo _t('sub.feed.add'); ?></h1>
 
 	<?php if (!$this->load_ok) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('internal_problem_feed', _url('index', 'logs')); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('feedback.sub.feed.internal_problem', _url('index', 'logs')); ?></p>
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
-		<legend><?php echo _t('informations'); ?></legend>
+		<legend><?php echo _t('sub.feed.informations'); ?></legend>
 		<?php if ($this->load_ok) { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('title'); ?></label>
+			<label class="group-name"><?php echo _t('sub.feed.title'); ?></label>
 			<div class="group-controls">
 				<label><?php echo $this->feed->name() ; ?></label>
 			</div>
@@ -18,7 +18,7 @@
 
 		<?php $desc = $this->feed->description(); if ($desc != '') { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('feed_description'); ?></label>
+			<label class="group-name"><?php echo _t('sub.feed.description'); ?></label>
 			<div class="group-controls">
 				<label><?php echo htmlspecialchars($desc, ENT_NOQUOTES, 'UTF-8'); ?></label>
 			</div>
@@ -26,7 +26,7 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('website_url'); ?></label>
+			<label class="group-name"><?php echo _t('sub.feed.website'); ?></label>
 			<div class="group-controls">
 				<?php echo $this->feed->website(); ?>
 				<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo _i('link'); ?></a>
@@ -35,17 +35,17 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
+			<label class="group-name" for="url"><?php echo _t('sub.feed.url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url_rss" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
 					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo _i('link'); ?></a>
 				</div>
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('sub.feed.validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="category"><?php echo _t('category'); ?></label>
+			<label class="group-name" for="category"><?php echo _t('sub.category'); ?></label>
 			<div class="group-controls">
 				<select name="category" id="category">
 					<?php foreach ($this->categories as $cat) { ?>
@@ -53,37 +53,37 @@
 						<?php echo $cat->name(); ?>
 					</option>
 					<?php } ?>
-					<option value="nc"><?php echo _t('new_category'); ?></option>
+					<option value="nc"><?php echo _t('sub.category.new'); ?></option>
 				</select>
 
 				<span style="display: none;">
-					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
+					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('sub.category.new'); ?>" />
 				</span>
 			</div>
 		</div>
 
-		<legend><?php echo _t('http_authentication'); ?></legend>
+		<legend><?php echo _t('sub.feed.auth.http'); ?></legend>
 		<?php $auth = $this->feed->httpAuth(false); ?>
 		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
+			<label class="group-name" for="http_user"><?php echo _t('sub.feed.auth.username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
+			<label class="group-name" for="http_pass"><?php echo _t('sub.feed.auth.password'); ?></label>
 			<div class="group-controls">
 				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
 
 			<div class="group-controls">
-				<?php echo _i('help'); ?> <?php echo _t('access_protected_feeds'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('sub.feed.auth.help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/javascript/actualize.phtml b/app/views/javascript/actualize.phtml
index 74cef4998..454228909 100644
--- a/app/views/javascript/actualize.phtml
+++ b/app/views/javascript/actualize.phtml
@@ -9,7 +9,7 @@ var feeds = [<?php foreach ($this->feeds as $feed) { ?>{<?php
 function initProgressBar(init) {
 	if (init) {
 		$("body").after("\<div id=\"actualizeProgress\" class=\"notification good\">\
-			<?php echo _t('refresh'); ?><br /><span class=\"title\">/</span><br />\
+			<?php echo _t('feedback.sub.actualize'); ?><br /><span class=\"title\">/</span><br />\
 			<span class=\"progress\">0 / " + feed_count + "</span>\
 		</div>");
 	} else {
@@ -23,7 +23,7 @@ function updateProgressBar(i, title_feed) {
 
 function updateFeeds() {
 	if (feed_count === 0) {
-		openNotification("<?php echo _t('no_feed_to_refresh'); ?>", "good");
+		openNotification("<?php echo _t('feedback.sub.feed.no_refresh'); ?>", "good");
 		ajax_loading = false;
 		return;
 	}
diff --git a/app/views/update/apply.phtml b/app/views/update/apply.phtml
index 30566c7ab..8221929ae 100644
--- a/app/views/update/apply.phtml
+++ b/app/views/update/apply.phtml
@@ -1,9 +1,9 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('update_system'); ?></h1>
+	<h1><?php echo _t('admin.update'); ?></h1>
 
 	<?php ask_info_update(); ?>
 </div>
diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml
index b36551340..a92860c7e 100644
--- a/app/views/update/checkInstall.phtml
+++ b/app/views/update/checkInstall.phtml
@@ -1,7 +1,7 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<h2><?php echo _t('admin.check_install.php'); ?></h2>
 
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index 401f6acd6..5c07d307e 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -1,12 +1,12 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo _t('update_system'); ?></h1>
+	<h1><?php echo _t('admin.update'); ?></h1>
 
 	<p>
-		<?php echo _i('help'); ?> <?php echo _t('update_last', $this->last_update_time); ?>
+		<?php echo _i('help'); ?> <?php echo _t('admin.update.last', $this->last_update_time); ?>
 	</p>
 
 	<?php if (!empty($this->message)) { ?>
@@ -16,8 +16,8 @@
 	</p>
 	<?php } elseif ($this->check_last_hour) { ?>
 	<p class="alert alert-warn">
-		<span class="alert-head"><?php echo _t('damn'); ?></span>
-		<?php echo _t('no_update'); ?>
+		<span class="alert-head"><?php echo _t('gen.short.damn'); ?></span>
+		<?php echo _t('admin.update.none'); ?>
 	</p>
 	<?php } ?>
 
@@ -26,11 +26,11 @@
 				(empty($this->message) || $this->message['status'] !== 'good')) {
 	?>
 	<p>
-		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('update_check'); ?></a>
+		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('admin.update.check'); ?></a>
 	</p>
 	<?php } ?>
 
 	<?php if ($this->update_to_apply) { ?>
-	<a class="btn btn-important" href="<?php echo _url('update', 'apply'); ?>"><?php echo _t('update_apply'); ?></a>
+	<a class="btn btn-important" href="<?php echo _url('update', 'apply'); ?>"><?php echo _t('admin.update.apply'); ?></a>
 	<?php } ?>
 </div>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index e46e02572..b175d48df 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -1,13 +1,13 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('user', 'create'); ?>">
-		<legend><?php echo _t('create_user'); ?></legend>
+		<legend><?php echo _t('admin.user.create'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
+			<label class="group-name" for="new_user_language"><?php echo _t('admin.user.language'); ?></label>
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
 				<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
@@ -19,25 +19,25 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_name"><?php echo _t('username'); ?></label>
+			<label class="group-name" for="new_user_name"><?php echo _t('admin.user.username'); ?></label>
 			<div class="group-controls">
 				<input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" placeholder="demo" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_passwordPlain"><?php echo _t('password_form'); ?></label>
+			<label class="group-name" for="new_user_passwordPlain"><?php echo _t('admin.user.password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
 					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_email"><?php echo _t('persona_connection_email'); ?></label>
+			<label class="group-name" for="new_user_email"><?php echo _t('admin.user.email_persona'); ?></label>
 			<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
@@ -46,17 +46,17 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('create'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
-		<legend><?php echo _t('users'); ?></legend>
+		<legend><?php echo _t('admin.user.users'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="user-list"><?php echo _t('users_list'); ?></label>
+			<label class="group-name" for="user-list"><?php echo _t('admin.user.user_list'); ?></label>
 			<div class="group-controls">
 				<select id="user-list" class="select-change" name="username">
 					<?php foreach (listUsers() as $username) { ?>
@@ -64,7 +64,7 @@
 					<?php } ?>
 				</select>
 
-				<p><?php echo _t('admin.users.articles_and_size',
+				<p><?php echo _t('admin.user.articles_and_size',
 				                 format_number($this->nb_articles),
 				                 format_bytes($this->size_user)); ?></p>
 			</div>
@@ -72,7 +72,7 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('gen.action.remove'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 60257012c..fc9b24674 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -1,36 +1,36 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('user', 'profile'); ?>">
-		<legend><?php echo _t('login_configuration'); ?></legend>
+		<legend><?php echo _t('conf.profile'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="current_user"><?php echo _t('current_user'); ?></label>
+			<label class="group-name" for="current_user"><?php echo _t('conf.user.current'); ?></label>
 			<div class="group-controls">
 				<input id="current_user" type="text" disabled="disabled" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
 				<label class="checkbox" for="is_admin">
 					<input type="checkbox" id="is_admin" disabled="disabled" <?php echo FreshRSS_Auth::hasAccess('admin') ? 'checked="checked" ' : ''; ?>/>
-					<?php echo _t('is_admin'); ?>
+					<?php echo _t('conf.user.is_admin'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
+			<label class="group-name" for="passwordPlain"><?php echo _t('conf.profile.password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<?php if (Minz_Configuration::apiEnabled()) { ?>
 		<div class="form-group">
-			<label class="group-name" for="apiPasswordPlain"><?php echo _t('password_api'); ?></label>
+			<label class="group-name" for="apiPasswordPlain"><?php echo _t('conf.profile.password_api'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
@@ -41,18 +41,18 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
+			<label class="group-name" for="mail_login"><?php echo _t('conf.profile.email_persona'); ?></label>
 			<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>

From bf51a8e87569617eca685cdcc1e7194f199b98fa Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 22:40:07 +0100
Subject: [PATCH 230/363] Fix french i18n for install + some fixes

French is finished!
---
 app/Models/CategoryDAO.php        |   2 +-
 app/Models/UserDAO.php            |   4 +-
 app/i18n/fr/conf.php              |   1 +
 app/i18n/fr/gen.php               |  92 +---------------
 app/i18n/fr/install.php           | 102 +++++++++++++++++-
 app/i18n/fr/sub.php               |   2 +
 app/install.php                   | 169 +++++++++++++++---------------
 app/views/subscription/feed.phtml |   4 +-
 8 files changed, 195 insertions(+), 181 deletions(-)

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 2e333d2f1..27a558522 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -134,7 +134,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		$def_cat = $this->searchById(1);
 
 		if ($def_cat == null) {
-			$cat = new FreshRSS_Category(_t('default_category'));
+			$cat = new FreshRSS_Category(_t('gen.short.default_category'));
 			$cat->_id(1);
 
 			$values = array(
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 60fca71b1..f04ae26bf 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -9,7 +9,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 
 		$ok = false;
 		if (defined('SQL_CREATE_TABLES')) {	//E.g. MySQL
-			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('gen.short.default_category'));
 			$stm = $userPDO->bd->prepare($sql);
 			$ok = $stm && $stm->execute();
 		} else {	//E.g. SQLite
@@ -17,7 +17,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 			if (is_array($SQL_CREATE_TABLES)) {
 				$ok = true;
 				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, '', _t('default_category'));
+					$sql = sprintf($instruction, '', _t('gen.short.default_category'));
 					$stm = $userPDO->bd->prepare($sql);
 					$ok &= ($stm && $stm->execute());
 				}
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 2e3414081..cf2c542e6 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -143,6 +143,7 @@ return array(
 		'first_article' => 'Passer au premier article',
 		'focus_search' => 'Accéder à la recherche',
 		'help' => 'Afficher la documentation',
+		'javascript' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
 		'last_article' => 'Passer au dernier article',
 		'load_more' => 'Charger plus d’articles',
 		'mark_read' => 'Marquer comme lu',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 26990b4fe..b2cdd3504 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -134,100 +134,10 @@ return array(
 		'by_author' => 'Par <em>%s</em>',
 		'by_default' => 'Par défaut',
 		'damn' => 'Arf !',
+		'default_category' => 'Sans catégorie',
 		'no' => 'Non',
 		'ok' => 'Ok !',
-		'oops' => 'Oups !',
 		'or' => 'ou',
 		'yes' => 'Oui',
 	),
-
-	'activate_sharing' => 'Activer le partage',
-	'article' => 'Article',
-	'article_published_on' => 'Article publié initialement sur <a href="%s">%s</a>',
-	'article_published_on_author' => 'Article publié initialement sur <a href="%s">%s</a> par %s',
-	'articles' => 'articles',
-	'author' => 'Auteur',
-	'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
-	'base_url' => 'Base de l’URL',
-	'bdd' => 'Base de données',
-	'bdd_conf_is_ko' => 'Vérifiez les informations d’accès à la base de données.',
-	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
-	'bdd_configuration' => 'Base de données',
-	'bdd_type' => 'Type de base de données',
-	'by_email' => 'Par courriel',
-	'by_feed' => 'par flux',
-	'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons',
-	'can_not_be_deleted' => 'Ne peut pas être supprimée.',
-	'categories' => 'Catégories',
-	'categories_management' => 'Gestion des catégories',
-	'categories_updated' => 'Les catégories ont été mises à jour.',
-	'categorize' => 'Ranger dans une catégorie',
-	'category_number' => 'Catégorie n°%d',
-	'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
-	'checks' => 'Vérifications',
-	'choose_language' => 'Choisissez la langue pour FreshRSS',
-	'congratulations' => 'Félicitations !',
-	'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
-	'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
-	'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
-	'curl_is_ok' => 'Vous disposez de cURL dans sa version %s',
-	'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
-	'default_category' => 'Sans catégorie',
-	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
-	'display' => 'Affichage',
-	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
-	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
-	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
-	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
-	'feed' => 'Flux',
-	'feeds' => 'Flux',
-	'finish_installation' => 'Terminer l’installation',
-	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
-	'freshrss_installation' => 'Installation · FreshRSS',
-	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
-	'general_configuration' => 'Configuration générale',
-	'host' => 'Hôte',
-	'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
-	'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
-	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
-	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
-	'installation_step' => 'Installation — étape %d · FreshRSS',
-	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
-	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
-	'language_defined' => 'La langue a bien été définie.',
-	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
-	'login_required' => 'Accès protégé par mot de passe :',
-	'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
-	'minz_is_ok' => 'Vous disposez du framework Minz',
-	'next_page' => 'Passer à la page suivante',
-	'next_step' => 'Passer à l’étape suivante',
-	'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
-	'no_rss_feed' => 'Aucun flux RSS',
-	'no_selected_feed' => 'Aucun flux sélectionné.',
-	'not_read' => '%d non lu',
-	'not_reads' => '%d non lus',
-	'not_yet_implemented' => 'Pas encore implémenté',
-	'number_feeds' => '%d flux',
-	'pcre_is_nok' => 'Il manque une librairie pour les expressions régulières (php-pcre)',
-	'pcre_is_ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE)',
-	'pdo_is_nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite)',
-	'pdo_is_ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite)',
-	'persona_is_ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons',
-	'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
-	'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
-	'prefix' => 'Préfixe des tables',
-	'previous_page' => 'Passer à la page précédente',
-	'public' => 'Public',
-	'random_string' => 'Chaîne aléatoire',
-	'sharing_management' => 'Gestion des options de partage',
-	'steps' => 'Étapes',
-	'this_is_the_end' => 'This is the end',
-	'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
-	'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
-	'update_start' => 'Lancer la mise à jour',
-	'updated' => 'Modifications enregistrées.',
-	'version_update' => 'Mise à jour',
-	'your_diaspora_pod' => 'Votre pod Diaspora*',
-	'your_shaarli' => 'Votre Shaarli',
-	'your_wallabag' => 'Votre wallabag',
 );
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index afca37ed3..738b1c084 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -1,5 +1,105 @@
 <?php
 
 return array(
-
+	'action' => array(
+		'finish' => 'Terminer l’installation',
+		'next_step' => 'Passer à l’étape suivante',
+	),
+	'auth' => array(
+		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Formulaire (traditionnel, requiert JavaScript)',
+		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
+		'none' => 'Aucune (dangereux)',
+		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
+		'type' => 'Méthode d’authentification',
+	),
+	'bdd' => array(
+		'_' => 'Base de données',
+		'conf' => array(
+			'_' => 'Base de données',
+			'ko' => 'Vérifiez les informations d’accès à la base de données.',
+			'ok' => 'La configuration de la base de données a été enregistrée.',
+		),
+		'host' => 'Hôte',
+		'password' => 'Mot de passe',
+		'prefix' => 'Préfixe des tables',
+		'type' => 'Type de base de données',
+		'username' => 'Nom d’utilisateur',
+	),
+	'check' => array(
+		'_' => 'Vérifications',
+		'cache' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de cache sont bons.',
+		),
+		'ctype' => array(
+			'nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype).',
+			'ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Vous ne disposez pas de cURL (paquet php5-curl).',
+			'ok' => 'Vous disposez de cURL.',
+		),
+		'data' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de data sont bons.',
+		),
+		'dom' => array(
+			'nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml).',
+			'ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/favicons</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des favicons sont bons.',
+		),
+		'http_referer' => array(
+			'nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
+			'ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
+		),
+		'logs' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/logs</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des logs sont bons.',
+		),
+		'minz' => array(
+			'nok' => 'Vous ne disposez pas de la librairie Minz.',
+			'ok' => 'Vous disposez du framework Minz',
+		),
+		'pcre' => array(
+			'nok' => 'Il manque une librairie pour les expressions régulières (php-pcre).',
+			'ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/persona</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons.',
+		),
+		'php' => array(
+			'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
+			'ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Configuration générale',
+		'ok' => 'La configuration générale a été enregistrée.',
+	),
+	'congratulations' => 'Félicitations !',
+	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
+	'delete_articles_after' => 'Supprimer les articles après',
+	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
+	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
+	'language' => array(
+		'_' => 'Langue',
+		'choose' => 'Choisissez la langue pour FreshRSS',
+		'defined' => 'La langue a bien été définie.',
+	),
+	'ok' => 'L’installation s’est bien passée.',
+	'not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
+	'step' => 'étape %d',
+	'steps' => 'Étapes',
+	'title' => 'Installation · FreshRSS',
+	'this_is_the_end' => 'This is the end',
 );
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index b9d9f4bc2..a3f7c4d6d 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -27,8 +27,10 @@ return array(
 		'informations' => 'Informations',
 		'keep_history' => 'Nombre minimum d’articles à conserver',
 		'moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
+		'no_selected' => 'Aucun flux sélectionné.',
 		'number_entries' => '%d articles',
 		'stats' => 'Statistiques',
+		'think_to_add' => 'Vous pouvez ajouter des flux.',
 		'title' => 'Titre',
 		'title_add' => 'Ajouter un flux RSS',
 		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
diff --git a/app/install.php b/app/install.php
index f54565c73..fcdf8d604 100644
--- a/app/install.php
+++ b/app/install.php
@@ -85,7 +85,7 @@ function saveLanguage() {
 
 function saveStep2() {
 	if (!empty($_POST)) {
-		$_SESSION['title'] = substr(trim(param('title', _t('freshrss'))), 0, 25);
+		$_SESSION['title'] = substr(trim(param('title', _t('gen.freshrss'))), 0, 25);
 		$_SESSION['old_entries'] = param('old_entries', 3);
 		$_SESSION['auth_type'] = param('auth_type', 'form');
 		$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16);
@@ -394,7 +394,7 @@ function checkBD() {
 		$c = new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
 
 		if (defined('SQL_CREATE_TABLES')) {
-			$sql = sprintf(SQL_CREATE_TABLES, $_SESSION['bd_prefix_user'], _t('default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $_SESSION['bd_prefix_user'], _t('gen.short.default_category'));
 			$stm = $c->prepare($sql);
 			$ok = $stm->execute();
 		} else {
@@ -402,7 +402,7 @@ function checkBD() {
 			if (is_array($SQL_CREATE_TABLES)) {
 				$ok = true;
 				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, $_SESSION['bd_prefix_user'], _t('default_category'));
+					$sql = sprintf($instruction, $_SESSION['bd_prefix_user'], _t('gen.short.default_category'));
 					$stm = $c->prepare($sql);
 					$ok &= $stm->execute();
 				}
@@ -425,13 +425,13 @@ function printStep0() {
 	global $actual;
 ?>
 	<?php $s0 = checkStep0(); if ($s0['all'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('language_defined'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.language.defined'); ?></p>
 	<?php } ?>
 
 	<form action="index.php?step=0" method="post">
-		<legend><?php echo _t('choose_language'); ?></legend>
+		<legend><?php echo _t('install.language.choose'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
+			<label class="group-name" for="language"><?php echo _t('install.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
 				<?php $languages = availableLanguages(); ?>
@@ -444,10 +444,10 @@ function printStep0() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 				<?php if ($s0['all'] == 'ok') { ?>
-				<a class="btn btn-important next-step" href="?step=1"><?php echo _t('next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=1"><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -455,94 +455,95 @@ function printStep0() {
 <?php
 }
 
+// @todo refactor this view with the check_install action
 function printStep1() {
 	$res = checkStep1();
 ?>
-	<noscript><p class="alert alert-warn"><span class="alert-head"><?php echo _t('attention'); ?></span> <?php echo _t('javascript_is_better'); ?></p></noscript>
+	<noscript><p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('install.javascript_is_better'); ?></p></noscript>
 
 	<?php if ($res['php'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('php_is_ok', PHP_VERSION); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.php.ok', PHP_VERSION); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('php_is_nok', PHP_VERSION, '5.2.1'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.php.nok', PHP_VERSION, '5.2.1'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['minz'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('minz_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.minz.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('minz_is_nok', LIB_PATH . '/Minz'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.minz.nok', LIB_PATH . '/Minz'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['pdo'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('pdo_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.pdo.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('pdo_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.pdo.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['curl'] == 'ok') { ?>
 	<?php $version = curl_version(); ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('curl_is_ok', $version['version']); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.curl.ok', $version['version']); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('curl_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.curl.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['pcre'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('pcre_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.pcre.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('pcre_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.pcre.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['ctype'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('ctype_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.ctype.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('ctype_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.ctype.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['dom'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('dom_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.dom.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('dom_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.dom.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['data'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('data_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.data.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', DATA_PATH); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.data.nok', DATA_PATH); ?></p>
 	<?php } ?>
 
 	<?php if ($res['cache'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('cache_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.cache.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', CACHE_PATH); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.cache.nok', CACHE_PATH); ?></p>
 	<?php } ?>
 
 	<?php if ($res['log'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('log_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.logs.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', LOG_PATH); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.logs.nok', LOG_PATH); ?></p>
 	<?php } ?>
 
 	<?php if ($res['favicons'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('favicons_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.favicons.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', DATA_PATH . '/favicons'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.favicons.nok', DATA_PATH . '/favicons'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['persona'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('persona_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.persona.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', DATA_PATH . '/persona'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.persona.nok', DATA_PATH . '/persona'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['http_referer'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('http_referer_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.http_referer.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('http_referer_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.http_referer.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['all'] == 'ok') { ?>
-	<a class="btn btn-important next-step" href="?step=2"><?php echo _t('next_step'); ?></a>
+	<a class="btn btn-important next-step" href="?step=2"><?php echo _t('install.action.next_step'); ?></a>
 	<?php } else { ?>
-	<p class="alert alert-error"><?php echo _t('fix_errors_before'); ?></p>
+	<p class="alert alert-error"><?php echo _t('install.action.fix_errors_before'); ?></p>
 	<?php } ?>
 <?php
 }
@@ -550,37 +551,37 @@ function printStep1() {
 function printStep2() {
 ?>
 	<?php $s2 = checkStep2(); if ($s2['all'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('general_conf_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.conf.ok'); ?></p>
 	<?php } elseif (!empty($_POST)) { ?>
-	<p class="alert alert-error"><?php echo _t('fix_errors_before'); ?></p>
+	<p class="alert alert-error"><?php echo _t('install.fix_errors_before'); ?></p>
 	<?php } ?>
 
 	<form action="index.php?step=2" method="post">
-		<legend><?php echo _t('general_configuration'); ?></legend>
+		<legend><?php echo _t('install.conf'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="title"><?php echo _t('title'); ?></label>
+			<label class="group-name" for="title"><?php echo _t('install.title'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="title" name="title" value="<?php echo isset($_SESSION['title']) ? $_SESSION['title'] : _t('freshrss'); ?>" />
+				<input type="text" id="title" name="title" value="<?php echo isset($_SESSION['title']) ? $_SESSION['title'] : _t('gen.freshrss'); ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
+			<label class="group-name" for="old_entries"><?php echo _t('install.delete_articles_after'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" required="required" min="1" max="1200" value="<?php echo isset($_SESSION['old_entries']) ? $_SESSION['old_entries'] : '3'; ?>" /> <?php echo _t('month'); ?>
+				<input type="number" id="old_entries" name="old_entries" required="required" min="1" max="1200" value="<?php echo isset($_SESSION['old_entries']) ? $_SESSION['old_entries'] : '3'; ?>" /> <?php echo _t('gen.date.month'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="default_user"><?php echo _t('default_user'); ?></label>
+			<label class="group-name" for="default_user"><?php echo _t('install.default_user'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="default_user" name="default_user" required="required" size="16" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" value="<?php echo isset($_SESSION['default_user']) ? $_SESSION['default_user'] : ''; ?>" placeholder="<?php echo httpAuthUser() == '' ? 'user1' : httpAuthUser(); ?>" />
+				<input type="text" id="default_user" name="default_user" required="required" size="16" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" value="<?php echo isset($_SESSION['default_user']) ? $_SESSION['default_user'] : ''; ?>" placeholder="<?php echo httpAuthUser() == '' ? 'alice' : httpAuthUser(); ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
+			<label class="group-name" for="auth_type"><?php echo _t('install.auth.type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type" required="required" onchange="auth_type_change(true)">
 					<?php
@@ -589,30 +590,30 @@ function printStep2() {
 						}
 						$auth_type = isset($_SESSION['auth_type']) ? $_SESSION['auth_type'] : '';
 					?>
-					<option value="form"<?php echo $auth_type === 'form' || no_auth($auth_type) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
-					<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
-					<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo $auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
+					<option value="form"<?php echo $auth_type === 'form' || no_auth($auth_type) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
+					<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.persona'); ?></option>
+					<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('install.auth.http'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo $auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
+			<label class="group-name" for="passwordPlain"><?php echo _t('install.auth.password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" autocomplete="off" <?php echo $auth_type === 'form' ? ' required="required"' : ''; ?> />
 					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo FreshRSS_Themes::icon('key'); ?></a>
 				</div>
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
+			<label class="group-name" for="mail_login"><?php echo _t('install.auth.email_persona'); ?></label>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" value="<?php echo isset($_SESSION['mail_login']) ? $_SESSION['mail_login'] : ''; ?>" placeholder="alice@example.net" <?php echo $auth_type === 'persona' ? ' required="required"' : ''; ?> />
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
@@ -663,10 +664,10 @@ function printStep2() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 				<?php if ($s2['all'] == 'ok') { ?>
-				<a class="btn btn-important next-step" href="?step=3"><?php echo _t('next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=3"><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -677,15 +678,15 @@ function printStep2() {
 function printStep3() {
 ?>
 	<?php $s3 = checkStep3(); if ($s3['all'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('bdd_conf_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.bdd.ok'); ?></p>
 	<?php } elseif ($s3['conn'] == 'ko') { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('bdd_conf_is_ko'),(empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.bdd.ko'),(empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']); ?></p>
 	<?php } ?>
 
 	<form action="index.php?step=3" method="post">
-		<legend><?php echo _t('bdd_configuration'); ?></legend>
+		<legend><?php echo _t('install.bdd.configuration'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="type"><?php echo _t('bdd_type'); ?></label>
+			<label class="group-name" for="type"><?php echo _t('install.bdd.type'); ?></label>
 			<div class="group-controls">
 				<select name="type" id="type" onchange="mySqlShowHide()">
 				<?php if (extension_loaded('pdo_mysql')) {?>
@@ -706,35 +707,35 @@ function printStep3() {
 
 		<div id="mysql">
 		<div class="form-group">
-			<label class="group-name" for="host"><?php echo _t('host'); ?></label>
+			<label class="group-name" for="host"><?php echo _t('install.bdd.host'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="host" name="host" pattern="[0-9A-Za-z_.-]{1,64}" value="<?php echo isset($_SESSION['bd_host']) ? $_SESSION['bd_host'] : 'localhost'; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="user"><?php echo _t('username'); ?></label>
+			<label class="group-name" for="user"><?php echo _t('install.bdd.username'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="user" name="user" maxlength="16" pattern="[0-9A-Za-z_.-]{1,16}" value="<?php echo isset($_SESSION['bd_user']) ? $_SESSION['bd_user'] : ''; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="pass"><?php echo _t('password'); ?></label>
+			<label class="group-name" for="pass"><?php echo _t('install.bdd.password'); ?></label>
 			<div class="group-controls">
 				<input type="password" id="pass" name="pass" value="<?php echo isset($_SESSION['bd_password']) ? $_SESSION['bd_password'] : ''; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="base"><?php echo _t('bdd'); ?></label>
+			<label class="group-name" for="base"><?php echo _t('install.bdd'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="base" name="base" maxlength="64" pattern="[0-9A-Za-z_]{1,64}" value="<?php echo isset($_SESSION['bd_base']) ? $_SESSION['bd_base'] : ''; ?>" placeholder="freshrss" />
+				<input type="text" id="base" name="base" maxlength="64" pattern="[0-9A-Za-z_]{1,64}" value="<?php echo isset($_SESSION['bd_base']) ? $_SESSION['bd_base'] : ''; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="prefix"><?php echo _t('prefix'); ?></label>
+			<label class="group-name" for="prefix"><?php echo _t('install.bdd.prefix'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="prefix" name="prefix" maxlength="16" pattern="[0-9A-Za-z_]{1,16}" value="<?php echo isset($_SESSION['bd_prefix']) ? $_SESSION['bd_prefix'] : 'freshrss_'; ?>" />
 			</div>
@@ -749,10 +750,10 @@ function printStep3() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 				<?php if ($s3['all'] == 'ok') { ?>
-				<a class="btn btn-important next-step" href="?step=4"><?php echo _t('next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=4"><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -762,14 +763,14 @@ function printStep3() {
 
 function printStep4() {
 ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('congratulations'); ?></span> <?php echo _t('installation_is_ok'); ?></p>
-	<a class="btn btn-important next-step" href="?step=5"><?php echo _t('finish_installation'); ?></a>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('install.congratulations'); ?></span> <?php echo _t('install.ok'); ?></p>
+	<a class="btn btn-important next-step" href="?step=5"><?php echo _t('install.action.finish'); ?></a>
 <?php
 }
 
 function printStep5() {
 ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('oops'); ?></span> <?php echo _t('install_not_deleted', DATA_PATH . '/do-install.txt'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.not_deleted', DATA_PATH . '/do-install.txt'); ?></p>
 <?php
 }
 
@@ -802,7 +803,7 @@ case 5:
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="initial-scale=1.0">
-		<title><?php echo _t('freshrss_installation'); ?></title>
+		<title><?php echo _t('install.title'); ?></title>
 		<link rel="stylesheet" type="text/css" media="all" href="../themes/base-theme/template.css" />
 		<link rel="stylesheet" type="text/css" media="all" href="../themes/Origine/origine.css" />
 	</head>
@@ -810,19 +811,19 @@ case 5:
 
 <div class="header">
 	<div class="item title">
-		<h1><a href="index.php"><?php echo _t('freshrss'); ?></a></h1>
-		<h2><?php echo _t('installation_step', STEP); ?></h2>
+		<h1><a href="index.php"><?php echo _t('install.title'); ?></a></h1>
+		<h2><?php echo _t('install.step', STEP); ?></h2>
 	</div>
 </div>
 
 <div id="global">
 	<ul class="nav nav-list aside">
-		<li class="nav-header"><?php echo _t('steps'); ?></li>
-		<li class="item<?php echo STEP == 0 ? ' active' : ''; ?>"><a href="?step=0"><?php echo _t('language'); ?></a></li>
-		<li class="item<?php echo STEP == 1 ? ' active' : ''; ?>"><a href="?step=1"><?php echo _t('checks'); ?></a></li>
-		<li class="item<?php echo STEP == 2 ? ' active' : ''; ?>"><a href="?step=2"><?php echo _t('general_configuration'); ?></a></li>
-		<li class="item<?php echo STEP == 3 ? ' active' : ''; ?>"><a href="?step=3"><?php echo _t('bdd_configuration'); ?></a></li>
-		<li class="item<?php echo STEP == 4 ? ' active' : ''; ?>"><a href="?step=5"><?php echo _t('this_is_the_end'); ?></a></li>
+		<li class="nav-header"><?php echo _t('install.steps'); ?></li>
+		<li class="item<?php echo STEP == 0 ? ' active' : ''; ?>"><a href="?step=0"><?php echo _t('install.language'); ?></a></li>
+		<li class="item<?php echo STEP == 1 ? ' active' : ''; ?>"><a href="?step=1"><?php echo _t('install.check'); ?></a></li>
+		<li class="item<?php echo STEP == 2 ? ' active' : ''; ?>"><a href="?step=2"><?php echo _t('install.conf'); ?></a></li>
+		<li class="item<?php echo STEP == 3 ? ' active' : ''; ?>"><a href="?step=3"><?php echo _t('install.bdd.conf'); ?></a></li>
+		<li class="item<?php echo STEP == 4 ? ' active' : ''; ?>"><a href="?step=5"><?php echo _t('install.this_is_the_end'); ?></a></li>
 	</ul>
 
 	<div class="post">
diff --git a/app/views/subscription/feed.phtml b/app/views/subscription/feed.phtml
index 48a401c4a..60664fdee 100644
--- a/app/views/subscription/feed.phtml
+++ b/app/views/subscription/feed.phtml
@@ -9,7 +9,7 @@ if ($this->feed) {
 } else {
 ?>
 <div class="alert alert-warn">
-	<span class="alert-head"><?php echo _t('no_selected_feed'); ?></span>
-	<?php echo _t('think_to_add'); ?>
+	<span class="alert-head"><?php echo _t('sub.feed.no_selected'); ?></span>
+	<?php echo _t('sub.feed.think_to_add'); ?>
 </div>
 <?php } ?>

From a34503a7aba67028c12a4db23fe101c3e927a53e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 22:42:20 +0100
Subject: [PATCH 231/363] Fix i1_n keys in install script

---
 app/install.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/install.php b/app/install.php
index fcdf8d604..8091a9eb0 100644
--- a/app/install.php
+++ b/app/install.php
@@ -678,13 +678,13 @@ function printStep2() {
 function printStep3() {
 ?>
 	<?php $s3 = checkStep3(); if ($s3['all'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.bdd.ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.bdd.conf.ok'); ?></p>
 	<?php } elseif ($s3['conn'] == 'ko') { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.bdd.ko'),(empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.bdd.conf.ko'),(empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']); ?></p>
 	<?php } ?>
 
 	<form action="index.php?step=3" method="post">
-		<legend><?php echo _t('install.bdd.configuration'); ?></legend>
+		<legend><?php echo _t('install.bdd.conf'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="type"><?php echo _t('install.bdd.type'); ?></label>
 			<div class="group-controls">

From 2d9ab3c6fa0eba18d9f64680fc0fc71ed5c7cb6e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 23:15:38 +0100
Subject: [PATCH 232/363] Fix english i18n files except the conf one

---
 app/i18n/en/admin.php    |  13 ++++-
 app/i18n/en/feedback.php |   1 +
 app/i18n/en/gen.php      |  93 ++---------------------------------
 app/i18n/en/index.php    |   5 +-
 app/i18n/en/install.php  | 102 ++++++++++++++++++++++++++++++++++++++-
 app/i18n/en/sub.php      |   2 +
 app/i18n/fr/gen.php      |   4 +-
 app/i18n/fr/install.php  |   4 +-
 8 files changed, 127 insertions(+), 97 deletions(-)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index b79b17bc4..d93e52f04 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -135,10 +135,21 @@ return array(
 		'top_feed' => 'Top ten feeds',
 	),
 	'update' => array(
+		'_' => 'Update system',
+		'apply' => 'Apply',
+		'check' => 'Check for new updates',
+		'last' => 'Last verification: %s',
 		'title' => 'Update system',
 	),
-	'users' => array(
+	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'create' => 'Create new user',
+		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Language',
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'title' => 'Manage users',
+		'user_list' => 'List of users',
+		'username' => 'Username',
+		'users' => 'Users',
 	),
 );
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 192a33fcf..8df83ac0a 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -38,6 +38,7 @@ return array(
 		'zip_error' => 'An error occured during Zip import.',
 	),
 	'sub' => array(
+		'actualize' => 'Actualize',
 		'category' => array(
 			'created' => 'Category %s has been created.',
 			'deleted' => 'Category has been deleted.',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index a460910bd..5459b83e1 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -5,6 +5,7 @@ return array(
 		'actualize' => 'Actualize',
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',
 		'cancel' => 'Cancel',
+		'create' => 'Create',
 		'disable' => 'Disable',
 		'empty' => 'Empty',
 		'enable' => 'Enable',
@@ -13,6 +14,7 @@ return array(
 		'import' => 'Import',
 		'manage' => 'Manage',
 		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
 		'remove' => 'Remove',
 		'see_website' => 'See website',
 		'submit' => 'Submit',
@@ -70,6 +72,7 @@ return array(
 		'march' => 'Mar',
 		'may' => 'May',
 		'mon' => 'Mon',
+		'month' => 'months',
 		'nov' => 'nov',
 		'november' => 'Nov',
 		'oct' => 'oct',
@@ -128,137 +131,66 @@ return array(
 	'short' => array(
 		'attention' => 'Attention!',
 		'blank_to_disable' => 'Leave blank to disable',
+		'by_author' => 'By <em>%s</em>',
 		'by_default' => 'By default',
 		'damn' => 'Damn!',
+		'default_category' => 'Uncategorized',
 		'no' => 'No',
 		'ok' => 'Ok!',
-		'oops' => 'Oops!',
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
 
-	'activate_sharing' => 'Activate sharing',
 	'after_onread' => 'After “mark all as read”,',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
-	'article' => 'Article',
 	'article_icons' => 'Article icons',
 	'article_open_on_website' => 'when article is opened on its original website',
 	'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
 	'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
 	'article_viewed' => 'when article is viewed',
-	'articles' => 'articles',
 	'articles_per_page' => 'Number of articles per page',
 	'articles_to_display' => 'Articles to display',
-	'author' => 'Author',
 	'auto_load_more' => 'Load next articles at the page bottom',
 	'auto_read_when' => 'Mark article as read…',
 	'auto_remove_article' => 'Hide articles after reading',
 	'auto_share' => 'Share',
 	'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-	'bad_opml_file' => 'Your OPML file is invalid',
-	'base_url' => 'Base URL',
-	'bdd' => 'Database',
-	'bdd_conf_is_ko' => 'Verify your database information.',
-	'bdd_conf_is_ok' => 'Database configuration has been saved.',
-	'bdd_configuration' => 'Database configuration',
-	'bdd_type' => 'Type of database',
 	'bottom_line' => 'Bottom line',
-	'by' => 'by',
-	'by_email' => 'By email',
-	'by_feed' => 'by feed',
-	'cache_is_ok' => 'Permissions on cache directory are good',
-	'can_not_be_deleted' => 'Cannot be deleted',
 	'categories' => 'Categories',
 	'categories_management' => 'Categories management',
 	'categories_updated' => 'Categories have been updated',
-	'categorize' => 'Store in a category',
-	'category_number' => 'Category n°%d',
-	'change_value' => 'You should change this value by any other',
-	'checks' => 'Checks',
-	'choose_language' => 'Choose a language for FreshRSS',
 	'collapse_article' => 'Collapse',
-	'congratulations' => 'Congratulations!',
 	'content_width' => 'Content width',
-	'create' => 'Create',
-	'create_user' => 'Create new user',
-	'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
-	'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
-	'curl_is_nok' => 'You lack cURL (php5-curl package)',
-	'curl_is_ok' => 'You have version %s of cURL',
 	'current_user' => 'Current user',
-	'data_is_ok' => 'Permissions on data directory are good',
-	'default_category' => 'Uncategorized',
-	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'default_view' => 'Default view',
 	'delete_articles_every' => 'Remove articles after',
 	'display_articles_unfolded' => 'Show articles unfolded by default',
 	'display_categories_unfolded' => 'Show categories folded by default',
 	'display_configuration' => 'Display',
 	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
-	'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
-	'dom_is_ok' => 'You have the required library to browse the DOM',
-	'favicons_is_ok' => 'Permissions on favicons directory are good',
-	'feed' => 'Feed',
-	'feeds' => 'Feeds',
-	'finish_installation' => 'Complete installation',
 	'first_article' => 'Skip to the first article',
-	'fix_errors_before' => 'Fix errors before skip to the next step.',
 	'focus_search' => 'Access search box',
-	'freshrss_installation' => 'Installation · FreshRSS',
-	'general_conf_is_ok' => 'General configuration has been saved.',
-	'general_configuration' => 'General configuration',
 	'help' => 'Display documentation',
 	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
-	'host' => 'Host',
 	'html5_notif_timeout' => 'HTML5 notification timeout',
-	'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
-	'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
-	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
-	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
-	'installation_step' => 'Installation — step %d · FreshRSS',
 	'is_admin' => 'is administrator',
 	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
-	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'language' => 'Language',
-	'language_defined' => 'Language has been defined.',
 	'last_article' => 'Skip to the last article',
-	'log_is_ok' => 'Permissions on logs directory are good',
 	'login_required' => 'Login required:',
-	'mark_cat_read' => 'Mark category as read',
-	'mark_favorite' => 'Mark as favourite',
-	'mark_feed_read' => 'Mark feed as read',
-	'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
-	'minz_is_ok' => 'You have the Minz framework',
-	'month' => 'months',
 	'more_information' => 'More information',
 	'next_article' => 'Skip to the next article',
-	'next_page' => 'Skip to the next page',
-	'next_step' => 'Go to the next step',
 	'no_feed_actualized' => 'No RSS feed has been updated',
 	'no_query' => 'You haven’t created any user query yet.',
 	'no_query_filter' => 'No filter',
 	'no_rss_feed' => 'No RSS feed',
-	'no_selected_feed' => 'No feed selected.',
-	'not_read' => '%d unread',
-	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
 	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
 	'number_feeds' => '%d feeds',
 	'optimize_bdd' => 'Optimize database',
 	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
 	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
-	'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
-	'pcre_is_nok' => 'You lack a required library for regular expressions (php-pcre)',
-	'pcre_is_ok' => 'You have the required library for regular expressions (PCRE)',
-	'pdo_is_nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite)',
-	'pdo_is_ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite)',
-	'persona_connection_email' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-	'persona_is_ok' => 'Permissions on Mozilla Persona directory are good',
-	'php_is_nok' => 'Your PHP version is %s but FreshRSS requires at least version %s',
-	'php_is_ok' => 'Your PHP version is %s, which is compatible with FreshRSS',
-	'prefix' => 'Table prefix',
 	'previous_article' => 'Skip to the previous article',
 	'previous_page' => 'Skip to the previous page',
 	'public' => 'Public',
@@ -305,29 +237,14 @@ return array(
 	'show_adaptive' => 'Adjust showing',
 	'show_all_articles' => 'Show all articles',
 	'sort_order' => 'Sort order',
-	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
 	'theme' => 'Theme',
-	'this_is_the_end' => 'This is the end',
 	'top_line' => 'Top line',
-	'update_apply' => 'Apply',
-	'update_check' => 'Check for new updates',
-	'update_end' => 'Update process is completed, now you can go to the final step.',
-	'update_last' => 'Last verification: %s',
-	'update_long' => 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
-	'update_start' => 'Start update process',
-	'updated' => 'Modifications have been updated',
 	'upon_reception' => 'upon reception of the article',
 	'user_filter' => 'Access user filters',
 	'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-	'users' => 'Users',
-	'users_list' => 'List of users',
-	'version_update' => 'Update',
 	'width_large' => 'Large',
 	'width_medium' => 'Medium',
 	'width_no_limit' => 'No limit',
 	'width_thin' => 'Thin',
-	'your_diaspora_pod' => 'Your Diaspora* pod',
-	'your_shaarli' => 'Your Shaarli',
-	'your_wallabag' => 'Your wallabag',
 );
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index b4d48ca73..941388b68 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -16,9 +16,6 @@ return array(
 		'version' => 'Version',
 		'website' => 'Website',
 	),
-	'entry' => array(
-		'by_author' => 'By <em>%s</em>',
-	),
 	'feed' => array(
 		'add' => 'You may add some feeds.',
 		'empty' => 'There is no article to show.',
@@ -42,6 +39,8 @@ return array(
 		'global_view' => 'Global view',
 		'main_stream' => 'Main stream',
 		'mark_all_read' => 'Mark all as read',
+		'mark_cat_read' => 'Mark category as read',
+		'mark_feed_read' => 'Mark feed as read',
 		'newer_first' => 'Newer first',
 		'non-starred' => 'Show all but favorites',
 		'normal_view' => 'Normal view',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index afca37ed3..ed3210190 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -1,5 +1,105 @@
 <?php
 
 return array(
-
+	'action' => array(
+		'finish' => 'Complete installation',
+		'next_step' => 'Go to the next step',
+	),
+	'auth' => array(
+		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Web form (traditional, requires JavaScript)',
+		'http' => 'HTTP (for advanced users with HTTPS)',
+		'none' => 'None (dangerous)',
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'persona' => 'Mozilla Persona (modern, requires JavaScript)',
+		'type' => 'Authentication method',
+	),
+	'bdd' => array(
+		'_' => 'Database',
+		'conf' => array(
+			'_' => 'Database configuration',
+			'ko' => 'Verify your database information.',
+			'ok' => 'Database configuration has been saved.',
+		),
+		'host' => 'Host',
+		'prefix' => 'Table prefix',
+		'password' => 'HTTP password',
+		'type' => 'Type of database',
+		'username' => 'HTTP username',
+	),
+	'check' => array(
+		'_' => 'Checks',
+		'cache' => array(
+			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on cache directory are good.',
+		),
+		'ctype' => array(
+			'nok' => 'You lack a required library for character type checking (php-ctype).',
+			'ok' => 'You have the required library for character type checking (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'You lack cURL (php5-curl package).',
+			'ok' => 'You have cURL extension.',
+		),
+		'data' => array(
+			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on data directory are good.',
+		),
+		'dom' => array(
+			'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+			'ok' => 'You have the required library to browse the DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on favicons directory are good.',
+		),
+		'http_referer' => array(
+			'nok' => 'Please check that you are not altering your HTTP REFERER.',
+			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
+		),
+		'logs' => array(
+			'nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on logs directory are good.',
+		),
+		'minz' => array(
+			'nok' => 'You lack the Minz framework.',
+			'ok' => 'You have the Minz framework.',
+		),
+		'pcre' => array(
+			'nok' => 'You lack a required library for regular expressions (php-pcre).',
+			'ok' => 'You have the required library for regular expressions (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
+			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on Mozilla Persona directory are good.',
+		),
+		'php' => array(
+			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
+			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+		),
+	),
+	'conf' => array(
+		'_' => 'General configuration',
+		'ok' => 'General configuration has been saved.',
+	),
+	'congratulations' => 'Congratulations!',
+	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
+	'delete_articles_after' => 'Remove articles after',
+	'fix_errors_before' => 'Fix errors before skip to the next step.',
+	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
+	'language' => array(
+		'_' => 'Language',
+		'choose' => 'Choose a language for FreshRSS',
+		'defined' => 'Language has been defined.',
+	),
+	'not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
+	'ok' => 'The installation process was successful.',
+	'step' => 'step %d',
+	'steps' => 'Steps',
+	'title' => 'Installation · FreshRSS',
+	'this_is_the_end' => 'This is the end',
 );
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 27559bbc4..2b62e4775 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -27,8 +27,10 @@ return array(
 		'informations' => 'Information',
 		'keep_history' => 'Minimum number of articles to keep',
 		'moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
+		'no_selected' => 'No feed selected.',
 		'number_entries' => '%d articles',
 		'stats' => 'Statistics',
+		'think_to_add' => 'You may add some feeds.',
 		'title' => 'Title',
 		'title_add' => 'Add a RSS feed',
 		'ttl' => 'Do not automatically refresh more often than',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index b2cdd3504..bb4478360 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -54,6 +54,8 @@ return array(
 		'december' => 'décembre',
 		'feb' => 'fév.',
 		'february' => 'février',
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\à H\\:i',
 		'fri' => 'ven.',
 		'jan' => 'jan.',
 		'january' => 'janvier',
@@ -61,8 +63,6 @@ return array(
 		'july' => 'juillet',
 		'jun' => 'juin',
 		'june' => 'juin',
-		'format_date' => 'j %s Y',
-		'format_date_hour' => 'j %s Y \\à H\\:i',
 		'last_3_month' => 'Depuis les trois derniers mois',
 		'last_6_month' => 'Depuis les six derniers mois',
 		'last_month' => 'Depuis le mois dernier',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 738b1c084..f1ef2ea3f 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -17,7 +17,7 @@ return array(
 	'bdd' => array(
 		'_' => 'Base de données',
 		'conf' => array(
-			'_' => 'Base de données',
+			'_' => 'Configuration de la base de données',
 			'ko' => 'Vérifiez les informations d’accès à la base de données.',
 			'ok' => 'La configuration de la base de données a été enregistrée.',
 		),
@@ -96,8 +96,8 @@ return array(
 		'choose' => 'Choisissez la langue pour FreshRSS',
 		'defined' => 'La langue a bien été définie.',
 	),
-	'ok' => 'L’installation s’est bien passée.',
 	'not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
+	'ok' => 'L’installation s’est bien passée.',
 	'step' => 'étape %d',
 	'steps' => 'Étapes',
 	'title' => 'Installation · FreshRSS',

From 9ddf3679c5c0a43bad1b2d02248047e2e4e26716 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 23:43:55 +0100
Subject: [PATCH 233/363] Finish to update i18n!!

See https://github.com/FreshRSS/FreshRSS/issues/334
---
 app/i18n/en/conf.php | 139 +++++++++++++++++++++++++++++++++++++++++++
 app/i18n/en/gen.php  | 107 ---------------------------------
 app/i18n/fr/conf.php |   6 +-
 3 files changed, 142 insertions(+), 110 deletions(-)

diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 09f9fa9ce..13efb650b 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -2,28 +2,167 @@
 
 return array(
 	'archiving' => array(
+		'_' => 'Archiving',
+		'advanced' => 'Advanced',
+		'delete_after' => 'Remove articles after',
+		'help' => 'More options are available in the individual stream settings',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'optimize' => 'Optimize database',
+		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'purge_now' => 'Purge now',
 		'title' => 'Archiving',
+		'ttl' => 'Do not automatically refresh more often than',
 	),
 	'display' => array(
+		'_' => 'Display',
+		'icon' => array(
+			'bottom_line' => 'Bottom line',
+			'entry' => 'Article icons',
+			'publication_date' => 'Date of publication',
+			'related_tags' => 'Related tags',
+			'sharing' => 'Sharing',
+			'top_line' => 'Top line',
+		),
+		'language' => 'Language',
+		'notif_html5' => array(
+			'seconds' => 'seconds (0 means no timeout)',
+			'timeout' => 'HTML5 notification timeout',
+		),
+		'theme' => 'Theme',
 		'title' => 'Display',
+		'width' => array(
+			'content' => 'Content width',
+			'large' => 'Large',
+			'medium' => 'Medium',
+			'no_limit' => 'No limit',
+			'thin' => 'Thin',
+		),
 	),
 	'query' => array(
+		'_' => 'User queries',
+		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
+		'filter' => 'Filter applied:',
+		'get_all' => 'Display all articles',
+		'get_category' => 'Display "%s" category',
+		'get_favorite' => 'Display favorite articles',
+		'get_feed' => 'Display "%s" feed',
+		'no_filter' => 'No filter',
+		'none' => 'You haven’t created any user query yet.',
 		'number' => 'Query n°%d',
+		'order_asc' => 'Display oldest articles first',
+		'order_desc' => 'Display newest articles first',
+		'search' => 'Search for "%s"',
+		'state_0' => 'Display all articles',
+		'state_1' => 'Display read articles',
+		'state_2' => 'Display unread articles',
+		'state_3' => 'Display all articles',
+		'state_4' => 'Display favorite articles',
+		'state_5' => 'Display read favorite articles',
+		'state_6' => 'Display unread favorite articles',
+		'state_7' => 'Display favorite articles',
+		'state_8' => 'Display not favorite articles',
+		'state_9' => 'Display read not favorite articles',
+		'state_10' => 'Display unread not favorite articles',
+		'state_11' => 'Display not favorite articles',
+		'state_12' => 'Display all articles',
+		'state_13' => 'Display read articles',
+		'state_14' => 'Display unread articles',
+		'state_15' => 'Display all articles',
 		'title' => 'User queries',
 	),
 	'profile' => array(
+		'_' => 'Profile management',
+		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'title' => 'Profile',
 	),
 	'reading' => array(
+		'_' => 'Reading',
+		'after_onread' => 'After “mark all as read”,',
+		'articles_per_page' => 'Number of articles per page',
+		'auto_load_more' => 'Load next articles at the page bottom',
+		'auto_remove_article' => 'Hide articles after reading',
+		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
+		'display_articles_unfolded' => 'Show articles unfolded by default',
+		'display_categories_unfolded' => 'Show categories folded by default',
+		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
+		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
+		'jump_next' => 'jump to next unread sibling (feed or category)',
+		'number_divided_when_reader' => 'Divided by 2 in the reading view.',
+		'read' => array(
+			'article_open_on_website' => 'when article is opened on its original website',
+			'article_viewed' => 'when article is viewed',
+			'scroll' => 'while scrolling',
+			'upon_reception' => 'upon reception of the article',
+			'when' => 'Mark article as read…',
+		),
+		'show' => array(
+			'_' => 	'Articles to display',
+			'adaptive' => 'Adjust showing',
+			'all_articles' => 'Show all articles',
+			'unread' => 'Show only unread',
+		),
+		'sort' => array(
+			'_' => 'Sort order',
+			'newer_first' => 'Newer first',
+			'older_first' => 'Oldest first',
+		),
+		'sticky_post' => 'Stick the article to the top when opened',
 		'title' => 'Reading',
+		'view' => array(
+			'default' => 'Default view',
+			'global' => 'Global view',
+			'normal' => 'Normal view',
+			'reader' => 'Reading view',
+		),
 	),
 	'sharing' => array(
+		'_' => 'Sharing',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'More information',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Share name to display',
+		'share_url' => 'Share URL to use',
 		'title' => 'Sharing',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
+		'_' => 'Shortcuts',
+		'article_action' => 'Article actions',
+		'auto_share' => 'Share',
+		'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+		'close_dropdown' => 'Close menus',
+		'collapse_article' => 'Collapse',
+		'first_article' => 'Skip to the first article',
+		'focus_search' => 'Access search box',
+		'help' => 'Display documentation',
+		'javascript' => 'JavaScript must be enabled in order to use shortcuts',
+		'last_article' => 'Skip to the last article',
+		'load_more' => 'Load more articles',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
+		'next_article' => 'Skip to the next article',
+		'other_action' => 'Other actions',
+		'previous_article' => 'Skip to the previous article',
+		'see_on_website' => 'See on original website',
+		'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
 		'title' => 'Shortcuts',
+		'user_filter' => 'Access user filters',
+		'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'current' => 'Current user',
+		'is_admin' => 'is administrator',
+		'users' => 'Users',
 	),
 );
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 5459b83e1..43f94f1bc 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -140,111 +140,4 @@ return array(
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
-
-	'after_onread' => 'After “mark all as read”,',
-	'archiving_configuration_help' => 'More options are available in the individual stream settings',
-	'article_icons' => 'Article icons',
-	'article_open_on_website' => 'when article is opened on its original website',
-	'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
-	'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
-	'article_viewed' => 'when article is viewed',
-	'articles_per_page' => 'Number of articles per page',
-	'articles_to_display' => 'Articles to display',
-	'auto_load_more' => 'Load next articles at the page bottom',
-	'auto_read_when' => 'Mark article as read…',
-	'auto_remove_article' => 'Hide articles after reading',
-	'auto_share' => 'Share',
-	'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-	'bottom_line' => 'Bottom line',
-	'categories' => 'Categories',
-	'categories_management' => 'Categories management',
-	'categories_updated' => 'Categories have been updated',
-	'collapse_article' => 'Collapse',
-	'content_width' => 'Content width',
-	'current_user' => 'Current user',
-	'default_view' => 'Default view',
-	'delete_articles_every' => 'Remove articles after',
-	'display_articles_unfolded' => 'Show articles unfolded by default',
-	'display_categories_unfolded' => 'Show categories folded by default',
-	'display_configuration' => 'Display',
-	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
-	'first_article' => 'Skip to the first article',
-	'focus_search' => 'Access search box',
-	'help' => 'Display documentation',
-	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
-	'html5_notif_timeout' => 'HTML5 notification timeout',
-	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
-	'is_admin' => 'is administrator',
-	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
-	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'last_article' => 'Skip to the last article',
-	'login_required' => 'Login required:',
-	'more_information' => 'More information',
-	'next_article' => 'Skip to the next article',
-	'no_feed_actualized' => 'No RSS feed has been updated',
-	'no_query' => 'You haven’t created any user query yet.',
-	'no_query_filter' => 'No filter',
-	'no_rss_feed' => 'No RSS feed',
-	'not_yet_implemented' => 'Not yet implemented',
-	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
-	'number_feeds' => '%d feeds',
-	'optimize_bdd' => 'Optimize database',
-	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
-	'previous_article' => 'Skip to the previous article',
-	'previous_page' => 'Skip to the previous page',
-	'public' => 'Public',
-	'publication_date' => 'Date of publication',
-	'purge_now' => 'Purge now',
-	'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
-	'query_filter' => 'Filter applied:',
-	'query_get_all' => 'Display all articles',
-	'query_get_category' => 'Display "%s" category',
-	'query_get_favorite' => 'Display favorite articles',
-	'query_get_feed' => 'Display "%s" feed',
-	'query_order_asc' => 'Display oldest articles first',
-	'query_order_desc' => 'Display newest articles first',
-	'query_search' => 'Search for "%s"',
-	'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',
-	'random_string' => 'Random string',
-	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
-	'scroll' => 'while scrolling',
-	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
-	'see_on_website' => 'See on original website',
-	'share_name' => 'Share name to display',
-	'share_url' => 'Share URL to use',
-	'sharing_management' => 'Sharing options management',
-	'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
-	'shortcuts_article_action' => 'Article actions',
-	'shortcuts_navigation' => 'Navigation',
-	'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
-	'shortcuts_other_action' => 'Other actions',
-	'show_adaptive' => 'Adjust showing',
-	'show_all_articles' => 'Show all articles',
-	'sort_order' => 'Sort order',
-	'sticky_post' => 'Stick the article to the top when opened',
-	'theme' => 'Theme',
-	'top_line' => 'Top line',
-	'upon_reception' => 'upon reception of the article',
-	'user_filter' => 'Access user filters',
-	'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-	'width_large' => 'Large',
-	'width_medium' => 'Medium',
-	'width_no_limit' => 'No limit',
-	'width_thin' => 'Thin',
 );
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index cf2c542e6..62d6342e9 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -6,7 +6,7 @@ return array(
 		'advanced' => 'Avancé',
 		'delete_after' => 'Supprimer les articles après',
 		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
-		'keep_history_by_feed' => 'Nombre minimum d’articles à conserver',
+		'keep_history_by_feed' => 'Nombre minimum d’articles à conserver par flux',
 		'optimize' => 'Optimiser la base de données',
 		'optimize_help' => 'À faire de temps en temps pour réduire la taille de la BDD',
 		'purge_now' => 'Purger maintenant',
@@ -24,12 +24,12 @@ return array(
 			'top_line' => 'Ligne du haut',
 		),
 		'language' => 'Langue',
-		'title' => 'Affichage',
 		'notif_html5' => array(
 			'seconds' => 'secondes (0 signifie aucun timeout)',
 			'timeout' => 'Temps d’affichage de la notification HTML5',
 		),
 		'theme' => 'Thème',
+		'title' => 'Affichage',
 		'width' => array(
 			'content' => 'Largeur du contenu',
 			'large' => 'Large',
@@ -46,9 +46,9 @@ return array(
 		'get_category' => 'Afficher la catégorie "%s"',
 		'get_favorite' => 'Afficher les articles favoris',
 		'get_feed' => 'Afficher le flux "%s"',
-		'number' => 'Filtre n°%d',
 		'no_filter' => 'Aucun filtre appliqué',
 		'none' => 'Vous n’avez pas encore créé de filtre.',
+		'number' => 'Filtre n°%d',
 		'order_asc' => 'Afficher les articles les plus anciens en premier',
 		'order_desc' => 'Afficher les articles les plus récents en premier',
 		'search' => 'Recherche de "%s"',

From 0803078e4c7d9faff71084e3a3c48b354d18c01b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 00:18:22 +0100
Subject: [PATCH 234/363] Add a missing i18n string

---
 app/i18n/en/admin.php | 1 +
 app/i18n/fr/admin.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index d93e52f04..26af23225 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -139,6 +139,7 @@ return array(
 		'apply' => 'Apply',
 		'check' => 'Check for new updates',
 		'last' => 'Last verification: %s',
+		'none' => 'No update to apply',
 		'title' => 'Update system',
 	),
 	'user' => array(
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index b822a867d..a0d173b0c 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -139,6 +139,7 @@ return array(
 		'apply' => 'Appliquer la mise à jour',
 		'check' => 'Vérifier les mises à jour',
 		'last' => 'Dernière vérification : %s',
+		'none' => 'Aucune mise à jour à appliquer',
 		'title' => 'Système de mise à jour',
 	),
 	'user' => array(

From c1c0011d04bdef525c85cfd67e34058080d5f5ce Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 12:40:11 +0100
Subject: [PATCH 235/363] Quick fix for theme slider

Bluelagoon description was overflowed by its screenshot
---
 p/themes/base-theme/template.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 80f76e80b..535a80a22 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -741,10 +741,15 @@ br + br + br {
 	padding: 0;
 }
 .properties {
-	bottom: -35px;
+	display: none;
+	bottom: 0;
 	position: absolute;
 	width: 100%;
-	display: none;
+	padding: 5px;
+	background: rgba(255, 255, 255, 0.7);
+	color: #000;
+	border-top: 1px solid #aaa;
+	z-index: 10;
 }
 .properties .page-number {
 	right: 0;

From bf87db31d90ef18871045f1c815443e162e06e46 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 12:43:34 +0100
Subject: [PATCH 236/363] Second fix for theme slider

---
 p/themes/base-theme/template.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 535a80a22..280b9b332 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -693,6 +693,7 @@ br + br + br {
 	min-width: 260px;
 	max-width: 640px;
 	margin-bottom: 30px;
+	border: 1px solid #aaa;
 }
 .slides * {
 	user-select: none;
@@ -743,8 +744,8 @@ br + br + br {
 .properties {
 	display: none;
 	bottom: 0;
+	left: 0; right: 0;
 	position: absolute;
-	width: 100%;
 	padding: 5px;
 	background: rgba(255, 255, 255, 0.7);
 	color: #000;
@@ -752,7 +753,7 @@ br + br + br {
 	z-index: 10;
 }
 .properties .page-number {
-	right: 0;
+	right: 5px;
 	top: 0;
 	position: absolute;
 }

From 6078888de631ea105410079888838503fd7acb3d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 14:27:50 +0100
Subject: [PATCH 237/363] Remove user-select: none in theme selector

See https://github.com/FreshRSS/FreshRSS/issues/571
---
 p/themes/base-theme/template.css | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 280b9b332..25f206106 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -695,14 +695,6 @@ br + br + br {
 	margin-bottom: 30px;
 	border: 1px solid #aaa;
 }
-.slides * {
-	user-select: none;
-	-ms-user-select: none;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	-webkit-user-select: none;
-	-webkit-touch-callout: none;
-}
 .slides input {
 	display: none;
 }

From a91a8f5e9382ae15674d0f65dfd05002a1523b75 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 19:00:23 +0100
Subject: [PATCH 238/363] Changelog (date for .0.9.3)

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 15582e82a..99ff0066f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 # Journal des modifications
 
-## 2014-12-xx FreshRSS 0.9.3 (beta)
+## 2014-12-12 FreshRSS 0.9.3 (beta)
 
 * SimplePie
 	* Support for content-type application/x-rss+xml

From 67aa7e76c186e43a5e0290ed2c512791c7a3005c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 13 Dec 2014 10:01:31 +0100
Subject: [PATCH 239/363] Fix strings and url on auth configuration page

---
 app/i18n/en/admin.php      | 2 +-
 app/i18n/fr/admin.php      | 2 +-
 app/views/auth/index.phtml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 26af23225..083cabfed 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -12,7 +12,7 @@ return array(
 		'title' => 'Authentication',
 		'title_reset' => 'Authentication reset',
 		'token' => 'Authentication token',
-		'token_help' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
+		'token_help' => 'Allows to access RSS output of the default user without authentication:',
 		'type' => 'Authentication method',
 		'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	),
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index a0d173b0c..1d327a33c 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -12,7 +12,7 @@ return array(
 		'title' => 'Authentification',
 		'title_reset' => 'Réinitialisation de l’authentification',
 		'token' => 'Jeton d’identification',
-		'token_help' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
+		'token_help' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier :',
 		'type' => 'Méthode d’authentification',
 		'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	),
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index 420937042..ee1e2d8b9 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -47,7 +47,7 @@
 					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
 					<?php echo _t('admin.auth.unsafe_autologin'); ?>
-					<kbd>p/i/?a=formLogin&amp;u=Alice&amp;p=1234</kbd>
+					<kbd><?php echo Minz_Url::display(array('c' => 'auth', 'a' => 'login', 'params' => array('u' => 'alice', 'p' => '1234')), 'html', true); ?></kbd>
 				</label>
 			</div>
 		</div>
@@ -59,7 +59,8 @@
 			<div class="group-controls">
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo _i('help'); ?> <?php echo _t('admin.auth.token_help', Minz_Url::display(null, 'html', true), $token); ?>
+				<?php echo _i('help'); ?> <?php echo _t('admin.auth.token_help'); ?>
+				<kbd><?php echo Minz_Url::display(array('params' => array('output' => 'rss', 'token' => $token)), 'html', true); ?></kbd>
 			</div>
 		</div>
 		<?php } ?>

From 7f4ca35fc331ca4ce5e097d574e99417da0ef73e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Dec 2014 17:21:41 +0100
Subject: [PATCH 240/363] Fix i18n strings for sharing

Fix https://github.com/FreshRSS/FreshRSS/issues/728
---
 app/Controllers/entryController.php        | 2 --
 app/Controllers/importExportController.php | 2 --
 app/views/index/normal.phtml               | 8 ++++++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index c894ae9aa..aae08c413 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -34,8 +34,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	 *   - nextGet (default: $get)
 	 *   - idMax (default: 0)
 	 *   - is_read (default: true)
-	 *
-	 * @todo nextGet system should not be present here... or should be?
 	 */
 	public function readAction() {
 		$id = Minz_Request::param('id');
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index f29051f34..6eefa0f6f 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -125,8 +125,6 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 *
 	 * Itis a *very* basic guess file type function. Only based on filename.
 	 * That's could be improved but should be enough for what we have to do.
-	 *
-	 * @todo move into lib_rss.php
 	 */
 	private function guessFileType($filename) {
 		if (substr_compare($filename, '.zip', -4) === 0) {
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 3a27a702b..66111397c 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -140,10 +140,14 @@ if (!empty($this->entries)) {
 
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li>
-							<?php foreach ($sharing as $share) :?>
+							<?php
+								foreach ($sharing as $share) :
+									$type_share = FreshRSS_Context::$conf->shares[$share['type']];
+									$has_specific_title = ($type_share['form'] === 'advanced');
+							?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo _t('index.share.' . $share['name']);?>
+										<?php echo $has_specific_title ? $share['name'] : _t('index.share.' . $share['name']); ?>
 									</a>
 								</li>
 							<?php endforeach;?>

From 875b8a72f97429c4e4df6d292daf4261fb7a45bd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Dec 2014 21:15:24 +0100
Subject: [PATCH 241/363] Coding style endforeach (must be avoided)

---
 app/views/configure/sharing.phtml | 8 ++++----
 app/views/index/normal.phtml      | 4 ++--
 app/views/stats/index.phtml       | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index b42825382..ffe3c039b 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -15,7 +15,7 @@
 			<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
 		<legend><?php echo _t('conf.sharing'); ?></legend>
-		<?php foreach (FreshRSS_Context::$conf->sharing as $key => $sharing): ?>
+		<?php foreach (FreshRSS_Context::$conf->sharing as $key => $sharing) { ?>
 			<?php $share = FreshRSS_Context::$conf->shares[$sharing['type']]; ?>
 			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
@@ -36,14 +36,14 @@
 					<?php } ?>
 				</div>
 			</div>
-		<?php endforeach;?>
+		<?php } ?>
 
 		<div class="form-group">
 			<div class="group-controls">
 				<select>
-					<?php foreach(FreshRSS_Context::$conf->shares as $key => $params):?>
+					<?php foreach(FreshRSS_Context::$conf->shares as $key => $params) { ?>
 						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t('conf.sharing.' . $key) ?></option>
-					<?php endforeach; ?>
+					<?php } ?>
 				</select>
 				<a href='#' class='share add btn'><?php echo _i('add'); ?></a>
 			</div>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 66111397c..b8a78cc3d 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -141,7 +141,7 @@ if (!empty($this->entries)) {
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li>
 							<?php
-								foreach ($sharing as $share) :
+								foreach ($sharing as $share) {
 									$type_share = FreshRSS_Context::$conf->shares[$share['type']];
 									$has_specific_title = ($type_share['form'] === 'advanced');
 							?>
@@ -150,7 +150,7 @@ if (!empty($this->entries)) {
 										<?php echo $has_specific_title ? $share['name'] : _t('index.share.' . $share['name']); ?>
 									</a>
 								</li>
-							<?php endforeach;?>
+							<?php } ?>
 						</ul>
 					</div>
 					<?php } ?>
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index c13c5d26c..18bcd4d99 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -52,14 +52,14 @@
 				</tr>
 			</thead>
 			<tbody>
-				<?php foreach ($this->topFeed as $feed): ?>
+				<?php foreach ($this->topFeed as $feed) { ?>
 					<tr>
 						<td><a href="<?php echo _url('stats', 'repartition', 'id', $feed['id']); ?>"><?php echo $feed['name']; ?></a></td>
 						<td><?php echo $feed['category']; ?></td>
 						<td class="numeric"><?php echo format_number($feed['count']); ?></td>
 						<td class="numeric"><?php echo format_number($feed['count'] / $this->repartition['all_feeds']['total'] * 100, 1);?></td>
 					</tr>
-				<?php endforeach;?>
+				<?php } ?>
 			</tbody>
 		</table>
 	</div>

From 930026df2159b027bc035f4ed15c39a43eb0e9fe Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Dec 2014 21:24:49 +0100
Subject: [PATCH 242/363] Fix bug with new file organisation

entry_bottom.phtml didn't find $feed variable. It's fixed now.
---
 app/views/helpers/index/normal/entry_bottom.phtml | 4 ++--
 app/views/helpers/index/normal/entry_header.phtml | 9 +--------
 app/views/index/normal.phtml                      | 9 +++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 704644f99..e1961e2aa 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -36,7 +36,7 @@
 	<li class="item"><?php
 			if ($bottomline_sharing) {
 				$link = urlencode($this->entry->link());
-				$title = urlencode($this->entry->title() . ' · ' . $feed->name());
+				$title = urlencode($this->entry->title() . ' · ' . $this->feed->name());
 		?><div class="dropdown">
 			<div id="dropdown-share-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
 			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $this->entry->id();?>">
@@ -48,7 +48,7 @@
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 				<?php foreach ($sharing as $share) :?>
 					<li class="item share">
-						<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $this->entry->link(), $this->entry->title() . ' . ' . $feed->name())?>">
+						<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $this->entry->link(), $this->entry->title() . ' . ' . $this->feed->name())?>">
 							<?php echo _t($share['name']);?>
 						</a>
 					</li>
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
index b751b884f..3d8b089b9 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -26,14 +26,7 @@
 			?></li><?php
 		}
 	}
-	$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $this->entry->feed());	//We most likely already have the feed object in cache
-	if ($feed == null) {
-		$feed = $this->entry->feed(true);
-		if ($feed == null) {
-			$feed = FreshRSS_Feed::example();
-		}
-	}
-	?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
+	?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><img class="favicon" src="<?php echo $this->feed->favicon(); ?>" alt="✇" /> <span><?php echo $this->feed->name(); ?></span></a></li>
 	<li class="item title"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></li>
 	<?php if ($topline_date) { ?><li class="item date"><?php echo $this->entry->date(); ?> </li><?php } ?>
 	<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index fd2289365..f2e1c5012 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -25,6 +25,15 @@ if (!empty($this->entries)) {
 			continue;
 		}
 
+		// We most likely already have the feed object in cache
+		$this->feed = FreshRSS_CategoryDAO::findFeed($this->categories, $this->entry->feed());
+		if ($this->feed == null) {
+			$this->feed = $this->entry->feed(true);
+			if ($this->feed == null) {
+				$this->feed = FreshRSS_Feed::example();
+			}
+		}
+
 		if ($display_today && $this->entry->isDay(FreshRSS_Days::TODAY, $today)) {
 			?><div class="day" id="day_today"><?php
 				echo _t('today');

From 04b9bd0b496994bed978e8bf772e83a181429ff1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Dec 2014 21:44:00 +0100
Subject: [PATCH 243/363] Fix i18n for extension system

---
 app/views/extension/configure.phtml |  4 ++--
 app/views/extension/index.phtml     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/extension/configure.phtml b/app/views/extension/configure.phtml
index 295080d5e..c03439a75 100644
--- a/app/views/extension/configure.phtml
+++ b/app/views/extension/configure.phtml
@@ -9,9 +9,9 @@ if (!Minz_Request::param('ajax')) {
 <div class="post">
 	<h1><?php echo $this->extension->getName(); ?> (<?php echo $this->extension->getVersion(); ?>) — <?php echo $this->extension->getType(); ?></h1>
 
-	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.by'), ' ', $this->extension->getAuthor(); ?></p>
+	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.short.by_author', $this->extension->getAuthor()); ?></p>
 
-	<h2><?php echo _t('gen.actions.manage'); ?></h2>
+	<h2><?php echo _t('gen.action.manage'); ?></h2>
 	<?php
 		$configure_view = $this->extension->getConfigureView();
 		if ($configure_view !== false) {
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index d34a84452..fd97c5e81 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -1,7 +1,7 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<h1><?php echo _t('admin.extensions.title'); ?></h1>
 
@@ -13,14 +13,14 @@
 			<?php if ($ext->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
 			<?php $name_encoded = urlencode($ext->getName()); ?>
 			<div class="stick">
-				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.actions.manage'); ?></a>
+				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?></a>
 				<?php if ($ext->is_enabled()) { ?>
-				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.disable'); ?></button>
+				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.disable'); ?></button>
 				<?php } else { ?>
-				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.enable'); ?></button>
+				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.enable'); ?></button>
 				<?php } ?>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.remove'); ?></button>
+				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.action.remove'); ?></button>
 				<?php } ?>
 			</div>
 			<?php } else { ?>

From 251d5a78ce893676c7e32e2a85c9ba45775a72bf Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 18 Dec 2014 13:57:25 +0100
Subject: [PATCH 244/363] Fix php interpretation in configure.phtml file

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 lib/Minz/Extension.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index 1d706ed80..e7b38448f 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -97,7 +97,10 @@ class Minz_Extension {
 		if (!file_exists($filename)) {
 			return false;
 		}
-		return @file_get_contents($filename);
+
+		ob_start();
+		include($filename);
+		return ob_get_clean();
 	}
 
 	/**

From c804a30140ecad805f5e1e757ce27612ff7f7022 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 18 Dec 2014 18:42:21 +0100
Subject: [PATCH 245/363] jQuery update from 2.1.1 to 2.1.3

http://blog.jquery.com/2014/12/18/jquery-1-11-2-and-2-1-3-released-safari-fail-safe-edition/
---
 p/scripts/jquery.min.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/p/scripts/jquery.min.js b/p/scripts/jquery.min.js
index e5ace116b..25714ed29 100644
--- a/p/scripts/jquery.min.js
+++ b/p/scripts/jquery.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)
-},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
-},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=l.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,n.ajaxSettings),b):tc(n.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Dc)Dc[a]()}),k.cors=!!Fc&&"withCredentials"in Fc,k.ajax=Fc=!!Fc,n.ajaxTransport(function(a){var b;return k.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Ic=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Jc})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Lc=a.jQuery,Mc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Mc),b&&a.jQuery===n&&(a.jQuery=Lc),n},typeof b===U&&(a.jQuery=a.$=n),n});
+/*! jQuery v2.1.3 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.3",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=mb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=nb(b);function qb(){}qb.prototype=d.filters=d.pseudos,d.setFilters=new qb,g=gb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?gb.error(a):z(a,i).slice(0)};function rb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)
+},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
+},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec=/#.*$/,fc=/([?&])_=[^&]*/,gc=/^(.*?):[ \t]*([^\r\n]*)$/gm,hc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ic=/^(?:GET|HEAD)$/,jc=/^\/\//,kc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lc={},mc={},nc="*/".concat("*"),oc=a.location.href,pc=kc.exec(oc.toLowerCase())||[];function qc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rc(a,b,c,d){var e={},f=a===mc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function sc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function uc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:oc,type:"GET",isLocal:hc.test(pc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sc(sc(a,n.ajaxSettings),b):sc(n.ajaxSettings,a)},ajaxPrefilter:qc(lc),ajaxTransport:qc(mc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gc.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||oc)+"").replace(ec,"").replace(jc,pc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pc[1]&&h[2]===pc[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pc[3]||("http:"===pc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rc(lc,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!ic.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fc.test(d)?d.replace(fc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+nc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rc(mc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tc(k,v,f)),u=uc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vc=/%20/g,wc=/\[\]$/,xc=/\r?\n/g,yc=/^(?:submit|button|image|reset|file)$/i,zc=/^(?:input|select|textarea|keygen)/i;function Ac(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wc.test(a)?d(a,e):Ac(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ac(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ac(c,a[c],b,e);return d.join("&").replace(vc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&zc.test(this.nodeName)&&!yc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xc,"\r\n")}}):{name:b.name,value:c.replace(xc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bc=0,Cc={},Dc={0:200,1223:204},Ec=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cc)Cc[a]()}),k.cors=!!Ec&&"withCredentials"in Ec,k.ajax=Ec=!!Ec,n.ajaxTransport(function(a){var b;return k.cors||Ec&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Dc[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Cc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fc=[],Gc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Fc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hc)return Hc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ic=a.document.documentElement;function Jc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ic;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ic})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Kc=a.jQuery,Lc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lc),b&&a.jQuery===n&&(a.jQuery=Kc),n},typeof b===U&&(a.jQuery=a.$=n),n});

From 26da4aa448906f857a252507b34d369a386043c6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 18 Dec 2014 18:59:13 +0100
Subject: [PATCH 246/363] Update Minz_Translation

- Give possibility to register new i18n files
- Add a extension->registerTranslates() method
- extensions can define new strings or override previous ones

Fix https://github.com/FreshRSS/FreshRSS/issues/731
---
 lib/Minz/Extension.php |  8 +++++
 lib/Minz/Translate.php | 79 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index e7b38448f..a24c718c3 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -178,6 +178,14 @@ class Minz_Extension {
 		Minz_View::addBasePathname($this->path);
 	}
 
+	/**
+	 * Register i18n files from ext_dir/i18n/
+	 */
+	public function registerTranslates() {
+		$i18n_dir = $this->path . '/i18n';
+		Minz_Translate::registerPath($i18n_dir);
+	}
+
 	/**
 	 * Register a new hook.
 	 *
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index e7efb8665..aa96728f2 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -15,9 +15,9 @@ class Minz_Translate {
 	private static $lang_name;
 
 	/**
-	 * $lang_path is the pathname of i18n files (e.g. ./app/i18n/en/).
+	 * $lang_files is a list of registered i18n files.
 	 */
-	private static $lang_path;
+	private static $lang_files = array();
 
 	/**
 	 * $translates is a cache for i18n translation.
@@ -30,7 +30,10 @@ class Minz_Translate {
 	public static function init() {
 		$l = Minz_Configuration::language();
 		self::$lang_name = Minz_Session::param('language', $l);
-		self::$lang_path = APP_PATH . '/i18n/' . self::$lang_name . '/';
+		self::$lang_files = array();
+		self::$translates = array();
+
+		self::registerPath(APP_PATH . '/i18n');
 	}
 
 	/**
@@ -40,6 +43,63 @@ class Minz_Translate {
 		self::init();
 	}
 
+	/**
+	 * Register a new path and load i18n files inside.
+	 *
+	 * @param $path a path containing i18n directories (e.g. ./en/, ./fr/).
+	 */
+	public static function registerPath($path) {
+		// We load first i18n files for the current language.
+		$lang_path = $path . '/' . self::$lang_name;
+		$list_i18n_files = array_values(array_diff(
+			scandir($lang_path),
+			array('..', '.')
+		));
+
+		// Each file basename correspond to a top-level i18n key. For each of
+		// these keys we store the file pathname and mark translations must be
+		// reloaded (by setting $translates[$i18n_key] to null).
+		foreach ($list_i18n_files as $i18n_filename) {
+			$i18n_key = basename($i18n_filename, '.php');
+			if (!isset(self::$lang_files[$i18n_key])) {
+				self::$lang_files[$i18n_key] = array();
+			}
+			self::$lang_files[$i18n_key][] = $lang_path . '/' . $i18n_filename;
+			self::$translates[$i18n_key] = null;
+		}
+	}
+
+	/**
+	 * Load the files associated to $key into $translates.
+	 *
+	 * @param $key the top level i18n key we want to load.
+	 */
+	private static function loadKey($key) {
+		// The top level key is not in $lang_files, it means it does not exist!
+		if (!isset(self::$lang_files[$key])) {
+			Minz_Log::debug($key . ' is not a valid top level key');
+			return false;
+		}
+
+		self::$translates[$key] = array();
+
+		foreach (self::$lang_files[$key] as $lang_pathname) {
+			$i18n_array = include($lang_pathname);
+			if (!is_array($i18n_array)) {
+				Minz_Log::warning('`' . $lang_pathname . '` does not contain a PHP array');
+				continue;
+			}
+
+			// We must avoid to erase previous data so we just override them if
+			// needed.
+			self::$translates[$key] = array_replace_recursive(
+				self::$translates[$key], $i18n_array
+			);
+		}
+
+		return true;
+	}
+
 	/**
 	 * Translate a key into its corresponding value based on selected language.
 	 * @param $key the key to translate.
@@ -57,16 +117,13 @@ class Minz_Translate {
 			$top_level = array_shift($group);
 		}
 
-		$filename = self::$lang_path . $top_level . '.php';
-
-		// Try to load the i18n file if it's not done yet.
-		if (!isset(self::$translates[$top_level])) {
-			if (!file_exists($filename)) {
-				Minz_Log::debug($top_level . ' is not a valid top level key');
+		// If $translates[$top_level] is null it means we have to load the
+		// corresponding files.
+		if (is_null(self::$translates[$top_level])) {
+			$res = self::loadKey($top_level);
+			if (!$res) {
 				return $key;
 			}
-
-			self::$translates[$top_level] = include($filename);
 		}
 
 		// Go through the i18n keys to get the correct translation value.

From b5bee8560345e4123432a8bd3bcd63b938549ef9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 21 Dec 2014 13:10:02 +0100
Subject: [PATCH 247/363] BREAKING FEATURE: move user data

- Create ./data/users/ folder
- Move user configuration to ./data/users/username/config.php
- Move sqlite db to ./data/users/username/db.sqlite
- Move user logs to ./data/users/username/log.txt

See https://github.com/FreshRSS/FreshRSS/issues/729
---
 app/Controllers/userController.php | 15 ++++++++-------
 app/Models/Configuration.php       |  4 ++--
 app/Models/LogDAO.php              |  4 ++--
 app/Models/UserDAO.php             |  8 ++++----
 data/.gitignore                    |  1 -
 data/log/.gitignore                |  1 -
 data/users/.gitignore              |  4 ++++
 data/{log => users}/index.html     |  0
 lib/Minz/Log.php                   |  2 +-
 lib/Minz/ModelPdo.php              |  2 +-
 lib/lib_rss.php                    | 24 +++++++++++++++---------
 11 files changed, 37 insertions(+), 28 deletions(-)
 delete mode 100644 data/log/.gitignore
 create mode 100644 data/users/.gitignore
 rename data/{log => users}/index.html (100%)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 3b40e42dc..1b1ccaac9 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -109,7 +109,8 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$conf->language);
-			if (!in_array($new_user_language, FreshRSS_Context::$conf->availableLanguages())) {
+			$languages = FreshRSS_Context::$conf->availableLanguages();
+			if (!isset($languages[$new_user_language])) {
 				$new_user_language = FreshRSS_Context::$conf->language;
 			}
 
@@ -121,11 +122,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 				$ok &= !in_array(strtoupper($new_user_name), array_map('strtoupper', listUsers()));	//Not an existing user, case-insensitive
 
-				$configPath = DATA_PATH . '/' . $new_user_name . '_user.php';
+				$configPath = join_path(DATA_PATH, 'users', $new_user_name, 'config.php');
 				$ok &= !file_exists($configPath);
 			}
 			if ($ok) {
-			
 				$passwordPlain = Minz_Request::param('new_user_passwordPlain', '', true);
 				$passwordHash = '';
 				if ($passwordPlain != '') {
@@ -147,12 +147,13 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				if (empty($new_user_email)) {
 					$new_user_email = '';
 				} else {
-					$personaFile = DATA_PATH . '/persona/' . $new_user_email . '.txt';
+					$personaFile = join_path(DATA_PATH, 'persona', $new_user_email . '.txt');
 					@unlink($personaFile);
 					$ok &= (file_put_contents($personaFile, $new_user_name) !== false);
 				}
 			}
 			if ($ok) {
+				mkdir(join_path(DATA_PATH, 'users', $new_user_name));
 				$config_array = array(
 					'language' => $new_user_language,
 					'passwordHash' => $passwordHash,
@@ -183,18 +184,18 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 			$username = Minz_Request::param('username');
 			$ok = ctype_alnum($username);
+			$user_data = join_path(DATA_PATH, 'users', $username);
 
 			if ($ok) {
 				$ok &= (strcasecmp($username, Minz_Configuration::defaultUser()) !== 0);	//It is forbidden to delete the default user
 			}
 			if ($ok) {
-				$configPath = DATA_PATH . '/' . $username . '_user.php';
-				$ok &= file_exists($configPath);
+				$ok &= is_dir($user_data);
 			}
 			if ($ok) {
 				$userDAO = new FreshRSS_UserDAO();
 				$ok &= $userDAO->deleteUser($username);
-				$ok &= unlink($configPath);
+				$ok &= recursive_unlink($user_data);
 				//TODO: delete Persona file
 			}
 			invalidateHttpCache();
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 8668470b0..8bba8f777 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -74,7 +74,7 @@ class FreshRSS_Configuration {
 	private $shares;
 
 	public function __construct($user) {
-		$this->filename = DATA_PATH . DIRECTORY_SEPARATOR . $user . '_user.php';
+		$this->filename = join_path(DATA_PATH, 'users', $user, 'config.php');
 
 		$data = @include($this->filename);
 		if (!is_array($data)) {
@@ -89,7 +89,7 @@ class FreshRSS_Configuration {
 		}
 		$this->data['user'] = $user;
 
-		$this->shares = DATA_PATH . DIRECTORY_SEPARATOR . 'shares.php';
+		$this->shares = join_path(DATA_PATH, 'shares.php');
 
 		$shares = @include($this->shares);
 		if (!is_array($shares)) {
diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
index 21593435d..4c56e3150 100644
--- a/app/Models/LogDAO.php
+++ b/app/Models/LogDAO.php
@@ -3,7 +3,7 @@
 class FreshRSS_LogDAO {
 	public static function lines() {
 		$logs = array();
-		$handle = @fopen(LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log', 'r');
+		$handle = @fopen(join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt'), 'r');
 		if ($handle) {
 			while (($line = fgets($handle)) !== false) {
 				if (preg_match('/^\[([^\[]+)\] \[([^\[]+)\] --- (.*)$/', $line, $matches)) {
@@ -20,6 +20,6 @@ class FreshRSS_LogDAO {
 	}
 
 	public static function truncate() {
-		file_put_contents(LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log', '');
+		file_put_contents(join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt'), '');
 	}
 }
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index f04ae26bf..6514080bc 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -38,7 +38,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 		if ($db['type'] === 'sqlite') {
-			return unlink(DATA_PATH . '/' . $username . '.sqlite');
+			return unlink(join_path(DATA_PATH, 'users', $username, 'db.sqlite'));
 		} else {
 			$userPDO = new Minz_ModelPdo($username);
 
@@ -55,14 +55,14 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 	}
 
 	public static function exist($username) {
-		return file_exists(DATA_PATH . '/' . $username . '_user.php');
+		return is_dir(join_path(DATA_PATH , 'users', $username));
 	}
 
 	public static function touch($username) {
-		return touch(DATA_PATH . '/' . $username . '_user.php');
+		return touch(join_path(DATA_PATH , 'users', $username, 'config.php'));
 	}
 
 	public static function mtime($username) {
-		return @filemtime(DATA_PATH . '/' . $username . '_user.php');
+		return @filemtime(join_path(DATA_PATH , 'users', $username, 'config.php'));
 	}
 }
diff --git a/data/.gitignore b/data/.gitignore
index 325fa75c6..20364e266 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,6 +1,5 @@
 application.ini
 config.php
-*_user.php
 *.sqlite
 touch.txt
 no-cache.txt
diff --git a/data/log/.gitignore b/data/log/.gitignore
deleted file mode 100644
index bf0824e59..000000000
--- a/data/log/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.log
\ No newline at end of file
diff --git a/data/users/.gitignore b/data/users/.gitignore
new file mode 100644
index 000000000..53ed0587b
--- /dev/null
+++ b/data/users/.gitignore
@@ -0,0 +1,4 @@
+db.sqlite
+config.php
+log.txt
+
diff --git a/data/log/index.html b/data/users/index.html
similarity index 100%
rename from data/log/index.html
rename to data/users/index.html
diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php
index d3eaec2ae..26412c547 100644
--- a/lib/Minz/Log.php
+++ b/lib/Minz/Log.php
@@ -37,7 +37,7 @@ class Minz_Log {
 		       || ($env === Minz_Configuration::PRODUCTION
 		       && ($level >= Minz_Log::NOTICE)))) {
 			if ($file_name === null) {
-				$file_name = LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log';
+				$file_name = join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt');
 			}
 
 			switch ($level) {
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 6198cd85c..118d89ad2 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -63,7 +63,7 @@ class Minz_ModelPdo {
 				);
 				$this->prefix = $db['prefix'] . $currentUser . '_';
 			} elseif ($type === 'sqlite') {
-				$string = 'sqlite:' . DATA_PATH . '/' . $currentUser . '.sqlite';
+				$string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite');
 				$driver_options = array(
 					//PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
 				);
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 264c69d58..cfd31b2c8 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -15,6 +15,17 @@ if (!function_exists('json_encode')) {
 	}
 }
 
+/**
+ * Build a directory path by concatenating a list of directory names.
+ *
+ * @param $path_parts a list of directory names
+ * @return a string corresponding to the final pathname
+ */
+function join_path() {
+	$path_parts = func_get_args();
+	return join(DIRECTORY_SEPARATOR, $path_parts);
+}
+
 //<Auto-loading>
 function classAutoloader($class) {
 	if (strpos($class, 'FreshRSS') === 0) {
@@ -208,16 +219,11 @@ function invalidateHttpCache() {
 	return touch(LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log');
 }
 
-function usernameFromPath($userPath) {
-	if (preg_match('%/([A-Za-z0-9]{1,16})_user\.php$%', $userPath, $matches)) {
-		return $matches[1];
-	} else {
-		return '';
-	}
-}
-
 function listUsers() {
-	return array_map('usernameFromPath', glob(DATA_PATH . '/*_user.php'));
+	return array_values(array_diff(
+		scandir(join_path(DATA_PATH, 'users')),
+		array('..', '.')
+	));
 }
 
 function httpAuthUser() {

From 966c061b3c032ead2441e906d59ac7985223a405 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 21 Dec 2014 17:38:38 +0100
Subject: [PATCH 248/363] Fix listUsers function

See https://github.com/FreshRSS/FreshRSS/issues/729
---
 lib/lib_rss.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index cfd31b2c8..2c2682041 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -216,14 +216,21 @@ function uSecString() {
 
 function invalidateHttpCache() {
 	Minz_Session::_param('touch', uTimeString());
-	return touch(LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log');
+	return touch(join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt'));
 }
 
 function listUsers() {
-	return array_values(array_diff(
-		scandir(join_path(DATA_PATH, 'users')),
-		array('..', '.')
-	));
+	$final_list = array();
+	$base_path = join_path(DATA_PATH, 'users');
+	$dir_list = array_values(array_diff(scandir($base_path), array('..', '.')));
+
+	foreach ($dir_list as $file) {
+		if (is_dir(join_path($base_path, $file))) {
+			$final_list[] = $file;
+		}
+	}
+
+	return $final_list;
 }
 
 function httpAuthUser() {

From 725aece83ecd2705f273da64623007a7a05f8791 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 21 Dec 2014 17:41:20 +0100
Subject: [PATCH 249/363] Fix getting db size for sqlite

See https://github.com/FreshRSS/FreshRSS/issues/729
---
 app/Models/EntryDAOSQLite.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index bb1539e0c..ffe0f037c 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -169,6 +169,6 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	}
 
 	public function size($all = false) {
-		return @filesize(DATA_PATH . '/' . $this->current_user . '.sqlite');
+		return @filesize(join_path(DATA_PATH, 'users', $this->current_user, 'db.sqlite'));
 	}
 }

From 5f327abeeca1953ff9d11f93afb9fbd9ceb825ba Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 21 Dec 2014 17:53:03 +0100
Subject: [PATCH 250/363] Add recursive_unlink function in dev branch

---
 lib/lib_rss.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 264c69d58..2400ba708 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -319,3 +319,27 @@ function check_install_database() {
 
 	return $status;
 }
+
+/**
+ * Remove a directory recursively.
+ *
+ * From http://php.net/rmdir#110489
+ *
+ * @param $dir the directory to remove
+ */
+function recursive_unlink($dir) {
+	if (!is_dir($dir)) {
+		return true;
+	}
+	$files = array_diff(scandir($dir), array('.', '..'));
+	foreach ($files as $filename) {
+		$filename = $dir . '/' . $filename;
+		if (is_dir($filename)) {
+			@chmod($filename, 0777);
+			recursive_unlink($filename);
+		} else {
+			unlink($filename);
+		}
+	}
+	return rmdir($dir);
+}

From 039a83759d41615aaa593fa62deff4c25fc126a2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 28 Dec 2014 17:42:46 +0100
Subject: [PATCH 251/363] Fix install.php to consider new data organization

- Introduce USERS_PATH
- Remove LOG_PATH
- Use join_path in install.php
- Change references to old  data files to the new ones
- Update i18n

See https://github.com/FreshRSS/FreshRSS/issues/729
---
 app/i18n/en/install.php |  9 ++++----
 app/i18n/fr/install.php |  9 ++++----
 app/install.php         | 49 +++++++++++++++++++++++------------------
 constants.php           |  2 +-
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index ed3210190..e8073e8b6 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'finish' => 'Complete installation',
+		'fix_errors_before' => 'Fix errors before skip to the next step.',
 		'next_step' => 'Go to the next step',
 	),
 	'auth' => array(
@@ -57,10 +58,6 @@ return array(
 			'nok' => 'Please check that you are not altering your HTTP REFERER.',
 			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 		),
-		'logs' => array(
-			'nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on logs directory are good.',
-		),
 		'minz' => array(
 			'nok' => 'You lack the Minz framework.',
 			'ok' => 'You have the Minz framework.',
@@ -81,6 +78,10 @@ return array(
 			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
 			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
 		),
+		'users' => array(
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on users directory are good.',
+		),
 	),
 	'conf' => array(
 		'_' => 'General configuration',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index f1ef2ea3f..d1b78ffb6 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'finish' => 'Terminer l’installation',
+		'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
 		'next_step' => 'Passer à l’étape suivante',
 	),
 	'auth' => array(
@@ -57,10 +58,6 @@ return array(
 			'nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
 			'ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
 		),
-		'logs' => array(
-			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/logs</em>. Le serveur HTTP doit être capable d’écrire dedans',
-			'ok' => 'Les droits sur le répertoire des logs sont bons.',
-		),
 		'minz' => array(
 			'nok' => 'Vous ne disposez pas de la librairie Minz.',
 			'ok' => 'Vous disposez du framework Minz',
@@ -81,6 +78,10 @@ return array(
 			'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
 			'ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
 		),
+		'users' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/users</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des utilisateurs sont bons.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Configuration générale',
diff --git a/app/install.php b/app/install.php
index 8091a9eb0..8b65fbb6f 100644
--- a/app/install.php
+++ b/app/install.php
@@ -132,12 +132,17 @@ function saveStep2() {
 			'token' => $token,
 		);
 
-		$configPath = DATA_PATH . '/' . $_SESSION['default_user'] . '_user.php';
-		@unlink($configPath);	//To avoid access-rights problems
-		file_put_contents($configPath, "<?php\n return " . var_export($config_array, true) . ';');
+		// Create default user files but first, we delete previous data to
+		// avoid access right problems.
+		$user_dir = join_path(USERS_PATH, $_SESSION['default_user']);
+		$user_config_path = join_path($user_dir, 'config.php');
+
+		recursive_unlink($user_dir);
+		mkdir($user_dir);
+		file_put_contents($user_config_path, "<?php\n return " . var_export($config_array, true) . ';');
 
 		if ($_SESSION['mail_login'] != '') {
-			$personaFile = DATA_PATH . '/persona/' . $_SESSION['mail_login'] . '.txt';
+			$personaFile = join_path(DATA_PATH, 'persona', $_SESSION['mail_login'] . '.txt');
 			@unlink($personaFile);
 			file_put_contents($personaFile, $_SESSION['default_user']);
 		}
@@ -193,8 +198,8 @@ function saveStep3() {
 			),
 		);
 
-		@unlink(DATA_PATH . '/config.php');	//To avoid access-rights problems
-		file_put_contents(DATA_PATH . '/config.php', "<?php\n return " . var_export($ini_array, true) . ';');
+		@unlink(join_path(DATA_PATH, 'config.php'));	//To avoid access-rights problems
+		file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($ini_array, true) . ';');
 
 		$res = checkBD();
 
@@ -217,7 +222,7 @@ function newPdo() {
 		);
 		break;
 	case 'sqlite':
-		$str = 'sqlite:' . DATA_PATH . '/' . $_SESSION['default_user'] . '.sqlite';
+		$str = 'sqlite:' . join_path(USERS_PATH, $_SESSION['default_user'], 'db.sqlite');
 		$driver_options = array(
 			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
 		);
@@ -229,7 +234,7 @@ function newPdo() {
 }
 
 function deleteInstall() {
-	$res = unlink(DATA_PATH . '/do-install.txt');
+	$res = unlink(join_path(DATA_PATH, 'do-install.txt'));
 
 	if (!$res) {
 		return false;
@@ -270,7 +275,7 @@ function checkStep0() {
 
 function checkStep1() {
 	$php = version_compare(PHP_VERSION, '5.2.1') >= 0;
-	$minz = file_exists(LIB_PATH . '/Minz');
+	$minz = file_exists(join_path(LIB_PATH, 'Minz'));
 	$curl = extension_loaded('curl');
 	$pdo_mysql = extension_loaded('pdo_mysql');
 	$pdo_sqlite = extension_loaded('pdo_sqlite');
@@ -280,9 +285,9 @@ function checkStep1() {
 	$dom = class_exists('DOMDocument');
 	$data = DATA_PATH && is_writable(DATA_PATH);
 	$cache = CACHE_PATH && is_writable(CACHE_PATH);
-	$log = LOG_PATH && is_writable(LOG_PATH);
-	$favicons = is_writable(DATA_PATH . '/favicons');
-	$persona = is_writable(DATA_PATH . '/persona');
+	$users = USERS_PATH && is_writable(USERS_PATH);
+	$favicons = is_writable(join_path(DATA_PATH, 'favicons'));
+	$persona = is_writable(join_path(DATA_PATH, 'persona'));
 	$http_referer = is_referer_from_same_domain();
 
 	return array(
@@ -297,12 +302,12 @@ function checkStep1() {
 		'dom' => $dom ? 'ok' : 'ko',
 		'data' => $data ? 'ok' : 'ko',
 		'cache' => $cache ? 'ok' : 'ko',
-		'log' => $log ? 'ok' : 'ko',
+		'users' => $users ? 'ok' : 'ko',
 		'favicons' => $favicons ? 'ok' : 'ko',
 		'persona' => $persona ? 'ok' : 'ko',
 		'http_referer' => $http_referer ? 'ok' : 'ko',
 		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom &&
-		         $data && $cache && $log && $favicons && $persona && $http_referer ?
+		         $data && $cache && $users && $favicons && $persona && $http_referer ?
 		         'ok' : 'ko'
 	);
 }
@@ -327,7 +332,7 @@ function checkStep2() {
 	if ($defaultUser === null) {
 		$defaultUser = empty($_SESSION['default_user']) ? '' : $_SESSION['default_user'];
 	}
-	$data = is_writable(DATA_PATH . '/' . $defaultUser . '_user.php');
+	$data = is_writable(join_path(USERS_PATH, $defaultUser, 'config.php'));
 
 	return array(
 		'conf' => $conf ? 'ok' : 'ko',
@@ -339,7 +344,7 @@ function checkStep2() {
 }
 
 function checkStep3() {
-	$conf = is_writable(DATA_PATH . '/config.php');
+	$conf = is_writable(join_path(DATA_PATH, 'config.php'));
 
 	$bd = isset($_SESSION['bd_type']) &&
 	      isset($_SESSION['bd_host']) &&
@@ -382,7 +387,7 @@ function checkBD() {
 			$str = 'mysql:host=' . $_SESSION['bd_host'] . ';dbname=' . $_SESSION['bd_base'];
 			break;
 		case 'sqlite':
-			$str = 'sqlite:' . DATA_PATH . '/' . $_SESSION['default_user'] . '.sqlite';
+			$str = 'sqlite:' . join_path(USERS_PATH, $_SESSION['default_user'], 'db.sqlite');
 			$driver_options = array(
 				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
 			);
@@ -414,7 +419,7 @@ function checkBD() {
 	}
 
 	if (!$ok) {
-		@unlink(DATA_PATH . '/config.php');
+		@unlink(join_path(DATA_PATH, 'config.php'));
 	}
 
 	return $ok;
@@ -470,7 +475,7 @@ function printStep1() {
 	<?php if ($res['minz'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.minz.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.minz.nok', LIB_PATH . '/Minz'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.minz.nok', join_path(LIB_PATH, 'Minz')); ?></p>
 	<?php } ?>
 
 	<?php if ($res['pdo'] == 'ok') { ?>
@@ -516,10 +521,10 @@ function printStep1() {
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.cache.nok', CACHE_PATH); ?></p>
 	<?php } ?>
 
-	<?php if ($res['log'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.logs.ok'); ?></p>
+	<?php if ($res['users'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.users.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.logs.nok', LOG_PATH); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.users.nok', USERS_PATH); ?></p>
 	<?php } ?>
 
 	<?php if ($res['favicons'] == 'ok') { ?>
diff --git a/constants.php b/constants.php
index f66a012b0..07dd6f18e 100644
--- a/constants.php
+++ b/constants.php
@@ -16,7 +16,7 @@ define('FRESHRSS_PATH', dirname(__FILE__));
 
 	define('DATA_PATH', FRESHRSS_PATH . '/data');
 		define('UPDATE_FILENAME', DATA_PATH . '/update.php');
-		define('LOG_PATH', DATA_PATH . '/log');
+		define('USERS_PATH', DATA_PATH . '/users');
 		define('CACHE_PATH', DATA_PATH . '/cache');
 
 	define('LIB_PATH', FRESHRSS_PATH . '/lib');

From c391ca62f1ad4130202b995bb5bb9111894e65ff Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 28 Dec 2014 18:05:02 +0100
Subject: [PATCH 252/363] Remove all old references to LOG_PATH

See https://github.com/FreshRSS/FreshRSS/issues/729
---
 app/actualize_script.php     | 4 ++--
 lib/Minz/FrontController.php | 4 ----
 lib/Minz/Log.php             | 6 +++---
 lib/lib_rss.php              | 7 +++++--
 p/api/greader.php            | 2 +-
 p/i/index.php                | 4 ++--
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index 6ce4178cd..e8bc67c10 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -56,9 +56,9 @@ foreach ($users as $myUser) {
 	$freshRSS->run();
 
 	if (!invalidateHttpCache()) {
-		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . LOG_PATH . '/*.log!');
+		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . USERS_PATH . '/*/log.txt!');
 		if (defined('STDERR')) {
-			fwrite(STDERR, 'Write access problem in ' . LOG_PATH . '/*.log!' . "\n");
+			fwrite(STDERR, 'Write access problem in ' . USERS_PATH . '/*/log.txt!' . "\n");
 		}
 	}
 	Minz_Session::unset_session(true);
diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php
index e95c56bf3..3dac1e438 100644
--- a/lib/Minz/FrontController.php
+++ b/lib/Minz/FrontController.php
@@ -30,10 +30,6 @@ class Minz_FrontController {
 	 * Initialise le dispatcher, met à jour la Request
 	 */
 	public function __construct () {
-		if (LOG_PATH === false) {
-			$this->killApp ('Path not found: LOG_PATH');
-		}
-
 		try {
 			Minz_Configuration::init ();
 
diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php
index 26412c547..d19edc1dc 100644
--- a/lib/Minz/Log.php
+++ b/lib/Minz/Log.php
@@ -28,7 +28,7 @@ class Minz_Log {
 	 * 	- level = NOTICE et environment = PRODUCTION
 	 * @param $information message d'erreur / information à enregistrer
 	 * @param $level niveau d'erreur
-	 * @param $file_name fichier de log, par défaut LOG_PATH/application.log
+	 * @param $file_name fichier de log
 	 */
 	public static function record ($information, $level, $file_name = null) {
 		$env = Minz_Configuration::environment ();
@@ -37,7 +37,7 @@ class Minz_Log {
 		       || ($env === Minz_Configuration::PRODUCTION
 		       && ($level >= Minz_Log::NOTICE)))) {
 			if ($file_name === null) {
-				$file_name = join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt');
+				$file_name = join_path(USERS_PATH, Minz_Session::param('currentUser', '_'), 'log.txt');
 			}
 
 			switch ($level) {
@@ -71,7 +71,7 @@ class Minz_Log {
 	 * Automatise le log des variables globales $_GET et $_POST
 	 * Fait appel à la fonction record(...)
 	 * Ne fonctionne qu'en environnement "development"
-	 * @param $file_name fichier de log, par défaut LOG_PATH/application.log
+	 * @param $file_name fichier de log
 	 */
 	public static function recordRequest($file_name = null) {
 		$msg_get = str_replace("\n", '', '$_GET content : ' . print_r($_GET, true));
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index cc60a1607..d450ec858 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -222,7 +222,10 @@ function invalidateHttpCache() {
 function listUsers() {
 	$final_list = array();
 	$base_path = join_path(DATA_PATH, 'users');
-	$dir_list = array_values(array_diff(scandir($base_path), array('..', '.')));
+	$dir_list = array_values(array_diff(
+		scandir($base_path),
+		array('..', '.', '_')
+	));
 
 	foreach ($dir_list as $file) {
 		if (is_dir(join_path($base_path, $file))) {
@@ -297,7 +300,7 @@ function check_install_files() {
 	return array(
 		'data' => DATA_PATH && is_writable(DATA_PATH),
 		'cache' => CACHE_PATH && is_writable(CACHE_PATH),
-		'logs' => LOG_PATH && is_writable(LOG_PATH),
+		'users' => USERS_PATH && is_writable(USERS_PATH),
 		'favicons' => is_writable(DATA_PATH . '/favicons'),
 		'persona' => is_writable(DATA_PATH . '/persona'),
 		'tokens' => is_writable(DATA_PATH . '/tokens'),
diff --git a/p/api/greader.php b/p/api/greader.php
index 1a66c30fb..80714d478 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -77,7 +77,7 @@ class MyPDO extends Minz_ModelPdo {
 }
 
 function logMe($text) {
-	file_put_contents(LOG_PATH . '/api.log', $text, FILE_APPEND);
+	file_put_contents(join_path(USERS_PATH, '_', 'log_api.txt'), $text, FILE_APPEND);
 }
 
 function debugInfo() {
diff --git a/p/i/index.php b/p/i/index.php
index ec969c159..009d56bc3 100755
--- a/p/i/index.php
+++ b/p/i/index.php
@@ -32,8 +32,8 @@ if (file_exists(DATA_PATH . '/do-install.txt')) {
 		require(LIB_PATH . '/http-conditional.php');
 		$currentUser = Minz_Session::param('currentUser', '');
 		$dateLastModification = $currentUser === '' ? time() : max(
-			@filemtime(LOG_PATH . '/' . $currentUser . '.log'),
-			@filemtime(DATA_PATH . '/config.php')
+			@filemtime(join_path(USERS_PATH, $currentUser, 'log.txt')),
+			@filemtime(join_path(DATA_PATH . 'config.php'))
 		);
 		if (httpConditional($dateLastModification, 0, 0, false, PHP_COMPRESSION, true)) {
 			exit();	//No need to send anything

From 497d295be470454b7bd068a5c5cceda8caa19527 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 28 Dec 2014 19:35:20 +0100
Subject: [PATCH 253/363] Add a default users/_ dir

Useful for default log path

See https://github.com/FreshRSS/FreshRSS/issues/729
---
 data/users/_/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 data/users/_/.gitkeep

diff --git a/data/users/_/.gitkeep b/data/users/_/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From 249a474703259a3e2b7e9064ed2052c20c207a8c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 28 Dec 2014 19:59:07 +0100
Subject: [PATCH 254/363] Fix i18n for check installation

Add keys for user directory checking

See https://github.com/FreshRSS/FreshRSS/issues/729
---
 app/i18n/en/admin.php | 8 ++++----
 app/i18n/fr/admin.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 083cabfed..5653453df 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -63,10 +63,6 @@ return array(
 			'nok' => 'You lack JSON (php5-json package).',
 			'ok' => 'You have JSON extension.',
 		),
-		'logs' => array(
-			'nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on logs directory are good.',
-		),
 		'minz' => array(
 			'nok' => 'You lack the Minz framework.',
 			'ok' => 'You have the Minz framework.',
@@ -97,6 +93,10 @@ return array(
 			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
 			'ok' => 'Permissions on tokens directory are good.',
 		),
+		'users' => array(
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on users directory are good.',
+		),
 		'zip' => array(
 			'nok' => 'You lack ZIP extension (php5-zip package).',
 			'ok' => 'You have ZIP extension.',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 1d327a33c..7a4215722 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -63,10 +63,6 @@ return array(
 			'nok' => 'Vous ne disposez pas de JSON (paquet php5-json).',
 			'ok' => 'Vous disposez de l\'extension JSON.',
 		),
-		'logs' => array(
-			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/logs</em>. Le serveur HTTP doit être capable d’écrire dedans',
-			'ok' => 'Les droits sur le répertoire des logs sont bons.',
-		),
 		'minz' => array(
 			'nok' => 'Vous ne disposez pas de la librairie Minz.',
 			'ok' => 'Vous disposez du framework Minz',
@@ -97,6 +93,10 @@ return array(
 			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/tokens</em>. Le serveur HTTP doit être capable d’écrire dedans',
 			'ok' => 'Les droits sur le répertoire des tokens sont bons.',
 		),
+		'users' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/users</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des utilisateurs sont bons.',
+		),
 		'zip' => array(
 			'nok' => 'Vous ne disposez pas de l\'extension ZIP (paquet php5-zip).',
 			'ok' => 'Vous disposez de l\'extension ZIP.',

From d234304580f506266aef8e3c893c4de8493ba879 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 29 Dec 2014 11:22:22 +0100
Subject: [PATCH 255/363] Add files for the new favicon system

Use https://github.com/ArthurHoaro/favicon
See https://github.com/FreshRSS/FreshRSS/issues/290
---
 lib/Favicon/DataAccess.php         |  40 ++++
 lib/Favicon/Favicon.php            | 293 +++++++++++++++++++++++++++++
 p/themes/icons/default_favicon.png | Bin 0 -> 726 bytes
 3 files changed, 333 insertions(+)
 create mode 100644 lib/Favicon/DataAccess.php
 create mode 100644 lib/Favicon/Favicon.php
 create mode 100644 p/themes/icons/default_favicon.png

diff --git a/lib/Favicon/DataAccess.php b/lib/Favicon/DataAccess.php
new file mode 100644
index 000000000..2bfdf640e
--- /dev/null
+++ b/lib/Favicon/DataAccess.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Favicon;
+
+/**
+ * DataAccess is a wrapper used to read/write data locally or remotly
+ * Aside from SOLID principles, this wrapper is also useful to mock remote resources in unit tests
+ * Note: remote access warning are silenced because we don't care if a website is unreachable
+ **/
+class DataAccess {
+	public function retrieveUrl($url) {
+	    $this->set_context();
+	    return @file_get_contents($url);
+	}
+	
+	public function retrieveHeader($url) {
+	    $this->set_context();
+		return @get_headers($url, TRUE);
+	}
+	
+    public function saveCache($file, $data) {
+        file_put_contents($file, $data);
+    }
+    
+    public function readCache($file) {
+    	return file_get_contents($file);
+    }
+    
+    private function set_context() {
+        stream_context_set_default(
+            array(
+                'http' => array(
+                    'method' => 'GET',
+                    'timeout' => 10,
+                    'header' => "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:20.0; Favicon; +https://github.com/ArthurHoaro/favicon) Gecko/20100101 Firefox/32.0\r\n",
+                )
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/Favicon/Favicon.php b/lib/Favicon/Favicon.php
new file mode 100644
index 000000000..7ea6ccf16
--- /dev/null
+++ b/lib/Favicon/Favicon.php
@@ -0,0 +1,293 @@
+<?php
+
+namespace Favicon;
+
+class Favicon
+{
+    protected $url = '';
+    protected $cacheDir;
+    protected $cacheTimeout;
+    protected $dataAccess;
+
+    public function __construct($args = array())
+    {
+        if (isset($args['url'])) {
+            $this->url = $args['url'];
+        }
+        
+        $this->cacheDir = __DIR__ . '/../../resources/cache';
+        $this->dataAccess = new DataAccess();
+    }
+
+    public function cache($args = array()) {
+        if (isset($args['dir'])) {
+            $this->cacheDir = $args['dir'];
+        }
+
+        if (!empty($args['timeout'])) {
+                $this->cacheTimeout = $args['timeout'];
+        } else {
+                $this->cacheTimeout = 0;
+        }
+    }
+
+    public static function baseUrl($url, $path = false)
+    {
+        $return = '';
+
+        if (!$url = parse_url($url)) {
+            return FALSE;
+        }
+
+        // Scheme
+        $scheme = isset($url['scheme']) ? strtolower($url['scheme']) : null;
+        if ($scheme != 'http' && $scheme != 'https') {
+
+            return FALSE;
+        }
+        $return .= "{$scheme}://";
+
+        // Username and password
+        if (isset($url['user'])) {
+            $return .= $url['user'];
+            if (isset($url['pass'])) {
+                $return .= ":{$url['pass']}";
+            }
+            $return .= '@';
+        }
+
+        // Hostname
+        if( !isset($url['host']) ) {
+            return FALSE;
+        }
+        
+        $return .= $url['host'];
+
+        // Port
+        if (isset($url['port'])) {
+            $return .= ":{$url['port']}";
+        }
+
+        // Path
+        if( $path && isset($url['path']) ) {
+            $return .= $url['path'];
+        }
+        $return .= '/';
+
+        return $return;    
+    }
+
+    public function info($url)
+    {
+        if(empty($url) || $url === false) {
+            return false;
+        }
+        
+        $max_loop = 5;
+        
+        // Discover real status by following redirects. 
+        $loop = TRUE;
+        while ($loop && $max_loop-- > 0) {
+            $headers = $this->dataAccess->retrieveHeader($url);
+            $exploded = explode(' ', $headers[0]);
+            
+            if( !isset($exploded[1]) ) { 
+                return false;
+            }
+            list(,$status) = $exploded;
+            
+            switch ($status) {
+                case '301':
+                case '302':
+                    $url = $headers['Location'];
+                    break;
+                default:
+                    $loop = FALSE;
+                    break;
+            }
+        }
+
+        return array('status' => $status, 'url' => $url);
+    }
+    
+    public function endRedirect($url) {
+        $out = $this->info($url);
+        return !empty($out['url']) ? $out['url'] : false;
+    }
+
+    /**
+     * Find remote (or cached) favicon
+     * @return favicon URL, false if nothing was found
+     **/
+    public function get($url = '')
+    {
+        // URLs passed to this method take precedence.
+        if (!empty($url)) {
+            $this->url = $url;
+        }
+
+        // Get the base URL without the path for clearer concatenations.
+        $original = rtrim($this->baseUrl($this->url, true), '/');
+        $url = rtrim($this->endRedirect($this->baseUrl($this->url, false)), '/');
+
+        if(($favicon = $this->checkCache($url)) || ($favicon = $this->getFavicon($url))) {
+            $base = true;
+        }
+        elseif(($favicon = $this->checkCache($original)) || ($favicon = $this->getFavicon($original, false))) {
+            $base = false;    
+        }
+        else
+            return false;
+            
+        // Save cache if necessary
+        $cache = $this->cacheDir . '/' . md5($base ? $url : $original);
+        if ($this->cacheTimeout && !file_exists($cache) || (is_writable($cache) && time() - filemtime($cache) > $this->cacheTimeout)) {
+            $this->dataAccess->saveCache($cache, $favicon);
+        }
+        
+        return $favicon;
+    }
+    
+    private function getFavicon($url, $checkDefault = true) {
+        $favicon = false;
+        
+        if(empty($url)) {
+            return false;
+        }
+        
+        // Try /favicon.ico first.
+        if( $checkDefault ) {
+            $info = $this->info("{$url}/favicon.ico");
+            if ($info['status'] == '200') {
+                $favicon = $info['url'];
+            }
+        }
+
+        // See if it's specified in a link tag in domain url.
+        if (!$favicon) {
+            $favicon = $this->getInPage($url);
+        }
+        
+        // Make sure the favicon is an absolute URL.
+        if( $favicon && filter_var($favicon, FILTER_VALIDATE_URL) === false ) {
+            $favicon = $url . '/' . $favicon;
+        }
+
+        // Sometimes people lie, so check the status.
+        // And sometimes, it's not even an image. Sneaky bastards!
+        // If cacheDir isn't writable, that's not our problem
+        if ($favicon && is_writable($this->cacheDir) && !$this->checkImageMType($favicon)) {
+            $favicon = false;
+        }
+
+        return $favicon;
+    }
+    
+    private function getInPage($url) {
+        $html = $this->dataAccess->retrieveUrl("{$url}/");
+        preg_match('!<head.*?>.*</head>!ims', $html, $match);
+        
+        if(empty($match) || count($match) == 0) {
+            return false;
+        }
+        
+        $head = $match[0];
+        
+        $dom = new \DOMDocument();
+        // Use error supression, because the HTML might be too malformed.
+        if (@$dom->loadHTML($head)) {
+            $links = $dom->getElementsByTagName('link');
+            foreach ($links as $link) {
+                if ($link->hasAttribute('rel') && strtolower($link->getAttribute('rel')) == 'shortcut icon') {
+                    return $link->getAttribute('href');
+                } elseif ($link->hasAttribute('rel') && strtolower($link->getAttribute('rel')) == 'icon') {
+                    return $link->getAttribute('href');
+                } elseif ($link->hasAttribute('href') && strpos($link->getAttribute('href'), 'favicon') !== FALSE) {
+                    return $link->getAttribute('href');
+                }
+            }
+        }
+        return false;
+    }
+    
+    private function checkCache($url) {
+        if ($this->cacheTimeout) {
+            $cache = $this->cacheDir . '/' . md5($url);
+            if (file_exists($cache) && is_readable($cache) && (time() - filemtime($cache) < $this->cacheTimeout)) {
+                return $this->dataAccess->readCache($cache);
+            }
+        } 
+        return false;
+    }
+    
+    private function checkImageMType($url) {
+        $tmpFile = $this->cacheDir . '/tmp.ico';
+        
+        $fileContent = $this->dataAccess->retrieveUrl($url);
+        $this->dataAccess->saveCache($tmpFile, $fileContent);
+        
+        $finfo = finfo_open(FILEINFO_MIME_TYPE);
+        $isImage = strpos(finfo_file($finfo, $tmpFile), 'image') !== false;
+        finfo_close($finfo);
+        
+        unlink($tmpFile);
+        
+        return $isImage;
+    }
+    
+    /**
+     * @return mixed
+     */
+    public function getCacheDir()
+    {
+        return $this->cacheDir;
+    }
+
+    /**
+     * @param mixed $cacheDir
+     */
+    public function setCacheDir($cacheDir)
+    {
+        $this->cacheDir = $cacheDir;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCacheTimeout()
+    {
+        return $this->cacheTimeout;
+    }
+
+    /**
+     * @param mixed $cacheTimeout
+     */
+    public function setCacheTimeout($cacheTimeout)
+    {
+        $this->cacheTimeout = $cacheTimeout;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * @param string $url
+     */
+    public function setUrl($url)
+    {
+        $this->url = $url;
+    }
+
+    /**
+     * @param DataAccess $dataAccess
+     */
+    public function setDataAccess($dataAccess)
+    {
+        $this->dataAccess = $dataAccess;
+    }
+}
diff --git a/p/themes/icons/default_favicon.png b/p/themes/icons/default_favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e660b740906b95894663a8785846d0c410402bc
GIT binary patch
literal 726
zcmV;{0xA88P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy~h)G02R5%f(Q_W8kQ4pWn(r!z;P_|TC=|X`bL@<#QQWH54gCQL1
zSq>@(4yGRbW8k2Tc*C=3xZqXT^aB%>1XK{VTBTWNyDi=BLalE`YtY1tPV)B6zWI2+
zH}e})y<Ug^5eo*JOeTolT(FnQhUdzNIAR>vV)=p=E~-^0+IbgOcDLG7R;zhlO3F!>
z)2iIRJEo0~^@0fz+?alB*Y%peFVsF;F6+_Wpx_m|+XR*ftW9PJiUO>xY#!{&`5f=E
zExr4o#BDZn_UYn`MhNic!GUwLmCEt-;3Z!m*eO7>!wSPg9dJ}JpwrJox9AbxY-WYU
zCuwJ>#{(Oi`|}K3<_toNFxYCj8lAa4O2K%Bw@d4LsFHXE2Q)D>cW#Xa&=+ISKnV<^
z7V8SQy^+h}4{!E8W(jb)TO4$Dq@6&asIh-Li09p2T|bGTff8WBCMNm?bUH29uJ!@n
zOs|Ayy9F-vcwt9AgvrSP;V`d-(U+`6Rdb&8@Z^kd@9?$KY6PRBnO(K7lu!lqRap$`
zga8!`M2QS{!KW_;R)gQskdb|`4k!)w5CZJ;j;!#$c9BqAXZ?MdmSKxr0XqP`b_a|{
zf}j+tu(h2dZlIYEw7DIr7p%`e{b?KO_d`x8(~{PAA@Mp(=bly$o;`nifH8PL2^hoX
zJ~EQvt$&lx>{+#MK*+LR)f{KD%>7Eh=$S%>#TV8xjU-q=M9~n`rB^aMh_7Z^T-=hB
zk_iFT0J)9y4E1{8;iJ{)^74jvYU-kZJjfR-z<2_wgmjR}7IG~-xAcBniDL{Vr&%~X
zOp&k{){T>U*k`p=b>ggGk%cx#(#|!_ttIx-&Oe8#0rOw>?^q!lUgi3;(*OVf07*qo
IM6N<$f|IpWF#rGn

literal 0
HcmV?d00001


From 4f1fc70f876f27a6a9dc09dcf8c0f016466ea8e9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 29 Dec 2014 11:44:25 +0100
Subject: [PATCH 256/363] Change favicon getter behaviour

- Use Favicon library
- Fix coding style
- Change default favicon

Fix https://github.com/FreshRSS/FreshRSS/issues/290
---
 p/f.php | 83 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/p/f.php b/p/f.php
index 5db9ab213..f29de095d 100644
--- a/p/f.php
+++ b/p/f.php
@@ -1,36 +1,59 @@
 <?php
+
 require('../constants.php');
+
+include(LIB_PATH . '/Favicon/Favicon.php');
+include(LIB_PATH . '/Favicon/DataAccess.php');
+
+
 $favicons_dir = DATA_PATH . '/favicons/';
+$default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.png';
+
 
 /* Télécharge le favicon d'un site et le place sur le serveur */
-function download_favicon ($website, $dest) {
-	$ok = false;
-	$url = 'http://g.etfv.co/' . $website;
+function download_favicon($website, $dest) {
+	global $favicons_dir;
 
-	$c = curl_init ($url);
-	curl_setopt ($c, CURLOPT_HEADER, false);
-	curl_setopt ($c, CURLOPT_RETURNTRANSFER, true);
-	curl_setopt ($c, CURLOPT_BINARYTRANSFER, true);
-	$imgRaw = curl_exec ($c);
+	$favicon_getter = new \Favicon\Favicon();
+	$favicon_getter->setCacheDir($favicons_dir);
+	$favicon_url = $favicon_getter->get($website);
 
-	if (curl_getinfo ($c, CURLINFO_HTTP_CODE) == 200) {
-		$file = fopen ($dest, 'w');
-		if ($file !== false) {
-			fwrite ($file, $imgRaw);
-			fclose ($file);
-			$ok = true;
-		}
-	}
-	curl_close ($c);
-	if (!$ok) {
-		header('Location: ' . $url);
+	if ($favicon_url === false) {
 		return false;
 	}
-	return true;
+
+	$c = curl_init($favicon_url);
+	curl_setopt($c, CURLOPT_HEADER, false);
+	curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($c, CURLOPT_BINARYTRANSFER, true);
+	$img_raw = curl_exec($c);
+	$status_code = curl_getinfo($c, CURLINFO_HTTP_CODE);
+	curl_close ($c);
+
+	if ($status_code === 200) {
+		$file = fopen($dest, 'w');
+		if ($file !== false) {
+			fwrite($file, $img_raw);
+			fclose($file);
+			return true;
+		}
+	}
+
+	return false;
 }
 
-$id = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '0';
 
+function show_default_favicon() {
+	global $default_favicon;
+
+	header('HTTP/1.1 404 Not Found');
+	header('Content-Type: image/png');
+	readfile($default_favicon);
+	die();
+}
+
+
+$id = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '0';
 if (!ctype_xdigit($id)) {
 	$id = '0';
 }
@@ -38,19 +61,17 @@ if (!ctype_xdigit($id)) {
 $txt = $favicons_dir . $id . '.txt';
 $ico = $favicons_dir . $id . '.ico';
 
-$icoMTime = @filemtime($ico);
-$txtMTime = @filemtime($txt);
+$ico_mtime = @filemtime($ico);
+$txt_mtime = @filemtime($txt);
 
-if (($icoMTime == false) || ($txtMTime > $icoMTime)) {
-	if ($txtMTime == false) {
-		header('HTTP/1.1 404 Not Found');
-		header('Content-Type: image/gif');
-		readfile(PUBLIC_PATH . '/themes/icons/grey.gif');	//TODO: Better 404 favicon
-		die();
+if (($ico_mtime == false) || ($txt_mtime > $ico_mtime)) {
+	if ($txt_mtime == false) {
+		show_default_favicon();
 	}
+
 	$url = file_get_contents($txt);
 	if (!download_favicon($url, $ico)) {
-		die();
+		show_default_favicon();
 	}
 }
 
@@ -59,6 +80,6 @@ require(LIB_PATH . '/http-conditional.php');
 header('Content-Type: image/x-icon');
 header('Content-Disposition: inline; filename="' . $id . '.ico"');
 
-if (!httpConditional($icoMTime, 2592000, 2)) {
+if (!httpConditional($ico_mtime, 2592000, 2)) {
 	readfile($ico);
 }

From ea7946658289ab768f0948c50d5aa553f6e826d1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 29 Dec 2014 11:46:01 +0100
Subject: [PATCH 257/363] Fix typo coding style

See https://github.com/FreshRSS/FreshRSS/issues/290
---
 p/f.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/f.php b/p/f.php
index f29de095d..d00b36eb0 100644
--- a/p/f.php
+++ b/p/f.php
@@ -28,7 +28,7 @@ function download_favicon($website, $dest) {
 	curl_setopt($c, CURLOPT_BINARYTRANSFER, true);
 	$img_raw = curl_exec($c);
 	$status_code = curl_getinfo($c, CURLINFO_HTTP_CODE);
-	curl_close ($c);
+	curl_close($c);
 
 	if ($status_code === 200) {
 		$file = fopen($dest, 'w');

From 7584364a4c2b407e97909e94ba274da62620abea Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 29 Dec 2014 11:56:22 +0100
Subject: [PATCH 258/363] Fix behaviour when favicon url is not found

If url is not find, we copy default favicon into favicon dir so at the next
try, we don't search the url again.

See https://github.com/FreshRSS/FreshRSS/issues/290
See https://github.com/FreshRSS/FreshRSS/issues/727
---
 p/f.php                            |   8 ++++----
 p/themes/icons/default_favicon.ico | Bin 0 -> 1150 bytes
 p/themes/icons/default_favicon.png | Bin 726 -> 0 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 p/themes/icons/default_favicon.ico
 delete mode 100644 p/themes/icons/default_favicon.png

diff --git a/p/f.php b/p/f.php
index d00b36eb0..fefbf9a10 100644
--- a/p/f.php
+++ b/p/f.php
@@ -7,19 +7,19 @@ include(LIB_PATH . '/Favicon/DataAccess.php');
 
 
 $favicons_dir = DATA_PATH . '/favicons/';
-$default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.png';
+$default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.ico';
 
 
 /* Télécharge le favicon d'un site et le place sur le serveur */
 function download_favicon($website, $dest) {
-	global $favicons_dir;
+	global $favicons_dir, $default_favicon;
 
 	$favicon_getter = new \Favicon\Favicon();
 	$favicon_getter->setCacheDir($favicons_dir);
 	$favicon_url = $favicon_getter->get($website);
 
 	if ($favicon_url === false) {
-		return false;
+		return @copy($default_favicon, $dest);
 	}
 
 	$c = curl_init($favicon_url);
@@ -47,7 +47,7 @@ function show_default_favicon() {
 	global $default_favicon;
 
 	header('HTTP/1.1 404 Not Found');
-	header('Content-Type: image/png');
+	header('Content-Type: image/ico');
 	readfile($default_favicon);
 	die();
 }
diff --git a/p/themes/icons/default_favicon.ico b/p/themes/icons/default_favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e4d5e8f672aeb1cb0aed8d79f793ff3a3859ebbe
GIT binary patch
literal 1150
zcmbtT&r2Io5FTlvc=O~<EO_zXuoq8Cv+bo|Osj|bBRRCSN}^(nE#^?qT1utXLyUqE
zL!$xLmQb*zrL+eZAs{he3%Vc+l@{#sobN5O#I2|Hh1r*#H{ZOOZ@wj}<6lDq@$)+M
zT_tKHqE<F`vB&fCcIi?|(f=9}&)?~+pX+FADon;h>!T0N?7&@TA#Av>x<c+!f5c(m
z*2dK6&AE;nO^7X*w*7nY{=#T)$qh%-nf`98kV@DGpWmzfoww>!_NDr;IIA|;m+1>z
zxyR8oVu6vmac^!omR=f&RDqLqQYow5%~fsqkF(7Ea1}X#5qu#P4{?oFE%xlE<6|X<
za{qWaxDNCw`25%-vpAi!<zDPT{NcBc{_&gSh`pY8V6sDVkR80|)ZUFiyo;S4efP1y
zPL8!7oC<!S`<5#)xVKy?D#QiX{?4}AGxG{uU@o<I_^^OIF7N94wWH<%Jh<@ihL2y4
z_UQV9J>%V9%pLLqkG`M}KGXes{7u;4SGbm4a!BqU)>pOpWXy)f1kdv`c=mdJf<vD$
z=dj|Hz`0RBH05b5ZU`P)SY!RH#Cofx=QFwn;ZX447e40wFa3yq*G6J#o~5<*?5X`_
zbx~^<JNhk7PuS2HbQ;v}h3_YoF!JL==5nmpc^$d!!oV*$LZ7HL`29#9|F#qTZYHW+
UBYJnmvt%97WhUo{1%}5*=SGD6=>Px#

literal 0
HcmV?d00001

diff --git a/p/themes/icons/default_favicon.png b/p/themes/icons/default_favicon.png
deleted file mode 100644
index 1e660b740906b95894663a8785846d0c410402bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 726
zcmV;{0xA88P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy~h)G02R5%f(Q_W8kQ4pWn(r!z;P_|TC=|X`bL@<#QQWH54gCQL1
zSq>@(4yGRbW8k2Tc*C=3xZqXT^aB%>1XK{VTBTWNyDi=BLalE`YtY1tPV)B6zWI2+
zH}e})y<Ug^5eo*JOeTolT(FnQhUdzNIAR>vV)=p=E~-^0+IbgOcDLG7R;zhlO3F!>
z)2iIRJEo0~^@0fz+?alB*Y%peFVsF;F6+_Wpx_m|+XR*ftW9PJiUO>xY#!{&`5f=E
zExr4o#BDZn_UYn`MhNic!GUwLmCEt-;3Z!m*eO7>!wSPg9dJ}JpwrJox9AbxY-WYU
zCuwJ>#{(Oi`|}K3<_toNFxYCj8lAa4O2K%Bw@d4LsFHXE2Q)D>cW#Xa&=+ISKnV<^
z7V8SQy^+h}4{!E8W(jb)TO4$Dq@6&asIh-Li09p2T|bGTff8WBCMNm?bUH29uJ!@n
zOs|Ayy9F-vcwt9AgvrSP;V`d-(U+`6Rdb&8@Z^kd@9?$KY6PRBnO(K7lu!lqRap$`
zga8!`M2QS{!KW_;R)gQskdb|`4k!)w5CZJ;j;!#$c9BqAXZ?MdmSKxr0XqP`b_a|{
zf}j+tu(h2dZlIYEw7DIr7p%`e{b?KO_d`x8(~{PAA@Mp(=bly$o;`nifH8PL2^hoX
zJ~EQvt$&lx>{+#MK*+LR)f{KD%>7Eh=$S%>#TV8xjU-q=M9~n`rB^aMh_7Z^T-=hB
zk_iFT0J)9y4E1{8;iJ{)^74jvYU-kZJjfR-z<2_wgmjR}7IG~-xAcBniDL{Vr&%~X
zOp&k{){T>U*k`p=b>ggGk%cx#(#|!_ttIx-&Oe8#0rOw>?^q!lUgi3;(*OVf07*qo
IM6N<$f|IpWF#rGn


From 51a71ec4b9d62528054be8faee1576a8fd6d37f6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 5 Jan 2015 16:54:16 +0100
Subject: [PATCH 259/363] New configuration system (not working yet)

- Use only Minz_Configuration
- register() method to load a new configuration file
- get() to get a configuration
- new exceptions related to configuration
- fix a list configuration calls to have FRSS working

Current problems to resolve:

- How to handle configuration param verifications (i.e. check auth_type
  is a value from none, http_auth, persona or form)
- We must use $conf = Minz_Configuration::get('system'); $general_conf = $conf->general;
  to access global system configuration which is quite annoying. How to change that?

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/authController.php           |  34 +-
 app/FreshRSS.php                             |   8 +-
 app/Models/Auth.php                          |  40 +-
 app/Models/Context.php                       |   4 +-
 app/Models/Factory.php                       |  16 +-
 app/Models/Feed.php                          |   3 +-
 app/layout/header.phtml                      |  13 +-
 app/layout/layout.phtml                      |   3 +-
 app/views/helpers/javascript_vars.phtml      |   3 +-
 data/config.default.php                      |  32 ++
 data/users/_/config.default.php              |  66 +++
 lib/Minz/BadConfigurationException.php       |   9 -
 lib/Minz/Configuration.php                   | 565 ++++++-------------
 lib/Minz/ConfigurationException.php          |   8 +
 lib/Minz/ConfigurationNamespaceException.php |   4 +
 lib/Minz/ConfigurationParamException.php     |   4 +
 lib/Minz/Error.php                           |   7 +-
 lib/Minz/FrontController.php                 |  26 +-
 lib/Minz/Log.php                             |  11 +-
 lib/Minz/ModelPdo.php                        |   3 +-
 lib/Minz/Request.php                         |   3 +-
 lib/Minz/Translate.php                       |   3 +-
 lib/Minz/View.php                            |   4 +-
 p/i/index.php                                |   2 +-
 24 files changed, 407 insertions(+), 464 deletions(-)
 create mode 100644 data/config.default.php
 create mode 100644 data/users/_/config.default.php
 delete mode 100644 lib/Minz/BadConfigurationException.php
 create mode 100644 lib/Minz/ConfigurationException.php
 create mode 100644 lib/Minz/ConfigurationNamespaceException.php
 create mode 100644 lib/Minz/ConfigurationParamException.php

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index ccc32ec0d..f68ea8da5 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -27,6 +27,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
+			$system_conf = Minz_Configuration::get('system');
+			$general = $system_conf->general;
 			$current_token = FreshRSS_Context::$conf->token;
 			$token = Minz_Request::param('token', $current_token);
 			FreshRSS_Context::$conf->_token($token);
@@ -39,18 +41,21 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			$auth_type = Minz_Request::param('auth_type', 'none');
 			$unsafe_autologin = Minz_Request::param('unsafe_autologin', false);
 			$api_enabled = Minz_Request::param('api_enabled', false);
-			if ($anon != Minz_Configuration::allowAnonymous() ||
-				$auth_type != Minz_Configuration::authType() ||
-				$anon_refresh != Minz_Configuration::allowAnonymousRefresh() ||
-				$unsafe_autologin != Minz_Configuration::unsafeAutologinEnabled() ||
-				$api_enabled != Minz_Configuration::apiEnabled()) {
+			if ($anon != $general['allow_anonymous'] ||
+				$auth_type != $general['auth_type'] ||
+				$anon_refresh != $general['allow_anonymous_refresh'] ||
+				$unsafe_autologin != $general['unsafe_autologin_enabled'] ||
+				$api_enabled != $general['api_enabled']) {
 
-				Minz_Configuration::_authType($auth_type);
-				Minz_Configuration::_allowAnonymous($anon);
-				Minz_Configuration::_allowAnonymousRefresh($anon_refresh);
-				Minz_Configuration::_enableAutologin($unsafe_autologin);
-				Minz_Configuration::_enableApi($api_enabled);
-				$ok &= Minz_Configuration::writeFile();
+				// TODO: test values from form
+				$general['auth_type'] = $auth_type;
+				$general['allow_anonymous'] = $anon;
+				$general['allow_anonymous_refresh'] = $anon_refresh;
+				$general['unsafe_autologin_enabled'] = $unsafe_autologin;
+				$general['api_enabled'] = $api_enabled;
+
+				$system_conf->general = $general;
+				$ok &= $system_conf->save();
 			}
 
 			invalidateHttpCache();
@@ -76,7 +81,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
 		}
 
-		$auth_type = Minz_Configuration::authType();
+		$conf = Minz_Configuration::get('system');
+		$auth_type = $conf->general['auth_type'];
 		switch ($auth_type) {
 		case 'form':
 			Minz_Request::forward(array('c' => 'auth', 'a' => 'formLogin'));
@@ -114,6 +120,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js');
 		Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . $file_mtime));
 
+		$conf = Minz_Configuration::get('system');
+
 		if (Minz_Request::isPost()) {
 			$nonce = Minz_Session::param('nonce');
 			$username = Minz_Request::param('username', '');
@@ -154,7 +162,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
-		} elseif (Minz_Configuration::unsafeAutologinEnabled()) {
+		} elseif ($conf->general['unsafe_autologin_enabled']) {
 			$username = Minz_Request::param('u', '');
 			$password = Minz_Request::param('p', '');
 			Minz_Request::_param('p');
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 6114a5d1a..455f2fefd 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -6,6 +6,11 @@ class FreshRSS extends Minz_FrontController {
 			Minz_Session::init('FreshRSS');
 		}
 
+		$current_user = Minz_Session::param('currentUser', '_');
+		Minz_Configuration::register('user',
+		                             join_path(USERS_PATH, $current_user, 'config.php'),
+		                             join_path(USERS_PATH, '_', 'config.default.php'));
+
 		// Need to be called just after session init because it initializes
 		// current user.
 		FreshRSS_Auth::init();
@@ -57,7 +62,8 @@ class FreshRSS extends Minz_FrontController {
 		Minz_View::appendScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
 
-		if (Minz_Configuration::authType() === 'persona') {
+		$conf = Minz_Configuration::get('system');
+		if ($conf->general['auth_type'] === 'persona') {
 			// TODO move it in a plugin
 			// Needed for login AND logout with Persona.
 			Minz_View::appendScript('https://login.persona.org/include.js');
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 2971d65c8..84b4e3721 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -16,7 +16,8 @@ class FreshRSS_Auth {
 		self::$login_ok = Minz_Session::param('loginOk', false);
 		$current_user = Minz_Session::param('currentUser', '');
 		if ($current_user === '') {
-			$current_user = Minz_Configuration::defaultUser();
+			$conf = Minz_Configuration::get('system');
+			$current_user = $conf->general['default_user'];
 			Minz_Session::_param('currentUser', $current_user);
 		}
 
@@ -40,7 +41,9 @@ class FreshRSS_Auth {
 	 * @return boolean true if user can be connected, false else.
 	 */
 	private static function accessControl() {
-		switch (Minz_Configuration::authType()) {
+		$conf = Minz_Configuration::get('system');
+		$auth_type = $conf->general['auth_type'];
+		switch ($auth_type) {
 		case 'form':
 			$credentials = FreshRSS_FormAuth::getCredentialsFromCookie();
 			$current_user = '';
@@ -79,22 +82,19 @@ class FreshRSS_Auth {
 	 * Gives access to the current user.
 	 */
 	public static function giveAccess() {
-		$current_user = Minz_Session::param('currentUser');
-		try {
-			$conf = new FreshRSS_Configuration($current_user);
-		} catch(Minz_Exception $e) {
-			die($e->getMessage());
-		}
+		$user_conf = Minz_Configuration::get('user');
+		$system_conf = Minz_Configuration::get('system');
+		$auth_type = $system_conf->general['auth_type'];
 
-		switch (Minz_Configuration::authType()) {
+		switch ($auth_type) {
 		case 'form':
-			self::$login_ok = Minz_Session::param('passwordHash') === $conf->passwordHash;
+			self::$login_ok = Minz_Session::param('passwordHash') === $user_conf->passwordHash;
 			break;
 		case 'http_auth':
 			self::$login_ok = strcasecmp($current_user, httpAuthUser()) === 0;
 			break;
 		case 'persona':
-			self::$login_ok = strcasecmp(Minz_Session::param('mail'), $conf->mail_login) === 0;
+			self::$login_ok = strcasecmp(Minz_Session::param('mail'), $user_conf->mail_login) === 0;
 			break;
 		case 'none':
 			self::$login_ok = true;
@@ -114,12 +114,14 @@ class FreshRSS_Auth {
 	 * @return boolean true if user has corresponding access, false else.
 	 */
 	public static function hasAccess($scope = 'general') {
+		$conf = Minz_Configuration::get('system');
+		$default_user = $conf->general['default_user'];
 		$ok = self::$login_ok;
 		switch ($scope) {
 		case 'general':
 			break;
 		case 'admin':
-			$ok &= Minz_Session::param('currentUser') === Minz_Configuration::defaultUser();
+			$ok &= Minz_Session::param('currentUser') === $default_user;
 			break;
 		default:
 			$ok = false;
@@ -133,9 +135,10 @@ class FreshRSS_Auth {
 	public static function removeAccess() {
 		Minz_Session::_param('loginOk');
 		self::$login_ok = false;
-		Minz_Session::_param('currentUser', Minz_Configuration::defaultUser());
+		$conf = Minz_Configuration::get('system');
+		Minz_Session::_param('currentUser', $conf->general['default_user']);
 
-		switch (Minz_Configuration::authType()) {
+		switch ($conf->general['auth_type']) {
 		case 'form':
 			Minz_Session::_param('passwordHash');
 			FreshRSS_FormAuth::deleteCookie();
@@ -151,6 +154,15 @@ class FreshRSS_Auth {
 			// TODO: extensions
 		}
 	}
+
+	/**
+	 * Return if authentication is enabled on this instance of FRSS.
+	 */
+	public static function accessNeedLogin() {
+		$conf = Minz_Configuration::get('system');
+		$auth_type = $conf->general['auth_type'];
+		return $auth_type === 'form' || $auth_type === 'persona';
+	}
 }
 
 
diff --git a/app/Models/Context.php b/app/Models/Context.php
index c8a65063a..9bbad9857 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -41,10 +41,10 @@ class FreshRSS_Context {
 	 */
 	public static function init() {
 		// Init configuration.
-		$current_user = Minz_Session::param('currentUser');
 		try {
-			self::$conf = new FreshRSS_Configuration($current_user);
+			self::$conf = Minz_Configuration::get('user');
 		} catch(Minz_Exception $e) {
+			$current_user = Minz_Session::param('currentUser', '_');
 			Minz_Log::error('Cannot load configuration file of user `' . $current_user . '`');
 			die($e->getMessage());
 		}
diff --git a/app/Models/Factory.php b/app/Models/Factory.php
index 91cb84998..db09d155d 100644
--- a/app/Models/Factory.php
+++ b/app/Models/Factory.php
@@ -3,8 +3,8 @@
 class FreshRSS_Factory {
 
 	public static function createFeedDao($username = null) {
-		$db = Minz_Configuration::dataBase();
-		if ($db['type'] === 'sqlite') {
+		$conf = Minz_Configuration::get('system');
+		if ($conf->db['type'] === 'sqlite') {
 			return new FreshRSS_FeedDAOSQLite($username);
 		} else {
 			return new FreshRSS_FeedDAO($username);
@@ -12,8 +12,8 @@ class FreshRSS_Factory {
 	}
 
 	public static function createEntryDao($username = null) {
-		$db = Minz_Configuration::dataBase();
-		if ($db['type'] === 'sqlite') {
+		$conf = Minz_Configuration::get('system');
+		if ($conf->db['type'] === 'sqlite') {
 			return new FreshRSS_EntryDAOSQLite($username);
 		} else {
 			return new FreshRSS_EntryDAO($username);
@@ -21,8 +21,8 @@ class FreshRSS_Factory {
 	}
 
 	public static function createStatsDAO($username = null) {
-		$db = Minz_Configuration::dataBase();
-		if ($db['type'] === 'sqlite') {
+		$conf = Minz_Configuration::get('system');
+		if ($conf->db['type'] === 'sqlite') {
 			return new FreshRSS_StatsDAOSQLite($username);
 		} else {
 			return new FreshRSS_StatsDAO($username);
@@ -30,8 +30,8 @@ class FreshRSS_Factory {
 	}
 
 	public static function createDatabaseDAO($username = null) {
-		$db = Minz_Configuration::dataBase();
-		if ($db['type'] === 'sqlite') {
+		$conf = Minz_Configuration::get('system');
+		if ($conf->db['type'] === 'sqlite') {
 			return new FreshRSS_DatabaseDAOSQLite($username);
 		} else {
 			return new FreshRSS_DatabaseDAO($username);
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 8f4b60097..071eafdf6 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -39,8 +39,9 @@ class FreshRSS_Feed extends Minz_Model {
 	}
 
 	public function hash() {
+		$conf = Minz_Configuration::get('system');
 		if ($this->hash === null) {
-			$this->hash = hash('crc32b', Minz_Configuration::salt() . $this->url);
+			$this->hash = hash('crc32b', $conf->general['salt'] . $this->url);
 		}
 		return $this->hash;
 	}
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index ba13c2a45..2f16b5f63 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -1,5 +1,8 @@
 <?php
-if (Minz_Configuration::canLogIn()) {
+
+$conf = Minz_Configuration::get('system');
+
+if (FreshRSS_Auth::accessNeedLogin()) {
 	?><ul class="nav nav-head nav-login"><?php
 		if (FreshRSS_Auth::hasAccess()) {
 			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('gen.auth.logout'); ?></a></li><?php
@@ -15,13 +18,13 @@ if (Minz_Configuration::canLogIn()) {
 		<h1>
 			<a href="<?php echo _url('index', 'index'); ?>">
 				<img class="logo" src="<?php echo _i('icon', true); ?>" alt="⊚" />
-				<?php echo Minz_Configuration::title(); ?>
+				<?php echo $conf->general['title']; ?>
 			</a>
 		</h1>
 	</div>
 
 	<div class="item search">
-		<?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymous()) { ?>
+		<?php if (FreshRSS_Auth::hasAccess() || $conf->general['allow_anonymous']) { ?>
 		<form action="<?php echo _url('index', 'index'); ?>" method="get">
 			<div class="stick">
 				<?php $search = Minz_Request::param('search', ''); ?>
@@ -76,14 +79,14 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('gen.menu.logs'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.menu.about'); ?></a></li>
 				<?php
-				if (Minz_Configuration::canLogIn()) {
+				if (FreshRSS_Auth::accessNeedLogin()) {
 					?><li class="separator"></li>
 				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('gen.auth.logout'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
 	</div>
-	<?php } elseif (Minz_Configuration::canLogIn()) { ?>
+	<?php } elseif (FreshRSS_Auth::accessNeedLogin()) { ?>
 	<div class="item configure">
 		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a>
 	</div>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 1827d6c26..656fbe9bc 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -10,6 +10,7 @@
 <?php $this->renderHelper('javascript_vars'); ?>
 		//]]></script>
 <?php
+	$conf = Minz_Configuration::get('system');
 	$url_base = Minz_Request::currentRequest();
 	if (FreshRSS_Context::$next_id !== '') {
 		$url_next = $url_base;
@@ -34,7 +35,7 @@
 		<link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="apple-mobile-web-app-status-bar-style" content="black" />
-		<meta name="apple-mobile-web-app-title" content="<?php echo Minz_Configuration::title(); ?>">
+		<meta name="apple-mobile-web-app-title" content="<?php echo $conf->general['title'] ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
 		<meta name="robots" content="noindex,nofollow" />
 	</head>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 6577e0109..02f2014ee 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,6 +1,7 @@
 "use strict";
 <?php
 
+$conf = Minz_Configuration::get('system');
 $mark = FreshRSS_Context::$conf->mark_when;
 $mail = Minz_Session::param('mail', false);
 $auto_actualize = Minz_Session::param('actualize_feeds', false);
@@ -29,7 +30,7 @@ echo 'var context={',
 	'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',',
 	'sticky_post:', FreshRSS_Context::isStickyPostEnabled() ? 'true' : 'false', ',',
 	'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',',
-	'auth_type:"', Minz_Configuration::authType(), '",',
+	'auth_type:"', $conf->general['auth_type'], '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
 	'current_view:"', Minz_Request::param('output', 'normal'), '"',
 "},\n";
diff --git a/data/config.default.php b/data/config.default.php
new file mode 100644
index 000000000..a69d8050b
--- /dev/null
+++ b/data/config.default.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+	'general' => array(
+		'environment' => 'production',
+		'salt' => '',
+		'base_url' => '',
+		'language' => 'en',
+		'title' => 'FreshRSS',
+		'default_user' => '_',
+		'allow_anonymous' => false,
+		'allow_anonymous_refresh' => false,
+		'auth_type' => 'none',
+		'api_enabled' => false,
+		'unsafe_autologin_enabled' => false,
+	),
+	'limits' => array(
+		'cache_duration' => 800,
+		'timeout' => 10,
+		'max_inactivity' => PHP_INT_MAX,
+		'max_feeds' => 16384,
+		'max_categories' => 16384,
+	),
+	'db' => array(
+		'type' => 'sqlite',
+		'host' => '',
+		'user' => '',
+		'password' => '',
+		'base' => '',
+		'prefix' => '',
+	),
+);
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
new file mode 100644
index 000000000..56d54b293
--- /dev/null
+++ b/data/users/_/config.default.php
@@ -0,0 +1,66 @@
+<?php
+
+return array (
+	'language' => 'en',
+	'old_entries' => 3,
+	'keep_history_default' => 0,
+	'ttl_default' => 3600,
+	'mail_login' => '',
+	'token' => '',
+	'passwordHash' => '',
+	'apiPasswordHash' => '',
+	'posts_per_page' => 20,
+	'view_mode' => 'normal',
+	'default_view' => 'adaptive',
+	'default_state' => FreshRSS_Entry::STATE_NOT_READ,
+	'auto_load_more' => true,
+	'display_posts' => false,
+	'display_categories' => false,
+	'hide_read_feeds' => true,
+	'onread_jump_next' => true,
+	'lazyload' => true,
+	'sticky_post' => true,
+	'reading_confirm' => false,
+	'auto_remove_article' => false,
+	'sort_order' => 'DESC',
+	'anon_access' => false,
+	'mark_when' => array (
+		'article' => true,
+		'site' => true,
+		'scroll' => false,
+		'reception' => false,
+	),
+	'theme' => 'Origine',
+	'content_width' => 'thin',
+	'shortcuts' => array (
+		'mark_read' => 'r',
+		'mark_favorite' => 'f',
+		'go_website' => 'space',
+		'next_entry' => 'j',
+		'prev_entry' => 'k',
+		'first_entry' => 'home',
+		'last_entry' => 'end',
+		'collapse_entry' => 'c',
+		'load_more' => 'm',
+		'auto_share' => 's',
+		'focus_search' => 'a',
+		'user_filter' => 'u',
+		'help' => 'f1',
+		'close_dropdown' => 'escape',
+	),
+	'topline_read' => true,
+	'topline_favorite' => true,
+	'topline_date' => true,
+	'topline_link' => true,
+	'bottomline_read' => true,
+	'bottomline_favorite' => true,
+	'bottomline_sharing' => true,
+	'bottomline_tags' => true,
+	'bottomline_date' => true,
+	'bottomline_link' => true,
+	'sharing' => array (
+	),
+	'queries' => array (
+	),
+	'html5_notif_timeout' => 0,
+);
diff --git a/lib/Minz/BadConfigurationException.php b/lib/Minz/BadConfigurationException.php
deleted file mode 100644
index a7b77d687..000000000
--- a/lib/Minz/BadConfigurationException.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-class Minz_BadConfigurationException extends Minz_Exception {
-	public function __construct ($part_missing, $code = self::ERROR) {
-		$message = '`' . $part_missing
-		         . '` in the configuration file is missing or is misconfigured';
-		
-		parent::__construct ($message, $code);
-	}
-}
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 6cbc9fc0b..66df21a31 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -1,419 +1,192 @@
 <?php
-/**
- * MINZ - Copyright 2011 Marien Fressinaud
- * Sous licence AGPL3 <http://www.gnu.org/licenses/>
-*/
 
 /**
- * La classe Configuration permet de gérer la configuration de l'application
+ * Manage configuration for the application.
  */
 class Minz_Configuration {
-	const CONF_PATH_NAME = '/config.php';
+	/**
+	 * The list of configurations.
+	 */
+	private static $config_list = array();
 
 	/**
-	 * VERSION est la version actuelle de MINZ
+	 * Add a new configuration to the list of configuration.
+	 *
+	 * @param $namespace the name of the current configuration
+	 * @param $config_filename the filename of the configuration
+	 * @param $default_filename a filename containing default values for the configuration
+	 * @throws Minz_ConfigurationNamespaceException if the namespace already exists.
 	 */
-	const VERSION = '1.3.1.freshrss';  // version spéciale FreshRSS
-
-	/**
-	 * valeurs possibles pour l'"environment"
-	 * SILENT rend l'application muette (pas de log)
-	 * PRODUCTION est recommandée pour une appli en production
-	 *			(log les erreurs critiques)
-	 * DEVELOPMENT log toutes les erreurs
-	 */
-	const SILENT = 0;
-	const PRODUCTION = 1;
-	const DEVELOPMENT = 2;
-
-	/**
-	 * définition des variables de configuration
-	 * $salt une chaîne de caractères aléatoires (obligatoire)
-	 * $environment gère le niveau d'affichage pour log et erreurs
-	 * $base_url le chemin de base pour accéder à l'application
-	 * $title le nom de l'application
-	 * $language la langue par défaut de l'application
-	 * $db paramètres pour la base de données (tableau)
-	 *     - host le serveur de la base
-	 *     - user nom d'utilisateur
-	 *     - password mot de passe de l'utilisateur
-	 *     - base le nom de la base de données
-	 */
-	private static $salt = '';
-	private static $environment = Minz_Configuration::PRODUCTION;
-	private static $base_url = '';
-	private static $title = '';
-	private static $language = 'en';
-	private static $default_user = '';
-	private static $allow_anonymous = false;
-	private static $allow_anonymous_refresh = false;
-	private static $auth_type = 'none';
-	private static $api_enabled = false;
-	private static $unsafe_autologin_enabled = false;
-
-	private static $db = array (
-		'type' => 'mysql',
-		'host' => '',
-		'user' => '',
-		'password' => '',
-		'base' => '',
-		'prefix' => '',
-	);
-
-	const MAX_SMALL_INT = 16384;
-	private static $limits = array(
-		'cache_duration' => 800,	//SimplePie cache duration in seconds
-		'timeout' => 10,	//SimplePie timeout in seconds
-		'max_inactivity' => PHP_INT_MAX,	//Time in seconds after which a user who has not used the account is considered inactive (no auto-refresh of feeds).
-		'max_feeds' => Minz_Configuration::MAX_SMALL_INT,
-		'max_categories' => Minz_Configuration::MAX_SMALL_INT,
-	);
-
-	/*
-	 * Getteurs
-	 */
-	public static function salt () {
-		return self::$salt;
-	}
-	public static function environment ($str = false) {
-		$env = self::$environment;
-
-		if ($str) {
-			switch (self::$environment) {
-			case self::SILENT:
-				$env = 'silent';
-				break;
-			case self::DEVELOPMENT:
-				$env = 'development';
-				break;
-			case self::PRODUCTION:
-			default:
-				$env = 'production';
-			}
+	public static function register($namespace, $config_filename, $default_filename = null) {
+		if (isset(self::$config_list[$namespace])) {
+			throw new Minz_ConfigurationNamespaceException(
+				$namespace . ' namespace already exists'
+			);
 		}
 
-		return $env;
-	}
-	public static function baseUrl () {
-		return self::$base_url;
-	}
-	public static function title () {
-		return self::$title;
-	}
-	public static function language () {
-		return self::$language;
-	}
-	public static function dataBase () {
-		return self::$db;
-	}
-	public static function limits() {
-		return self::$limits;
-	}
-	public static function defaultUser () {
-		return self::$default_user;
-	}
-	public static function allowAnonymous() {
-		return self::$allow_anonymous;
-	}
-	public static function allowAnonymousRefresh() {
-		return self::$allow_anonymous_refresh;
-	}
-	public static function authType() {
-		return self::$auth_type;
-	}
-	public static function needsLogin() {
-		return self::$auth_type !== 'none';
-	}
-	public static function canLogIn() {
-		return self::$auth_type === 'form' || self::$auth_type === 'persona';
-	}
-	public static function apiEnabled() {
-		return self::$api_enabled;
-	}
-	public static function unsafeAutologinEnabled() {
-		return self::$unsafe_autologin_enabled;
-	}
-
-	public static function _allowAnonymous($allow = false) {
-		self::$allow_anonymous = ((bool)$allow) && self::canLogIn();
-	}
-	public static function _allowAnonymousRefresh($allow = false) {
-		self::$allow_anonymous_refresh = ((bool)$allow) && self::allowAnonymous();
-	}
-	public static function _authType($value) {
-		$value = strtolower($value);
-		switch ($value) {
-			case 'form':
-			case 'http_auth':
-			case 'persona':
-			case 'none':
-				self::$auth_type = $value;
-				break;
-		}
-		self::_allowAnonymous(self::$allow_anonymous);
-	}
-
-	public static function _enableApi($value = false) {
-		self::$api_enabled = (bool)$value;
-	}
-	public static function _enableAutologin($value = false) {
-		self::$unsafe_autologin_enabled = (bool)$value;
-	}
-
-	/**
-	 * Initialise les variables de configuration
-	 * @exception Minz_FileNotExistException si le CONF_PATH_NAME n'existe pas
-	 * @exception Minz_BadConfigurationException si CONF_PATH_NAME mal formaté
-	 */
-	public static function init () {
-		try {
-			self::parseFile ();
-			self::setReporting ();
-		} catch (Minz_FileNotExistException $e) {
-			throw $e;
-		} catch (Minz_BadConfigurationException $e) {
-			throw $e;
-		}
-	}
-
-	public static function writeFile() {
-		$ini_array = array(
-			'general' => array(
-				'environment' => self::environment(true),
-				'salt' => self::$salt,
-				'base_url' => self::$base_url,
-				'title' => self::$title,
-				'default_user' => self::$default_user,
-				'allow_anonymous' => self::$allow_anonymous,
-				'allow_anonymous_refresh' => self::$allow_anonymous_refresh,
-				'auth_type' => self::$auth_type,
-				'api_enabled' => self::$api_enabled,
-				'unsafe_autologin_enabled' => self::$unsafe_autologin_enabled,
-			),
-			'limits' => self::$limits,
-			'db' => self::$db,
+		self::$config_list[$namespace] = new Minz_Configuration(
+			$namespace, $config_filename, $default_filename
 		);
-		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak.php');
-		$result = file_put_contents(DATA_PATH . self::CONF_PATH_NAME, "<?php\n return " . var_export($ini_array, true) . ';');
-		if (function_exists('opcache_invalidate')) {
-			opcache_invalidate(DATA_PATH . self::CONF_PATH_NAME);	//Clear PHP 5.5+ cache for include
-		}
-		return (bool)$result;
 	}
 
 	/**
-	 * Parse un fichier de configuration
-	 * @exception Minz_PermissionDeniedException si le CONF_PATH_NAME n'est pas accessible
-	 * @exception Minz_BadConfigurationException si CONF_PATH_NAME mal formaté
+	 * Parse a file and return its data.
+	 *
+	 * If the file does not contain a valid PHP code returning an array, an
+	 * empty array is returned anyway.
+	 *
+	 * @param $filename the name of the file to parse.
+	 * @return an array of values
+	 * @throws Minz_FileNotExistException if the file does not exist.
 	 */
-	private static function parseFile () {
-		$ini_array = include(DATA_PATH . self::CONF_PATH_NAME);
-
-		if (!is_array($ini_array)) {
-			throw new Minz_PermissionDeniedException (
-				DATA_PATH . self::CONF_PATH_NAME,
-				Minz_Exception::ERROR
-			);
+	public static function parseFile($filename) {
+		if (!file_exists($filename)) {
+			throw new Minz_FileNotExistException($filename);
 		}
 
-		// [general] est obligatoire
-		if (!isset ($ini_array['general'])) {
-			throw new Minz_BadConfigurationException (
-				'[general]',
-				Minz_Exception::ERROR
-			);
-		}
-		$general = $ini_array['general'];
-
-		// salt est obligatoire
-		if (!isset ($general['salt'])) {
-			if (isset($general['sel_application'])) {	//v0.6
-				$general['salt'] = $general['sel_application'];
-			} else {
-				throw new Minz_BadConfigurationException (
-					'salt',
-					Minz_Exception::ERROR
-				);
-			}
-		}
-		self::$salt = $general['salt'];
-
-		if (isset ($general['environment'])) {
-			switch ($general['environment']) {
-			case 'silent':
-				self::$environment = Minz_Configuration::SILENT;
-				break;
-			case 'development':
-				self::$environment = Minz_Configuration::DEVELOPMENT;
-				break;
-			case 'production':
-				self::$environment = Minz_Configuration::PRODUCTION;
-				break;
-			default:
-				if ($general['environment'] >= 0 &&
-					$general['environment'] <= 2) {
-					// fallback 0.7-beta
-					self::$environment = $general['environment'];
-				} else {
-					throw new Minz_BadConfigurationException (
-						'environment',
-						Minz_Exception::ERROR
-					);
-				}
-			}
-
-		}
-		if (isset ($general['base_url'])) {
-			self::$base_url = $general['base_url'];
-		}
-
-		if (isset ($general['title'])) {
-			self::$title = $general['title'];
-		}
-		if (isset ($general['language'])) {
-			self::$language = $general['language'];
-		}
-		if (isset ($general['default_user'])) {
-			self::$default_user = $general['default_user'];
-		}
-		if (isset ($general['auth_type'])) {
-			self::_authType($general['auth_type']);
-		}
-		if (isset ($general['allow_anonymous'])) {
-			self::$allow_anonymous = (
-				((bool)($general['allow_anonymous'])) &&
-				($general['allow_anonymous'] !== 'no')
-			);
-		}
-		if (isset ($general['allow_anonymous_refresh'])) {
-			self::$allow_anonymous_refresh = (
-				((bool)($general['allow_anonymous_refresh'])) &&
-				($general['allow_anonymous_refresh'] !== 'no')
-			);
-		}
-		if (isset ($general['api_enabled'])) {
-			self::$api_enabled = (
-				((bool)($general['api_enabled'])) &&
-				($general['api_enabled'] !== 'no')
-			);
-		}
-		if (isset ($general['unsafe_autologin_enabled'])) {
-			self::$unsafe_autologin_enabled = (
-				((bool)($general['unsafe_autologin_enabled'])) &&
-				($general['unsafe_autologin_enabled'] !== 'no')
-			);
-		}
-
-		if (isset($ini_array['limits'])) {
-			$limits = $ini_array['limits'];
-			if (isset($limits['cache_duration'])) {
-				$v = intval($limits['cache_duration']);
-				if ($v > 0) {
-					self::$limits['cache_duration'] = $v;
-				}
-			}
-			if (isset($limits['timeout'])) {
-				$v = intval($limits['timeout']);
-				if ($v > 0) {
-					self::$limits['timeout'] = $v;
-				}
-			}
-			if (isset($limits['max_inactivity'])) {
-				$v = intval($limits['max_inactivity']);
-				if ($v > 0) {
-					self::$limits['max_inactivity'] = $v;
-				}
-			}
-			if (isset($limits['max_feeds'])) {
-				$v = intval($limits['max_feeds']);
-				if ($v > 0 && $v < Minz_Configuration::MAX_SMALL_INT) {
-					self::$limits['max_feeds'] = $v;
-				}
-			}
-			if (isset($limits['max_categories'])) {
-				$v = intval($limits['max_categories']);
-				if ($v > 0 && $v < Minz_Configuration::MAX_SMALL_INT) {
-					self::$limits['max_categories'] = $v;
-				}
-			}
-		}
-
-		// Base de données
-		if (isset ($ini_array['db'])) {
-			$db = $ini_array['db'];
-			if (empty($db['type'])) {
-				throw new Minz_BadConfigurationException (
-					'type',
-					Minz_Exception::ERROR
-				);
-			}
-			switch ($db['type']) {
-				case 'mysql':
-					if (empty($db['host'])) {
-						throw new Minz_BadConfigurationException (
-							'host',
-							Minz_Exception::ERROR
-						);
-					}
-					if (empty($db['user'])) {
-						throw new Minz_BadConfigurationException (
-							'user',
-							Minz_Exception::ERROR
-						);
-					}
-					if (!isset($db['password'])) {
-						throw new Minz_BadConfigurationException (
-							'password',
-							Minz_Exception::ERROR
-						);
-					}
-					if (empty($db['base'])) {
-						throw new Minz_BadConfigurationException (
-							'base',
-							Minz_Exception::ERROR
-						);
-					}
-					self::$db['host'] = $db['host'];
-					self::$db['user'] = $db['user'];
-					self::$db['password'] = $db['password'];
-					self::$db['base'] = $db['base'];
-					if (isset($db['prefix'])) {
-						self::$db['prefix'] = $db['prefix'];
-					}
-					break;
-				case 'sqlite':
-					self::$db['host'] = '';
-					self::$db['user'] = '';
-					self::$db['password'] = '';
-					self::$db['base'] = '';
-					self::$db['prefix'] = '';
-					break;
-				default:
-					throw new Minz_BadConfigurationException (
-						'type',
-						Minz_Exception::ERROR
-					);
-					break;
-			}
-			self::$db['type'] = $db['type'];
+		$data = @include($filename);
+		if (is_array($data)) {
+			return $data;
+		} else {
+			return array();
 		}
 	}
 
-	private static function setReporting() {
-		switch (self::$environment) {
-			case self::PRODUCTION:
-				error_reporting(E_ALL);
-				ini_set('display_errors','Off');
-				ini_set('log_errors', 'On');
-				break;
-			case self::DEVELOPMENT:
-				error_reporting(E_ALL);
-				ini_set('display_errors','On');
-				ini_set('log_errors', 'On');
-				break;
-			case self::SILENT:
-				error_reporting(0);
-				break;
+	/**
+	 * Return the configuration related to a given namespace.
+	 *
+	 * @param $namespace the name of the configuration to get.
+	 * @return a Minz_Configuration object
+	 * @throws Minz_ConfigurationNamespaceException if the namespace does not exist.
+	 */
+	public static function get($namespace) {
+		if (!isset(self::$config_list[$namespace])) {
+			throw new Minz_ConfigurationNamespaceException(
+				$namespace . ' namespace does not exist'
+			);
 		}
+
+		return self::$config_list[$namespace];
+	}
+
+	/**
+	 * The namespace of the current configuration.
+	 */
+	private $namespace = '';
+
+	/**
+	 * The filename for the current configuration.
+	 */
+	private $config_filename = '';
+
+	/**
+	 * The filename for the current default values, null by default.
+	 */
+	private $default_filename = null;
+
+	/**
+	 * The configuration values, an empty array by default.
+	 */
+	private $data = array();
+
+	/**
+	 * The default values, an empty array by default.
+	 */
+	private $data_default = array();
+
+	/**
+	 * Create a new Minz_Configuration object.
+	 * 
+	 * @param $namespace the name of the current configuration.
+	 * @param $config_filename the file containing configuration values.
+	 * @param $default_filename the file containing default values, null by default.
+	 */
+	private function __construct($namespace, $config_filename, $default_filename = null) {
+		$this->namespace = $namespace;
+		$this->config_filename = $config_filename;
+
+		try {
+			$this->data = self::parseFile($this->config_filename);
+		} catch (Minz_FileNotExistException $e) {
+			if (is_null($default_filename)) {
+				throw $e;
+			}
+		}
+
+		$this->default_filename = $default_filename;
+		if (!is_null($this->default_filename)) {
+			$this->data_default = self::parseFile($this->default_filename);
+		}
+	}
+
+	/**
+	 * Return the value of the given param.
+	 * 
+	 * @param $key the name of the param.
+	 * @param $default default value to return if key does not exist.
+	 * @return the value corresponding to the key.
+	 * @throws Minz_ConfigurationParamException if the param does not exist
+	 */
+	public function param($key, $default = null) {
+		if (isset($this->data[$key])) {
+			return $this->data[$key];
+		} elseif (!is_null($default)) {
+			return $default;
+		} elseif (isset($this->data_default[$key])) {
+			return $this->data_default[$key];
+		} else {
+			throw new Minz_ConfigurationParamException(
+				$key . ' param does not exist'
+			);
+		}
+	}
+
+	/**
+	 * A wrapper for param().
+	 */
+	public function __get($key) {
+		return $this->param($key);
+	}
+
+	/**
+	 * Set or remove a param.
+	 *
+	 * @param $key the param name to set.
+	 * @param $value the value to set. If null, the key is removed from the configuration.
+	 */
+	public function _param($key, $value = null) {
+		if (isset($this->data[$key]) && is_null($value)) {
+			unset($this->data[$key]);
+		} else {
+			$this->data[$key] = $value;
+		}
+	}
+
+	/**
+	 * A wrapper for _param().
+	 */
+	public function __set($key, $value) {
+		$this->_param($key, $value);
+	}
+
+	/**
+	 * Save the current configuration in the configuration file.
+	 */
+	public function save() {
+		$back_filename = $this->config_filename . '.bak.php';
+		@rename($this->config_filename, $back_filename);
+
+		if (file_put_contents($this->config_filename,
+		                      "<?php\nreturn " . var_export($this->data, true) . ';',
+		                      LOCK_EX) === false) {
+			return false;
+		}
+
+		// Clear PHP 5.5+ cache for include
+		if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($this->config_filename);
+		}
+
+		return true;
 	}
 }
diff --git a/lib/Minz/ConfigurationException.php b/lib/Minz/ConfigurationException.php
new file mode 100644
index 000000000..f294c3341
--- /dev/null
+++ b/lib/Minz/ConfigurationException.php
@@ -0,0 +1,8 @@
+<?php
+
+class Minz_ConfigurationException extends Minz_Exception {
+	public function __construct($error, $code = self::ERROR) {
+		$message = 'Configuration error: ' . $error;
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Minz/ConfigurationNamespaceException.php b/lib/Minz/ConfigurationNamespaceException.php
new file mode 100644
index 000000000..f4278c5d6
--- /dev/null
+++ b/lib/Minz/ConfigurationNamespaceException.php
@@ -0,0 +1,4 @@
+<?php
+
+class Minz_ConfigurationNamespaceException extends Minz_ConfigurationException {
+}
diff --git a/lib/Minz/ConfigurationParamException.php b/lib/Minz/ConfigurationParamException.php
new file mode 100644
index 000000000..eac977935
--- /dev/null
+++ b/lib/Minz/ConfigurationParamException.php
@@ -0,0 +1,4 @@
+<?php
+
+class Minz_ConfigurationParamException extends Minz_ConfigurationException {
+}
diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php
index e5f3dff07..6af23a566 100644
--- a/lib/Minz/Error.php
+++ b/lib/Minz/Error.php
@@ -82,7 +82,8 @@ class Minz_Error {
 	 *       > en fonction de l'environment
 	 */
 	private static function processLogs ($logs) {
-		$env = Minz_Configuration::environment ();
+		$conf = Minz_Configuration::get('system');
+		$env = $conf->general['environment'];
 		$logs_ok = array ();
 		$error = array ();
 		$warning = array ();
@@ -98,10 +99,10 @@ class Minz_Error {
 			$notice = $logs['notice'];
 		}
 
-		if ($env == Minz_Configuration::PRODUCTION) {
+		if ($env == 'production') {
 			$logs_ok = $error;
 		}
-		if ($env == Minz_Configuration::DEVELOPMENT) {
+		if ($env == 'development') {
 			$logs_ok = array_merge ($error, $warning, $notice);
 		}
 
diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php
index 3dac1e438..974cf4260 100644
--- a/lib/Minz/FrontController.php
+++ b/lib/Minz/FrontController.php
@@ -31,9 +31,12 @@ class Minz_FrontController {
 	 */
 	public function __construct () {
 		try {
-			Minz_Configuration::init ();
+			Minz_Configuration::register('system',
+			                             DATA_PATH . '/config.php',
+			                             DATA_PATH . '/config.default.php');
+			$this->setReporting();
 
-			Minz_Request::init ();
+			Minz_Request::init();
 
 			$url = $this->buildUrl();
 			$url['params'] = array_merge (
@@ -110,4 +113,23 @@ class Minz_FrontController {
 		}
 		exit ('### Application problem ###<br />'."\n".$txt);
 	}
+
+	private function setReporting() {
+		$conf = Minz_Configuration::get('system');
+		switch($conf->general['environment']) {
+		case 'production':
+			error_reporting(E_ALL);
+			ini_set('display_errors','Off');
+			ini_set('log_errors', 'On');
+			break;
+		case 'development':
+			error_reporting(E_ALL);
+			ini_set('display_errors','On');
+			ini_set('log_errors', 'On');
+			break;
+		case 'silent':
+			error_reporting(0);
+			break;
+		}
+	}
 }
diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php
index d19edc1dc..2063efe7e 100644
--- a/lib/Minz/Log.php
+++ b/lib/Minz/Log.php
@@ -31,10 +31,15 @@ class Minz_Log {
 	 * @param $file_name fichier de log
 	 */
 	public static function record ($information, $level, $file_name = null) {
-		$env = Minz_Configuration::environment ();
+		try {
+			$conf = Minz_Configuration::get('system');
+			$env = $conf->general['environment'];
+		} catch (Minz_ConfigurationException $e) {
+			$env = 'production';
+		}
 
-		if (! ($env === Minz_Configuration::SILENT
-		       || ($env === Minz_Configuration::PRODUCTION
+		if (! ($env === 'silent'
+		       || ($env === 'production'
 		       && ($level >= Minz_Log::NOTICE)))) {
 			if ($file_name === null) {
 				$file_name = join_path(USERS_PATH, Minz_Session::param('currentUser', '_'), 'log.txt');
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 118d89ad2..ac7a1bed7 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -44,7 +44,8 @@ class Minz_ModelPdo {
 			return;
 		}
 
-		$db = Minz_Configuration::dataBase();
+		$conf = Minz_Configuration::get('system');
+		$db = $conf->db;
 
 		if ($currentUser === null) {
 			$currentUser = Minz_Session::param('currentUser', '_');
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 4b97a3caf..5f2f6a858 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -96,7 +96,8 @@ class Minz_Request {
 	 * @return la base de l'url
 	 */
 	public static function getBaseUrl() {
-		$defaultBaseUrl = Minz_Configuration::baseUrl();
+		$conf = Minz_Configuration::get('system');
+		$defaultBaseUrl = $conf->general['base_url'];
 		if (!empty($defaultBaseUrl)) {
 			return $defaultBaseUrl;
 		} elseif (isset($_SERVER['REQUEST_URI'])) {
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index e7efb8665..7525e95cc 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -28,7 +28,8 @@ class Minz_Translate {
 	 * Load $lang_name and $lang_path based on configuration and selected language.
 	 */
 	public static function init() {
-		$l = Minz_Configuration::language();
+		$conf = Minz_Configuration::get('system');
+		$l = $conf->general['language'];
 		self::$lang_name = Minz_Session::param('language', $l);
 		self::$lang_path = APP_PATH . '/i18n/' . self::$lang_name . '/';
 	}
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index b40448491..24ad630d0 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -28,7 +28,9 @@ class Minz_View {
 	public function __construct () {
 		$this->change_view(Minz_Request::controllerName(),
 		                   Minz_Request::actionName());
-		self::$title = Minz_Configuration::title ();
+
+		$conf = Minz_Configuration::get('system');
+		self::$title = $conf->general['title'];
 	}
 
 	/**
diff --git a/p/i/index.php b/p/i/index.php
index 009d56bc3..d3fc0b37c 100755
--- a/p/i/index.php
+++ b/p/i/index.php
@@ -33,7 +33,7 @@ if (file_exists(DATA_PATH . '/do-install.txt')) {
 		$currentUser = Minz_Session::param('currentUser', '');
 		$dateLastModification = $currentUser === '' ? time() : max(
 			@filemtime(join_path(USERS_PATH, $currentUser, 'log.txt')),
-			@filemtime(join_path(DATA_PATH . 'config.php'))
+			@filemtime(join_path(DATA_PATH, 'config.php'))
 		);
 		if (httpConditional($dateLastModification, 0, 0, false, PHP_COMPRESSION, true)) {
 			exit();	//No need to send anything

From 7cca47d1ab5838f5440b1a1e08fa4c0d43989664 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 5 Jan 2015 22:43:15 +0100
Subject: [PATCH 260/363] Change name of user configuration var in Context

- FreshRSS_Context::$conf is replaced by FreshRSS_Context::$user_conf
- Introduce FreshRSS_Context::$system_conf
- Remove FreshRSS_Configuration object

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/authController.php         |  24 +-
 app/Controllers/categoryController.php     |  10 +-
 app/Controllers/configureController.php    |  92 +++---
 app/Controllers/entryController.php        |   4 +-
 app/Controllers/feedController.php         |  18 +-
 app/Controllers/importExportController.php |   4 +-
 app/Controllers/indexController.php        |  12 +-
 app/Controllers/javascriptController.php   |   2 +-
 app/Controllers/userController.php         |  18 +-
 app/FreshRSS.php                           |   7 +-
 app/Models/Configuration.php               | 345 ---------------------
 app/Models/Context.php                     |  20 +-
 app/layout/aside_feed.phtml                |   6 +-
 app/layout/layout.phtml                    |   2 +-
 app/layout/nav_menu.phtml                  |  10 +-
 app/views/auth/index.phtml                 |   4 +-
 app/views/configure/archiving.phtml        |  10 +-
 app/views/configure/display.phtml          |  30 +-
 app/views/configure/queries.phtml          |   4 +-
 app/views/configure/reading.phtml          |  44 +--
 app/views/configure/sharing.phtml          |   6 +-
 app/views/configure/shortcut.phtml         |   2 +-
 app/views/helpers/javascript_vars.phtml    |  14 +-
 app/views/helpers/pagination.phtml         |   2 +-
 app/views/index/global.phtml               |   4 +-
 app/views/index/normal.phtml               |  32 +-
 app/views/index/reader.phtml               |   4 +-
 app/views/user/manage.phtml                |   6 +-
 app/views/user/profile.phtml               |   2 +-
 29 files changed, 195 insertions(+), 543 deletions(-)
 delete mode 100644 app/Models/Configuration.php

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index f68ea8da5..3a1ad4605 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -27,12 +27,11 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
-			$system_conf = Minz_Configuration::get('system');
-			$general = $system_conf->general;
-			$current_token = FreshRSS_Context::$conf->token;
+			$general = FreshRSS_Context::$system_conf->general;
+			$current_token = FreshRSS_Context::$user_conf->token;
 			$token = Minz_Request::param('token', $current_token);
-			FreshRSS_Context::$conf->_token($token);
-			$ok &= FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->_token($token);
+			$ok &= FreshRSS_Context::$user_conf->save();
 
 			$anon = Minz_Request::param('anon_access', false);
 			$anon = ((bool)$anon) && ($anon !== 'no');
@@ -81,8 +80,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
 		}
 
-		$conf = Minz_Configuration::get('system');
-		$auth_type = $conf->general['auth_type'];
+		$auth_type = FreshRSS_Context::$system_conf->general['auth_type'];
 		switch ($auth_type) {
 		case 'form':
 			Minz_Request::forward(array('c' => 'auth', 'a' => 'formLogin'));
@@ -120,12 +118,12 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js');
 		Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . $file_mtime));
 
-		$conf = Minz_Configuration::get('system');
-
 		if (Minz_Request::isPost()) {
 			$nonce = Minz_Session::param('nonce');
 			$username = Minz_Request::param('username', '');
 			$challenge = Minz_Request::param('challenge', '');
+
+			// TODO #730: change the way to get the configuration
 			try {
 				$conf = new FreshRSS_Configuration($username);
 			} catch(Minz_Exception $e) {
@@ -162,7 +160,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
-		} elseif ($conf->general['unsafe_autologin_enabled']) {
+		} elseif (FreshRSS_Context::$system_conf->general['unsafe_autologin_enabled']) {
 			$username = Minz_Request::param('u', '');
 			$password = Minz_Request::param('p', '');
 			Minz_Request::_param('p');
@@ -171,6 +169,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				return;
 			}
 
+			// TODO #730: change the way to get the configuration
 			try {
 				$conf = new FreshRSS_Configuration($username);
 			} catch(Minz_Exception $e) {
@@ -243,6 +242,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 					$persona_file = DATA_PATH . '/persona/' . $email . '.txt';
 					if (($current_user = @file_get_contents($persona_file)) !== false) {
 						$current_user = trim($current_user);
+						// TODO #730: change the way to get the configuration
 						try {
 							$conf = new FreshRSS_Configuration($current_user);
 							$login_ok = strcasecmp($email, $conf->mail_login) === 0;
@@ -301,7 +301,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 
 		$this->view->no_form = false;
 		// Enable changement of auth only if Persona!
-		if (Minz_Configuration::authType() != 'persona') {
+		if (FreshRSS_Context::$system_conf->general['auth_type'] != 'persona') {
 			$this->view->message = array(
 				'status' => 'bad',
 				'title' => _t('gen.short.damn'),
@@ -311,6 +311,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			return;
 		}
 
+		// TODO #730
 		$conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
 		// Admin user must have set its master password.
 		if (!$conf->passwordHash) {
@@ -335,6 +336,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			);
 
 			if ($ok) {
+				// TODO #730
 				Minz_Configuration::_authType('form');
 				$ok = Minz_Configuration::writeFile();
 
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 5f1beae90..c90e55ea7 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -30,7 +30,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 		$catDAO = new FreshRSS_CategoryDAO();
 		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
-		$limits = Minz_Configuration::limits();
+		$limits = FreshRSS_Context::$system_conf->limits;
 		$this->view->categories = $catDAO->listCategories(false);
 
 		if (count($this->view->categories) >= $limits['max_categories']) {
@@ -141,8 +141,8 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			}
 
 			// Remove related queries.
-			FreshRSS_Context::$conf->remove_query_by_get('c_' . $id);
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->remove_query_by_get('c_' . $id);
+			FreshRSS_Context::$user_conf->save();
 
 			Minz_Request::good(_t('feedback.sub.category.deleted'), $url_redirect);
 		}
@@ -177,9 +177,9 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 				// Remove related queries
 				foreach ($feeds as $feed) {
-					FreshRSS_Context::$conf->remove_query_by_get('f_' . $feed->id());
+					FreshRSS_Context::$user_conf->remove_query_by_get('f_' . $feed->id());
 				}
-				FreshRSS_Context::$conf->save();
+				FreshRSS_Context::$user_conf->save();
 
 				Minz_Request::good(_t('feedback.sub.category.emptied'), $url_redirect);
 			} else {
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index feb5483fb..6e7a40ea6 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -41,23 +41,23 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function displayAction() {
 		if (Minz_Request::isPost()) {
-			FreshRSS_Context::$conf->_language(Minz_Request::param('language', 'en'));
-			FreshRSS_Context::$conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
-			FreshRSS_Context::$conf->_content_width(Minz_Request::param('content_width', 'thin'));
-			FreshRSS_Context::$conf->_topline_read(Minz_Request::param('topline_read', false));
-			FreshRSS_Context::$conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
-			FreshRSS_Context::$conf->_topline_date(Minz_Request::param('topline_date', false));
-			FreshRSS_Context::$conf->_topline_link(Minz_Request::param('topline_link', false));
-			FreshRSS_Context::$conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
-			FreshRSS_Context::$conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
-			FreshRSS_Context::$conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
-			FreshRSS_Context::$conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
-			FreshRSS_Context::$conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
-			FreshRSS_Context::$conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
-			FreshRSS_Context::$conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->_language(Minz_Request::param('language', 'en'));
+			FreshRSS_Context::$user_conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
+			FreshRSS_Context::$user_conf->_content_width(Minz_Request::param('content_width', 'thin'));
+			FreshRSS_Context::$user_conf->_topline_read(Minz_Request::param('topline_read', false));
+			FreshRSS_Context::$user_conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
+			FreshRSS_Context::$user_conf->_topline_date(Minz_Request::param('topline_date', false));
+			FreshRSS_Context::$user_conf->_topline_link(Minz_Request::param('topline_link', false));
+			FreshRSS_Context::$user_conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
+			FreshRSS_Context::$user_conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
+			FreshRSS_Context::$user_conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
+			FreshRSS_Context::$user_conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
+			FreshRSS_Context::$user_conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
+			FreshRSS_Context::$user_conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
+			FreshRSS_Context::$user_conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
+			FreshRSS_Context::$user_conf->save();
 
-			Minz_Session::_param('language', FreshRSS_Context::$conf->language);
+			Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
@@ -100,28 +100,28 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function readingAction() {
 		if (Minz_Request::isPost()) {
-			FreshRSS_Context::$conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
-			FreshRSS_Context::$conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
-			FreshRSS_Context::$conf->_default_view(Minz_Request::param('default_view', 'adaptive'));
-			FreshRSS_Context::$conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
-			FreshRSS_Context::$conf->_display_posts(Minz_Request::param('display_posts', false));
-			FreshRSS_Context::$conf->_display_categories(Minz_Request::param('display_categories', false));
-			FreshRSS_Context::$conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
-			FreshRSS_Context::$conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
-			FreshRSS_Context::$conf->_lazyload(Minz_Request::param('lazyload', false));
-			FreshRSS_Context::$conf->_sticky_post(Minz_Request::param('sticky_post', false));
-			FreshRSS_Context::$conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
-			FreshRSS_Context::$conf->_auto_remove_article(Minz_Request::param('auto_remove_article', false));
-			FreshRSS_Context::$conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
-			FreshRSS_Context::$conf->_mark_when(array(
+			FreshRSS_Context::$user_conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
+			FreshRSS_Context::$user_conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
+			FreshRSS_Context::$user_conf->_default_view(Minz_Request::param('default_view', 'adaptive'));
+			FreshRSS_Context::$user_conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
+			FreshRSS_Context::$user_conf->_display_posts(Minz_Request::param('display_posts', false));
+			FreshRSS_Context::$user_conf->_display_categories(Minz_Request::param('display_categories', false));
+			FreshRSS_Context::$user_conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
+			FreshRSS_Context::$user_conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
+			FreshRSS_Context::$user_conf->_lazyload(Minz_Request::param('lazyload', false));
+			FreshRSS_Context::$user_conf->_sticky_post(Minz_Request::param('sticky_post', false));
+			FreshRSS_Context::$user_conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
+			FreshRSS_Context::$user_conf->_auto_remove_article(Minz_Request::param('auto_remove_article', false));
+			FreshRSS_Context::$user_conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
+			FreshRSS_Context::$user_conf->_mark_when(array(
 				'article' => Minz_Request::param('mark_open_article', false),
 				'site' => Minz_Request::param('mark_open_site', false),
 				'scroll' => Minz_Request::param('mark_scroll', false),
 				'reception' => Minz_Request::param('mark_upon_reception', false),
 			));
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->save();
 
-			Minz_Session::_param('language', FreshRSS_Context::$conf->language);
+			Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
@@ -142,8 +142,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
 			$params = Minz_Request::params();
-			FreshRSS_Context::$conf->_sharing($params['share']);
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->_sharing($params['share']);
+			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('feedback.conf.updated'),
@@ -184,8 +184,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				}
 			}
 
-			FreshRSS_Context::$conf->_shortcuts($shortcuts_ok);
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->_shortcuts($shortcuts_ok);
+			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('feedback.conf.shortcuts_updated'),
@@ -212,10 +212,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
-			FreshRSS_Context::$conf->_old_entries(Minz_Request::param('old_entries', 3));
-			FreshRSS_Context::$conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
-			FreshRSS_Context::$conf->_ttl_default(Minz_Request::param('ttl_default', -2));
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->_old_entries(Minz_Request::param('old_entries', 3));
+			FreshRSS_Context::$user_conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
+			FreshRSS_Context::$user_conf->_ttl_default(Minz_Request::param('ttl_default', -2));
+			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('feedback.conf.updated'),
@@ -252,8 +252,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					$query['name'] = _t('conf.query.number', $key + 1);
 				}
 			}
-			FreshRSS_Context::$conf->_queries($queries);
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->_queries($queries);
+			FreshRSS_Context::$user_conf->save();
 
 			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'queries'));
@@ -261,7 +261,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->query_get = array();
 			$cat_dao = new FreshRSS_CategoryDAO();
 			$feed_dao = FreshRSS_Factory::createFeedDao();
-			foreach (FreshRSS_Context::$conf->queries as $key => $query) {
+			foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
 				if (!isset($query['get'])) {
 					continue;
 				}
@@ -329,7 +329,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function addQueryAction() {
 		$whitelist = array('get', 'order', 'name', 'search', 'state');
-		$queries = FreshRSS_Context::$conf->queries;
+		$queries = FreshRSS_Context::$user_conf->queries;
 		$query = Minz_Request::params();
 		$query['name'] = _t('conf.query.number', count($queries) + 1);
 		foreach ($query as $key => $value) {
@@ -338,8 +338,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			}
 		}
 		$queries[] = $query;
-		FreshRSS_Context::$conf->_queries($queries);
-		FreshRSS_Context::$conf->save();
+		FreshRSS_Context::$user_conf->_queries($queries);
+		FreshRSS_Context::$user_conf->save();
 
 		Minz_Request::good(_t('feedback.conf.query_created', $query['name']),
 		                   array('c' => 'configure', 'a' => 'queries'));
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index aae08c413..1d9989f40 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -154,7 +154,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	public function purgeAction() {
 		@set_time_limit(300);
 
-		$nb_month_old = max(FreshRSS_Context::$conf->old_entries, 1);
+		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -168,7 +168,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
 				// -2 means we take the default value from configuration
-				$feed_history = FreshRSS_Context::$conf->keep_history_default;
+				$feed_history = FreshRSS_Context::$user_conf->keep_history_default;
 			}
 
 			if ($feed_history >= 0) {
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 121cb8921..92a1e3bf8 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -14,7 +14,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// Token is useful in the case that anonymous refresh is forbidden
 			// and CRON task cannot be used with php command so the user can
 			// set a CRON task to refresh his feeds by using token inside url
-			$token = FreshRSS_Context::$conf->token;
+			$token = FreshRSS_Context::$user_conf->token;
 			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token == $token_param);
 			$action = Minz_Request::actionName();
@@ -161,14 +161,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feed->_id($id);
 			$feed->faviconPrepare();
 
-			$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
+			$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 
 			$entryDAO = FreshRSS_Factory::createEntryDao();
 			// We want chronological order and SimplePie uses reverse order.
 			$entries = array_reverse($feed->entries());
 
 			// Calculate date of oldest entries we accept in DB.
-			$nb_month_old = FreshRSS_Context::$conf->old_entries;
+			$nb_month_old = FreshRSS_Context::$user_conf->old_entries;
 			$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 			// Use a shared statement and a transaction to improve a LOT the
@@ -272,15 +272,15 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feeds[] = $feed;
 			}
 		} else {
-			$feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default);
+			$feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
 		}
 
 		// Calculate date of oldest entries we accept in DB.
-		$nb_month_old = max(FreshRSS_Context::$conf->old_entries, 1);
+		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$updated_feeds = 0;
-		$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
+		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			if (!$feed->lock()) {
 				Minz_Log::notice('Feed already being actualized: ' . $feed->url());
@@ -302,7 +302,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
 				// -2 means we take the default value from configuration
-				$feed_history = FreshRSS_Context::$conf->keep_history_default;
+				$feed_history = FreshRSS_Context::$user_conf->keep_history_default;
 			}
 
 			// We want chronological order and SimplePie uses reverse order.
@@ -476,8 +476,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// TODO: Delete old favicon
 
 			// Remove related queries
-			FreshRSS_Context::$conf->remove_query_by_get('f_' . $id);
-			FreshRSS_Context::$conf->save();
+			FreshRSS_Context::$user_conf->remove_query_by_get('f_' . $id);
+			FreshRSS_Context::$user_conf->save();
 
 			Minz_Request::good(_t('feedback.sub.feed.deleted'), $redirect_url);
 		} else {
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 6eefa0f6f..334f33d6a 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -315,7 +315,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			return true;
 		}
 
-		$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
+		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 
 		$google_compliant = strpos($article_object['id'], 'com.google') !== false;
 
@@ -532,7 +532,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$this->view->type = 'feed/' . $feed->id();
 			$this->view->entries = $this->entryDAO->listWhere(
 				'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
-				FreshRSS_Context::$conf->posts_per_page
+				FreshRSS_Context::$user_conf->posts_per_page
 			);
 			$this->view->feed = $feed;
 		}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 33cd2843c..14f3f4f4b 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -9,7 +9,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action only redirect on the default view mode (normal or global)
 	 */
 	public function indexAction() {
-		$prefered_output = FreshRSS_Context::$conf->view_mode;
+		$prefered_output = FreshRSS_Context::$user_conf->view_mode;
 		Minz_Request::forward(array(
 			'c' => 'index',
 			'a' => $prefered_output
@@ -109,7 +109,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the RSS feed of FreshRSS.
 	 */
 	public function rssAction() {
-		$token = FreshRSS_Context::$conf->token;
+		$token = FreshRSS_Context::$user_conf->token;
 		$token_param = Minz_Request::param('token', '');
 		$token_is_ok = ($token != '' && $token === $token_param);
 
@@ -160,10 +160,10 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		FreshRSS_Context::_get(Minz_Request::param('get', 'a'));
 
 		FreshRSS_Context::$state = Minz_Request::param(
-			'state', FreshRSS_Context::$conf->default_state
+			'state', FreshRSS_Context::$user_conf->default_state
 		);
 		$state_forced_by_user = Minz_Request::param('state', false) !== false;
-		if (FreshRSS_Context::$conf->default_view === 'adaptive' &&
+		if (FreshRSS_Context::$user_conf->default_view === 'adaptive' &&
 				FreshRSS_Context::$get_unread <= 0 &&
 				!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ) &&
 				!$state_forced_by_user) {
@@ -172,10 +172,10 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		FreshRSS_Context::$search = Minz_Request::param('search', '');
 		FreshRSS_Context::$order = Minz_Request::param(
-			'order', FreshRSS_Context::$conf->sort_order
+			'order', FreshRSS_Context::$user_conf->sort_order
 		);
 		FreshRSS_Context::$number = Minz_Request::param(
-			'nb', FreshRSS_Context::$conf->posts_per_page
+			'nb', FreshRSS_Context::$user_conf->posts_per_page
 		);
 		FreshRSS_Context::$first_id = Minz_Request::param('next', '');
 	}
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 113f58ea9..b178801d4 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -8,7 +8,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 	public function actualizeAction() {
 		header('Content-Type: text/javascript; charset=UTF-8');
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default);
+		$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
 	}
 
 	public function nbUnreadsPerFeedAction() {
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 1b1ccaac9..58181bfb0 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -39,9 +39,9 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				FreshRSS_Context::$conf->_passwordHash($passwordHash);
+				FreshRSS_Context::$user_conf->_passwordHash($passwordHash);
 			}
-			Minz_Session::_param('passwordHash', FreshRSS_Context::$conf->passwordHash);
+			Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash);
 
 			$passwordPlain = Minz_Request::param('apiPasswordPlain', '', true);
 			if ($passwordPlain != '') {
@@ -52,17 +52,17 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				FreshRSS_Context::$conf->_apiPasswordHash($passwordHash);
+				FreshRSS_Context::$user_conf->_apiPasswordHash($passwordHash);
 			}
 
 			// TODO: why do we need of hasAccess here?
 			if (FreshRSS_Auth::hasAccess('admin')) {
-				FreshRSS_Context::$conf->_mail_login(Minz_Request::param('mail_login', '', true));
+				FreshRSS_Context::$user_conf->_mail_login(Minz_Request::param('mail_login', '', true));
 			}
-			$email = FreshRSS_Context::$conf->mail_login;
+			$email = FreshRSS_Context::$user_conf->mail_login;
 			Minz_Session::_param('mail', $email);
 
-			$ok &= FreshRSS_Context::$conf->save();
+			$ok &= FreshRSS_Context::$user_conf->save();
 
 			if ($email != '') {
 				$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
@@ -108,10 +108,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			$db = Minz_Configuration::dataBase();
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
-			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$conf->language);
-			$languages = FreshRSS_Context::$conf->availableLanguages();
+			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$user_conf->language);
+			$languages = FreshRSS_Context::$user_conf->availableLanguages();
 			if (!isset($languages[$new_user_language])) {
-				$new_user_language = FreshRSS_Context::$conf->language;
+				$new_user_language = FreshRSS_Context::$user_conf->language;
 			}
 
 			$new_user_name = Minz_Request::param('new_user_name');
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 455f2fefd..b22bfdb4b 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -32,7 +32,7 @@ class FreshRSS extends Minz_FrontController {
 		FreshRSS_Context::init();
 
 		// Init i18n.
-		Minz_Session::_param('language', FreshRSS_Context::$conf->language);
+		Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
 		Minz_Translate::init();
 
 		$this->loadStylesAndScripts();
@@ -41,7 +41,7 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	private function loadStylesAndScripts() {
-		$theme = FreshRSS_Themes::load(FreshRSS_Context::$conf->theme);
+		$theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme);
 		if ($theme) {
 			foreach($theme['files'] as $file) {
 				if ($file[0] === '_') {
@@ -62,8 +62,7 @@ class FreshRSS extends Minz_FrontController {
 		Minz_View::appendScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
 
-		$conf = Minz_Configuration::get('system');
-		if ($conf->general['auth_type'] === 'persona') {
+		if (FreshRSS_Context::$system_conf->general['auth_type'] === 'persona') {
 			// TODO move it in a plugin
 			// Needed for login AND logout with Persona.
 			Minz_View::appendScript('https://login.persona.org/include.js');
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
deleted file mode 100644
index 8bba8f777..000000000
--- a/app/Models/Configuration.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-
-class FreshRSS_Configuration {
-	private $filename;
-
-	private $data = array(
-		'language' => 'en',
-		'old_entries' => 3,
-		'keep_history_default' => 0,
-		'ttl_default' => 3600,
-		'mail_login' => '',
-		'token' => '',
-		'passwordHash' => '',	//CRYPT_BLOWFISH
-		'apiPasswordHash' => '',	//CRYPT_BLOWFISH
-		'posts_per_page' => 20,
-		'view_mode' => 'normal',
-		'default_view' => 'adaptive',
-		'default_state' => FreshRSS_Entry::STATE_NOT_READ,
-		'auto_load_more' => true,
-		'display_posts' => false,
-		'display_categories' => false,
-		'hide_read_feeds' => true,
-		'onread_jump_next' => true,
-		'lazyload' => true,
-		'sticky_post' => true,
-		'reading_confirm' => false,
-		'auto_remove_article' => false,
-		'sort_order' => 'DESC',
-		'anon_access' => false,
-		'mark_when' => array(
-			'article' => true,
-			'site' => true,
-			'scroll' => false,
-			'reception' => false,
-		),
-		'theme' => 'Origine',
-		'content_width' => 'thin',
-		'shortcuts' => array(
-			'mark_read' => 'r',
-			'mark_favorite' => 'f',
-			'go_website' => 'space',
-			'next_entry' => 'j',
-			'prev_entry' => 'k',
-			'first_entry' => 'home',
-			'last_entry' => 'end',
-			'collapse_entry' => 'c',
-			'load_more' => 'm',
-			'auto_share' => 's',
-			'focus_search' => 'a',
-			'user_filter' => 'u',
-			'help' => 'f1',
-			'close_dropdown' => 'escape',
-		),
-		'topline_read' => true,
-		'topline_favorite' => true,
-		'topline_date' => true,
-		'topline_link' => true,
-		'bottomline_read' => true,
-		'bottomline_favorite' => true,
-		'bottomline_sharing' => true,
-		'bottomline_tags' => true,
-		'bottomline_date' => true,
-		'bottomline_link' => true,
-		'sharing' => array(),
-		'queries' => array(),
-		'html5_notif_timeout' => 0,
-	);
-
-	private $available_languages = array(
-		'en' => 'English',
-		'fr' => 'Français',
-	);
-
-	private $shares;
-
-	public function __construct($user) {
-		$this->filename = join_path(DATA_PATH, 'users', $user, 'config.php');
-
-		$data = @include($this->filename);
-		if (!is_array($data)) {
-			throw new Minz_PermissionDeniedException($this->filename);
-		}
-
-		foreach ($data as $key => $value) {
-			if (isset($this->data[$key])) {
-				$function = '_' . $key;
-				$this->$function($value);
-			}
-		}
-		$this->data['user'] = $user;
-
-		$this->shares = join_path(DATA_PATH, 'shares.php');
-
-		$shares = @include($this->shares);
-		if (!is_array($shares)) {
-			throw new Minz_PermissionDeniedException($this->shares);
-		}
-
-		$this->data['shares'] = $shares;
-	}
-
-	public function save() {
-		@rename($this->filename, $this->filename . '.bak.php');
-		unset($this->data['shares']); // Remove shares because it is not intended to be stored in user configuration
-		if (file_put_contents($this->filename, "<?php\n return " . var_export($this->data, true) . ';', LOCK_EX) === false) {
-			throw new Minz_PermissionDeniedException($this->filename);
-		}
-		if (function_exists('opcache_invalidate')) {
-			opcache_invalidate($this->filename);	//Clear PHP 5.5+ cache for include
-		}
-		invalidateHttpCache();
-		return true;
-	}
-
-	public function __get($name) {
-		if (array_key_exists($name, $this->data)) {
-			return $this->data[$name];
-		} else {
-			$trace = debug_backtrace();
-			trigger_error('Undefined FreshRSS_Configuration->' . $name . 'in ' . $trace[0]['file'] . ' line ' . $trace[0]['line'], E_USER_NOTICE);	//TODO: Use Minz exceptions
-			return null;
-		}
-	}
-
-	public function availableLanguages() {
-		return $this->available_languages;
-	}
-
-	public function remove_query_by_get($get) {
-		$final_queries = array();
-		foreach ($this->queries as $key => $query) {
-			if (empty($query['get']) || $query['get'] !== $get) {
-				$final_queries[$key] = $query;
-			}
-		}
-		$this->_queries($final_queries);
-	}
-
-	public function _language($value) {
-		if (!isset($this->available_languages[$value])) {
-			$value = 'en';
-		}
-		$this->data['language'] = $value;
-	}
-	public function _posts_per_page($value) {
-		$value = intval($value);
-		$this->data['posts_per_page'] = $value > 0 ? $value : 10;
-	}
-	public function _view_mode($value) {
-		if ($value === 'global' || $value === 'reader') {
-			$this->data['view_mode'] = $value;
-		} else {
-			$this->data['view_mode'] = 'normal';
-		}
-	}
-	public function _default_view($value) {
-		switch ($value) {
-		case 'all':
-			$this->data['default_view'] = $value;
-			$this->data['default_state'] = (FreshRSS_Entry::STATE_READ +
-			                                FreshRSS_Entry::STATE_NOT_READ);
-			break;
-		case 'adaptive':
-		case 'unread':
-		default:
-			$this->data['default_view'] = $value;
-			$this->data['default_state'] = FreshRSS_Entry::STATE_NOT_READ;
-		}
-	}
-	public function _default_state($value) {
-		$this->data['default_state'] = (int)$value;
-	}
-
-	public function _display_posts($value) {
-		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _display_categories($value) {
-		$this->data['display_categories'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _hide_read_feeds($value) {
-		$this->data['hide_read_feeds'] = (bool)$value;
-	}
-	public function _onread_jump_next($value) {
-		$this->data['onread_jump_next'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _lazyload($value) {
-		$this->data['lazyload'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _sticky_post($value) {
-		$this->data['sticky_post'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _reading_confirm($value) {
-		$this->data['reading_confirm'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _auto_remove_article($value) {
-		$this->data['auto_remove_article'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _sort_order($value) {
-		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
-	}
-	public function _old_entries($value) {
-		$value = intval($value);
-		$this->data['old_entries'] = $value > 0 ? $value : 3;
-	}
-	public function _keep_history_default($value) {
-		$value = intval($value);
-		$this->data['keep_history_default'] = $value >= -1 ? $value : 0;
-	}
-	public function _ttl_default($value) {
-		$value = intval($value);
-		$this->data['ttl_default'] = $value >= -1 ? $value : 3600;
-	}
-	public function _shortcuts($values) {
-		foreach ($values as $key => $value) {
-			if (isset($this->data['shortcuts'][$key])) {
-				$this->data['shortcuts'][$key] = $value;
-			}
-		}
-	}
-	public function _passwordHash($value) {
-		$this->data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
-	}
-	public function _apiPasswordHash($value) {
-		$this->data['apiPasswordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
-	}
-	public function _mail_login($value) {
-		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
-		if ($value) {
-			$this->data['mail_login'] = $value;
-		} else {
-			$this->data['mail_login'] = '';
-		}
-	}
-	public function _anon_access($value) {
-		$this->data['anon_access'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _mark_when($values) {
-		foreach ($values as $key => $value) {
-			if (isset($this->data['mark_when'][$key])) {
-				$this->data['mark_when'][$key] = ((bool)$value) && $value !== 'no';
-			}
-		}
-	}
-	public function _sharing($values) {
-		$this->data['sharing'] = array();
-		$unique = array();
-		foreach ($values as $value) {
-			if (!is_array($value)) {
-				continue;
-			}
-
-			// Verify URL and add default value when needed
-			if (isset($value['url'])) {
-				$is_url = (
-					filter_var($value['url'], FILTER_VALIDATE_URL) ||
-					(version_compare(PHP_VERSION, '5.3.3', '<') &&
-						(strpos($value, '-') > 0) &&
-						($value === filter_var($value, FILTER_SANITIZE_URL)))
-				);  //PHP bug #51192
-				if (!$is_url) {
-					continue;
-				}
-			} else {
-				$value['url'] = null;
-			}
-
-			// Add a default name
-			if (empty($value['name'])) {
-				$value['name'] = $value['type'];
-			}
-
-			$json_value = json_encode($value);
-			if (!in_array($json_value, $unique)) {
-				$unique[] = $json_value;
-				$this->data['sharing'][] = $value;
-			}
-		}
-	}
-	public function _queries($values) {
-		$this->data['queries'] = array();
-		foreach ($values as $value) {
-			$value = array_filter($value);
-			$params = $value;
-			unset($params['name']);
-			unset($params['url']);
-			$value['url'] = Minz_Url::display(array('params' => $params));
-
-			$this->data['queries'][] = $value;
-		}
-	}
-	public function _theme($value) {
-		$this->data['theme'] = $value;
-	}
-	public function _content_width($value) {
-		if ($value === 'medium' ||
-				$value === 'large' ||
-				$value === 'no_limit') {
-			$this->data['content_width'] = $value;
-		} else {
-			$this->data['content_width'] = 'thin';
-		}
-	}
-	
-	public function _html5_notif_timeout($value) {
-		$value = intval($value);
-		$this->data['html5_notif_timeout'] = $value >= 0 ? $value : 0;
-	}
-	
-	public function _token($value) {
-		$this->data['token'] = $value;
-	}
-	public function _auto_load_more($value) {
-		$this->data['auto_load_more'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_read($value) {
-		$this->data['topline_read'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_favorite($value) {
-		$this->data['topline_favorite'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_date($value) {
-		$this->data['topline_date'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_link($value) {
-		$this->data['topline_link'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_read($value) {
-		$this->data['bottomline_read'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_favorite($value) {
-		$this->data['bottomline_favorite'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_sharing($value) {
-		$this->data['bottomline_sharing'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_tags($value) {
-		$this->data['bottomline_tags'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_date($value) {
-		$this->data['bottomline_date'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_link($value) {
-		$this->data['bottomline_link'] = ((bool)$value) && $value !== 'no';
-	}
-}
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 9bbad9857..1c770c756 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -5,7 +5,8 @@
  * useful functions associated to the current view state.
  */
 class FreshRSS_Context {
-	public static $conf = null;
+	public static $user_conf = null;
+	public static $system_conf = null;
 	public static $categories = array();
 
 	public static $name = '';
@@ -37,17 +38,12 @@ class FreshRSS_Context {
 	/**
 	 * Initialize the context.
 	 *
-	 * Set the correct $conf and $categories variables.
+	 * Set the correct configurations and $categories variables.
 	 */
 	public static function init() {
 		// Init configuration.
-		try {
-			self::$conf = Minz_Configuration::get('user');
-		} catch(Minz_Exception $e) {
-			$current_user = Minz_Session::param('currentUser', '_');
-			Minz_Log::error('Cannot load configuration file of user `' . $current_user . '`');
-			die($e->getMessage());
-		}
+		self::$system_conf = Minz_Configuration::get('system');
+		self::$user_conf = Minz_Configuration::get('user');
 
 		$catDAO = new FreshRSS_CategoryDAO();
 		self::$categories = $catDAO->listCategories();
@@ -198,7 +194,7 @@ class FreshRSS_Context {
 		// By default, $next_get == $get
 		self::$next_get = $get;
 
-		if (self::$conf->onread_jump_next && strlen($get) > 2) {
+		if (self::$user_conf->onread_jump_next && strlen($get) > 2) {
 			$another_unread_id = '';
 			$found_current_get = false;
 			switch ($get[0]) {
@@ -276,7 +272,7 @@ class FreshRSS_Context {
 	 * @return boolean
 	 */
 	public static function isAutoRemoveAvailable() {
-		if (!self::$conf->auto_remove_article) {
+		if (!self::$user_conf->auto_remove_article) {
 			return false;
 		}
 		if (self::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
@@ -297,7 +293,7 @@ class FreshRSS_Context {
 	 * @return boolean
 	 */
 	public static function isStickyPostEnabled() {
-		if (self::$conf->sticky_post) {
+		if (self::$user_conf->sticky_post) {
 			return true;
 		}
 		if (self::isAutoRemoveAvailable()) {
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index a39aea327..a384455b4 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -1,6 +1,6 @@
 <?php
 	$class = '';
-	if (FreshRSS_Context::$conf->hide_read_feeds &&
+	if (FreshRSS_Context::$user_conf->hide_read_feeds &&
 			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
 			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
 		$class = ' state_unread';
@@ -39,7 +39,7 @@
 				$feeds = $cat->feeds();
 				if (!empty($feeds)) {
 					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
-					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
+					$c_show = $c_active && (!FreshRSS_Context::$user_conf->display_categories ||
 					                        FreshRSS_Context::$current_get['feed']);
 		?>
 		<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
@@ -84,7 +84,7 @@
 		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
 		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
 		<li class="item">
-			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
+			<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
 			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 656fbe9bc..b3734aa56 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<?php echo FreshRSS_Context::$conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$conf->language; ?>">
+<html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="initial-scale=1.0" />
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index f8abf9032..eeadb622b 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -39,13 +39,13 @@
 					<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
 				</li>
 
-				<?php foreach (FreshRSS_Context::$conf->queries as $query) { ?>
+				<?php foreach (FreshRSS_Context::$user_conf->queries as $query) { ?>
 				<li class="item query">
 					<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
 				</li>
 				<?php } ?>
 
-				<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
+				<?php if (count(FreshRSS_Context::$user_conf->queries) > 0) { ?>
 				<li class="separator no-mobile"></li>
 				<?php } ?>
 
@@ -82,7 +82,7 @@
 	<form id="mark-read-menu" method="post" style="display: none"></form>
 
 	<div class="stick" id="nav_menu_read_all">
-		<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
+		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
 		        formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
@@ -145,8 +145,8 @@
 
 		<?php
 			$url_output['a'] = 'rss';
-			if (FreshRSS_Context::$conf->token) {
-				$url_output['params']['token'] = FreshRSS_Context::$conf->token;
+			if (FreshRSS_Context::$user_conf->token) {
+				$url_output['params']['token'] = FreshRSS_Context::$user_conf->token;
 			}
 		?>
 		<a class="view_rss btn" target="_blank" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index ee1e2d8b9..bb07cc2af 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -14,7 +14,7 @@
 						<option selected="selected"></option>
 					<?php } ?>
 					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('admin.auth.form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.persona'); ?></option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$user_conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.persona'); ?></option>
 					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.http'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
 					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('admin.auth.none'); ?></option>
 				</select>
@@ -55,7 +55,7 @@
 		<?php if (Minz_Configuration::canLogIn()) { ?>
 		<div class="form-group">
 			<label class="group-name" for="token"><?php echo _t('admin.auth.token'); ?></label>
-			<?php $token = FreshRSS_Context::$conf->token; ?>
+			<?php $token = FreshRSS_Context::$user_conf->token; ?>
 			<div class="group-controls">
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 4e8dfd385..875463137 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -10,7 +10,7 @@
 		<div class="form-group">
 			<label class="group-name" for="old_entries"><?php echo _t('conf.archiving.delete_after'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$conf->old_entries; ?>" /> <?php echo _t('gen.date.month'); ?>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$user_conf->old_entries; ?>" /> <?php echo _t('gen.date.month'); ?>
 				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('conf.archiving.purge_now'); ?></a>
 			</div>
 		</div>
@@ -19,7 +19,7 @@
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
 					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . (FreshRSS_Context::$conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
+						echo '<option value="' . $v . (FreshRSS_Context::$user_conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
 				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
@@ -34,13 +34,13 @@
 					                36000 => '10h', 43200 => '12h', 64800 => '18h',
 					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
 					                604800 => '1wk', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . (FreshRSS_Context::$conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-						if (FreshRSS_Context::$conf->ttl_default == $v) {
+						echo '<option value="' . $v . (FreshRSS_Context::$user_conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						if (FreshRSS_Context::$user_conf->ttl_default == $v) {
 							$found = true;
 						}
 					}
 					if (!$found) {
-						echo '<option value="' . intval(FreshRSS_Context::$conf->ttl_default) . '" selected="selected">' . intval(FreshRSS_Context::$conf->ttl_default) . 's</option>';
+						echo '<option value="' . intval(FreshRSS_Context::$user_conf->ttl_default) . '" selected="selected">' . intval(FreshRSS_Context::$user_conf->ttl_default) . 's</option>';
 					}
 				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index a245c8f5e..b68bf925b 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -10,9 +10,9 @@
 			<label class="group-name" for="language"><?php echo _t('conf.display.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
+				<?php $languages = FreshRSS_Context::$user_conf->availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$user_conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
 				</select>
 			</div>
@@ -24,7 +24,7 @@
 				<ul class="slides">
 					<?php $slides = count($this->themes); $i = 1; ?>
 					<?php foreach($this->themes as $theme) { ?>
-						<input type="radio" name="theme" id="img-<?php echo $i ?>" <?php if (FreshRSS_Context::$conf->theme === $theme['id']) {echo "checked";}?> value="<?php echo $theme['id'] ?>"/>
+						<input type="radio" name="theme" id="img-<?php echo $i ?>" <?php if (FreshRSS_Context::$user_conf->theme === $theme['id']) {echo "checked";}?> value="<?php echo $theme['id'] ?>"/>
 						<li class="slide-container">
 							<div class="slide">
 								<img src="<?php echo Minz_Url::display('/themes/' . $theme['id'] . '/thumbs/original.png')?>"/>
@@ -49,7 +49,7 @@
 			</div>
 		</div>
 
-		<?php $width = FreshRSS_Context::$conf->content_width; ?>
+		<?php $width = FreshRSS_Context::$user_conf->content_width; ?>
 		<div class="form-group">
 			<label class="group-name" for="content_width"><?php echo _t('conf.display.width.content'); ?></label>
 			<div class="group-controls">
@@ -87,20 +87,20 @@
 				<tbody>
 					<tr>
 						<th><?php echo _t('conf.display.icon.top_line'); ?></th>
-						<td><input type="checkbox" name="topline_read" value="1"<?php echo FreshRSS_Context::$conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_read" value="1"<?php echo FreshRSS_Context::$user_conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
-						<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$user_conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$user_conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
 						<th><?php echo _t('conf.display.icon.bottom_line'); ?></th>
-						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo FreshRSS_Context::$conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo FreshRSS_Context::$conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo FreshRSS_Context::$conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr>
 				</tbody>
 			</table><br />
@@ -109,7 +109,7 @@
 		<div class="form-group">
 			<label class="group-name" for="posts_per_page"><?php echo _t('conf.display.notif_html5.timeout'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$conf->html5_notif_timeout; ?>" /> <?php echo _t('conf.display.notif_html5.seconds'); ?>
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$user_conf->html5_notif_timeout; ?>" /> <?php echo _t('conf.display.notif_html5.seconds'); ?>
 			</div>
 		</div>
 
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index 1b3a08c91..5f449deb3 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -6,7 +6,7 @@
 	<form method="post" action="<?php echo _url('configure', 'queries'); ?>">
 		<legend><?php echo _t('conf.query'); ?></legend>
 
-		<?php foreach (FreshRSS_Context::$conf->queries as $key => $query) { ?>
+		<?php foreach (FreshRSS_Context::$user_conf->queries as $key => $query) { ?>
 		<div class="form-group" id="query-group-<?php echo $key; ?>">
 			<label class="group-name" for="queries_<?php echo $key; ?>_name">
 				<?php echo _t('conf.query.number', $key + 1); ?>
@@ -82,7 +82,7 @@
 		</div>
 		<?php } ?>
 
-		<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
+		<?php if (count(FreshRSS_Context::$user_conf->queries) > 0) { ?>
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 440ad1df8..636671f14 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -9,7 +9,7 @@
 		<div class="form-group">
 			<label class="group-name" for="posts_per_page"><?php echo _t('conf.reading.articles_per_page'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$conf->posts_per_page; ?>" min="5" max="50" />
+				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>" min="5" max="50" />
 				<?php echo _i('help'); ?> <?php echo _t('conf.reading.number_divided_when_reader'); ?>
 			</div>
 		</div>
@@ -18,8 +18,8 @@
 			<label class="group-name" for="sort_order"><?php echo _t('conf.reading.sort'); ?></label>
 			<div class="group-controls">
 				<select name="sort_order" id="sort_order">
-					<option value="DESC"<?php echo FreshRSS_Context::$conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.newer_first'); ?></option>
-					<option value="ASC"<?php echo FreshRSS_Context::$conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.older_first'); ?></option>
+					<option value="DESC"<?php echo FreshRSS_Context::$user_conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.newer_first'); ?></option>
+					<option value="ASC"<?php echo FreshRSS_Context::$user_conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.older_first'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -28,9 +28,9 @@
 			<label class="group-name" for="view_mode"><?php echo _t('conf.reading.view.default'); ?></label>
 			<div class="group-controls">
 				<select name="view_mode" id="view_mode">
-					<option value="normal"<?php echo FreshRSS_Context::$conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.normal'); ?></option>
-					<option value="reader"<?php echo FreshRSS_Context::$conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.reader'); ?></option>
-					<option value="global"<?php echo FreshRSS_Context::$conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.global'); ?></option>
+					<option value="normal"<?php echo FreshRSS_Context::$user_conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.normal'); ?></option>
+					<option value="reader"<?php echo FreshRSS_Context::$user_conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.reader'); ?></option>
+					<option value="global"<?php echo FreshRSS_Context::$user_conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.global'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -39,9 +39,9 @@
 			<label class="group-name" for="view_mode"><?php echo _t('conf.reading.show'); ?></label>
 			<div class="group-controls">
 				<select name="default_view" id="default_view">
-					<option value="adaptive"<?php echo FreshRSS_Context::$conf->default_view === 'adaptive' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.adaptive'); ?></option>
-					<option value="all"<?php echo FreshRSS_Context::$conf->default_view === 'all' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.all_articles'); ?></option>
-					<option value="unread"<?php echo FreshRSS_Context::$conf->default_view === 'unread' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.unread'); ?></option>
+					<option value="adaptive"<?php echo FreshRSS_Context::$user_conf->default_view === 'adaptive' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.adaptive'); ?></option>
+					<option value="all"<?php echo FreshRSS_Context::$user_conf->default_view === 'all' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.all_articles'); ?></option>
+					<option value="unread"<?php echo FreshRSS_Context::$user_conf->default_view === 'unread' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.unread'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -49,7 +49,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="hide_read_feeds">
-					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo FreshRSS_Context::$conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo FreshRSS_Context::$user_conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.hide_read_feeds'); ?>
 				</label>
 			</div>
@@ -58,7 +58,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="display_posts">
-					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo FreshRSS_Context::$conf->display_posts ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo FreshRSS_Context::$user_conf->display_posts ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.display_articles_unfolded'); ?>
 					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
@@ -68,7 +68,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="display_categories">
-					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo FreshRSS_Context::$conf->display_categories ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo FreshRSS_Context::$user_conf->display_categories ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.display_categories_unfolded'); ?>
 					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
@@ -78,7 +78,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="sticky_post">
-					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo FreshRSS_Context::$conf->sticky_post ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo FreshRSS_Context::$user_conf->sticky_post ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.sticky_post'); ?>
 					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
@@ -88,7 +88,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">
-					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo FreshRSS_Context::$conf->auto_load_more ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo FreshRSS_Context::$user_conf->auto_load_more ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.auto_load_more'); ?>
 					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
@@ -98,7 +98,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
-					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo FreshRSS_Context::$conf->lazyload ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo FreshRSS_Context::$user_conf->lazyload ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.img_with_lazyload'); ?>
 					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
@@ -108,7 +108,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="reading_confirm">
-					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo FreshRSS_Context::$conf->reading_confirm ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo FreshRSS_Context::$user_conf->reading_confirm ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.confirm_enabled'); ?>
 					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
@@ -118,7 +118,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="auto_remove_article">
-					<input type="checkbox" name="auto_remove_article" id="auto_remove_article" value="1"<?php echo FreshRSS_Context::$conf->auto_remove_article ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="auto_remove_article" id="auto_remove_article" value="1"<?php echo FreshRSS_Context::$user_conf->auto_remove_article ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.auto_remove_article'); ?>
 					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
@@ -129,19 +129,19 @@
 			<label class="group-name"><?php echo _t('conf.reading.read.when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
-					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo FreshRSS_Context::$conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo FreshRSS_Context::$user_conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.read.article_viewed'); ?>
 				</label>
 				<label class="checkbox" for="check_open_site">
-					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo FreshRSS_Context::$conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo FreshRSS_Context::$user_conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.read.article_open_on_website'); ?>
 				</label>
 				<label class="checkbox" for="check_scroll">
-					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo FreshRSS_Context::$conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo FreshRSS_Context::$user_conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.read.scroll'); ?>
 				</label>
 				<label class="checkbox" for="check_reception">
-					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo FreshRSS_Context::$conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo FreshRSS_Context::$user_conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.read.upon_reception'); ?>
 				</label>
 			</div>
@@ -151,7 +151,7 @@
 			<label class="group-name"><?php echo _t('conf.reading.after_onread'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="onread_jump_next">
-					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo FreshRSS_Context::$conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo FreshRSS_Context::$user_conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
 					<?php echo _t('conf.reading.jump_next'); ?>
 				</label>
 			</div>
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index ffe3c039b..f5c133f07 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -15,8 +15,8 @@
 			<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
 		<legend><?php echo _t('conf.sharing'); ?></legend>
-		<?php foreach (FreshRSS_Context::$conf->sharing as $key => $sharing) { ?>
-			<?php $share = FreshRSS_Context::$conf->shares[$sharing['type']]; ?>
+		<?php foreach (FreshRSS_Context::$user_conf->sharing as $key => $sharing) { ?>
+			<?php $share = FreshRSS_Context::$user_conf->shares[$sharing['type']]; ?>
 			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
 					<?php echo _t('conf.sharing.' . $sharing['type']); ?>
@@ -41,7 +41,7 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<select>
-					<?php foreach(FreshRSS_Context::$conf->shares as $key => $params) { ?>
+					<?php foreach(FreshRSS_Context::$user_conf->shares as $key => $params) { ?>
 						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t('conf.sharing.' . $key) ?></option>
 					<?php } ?>
 				</select>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index dca8b6ef8..fdbeed3ea 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -9,7 +9,7 @@
 		<?php } ?>
 	</datalist>
 
-	<?php $s = FreshRSS_Context::$conf->shortcuts; ?>
+	<?php $s = FreshRSS_Context::$user_conf->shortcuts; ?>
 
 	<form method="post" action="<?php echo _url('configure', 'shortcut'); ?>">
 		<legend><?php echo _t('conf.shortcut'); ?></legend>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 02f2014ee..aa73e297e 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -2,12 +2,12 @@
 <?php
 
 $conf = Minz_Configuration::get('system');
-$mark = FreshRSS_Context::$conf->mark_when;
+$mark = FreshRSS_Context::$user_conf->mark_when;
 $mail = Minz_Session::param('mail', false);
 $auto_actualize = Minz_Session::param('actualize_feeds', false);
-$hide_posts = (FreshRSS_Context::$conf->display_posts ||
+$hide_posts = (FreshRSS_Context::$user_conf->display_posts ||
                Minz_Request::param('output') === 'reader');
-$s = FreshRSS_Context::$conf->shortcuts;
+$s = FreshRSS_Context::$user_conf->shortcuts;
 
 $url_login = Minz_Url::display(array(
 	'c' => 'auth',
@@ -21,15 +21,15 @@ $url_logout = Minz_Url::display(array(
 echo 'var context={',
 	'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',',
 	'hide_posts:', $hide_posts ? 'false' : 'true', ',',
-	'display_order:"', Minz_Request::param('order', FreshRSS_Context::$conf->sort_order), '",',
+	'display_order:"', Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order), '",',
 	'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
 	'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',',
 	'auto_mark_scroll:', $mark['scroll'] ? 'true' : 'false', ',',
-	'auto_load_more:', FreshRSS_Context::$conf->auto_load_more ? 'true' : 'false', ',',
+	'auto_load_more:', FreshRSS_Context::$user_conf->auto_load_more ? 'true' : 'false', ',',
 	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
-	'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',',
+	'does_lazyload:', FreshRSS_Context::$user_conf->lazyload ? 'true' : 'false', ',',
 	'sticky_post:', FreshRSS_Context::isStickyPostEnabled() ? 'true' : 'false', ',',
-	'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',',
+	'html5_notif_timeout:', FreshRSS_Context::$user_conf->html5_notif_timeout, ',',
 	'auth_type:"', $conf->general['auth_type'], '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
 	'current_view:"', Minz_Request::param('output', 'normal'), '"',
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index 8b40e4336..b20201c4b 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -24,7 +24,7 @@
 		</a>
 	<?php } elseif ($url_mark_read) { ?>
 		<button id="bigMarkAsRead"
-		        class="as-link <?php echo FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>"
+		        class="as-link <?php echo FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>"
 		        form="mark-read-pagination"
 		        formaction="<?php echo Minz_Url::display($url_mark_read); ?>"
 		        type="submit">
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index ae7f5ffbc..cf95bd0f5 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -2,7 +2,7 @@
 	$this->partial('nav_menu');
 
 	$class = '';
-	if (FreshRSS_Context::$conf->hide_read_feeds &&
+	if (FreshRSS_Context::$user_conf->hide_read_feeds &&
 			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
 			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
 		$class = ' state_unread';
@@ -50,5 +50,5 @@
 <div id="overlay">
 	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
-<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+<div id="panel"<?php echo FreshRSS_Context::$user_conf->display_posts ? '' : ' class="hide_posts"'; ?>>
 </div>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index b8a78cc3d..c2cf7c887 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -8,24 +8,24 @@ if (!empty($this->entries)) {
 	$display_yesterday = true;
 	$display_others = true;
 	if (FreshRSS_Auth::hasAccess()) {
-		$sharing = FreshRSS_Context::$conf->sharing;
+		$sharing = FreshRSS_Context::$user_conf->sharing;
 	} else {
 		$sharing = array();
 	}
-	$hidePosts = !FreshRSS_Context::$conf->display_posts;
-	$lazyload = FreshRSS_Context::$conf->lazyload;
-	$topline_read = FreshRSS_Context::$conf->topline_read;
-	$topline_favorite = FreshRSS_Context::$conf->topline_favorite;
-	$topline_date = FreshRSS_Context::$conf->topline_date;
-	$topline_link = FreshRSS_Context::$conf->topline_link;
-	$bottomline_read = FreshRSS_Context::$conf->bottomline_read;
-	$bottomline_favorite = FreshRSS_Context::$conf->bottomline_favorite;
-	$bottomline_sharing = FreshRSS_Context::$conf->bottomline_sharing && (count($sharing));
-	$bottomline_tags = FreshRSS_Context::$conf->bottomline_tags;
-	$bottomline_date = FreshRSS_Context::$conf->bottomline_date;
-	$bottomline_link = FreshRSS_Context::$conf->bottomline_link;
+	$hidePosts = !FreshRSS_Context::$user_conf->display_posts;
+	$lazyload = FreshRSS_Context::$user_conf->lazyload;
+	$topline_read = FreshRSS_Context::$user_conf->topline_read;
+	$topline_favorite = FreshRSS_Context::$user_conf->topline_favorite;
+	$topline_date = FreshRSS_Context::$user_conf->topline_date;
+	$topline_link = FreshRSS_Context::$user_conf->topline_link;
+	$bottomline_read = FreshRSS_Context::$user_conf->bottomline_read;
+	$bottomline_favorite = FreshRSS_Context::$user_conf->bottomline_favorite;
+	$bottomline_sharing = FreshRSS_Context::$user_conf->bottomline_sharing && (count($sharing));
+	$bottomline_tags = FreshRSS_Context::$user_conf->bottomline_tags;
+	$bottomline_date = FreshRSS_Context::$user_conf->bottomline_date;
+	$bottomline_link = FreshRSS_Context::$user_conf->bottomline_link;
 
-	$content_width = FreshRSS_Context::$conf->content_width;
+	$content_width = FreshRSS_Context::$user_conf->content_width;
 
 	$today = @strtotime('today');
 ?>
@@ -142,11 +142,11 @@ if (!empty($this->entries)) {
 							<li class="dropdown-close"><a href="#close">❌</a></li>
 							<?php
 								foreach ($sharing as $share) {
-									$type_share = FreshRSS_Context::$conf->shares[$share['type']];
+									$type_share = FreshRSS_Context::$user_conf->shares[$share['type']];
 									$has_specific_title = ($type_share['form'] === 'advanced');
 							?>
 								<li class="item share">
-									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
+									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$user_conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
 										<?php echo $has_specific_title ? $share['name'] : _t('index.share.' . $share['name']); ?>
 									</a>
 								</li>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index 1eab86dd2..017297710 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -2,8 +2,8 @@
 $this->partial('nav_menu');
 
 if (!empty($this->entries)) {
-	$lazyload = FreshRSS_Context::$conf->lazyload;
-	$content_width = FreshRSS_Context::$conf->content_width;
+	$lazyload = FreshRSS_Context::$user_conf->lazyload;
+	$content_width = FreshRSS_Context::$user_conf->content_width;
 ?>
 
 <div id="stream" class="reader">
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index b175d48df..6e472ca0b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -10,9 +10,9 @@
 			<label class="group-name" for="new_user_language"><?php echo _t('admin.user.language'); ?></label>
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
-				<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
+				<?php $languages = FreshRSS_Context::$user_conf->availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$user_conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
 				</select>
 			</div>
@@ -38,7 +38,7 @@
 
 		<div class="form-group">
 			<label class="group-name" for="new_user_email"><?php echo _t('admin.user.email_persona'); ?></label>
-			<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
+			<?php $mail = FreshRSS_Context::$user_conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
 			</div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index fc9b24674..a3f7bf15d 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -42,7 +42,7 @@
 
 		<div class="form-group">
 			<label class="group-name" for="mail_login"><?php echo _t('conf.profile.email_persona'); ?></label>
-			<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
+			<?php $mail = FreshRSS_Context::$user_conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>

From d27efeec04c7c41cf0f52bc7f89879e66f2e44a9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 17:38:31 +0100
Subject: [PATCH 261/363] Fix Controllers to use the correct config system

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/feedController.php         |  5 +++--
 app/Controllers/importExportController.php |  4 ++--
 app/Controllers/indexController.php        |  9 ++++++---
 app/Controllers/javascriptController.php   |  3 ++-
 app/Controllers/userController.php         | 10 ++++++----
 lib/lib_rss.php                            |  3 ++-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 92a1e3bf8..df1e559bc 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -18,8 +18,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token == $token_param);
 			$action = Minz_Request::actionName();
+			$allow_anonymous_refresh = FreshRSS_Context::$system_conf->general['allow_anonymous_refresh'];
 			if ($action !== 'actualize' ||
-					!(Minz_Configuration::allowAnonymousRefresh() || $token_is_ok)) {
+					!($allow_anonymous_refresh || $token_is_ok)) {
 				Minz_Error::error(403);
 			}
 		}
@@ -65,7 +66,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			'params' => array(),
 		);
 
-		$limits = Minz_Configuration::limits();
+		$limits = FreshRSS_Context::$system_conf->limits;
 		$this->view->feeds = $feedDAO->listFeeds();
 		if (count($this->view->feeds) >= $limits['max_feeds']) {
 			Minz_Request::bad(_t('feedback.sub.feed.over_max', $limits['max_feeds']),
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 334f33d6a..4ce24719e 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -174,7 +174,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		$nb_feeds = count($this->feedDAO->listFeeds());
 		$nb_cats = count($this->catDAO->listCategories(false));
-		$limits = Minz_Configuration::limits();
+		$limits = FreshRSS_Context::$system_conf->limits;
 
 		foreach ($opml_elements as $elt) {
 			$is_error = false;
@@ -323,7 +323,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$article_to_feed = array();
 
 		$nb_feeds = count($this->feedDAO->listFeeds());
-		$limits = Minz_Configuration::limits();
+		$limits = FreshRSS_Context::$system_conf->limits;
 
 		// First, we check feeds of articles are in DB (and add them if needed).
 		foreach ($article_object['items'] as $item) {
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 14f3f4f4b..d948504cc 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -20,7 +20,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the normal view of FreshRSS.
 	 */
 	public function normalAction() {
-		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
+		$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
+		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
 			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
 			return;
 		}
@@ -82,7 +83,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the global view of FreshRSS.
 	 */
 	public function globalAction() {
-		if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
+		$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
+		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
 			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
 			return;
 		}
@@ -109,13 +111,14 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the RSS feed of FreshRSS.
 	 */
 	public function rssAction() {
+		$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
 		$token = FreshRSS_Context::$user_conf->token;
 		$token_param = Minz_Request::param('token', '');
 		$token_is_ok = ($token != '' && $token === $token_param);
 
 		// Check if user has access.
 		if (!FreshRSS_Auth::hasAccess() &&
-				!Minz_Configuration::allowAnonymous() &&
+				!$allow_anonymous &&
 				!$token_is_ok) {
 			Minz_Error::error(403);
 		}
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index b178801d4..dd9aa6189 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -28,11 +28,12 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 		$user = isset($_GET['user']) ? $_GET['user'] : '';
 		if (ctype_alnum($user)) {
 			try {
+				$salt = FreshRSS_Context::$system_conf->general['salt'];
 				$conf = new FreshRSS_Configuration($user);
 				$s = $conf->passwordHash;
 				if (strlen($s) >= 60) {
 					$this->view->salt1 = substr($s, 0, 29);	//CRYPT_BLOWFISH Salt: "$2a$", a two digit cost parameter, "$", and 22 characters from the alphabet "./0-9A-Za-z".
-					$this->view->nonce = sha1(Minz_Configuration::salt() . uniqid(mt_rand(), true));
+					$this->view->nonce = sha1($salt . uniqid(mt_rand(), true));
 					Minz_Session::_param('nonce', $this->view->nonce);
 					return;	//Success
 				}
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 58181bfb0..be2ae943e 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -105,7 +105,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 	public function createAction() {
 		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
-			$db = Minz_Configuration::dataBase();
+			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$user_conf->language);
@@ -118,7 +118,8 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			$ok = ($new_user_name != '') && ctype_alnum($new_user_name);
 
 			if ($ok) {
-				$ok &= (strcasecmp($new_user_name, Minz_Configuration::defaultUser()) !== 0);	//It is forbidden to alter the default user
+				$default_user = FreshRSS_Context::$system_conf->general['default_user'];
+				$ok &= (strcasecmp($new_user_name, $default_user) !== 0);	//It is forbidden to alter the default user
 
 				$ok &= !in_array(strtoupper($new_user_name), array_map('strtoupper', listUsers()));	//Not an existing user, case-insensitive
 
@@ -179,7 +180,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 	public function deleteAction() {
 		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
-			$db = Minz_Configuration::dataBase();
+			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 			$username = Minz_Request::param('username');
@@ -187,7 +188,8 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			$user_data = join_path(DATA_PATH, 'users', $username);
 
 			if ($ok) {
-				$ok &= (strcasecmp($username, Minz_Configuration::defaultUser()) !== 0);	//It is forbidden to delete the default user
+				$default_user = FreshRSS_Context::$system_conf->general['default_user'];
+				$ok &= (strcasecmp($username, $default_user) !== 0);	//It is forbidden to delete the default user
 			}
 			if ($ok) {
 				$ok &= is_dir($user_data);
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index d450ec858..3a929631e 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -119,7 +119,8 @@ function html_only_entity_decode($text) {
 }
 
 function customSimplePie() {
-	$limits = Minz_Configuration::limits();
+	$system_conf = Minz_Configuration::get('system');
+	$limits = $system_conf->limits;
 	$simplePie = new SimplePie();
 	$simplePie->set_useragent(_t('gen.freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);

From d3a93ea2905ae50a2365d293f9f3ef3e51bf5f30 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 18:53:36 +0100
Subject: [PATCH 262/363] BREAKING FEATURE: Remove general in config

General attribute has been removed from system config.
Now subattributes (e.g. environment, salt, title, etc.) are directly accessible.

YOU HAVE TO FIX YOUR ./data/config.php file!

- Remove the general array
- Values inside this array must be kept
- To see what it must look like, please have a look to ./data/config.default.php
  (but keep your values!!).

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/authController.php       | 28 +++++++++++-------------
 app/Controllers/feedController.php       |  2 +-
 app/Controllers/indexController.php      |  6 ++---
 app/Controllers/javascriptController.php |  2 +-
 app/Controllers/userController.php       |  4 ++--
 app/FreshRSS.php                         |  2 +-
 app/Models/Auth.php                      | 14 ++++++------
 app/Models/Feed.php                      |  4 ++--
 app/layout/header.phtml                  |  6 ++---
 app/layout/layout.phtml                  |  2 +-
 app/views/helpers/javascript_vars.phtml  |  3 +--
 data/config.default.php                  | 24 ++++++++++----------
 lib/Minz/Error.php                       |  2 +-
 lib/Minz/FrontController.php             |  2 +-
 lib/Minz/Log.php                         |  2 +-
 lib/Minz/Request.php                     |  2 +-
 lib/Minz/Translate.php                   |  2 +-
 lib/Minz/View.php                        |  2 +-
 18 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 3a1ad4605..4ae9ff7fb 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -27,7 +27,6 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
-			$general = FreshRSS_Context::$system_conf->general;
 			$current_token = FreshRSS_Context::$user_conf->token;
 			$token = Minz_Request::param('token', $current_token);
 			FreshRSS_Context::$user_conf->_token($token);
@@ -40,20 +39,19 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			$auth_type = Minz_Request::param('auth_type', 'none');
 			$unsafe_autologin = Minz_Request::param('unsafe_autologin', false);
 			$api_enabled = Minz_Request::param('api_enabled', false);
-			if ($anon != $general['allow_anonymous'] ||
-				$auth_type != $general['auth_type'] ||
-				$anon_refresh != $general['allow_anonymous_refresh'] ||
-				$unsafe_autologin != $general['unsafe_autologin_enabled'] ||
-				$api_enabled != $general['api_enabled']) {
+			if ($anon != FreshRSS_Context::$system_conf->allow_anonymous ||
+				$auth_type != FreshRSS_Context::$system_conf->auth_type ||
+				$anon_refresh != FreshRSS_Context::$system_conf->allow_anonymous_refresh ||
+				$unsafe_autologin != FreshRSS_Context::$system_conf->unsafe_autologin_enabled ||
+				$api_enabled != FreshRSS_Context::$system_conf->api_enabled) {
 
 				// TODO: test values from form
-				$general['auth_type'] = $auth_type;
-				$general['allow_anonymous'] = $anon;
-				$general['allow_anonymous_refresh'] = $anon_refresh;
-				$general['unsafe_autologin_enabled'] = $unsafe_autologin;
-				$general['api_enabled'] = $api_enabled;
+				FreshRSS_Context::$system_conf->auth_type = $auth_type;
+				FreshRSS_Context::$system_conf->allow_anonymous = $anon;
+				FreshRSS_Context::$system_conf->allow_anonymous_refresh = $anon_refresh;
+				FreshRSS_Context::$system_conf->unsafe_autologin_enabled = $unsafe_autologin;
+				FreshRSS_Context::$system_conf->api_enabled = $api_enabled;
 
-				$system_conf->general = $general;
 				$ok &= $system_conf->save();
 			}
 
@@ -80,7 +78,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
 		}
 
-		$auth_type = FreshRSS_Context::$system_conf->general['auth_type'];
+		$auth_type = FreshRSS_Context::$system_conf->auth_type;
 		switch ($auth_type) {
 		case 'form':
 			Minz_Request::forward(array('c' => 'auth', 'a' => 'formLogin'));
@@ -160,7 +158,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
-		} elseif (FreshRSS_Context::$system_conf->general['unsafe_autologin_enabled']) {
+		} elseif (FreshRSS_Context::$system_conf->unsafe_autologin_enabled) {
 			$username = Minz_Request::param('u', '');
 			$password = Minz_Request::param('p', '');
 			Minz_Request::_param('p');
@@ -301,7 +299,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 
 		$this->view->no_form = false;
 		// Enable changement of auth only if Persona!
-		if (FreshRSS_Context::$system_conf->general['auth_type'] != 'persona') {
+		if (FreshRSS_Context::$system_conf->auth_type != 'persona') {
 			$this->view->message = array(
 				'status' => 'bad',
 				'title' => _t('gen.short.damn'),
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index df1e559bc..c22669361 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -18,7 +18,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token == $token_param);
 			$action = Minz_Request::actionName();
-			$allow_anonymous_refresh = FreshRSS_Context::$system_conf->general['allow_anonymous_refresh'];
+			$allow_anonymous_refresh = FreshRSS_Context::$system_conf->allow_anonymous_refresh;
 			if ($action !== 'actualize' ||
 					!($allow_anonymous_refresh || $token_is_ok)) {
 				Minz_Error::error(403);
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index d948504cc..c53d3223e 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -20,7 +20,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the normal view of FreshRSS.
 	 */
 	public function normalAction() {
-		$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
+		$allow_anonymous = FreshRSS_Context::$system_conf->allow_anonymous;
 		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
 			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
 			return;
@@ -83,7 +83,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the global view of FreshRSS.
 	 */
 	public function globalAction() {
-		$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
+		$allow_anonymous = FreshRSS_Context::$system_conf->allow_anonymous;
 		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
 			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
 			return;
@@ -111,7 +111,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 * This action displays the RSS feed of FreshRSS.
 	 */
 	public function rssAction() {
-		$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
+		$allow_anonymous = FreshRSS_Context::$system_conf->allow_anonymous;
 		$token = FreshRSS_Context::$user_conf->token;
 		$token_param = Minz_Request::param('token', '');
 		$token_is_ok = ($token != '' && $token === $token_param);
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index dd9aa6189..acd3fef69 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -28,7 +28,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 		$user = isset($_GET['user']) ? $_GET['user'] : '';
 		if (ctype_alnum($user)) {
 			try {
-				$salt = FreshRSS_Context::$system_conf->general['salt'];
+				$salt = FreshRSS_Context::$system_conf->salt;
 				$conf = new FreshRSS_Configuration($user);
 				$s = $conf->passwordHash;
 				if (strlen($s) >= 60) {
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index be2ae943e..bfc2dfb3b 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -118,7 +118,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			$ok = ($new_user_name != '') && ctype_alnum($new_user_name);
 
 			if ($ok) {
-				$default_user = FreshRSS_Context::$system_conf->general['default_user'];
+				$default_user = FreshRSS_Context::$system_conf->default_user;
 				$ok &= (strcasecmp($new_user_name, $default_user) !== 0);	//It is forbidden to alter the default user
 
 				$ok &= !in_array(strtoupper($new_user_name), array_map('strtoupper', listUsers()));	//Not an existing user, case-insensitive
@@ -188,7 +188,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			$user_data = join_path(DATA_PATH, 'users', $username);
 
 			if ($ok) {
-				$default_user = FreshRSS_Context::$system_conf->general['default_user'];
+				$default_user = FreshRSS_Context::$system_conf->default_user;
 				$ok &= (strcasecmp($username, $default_user) !== 0);	//It is forbidden to delete the default user
 			}
 			if ($ok) {
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index b22bfdb4b..a53174394 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -62,7 +62,7 @@ class FreshRSS extends Minz_FrontController {
 		Minz_View::appendScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
 
-		if (FreshRSS_Context::$system_conf->general['auth_type'] === 'persona') {
+		if (FreshRSS_Context::$system_conf->auth_type === 'persona') {
 			// TODO move it in a plugin
 			// Needed for login AND logout with Persona.
 			Minz_View::appendScript('https://login.persona.org/include.js');
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 84b4e3721..05ec61d0e 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -17,7 +17,7 @@ class FreshRSS_Auth {
 		$current_user = Minz_Session::param('currentUser', '');
 		if ($current_user === '') {
 			$conf = Minz_Configuration::get('system');
-			$current_user = $conf->general['default_user'];
+			$current_user = $conf->default_user;
 			Minz_Session::_param('currentUser', $current_user);
 		}
 
@@ -42,7 +42,7 @@ class FreshRSS_Auth {
 	 */
 	private static function accessControl() {
 		$conf = Minz_Configuration::get('system');
-		$auth_type = $conf->general['auth_type'];
+		$auth_type = $conf->auth_type;
 		switch ($auth_type) {
 		case 'form':
 			$credentials = FreshRSS_FormAuth::getCredentialsFromCookie();
@@ -84,7 +84,7 @@ class FreshRSS_Auth {
 	public static function giveAccess() {
 		$user_conf = Minz_Configuration::get('user');
 		$system_conf = Minz_Configuration::get('system');
-		$auth_type = $system_conf->general['auth_type'];
+		$auth_type = $system_conf->auth_type;
 
 		switch ($auth_type) {
 		case 'form':
@@ -115,7 +115,7 @@ class FreshRSS_Auth {
 	 */
 	public static function hasAccess($scope = 'general') {
 		$conf = Minz_Configuration::get('system');
-		$default_user = $conf->general['default_user'];
+		$default_user = $conf->default_user;
 		$ok = self::$login_ok;
 		switch ($scope) {
 		case 'general':
@@ -136,9 +136,9 @@ class FreshRSS_Auth {
 		Minz_Session::_param('loginOk');
 		self::$login_ok = false;
 		$conf = Minz_Configuration::get('system');
-		Minz_Session::_param('currentUser', $conf->general['default_user']);
+		Minz_Session::_param('currentUser', $conf->default_user);
 
-		switch ($conf->general['auth_type']) {
+		switch ($conf->auth_type) {
 		case 'form':
 			Minz_Session::_param('passwordHash');
 			FreshRSS_FormAuth::deleteCookie();
@@ -160,7 +160,7 @@ class FreshRSS_Auth {
 	 */
 	public static function accessNeedLogin() {
 		$conf = Minz_Configuration::get('system');
-		$auth_type = $conf->general['auth_type'];
+		$auth_type = $conf->auth_type;
 		return $auth_type === 'form' || $auth_type === 'persona';
 	}
 }
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 071eafdf6..86cbb783e 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -39,9 +39,9 @@ class FreshRSS_Feed extends Minz_Model {
 	}
 
 	public function hash() {
-		$conf = Minz_Configuration::get('system');
 		if ($this->hash === null) {
-			$this->hash = hash('crc32b', $conf->general['salt'] . $this->url);
+			$salt = FreshRSS_Context::$system_conf->salt;
+			$this->hash = hash('crc32b', $salt . $this->url);
 		}
 		return $this->hash;
 	}
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 2f16b5f63..97e24a1d9 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -1,7 +1,5 @@
 <?php
 
-$conf = Minz_Configuration::get('system');
-
 if (FreshRSS_Auth::accessNeedLogin()) {
 	?><ul class="nav nav-head nav-login"><?php
 		if (FreshRSS_Auth::hasAccess()) {
@@ -18,13 +16,13 @@ if (FreshRSS_Auth::accessNeedLogin()) {
 		<h1>
 			<a href="<?php echo _url('index', 'index'); ?>">
 				<img class="logo" src="<?php echo _i('icon', true); ?>" alt="⊚" />
-				<?php echo $conf->general['title']; ?>
+				<?php echo FreshRSS_Context::$system_conf->title; ?>
 			</a>
 		</h1>
 	</div>
 
 	<div class="item search">
-		<?php if (FreshRSS_Auth::hasAccess() || $conf->general['allow_anonymous']) { ?>
+		<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?>
 		<form action="<?php echo _url('index', 'index'); ?>" method="get">
 			<div class="stick">
 				<?php $search = Minz_Request::param('search', ''); ?>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index b3734aa56..ed8029fe0 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -35,7 +35,7 @@
 		<link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="apple-mobile-web-app-status-bar-style" content="black" />
-		<meta name="apple-mobile-web-app-title" content="<?php echo $conf->general['title'] ?>">
+		<meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
 		<meta name="robots" content="noindex,nofollow" />
 	</head>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index aa73e297e..fec3a6f7c 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,7 +1,6 @@
 "use strict";
 <?php
 
-$conf = Minz_Configuration::get('system');
 $mark = FreshRSS_Context::$user_conf->mark_when;
 $mail = Minz_Session::param('mail', false);
 $auto_actualize = Minz_Session::param('actualize_feeds', false);
@@ -30,7 +29,7 @@ echo 'var context={',
 	'does_lazyload:', FreshRSS_Context::$user_conf->lazyload ? 'true' : 'false', ',',
 	'sticky_post:', FreshRSS_Context::isStickyPostEnabled() ? 'true' : 'false', ',',
 	'html5_notif_timeout:', FreshRSS_Context::$user_conf->html5_notif_timeout, ',',
-	'auth_type:"', $conf->general['auth_type'], '",',
+	'auth_type:"', FreshRSS_Context::$system_conf->auth_type, '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
 	'current_view:"', Minz_Request::param('output', 'normal'), '"',
 "},\n";
diff --git a/data/config.default.php b/data/config.default.php
index a69d8050b..193ac5726 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -1,19 +1,17 @@
 <?php
 
 return array(
-	'general' => array(
-		'environment' => 'production',
-		'salt' => '',
-		'base_url' => '',
-		'language' => 'en',
-		'title' => 'FreshRSS',
-		'default_user' => '_',
-		'allow_anonymous' => false,
-		'allow_anonymous_refresh' => false,
-		'auth_type' => 'none',
-		'api_enabled' => false,
-		'unsafe_autologin_enabled' => false,
-	),
+	'environment' => 'production',
+	'salt' => '',
+	'base_url' => '',
+	'language' => 'en',
+	'title' => 'FreshRSS',
+	'default_user' => '_',
+	'allow_anonymous' => false,
+	'allow_anonymous_refresh' => false,
+	'auth_type' => 'none',
+	'api_enabled' => false,
+	'unsafe_autologin_enabled' => false,
 	'limits' => array(
 		'cache_duration' => 800,
 		'timeout' => 10,
diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php
index 6af23a566..3eadc6d98 100644
--- a/lib/Minz/Error.php
+++ b/lib/Minz/Error.php
@@ -83,7 +83,7 @@ class Minz_Error {
 	 */
 	private static function processLogs ($logs) {
 		$conf = Minz_Configuration::get('system');
-		$env = $conf->general['environment'];
+		$env = $conf->environment;
 		$logs_ok = array ();
 		$error = array ();
 		$warning = array ();
diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php
index 974cf4260..f9eff3db6 100644
--- a/lib/Minz/FrontController.php
+++ b/lib/Minz/FrontController.php
@@ -116,7 +116,7 @@ class Minz_FrontController {
 
 	private function setReporting() {
 		$conf = Minz_Configuration::get('system');
-		switch($conf->general['environment']) {
+		switch($conf->environment) {
 		case 'production':
 			error_reporting(E_ALL);
 			ini_set('display_errors','Off');
diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php
index 2063efe7e..2a9e10993 100644
--- a/lib/Minz/Log.php
+++ b/lib/Minz/Log.php
@@ -33,7 +33,7 @@ class Minz_Log {
 	public static function record ($information, $level, $file_name = null) {
 		try {
 			$conf = Minz_Configuration::get('system');
-			$env = $conf->general['environment'];
+			$env = $conf->environment;
 		} catch (Minz_ConfigurationException $e) {
 			$env = 'production';
 		}
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 5f2f6a858..6db2e9c7a 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -97,7 +97,7 @@ class Minz_Request {
 	 */
 	public static function getBaseUrl() {
 		$conf = Minz_Configuration::get('system');
-		$defaultBaseUrl = $conf->general['base_url'];
+		$defaultBaseUrl = $conf->base_url;
 		if (!empty($defaultBaseUrl)) {
 			return $defaultBaseUrl;
 		} elseif (isset($_SERVER['REQUEST_URI'])) {
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index 7525e95cc..39200e81f 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -29,7 +29,7 @@ class Minz_Translate {
 	 */
 	public static function init() {
 		$conf = Minz_Configuration::get('system');
-		$l = $conf->general['language'];
+		$l = $conf->language;
 		self::$lang_name = Minz_Session::param('language', $l);
 		self::$lang_path = APP_PATH . '/i18n/' . self::$lang_name . '/';
 	}
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index 24ad630d0..481b0376d 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -30,7 +30,7 @@ class Minz_View {
 		                   Minz_Request::actionName());
 
 		$conf = Minz_Configuration::get('system');
-		self::$title = $conf->general['title'];
+		self::$title = $conf->title;
 	}
 
 	/**

From 5f9672111f86c693d843138c00934a6c3eeede45 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 20:50:58 +0100
Subject: [PATCH 263/363] Fix last calls to Minz_Configuration methods

- We have still to fix actualize_script and greader api (refactoring?)
- We have to fix the FreshRSS_Configuration calls
- We have to fix availableLanguages calls

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/authController.php  |  7 +++----
 app/Models/Auth.php                 | 14 +++++++++++--
 app/Models/EntryDAO.php             |  2 +-
 app/Models/UserDAO.php              |  4 ++--
 app/layout/aside_feed.phtml         |  2 +-
 app/layout/header.phtml             |  6 +++---
 app/layout/layout.phtml             |  1 -
 app/layout/nav_menu.phtml           |  2 +-
 app/views/auth/index.phtml          | 32 ++++++++++++++---------------
 app/views/helpers/export/opml.phtml |  2 +-
 app/views/index/index.phtml         |  2 +-
 app/views/user/profile.phtml        |  2 +-
 12 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 4ae9ff7fb..02b8119e9 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -310,7 +310,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		}
 
 		// TODO #730
-		$conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
+		$conf = new FreshRSS_Configuration(FreshRSS_Context::$system_conf->default_user);
 		// Admin user must have set its master password.
 		if (!$conf->passwordHash) {
 			$this->view->message = array(
@@ -334,9 +334,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			);
 
 			if ($ok) {
-				// TODO #730
-				Minz_Configuration::_authType('form');
-				$ok = Minz_Configuration::writeFile();
+				FreshRSS_Context::$system_conf->auth_type = 'form';
+				$ok = FreshRSS_Context::$system_conf->save();
 
 				if ($ok) {
 					Minz_Request::good(_t('feedback.auth.form.set'));
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 05ec61d0e..917e151ca 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -158,7 +158,16 @@ class FreshRSS_Auth {
 	/**
 	 * Return if authentication is enabled on this instance of FRSS.
 	 */
-	public static function accessNeedLogin() {
+	public static function accessNeedsLogin() {
+		$conf = Minz_Configuration::get('system');
+		$auth_type = $conf->auth_type;
+		return $auth_type !== 'none';
+	}
+
+	/**
+	 * Return if authentication requires a PHP action.
+	 */
+	public static function accessNeedsAction() {
 		$conf = Minz_Configuration::get('system');
 		$auth_type = $conf->auth_type;
 		return $auth_type === 'form' || $auth_type === 'persona';
@@ -206,7 +215,8 @@ class FreshRSS_FormAuth {
 
 	public static function makeCookie($username, $password_hash) {
 		do {
-			$token = sha1(Minz_Configuration::salt() . $username . uniqid(mt_rand(), true));
+			$conf = Minz_Configuration::get('system');
+			$token = sha1($conf->salt . $username . uniqid(mt_rand(), true));
 			$token_file = DATA_PATH . '/tokens/' . $token . '.txt';
 		} while (file_exists($token_file));
 
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 4d06ac028..61beeea13 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -586,7 +586,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	}
 
 	public function size($all = false) {
-		$db = Minz_Configuration::dataBase();
+		$db = FreshRSS_Context::$system_conf->db;
 		$sql = 'SELECT SUM(data_length + index_length) FROM information_schema.TABLES WHERE table_schema=?';	//MySQL
 		$values = array($db['base']);
 		if (!$all) {
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 6514080bc..b55766ab4 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -2,7 +2,7 @@
 
 class FreshRSS_UserDAO extends Minz_ModelPdo {
 	public function createUser($username) {
-		$db = Minz_Configuration::dataBase();
+		$db = FreshRSS_Context::$system_conf->db;
 		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 		$userPDO = new Minz_ModelPdo($username);
@@ -34,7 +34,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 	}
 
 	public function deleteUser($username) {
-		$db = Minz_Configuration::dataBase();
+		$db = FreshRSS_Context::$system_conf->db;
 		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 		if ($db['type'] === 'sqlite') {
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index a384455b4..d2612e751 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -15,7 +15,7 @@
 		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.menu.subscription'); ?></a>
 		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
 	</div>
-	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
+	<?php } elseif (FreshRSS_Auth::accessNeedsLogin()) { ?>
 	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
 	<?php } ?>
 
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 97e24a1d9..0c2e171dd 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -1,6 +1,6 @@
 <?php
 
-if (FreshRSS_Auth::accessNeedLogin()) {
+if (FreshRSS_Auth::accessNeedsAction()) {
 	?><ul class="nav nav-head nav-login"><?php
 		if (FreshRSS_Auth::hasAccess()) {
 			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('gen.auth.logout'); ?></a></li><?php
@@ -77,14 +77,14 @@ if (FreshRSS_Auth::accessNeedLogin()) {
 				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('gen.menu.logs'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.menu.about'); ?></a></li>
 				<?php
-				if (FreshRSS_Auth::accessNeedLogin()) {
+				if (FreshRSS_Auth::accessNeedsAction()) {
 					?><li class="separator"></li>
 				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('gen.auth.logout'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
 	</div>
-	<?php } elseif (FreshRSS_Auth::accessNeedLogin()) { ?>
+	<?php } elseif (FreshRSS_Auth::accessNeedsAction()) { ?>
 	<div class="item configure">
 		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a>
 	</div>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index ed8029fe0..083ffd4b3 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -10,7 +10,6 @@
 <?php $this->renderHelper('javascript_vars'); ?>
 		//]]></script>
 <?php
-	$conf = Minz_Configuration::get('system');
 	$url_base = Minz_Request::currentRequest();
 	if (FreshRSS_Context::$next_id !== '') {
 		$url_next = $url_base;
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index eeadb622b..d35a0b5fb 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -193,7 +193,7 @@
 		<?php echo _i($icon); ?>
 	</a>
 	
-	<?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymousRefresh()) { ?>
+	<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous_refresh) { ?>
 	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('gen.action.actualize'); ?>"><?php echo _i('refresh'); ?></a>
 	<?php } ?>
 </div>
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index bb07cc2af..f7a862ac9 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -10,13 +10,13 @@
 			<label class="group-name" for="auth_type"><?php echo _t('admin.auth.type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type" required="required">
-					<?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?>
+					<?php if (!in_array(FreshRSS_Context::$system_conf->auth_type, array('form', 'persona', 'http_auth', 'none'))) { ?>
 						<option selected="selected"></option>
 					<?php } ?>
-					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('admin.auth.form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$user_conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.persona'); ?></option>
-					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.http'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('admin.auth.none'); ?></option>
+					<option value="form"<?php echo FreshRSS_Context::$system_conf->auth_type === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('admin.auth.form'); ?></option>
+					<option value="persona"<?php echo FreshRSS_Context::$system_conf->auth_type === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$user_conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.persona'); ?></option>
+					<option value="http_auth"<?php echo FreshRSS_Context::$system_conf->auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.http'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo FreshRSS_Context::$system_conf->auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('admin.auth.none'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -24,9 +24,9 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="anon_access">
-					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : '',
-						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('admin.auth.allow_anonymous', Minz_Configuration::defaultUser()); ?>
+					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo FreshRSS_Context::$system_conf->allow_anonymous ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('admin.auth.allow_anonymous', FreshRSS_Context::$system_conf->default_user); ?>
 				</label>
 			</div>
 		</div>
@@ -34,8 +34,8 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="anon_refresh">
-					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo Minz_Configuration::allowAnonymousRefresh() ? ' checked="checked"' : '',
-						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
+					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo FreshRSS_Context::$system_conf->allow_anonymous_refresh ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
 					<?php echo _t('admin.auth.allow_anonymous_refresh'); ?>
 				</label>
 			</div>
@@ -44,21 +44,21 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="unsafe_autologin">
-					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
-						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
+					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo FreshRSS_Context::$system_conf->unsafe_autologin_enabled ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
 					<?php echo _t('admin.auth.unsafe_autologin'); ?>
 					<kbd><?php echo Minz_Url::display(array('c' => 'auth', 'a' => 'login', 'params' => array('u' => 'alice', 'p' => '1234')), 'html', true); ?></kbd>
 				</label>
 			</div>
 		</div>
 
-		<?php if (Minz_Configuration::canLogIn()) { ?>
+		<?php if (FreshRSS_Auth::accessNeedsAction()) { ?>
 		<div class="form-group">
 			<label class="group-name" for="token"><?php echo _t('admin.auth.token'); ?></label>
 			<?php $token = FreshRSS_Context::$user_conf->token; ?>
 			<div class="group-controls">
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
-					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
+					echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
 				<?php echo _i('help'); ?> <?php echo _t('admin.auth.token_help'); ?>
 				<kbd><?php echo Minz_Url::display(array('params' => array('output' => 'rss', 'token' => $token)), 'html', true); ?></kbd>
 			</div>
@@ -68,8 +68,8 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="api_enabled">
-					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo Minz_Configuration::apiEnabled() ? ' checked="checked"' : '',
-						Minz_Configuration::needsLogin() ? '' : ' disabled="disabled"'; ?> />
+					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo FreshRSS_Context::$system_conf->api_enabled ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsLogin() ? '' : ' disabled="disabled"'; ?> />
 					<?php echo _t('admin.auth.api_enabled'); ?>
 				</label>
 			</div>
diff --git a/app/views/helpers/export/opml.phtml b/app/views/helpers/export/opml.phtml
index 8622d9144..236cca303 100644
--- a/app/views/helpers/export/opml.phtml
+++ b/app/views/helpers/export/opml.phtml
@@ -2,7 +2,7 @@
 
 $opml_array = array(
 	'head' => array(
-		'title' => Minz_Configuration::title(),
+		'title' => FreshRSS_Context::$system_conf->title,
 		'dateCreated' => date('D, d M Y H:i:s')
 	),
 	'body' => array()
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 8b93461dd..8b94c7f7d 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -2,7 +2,7 @@
 
 $output = Minz_Request::param('output', 'normal');
 
-if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymous()) {
+if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) {
 	if ($output === 'normal') {
 		$this->renderHelper('view/normal_view');
 	} elseif ($output === 'reader') {
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index a3f7bf15d..d85499ad8 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -28,7 +28,7 @@
 			</div>
 		</div>
 
-		<?php if (Minz_Configuration::apiEnabled()) { ?>
+		<?php if (FreshRSS_Context::$system_conf->api_enabled) { ?>
 		<div class="form-group">
 			<label class="group-name" for="apiPasswordPlain"><?php echo _t('conf.profile.password_api'); ?></label>
 			<div class="group-controls">

From addcea9cd45a87f2ae56f879bad86425efc16fba Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 21:10:51 +0100
Subject: [PATCH 264/363] Fix i18n loading and availableLanguages calls

- Change the way to init i18n
- Add a availableLanguages() method to Minz_Translate

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/FreshRSS.php                  | 18 ++++++++++++++----
 app/views/configure/display.phtml |  2 +-
 app/views/user/manage.phtml       |  2 +-
 lib/Minz/Session.php              |  2 +-
 lib/Minz/Translate.php            | 31 +++++++++++++++++++++++--------
 5 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index a53174394..7b5df7ced 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -31,15 +31,25 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
-		// Init i18n.
-		Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
-		Minz_Translate::init();
-
+		$this->initI18n();
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
 	}
 
+	private function initI18n() {
+		$lang = Minz_Session::param('language');
+		if ($lang === false) {
+			Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
+			$lang = FreshRSS_Context::$user_conf->language;
+		}
+
+		Minz_Translate::init(array(
+			'en' => 'English',
+			'fr' => 'Français',
+		), $lang);
+	}
+
 	private function loadStylesAndScripts() {
 		$theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme);
 		if ($theme) {
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index b68bf925b..36a075ea7 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -10,7 +10,7 @@
 			<label class="group-name" for="language"><?php echo _t('conf.display.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php $languages = FreshRSS_Context::$user_conf->availableLanguages(); ?>
+				<?php $languages = Minz_Translate::availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
 				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$user_conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 6e472ca0b..11c42a857 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -10,7 +10,7 @@
 			<label class="group-name" for="new_user_language"><?php echo _t('admin.user.language'); ?></label>
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
-				<?php $languages = FreshRSS_Context::$user_conf->availableLanguages(); ?>
+				<?php $languages = Minz_Translate::availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
 				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$user_conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index af4de75bb..cfe8debe9 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -55,7 +55,7 @@ class Minz_Session {
 
 		if (!$force) {
 			self::_param('language', $language);
-			Minz_Translate::reset();
+			Minz_Translate::reset($language);
 		}
 	}
 
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index 39200e81f..1b4102ca9 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -9,6 +9,11 @@
  * It uses files in `./app/i18n/`
  */
 class Minz_Translate {
+	/**
+	 * $lang_list is the list of available languages.
+	 */
+	private static $lang_list = array();
+
 	/**
 	 * $lang_name is the name of the current language to use.
 	 */
@@ -25,20 +30,30 @@ class Minz_Translate {
 	private static $translates = array();
 
 	/**
-	 * Load $lang_name and $lang_path based on configuration and selected language.
+	 * Init the translation object.
+	 * @param $lang_list the list of available languages.
+	 * @param $lang_name the lang to show.
 	 */
-	public static function init() {
-		$conf = Minz_Configuration::get('system');
-		$l = $conf->language;
-		self::$lang_name = Minz_Session::param('language', $l);
+	public static function init($lang_list, $lang_name) {
+		self::$lang_list = $lang_list;
+		self::$lang_name = $lang_name;
 		self::$lang_path = APP_PATH . '/i18n/' . self::$lang_name . '/';
 	}
 
 	/**
-	 * Alias for init().
+	 * Reset the translation object with a new language.
+	 * @param $lang_name the new language to use
 	 */
-	public static function reset() {
-		self::init();
+	public static function reset($lang_name) {
+		self::init(self::$lang_list, $lang_name);
+	}
+
+	/**
+	 * Return the list of available languages.
+	 * @return an array.
+	 */
+	public static function availableLanguages() {
+		return self::$lang_list;
 	}
 
 	/**

From 17a280230f1e47d092d8e22bc5d1041e7a84979f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 21:16:33 +0100
Subject: [PATCH 265/363] Change Minz_Configuration::parseFile() in load()

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 lib/Minz/Configuration.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 66df21a31..039ba9645 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -39,7 +39,7 @@ class Minz_Configuration {
 	 * @return an array of values
 	 * @throws Minz_FileNotExistException if the file does not exist.
 	 */
-	public static function parseFile($filename) {
+	public static function load($filename) {
 		if (!file_exists($filename)) {
 			throw new Minz_FileNotExistException($filename);
 		}
@@ -106,7 +106,7 @@ class Minz_Configuration {
 		$this->config_filename = $config_filename;
 
 		try {
-			$this->data = self::parseFile($this->config_filename);
+			$this->data = self::load($this->config_filename);
 		} catch (Minz_FileNotExistException $e) {
 			if (is_null($default_filename)) {
 				throw $e;
@@ -115,7 +115,7 @@ class Minz_Configuration {
 
 		$this->default_filename = $default_filename;
 		if (!is_null($this->default_filename)) {
-			$this->data_default = self::parseFile($this->default_filename);
+			$this->data_default = self::load($this->default_filename);
 		}
 	}
 

From dd41642ce617ccf873974d884043c21c1fe10223 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 21:40:19 +0100
Subject: [PATCH 266/363] Fix calls to FreshRSS_Configuration

Replaced by a get_user_configuration() function in lib_rss.
This function register a new configuration based on the given username
and return the corresponding configuration.

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/authController.php       | 33 ++++++++++--------------
 app/Controllers/javascriptController.php |  2 +-
 lib/lib_rss.php                          | 23 +++++++++++++++++
 3 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 02b8119e9..e1f895412 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -121,12 +121,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			$username = Minz_Request::param('username', '');
 			$challenge = Minz_Request::param('challenge', '');
 
-			// TODO #730: change the way to get the configuration
-			try {
-				$conf = new FreshRSS_Configuration($username);
-			} catch(Minz_Exception $e) {
-				// $username is not a valid user, nor the configuration file!
-				Minz_Log::warning('Login failure: ' . $e->getMessage());
+			$conf = get_user_configuration($username);
+			if (is_null($conf)) {
 				Minz_Request::bad(_t('feedback.auth.login.invalid'),
 				                  array('c' => 'auth', 'a' => 'login'));
 			}
@@ -167,12 +163,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				return;
 			}
 
-			// TODO #730: change the way to get the configuration
-			try {
-				$conf = new FreshRSS_Configuration($username);
-			} catch(Minz_Exception $e) {
-				// $username is not a valid user, nor the configuration file!
-				Minz_Log::warning('Login failure: ' . $e->getMessage());
+			$conf = get_user_configuration($username);
+			if (is_null($conf)) {
 				return;
 			}
 
@@ -240,14 +232,12 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 					$persona_file = DATA_PATH . '/persona/' . $email . '.txt';
 					if (($current_user = @file_get_contents($persona_file)) !== false) {
 						$current_user = trim($current_user);
-						// TODO #730: change the way to get the configuration
-						try {
-							$conf = new FreshRSS_Configuration($current_user);
+						$conf = get_user_configuration($current_user);
+						if (!is_null($conf)) {
 							$login_ok = strcasecmp($email, $conf->mail_login) === 0;
-						} catch (Minz_Exception $e) {
-							//Permission denied or conf file does not exist
+						} else {
 							$reason = 'Invalid configuration for user ' .
-							          '[' . $current_user . '] ' . $e->getMessage();
+							          '[' . $current_user . ']';
 						}
 					}
 				} else {
@@ -309,8 +299,11 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			return;
 		}
 
-		// TODO #730
-		$conf = new FreshRSS_Configuration(FreshRSS_Context::$system_conf->default_user);
+		$conf = get_user_configuration(FreshRSS_Context::$system_conf->default_user);
+		if (is_null($conf)) {
+			return;
+		}
+
 		// Admin user must have set its master password.
 		if (!$conf->passwordHash) {
 			$this->view->message = array(
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index acd3fef69..421cf6f72 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -29,7 +29,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 		if (ctype_alnum($user)) {
 			try {
 				$salt = FreshRSS_Context::$system_conf->salt;
-				$conf = new FreshRSS_Configuration($user);
+				$conf = get_user_configuration($user);
 				$s = $conf->passwordHash;
 				if (strlen($s) >= 60) {
 					$this->view->salt1 = substr($s, 0, 29);	//CRYPT_BLOWFISH Salt: "$2a$", a two digit cost parameter, "$", and 22 characters from the alphabet "./0-9A-Za-z".
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 3a929631e..8bfc6eb10 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -237,6 +237,29 @@ function listUsers() {
 	return $final_list;
 }
 
+
+/**
+ * Register and return the configuration for a given user.
+ *
+ * Note this function has been created to generate temporary configuration
+ * objects. If you need a long-time configuration, please don't use this function.
+ *
+ * @param $username the name of the user of which we want the configuration.
+ * @return a Minz_Configuration object, null if the configuration cannot be loaded.
+ */
+function get_user_configuration($username) {
+	$namespace = time() . '_user_' . $username;
+	try {
+		Minz_Configuration::register($namespace,
+		                             join_path(USERS_PATH, $username, 'config.php'),
+		                             join_path(USERS_PATH, '_', 'config.default.php'));
+		return Minz_Configuration::get($namespace);
+	} catch(Minz_ConfigurationException $e) {
+		return null;
+	}
+}
+
+
 function httpAuthUser() {
 	return isset($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'] : '';
 }

From eff804572f449a1072274eb6623709b162db4da9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 21:54:46 +0100
Subject: [PATCH 267/363] Fix setters on $user_conf

Old setters does not exist anymore, remove them.

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/authController.php      |  2 +-
 app/Controllers/configureController.php | 77 ++++++++++++-------------
 app/Controllers/userController.php      |  6 +-
 3 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index e1f895412..9a11bedc4 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -29,7 +29,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 
 			$current_token = FreshRSS_Context::$user_conf->token;
 			$token = Minz_Request::param('token', $current_token);
-			FreshRSS_Context::$user_conf->_token($token);
+			FreshRSS_Context::$user_conf->token = $token;
 			$ok &= FreshRSS_Context::$user_conf->save();
 
 			$anon = Minz_Request::param('anon_access', false);
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 6e7a40ea6..38ccd2b2d 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -41,24 +41,24 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function displayAction() {
 		if (Minz_Request::isPost()) {
-			FreshRSS_Context::$user_conf->_language(Minz_Request::param('language', 'en'));
-			FreshRSS_Context::$user_conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
-			FreshRSS_Context::$user_conf->_content_width(Minz_Request::param('content_width', 'thin'));
-			FreshRSS_Context::$user_conf->_topline_read(Minz_Request::param('topline_read', false));
-			FreshRSS_Context::$user_conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
-			FreshRSS_Context::$user_conf->_topline_date(Minz_Request::param('topline_date', false));
-			FreshRSS_Context::$user_conf->_topline_link(Minz_Request::param('topline_link', false));
-			FreshRSS_Context::$user_conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
-			FreshRSS_Context::$user_conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
-			FreshRSS_Context::$user_conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
-			FreshRSS_Context::$user_conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
-			FreshRSS_Context::$user_conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
-			FreshRSS_Context::$user_conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
-			FreshRSS_Context::$user_conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
+			FreshRSS_Context::$user_conf->language = Minz_Request::param('language', 'en');
+			FreshRSS_Context::$user_conf->theme = Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme);
+			FreshRSS_Context::$user_conf->content_width = Minz_Request::param('content_width', 'thin');
+			FreshRSS_Context::$user_conf->topline_read = Minz_Request::param('topline_read', false);
+			FreshRSS_Context::$user_conf->topline_favorite = Minz_Request::param('topline_favorite', false);
+			FreshRSS_Context::$user_conf->topline_date = Minz_Request::param('topline_date', false);
+			FreshRSS_Context::$user_conf->topline_link = Minz_Request::param('topline_link', false);
+			FreshRSS_Context::$user_conf->bottomline_read = Minz_Request::param('bottomline_read', false);
+			FreshRSS_Context::$user_conf->bottomline_favorite = Minz_Request::param('bottomline_favorite', false);
+			FreshRSS_Context::$user_conf->bottomline_sharing = Minz_Request::param('bottomline_sharing', false);
+			FreshRSS_Context::$user_conf->bottomline_tags = Minz_Request::param('bottomline_tags', false);
+			FreshRSS_Context::$user_conf->bottomline_date = Minz_Request::param('bottomline_date', false);
+			FreshRSS_Context::$user_conf->bottomline_link = Minz_Request::param('bottomline_link', false);
+			FreshRSS_Context::$user_conf->html5_notif_timeout = Minz_Request::param('html5_notif_timeout', 0);
 			FreshRSS_Context::$user_conf->save();
 
 			Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
-			Minz_Translate::reset();
+			Minz_Translate::reset(FreshRSS_Context::$user_conf->language);
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('feedback.conf.updated'),
@@ -100,29 +100,26 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function readingAction() {
 		if (Minz_Request::isPost()) {
-			FreshRSS_Context::$user_conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
-			FreshRSS_Context::$user_conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
-			FreshRSS_Context::$user_conf->_default_view(Minz_Request::param('default_view', 'adaptive'));
-			FreshRSS_Context::$user_conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
-			FreshRSS_Context::$user_conf->_display_posts(Minz_Request::param('display_posts', false));
-			FreshRSS_Context::$user_conf->_display_categories(Minz_Request::param('display_categories', false));
-			FreshRSS_Context::$user_conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
-			FreshRSS_Context::$user_conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
-			FreshRSS_Context::$user_conf->_lazyload(Minz_Request::param('lazyload', false));
-			FreshRSS_Context::$user_conf->_sticky_post(Minz_Request::param('sticky_post', false));
-			FreshRSS_Context::$user_conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
-			FreshRSS_Context::$user_conf->_auto_remove_article(Minz_Request::param('auto_remove_article', false));
-			FreshRSS_Context::$user_conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
-			FreshRSS_Context::$user_conf->_mark_when(array(
+			FreshRSS_Context::$user_conf->posts_per_page = Minz_Request::param('posts_per_page', 10);
+			FreshRSS_Context::$user_conf->view_mode = Minz_Request::param('view_mode', 'normal');
+			FreshRSS_Context::$user_conf->default_view = Minz_Request::param('default_view', 'adaptive');
+			FreshRSS_Context::$user_conf->auto_load_more = Minz_Request::param('auto_load_more', false);
+			FreshRSS_Context::$user_conf->display_posts = Minz_Request::param('display_posts', false);
+			FreshRSS_Context::$user_conf->display_categories = Minz_Request::param('display_categories', false);
+			FreshRSS_Context::$user_conf->hide_read_feeds = Minz_Request::param('hide_read_feeds', false);
+			FreshRSS_Context::$user_conf->onread_jump_next = Minz_Request::param('onread_jump_next', false);
+			FreshRSS_Context::$user_conf->lazyload = Minz_Request::param('lazyload', false);
+			FreshRSS_Context::$user_conf->sticky_post = Minz_Request::param('sticky_post', false);
+			FreshRSS_Context::$user_conf->reading_confirm = Minz_Request::param('reading_confirm', false);
+			FreshRSS_Context::$user_conf->auto_remove_article = Minz_Request::param('auto_remove_article', false);
+			FreshRSS_Context::$user_conf->sort_order = Minz_Request::param('sort_order', 'DESC');
+			FreshRSS_Context::$user_conf->mark_when = array(
 				'article' => Minz_Request::param('mark_open_article', false),
 				'site' => Minz_Request::param('mark_open_site', false),
 				'scroll' => Minz_Request::param('mark_scroll', false),
 				'reception' => Minz_Request::param('mark_upon_reception', false),
-			));
+			);
 			FreshRSS_Context::$user_conf->save();
-
-			Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
-			Minz_Translate::reset();
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('feedback.conf.updated'),
@@ -142,7 +139,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
 			$params = Minz_Request::params();
-			FreshRSS_Context::$user_conf->_sharing($params['share']);
+			FreshRSS_Context::$user_conf->sharing = $params['share'];
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
@@ -184,7 +181,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				}
 			}
 
-			FreshRSS_Context::$user_conf->_shortcuts($shortcuts_ok);
+			FreshRSS_Context::$user_conf->shortcuts = $shortcuts_ok;
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
@@ -212,9 +209,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
-			FreshRSS_Context::$user_conf->_old_entries(Minz_Request::param('old_entries', 3));
-			FreshRSS_Context::$user_conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
-			FreshRSS_Context::$user_conf->_ttl_default(Minz_Request::param('ttl_default', -2));
+			FreshRSS_Context::$user_conf->old_entries = Minz_Request::param('old_entries', 3);
+			FreshRSS_Context::$user_conf->keep_history_default = Minz_Request::param('keep_history_default', 0);
+			FreshRSS_Context::$user_conf->ttl_default = Minz_Request::param('ttl_default', -2);
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
@@ -252,7 +249,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					$query['name'] = _t('conf.query.number', $key + 1);
 				}
 			}
-			FreshRSS_Context::$user_conf->_queries($queries);
+			FreshRSS_Context::$user_conf->queries = $queries;
 			FreshRSS_Context::$user_conf->save();
 
 			Minz_Request::good(_t('feedback.conf.updated'),
@@ -338,7 +335,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			}
 		}
 		$queries[] = $query;
-		FreshRSS_Context::$user_conf->_queries($queries);
+		FreshRSS_Context::$user_conf->queries = $queries;
 		FreshRSS_Context::$user_conf->save();
 
 		Minz_Request::good(_t('feedback.conf.query_created', $query['name']),
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index bfc2dfb3b..c3c6e06d9 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -39,7 +39,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				FreshRSS_Context::$user_conf->_passwordHash($passwordHash);
+				FreshRSS_Context::$user_conf->passwordHash = $passwordHash;
 			}
 			Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash);
 
@@ -52,12 +52,12 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				FreshRSS_Context::$user_conf->_apiPasswordHash($passwordHash);
+				FreshRSS_Context::$user_conf->apiPasswordHash = $passwordHash;
 			}
 
 			// TODO: why do we need of hasAccess here?
 			if (FreshRSS_Auth::hasAccess('admin')) {
-				FreshRSS_Context::$user_conf->_mail_login(Minz_Request::param('mail_login', '', true));
+				FreshRSS_Context::$user_conf->mail_login = Minz_Request::param('mail_login', '', true);
 			}
 			$email = FreshRSS_Context::$user_conf->mail_login;
 			Minz_Session::_param('mail', $email);

From 5cdfd6d493705eed93481ff945e8a84cbcff92f7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 22:12:48 +0100
Subject: [PATCH 268/363] Fix and improve actualize_script

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/actualize_script.php | 52 +++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index e8bc67c10..cc2a88c51 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -12,21 +12,36 @@ if (defined('STDOUT')) {
 	fwrite(STDOUT, 'Starting feed actualization at ' . $begin_date->format('c') . "\n");	//Unbuffered
 }
 
-Minz_Configuration::init();
 
+// Set the header params ($_GET) to call the FRSS application.
+$_GET['c'] = 'feed';
+$_GET['a'] = 'actualize';
+$_GET['ajax'] = 1;
+$_GET['force'] = true;
+$_SERVER['HTTP_HOST'] = '';
+
+
+$app = new FreshRSS();
+$app->init();
+
+$system_conf = Minz_Configuration::get('system');
+$system_conf->auth_type = 'none';  // avoid necessity to be logged in (not saved!)
+
+// Create the list of users to actualize.
+// Users are processed in a random order but always start with admin
 $users = listUsers();
-shuffle($users);	//Process users in random order
-
-if (Minz_Configuration::defaultUser() !== ''){
-	array_unshift($users, Minz_Configuration::defaultUser());	//But always start with admin
+shuffle($users);
+if ($system_conf->default_user !== ''){
+	array_unshift($users, $system_conf->default_user);
 	$users = array_unique($users);
 }
 
-$limits = Minz_Configuration::limits();
-$minLastActivity = time() - $limits['max_inactivity'];
 
+$limits = $system_conf->limits;
+$minLastActivity = time() - $limits['max_inactivity'];
 foreach ($users as $myUser) {
-	if (($myUser !== Minz_Configuration::defaultUser()) && (FreshRSS_UserDAO::mtime($myUser) < $minLastActivity)) {
+	if (($myUser !== $system_conf->default_user) &&
+			(FreshRSS_UserDAO::mtime($myUser) < $minLastActivity)) {
 		syslog(LOG_INFO, 'FreshRSS skip inactive user ' . $myUser);
 		if (defined('STDOUT')) {
 			fwrite(STDOUT, 'FreshRSS skip inactive user ' . $myUser . "\n");	//Unbuffered
@@ -39,31 +54,20 @@ foreach ($users as $myUser) {
 	}
 	echo $myUser, ' ';	//Buffered
 
-	$_GET['c'] = 'feed';
-	$_GET['a'] = 'actualize';
-	$_GET['ajax'] = 1;
-	$_GET['force'] = true;
-	$_SERVER['HTTP_HOST'] = '';
 
-	$freshRSS = new FreshRSS();
-
-	Minz_Configuration::_authType('none');
-
-	Minz_Session::init('FreshRSS');
 	Minz_Session::_param('currentUser', $myUser);
+	$app->run();
 
-	$freshRSS->init();
-	$freshRSS->run();
 
 	if (!invalidateHttpCache()) {
-		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . USERS_PATH . '/*/log.txt!');
+		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . join_path(USERS_PATH, $myUser, 'log.txt'));
 		if (defined('STDERR')) {
-			fwrite(STDERR, 'Write access problem in ' . USERS_PATH . '/*/log.txt!' . "\n");
+			fwrite(STDERR, 'Write access problem in ' . join_path(USERS_PATH, $myUser, 'log.txt') . "\n");
 		}
 	}
-	Minz_Session::unset_session(true);
-	Minz_ModelPdo::clean();
 }
+
+
 syslog(LOG_INFO, 'FreshRSS actualize done.');
 if (defined('STDOUT')) {
 	fwrite(STDOUT, 'Done.' . "\n");

From ff1e989de1ff2c0b42a358a93b407a936acb9fbc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 22:14:14 +0100
Subject: [PATCH 269/363] Fix a call to availableLanguages() (bad object)

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/userController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index c3c6e06d9..ed01b83c5 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -109,7 +109,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$user_conf->language);
-			$languages = FreshRSS_Context::$user_conf->availableLanguages();
+			$languages = Minz_Translate::availableLanguages();
 			if (!isset($languages[$new_user_language])) {
 				$new_user_language = FreshRSS_Context::$user_conf->language;
 			}

From ce9298439b882d64c403eded1575db8f029aa389 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 22:15:51 +0100
Subject: [PATCH 270/363] Fix a call to $system_conf

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/authController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 9a11bedc4..937c0759d 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -52,7 +52,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				FreshRSS_Context::$system_conf->unsafe_autologin_enabled = $unsafe_autologin;
 				FreshRSS_Context::$system_conf->api_enabled = $api_enabled;
 
-				$ok &= $system_conf->save();
+				$ok &= FreshRSS_Context::$system_conf->save();
 			}
 
 			invalidateHttpCache();

From 8e6ab12e89504e3c44f766d319ac00cc7d58810a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 22:43:24 +0100
Subject: [PATCH 271/363] Fix a bug in FreshRSS_Auth::giveAccess()

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Models/Auth.php | 6 +++---
 lib/lib_rss.php     | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 917e151ca..4e7a71947 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -82,11 +82,11 @@ class FreshRSS_Auth {
 	 * Gives access to the current user.
 	 */
 	public static function giveAccess() {
-		$user_conf = Minz_Configuration::get('user');
+		$current_user = Minz_Session::param('currentUser');
+		$user_conf = get_user_configuration($current_user);
 		$system_conf = Minz_Configuration::get('system');
-		$auth_type = $system_conf->auth_type;
 
-		switch ($auth_type) {
+		switch ($system_conf->auth_type) {
 		case 'form':
 			self::$login_ok = Minz_Session::param('passwordHash') === $user_conf->passwordHash;
 			break;
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8bfc6eb10..14b6e854d 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -253,10 +253,14 @@ function get_user_configuration($username) {
 		Minz_Configuration::register($namespace,
 		                             join_path(USERS_PATH, $username, 'config.php'),
 		                             join_path(USERS_PATH, '_', 'config.default.php'));
-		return Minz_Configuration::get($namespace);
-	} catch(Minz_ConfigurationException $e) {
+	} catch (Minz_ConfigurationNamespaceException $e) {
+		// namespace already exists, do nothing.
+	} catch (Minz_FileNotExistException $e) {
+		Minz_Log::warning($e->getMessage());
 		return null;
 	}
+
+	return Minz_Configuration::get($namespace);
 }
 
 

From cf406fc5755322ae1ddb7b8320e3b74a8a383a89 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 23:06:17 +0100
Subject: [PATCH 272/363] Fix a bug of authentication in actualize_script

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/actualize_script.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index cc2a88c51..b498c6a5a 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -56,6 +56,7 @@ foreach ($users as $myUser) {
 
 
 	Minz_Session::_param('currentUser', $myUser);
+	FreshRSS_Auth::giveAccess();
 	$app->run();
 
 

From c96e1d9aec81d4872d4c35d86b7a062389d191d2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 23:07:57 +0100
Subject: [PATCH 273/363] Coding style in actualize_script

---
 app/actualize_script.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index b498c6a5a..c7959be82 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -38,32 +38,32 @@ if ($system_conf->default_user !== ''){
 
 
 $limits = $system_conf->limits;
-$minLastActivity = time() - $limits['max_inactivity'];
-foreach ($users as $myUser) {
-	if (($myUser !== $system_conf->default_user) &&
-			(FreshRSS_UserDAO::mtime($myUser) < $minLastActivity)) {
-		syslog(LOG_INFO, 'FreshRSS skip inactive user ' . $myUser);
+$min_last_activity = time() - $limits['max_inactivity'];
+foreach ($users as $user) {
+	if (($user !== $system_conf->default_user) &&
+			(FreshRSS_UserDAO::mtime($user) < $min_last_activity)) {
+		syslog(LOG_INFO, 'FreshRSS skip inactive user ' . $user);
 		if (defined('STDOUT')) {
-			fwrite(STDOUT, 'FreshRSS skip inactive user ' . $myUser . "\n");	//Unbuffered
+			fwrite(STDOUT, 'FreshRSS skip inactive user ' . $user . "\n");	//Unbuffered
 		}
 		continue;
 	}
-	syslog(LOG_INFO, 'FreshRSS actualize ' . $myUser);
+	syslog(LOG_INFO, 'FreshRSS actualize ' . $user);
 	if (defined('STDOUT')) {
-		fwrite(STDOUT, 'Actualize ' . $myUser . "...\n");	//Unbuffered
+		fwrite(STDOUT, 'Actualize ' . $user . "...\n");	//Unbuffered
 	}
-	echo $myUser, ' ';	//Buffered
+	echo $user, ' ';	//Buffered
 
 
-	Minz_Session::_param('currentUser', $myUser);
+	Minz_Session::_param('currentUser', $user);
 	FreshRSS_Auth::giveAccess();
 	$app->run();
 
 
 	if (!invalidateHttpCache()) {
-		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . join_path(USERS_PATH, $myUser, 'log.txt'));
+		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . join_path(USERS_PATH, $user, 'log.txt'));
 		if (defined('STDERR')) {
-			fwrite(STDERR, 'Write access problem in ' . join_path(USERS_PATH, $myUser, 'log.txt') . "\n");
+			fwrite(STDERR, 'Write access problem in ' . join_path(USERS_PATH, $user, 'log.txt') . "\n");
 		}
 	}
 }

From 60563283cc5594f50fd8943661e03e350e529913 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 23:16:57 +0100
Subject: [PATCH 274/363] Fix greader api script with new config system

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 p/api/greader.php | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 80714d478..30530d60d 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -150,13 +150,12 @@ function authorizationToUserConf() {
 		if (count($headerAuthX) === 2) {
 			$user = $headerAuthX[0];
 			if (ctype_alnum($user)) {
-				try {
-					$conf = new FreshRSS_Configuration($user);
-				} catch (Exception $e) {
-					logMe($e->getMessage() . "\n");
+				$conf = get_user_configuration($user);
+				if (is_null($conf)) {
 					unauthorized();
 				}
-				if ($headerAuthX[1] === sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash)) {
+				$system_conf = Minz_Configuration::get('system');
+				if ($headerAuthX[1] === sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash)) {
 					return $conf;
 				} else {
 					logMe('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1] . "\n");
@@ -177,16 +176,16 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 		if (!function_exists('password_verify')) {
 			include_once(LIB_PATH . '/password_compat.php');
 		}
-		try {
-			$conf = new FreshRSS_Configuration($email);
-		} catch (Exception $e) {
-			logMe($e->getMessage() . "\n");
-			Minz_Log::warning('Invalid API user ' . $email);
+
+		$conf = get_user_configuration($email);
+		if (is_null($conf)) {
 			unauthorized();
 		}
+
 		if ($conf->apiPasswordHash != '' && password_verify($pass, $conf->apiPasswordHash)) {
 			header('Content-Type: text/plain; charset=UTF-8');
-			$auth = $email . '/' . sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash);
+			$system_conf = Minz_Configuration::get('system');
+			$auth = $email . '/' . sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash);
 			echo 'SID=', $auth, "\n",
 				'Auth=', $auth, "\n";
 			exit();
@@ -204,7 +203,8 @@ function token($conf) {
 //http://blog.martindoms.com/2009/08/15/using-the-google-reader-api-part-1/
 //https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
 	logMe('token('. $conf->user . ")\n");	//TODO: Implement real token that expires
-	$token = str_pad(sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
+	$system_conf = Minz_Configuration::get('system');
+	$token = str_pad(sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
 	echo $token, "\n";
 	exit();
 }
@@ -212,7 +212,8 @@ function token($conf) {
 function checkToken($conf, $token) {
 //http://code.google.com/p/google-reader-api/wiki/ActionToken
 	logMe('checkToken(' . $token . ")\n");
-	if ($token === str_pad(sha1(Minz_Configuration::salt() . $conf->user . $conf->apiPasswordHash), 57, 'Z')) {
+	$system_conf = Minz_Configuration::get('system');
+	if ($token === str_pad(sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash), 57, 'Z')) {
 		return true;
 	}
 	unauthorized();
@@ -536,9 +537,11 @@ logMe('----------------------------------------------------------------'."\n");
 $pathInfo = empty($_SERVER['PATH_INFO']) ? '/Error' : urldecode($_SERVER['PATH_INFO']);
 $pathInfos = explode('/', $pathInfo);
 
-Minz_Configuration::init();
-
-if (!Minz_Configuration::apiEnabled()) {
+Minz_Configuration::register('system',
+                             DATA_PATH . '/config.php',
+                             DATA_PATH . '/config.default.php');
+$system_conf = Minz_Configuration::get('system');
+if (!$system_conf->api_enabled) {
 	serviceUnavailable();
 }
 

From ce10f482748c9819d8e372487010f656c3683db8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 6 Jan 2015 23:20:54 +0100
Subject: [PATCH 275/363] Fix a bug in i18n init

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/FreshRSS.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 7b5df7ced..06976c88b 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -38,16 +38,12 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	private function initI18n() {
-		$lang = Minz_Session::param('language');
-		if ($lang === false) {
-			Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
-			$lang = FreshRSS_Context::$user_conf->language;
-		}
+		Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
 
 		Minz_Translate::init(array(
 			'en' => 'English',
 			'fr' => 'Français',
-		), $lang);
+		), FreshRSS_Context::$user_conf->language);
 	}
 
 	private function loadStylesAndScripts() {

From bd199c617081f0354576afd09e9427756873afd2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 10:48:47 +0100
Subject: [PATCH 276/363] If a conf param doesn't exist, log and return null

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 lib/Minz/Configuration.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 039ba9645..06a7b43b0 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -135,9 +135,8 @@ class Minz_Configuration {
 		} elseif (isset($this->data_default[$key])) {
 			return $this->data_default[$key];
 		} else {
-			throw new Minz_ConfigurationParamException(
-				$key . ' param does not exist'
-			);
+			Minz_Log::warning($key . ' does not exist in configuration');
+			return null;
 		}
 	}
 

From 0140448a562b97859be0b9a6e480e1f6aa4d1b1d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 14:59:18 +0100
Subject: [PATCH 277/363] Refactor FreshRSS_Share object to be more usable

- FreshRSS_Share is the only object we manipulate
- Add a way to register new share options easily
- Move some i18n keys from index.php to gen.php

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/FreshRSS.php                  |   3 +
 app/Models/Share.php              | 234 +++++++++++++++++++++++++++---
 app/i18n/en/gen.php               |  11 ++
 app/i18n/en/index.php             |  13 +-
 app/i18n/fr/conf.php              |   2 +-
 app/i18n/fr/gen.php               |  11 ++
 app/i18n/fr/index.php             |  13 +-
 app/views/configure/sharing.phtml |  27 ++--
 app/views/index/normal.phtml      |  28 ++--
 p/scripts/main.js                 |   2 +-
 10 files changed, 273 insertions(+), 71 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 06976c88b..254e35fee 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -32,6 +32,9 @@ class FreshRSS extends Minz_FrontController {
 		FreshRSS_Context::init();
 
 		$this->initI18n();
+
+		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
+
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
diff --git a/app/Models/Share.php b/app/Models/Share.php
index b146db722..db6feda19 100644
--- a/app/Models/Share.php
+++ b/app/Models/Share.php
@@ -1,44 +1,240 @@
 <?php
 
+/**
+ * Manage the sharing options in FreshRSS.
+ */
 class FreshRSS_Share {
+	/**
+	 * The list of available sharing options.
+	 */
+	private static $list_sharing = array();
 
-	static public function generateUrl($options, $selected, $link, $title) {
-		$share = $options[$selected['type']];
+	/**
+	 * Register a new sharing option.
+	 * @param $share_options is an array defining the share option.
+	 */
+	public static function register($share_options) {
+		$type = $share_options['type'];
+
+		if (isset(self::$list_sharing[$type])) {
+			return;
+		}
+
+		$help_url = isset($share_options['help']) ? $share_options['help'] : '';
+		self::$list_sharing[$type] = new FreshRSS_Share(
+			$type, $share_options['url'], $share_options['transform'],
+			$share_options['form'], $help_url
+		);
+	}
+
+	/**
+	 * Register sharing options in a file.
+	 * @param $filename the name of the file to load.
+	 */
+	public static function load($filename) {
+		$shares_from_file = @include($filename);
+		if (!is_array($shares_from_file)) {
+			$shares_from_file = array();
+		}
+
+		foreach ($shares_from_file as $share_type => $share_options) {
+			$share_options['type'] = $share_type;
+			self::register($share_options);
+		}
+	}
+
+	/**
+	 * Return the list of sharing options.
+	 * @return an array of FreshRSS_Share objects.
+	 */
+	public static function enum() {
+		return self::$list_sharing;
+	}
+
+	/**
+	 * Return FreshRSS_Share object related to the given type.
+	 * @param $type the share type, null if $type is not registered.
+	 */
+	public static function get($type) {
+		if (!isset(self::$list_sharing[$type])) {
+			return null;
+		}
+
+		return self::$list_sharing[$type];
+	}
+
+	/**
+	 *
+	 */
+	private $type = '';
+	private $name = '';
+	private $url_transform = '';
+	private $transform = array();
+	private $form_type = 'simple';
+	private $help_url = '';
+	private $custom_name = null;
+	private $base_url = null;
+	private $title = null;
+	private $link = null;
+
+	/**
+	 * Create a FreshRSS_Share object.
+	 * @param $type is a unique string defining the kind of share option.
+	 * @param $url_transform defines the url format to use in order to share.
+	 * @param $transform is an array of transformations to apply on link and title.
+	 * @param $form_type defines which form we have to use to complete. "simple"
+	 *        is typically for a centralized service while "advanced" is for
+	 *        decentralized ones.
+	 * @param $help_url is an optional url to give help on this option.
+	 */
+	private function __construct($type, $url_transform, $transform = array(),
+	                             $form_type, $help_url = '') {
+		$this->type = $type;
+		$this->name = _t('gen.share.' . $type);
+		$this->url_transform = $url_transform;
+		$this->help_url = $help_url;
+
+		if (!is_array($transform)) {
+			$transform = array();
+		}
+		$this->transform = $transform;
+
+		if (!in_array($form_type, array('simple', 'advanced'))) {
+			$form_type = 'simple';
+		}
+		$this->form_type = $form_type;
+	}
+
+	/**
+	 * Update a FreshRSS_Share object with information from an array.
+	 * @param $options is a list of informations to update where keys should be
+	 *        in this list: name, url, title, link.
+	 */
+	public function update($options) {
+		$available_options = array(
+			'name' => 'custom_name',
+			'url' => 'base_url',
+			'title' => 'title',
+			'link' => 'link',
+		);
+
+		foreach ($options as $key => $value) {
+			if (!isset($available_options[$key])) {
+				continue;
+			}
+
+			$this->$available_options[$key] = $value;
+		}
+	}
+
+	/**
+	 * Return the current type of the share option.
+	 */
+	public function type() {
+		return $this->type;
+	}
+
+	/**
+	 * Return the current form type of the share option.
+	 */
+	public function formType() {
+		return $this->form_type;
+	}
+
+	/**
+	 * Return the current help url of the share option.
+	 */
+	public function help() {
+		return $this->help_url;
+	}
+
+	/**
+	 * Return the current name of the share option.
+	 */
+	public function name($real = false) {
+		if ($real || is_null($this->custom_name)) {
+			return $this->name;
+		} else {
+			return $this->custom_name;
+		}
+	}
+
+	/**
+	 * Return the current base url of the share option.
+	 */
+	public function baseUrl() {
+		return $this->base_url;
+	}
+
+	/**
+	 * Return the current url by merging url_transform and base_url.
+	 */
+	public function url() {
 		$matches = array(
 			'~URL~',
 			'~TITLE~',
 			'~LINK~',
 		);
 		$replaces = array(
-			$selected['url'],
-			self::transformData($title, self::getTransform($share, 'title')),
-			self::transformData($link, self::getTransform($share, 'link')),
+			$this->base_url,
+			$this->title(),
+			$this->link(),
 		);
-		$url = str_replace($matches, $replaces, $share['url']);
-		return $url;
+		return str_replace($matches, $replaces, $this->url_transform);
 	}
 
-	static private function transformData($data, $transform) {
-		if (!is_array($transform)) {
-			return $data;
-		}
-		if (count($transform) === 0) {
+	/**
+	 * Return the title.
+	 * @param $raw true if we should get the title without transformations.
+	 */
+	public function title($raw = false) {
+		if ($raw) {
+			return $this->title;
+		}
+
+		return $this->transform($this->title, $this->getTransform('title'));
+	}
+
+	/**
+	 * Return the link.
+	 * @param $raw true if we should get the link without transformations.
+	 */
+	public function link($raw = false) {
+		if ($raw) {
+			return $this->link;
+		}
+
+		return $this->transform($this->link, $this->getTransform('link'));
+	}
+
+	/**
+	 * Transform a data with the given functions.
+	 * @param $data the data to transform.
+	 * @param $tranform an array containing a list of functions to apply.
+	 * @return the transformed data.
+	 */
+	private static function transform($data, $transform) {
+		if (!is_array($transform) || empty($transform)) {
 			return $data;
 		}
+
 		foreach ($transform as $action) {
 			$data = call_user_func($action, $data);
 		}
+
 		return $data;
 	}
 
-	static private function getTransform($options, $type) {
-		$transform = $options['transform'];
-
-		if (array_key_exists($type, $transform)) {
-			return $transform[$type];
+	/**
+	 * Get the list of transformations for the given attribute.
+	 * @param $attr the attribute of which we want the transformations.
+	 * @return an array containing a list of transformations to apply.
+	 */
+	private function getTransform($attr) {
+		if (array_key_exists($attr, $this->transform)) {
+			return $this->transform[$attr];
 		}
 
-		return $transform;
+		return $this->transform;
 	}
-
 }
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 43f94f1bc..4a6f8a71b 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -128,6 +128,17 @@ return array(
 		'nothing_to_load' => 'There are no more articles',
 		'previous' => 'Previous',
 	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
 	'short' => array(
 		'attention' => 'Attention!',
 		'blank_to_disable' => 'Leave blank to disable',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 941388b68..8e7d81db8 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -55,18 +55,7 @@ return array(
 		'subscription' => 'Subscriptions management',
 		'unread' => 'Show only unread',
 	),
-	'share' => array(
-		'_' => 'Share',
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'g+' => 'Google+',
-		'print' => 'Print',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
-	),
+	'share' => 'Share',
 	'tag' => array(
 		'related' => 'Related tags',
 	),
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 62d6342e9..e91aeb66a 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -121,7 +121,7 @@ return array(
 		'_' => 'Partage',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
+		'email' => 'Courriel',
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
 		'more_information' => 'Plus d’informations',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index bb4478360..d990dad4a 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -128,6 +128,17 @@ return array(
 		'nothing_to_load' => 'Fin des articles',
 		'previous' => 'Précédent',
 	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Courriel',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Imprimer',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
 	'short' => array(
 		'attention' => 'Attention !',
 		'blank_to_disable' => 'Laissez vide pour désactiver',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 3279543bd..f9975c593 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -55,18 +55,7 @@ return array(
 		'subscription' => 'Gestion des abonnements',
 		'unread' => 'Afficher les non lus',
 	),
-	'share' => array(
-		'_' => 'Partager',
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Courriel',
-		'facebook' => 'Facebook',
-		'g+' => 'Google+',
-		'print' => 'Imprimer',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
-	),
+	'share' => 'Partager',
 	'tag' => array(
 		'related' => 'Tags associés',
 	),
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index f5c133f07..da7557480 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -15,22 +15,25 @@
 			<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
 		<legend><?php echo _t('conf.sharing'); ?></legend>
-		<?php foreach (FreshRSS_Context::$user_conf->sharing as $key => $sharing) { ?>
-			<?php $share = FreshRSS_Context::$user_conf->shares[$sharing['type']]; ?>
-			<div class="form-group" id="group-share-<?php echo $key; ?>">
+		<?php
+			foreach (FreshRSS_Context::$user_conf->sharing as $key => $share_options) {
+				$share = FreshRSS_Share::get($share_options['type']);
+				$share->update($share_options);
+		?>
+			<div class="form-group group-share" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
-					<?php echo _t('conf.sharing.' . $sharing['type']); ?>
+					<?php echo $share->name(true); ?>
 				</label>
 				<div class="group-controls">
-					<input type='hidden' id='share_<?php echo $key;?>_type' name="share[<?php echo $key;?>][type]" value='<?php echo $sharing['type']?>' />
-					<?php if ($share['form'] === 'advanced') { ?>
+					<input type='hidden' id='share_<?php echo $key; ?>_type' name="share[<?php echo $key; ?>][type]" value='<?php echo $share->type(); ?>' />
+					<?php if ($share->formType() === 'advanced') { ?>
 						<div class="stick">
-							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('conf.sharing.share_name'); ?>" size="64" />
-							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('conf.sharing.share_url'); ?>" size="64" />
+							<input type="text" id="share_<?php echo $key; ?>_name" name="share[<?php echo $key; ?>][name]" class="extend" value="<?php echo $share->name(); ?>" placeholder="<?php echo _t('conf.sharing.share_name'); ?>" size="64" />
+							<input type="url" id="share_<?php echo $key; ?>_url" name="share[<?php echo $key; ?>][url]" class="extend" value="<?php echo $share->baseUrl(); ?>" placeholder="<?php echo _t('conf.sharing.share_url'); ?>" size="64" />
 							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 						</div>
 
-						<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="<?php echo $share['help']?>"><?php echo _i('help'); ?></a>
+						<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="<?php echo $share->help(); ?>"><?php echo _i('help'); ?></a>
 					<?php } else { ?>
 					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 					<?php } ?>
@@ -41,8 +44,10 @@
 		<div class="form-group">
 			<div class="group-controls">
 				<select>
-					<?php foreach(FreshRSS_Context::$user_conf->shares as $key => $params) { ?>
-						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t('conf.sharing.' . $key) ?></option>
+					<?php foreach (FreshRSS_Share::enum() as $share) { ?>
+					<option value='<?php echo $share->type(); ?>' data-form='<?php echo $share->formType(); ?>' data-help='<?php echo $share->help(); ?>'>
+						<?php echo $share->name(true); ?>
+					</option>
 					<?php } ?>
 				</select>
 				<a href='#' class='share add btn'><?php echo _i('add'); ?></a>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index c2cf7c887..8c6ddd1ee 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -129,8 +129,6 @@ if (!empty($this->entries)) {
 				} ?>
 				<li class="item"><?php
 						if ($bottomline_sharing) {
-							$link = urlencode($item->link());
-							$title = urlencode($item->title() . ' · ' . $feed->name());
 					?><div class="dropdown">
 						<div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
 						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
@@ -139,19 +137,19 @@ if (!empty($this->entries)) {
 						</a>
 
 						<ul class="dropdown-menu">
-							<li class="dropdown-close"><a href="#close">❌</a></li>
-							<?php
-								foreach ($sharing as $share) {
-									$type_share = FreshRSS_Context::$user_conf->shares[$share['type']];
-									$has_specific_title = ($type_share['form'] === 'advanced');
-							?>
-								<li class="item share">
-									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$user_conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo $has_specific_title ? $share['name'] : _t('index.share.' . $share['name']); ?>
-									</a>
-								</li>
-							<?php } ?>
-						</ul>
+							<li class="dropdown-close"><a href="#close">❌</a></li><?php
+								$link = $item->link();
+								$title = $item->title() . ' · ' . $feed->name();
+								foreach (FreshRSS_Context::$user_conf->sharing as $share_options) {
+									$share = FreshRSS_Share::get($share_options['type']);
+									$share_options['link'] = $link;
+									$share_options['title'] = $title;
+									$share->update($share_options);
+							?><li class="item share">
+								<a target="_blank" href="<?php echo $share->url(); ?>"><?php echo $share->name(); ?></a>
+							</li><?php
+								}
+						?></ul>
 					</div>
 					<?php } ?>
 				</li><?php
diff --git a/p/scripts/main.js b/p/scripts/main.js
index e48630d89..e8bd66fc1 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1086,7 +1086,7 @@ function init_print_action() {
 }
 
 function init_share_observers() {
-	shares = $('.form-group:not(".form-actions")').length;
+	shares = $('.group-share').length;
 
 	$('.share.add').on('click', function(e) {
 		var opt = $(this).siblings('select').find(':selected');

From 09545b0a654c6bec9ddae9632de71860e8b07c08 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 15:37:24 +0100
Subject: [PATCH 278/363] Fix calls to remove_query_by_get()

The function has been moved into lib_rss.php

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Controllers/categoryController.php |  6 ++++--
 app/Controllers/feedController.php     |  3 ++-
 lib/lib_rss.php                        | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index c90e55ea7..e65c146de 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -141,7 +141,8 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 			}
 
 			// Remove related queries.
-			FreshRSS_Context::$user_conf->remove_query_by_get('c_' . $id);
+			FreshRSS_Context::$user_conf->queries = remove_query_by_get(
+				'c_' . $id, FreshRSS_Context::$user_conf->queries);
 			FreshRSS_Context::$user_conf->save();
 
 			Minz_Request::good(_t('feedback.sub.category.deleted'), $url_redirect);
@@ -177,7 +178,8 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 
 				// Remove related queries
 				foreach ($feeds as $feed) {
-					FreshRSS_Context::$user_conf->remove_query_by_get('f_' . $feed->id());
+					FreshRSS_Context::$user_conf->queries = remove_query_by_get(
+						'f_' . $feed->id(), FreshRSS_Context::$user_conf->queries);
 				}
 				FreshRSS_Context::$user_conf->save();
 
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c22669361..c110fda4e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -477,7 +477,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// TODO: Delete old favicon
 
 			// Remove related queries
-			FreshRSS_Context::$user_conf->remove_query_by_get('f_' . $id);
+			FreshRSS_Context::$user_conf->queries = remove_query_by_get(
+				'f_' . $id, FreshRSS_Context::$user_conf->queries);
 			FreshRSS_Context::$user_conf->save();
 
 			Minz_Request::good(_t('feedback.sub.feed.deleted'), $redirect_url);
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 14b6e854d..ffd56eae4 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -387,3 +387,20 @@ function recursive_unlink($dir) {
 	}
 	return rmdir($dir);
 }
+
+
+/**
+ * Remove queries where $get is appearing.
+ * @param $get the get attribute which should be removed.
+ * @param $queries an array of queries.
+ * @return the same array whithout those where $get is appearing.
+ */
+function remove_query_by_get($get, $queries) {
+	$final_queries = array();
+	foreach ($queries as $key => $query) {
+		if (empty($query['get']) || $query['get'] !== $get) {
+			$final_queries[$key] = $query;
+		}
+	}
+	return $final_queries;
+}

From 9c8a80e57f1e2eb60916eae2e2cbed86d991c750 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 15:39:24 +0100
Subject: [PATCH 279/363] Remove .gitkeep in data/users/_/

---
 data/users/_/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 data/users/_/.gitkeep

diff --git a/data/users/_/.gitkeep b/data/users/_/.gitkeep
deleted file mode 100644
index e69de29bb..000000000

From 91e2d4936d71a72d0aefe9736879099283519239 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 15:57:27 +0100
Subject: [PATCH 280/363] Add support of configuration_setter

A configuration setter must implement only one method: `handle($key, $value)`.
Before setting a value in configuration, the setter will be called with this
method to check its validity.
If a setter has been assigned to a configuration object, it will be called for
each of its data so be careful to always return a value (or null if you want
to delete the key).

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 lib/Minz/Configuration.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 06a7b43b0..5dbd55876 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -15,9 +15,11 @@ class Minz_Configuration {
 	 * @param $namespace the name of the current configuration
 	 * @param $config_filename the filename of the configuration
 	 * @param $default_filename a filename containing default values for the configuration
+	 * @param $configuration_setter an optional helper to set values in configuration
 	 * @throws Minz_ConfigurationNamespaceException if the namespace already exists.
 	 */
-	public static function register($namespace, $config_filename, $default_filename = null) {
+	public static function register($namespace, $config_filename, $default_filename = null,
+	                                $configuration_setter = null) {
 		if (isset(self::$config_list[$namespace])) {
 			throw new Minz_ConfigurationNamespaceException(
 				$namespace . ' namespace already exists'
@@ -25,7 +27,7 @@ class Minz_Configuration {
 		}
 
 		self::$config_list[$namespace] = new Minz_Configuration(
-			$namespace, $config_filename, $default_filename
+			$namespace, $config_filename, $default_filename, $configuration_setter
 		);
 	}
 
@@ -94,14 +96,21 @@ class Minz_Configuration {
 	 */
 	private $data_default = array();
 
+	/**
+	 * An object which help to set good values in configuration.
+	 */
+	private $configuration_setter = null;
+
 	/**
 	 * Create a new Minz_Configuration object.
 	 * 
 	 * @param $namespace the name of the current configuration.
 	 * @param $config_filename the file containing configuration values.
 	 * @param $default_filename the file containing default values, null by default.
+	 * @param $configuration_setter an optional helper to set values in configuration
 	 */
-	private function __construct($namespace, $config_filename, $default_filename = null) {
+	private function __construct($namespace, $config_filename, $default_filename = null,
+	                             $configuration_setter = null) {
 		$this->namespace = $namespace;
 		$this->config_filename = $config_filename;
 
@@ -117,6 +126,8 @@ class Minz_Configuration {
 		if (!is_null($this->default_filename)) {
 			$this->data_default = self::load($this->default_filename);
 		}
+
+		$this->configuration_setter = $configuration_setter;
 	}
 
 	/**
@@ -154,9 +165,13 @@ class Minz_Configuration {
 	 * @param $value the value to set. If null, the key is removed from the configuration.
 	 */
 	public function _param($key, $value = null) {
+		if (!is_null($this->configuration_setter)) {
+			$value = $this->configuration_setter->handle($key, $value);
+		}
+
 		if (isset($this->data[$key]) && is_null($value)) {
 			unset($this->data[$key]);
-		} else {
+		} elseif (!is_null($value)) {
 			$this->data[$key] = $value;
 		}
 	}

From 7f12058fab8a455cf33b5df614c5404f7a236d0a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 16:09:24 +0100
Subject: [PATCH 281/363] Add a method to change the configuration setter

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 lib/Minz/Configuration.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 5dbd55876..019b47fae 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -127,7 +127,18 @@ class Minz_Configuration {
 			$this->data_default = self::load($this->default_filename);
 		}
 
-		$this->configuration_setter = $configuration_setter;
+		$this->_configurationSetter($configuration_setter);
+	}
+
+	/**
+	 * Set a configuration setter for the current configuration.
+	 * @param $configuration_setter the setter to call when modifying data. It
+	 *        must implement an handle($key, $value) method.
+	 */
+	public function _configurationSetter($configuration_setter) {
+		if (is_callable(array($configuration_setter, 'handle'))) {
+			$this->configuration_setter = $configuration_setter;
+		}
 	}
 
 	/**

From 4c128e05a4b1245525fd3eae7733e022ee805acd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 16:13:57 +0100
Subject: [PATCH 282/363] Reorganize FreshRSS init

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/FreshRSS.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 254e35fee..4900528d3 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -6,15 +6,25 @@ class FreshRSS extends Minz_FrontController {
 			Minz_Session::init('FreshRSS');
 		}
 
+		$this->initConfiguration();
+		$this->initAuth();
+		FreshRSS_Context::init();
+		$this->initI18n();
+		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
+		$this->loadStylesAndScripts();
+		$this->loadNotifications();
+		$this->loadExtensions();
+	}
+
+	private function initConfiguration() {
 		$current_user = Minz_Session::param('currentUser', '_');
 		Minz_Configuration::register('user',
 		                             join_path(USERS_PATH, $current_user, 'config.php'),
 		                             join_path(USERS_PATH, '_', 'config.default.php'));
+	}
 
-		// Need to be called just after session init because it initializes
-		// current user.
+	private function initAuth() {
 		FreshRSS_Auth::init();
-
 		if (Minz_Request::isPost() && !is_referer_from_same_domain()) {
 			// Basic protection against XSRF attacks
 			FreshRSS_Auth::removeAccess();
@@ -27,17 +37,6 @@ class FreshRSS extends Minz_FrontController {
 				))
 			);
 		}
-
-		// Load context and configuration.
-		FreshRSS_Context::init();
-
-		$this->initI18n();
-
-		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
-
-		$this->loadStylesAndScripts();
-		$this->loadNotifications();
-		$this->loadExtensions();
 	}
 
 	private function initI18n() {

From 2fd8a80878441cf59b1689b1765633694cb320b6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 16:36:55 +0100
Subject: [PATCH 283/363] Add first test for a generic ConfigurationSetter

We are blocked if a setter has to update several values.
ConfigurationSetter will be updated.

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/FreshRSS.php                   |  7 +++++-
 app/Models/ConfigurationSetter.php | 37 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 app/Models/ConfigurationSetter.php

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 4900528d3..002a70af5 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -17,10 +17,15 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	private function initConfiguration() {
+		$configuration_setter = new FreshRSS_ConfigurationSetter();
 		$current_user = Minz_Session::param('currentUser', '_');
+
 		Minz_Configuration::register('user',
 		                             join_path(USERS_PATH, $current_user, 'config.php'),
-		                             join_path(USERS_PATH, '_', 'config.default.php'));
+		                             join_path(USERS_PATH, '_', 'config.default.php'),
+		                             $configuration_setter);
+		$system_conf = Minz_Configuration::get('system');
+		$system_conf->_configurationSetter($configuration_setter);
 	}
 
 	private function initAuth() {
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
new file mode 100644
index 000000000..e30cb0187
--- /dev/null
+++ b/app/Models/ConfigurationSetter.php
@@ -0,0 +1,37 @@
+<?php
+
+class FreshRSS_ConfigurationSetter {
+	private $setters = array(
+		'language' => '_language',
+		'posts_per_page' => '_posts_per_page',
+		'view_mode' => '_view_mode',
+	);
+
+	public function handle($key, $value) {
+		if (isset($this->setters[$key])) {
+			$value = call_user_func(array($this, $this->setters[$key]), $value);
+		}
+		return $value;
+	}
+
+	private function _language($value) {
+		$languages = Minz_Translate::availableLanguages();
+		if (!isset($languages[$value])) {
+			$value = 'en';
+		}
+
+		return $value;
+	}
+
+	private function _posts_per_page($value) {
+		$value = intval($value);
+		return $value > 0 ? $value : 10;
+	}
+
+	private function _view_mode($value) {
+		if (!in_array($value, array('global', 'normal', 'reader'))) {
+			$value = 'normal';
+		}
+		return $value;
+	}
+}

From fb614ab80cf038416e5451b4f6f25f421d75d8e4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 17:36:29 +0100
Subject: [PATCH 284/363] Change way to call configuration setter.

- Add a support($key) method which return if the given key is supported by
  the setter.
- Change handle signature by adding a $data param which must be passed by
  reference.

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Models/ConfigurationSetter.php | 46 ++++++++++++++++++------------
 lib/Minz/Configuration.php         |  8 ++----
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index e30cb0187..801e11625 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -1,37 +1,47 @@
 <?php
 
 class FreshRSS_ConfigurationSetter {
-	private $setters = array(
-		'language' => '_language',
-		'posts_per_page' => '_posts_per_page',
-		'view_mode' => '_view_mode',
-	);
-
-	public function handle($key, $value) {
-		if (isset($this->setters[$key])) {
-			$value = call_user_func(array($this, $this->setters[$key]), $value);
-		}
-		return $value;
+	/**
+	 * Return if the given key is supported by this setter.
+	 * @param $key the key to test.
+	 * @return true if the key is supported, false else.
+	 */
+	public function support($key) {
+		$name_setter = '_' . $key;
+		return is_callable(array($this, $name_setter));
 	}
 
-	private function _language($value) {
+	/**
+	 * Set the given key in data with the current value.
+	 * @param $data an array containing the list of all configuration data.
+	 * @param $key the key to update.
+	 * @param $value the value to set.
+	 */
+	public function handle(&$data, $key, $value) {
+		$name_setter = '_' . $key;
+		call_user_func_array(array($this, $name_setter), array(&$data, $value));
+	}
+
+	/**
+	 * The (long) list of setters.
+	 */
+	private function _language(&$data, $value) {
 		$languages = Minz_Translate::availableLanguages();
 		if (!isset($languages[$value])) {
 			$value = 'en';
 		}
-
-		return $value;
+		$data['language'] = $value;
 	}
 
-	private function _posts_per_page($value) {
+	private function _posts_per_page(&$data, $value) {
 		$value = intval($value);
-		return $value > 0 ? $value : 10;
+		$data['posts_per_page'] = $value > 0 ? $value : 10;
 	}
 
-	private function _view_mode($value) {
+	private function _view_mode(&$data, $value) {
 		if (!in_array($value, array('global', 'normal', 'reader'))) {
 			$value = 'normal';
 		}
-		return $value;
+		$data['view_mode'] =  $value;
 	}
 }
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 019b47fae..6044fc269 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -176,11 +176,9 @@ class Minz_Configuration {
 	 * @param $value the value to set. If null, the key is removed from the configuration.
 	 */
 	public function _param($key, $value = null) {
-		if (!is_null($this->configuration_setter)) {
-			$value = $this->configuration_setter->handle($key, $value);
-		}
-
-		if (isset($this->data[$key]) && is_null($value)) {
+		if (!is_null($this->configuration_setter) && $this->configuration_setter->support($key)) {
+			$this->configuration_setter->handle($this->data, $key, $value);
+		} elseif (isset($this->data[$key]) && is_null($value)) {
 			unset($this->data[$key]);
 		} elseif (!is_null($value)) {
 			$this->data[$key] = $value;

From 7e81e67aeda7de923f31bfa36f6fcfa41f34dc9b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 18:16:57 +0100
Subject: [PATCH 285/363] Add setters for the user configurations

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Models/ConfigurationSetter.php | 197 +++++++++++++++++++++++++++++
 1 file changed, 197 insertions(+)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 801e11625..64ca61eee 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -25,6 +25,47 @@ class FreshRSS_ConfigurationSetter {
 	/**
 	 * The (long) list of setters.
 	 */
+	private function _apiPasswordHash(&$data, $value) {
+		$data['apiPasswordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
+	}
+
+	private function _content_width(&$data, $value) {
+		if (!in_array($value, array('thin', 'medium', 'large', 'no_limit'))) {
+			$value = 'thin';
+		}
+
+		$data['content_width'] = $value;
+	}
+
+	private function _default_state(&$data, $value) {
+		$data['default_state'] = (int)$value;
+	}
+
+	private function _default_view(&$data, $value) {
+		switch ($value) {
+		case 'all':
+			$data['default_view'] = $value;
+			$data['default_state'] = (FreshRSS_Entry::STATE_READ +
+			                          FreshRSS_Entry::STATE_NOT_READ);
+			break;
+		case 'adaptive':
+		case 'unread':
+		default:
+			$data['default_view'] = $value;
+			$data['default_state'] = FreshRSS_Entry::STATE_NOT_READ;
+		}
+	}
+
+	private function _html5_notif_timeout(&$data, $value) {
+		$value = intval($value);
+		$data['html5_notif_timeout'] = $value >= 0 ? $value : 0;
+	}
+
+	private function _keep_history_default(&$data, $value) {
+		$value = intval($value);
+		$data['keep_history_default'] = $value >= -1 ? $value : 0;
+	}
+
 	private function _language(&$data, $value) {
 		$languages = Minz_Translate::availableLanguages();
 		if (!isset($languages[$value])) {
@@ -33,15 +74,171 @@ class FreshRSS_ConfigurationSetter {
 		$data['language'] = $value;
 	}
 
+	private function _mail_login(&$data, $value) {
+		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
+		$data['mail_login'] = $value ? $value : '';
+	}
+
+	private function _old_entries(&$data, $value) {
+		$value = intval($value);
+		$data['old_entries'] = $value > 0 ? $value : 3;
+	}
+
+	private function _passwordHash(&$data, $value) {
+		$data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
+	}
+
 	private function _posts_per_page(&$data, $value) {
 		$value = intval($value);
 		$data['posts_per_page'] = $value > 0 ? $value : 10;
 	}
 
+	private function _queries(&$data, $values) {
+		$data['queries'] = array();
+		foreach ($values as $value) {
+			$value = array_filter($value);
+			$params = $value;
+			unset($params['name']);
+			unset($params['url']);
+			$value['url'] = Minz_Url::display(array('params' => $params));
+			$data['queries'][] = $value;
+		}
+	}
+
+	private function _sharing(&$data, $values) {
+		$data['sharing'] = array();
+		foreach ($values as $value) {
+			if (!is_array($value)) {
+				continue;
+			}
+
+			// Verify URL and add default value when needed
+			if (isset($value['url'])) {
+				$is_url = (
+					filter_var($value['url'], FILTER_VALIDATE_URL) ||
+					(version_compare(PHP_VERSION, '5.3.3', '<') &&
+						(strpos($value, '-') > 0) &&
+						($value === filter_var($value, FILTER_SANITIZE_URL)))
+				); //PHP bug #51192
+				if (!$is_url) {
+					continue;
+				}
+			} else {
+				$value['url'] = null;
+			}
+
+			$data['sharing'][] = $value;
+		}
+	}
+
+	private function _shortcuts(&$data, $values) {
+		foreach ($values as $key => $value) {
+			if (isset($data['shortcuts'][$key])) {
+				$data['shortcuts'][$key] = $value;
+			}
+		}
+	}
+
+	private function _sort_order(&$data, $value) {
+		$data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
+	}
+
+	private function _ttl_default(&$data, $value) {
+		$value = intval($value);
+		$data['ttl_default'] = $value >= -1 ? $value : 3600;
+	}
+
 	private function _view_mode(&$data, $value) {
 		if (!in_array($value, array('global', 'normal', 'reader'))) {
 			$value = 'normal';
 		}
 		$data['view_mode'] =  $value;
 	}
+
+	/**
+	 * A list of boolean setters.
+	 */
+	private function handleBool($value) {
+		return ((bool)$value) && $value !== 'no';
+	}
+
+	private function _anon_access(&$data, $value) {
+		$data['anon_access'] = $this->handleBool($value);
+	}
+
+	private function _auto_load_more(&$data, $value) {
+		$data['auto_load_more'] = $this->handleBool($value);
+	}
+
+	private function _auto_remove_article(&$data, $value) {
+		$data['auto_remove_article'] = $this->handleBool($value);
+	}
+
+	private function _display_categories(&$data, $value) {
+		$data['display_categories'] = $this->handleBool($value);
+	}
+
+	private function _display_posts(&$data, $value) {
+		$data['display_posts'] = $this->handleBool($value);
+	}
+
+	private function _hide_read_feeds(&$data, $value) {
+		$data['hide_read_feeds'] = $this->handleBool($value);
+	}
+
+	private function _lazyload(&$data, $value) {
+		$data['lazyload'] = $this->handleBool($value);
+	}
+
+	private function _mark_when(&$data, $values) {
+		foreach ($values as $key => $value) {
+			if (isset($data['mark_when'][$key])) {
+				$data['mark_when'][$key] = $this->handleBool($value);
+			}
+		}
+	}
+
+	private function _onread_jump_next(&$data, $value) {
+		$data['onread_jump_next'] = $this->handleBool($value);
+	}
+
+	private function _reading_confirm(&$data, $value) {
+		$data['reading_confirm'] = $this->handleBool($value);
+	}
+
+	private function _sticky_post(&$data, $value) {
+		$data['sticky_post'] = $this->handleBool($value);
+	}
+
+	private function _bottomline_date(&$data, $value) {
+		$data['bottomline_date'] = $this->handleBool($value);
+	}
+	private function _bottomline_favorite(&$data, $value) {
+		$data['bottomline_favorite'] = $this->handleBool($value);
+	}
+	private function _bottomline_link(&$data, $value) {
+		$data['bottomline_link'] = $this->handleBool($value);
+	}
+	private function _bottomline_read(&$data, $value) {
+		$data['bottomline_read'] = $this->handleBool($value);
+	}
+	private function _bottomline_sharing(&$data, $value) {
+		$data['bottomline_sharing'] = $this->handleBool($value);
+	}
+	private function _bottomline_tags(&$data, $value) {
+		$data['bottomline_tags'] = $this->handleBool($value);
+	}
+
+	private function _topline_date(&$data, $value) {
+		$data['topline_date'] = $this->handleBool($value);
+	}
+	private function _topline_favorite(&$data, $value) {
+		$data['topline_favorite'] = $this->handleBool($value);
+	}
+	private function _topline_link(&$data, $value) {
+		$data['topline_link'] = $this->handleBool($value);
+	}
+	private function _topline_read(&$data, $value) {
+		$data['topline_read'] = $this->handleBool($value);
+	}
 }

From 9265cd57333b2a91effc6ea284b504fbc977b9ed Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 7 Jan 2015 18:55:18 +0100
Subject: [PATCH 286/363] Add system config setter methods

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/Models/ConfigurationSetter.php | 134 +++++++++++++++++++++++++++--
 1 file changed, 129 insertions(+), 5 deletions(-)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 64ca61eee..9830fed28 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -23,13 +23,24 @@ class FreshRSS_ConfigurationSetter {
 	}
 
 	/**
-	 * The (long) list of setters.
+	 * A helper to set boolean values.
+	 *
+	 * @param $value the tested value.
+	 * @return true if value is true and different from no, false else.
+	 */
+	private function handleBool($value) {
+		return ((bool)$value) && $value !== 'no';
+	}
+
+	/**
+	 * The (long) list of setters for user configuration.
 	 */
 	private function _apiPasswordHash(&$data, $value) {
 		$data['apiPasswordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
 	}
 
 	private function _content_width(&$data, $value) {
+		$value = strtolower($value);
 		if (!in_array($value, array('thin', 'medium', 'large', 'no_limit'))) {
 			$value = 'thin';
 		}
@@ -66,7 +77,9 @@ class FreshRSS_ConfigurationSetter {
 		$data['keep_history_default'] = $value >= -1 ? $value : 0;
 	}
 
+	// It works for system config too!
 	private function _language(&$data, $value) {
+		$value = strtolower($value);
 		$languages = Minz_Translate::availableLanguages();
 		if (!isset($languages[$value])) {
 			$value = 'en';
@@ -149,6 +162,7 @@ class FreshRSS_ConfigurationSetter {
 	}
 
 	private function _view_mode(&$data, $value) {
+		$value = strtolower($value);
 		if (!in_array($value, array('global', 'normal', 'reader'))) {
 			$value = 'normal';
 		}
@@ -158,10 +172,6 @@ class FreshRSS_ConfigurationSetter {
 	/**
 	 * A list of boolean setters.
 	 */
-	private function handleBool($value) {
-		return ((bool)$value) && $value !== 'no';
-	}
-
 	private function _anon_access(&$data, $value) {
 		$data['anon_access'] = $this->handleBool($value);
 	}
@@ -241,4 +251,118 @@ class FreshRSS_ConfigurationSetter {
 	private function _topline_read(&$data, $value) {
 		$data['topline_read'] = $this->handleBool($value);
 	}
+
+	/**
+	 * The (not so long) list of setters for system configuration.
+	 */
+	private function _allow_anonymous(&$data, $value) {
+		$data['allow_anonymous'] = $this->handleBool($value) && FreshRSS_Auth::accessNeedsAction();
+	}
+
+	private function _allow_anonymous_refresh(&$data, $value) {
+		$data['allow_anonymous_refresh'] = $this->handleBool($value) && $data['allow_anonymous'];
+	}
+
+	private function _api_enabled(&$data, $value) {
+		$data['api_enabled'] = $this->handleBool($value);
+	}
+
+	private function _auth_type(&$data, $value) {
+		$value = strtolower($value);
+		if (!in_array($value, array('form', 'http_auth', 'persona', 'none'))) {
+			$value = 'none';
+		}
+		$data['auth_type'] = $value;
+		$this->_allow_anonymous($data, $data['allow_anonymous']);
+	}
+
+	private function _db(&$data, $value) {
+		if (!isset($value['type'])) {
+			return;
+		}
+
+		switch ($value['type']) {
+		case 'mysql':
+			if (empty($value['host']) ||
+					empty($value['user']) ||
+					empty($value['base']) ||
+					!isset($value['password'])) {
+				return;
+			}
+
+			$data['db']['type'] = $value['type'];
+			$data['db']['host'] = $value['host'];
+			$data['db']['user'] = $value['user'];
+			$data['db']['base'] = $value['base'];
+			$data['db']['password'] = $value['password'];
+			$data['db']['prefix'] = isset($value['prefix']) ? $value['prefix'] : '';
+			break;
+		case 'sqlite':
+			$data['db']['type'] = $value['type'];
+			$data['db']['host'] = '';
+			$data['db']['user'] = '';
+			$data['db']['base'] = '';
+			$data['db']['password'] = '';
+			$data['db']['prefix'] = '';
+			break;
+		default:
+			return;
+		}
+	}
+
+	private function _default_user(&$data, $value) {
+		$user_list = listUsers();
+		if (in_array($value, $user_list)) {
+			$data['default_user'] = $value;
+		}
+	}
+
+	private function _environment(&$data, $value) {
+		$value = strtolower($value);
+		if (!in_array($value, array('silent', 'development', 'production'))) {
+			$value = 'production';
+		}
+		$data['environment'] =  $value;
+	}
+
+	private function _limits(&$data, $values) {
+		$max_small_int = 16384;
+		$limits_keys = array(
+			'cache_duration' => array(
+				'min' => 0,
+			),
+			'timeout' => array(
+				'min' => 0,
+			),
+			'max_inactivity' => array(
+				'min' => 0,
+			),
+			'max_feeds' => array(
+				'min' => 0,
+				'max' => $max_small_int,
+			),
+			'max_categories' => array(
+				'min' => 0,
+				'max' => $max_small_int,
+			),
+		);
+
+		foreach ($values as $key => $value) {
+			if (!isset($limits_keys[$key])) {
+				continue;
+			}
+
+			$limits = $limits_keys[$key];
+			if (
+				(!isset($limits['min']) || $value > $limits['min']) &&
+				(!isset($limits['max']) || $value < $limits['max'])
+			) {
+				$data['limits'][$key] = $value;
+			}
+		}
+	}
+
+	private function _unsafe_autologin_enabled(&$data, $value) {
+		$data['unsafe_autologin_enabled'] = $this->handleBool($value);
+	}
 }

From 59abb0c7540369e59b9b81caa867fc7b70c52667 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 12:12:41 +0100
Subject: [PATCH 287/363] Fix i18n in install.php

---
 app/install.php | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/install.php b/app/install.php
index 8b65fbb6f..a2c12e79f 100644
--- a/app/install.php
+++ b/app/install.php
@@ -43,30 +43,29 @@ function param($key, $default = false) {
 
 // gestion internationalisation
 function initTranslate() {
-	if (!isset($_SESSION['language'])) {
-		$_SESSION['language'] = getBetterLanguage('en');
-	}
-
-	Minz_Translate::init();
-}
-
-function getBetterLanguage($fallback) {
-	$available = availableLanguages();
-	$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-	$language = strtolower(substr($accept, 0, 2));
-
-	if (isset($available[$language])) {
-		return $language;
-	} else {
-		return $fallback;
-	}
-}
-
-function availableLanguages() {
-	return array(
+	$available_languages = array(
 		'en' => 'English',
 		'fr' => 'Français'
 	);
+
+	if (!isset($_SESSION['language'])) {
+		$best = get_best_language();
+		if (!isset($available_languages[$best])) {
+			$best = 'en';
+		}
+
+		$_SESSION['language'] = $best;
+	}
+
+	Minz_Translate::init(array(
+		'en' => 'English',
+		'fr' => 'Français',
+	), $_SESSION['language']);
+}
+
+function get_best_language() {
+	$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+	return strtolower(substr($accept, 0, 2));
 }
 
 
@@ -263,7 +262,7 @@ function checkStep() {
 }
 
 function checkStep0() {
-	$languages = availableLanguages();
+	$languages = Minz_Translate::availableLanguages();
 	$language = isset($_SESSION['language']) &&
 	            isset($languages[$_SESSION['language']]);
 
@@ -427,7 +426,8 @@ function checkBD() {
 
 /*** AFFICHAGE ***/
 function printStep0() {
-	global $actual;
+	$actual = Minz_Translate::language();
+	$languages = Minz_Translate::availableLanguages();
 ?>
 	<?php $s0 = checkStep0(); if ($s0['all'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.language.defined'); ?></p>
@@ -439,7 +439,6 @@ function printStep0() {
 			<label class="group-name" for="language"><?php echo _t('install.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php $languages = availableLanguages(); ?>
 				<?php foreach ($languages as $short => $lib) { ?>
 				<option value="<?php echo $short; ?>"<?php echo $actual == $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
 				<?php } ?>

From 2ac732ec6d490f1b7897aac6786d00e7ec7b2fff Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 12:15:09 +0100
Subject: [PATCH 288/363] Fix i18n in install.php

Init i18n must be done before check steps
---
 app/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/install.php b/app/install.php
index a2c12e79f..090539a23 100644
--- a/app/install.php
+++ b/app/install.php
@@ -778,10 +778,10 @@ function printStep5() {
 <?php
 }
 
-checkStep();
-
 initTranslate();
 
+checkStep();
+
 switch (STEP) {
 case 0:
 default:

From 0e4e16ac55097aa173c7c439367294ebd7645562 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 12:22:13 +0100
Subject: [PATCH 289/363] Fix saving system config file

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/install.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/install.php b/app/install.php
index 090539a23..a9faa764b 100644
--- a/app/install.php
+++ b/app/install.php
@@ -174,19 +174,12 @@ function saveStep3() {
 			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] .(empty($_SESSION['default_user']) ? '' :($_SESSION['default_user'] . '_'));
 		}
 
-		$ini_array = array(
-			'general' => array(
-				'environment' => empty($_SESSION['environment']) ? 'production' : $_SESSION['environment'],
-				'salt' => $_SESSION['salt'],
-				'base_url' => '',
-				'title' => $_SESSION['title'],
-				'default_user' => $_SESSION['default_user'],
-				'allow_anonymous' => isset($_SESSION['allow_anonymous']) ? $_SESSION['allow_anonymous'] : false,
-				'allow_anonymous_refresh' => isset($_SESSION['allow_anonymous_refresh']) ? $_SESSION['allow_anonymous_refresh'] : false,
-				'auth_type' => $_SESSION['auth_type'],
-				'api_enabled' => isset($_SESSION['api_enabled']) ? $_SESSION['api_enabled'] : false,
-				'unsafe_autologin_enabled' => isset($_SESSION['unsafe_autologin_enabled']) ? $_SESSION['unsafe_autologin_enabled'] : false,
-			),
+		$config_array = array(
+			'environment' => 'production',
+			'salt' => $_SESSION['salt'],
+			'title' => $_SESSION['title'],
+			'default_user' => $_SESSION['default_user'],
+			'auth_type' => $_SESSION['auth_type'],
 			'db' => array(
 				'type' => $_SESSION['bd_type'],
 				'host' => $_SESSION['bd_host'],
@@ -198,7 +191,7 @@ function saveStep3() {
 		);
 
 		@unlink(join_path(DATA_PATH, 'config.php'));	//To avoid access-rights problems
-		file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($ini_array, true) . ';');
+		file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($config_array, true) . ';');
 
 		$res = checkBD();
 

From e86a6097c886ac8b0ed9278c2cafc543ad4c0227 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 14:22:20 +0100
Subject: [PATCH 290/363] Add a setter for extensions_enabled config value

---
 app/Models/ConfigurationSetter.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 9830fed28..e5ea6ff6f 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -67,6 +67,14 @@ class FreshRSS_ConfigurationSetter {
 		}
 	}
 
+	// It works for system config too!
+	private function _extensions_enabled(&$data, $value) {
+		if (!is_array($value)) {
+			$value = array($value);
+		}
+		$data['extensions_enabled'] = $value;
+	}
+
 	private function _html5_notif_timeout(&$data, $value) {
 		$value = intval($value);
 		$data['html5_notif_timeout'] = $value >= 0 ? $value : 0;

From 5bd7997d41d052420e2a4c164a4f60fe982760e2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 14:30:05 +0100
Subject: [PATCH 291/363] Call handleConfigureAction() even for GET requests

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 5 +----
 lib/Minz/Extension.php                  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 3eedcd949..e013bb369 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -49,10 +49,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 
 		$this->view->extension = $ext;
-
-		if (Minz_Request::isPost()) {
-			$this->view->extension->handleConfigureAction();
-		}
+		$this->view->extension->handleConfigureAction();
 	}
 
 	/**
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index a24c718c3..b3991c129 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -104,7 +104,7 @@ class Minz_Extension {
 	}
 
 	/**
-	 * Handle the configure POST action.
+	 * Handle the configure action.
 	 *
 	 * It must be redefined by child classes.
 	 */

From a3f667e586e73e996175477939aa7beb10630901 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 14:50:21 +0100
Subject: [PATCH 292/363] Fix Minz_Translate::availableLanguages() method

---
 app/Models/ConfigurationSetter.php |  2 +-
 app/i18n/en/gen.php                |  4 ++++
 app/i18n/fr/gen.php                |  4 ++++
 app/views/configure/display.phtml  |  4 ++--
 lib/Minz/Translate.php             | 28 +++++++++++++++++++++++++---
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index e5ea6ff6f..f1c465c7c 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -89,7 +89,7 @@ class FreshRSS_ConfigurationSetter {
 	private function _language(&$data, $value) {
 		$value = strtolower($value);
 		$languages = Minz_Translate::availableLanguages();
-		if (!isset($languages[$value])) {
+		if (!in_array($value, $languages)) {
 			$value = 'en';
 		}
 		$data['language'] = $value;
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index b3b8d8647..6271717d4 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -100,6 +100,10 @@ return array(
 		'notif_title_new_articles' => 'FreshRSS: new articles!',
 		'should_be_activated' => 'JavaScript must be enabled',
 	),
+	'lang' => array(
+		'en' => 'English',
+		'fr' => 'Français',
+	),
 	'menu' => array(
 		'about' => 'About',
 		'admin' => 'Administration',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 996c81cf5..6b449484f 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -100,6 +100,10 @@ return array(
 		'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
 		'should_be_activated' => 'Le JavaScript doit être activé.',
 	),
+	'lang' => array(
+		'en' => 'English',
+		'fr' => 'Français',
+	),
 	'menu' => array(
 		'about' => 'À propos',
 		'admin' => 'Administration',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 36a075ea7..02249bc55 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -11,8 +11,8 @@
 			<div class="group-controls">
 				<select name="language" id="language">
 				<?php $languages = Minz_Translate::availableLanguages(); ?>
-				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$user_conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<?php foreach ($languages as $lang) { ?>
+				<option value="<?php echo $lang; ?>"<?php echo FreshRSS_Context::$user_conf->language === $lang ? ' selected="selected"' : ''; ?>><?php echo _t('gen.lang.' . $lang); ?></option>
 				<?php } ?>
 				</select>
 			</div>
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index b05c9c695..d870b6bb2 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -9,6 +9,11 @@
  * It uses files in `./app/i18n/`
  */
 class Minz_Translate {
+	/**
+	 * $path_list is the list of registered base path to search translations.
+	 */
+	private static $path_list = array();
+
 	/**
 	 * $lang_name is the name of the current language to use.
 	 */
@@ -30,6 +35,7 @@ class Minz_Translate {
 	 */
 	public static function init($lang_name) {
 		self::$lang_name = $lang_name;
+		self::$path_list = array();
 		self::$lang_files = array();
 		self::$translates = array();
 		self::registerPath(APP_PATH . '/i18n');
@@ -45,11 +51,21 @@ class Minz_Translate {
 
 	/**
 	 * Return the list of available languages.
-	 * @return an array.
-	 * @todo fix this method.
+	 * @return an array containing langs found in different registered paths.
 	 */
 	public static function availableLanguages() {
-		return array();
+		$list_langs = array();
+
+		foreach (self::$path_list as $path) {
+			$path_langs = array_values(array_diff(
+				scandir($path),
+				array('..', '.')
+			));
+
+			$list_langs = array_merge($list_langs, $path_langs);
+		}
+
+		return array_unique($list_langs);
 	}
 
 	/**
@@ -58,6 +74,12 @@ class Minz_Translate {
 	 * @param $path a path containing i18n directories (e.g. ./en/, ./fr/).
 	 */
 	public static function registerPath($path) {
+		if (in_array($path, self::$path_list)) {
+			return;
+		}
+
+		self::$path_list[] = $path;
+
 		// We load first i18n files for the current language.
 		$lang_path = $path . '/' . self::$lang_name;
 		$list_i18n_files = array_values(array_diff(

From 8f04cb9d9db90cce71a0de81bcfbc68b0873ea23 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 15:05:25 +0100
Subject: [PATCH 293/363] Change Minz_Translate::reset() behaviour

- Don't reset the path list (use init() instead)
- init() accept a null lang_name. To use i18n, you'll have to use reset() later.
  It is helpful to load the list of available language before choosing one of them.
---
 lib/Minz/Translate.php | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index d870b6bb2..a90af659e 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -33,7 +33,7 @@ class Minz_Translate {
 	 * Init the translation object.
 	 * @param $lang_name the lang to show.
 	 */
-	public static function init($lang_name) {
+	public static function init($lang_name = null) {
 		self::$lang_name = $lang_name;
 		self::$path_list = array();
 		self::$lang_files = array();
@@ -46,7 +46,12 @@ class Minz_Translate {
 	 * @param $lang_name the new language to use
 	 */
 	public static function reset($lang_name) {
-		self::init($lang_name);
+		self::$lang_name = $lang_name;
+		self::$lang_files = array();
+		self::$translates = array();
+		foreach ($path_list as $path) {
+			self::loadLang($path);
+		}
 	}
 
 	/**
@@ -70,7 +75,6 @@ class Minz_Translate {
 
 	/**
 	 * Register a new path and load i18n files inside.
-	 *
 	 * @param $path a path containing i18n directories (e.g. ./en/, ./fr/).
 	 */
 	public static function registerPath($path) {
@@ -79,9 +83,20 @@ class Minz_Translate {
 		}
 
 		self::$path_list[] = $path;
+		self::loadLang($path);
+	}
 
-		// We load first i18n files for the current language.
+	/**
+	 * Load translations of the current language from the given path.
+	 * @param $path the path containing i18n directories.
+	 */
+	private static function loadLang($path) {
 		$lang_path = $path . '/' . self::$lang_name;
+		if (!file_exists($lang_path) || is_null(self::$lang_name)) {
+			// The lang path does not exist, nothing more to do.
+			return;
+		}
+
 		$list_i18n_files = array_values(array_diff(
 			scandir($lang_path),
 			array('..', '.')
@@ -102,7 +117,6 @@ class Minz_Translate {
 
 	/**
 	 * Load the files associated to $key into $translates.
-	 *
 	 * @param $key the top level i18n key we want to load.
 	 */
 	private static function loadKey($key) {

From 85ea5e548ac1057feeb8dfff99b1b433e4ecfd6b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 15:16:32 +0100
Subject: [PATCH 294/363] Fix install.php script (choice of lang)

Fix a bug in Minz_Translate too
---
 app/install.php        | 27 +++++++++++++--------------
 lib/Minz/Translate.php |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/install.php b/app/install.php
index 55817ec68..a79b0d318 100644
--- a/app/install.php
+++ b/app/install.php
@@ -43,21 +43,18 @@ function param($key, $default = false) {
 
 // gestion internationalisation
 function initTranslate() {
-	$available_languages = array(
-		'en' => 'English',
-		'fr' => 'Français'
-	);
+	Minz_Translate::init();
+	$available_languages = Minz_Translate::availableLanguages();
 
 	if (!isset($_SESSION['language'])) {
-		$best = get_best_language();
-		if (!isset($available_languages[$best])) {
-			$best = 'en';
-		}
-
-		$_SESSION['language'] = $best;
+		$_SESSION['language'] = get_best_language();
 	}
 
-	Minz_Translate::init($_SESSION['language']);
+	if (!in_array($_SESSION['language'], $available_languages)) {
+		$_SESSION['language'] = 'en';
+	}
+
+	Minz_Translate::reset($_SESSION['language']);
 }
 
 function get_best_language() {
@@ -254,7 +251,7 @@ function checkStep() {
 function checkStep0() {
 	$languages = Minz_Translate::availableLanguages();
 	$language = isset($_SESSION['language']) &&
-	            isset($languages[$_SESSION['language']]);
+	            in_array($_SESSION['language'], $languages);
 
 	return array(
 		'language' => $language ? 'ok' : 'ko',
@@ -429,8 +426,10 @@ function printStep0() {
 			<label class="group-name" for="language"><?php echo _t('install.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo $actual == $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<?php foreach ($languages as $lang) { ?>
+				<option value="<?php echo $lang; ?>"<?php echo $actual == $lang ? ' selected="selected"' : ''; ?>>
+					<?php echo _t('gen.lang.' . $lang); ?>
+				</option>
 				<?php } ?>
 				</select>
 			</div>
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index a90af659e..24497a193 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -49,7 +49,7 @@ class Minz_Translate {
 		self::$lang_name = $lang_name;
 		self::$lang_files = array();
 		self::$translates = array();
-		foreach ($path_list as $path) {
+		foreach (self::$path_list as $path) {
 			self::loadLang($path);
 		}
 	}

From 19dfef8b49f78e898ea5841869ff80cc351724bc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 16:32:13 +0100
Subject: [PATCH 295/363] Fix bug with Minz_Translate

When a path was registered before initialization, it was not considered unless
by calling reset() method.

This is fixed now.
---
 app/views/user/manage.phtml |  4 ++--
 lib/Minz/Translate.php      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 11c42a857..466446f2f 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -11,8 +11,8 @@
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
 				<?php $languages = Minz_Translate::availableLanguages(); ?>
-				<?php foreach ($languages as $short => $lib) { ?>
-				<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$user_conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<?php foreach ($languages as $lang) { ?>
+				<option value="<?php echo $lang; ?>"<?php echo FreshRSS_Context::$user_conf->language === $lang ? ' selected="selected"' : ''; ?>><?php echo _t('gen.lang.' . $lang); ?></option>
 				<?php } ?>
 				</select>
 			</div>
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index 24497a193..d8ce2a0f7 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -35,10 +35,12 @@ class Minz_Translate {
 	 */
 	public static function init($lang_name = null) {
 		self::$lang_name = $lang_name;
-		self::$path_list = array();
 		self::$lang_files = array();
 		self::$translates = array();
 		self::registerPath(APP_PATH . '/i18n');
+		foreach (self::$path_list as $path) {
+			self::loadLang($path);
+		}
 	}
 
 	/**
@@ -74,7 +76,7 @@ class Minz_Translate {
 	}
 
 	/**
-	 * Register a new path and load i18n files inside.
+	 * Register a new path.
 	 * @param $path a path containing i18n directories (e.g. ./en/, ./fr/).
 	 */
 	public static function registerPath($path) {
@@ -83,7 +85,6 @@ class Minz_Translate {
 		}
 
 		self::$path_list[] = $path;
-		self::loadLang($path);
 	}
 
 	/**
@@ -164,7 +165,8 @@ class Minz_Translate {
 
 		// If $translates[$top_level] is null it means we have to load the
 		// corresponding files.
-		if (is_null(self::$translates[$top_level])) {
+		if (!isset(self::$translates[$top_level]) ||
+				is_null(self::$translates[$top_level])) {
 			$res = self::loadKey($top_level);
 			if (!$res) {
 				return $key;

From b23fc3187cb90800aad6417badf7822a8d280b74 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 21:32:21 +0100
Subject: [PATCH 296/363] Fix translation bug

A path registered after initialization must be loaded.
---
 app/i18n/en/admin.php  | 1 +
 app/i18n/fr/admin.php  | 1 +
 lib/Minz/Translate.php | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 83c06bfb4..6a89d4a31 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -104,6 +104,7 @@ return array(
 	),
 	'extensions' => array(
 		'empty_list' => 'There is no installed extension',
+		'no_configure_view' => 'This extension cannot be configured.',
 		'system' => 'System extension (you have no rights on it)',
 		'title' => 'Extensions',
 	),
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index b16e2be54..2e879da61 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -104,6 +104,7 @@ return array(
 	),
 	'extensions' => array(
 		'empty_list' => 'Il n’y a aucune extension installée.',
+		'no_configure_view' => 'Cette extension ne peut pas être configurée.',
 		'system' => 'Extension système (vous n’avez aucun droit dessus)',
 		'title' => 'Extensions',
 	),
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index d8ce2a0f7..baddcb424 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -85,6 +85,7 @@ class Minz_Translate {
 		}
 
 		self::$path_list[] = $path;
+		self::loadLang($path);
 	}
 
 	/**

From cb8d1480c1e39c27a96939f7ed51a60f33a7e62b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 21:34:29 +0100
Subject: [PATCH 297/363] Update extensions README

---
 extensions/README.md | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/extensions/README.md b/extensions/README.md
index e7b66d5bc..4c1a81f5c 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -1,15 +1,3 @@
-== FreshRSS extensions ==
+# FreshRSS extensions
 
 You may place in this directory some custom extensions for FreshRSS.
-
-The structure must be:
-
-./FreshRSS/extensions/
-	./NameOfExtensionAlphanumeric/
-		./style.css
-		./script.js
-		./module.php
-
-Each file is optional.
-
-The name of non-official extensions should start by an 'x'.

From 03db0b5d3c431deb8c4f099b77e045160548f1b6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 21:37:59 +0100
Subject: [PATCH 298/363] Fix a bug related to sharing

$item and $feed were not existing, replaced by other names.
Introduce by the merging of dev in extension branch.
---
 app/views/helpers/index/normal/entry_bottom.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 32317d027..20b4b332c 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -36,16 +36,16 @@
 	<li class="item"><?php
 			if ($bottomline_sharing) {
 		?><div class="dropdown">
-			<div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
-			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
+			<div id="dropdown-share-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
+			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $this->entry->id();?>">
 				<?php echo _i('share'); ?>
 				<?php echo _t('index.share'); ?>
 			</a>
 
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li><?php
-					$link = $item->link();
-					$title = $item->title() . ' · ' . $feed->name();
+					$link = $this->entry->link();
+					$title = $this->entry->title() . ' · ' . $this->feed->name();
 					foreach (FreshRSS_Context::$user_conf->sharing as $share_options) {
 						$share = FreshRSS_Share::get($share_options['type']);
 						$share_options['link'] = $link;

From 450a1ea7a803ce6f5ba6ca260c40ff5faadc2420 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 21:52:47 +0100
Subject: [PATCH 299/363] Prepare Changelog

---
 CHANGELOG | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 99ff0066f..1e2c6bfb3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,16 @@
 # Journal des modifications
 
+## 2015-01-15 FreshRSS 0.9.4 (beta)
+
+* Feature
+	* Extension system (!!)
+* Refactoring
+	* Front controller (FreshRSS class)
+	* Configuration system
+	* Sharing system
+	* New data files organization
+
+
 ## 2014-12-12 FreshRSS 0.9.3 (beta)
 
 * SimplePie

From 67375537e49aafa226fa8552ee388b5dbaa349a0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 9 Jan 2015 19:34:02 +0100
Subject: [PATCH 300/363] Init auth before user configuration

Add a lot of comments to explain how work the FRSS front controller and
the order of initializations.

Fix https://github.com/FreshRSS/FreshRSS/issues/745
---
 app/FreshRSS.php | 49 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 453cc2d69..785b10299 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -1,15 +1,50 @@
 <?php
 
 class FreshRSS extends Minz_FrontController {
+	/**
+	 * Initialize the different FreshRSS / Minz components.
+	 *
+	 * PLEASE DON'T CHANGE THE ORDER OF INITIALIZATIONS UNLESS YOU KNOW WHAT
+	 * YOU DO!!
+	 *
+	 * Here is the list of components:
+	 * - Create a configuration setter and register it to system conf
+	 * - Init extension manager and enable system extensions (has to be done asap)
+	 * - Init authentication system
+	 * - Init user configuration (need auth system)
+	 * - Init FreshRSS context (need user conf)
+	 * - Init i18n (need context)
+	 * - Init sharing system (need user conf and i18n)
+	 * - Init generic styles and scripts (need user conf)
+	 * - Init notifications
+	 * - Enable user extensions (need all the other initializations)
+	 */
 	public function init() {
 		if (!isset($_SESSION)) {
 			Minz_Session::init('FreshRSS');
 		}
 
+		// Register the configuration setter for the system configuration
+		$configuration_setter = new FreshRSS_ConfigurationSetter();
+		$system_conf = Minz_Configuration::get('system');
+		$system_conf->_configurationSetter($configuration_setter);
+
 		// Load list of extensions and enable the "system" ones.
 		Minz_ExtensionManager::init();
-		$this->initConfiguration();
+
+		// Auth has to be initialized before using currentUser session parameter
+		// because it's this part which create this parameter.
 		$this->initAuth();
+
+		// Then, register the user configuration and use the configuration setter
+		// created above.
+		$current_user = Minz_Session::param('currentUser', '_');
+		Minz_Configuration::register('user',
+		                             join_path(USERS_PATH, $current_user, 'config.php'),
+		                             join_path(USERS_PATH, '_', 'config.default.php'),
+		                             $configuration_setter);
+
+		// Finish to initialize the other FreshRSS / Minz components.
 		FreshRSS_Context::init();
 		$this->initI18n();
 		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
@@ -22,18 +57,6 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
-	private function initConfiguration() {
-		$configuration_setter = new FreshRSS_ConfigurationSetter();
-		$current_user = Minz_Session::param('currentUser', '_');
-
-		Minz_Configuration::register('user',
-		                             join_path(USERS_PATH, $current_user, 'config.php'),
-		                             join_path(USERS_PATH, '_', 'config.default.php'),
-		                             $configuration_setter);
-		$system_conf = Minz_Configuration::get('system');
-		$system_conf->_configurationSetter($configuration_setter);
-	}
-
 	private function initAuth() {
 		FreshRSS_Auth::init();
 		if (Minz_Request::isPost() && !is_referer_from_same_domain()) {

From 2628197190e98cbb27db75bc603b88f51869f8db Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 10:21:05 +0100
Subject: [PATCH 301/363] Update data/users/.gitignore

Add the log_api.txt in the ignore file.
---
 data/users/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/users/.gitignore b/data/users/.gitignore
index 53ed0587b..a8b7cd60f 100644
--- a/data/users/.gitignore
+++ b/data/users/.gitignore
@@ -1,4 +1,4 @@
 db.sqlite
 config.php
-log.txt
+log*.txt
 

From 2d1cb016abb1ad2e5c9a875c649a702480f97b1b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 11:16:13 +0100
Subject: [PATCH 302/363] Fix user interaction with showing password feature

Before, the password was hidden again after 2 seconds. Now, the password
is hidden when the mouse is released

Fix https://github.com/FreshRSS/FreshRSS/issues/734
---
 app/install.php              | 17 ++++++++++-------
 app/views/user/manage.phtml  |  2 +-
 app/views/user/profile.phtml |  4 ++--
 p/scripts/main.js            | 15 ++++++++-------
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/install.php b/app/install.php
index a79b0d318..eb2f764f9 100644
--- a/app/install.php
+++ b/app/install.php
@@ -611,23 +611,26 @@ function printStep2() {
 		</div>
 
 		<script>
-			function toggle_password() {
+			function show_password() {
 				var button = this;
 				var passwordField = document.getElementById(button.getAttribute('data-toggle'));
-
 				passwordField.setAttribute('type', 'text');
 				button.className += ' active';
 
-				setTimeout(function() {
-					passwordField.setAttribute('type', 'password');
-					button.className = button.className.replace(/(?:^|\s)active(?!\S)/g , '');
-				}, 2000);
+				return false;
+			}
+			function hide_password() {
+				var button = this;
+				var passwordField = document.getElementById(button.getAttribute('data-toggle'));
+				passwordField.setAttribute('type', 'password');
+				button.className = button.className.replace(/(?:^|\s)active(?!\S)/g , '');
 
 				return false;
 			}
 			toggles = document.getElementsByClassName('toggle-password');
 			for (var i = 0 ; i < toggles.length ; i++) {
-				toggles[i].addEventListener('click', toggle_password);
+				toggles[i].addEventListener('mousedown', show_password);
+				toggles[i].addEventListener('mouseup', hide_password);
 			}
 
 			function auth_type_change(focus) {
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 466446f2f..11562093e 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -30,7 +30,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
-					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
+					<a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index d85499ad8..4e61664bc 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -22,7 +22,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
+					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
@@ -34,7 +34,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
+					<a class="btn toggle-password" data-toggle="apiPasswordPlain"><?php echo _i('key'); ?></a>
 				</div>
 			</div>
 		</div>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index e8bd66fc1..9b6524b01 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1134,17 +1134,18 @@ function init_feed_observers() {
 }
 
 function init_password_observers() {
-	$('input[type="password"] + a.btn.toggle-password').on('click', function(e) {
+	$('.toggle-password').on('mousedown', function(e) {
 		var button = $(this);
-		var passwordField = $(this).siblings('input[type="password"]');
-
+		var passwordField = $('#' + button.attr('data-toggle'));
 		passwordField.attr('type', 'text');
 		button.addClass('active');
 
-		setTimeout(function() {
-			passwordField.attr('type', 'password');
-			button.removeClass('active');
-		}, 2000);
+		return false;
+	}).on('mouseup', function(e) {
+		var button = $(this);
+		var passwordField = $('#' + button.attr('data-toggle'));
+		passwordField.attr('type', 'password');
+		button.removeClass('active');
 
 		return false;
 	});

From 0cba8dd69156eab50142efe67f4f3fac22a08081 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 11:32:29 +0100
Subject: [PATCH 303/363] Show current version of FRSS on the update page

See https://github.com/FreshRSS/FreshRSS/issues/699
---
 app/i18n/en/admin.php        | 1 +
 app/i18n/fr/admin.php        | 1 +
 app/views/update/index.phtml | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 6a89d4a31..3161683a8 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -144,6 +144,7 @@ return array(
 		'_' => 'Update system',
 		'apply' => 'Apply',
 		'check' => 'Check for new updates',
+		'current_version' => 'Your current version of FreshRSS is the %s.',
 		'last' => 'Last verification: %s',
 		'none' => 'No update to apply',
 		'title' => 'Update system',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 2e879da61..3d69e4daf 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -144,6 +144,7 @@ return array(
 		'_' => 'Système de mise à jour',
 		'apply' => 'Appliquer la mise à jour',
 		'check' => 'Vérifier les mises à jour',
+		'current_version' => 'Votre version actuelle de FreshRSS est la %s.',
 		'last' => 'Dernière vérification : %s',
 		'none' => 'Aucune mise à jour à appliquer',
 		'title' => 'Système de mise à jour',
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index 5c07d307e..4c88a0d18 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -6,7 +6,11 @@
 	<h1><?php echo _t('admin.update'); ?></h1>
 
 	<p>
-		<?php echo _i('help'); ?> <?php echo _t('admin.update.last', $this->last_update_time); ?>
+		<?php echo _i('help'); ?> <?php echo _t('admin.update.current_version', FRESHRSS_VERSION); ?>
+	</p>
+
+	<p>
+		<?php echo _t('admin.update.last', $this->last_update_time); ?>
 	</p>
 
 	<?php if (!empty($this->message)) { ?>

From e7c24b5d41c293fa13e4d92efb2aee7778ddcab4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 12:02:35 +0100
Subject: [PATCH 304/363] Show the version number during update process.

Number is stored inside the data/last_update.txt file and shown if there
is an update script.

See https://github.com/FreshRSS/FreshRSS/issues/699
---
 app/Controllers/updateController.php | 17 +++++++++++------
 app/i18n/en/feedback.php             |  2 +-
 app/i18n/fr/feedback.php             |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 1b44a739c..4bdd96f6d 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -1,8 +1,8 @@
 <?php
 
 class FreshRSS_update_Controller extends Minz_ActionController {
+
 	public function firstAction() {
-		$current_user = Minz_Session::param('currentUser', '');
 		if (!FreshRSS_Auth::hasAccess('admin')) {
 			Minz_Error::error(403);
 		}
@@ -12,8 +12,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		$this->view->update_to_apply = false;
 		$this->view->last_update_time = 'unknown';
 		$this->view->check_last_hour = false;
-		$timestamp = (int)@file_get_contents(DATA_PATH . '/last_update.txt');
-		if (is_numeric($timestamp) && $timestamp > 0) {
+		$timestamp = @filemtime(join_path(DATA_PATH, 'last_update.txt'));
+		if ($timestamp !== false) {
 			$this->view->last_update_time = timestamptodate($timestamp);
 			$this->view->check_last_hour = (time() - 3600) <= $timestamp;
 		}
@@ -30,11 +30,12 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			);
 		} elseif (file_exists(UPDATE_FILENAME)) {
 			// There is an update file to apply!
+			$version = file_get_contents(join_path(DATA_PATH, 'last_update.txt'));
 			$this->view->update_to_apply = true;
 			$this->view->message = array(
 				'status' => 'good',
 				'title' => _t('gen.short.ok'),
-				'body' => _t('feedback.update.can_apply')
+				'body' => _t('feedback.update.can_apply', $version)
 			);
 		}
 	}
@@ -82,13 +83,17 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 				'body' => _t('feedback.update.none')
 			);
 
-			@file_put_contents(DATA_PATH . '/last_update.txt', time());
+			@touch(join_path(DATA_PATH, 'last_update.txt'));
 
 			return;
 		}
 
 		$script = $res_array[1];
 		if (file_put_contents(UPDATE_FILENAME, $script) !== false) {
+			$version = explode(' ', $status, 2);
+			$version = $version[1];
+			@file_put_contents(join_path(DATA_PATH, 'last_update.txt'), $version);
+
 			Minz_Request::forward(array('c' => 'update'));
 		} else {
 			$this->view->message = array(
@@ -111,7 +116,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 			if ($res === true) {
 				@unlink(UPDATE_FILENAME);
-				@file_put_contents(DATA_PATH . '/last_update.txt', time());
+				@file_put_contents(join_path(DATA_PATH, 'last_update.txt'), '');
 				Minz_Request::good(_t('feedback.update.finished'));
 			} else {
 				Minz_Request::bad(_t('feedback.update.error', $res),
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 5f7183da3..e9499ed46 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -80,7 +80,7 @@ return array(
 		'purge_completed' => 'Purge completed (%d articles deleted)',
 	),
 	'update' => array(
-		'can_apply' => 'An update is available.',
+		'can_apply' => 'FreshRSS will be now updated to the <strong>version %s</strong>.',
 		'error' => 'The update process has encountered an error: %s',
 		'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 		'finished' => 'Update completed!',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index 5c71bbae1..c99314411 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -80,7 +80,7 @@ return array(
 		'purge_completed' => 'Purge effectuée (%d articles supprimés).',
 	),
 	'update' => array(
-		'can_apply' => 'Une mise à jour est disponible.',
+		'can_apply' => 'FreshRSS va maintenant être mis à jour vers la <strong>version %s</strong>.',
 		'error' => 'La mise à jour a rencontré un problème : %s',
 		'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
 		'finished' => 'La mise à jour est terminée !',

From f31b02be7882f8a7b180d64f3f77ba83cd9935f5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 14:10:31 +0100
Subject: [PATCH 305/363] Remove sticky feed aside. Work on an extension.

See https://github.com/FreshRSS/FreshRSS/issues/697
---
 p/themes/BlueLagoon/BlueLagoon.css   | 5 -----
 p/themes/Dark/dark.css               | 5 -----
 p/themes/Flat/flat.css               | 5 -----
 p/themes/Origine/origine.css         | 5 -----
 p/themes/Pafat/pafat.css             | 5 -----
 p/themes/Screwdriver/screwdriver.css | 5 -----
 p/themes/base-theme/base.css         | 5 -----
 7 files changed, 35 deletions(-)

diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index ae1c24604..ffb80ddb2 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -622,8 +622,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -1140,9 +1138,6 @@ opacity: 1;
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 909444d43..dd7502f25 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -547,8 +547,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -982,9 +980,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 313bee0ee..42b73bae2 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -553,8 +553,6 @@ a.btn {
 	border-radius: 0 10px 0 0;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -979,9 +977,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index eb2ecd5e8..18df4468a 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -587,8 +587,6 @@ a.btn {
 	background: #fff;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -1028,9 +1026,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 8b1e7866c..61e5c8f63 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -586,8 +586,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 5px;
 	margin: 10px 0 50px;
 }
 
@@ -1039,9 +1037,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 8dbd2ec34..a43d1801c 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -617,8 +617,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -1139,9 +1137,6 @@ opacity: 1;
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index ac30dbfea..f874d554c 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -427,8 +427,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -777,9 +775,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;

From e7e7a320d61a03141823ccb47c8587bb2541ba2e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 14:13:27 +0100
Subject: [PATCH 306/363] Add a log line in greader API.

See https://github.com/FreshRSS/FreshRSS/issues/747
---
 p/api/greader.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/p/api/greader.php b/p/api/greader.php
index 30530d60d..bbde2a867 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -152,6 +152,7 @@ function authorizationToUserConf() {
 			if (ctype_alnum($user)) {
 				$conf = get_user_configuration($user);
 				if (is_null($conf)) {
+					logMe('Invalid configuration API file for user ' . $user);
 					unauthorized();
 				}
 				$system_conf = Minz_Configuration::get('system');

From f3545208ab29ac646e3f104892aabcabe575411d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 15:00:06 +0100
Subject: [PATCH 307/363] Add log in API

See https://github.com/FreshRSS/FreshRSS/issues/747
---
 p/api/greader.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index bbde2a867..069fcd5a8 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -152,7 +152,7 @@ function authorizationToUserConf() {
 			if (ctype_alnum($user)) {
 				$conf = get_user_configuration($user);
 				if (is_null($conf)) {
-					logMe('Invalid configuration API file for user ' . $user);
+					Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.');
 					unauthorized();
 				}
 				$system_conf = Minz_Configuration::get('system');
@@ -180,6 +180,7 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 
 		$conf = get_user_configuration($email);
 		if (is_null($conf)) {
+			Minz_Log::warning('Invalid API user ' . $email . ': configuration cannot be found.');
 			unauthorized();
 		}
 

From 59760580d2e6856ee66dedb0ae33829aea29c971 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 15:14:55 +0100
Subject: [PATCH 308/363] Fix greader API

$conf->user didn't exist anymore since #730. User name had to be retrieved
by another way. It uses sessions now.

Fix https://github.com/FreshRSS/FreshRSS/issues/747
---
 p/api/greader.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 069fcd5a8..2c23b30a2 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -143,7 +143,7 @@ function checkCompatibility() {
 	exit();
 }
 
-function authorizationToUserConf() {
+function authorizationToUser() {
 	$headerAuth = headerVariable('Authorization', 'GoogleLogin_auth');	//Input is 'GoogleLogin auth', but PHP replaces spaces by '_'	http://php.net/language.variables.external
 	if ($headerAuth != '') {
 		$headerAuthX = explode('/', $headerAuth, 2);
@@ -156,8 +156,8 @@ function authorizationToUserConf() {
 					unauthorized();
 				}
 				$system_conf = Minz_Configuration::get('system');
-				if ($headerAuthX[1] === sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash)) {
-					return $conf;
+				if ($headerAuthX[1] === sha1($system_conf->salt . $user . $conf->apiPasswordHash)) {
+					return $user;
 				} else {
 					logMe('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1] . "\n");
 					Minz_Log::warning('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1]);
@@ -187,7 +187,7 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 		if ($conf->apiPasswordHash != '' && password_verify($pass, $conf->apiPasswordHash)) {
 			header('Content-Type: text/plain; charset=UTF-8');
 			$system_conf = Minz_Configuration::get('system');
-			$auth = $email . '/' . sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash);
+			$auth = $email . '/' . sha1($system_conf->salt . $email . $conf->apiPasswordHash);
 			echo 'SID=', $auth, "\n",
 				'Auth=', $auth, "\n";
 			exit();
@@ -204,18 +204,20 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 function token($conf) {
 //http://blog.martindoms.com/2009/08/15/using-the-google-reader-api-part-1/
 //https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
-	logMe('token('. $conf->user . ")\n");	//TODO: Implement real token that expires
+	$user = Minz_Session::_param('currentUser', '_');
+	logMe('token('. $user . ")\n");	//TODO: Implement real token that expires
 	$system_conf = Minz_Configuration::get('system');
-	$token = str_pad(sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
+	$token = str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
 	echo $token, "\n";
 	exit();
 }
 
 function checkToken($conf, $token) {
 //http://code.google.com/p/google-reader-api/wiki/ActionToken
+	$user = Minz_Session::_param('currentUser', '_');
 	logMe('checkToken(' . $token . ")\n");
 	$system_conf = Minz_Configuration::get('system');
-	if ($token === str_pad(sha1($system_conf->salt . $conf->user . $conf->apiPasswordHash), 57, 'Z')) {
+	if ($token === str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
 		return true;
 	}
 	unauthorized();
@@ -549,8 +551,11 @@ if (!$system_conf->api_enabled) {
 
 Minz_Session::init('FreshRSS');
 
-$conf = authorizationToUserConf();
-$user = $conf == null ? '' : $conf->user;
+$user = authorizationToUser();
+if (is_null($user)) {
+	unauthorized();
+}
+$conf = get_user_configuration($user);
 
 logMe('User => ' . $user . "\n");
 

From e8556ac1a4c00b4e44e88a7d73feca6f7462fc34 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 15:26:42 +0100
Subject: [PATCH 309/363] Change behaviour if authorizationToUser is null

authorizationToUser() returns now an empty string by default
If it returns an empty string, conf is set to null and api don't die
anymore.

Fix https://github.com/FreshRSS/FreshRSS/issues/747
---
 p/api/greader.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 2c23b30a2..20f72cc3b 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -168,7 +168,7 @@ function authorizationToUser() {
 			}
 		}
 	}
-	return null;
+	return '';
 }
 
 function clientLogin($email, $pass) {	//http://web.archive.org/web/20130604091042/http://undoc.in/clientLogin.html
@@ -552,10 +552,10 @@ if (!$system_conf->api_enabled) {
 Minz_Session::init('FreshRSS');
 
 $user = authorizationToUser();
-if (is_null($user)) {
-	unauthorized();
+$conf = null;
+if ($user !== '') {
+	$conf = get_user_configuration($user);
 }
-$conf = get_user_configuration($user);
 
 logMe('User => ' . $user . "\n");
 

From f1ffdd8b9d1f3d8742f1328dfa805664a66e34aa Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 21:13:38 +0100
Subject: [PATCH 310/363] Fix stupid bug in greader API

Replace Minz_Session::_param() by Minz_Session::param() in token()
and checkToken() functions.

Fix https://github.com/FreshRSS/FreshRSS/issues/747
---
 p/api/greader.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 20f72cc3b..ab1a02244 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -204,7 +204,7 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 function token($conf) {
 //http://blog.martindoms.com/2009/08/15/using-the-google-reader-api-part-1/
 //https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
-	$user = Minz_Session::_param('currentUser', '_');
+	$user = Minz_Session::param('currentUser', '_');
 	logMe('token('. $user . ")\n");	//TODO: Implement real token that expires
 	$system_conf = Minz_Configuration::get('system');
 	$token = str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
@@ -214,7 +214,7 @@ function token($conf) {
 
 function checkToken($conf, $token) {
 //http://code.google.com/p/google-reader-api/wiki/ActionToken
-	$user = Minz_Session::_param('currentUser', '_');
+	$user = Minz_Session::param('currentUser', '_');
 	logMe('checkToken(' . $token . ")\n");
 	$system_conf = Minz_Configuration::get('system');
 	if ($token === str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
@@ -649,7 +649,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			markAllAsRead($streamId, $ts);
 			break;
 		case 'token':
-			Token($conf);
+			token($conf);
 			break;
 	}
 } elseif ($pathInfos[1] === 'check' && $pathInfos[2] === 'compatibility') {

From 806b4de54ffd1dd682ec7b42a5be8343a464e5f0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 21:38:35 +0100
Subject: [PATCH 311/363] Add mechanism at (un)install of an extension

Test if the install or uninstall has been successfully performed.
If these methods return true, all is ok but if a string is returned,
the string must explain the problem. This problem is stored in log file.

A feedback is given to explain to check log file.

This commit fix a problem in the english translation of
feedback.sub.feed.internal_problem.
---
 app/Controllers/extensionController.php | 40 ++++++++++++++++---------
 app/i18n/en/feedback.php                | 12 ++++++--
 app/i18n/fr/feedback.php                | 10 +++++--
 lib/Minz/Extension.php                  | 14 +++++++--
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index e013bb369..692595a4c 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -88,15 +88,21 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			$ext->install();
+			$res = $ext->install();
 
-			$ext_list = $conf->extensions_enabled;
-			array_push_unique($ext_list, $ext_name);
-			$conf->extensions_enabled = $ext_list;
-			$conf->save();
+			if ($res === true) {
+				$ext_list = $conf->extensions_enabled;
+				array_push_unique($ext_list, $ext_name);
+				$conf->extensions_enabled = $ext_list;
+				$conf->save();
 
-			Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
-			                  $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.enable.ok', $ext_name),
+				                   $url_redirect);
+			} else {
+				Minz_Log::warning('Can not enable extension ' . $ext_name . ': ' . $res);
+				Minz_Request::bad(_t('feedback.extensions.enable.ko', $ext_name, _url('index', 'logs')),
+				                  $url_redirect);
+			}
 		}
 
 		Minz_Request::forward($url_redirect, true);
@@ -138,15 +144,21 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			$ext->uninstall();
+			$res = $ext->uninstall();
 
-			$ext_list = $conf->extensions_enabled;
-			array_remove($ext_list, $ext_name);
-			$conf->extensions_enabled = $ext_list;
-			$conf->save();
+			if ($res === true) {
+				$ext_list = $conf->extensions_enabled;
+				array_remove($ext_list, $ext_name);
+				$conf->extensions_enabled = $ext_list;
+				$conf->save();
 
-			Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
-			                  $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.disable.ok', $ext_name),
+				                   $url_redirect);
+			} else {
+				Minz_Log::warning('Can not unable extension ' . $ext_name . ': ' . $res);
+				Minz_Request::bad(_t('feedback.extensions.disable.ko', $ext_name, _url('index', 'logs')),
+				                  $url_redirect);
+			}
 		}
 
 		Minz_Request::forward($url_redirect, true);
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index e9499ed46..19af81e5b 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -31,8 +31,14 @@ return array(
 	),
 	'extensions' => array(
 		'already_enabled' => '%s is already enabled',
-		'disabled' => '%s is now disabled',
-		'enabled' => '%s is now enabled',
+		'disable' => array(
+			'ko' => '%s cannot be disabled. <a href="%s">Check FressRSS logs</a> for details.',
+			'ok' => '%s is now disabled',
+		),
+		'enable' => array(
+			'ko' => '%s cannot be enabled. <a href="%s">Check FressRSS logs</a> for details.',
+			'ok' => '%s is now enabled',
+		),
 		'no_access' => 'You have no access on %s',
 		'not_enabled' => '%s is not enabled yet',
 		'not_found' => '%s does not exist',
@@ -67,7 +73,7 @@ return array(
 			'already_subscribed' => 'You have already subscribed to <em>%s</em>',
 			'deleted' => 'Feed has been deleted',
 			'error' => 'Feed cannot be updated',
-			'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
+			'internal_problem' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
 			'invalid_url' => 'URL <em>%s</em> is invalid',
 			'marked_read' => 'Feeds have been marked as read',
 			'n_actualized' => '%d feeds have been updated',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index c99314411..e2364a251 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -31,8 +31,14 @@ return array(
 	),
 	'extensions' => array(
 		'already_enabled' => '%s est déjà activée',
-		'disabled' => '%s est désormais désactivée',
-		'enabled' => '%s est désormais activée',
+		'disable' => array(
+			'ko' => '%s ne peut pas être désactivée. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+			'ok' => '%s est désormais désactivée',
+		),
+		'enable' => array(
+			'ko' => '%s ne peut pas être activée. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+			'ok' => '%s est désormais activée',
+		),
 		'no_access' => 'Vous n’avez aucun accès sur %s',
 		'not_enabled' => '%s n’est pas encore activée',
 		'not_found' => '%s n’existe pas',
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index b3991c129..ac7231e9c 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -51,16 +51,26 @@ class Minz_Extension {
 	 * Used when installing an extension (e.g. update the database scheme).
 	 *
 	 * It must be redefined by child classes.
+	 *
+	 * @return true if the extension has been installed or a string explaining
+	 *         the problem.
 	 */
-	public function install() {}
+	public function install() {
+		return true;
+	}
 
 	/**
 	 * Used when uninstalling an extension (e.g. revert the database scheme to
 	 * cancel changes from install).
 	 *
 	 * It must be redefined by child classes.
+	 *
+	 * @return true if the extension has been uninstalled or a string explaining
+	 *         the problem.
 	 */
-	public function uninstall() {}
+	public function uninstall() {
+		return true;
+	}
 
 	/**
 	 * Call at the initialization of the extension (i.e. when the extension is

From ade1524d43150a45f633e6efac3d7fdea3e1d802 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 21:59:53 +0100
Subject: [PATCH 312/363] Fix valid extension entry points.

Add possibility to use underscores (_) in entrypoints.
---
 lib/Minz/ExtensionManager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 5880e80f6..3df72abb7 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -82,9 +82,10 @@ class Minz_ExtensionManager {
 	 * @return true if the array is valid, false else.
 	 */
 	public static function is_valid_metadata($meta) {
+		$valid_chars = array('_');
 		return !(empty($meta['name']) ||
 		         empty($meta['entrypoint']) ||
-		         !ctype_alnum($meta['entrypoint']));
+		         !ctype_alnum(str_replace($valid_chars, '', $meta['entrypoint'])));
 	}
 
 	/**

From 89682886005f1e6b36e664f47b3b0862d62846e6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 22:22:30 +0100
Subject: [PATCH 313/363] Fix extension API (coding style)

is_enabled() becomes isEnabled(). Sorry for this coding style mistake :s
---
 app/Controllers/extensionController.php | 4 ++--
 app/views/extension/index.phtml         | 2 +-
 lib/Minz/Extension.php                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 692595a4c..5dd7eac89 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -73,7 +73,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			if ($ext->is_enabled()) {
+			if ($ext->isEnabled()) {
 				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name),
 				                  $url_redirect);
 			}
@@ -129,7 +129,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			if (!$ext->is_enabled()) {
+			if (!$ext->isEnabled()) {
 				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name),
 				                  $url_redirect);
 			}
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index fd97c5e81..25b0eb9ee 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -14,7 +14,7 @@
 			<?php $name_encoded = urlencode($ext->getName()); ?>
 			<div class="stick">
 				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?></a>
-				<?php if ($ext->is_enabled()) { ?>
+				<?php if ($ext->isEnabled()) { ?>
 				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.disable'); ?></button>
 				<?php } else { ?>
 				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.enable'); ?></button>
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index ac7231e9c..5069362b5 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -92,7 +92,7 @@ class Minz_Extension {
 	 *
 	 * @return true if extension is enabled, false else.
 	 */
-	public function is_enabled() {
+	public function isEnabled() {
 		return $this->is_enabled;
 	}
 

From 2f1116818d7d9a6ef413b2c06e9603ffceaf7867 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 23:30:19 +0100
Subject: [PATCH 314/363] Fix extension interface

- Seperate user and system extensions on extension/index
- extension/configure shows index page with the slider opened
  if request is done with ajax
- Reorganize some extension view files
---
 app/Controllers/extensionController.php     | 13 ++++-
 app/i18n/en/admin.php                       |  8 ++-
 app/i18n/fr/admin.php                       |  8 ++-
 app/views/extension/configure.phtml         | 22 +-------
 app/views/extension/index.phtml             | 57 +++++++++++----------
 app/views/helpers/extension/configure.phtml | 19 +++++++
 app/views/helpers/extension/details.phtml   | 21 ++++++++
 7 files changed, 98 insertions(+), 50 deletions(-)
 create mode 100644 app/views/helpers/extension/configure.phtml
 create mode 100644 app/views/helpers/extension/details.phtml

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 5dd7eac89..ec5eecadb 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -20,7 +20,15 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	 */
 	public function indexAction() {
 		Minz_View::prependTitle(_t('admin.extensions.title') . ' · ');
-		$this->view->extension_list = Minz_ExtensionManager::list_extensions();
+		$this->view->extension_list = array(
+			'system' => array(),
+			'user' => array(),
+		);
+
+		$extensions = Minz_ExtensionManager::list_extensions();
+		foreach ($extensions as $ext) {
+			$this->view->extension_list[$ext->getType()][] = $ext;
+		}
 	}
 
 	/**
@@ -36,6 +44,9 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	public function configureAction() {
 		if (Minz_Request::param('ajax')) {
 			$this->view->_useLayout(false);
+		} else {
+			$this->indexAction();
+			$this->view->change_view('extension', 'index');
 		}
 
 		$ext_name = urldecode(Minz_Request::param('e'));
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 3161683a8..947d0e6c7 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -103,10 +103,16 @@ return array(
 		),
 	),
 	'extensions' => array(
+		'disabled' => 'Disabled',
 		'empty_list' => 'There is no installed extension',
+		'enabled' => 'Enabled',
 		'no_configure_view' => 'This extension cannot be configured.',
-		'system' => 'System extension (you have no rights on it)',
+		'system' => array(
+			'_' => 'System extensions',
+			'no_rights' => 'System extension (you have no rights on it)',
+		),
 		'title' => 'Extensions',
+		'user' => 'User extensions',
 	),
 	'stats' => array(
 		'_' => 'Statistics',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 3d69e4daf..980f1fccf 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -103,10 +103,16 @@ return array(
 		),
 	),
 	'extensions' => array(
+		'disabled' => 'Désactivée',
 		'empty_list' => 'Il n’y a aucune extension installée.',
+		'enabled' => 'Activée',
 		'no_configure_view' => 'Cette extension ne peut pas être configurée.',
-		'system' => 'Extension système (vous n’avez aucun droit dessus)',
+		'system' => array(
+			'_' => 'Extensions système',
+			'no_rights' => 'Extension système (vous n’avez aucun droit dessus)',
+		),
 		'title' => 'Extensions',
+		'user' => 'Extensions utilisateur',
 	),
 	'stats' => array(
 		'_' => 'Statistiques',
diff --git a/app/views/extension/configure.phtml b/app/views/extension/configure.phtml
index c03439a75..8933eeae5 100644
--- a/app/views/extension/configure.phtml
+++ b/app/views/extension/configure.phtml
@@ -1,23 +1,3 @@
 <?php
 
-if (!Minz_Request::param('ajax')) {
-	$this->partial('aside_configure');
-}
-
-?>
-
-<div class="post">
-	<h1><?php echo $this->extension->getName(); ?> (<?php echo $this->extension->getVersion(); ?>) — <?php echo $this->extension->getType(); ?></h1>
-
-	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.short.by_author', $this->extension->getAuthor()); ?></p>
-
-	<h2><?php echo _t('gen.action.manage'); ?></h2>
-	<?php
-		$configure_view = $this->extension->getConfigureView();
-		if ($configure_view !== false) {
-			echo $configure_view;
-		} else {
-	?>
-	<p class="alert alert-warn"><?php echo _t('admin.extensions.no_configure_view'); ?></p>
-	<?php } ?>
-</div>
+$this->renderHelper('extension/configure');
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 25b0eb9ee..f2d05028f 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -5,35 +5,40 @@
 
 	<h1><?php echo _t('admin.extensions.title'); ?></h1>
 
-	<?php if (!empty($this->extension_list)) { ?>
 	<form id="form-extension" method="post" style="display: none"></form>
-	<?php foreach ($this->extension_list as $ext) { ?>
-	<ul class="horizontal-list">
-		<li class="item">
-			<?php if ($ext->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
-			<?php $name_encoded = urlencode($ext->getName()); ?>
-			<div class="stick">
-				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?></a>
-				<?php if ($ext->isEnabled()) { ?>
-				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.disable'); ?></button>
-				<?php } else { ?>
-				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.enable'); ?></button>
-				<?php } ?>
-				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.action.remove'); ?></button>
-				<?php } ?>
-			</div>
-			<?php } else { ?>
-			<?php echo _t('admin.extensions.system'); ?>
-			<?php } ?>
-		</li>
-		<li class="item"><?php echo $ext->getName(); ?></li>
-	</ul>
+	<?php if (!empty($this->extension_list['system'])) { ?>
+	<h2><?php echo _t('admin.extensions.system'); ?></h2>
+	<?php
+		foreach ($this->extension_list['system'] as $ext) {
+			$this->ext_details = $ext;
+			$this->renderHelper('extension/details');
+		}
+	?>
 	<?php } ?>
-	<?php } else { ?>
+
+	<?php if (!empty($this->extension_list['user'])) { ?>
+	<h2><?php echo _t('admin.extensions.user'); ?></h2>
+	<?php
+		foreach ($this->extension_list['user'] as $ext) {
+			$this->ext_details = $ext;
+			$this->renderHelper('extension/details');
+		}
+	?>
+	<?php
+		}
+
+		if (empty($this->extension_list['system']) && empty($this->extension_list['user'])) {
+	?>
 	<p class="alert alert-warn"><?php echo _t('admin.extensions.empty_list'); ?></p>
 	<?php } ?>
 </div>
 
-<a href="#" id="close-slider"></a>
-<div id="slider"></div>
+<?php $class = isset($this->extension) ? ' class="active"' : ''; ?>
+<a href="#" id="close-slider"<?php echo $class; ?>></a>
+<div id="slider"<?php echo $class; ?>>
+<?php
+	if (isset($this->extension)) {
+		$this->renderHelper('extension/configure');
+	}
+?>
+</div>
diff --git a/app/views/helpers/extension/configure.phtml b/app/views/helpers/extension/configure.phtml
new file mode 100644
index 000000000..95d968aba
--- /dev/null
+++ b/app/views/helpers/extension/configure.phtml
@@ -0,0 +1,19 @@
+<div class="post">
+	<h1>
+		<?php echo $this->extension->getName(); ?> (<?php echo $this->extension->getVersion(); ?>) —
+		<?php echo $this->extension->isEnabled() ? _t('admin.extensions.enabled')
+		                                         : _t('admin.extensions.disabled'); ?>
+	</h1>
+
+	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.short.by_author', $this->extension->getAuthor()); ?></p>
+
+	<h2><?php echo _t('gen.action.manage'); ?></h2>
+	<?php
+		$configure_view = $this->extension->getConfigureView();
+		if ($configure_view !== false) {
+			echo $configure_view;
+		} else {
+	?>
+	<p class="alert alert-warn"><?php echo _t('admin.extensions.no_configure_view'); ?></p>
+	<?php } ?>
+</div>
diff --git a/app/views/helpers/extension/details.phtml b/app/views/helpers/extension/details.phtml
new file mode 100644
index 000000000..acba4e816
--- /dev/null
+++ b/app/views/helpers/extension/details.phtml
@@ -0,0 +1,21 @@
+<ul class="horizontal-list">
+	<li class="item">
+		<?php if ($this->ext_details->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
+		<?php $name_encoded = urlencode($this->ext_details->getName()); ?>
+		<div class="stick">
+			<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?></a>
+			<?php if ($this->ext_details->isEnabled()) { ?>
+			<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.disable'); ?></button>
+			<?php } else { ?>
+			<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.enable'); ?></button>
+			<?php } ?>
+			<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+			<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.action.remove'); ?></button>
+			<?php } ?>
+		</div>
+		<?php } else { ?>
+		<?php echo _t('admin.extensions.system.no_rights'); ?>
+		<?php } ?>
+	</li>
+	<li class="item"><?php echo $this->ext_details->getName(); ?></li>
+</ul>

From 789d9fc6c8647fa100d80e3ef52727c813f35f16 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 23:40:18 +0100
Subject: [PATCH 315/363] Fix coding style in extension manager

Yep, same as 8968288...
---
 app/Controllers/extensionController.php | 10 +++++-----
 app/FreshRSS.php                        |  2 +-
 lib/Minz/ExtensionManager.php           | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index ec5eecadb..b6d2d3fe4 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -25,7 +25,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			'user' => array(),
 		);
 
-		$extensions = Minz_ExtensionManager::list_extensions();
+		$extensions = Minz_ExtensionManager::listExtensions();
 		foreach ($extensions as $ext) {
 			$this->view->extension_list[$ext->getType()][] = $ext;
 		}
@@ -50,7 +50,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 
 		$ext_name = urldecode(Minz_Request::param('e'));
-		$ext = Minz_ExtensionManager::find_extension($ext_name);
+		$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 		if (is_null($ext)) {
 			Minz_Error::error(404);
@@ -77,7 +77,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 
 		if (Minz_Request::isPost()) {
 			$ext_name = urldecode(Minz_Request::param('e'));
-			$ext = Minz_ExtensionManager::find_extension($ext_name);
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
 				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
@@ -133,7 +133,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 
 		if (Minz_Request::isPost()) {
 			$ext_name = urldecode(Minz_Request::param('e'));
-			$ext = Minz_ExtensionManager::find_extension($ext_name);
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
 				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
@@ -193,7 +193,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 
 		if (Minz_Request::isPost()) {
 			$ext_name = urldecode(Minz_Request::param('e'));
-			$ext = Minz_ExtensionManager::find_extension($ext_name);
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
 				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 785b10299..021687999 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -53,7 +53,7 @@ class FreshRSS extends Minz_FrontController {
 		// Enable extensions for the current (logged) user.
 		if (FreshRSS_Auth::hasAccess()) {
 			$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
-			Minz_ExtensionManager::enable_by_list($ext_list);
+			Minz_ExtensionManager::enableByList($ext_list);
 		}
 	}
 
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 3df72abb7..8369e242a 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -52,7 +52,7 @@ class Minz_ExtensionManager {
 			}
 			$meta_raw_content = file_get_contents($metadata_filename);
 			$meta_json = json_decode($meta_raw_content, true);
-			if (!$meta_json || !self::is_valid_metadata($meta_json)) {
+			if (!$meta_json || !self::isValidMetadata($meta_json)) {
 				// metadata.json is not a json file? Invalid!
 				// or metadata.json is invalid (no required information), invalid!
 				Minz_Log::warning('`' . $metadata_filename . '` is not a valid metadata file');
@@ -81,7 +81,7 @@ class Minz_ExtensionManager {
 	 * @param $meta is an array of values.
 	 * @return true if the array is valid, false else.
 	 */
-	public static function is_valid_metadata($meta) {
+	public static function isValidMetadata($meta) {
 		$valid_chars = array('_');
 		return !(empty($meta['name']) ||
 		         empty($meta['entrypoint']) ||
@@ -168,7 +168,7 @@ class Minz_ExtensionManager {
 	 *
 	 * @param $ext_list the names of extensions we want to load.
 	 */
-	public static function enable_by_list($ext_list) {
+	public static function enableByList($ext_list) {
 		foreach ($ext_list as $ext_name) {
 			self::enable($ext_name);
 		}
@@ -180,7 +180,7 @@ class Minz_ExtensionManager {
 	 * @param $only_enabled if true returns only the enabled extensions (false by default).
 	 * @return an array of extensions.
 	 */
-	public static function list_extensions($only_enabled = false) {
+	public static function listExtensions($only_enabled = false) {
 		if ($only_enabled) {
 			return self::$ext_list_enabled;
 		} else {
@@ -194,7 +194,7 @@ class Minz_ExtensionManager {
 	 * @param $ext_name the name of the extension.
 	 * @return the corresponding extension or null if it doesn't exist.
 	 */
-	public static function find_extension($ext_name) {
+	public static function findExtension($ext_name) {
 		if (!isset(self::$ext_list[$ext_name])) {
 			return null;
 		}

From 81dac9975d0c662467cc2625154da2568457e3dd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 23:47:06 +0100
Subject: [PATCH 316/363] Fix aside_configure for extension/configure action

---
 app/layout/aside_configure.phtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 2d4cb9cad..7567a8206 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -22,8 +22,7 @@
 	                          Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
 		<a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::controllerName() === 'extension' &&
-	                          Minz_Request::actionName() === 'index'? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::controllerName() === 'extension' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a>
 	</li>
 	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>

From 556f4ad4bfa722e3350f20ab91a08f0af1d11f9e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 15 Jan 2015 11:20:16 +0100
Subject: [PATCH 317/363] Remove restriction of 1h for update checking

---
 app/Controllers/updateController.php | 8 +++-----
 app/views/update/index.phtml         | 8 +-------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 4bdd96f6d..1ea5816da 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -11,11 +11,9 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 		$this->view->update_to_apply = false;
 		$this->view->last_update_time = 'unknown';
-		$this->view->check_last_hour = false;
 		$timestamp = @filemtime(join_path(DATA_PATH, 'last_update.txt'));
 		if ($timestamp !== false) {
 			$this->view->last_update_time = timestamptodate($timestamp);
-			$this->view->check_last_hour = (time() - 3600) <= $timestamp;
 		}
 	}
 
@@ -43,11 +41,11 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	public function checkAction() {
 		$this->view->change_view('update', 'index');
 
-		if (file_exists(UPDATE_FILENAME) || $this->view->check_last_hour) {
+		if (file_exists(UPDATE_FILENAME)) {
 			// There is already an update file to apply: we don't need to check
 			// the webserver!
 			// Or if already check during the last hour, do nothing.
-			Minz_Request::forward(array('c' => 'update'));
+			Minz_Request::forward(array('c' => 'update'), true);
 
 			return;
 		}
@@ -94,7 +92,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			$version = $version[1];
 			@file_put_contents(join_path(DATA_PATH, 'last_update.txt'), $version);
 
-			Minz_Request::forward(array('c' => 'update'));
+			Minz_Request::forward(array('c' => 'update'), true);
 		} else {
 			$this->view->message = array(
 				'status' => 'bad',
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index 4c88a0d18..da1bc7ef5 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -18,16 +18,10 @@
 		<span class="alert-head"><?php echo $this->message['title']; ?></span>
 		<?php echo $this->message['body']; ?>
 	</p>
-	<?php } elseif ($this->check_last_hour) { ?>
-	<p class="alert alert-warn">
-		<span class="alert-head"><?php echo _t('gen.short.damn'); ?></span>
-		<?php echo _t('admin.update.none'); ?>
-	</p>
 	<?php } ?>
 
 	<?php
-		if (!$this->check_last_hour &&
-				(empty($this->message) || $this->message['status'] !== 'good')) {
+		if (empty($this->message) || $this->message['status'] !== 'good') {
 	?>
 	<p>
 		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('admin.update.check'); ?></a>

From 13cf8b5f9f22a50bba5d1223174407abb1c1d94c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 15 Jan 2015 12:02:42 +0100
Subject: [PATCH 318/363] Improve hook calls and add post_update hook

- To the hook is associated a method signature (OneToOne or NoneToNone for now) so
  it is easier to call hooks correctly
- post_update hook is called during the post update moment.
---
 app/Controllers/updateController.php |  2 +
 lib/Minz/ExtensionManager.php        | 76 +++++++++++++++++++++++-----
 2 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 1ea5816da..61b62773b 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -112,6 +112,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		if (Minz_Request::param('post_conf', false)) {
 			$res = do_post_update();
 
+			Minz_ExtensionManager::callHook('post_update');
+
 			if ($res === true) {
 				@unlink(UPDATE_FILENAME);
 				@file_put_contents(join_path(DATA_PATH, 'last_update.txt'), '');
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 8369e242a..7edc7afaa 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -15,9 +15,22 @@ class Minz_ExtensionManager {
 
 	// List of available hooks. Please keep this list sorted.
 	private static $hook_list = array(
-		'entry_before_display' => array(),  // function($entry) -> Entry | null
-		'entry_before_insert' => array(),  // function($entry) -> Entry | null
-		'feed_before_insert' => array(),  // function($feed) -> Feed | null
+		'entry_before_display' => array(  // function($entry) -> Entry | null
+			'list' => array(),
+			'signature' => 'OneToOne',
+		),
+		'entry_before_insert' => array(  // function($entry) -> Entry | null
+			'list' => array(),
+			'signature' => 'OneToOne',
+		),
+		'feed_before_insert' => array(  // function($feed) -> Feed | null
+			'list' => array(),
+			'signature' => 'OneToOne',
+		),
+		'post_update' => array(  // function(none) -> none
+			'list' => array(),
+			'signature' => 'NoneToNone',
+		),
 	);
 	private static $ext_to_hooks = array();
 
@@ -214,7 +227,7 @@ class Minz_ExtensionManager {
 	 */
 	public static function addHook($hook_name, $hook_function, $ext) {
 		if (isset(self::$hook_list[$hook_name]) && is_callable($hook_function)) {
-			self::$hook_list[$hook_name][] = $hook_function;
+			self::$hook_list[$hook_name]['list'][] = $hook_function;
 			self::$ext_to_hooks[$ext->getName()][] = $hook_name;
 		}
 	}
@@ -226,25 +239,60 @@ class Minz_ExtensionManager {
 	 * array keys.
 	 *
 	 * @param $hook_name the hook to call.
-	 * @param additionnal parameters (for signature, please see self::$hook_list comments)
-	 * @todo hook functions will have different signatures. So the $res = func($args);
-	 *       $args = $res; will not work for all of them in the future. We must
-	 *       find a better way to call hooks.
+	 * @param additionnal parameters (for signature, please see self::$hook_list).
+	 * @return the final result of the called hook.
 	 */
 	public static function callHook($hook_name) {
-		$args = func_get_args();
-		unset($args[0]);
+		if (!isset(self::$hook_list[$hook_name])) {
+			return;
+		}
 
-		$result = $args[1];
-		foreach (self::$hook_list[$hook_name] as $function) {
-			$result = call_user_func_array($function, $args);
+		$signature = self::$hook_list[$hook_name]['signature'];
+		$signature = 'self::call' . $signature;
+		$args = func_get_args();
+
+		return call_user_func_array($signature, $args);
+	}
+
+	/**
+	 * Call a hook which takes one argument and return a result.
+	 *
+	 * The result is chained between the extension, for instance, first extension
+	 * hook will receive the initial argument and return a result which will be
+	 * passed as an argument to the next extension hook and so on.
+	 *
+	 * If a hook return a null value, the method is stopped and return null.
+	 *
+	 * @param $hook_name is the hook to call.
+	 * @param $arg is the argument to pass to the first extension hook.
+	 * @return the final chained result of the hooks. If nothing is changed,
+	 *         the initial argument is returned.
+	 */
+	private static function callOneToOne($hook_name, $arg) {
+		$result = $arg;
+		foreach (self::$hook_list[$hook_name]['list'] as $function) {
+			$result = call_user_func($function, $arg);
 
 			if (is_null($result)) {
 				break;
 			}
 
-			$args = $result;
+			$arg = $result;
 		}
 		return $result;
 	}
+
+	/**
+	 * Call a hook which takes no argument and returns nothing.
+	 *
+	 * This case is simpler than callOneToOne because hooks are called one by
+	 * one, without any consideration of argument nor result.
+	 *
+	 * @param $hook_name is the hook to call.
+	 */
+	private static function callNoneToNone($hook_name) {
+		foreach (self::$hook_list[$hook_name]['list'] as $function) {
+			call_user_func($function);
+		}
+	}
 }

From 2039710d12f8f705b7eb9233ae3cc130f6e4e7c9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 15 Jan 2015 13:43:05 +0100
Subject: [PATCH 319/363] Avoid "PHP Strict Standards" error

A "Only variables should be passed by reference" error was raised in the
extension->getFileUrl() method.
---
 lib/Minz/Extension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index 5069362b5..d7ee8fe81 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -159,7 +159,7 @@ class Minz_Extension {
 	 * @return the url corresponding to the file.
 	 */
 	public function getFileUrl($filename, $type) {
-		$dir = end(explode('/', $this->path));
+		$dir = substr(strrchr($this->path, '/'), 1);
 		$file_name_url = urlencode($dir . '/static/' . $filename);
 
 		$absolute_path = $this->path . '/static/' . $filename;

From 4c143426712f75fa04999f4e8b3c0b6900bf062d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 15 Jan 2015 14:15:03 +0100
Subject: [PATCH 320/363] Update the CHANGELOG

---
 CHANGELOG | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1e2c6bfb3..2eca6fef3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,12 +3,18 @@
 ## 2015-01-15 FreshRSS 0.9.4 (beta)
 
 * Feature
-	* Extension system (!!)
+	* Extension system (!!): some extensions are available at https://github.com/FreshRSS/Extensions
 * Refactoring
 	* Front controller (FreshRSS class)
 	* Configuration system
 	* Sharing system
 	* New data files organization
+* Updates
+	* Remove restriction of 1h for updates
+	* Show the current version of FreshRSS and the next one
+* UI
+	* Remove the "sticky position" of the feed aside (moved into an extension)
+	* "Show password" shows the password only while the user is pressing the mouse.
 
 
 ## 2014-12-12 FreshRSS 0.9.3 (beta)

From 9483c6cf6759364678ca37d3f8379d35c72a8675 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 16 Jan 2015 23:20:59 +0100
Subject: [PATCH 321/363] Fix bug if a shortcut is not in the initial config

A new shortcut was never saved because ConfigurationSetter never set a
shortcut which did not appear in the initial conf.
---
 app/Models/ConfigurationSetter.php | 4 +---
 app/views/configure/shortcut.phtml | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index f1c465c7c..e808630b4 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -154,9 +154,7 @@ class FreshRSS_ConfigurationSetter {
 
 	private function _shortcuts(&$data, $values) {
 		foreach ($values as $key => $value) {
-			if (isset($data['shortcuts'][$key])) {
-				$data['shortcuts'][$key] = $value;
-			}
+			$data['shortcuts'][$key] = $value;
 		}
 	}
 
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index fdbeed3ea..f68091af9 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -114,7 +114,7 @@
 		<div class="form-group">
 			<label class="group-name" for="close_dropdown_shortcut"><?php echo _t('conf.shortcut.close_dropdown'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
+				<input type="text" id="close_dropdown" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
 			</div>
 		</div>
 

From f3d74b59e8957dfa7793125aaf71f47e088008d4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 16 Jan 2015 23:26:29 +0100
Subject: [PATCH 322/363] Fix a bug when default view is the global one.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If default view is "global", the popup tried to get articles on the
default view which was… "global"! Articles are present on the "normal" view
instead.
---
 app/views/index/global.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index cf95bd0f5..0ffa3bc54 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -13,7 +13,7 @@
 <?php
 	$url_base = array(
 		'c' => 'index',
-		'a' => 'index',
+		'a' => 'normal',
 		'params' => Minz_Request::params()
 	);
 

From fa376f746aa18d9c1e830f1f39567003cb14eaf4 Mon Sep 17 00:00:00 2001
From: Melvyn <melvyn.laily@gmail.com>
Date: Fri, 16 Jan 2015 23:31:55 +0100
Subject: [PATCH 323/363] Updated README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 971d53ea6..430dd82bc 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ The best way is to open issues on GitHub
 * PHP 5.2.1+ (PHP 5.3.7+ recommanded)
 	* Required extensions: [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (only for API access on platforms under 64 bits)
 	* Recommanded extensions : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
-* MySQL 5.0.3+ (recommanded) ou SQLite 3.7.4+
+* MySQL 5.0.3+ (recommanded) or SQLite 3.7.4+
 * A recent browser like Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
 	* Works on mobile
 
@@ -70,9 +70,9 @@ For example, if you want to run the script every hour:
 
 # Advices
 * For a better security, expose only the `./p/` folder on the web.
-	* Be aware that the `./data/` folder contain all personal data, so it is a bad idea to expose it.
-* The `./constants.php` file define access to application folder. If you want to customize your installation, every thing happens here.
-* If you encounter some problem, logs are accessibles from the interface or manually in `./data/log/*.log` files.
+	* Be aware that the `./data/` folder contains all personal data, so it is a bad idea to expose it.
+* The `./constants.php` file defines access to application folder. If you want to customize your installation, every thing happens here.
+* If you encounter any problem, logs are accessibles from the interface or manually in `./data/log/*.log` files.
 
 # Backup
 * You need to keep `./data/config.php`, `./data/*_user.php` and `./data/persona/` files

From 409e09f68516be23f564be81f82f3a8af10a0bbf Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 16 Jan 2015 23:38:12 +0100
Subject: [PATCH 324/363] Simplify shortcut setter

---
 app/Models/ConfigurationSetter.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index e808630b4..7fd0836c1 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -153,9 +153,11 @@ class FreshRSS_ConfigurationSetter {
 	}
 
 	private function _shortcuts(&$data, $values) {
-		foreach ($values as $key => $value) {
-			$data['shortcuts'][$key] = $value;
+		if (!is_array($values)) {
+			return;
 		}
+
+		$data['shortcuts'] = $values;
 	}
 
 	private function _sort_order(&$data, $value) {

From 6b560c61330b254e794057ef36515e4c751114f4 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 17 Jan 2015 00:08:06 -0500
Subject: [PATCH 325/363] Fix slider css rule (see issue #750)

---
 p/themes/Dark/dark.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index dd7502f25..d461040d8 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -955,6 +955,9 @@ a.btn {
 	background: #111;
 	color: #eee;
 }
+#slider.active {
+	background-color: #1c1c1c;
+}
 
 /*=== MOBILE */
 /*===========*/

From 53cdfc660fb7e7067bd73eb78e2721b97cde2740 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 17 Jan 2015 11:38:27 +0100
Subject: [PATCH 326/363] Fix #slider in Dark theme

See https://github.com/FreshRSS/FreshRSS/commit/6b560c61330b254e794057ef36515e4c751114f4
Fix https://github.com/FreshRSS/FreshRSS/issues/750
---
 p/themes/Dark/dark.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index d461040d8..cd2f85ebf 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -879,6 +879,12 @@ a.btn {
 	border-radius: 3px;
 }
 
+/*=== Slider */
+#slider {
+	background-color: #1c1c1c;
+	border-left: 1px solid #666;
+}
+
 /*=== DIVERS */
 /*===========*/
 .aside.aside_feed .nav-form input,
@@ -955,9 +961,6 @@ a.btn {
 	background: #111;
 	color: #eee;
 }
-#slider.active {
-	background-color: #1c1c1c;
-}
 
 /*=== MOBILE */
 /*===========*/

From b17cdadf15f21dc1e39ec3b270da6ae031072203 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 17 Jan 2015 10:42:24 -0500
Subject: [PATCH 327/363] Add the first unit test

Add phpunit configuration to run tests and add the first running test to validate the configuration
---
 tests/app/Models/CategoryTest.php | 32 +++++++++++++++++++++++++++++++
 tests/bootstrap.php               |  7 +++++++
 tests/phpunit.xml                 | 13 +++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 tests/app/Models/CategoryTest.php
 create mode 100644 tests/bootstrap.php
 create mode 100644 tests/phpunit.xml

diff --git a/tests/app/Models/CategoryTest.php b/tests/app/Models/CategoryTest.php
new file mode 100644
index 000000000..da439b785
--- /dev/null
+++ b/tests/app/Models/CategoryTest.php
@@ -0,0 +1,32 @@
+<?php
+
+class FreshRSS_CategoryTest extends \PHPUnit_Framework_TestCase {
+
+	public function test__construct_whenNoParameters_createsObjectWithDefaultValues() {
+		$category = new FreshRSS_Category();
+		$this->assertEquals(0, $category->id());
+		$this->assertEquals('', $category->name());
+	}
+
+	/**
+	 * @param string $input
+	 * @param string $expected
+	 * @dataProvider provideValidNames
+	 */
+	public function test_name_whenValidValue_storesModifiedValue($input, $expected) {
+		$category = new FreshRSS_Category($input);
+		$this->assertEquals($expected, $category->name());
+	}
+
+	public function provideValidNames() {
+		return array(
+		    array('', ''),
+		    array('this string does not need trimming', 'this string does not need trimming'),
+		    array('  this string needs trimming on left', 'this string needs trimming on left'),
+		    array('this string needs trimming on right  ', 'this string needs trimming on right'),
+		    array('  this string needs trimming on both ends  ', 'this string needs trimming on both ends'),
+		    array(str_repeat('This string needs to be shortened because its length is way too long. ', 4), str_repeat('This string needs to be shortened because its length is way too long. ', 3) . 'This string needs to be shortened because its'),
+		);
+	}
+
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000..24340b15c
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+require('../constants.php');
+require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
\ No newline at end of file
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
new file mode 100644
index 000000000..f639637ec
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="bootstrap.php">
+	<filter>
+		<whitelist>
+			<directory suffix=".php">../app</directory>
+		</whitelist>
+	</filter>
+	<testsuites>
+		<testsuite name="FreshRSS">
+			<directory>app</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>
\ No newline at end of file

From fa2254cd313f538d74850a67bc062f24626d009d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 17 Jan 2015 23:07:57 +0100
Subject: [PATCH 328/363] Fix i18n string for errors in feed management

See https://github.com/FreshRSS/FreshRSS/issues/755
---
 app/Controllers/subscriptionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 6152b7252..e98b1f640 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -108,7 +108,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 
 				Minz_Request::good(_t('feedback.sub.feed.updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
 			} else {
-				Minz_Request::bad(_t('feedback.sub.error'), array('c' => 'subscription'));
+				Minz_Request::bad(_t('feedback.sub.feed.error'), array('c' => 'subscription'));
 			}
 		}
 	}

From d91a92434f516a9e25bf0dca608a0221094d0489 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 18 Jan 2015 11:47:16 +0100
Subject: [PATCH 329/363] Fix Minz_Error and error_Controller

- Error code and logs was not propagated from Minz_Error to the controller
- header was bad (200 instead of 404 or 403)

Related to https://github.com/FreshRSS/FreshRSS/issues/751
---
 app/Controllers/errorController.php | 42 +++++++++++++++--------------
 lib/Minz/Error.php                  | 39 ++++-----------------------
 2 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 06fa186cf..b0bafda72 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -9,41 +9,43 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 	 *
 	 * It is called by Minz_Error::error() method.
 	 *
-	 * Parameters are:
-	 *   - code (default: 404)
-	 *   - logs (default: array())
+	 * Parameters are passed by Minz_Session to have a proper url:
+	 *   - error_code (default: 404)
+	 *   - error_logs (default: array())
 	 */
 	public function indexAction() {
-		$code_int = Minz_Request::param('code', 404);
+		$code_int = Minz_Session::param('error_code', 404);
+		$error_logs = Minz_Session::param('error_logs', array());
+		Minz_Session::_param('error_code');
+		Minz_Session::_param('error_logs');
+
 		switch ($code_int) {
-		case 403:
-			$this->view->code = 'Error 403 - Forbidden';
+		case 200 :
+			header('HTTP/1.1 200 OK');
 			break;
-		case 404:
-			$this->view->code = 'Error 404 - Not found';
+		case 403:
+			header('HTTP/1.1 403 Forbidden');
+			$this->view->code = 'Error 403 - Forbidden';
+			$this->view->errorMessage = _t('feedback.access.denied');
 			break;
 		case 500:
+			header('HTTP/1.1 500 Internal Server Error');
 			$this->view->code = 'Error 500 - Internal Server Error';
 			break;
 		case 503:
+			header('HTTP/1.1 503 Service Unavailable');
 			$this->view->code = 'Error 503 - Service Unavailable';
 			break;
+		case 404:
 		default:
+			header('HTTP/1.1 404 Not Found');
 			$this->view->code = 'Error 404 - Not found';
+			$this->view->errorMessage = _t('feedback.access.not_found');
 		}
 
-		$errors = Minz_Request::param('logs', array());
-		$this->view->errorMessage = trim(implode($errors));
-		if ($this->view->errorMessage == '') {
-			switch($code_int) {
-			case 403:
-				$this->view->errorMessage = _t('feedback.access.denied');
-				break;
-			case 404:
-			default:
-				$this->view->errorMessage = _t('feedback.access.not_found');
-				break;
-			}
+		$error_message = trim(implode($error_logs));
+		if ($error_message !== '') {
+			$this->view->errorMessage = $error_message;
 		}
 
 		Minz_View::prependTitle($this->view->code . ' · ');
diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php
index 3eadc6d98..3e4a3e8f3 100644
--- a/lib/Minz/Error.php
+++ b/lib/Minz/Error.php
@@ -23,42 +23,13 @@ class Minz_Error {
 		$logs = self::processLogs ($logs);
 		$error_filename = APP_PATH . '/Controllers/errorController.php';
 
-		switch ($code) {
-			case 200 :
-				header('HTTP/1.1 200 OK');
-				break;
-			case 403 :
-				header('HTTP/1.1 403 Forbidden');
-				break;
-			case 404 :
-				header('HTTP/1.1 404 Not Found');
-				break;
-			case 500 :
-				header('HTTP/1.1 500 Internal Server Error');
-				break;
-			case 503 :
-				header('HTTP/1.1 503 Service Unavailable');
-				break;
-			default :
-				header('HTTP/1.1 500 Internal Server Error');
-		}
-
 		if (file_exists ($error_filename)) {
-			$params = array (
-				'code' => $code,
-				'logs' => $logs
-			);
+			Minz_Session::_param('error_code', $code);
+			Minz_Session::_param('error_logs', $logs);
 
-			if ($redirect) {
-				Minz_Request::forward (array (
-					'c' => 'error'
-				), true);
-			} else {
-				Minz_Request::forward (array (
-					'c' => 'error',
-					'params' => $params
-				), false);
-			}
+			Minz_Request::forward (array (
+				'c' => 'error'
+			), $redirect);
 		} else {
 			echo '<h1>An error occured</h1>' . "\n";
 

From 14206aca160355507ae50e6337c798733e730c15 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 18 Jan 2015 11:59:03 +0100
Subject: [PATCH 330/363] Improve behavior when mark as read / favorite fail

If the request fails:
- Open a notification to inform user
- Remove pending index from the pending_feeds list

Fix https://github.com/FreshRSS/FreshRSS/issues/751
---
 app/i18n/en/gen.php                     | 3 +++
 app/i18n/fr/gen.php                     | 3 +++
 app/views/helpers/javascript_vars.phtml | 1 +
 p/scripts/main.js                       | 6 ++++++
 4 files changed, 13 insertions(+)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 6271717d4..539feaf40 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -95,6 +95,9 @@ return array(
 		'category_empty' => 'Empty category',
 		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
 		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+		'feedback' => array(
+			'request_failed' => 'A problem happened and the request failed.'
+		),
 		'new_article' => 'There are new available articles, click to refresh the page.',
 		'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS: new articles!',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 6b449484f..05ff9c38d 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -95,6 +95,9 @@ return array(
 		'category_empty' => 'Catégorie vide',
 		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
 		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
+		'feedback' => array(
+			'request_failed' => 'Un problème est survenu et la requête a échoué.'
+		),
 		'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 		'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index fec3a6f7c..1fef13b52 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -62,6 +62,7 @@ echo 'i18n={',
 	'confirmation_default:"', _t('gen.js.confirm_action'), '",',
 	'notif_title_articles:"', _t('gen.js.notif_title_new_articles'), '",',
 	'notif_body_articles:"', _t('gen.js.notif_body_new_articles'), '",',
+	'notif_request_failed:"', _t('gen.js.feedback.request_failed'), '",',
 	'category_empty:"', _t('gen.js.category_empty'), '"',
 "},\n";
 
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 9b6524b01..0561097e5 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -154,6 +154,9 @@ function mark_read(active, only_not_read) {
 		incUnreadsFeed(active, feed_id, inc);
 		faviconNbUnread();
 
+		pending_feeds.splice(index_pending, 1);
+	}).fail(function (data) {
+		openNotification(i18n.notif_request_failed, 'bad');
 		pending_feeds.splice(index_pending, 1);
 	});
 }
@@ -209,6 +212,9 @@ function mark_favorite(active) {
 			}
 		}
 
+		pending_feeds.splice(index_pending, 1);
+	}).fail(function (data) {
+		openNotification(i18n.notif_request_failed, 'bad');
 		pending_feeds.splice(index_pending, 1);
 	});
 }

From bf2f7176ee639ab42e929e7331939da5258165c5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 18 Jan 2015 12:06:40 +0100
Subject: [PATCH 331/363] Improve i18n for JavaScript

notif_* messages have been moved into feedback array.
---
 app/i18n/en/gen.php                     | 6 +++---
 app/i18n/fr/gen.php                     | 6 +++---
 app/views/helpers/javascript_vars.phtml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 539feaf40..4e9e2e7d6 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -96,11 +96,11 @@ return array(
 		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
 		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
 		'feedback' => array(
-			'request_failed' => 'A problem happened and the request failed.'
+			'body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+			'request_failed' => 'A problem happened and the request failed.',
+			'title_new_articles' => 'FreshRSS: new articles!',
 		),
 		'new_article' => 'There are new available articles, click to refresh the page.',
-		'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
-		'notif_title_new_articles' => 'FreshRSS: new articles!',
 		'should_be_activated' => 'JavaScript must be enabled',
 	),
 	'lang' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 05ff9c38d..10b2c8d28 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -96,11 +96,11 @@ return array(
 		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
 		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
 		'feedback' => array(
-			'request_failed' => 'Un problème est survenu et la requête a échoué.'
+			'body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+			'request_failed' => 'Un problème est survenu et la requête a échoué.',
+			'title_new_articles' => 'FreshRSS : nouveaux articles !',
 		),
 		'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
-		'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
-		'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
 		'should_be_activated' => 'Le JavaScript doit être activé.',
 	),
 	'lang' => array(
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 1fef13b52..613521f0f 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -60,8 +60,8 @@ echo 'url={',
 
 echo 'i18n={',
 	'confirmation_default:"', _t('gen.js.confirm_action'), '",',
-	'notif_title_articles:"', _t('gen.js.notif_title_new_articles'), '",',
-	'notif_body_articles:"', _t('gen.js.notif_body_new_articles'), '",',
+	'notif_title_articles:"', _t('gen.js.feedback.title_new_articles'), '",',
+	'notif_body_articles:"', _t('gen.js.feedback.body_new_articles'), '",',
 	'notif_request_failed:"', _t('gen.js.feedback.request_failed'), '",',
 	'category_empty:"', _t('gen.js.category_empty'), '"',
 "},\n";

From 9e406394950b6df386918fa5f21ff110d726cd08 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 18 Jan 2015 12:33:55 +0100
Subject: [PATCH 332/363] Enlarge the .item.date to contain larger date

I know it's not the best solution, a dynamic width would be the best but there
are some CSS constraints. I don't want to spend my time on this problem ;)

Fix https://github.com/FreshRSS/FreshRSS/issues/756
---
 p/themes/base-theme/template.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 25f206106..c6ea40f66 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -485,7 +485,7 @@ a.btn {
 	text-decoration: none;
 }
 .flux .item.date {
-	width: 145px;
+	width: 155px;
 	text-align: right;
 	overflow: hidden;
 }

From 517d5aa9c52694b21f66d429085348d2e4fd10d2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 18 Jan 2015 12:49:49 +0100
Subject: [PATCH 333/363] Fix feed update with MySQL/MariaDB

- updateFeed() returns 0 if nothing changes so the test was false.
- Redirection in case of error is better now by redirecting on the right feed

Fix https://github.com/FreshRSS/FreshRSS/issues/755
---
 app/Controllers/subscriptionController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index e98b1f640..333565faf 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -102,13 +102,14 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 
 			invalidateHttpCache();
 
-			if ($feedDAO->updateFeed($id, $values)) {
+			$url_redirect = array('c' => 'subscription', 'params' => array('id' => $id));
+			if ($feedDAO->updateFeed($id, $values) !== false) {
 				$this->view->feed->_category($cat);
 				$this->view->feed->faviconPrepare();
 
-				Minz_Request::good(_t('feedback.sub.feed.updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
+				Minz_Request::good(_t('feedback.sub.feed.updated'), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('feedback.sub.feed.error'), array('c' => 'subscription'));
+				Minz_Request::bad(_t('feedback.sub.feed.error'), $url_redirect);
 			}
 		}
 	}

From 711ef5546cd218f81595e6e3b479b929ffeb3bc7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 18 Jan 2015 13:04:08 +0100
Subject: [PATCH 334/363] Fix mark_when setter

mark_when was not taken in consideration.
---
 app/Models/ConfigurationSetter.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 7fd0836c1..eeb1f2f4c 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -210,9 +210,7 @@ class FreshRSS_ConfigurationSetter {
 
 	private function _mark_when(&$data, $values) {
 		foreach ($values as $key => $value) {
-			if (isset($data['mark_when'][$key])) {
-				$data['mark_when'][$key] = $this->handleBool($value);
-			}
+			$data['mark_when'][$key] = $this->handleBool($value);
 		}
 	}
 

From 8b94141fec20f055e17aebe86002cd87d8acf8ad Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 19 Jan 2015 12:14:04 +0100
Subject: [PATCH 335/363] Add CREDIT file with name of all contributors

Contributor list comes from https://github.com/FreshRSS/FreshRSS/graphs/contributors
Note I didn't take responsability to add information such as personal website
or email address. If you want these information appear feel free to update
the file!
---
 CREDITS | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 CREDITS

diff --git a/CREDITS b/CREDITS
new file mode 100644
index 000000000..d88535a99
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1,36 @@
+This is a credit file of people who have contributed to FreshRSS with, at least,
+one commit on the FreshRSS repository (at https://github.com/FreshRSS/FreshRSS).
+Please note a commit on THIS specific file is not considered as a contribution
+(too easy!). It's purpose is to show even the smallest contribution is important.
+People are sorted by name so please keep this order.
+
+---
+
+Alexandre Alapetite
+https://github.com/Alkarex
+
+Alexis Degrugillier
+https://github.com/aledeg
+
+Alwaysin
+https://github.com/Alwaysin
+
+Amaury Carrade
+https://github.com/AmauryCarrade
+
+Luc Didry
+https://github.com/ldidry
+
+Marien Fressinaud
+dev@marienfressinaud.fr
+http://marienfressinaud.fr
+https://github.com/marienfressinaud
+
+Nicolas Elie
+https://github.com/nicolaselie
+
+plopoyop
+https://github.com/plopoyop
+
+tomgue
+https://github.com/tomgue

From d30b3becfa50b96982a3b4880c07cc2b770d7eed Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Mon, 19 Jan 2015 13:54:57 +0100
Subject: [PATCH 336/363] Addressed warnings when reading from new files

There were warnings when reading extensions (trying to use e.g. README
and .gitignore as directories), and when reading update file.
https://github.com/FreshRSS/FreshRSS/issues/733
---
 app/Controllers/updateController.php | 5 ++++-
 lib/Minz/ExtensionManager.php        | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 61b62773b..4797a3486 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -28,7 +28,10 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			);
 		} elseif (file_exists(UPDATE_FILENAME)) {
 			// There is an update file to apply!
-			$version = file_get_contents(join_path(DATA_PATH, 'last_update.txt'));
+			$version = @file_get_contents(join_path(DATA_PATH, 'last_update.txt'));
+			if (empty($version)) {
+				$version = 'unknown';
+			}
 			$this->view->update_to_apply = true;
 			$this->view->message = array(
 				'status' => 'good',
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 7edc7afaa..f00453f6c 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -56,6 +56,9 @@ class Minz_ExtensionManager {
 
 		foreach ($list_potential_extensions as $ext_dir) {
 			$ext_pathname = EXTENSIONS_PATH . '/' . $ext_dir;
+			if (!is_dir($ext_pathname)) {
+				continue;
+			}
 			$metadata_filename = $ext_pathname . '/' . self::$ext_metaname;
 
 			// Try to load metadata file.

From 2036b9aed32c5446c31578ad5ff63b2a7a02bbc2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 20 Jan 2015 19:54:00 +0100
Subject: [PATCH 337/363] Suppress possible warnings after update

Prevent JavaScript errors when the shortcuts have not been defined in
the config file.
https://github.com/FreshRSS/FreshRSS/issues/733
---
 app/views/helpers/javascript_vars.phtml | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 613521f0f..adf0783f3 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -35,20 +35,20 @@ echo 'var context={',
 "},\n";
 
 echo 'shortcuts={',
-	'mark_read:"', $s['mark_read'], '",',
-	'mark_favorite:"', $s['mark_favorite'], '",',
-	'go_website:"', $s['go_website'], '",',
-	'prev_entry:"', $s['prev_entry'], '",',
-	'next_entry:"', $s['next_entry'], '",',
-	'first_entry:"', $s['first_entry'], '",',
-	'last_entry:"', $s['last_entry'], '",',
-	'collapse_entry:"', $s['collapse_entry'], '",',
-	'load_more:"', $s['load_more'], '",',
-	'auto_share:"', $s['auto_share'], '",',
-	'focus_search:"', $s['focus_search'], '",',
-	'user_filter:"', $s['user_filter'], '",',
-	'help:"', $s['help'], '",',
-	'close_dropdown:"', $s['close_dropdown'], '"',
+	'mark_read:"', @$s['mark_read'], '",',
+	'mark_favorite:"', @$s['mark_favorite'], '",',
+	'go_website:"', @$s['go_website'], '",',
+	'prev_entry:"', @$s['prev_entry'], '",',
+	'next_entry:"', @$s['next_entry'], '",',
+	'first_entry:"', @$s['first_entry'], '",',
+	'last_entry:"', @$s['last_entry'], '",',
+	'collapse_entry:"', @$s['collapse_entry'], '",',
+	'load_more:"', @$s['load_more'], '",',
+	'auto_share:"', @$s['auto_share'], '",',
+	'focus_search:"', @$s['focus_search'], '",',
+	'user_filter:"', @$s['user_filter'], '",',
+	'help:"', @$s['help'], '",',
+	'close_dropdown:"', @$s['close_dropdown'], '"',
 "},\n";
 
 echo 'url={',

From 12081f7ba2089c8046dacac23ebe44ea843d7ef1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 20 Jan 2015 23:29:04 +0100
Subject: [PATCH 338/363] Quick fix cron actualization due to problematic
 FreshRSS constructor/init

https://github.com/FreshRSS/FreshRSS/issues/759
Suggestion: the static objects should be user-independent (or at least
with the possibility to be re-set), while the FreshRSS object and its
attributes should be user-dependent.
---
 app/actualize_script.php   | 3 ++-
 lib/Minz/Configuration.php | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/actualize_script.php b/app/actualize_script.php
index c7959be82..bae40aa56 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -22,7 +22,6 @@ $_SERVER['HTTP_HOST'] = '';
 
 
 $app = new FreshRSS();
-$app->init();
 
 $system_conf = Minz_Configuration::get('system');
 $system_conf->auth_type = 'none';  // avoid necessity to be logged in (not saved!)
@@ -56,7 +55,9 @@ foreach ($users as $user) {
 
 
 	Minz_Session::_param('currentUser', $user);
+	new Minz_ModelPdo($user);	//TODO: FIXME: Quick-fix while waiting for a better FreshRSS() constructor/init
 	FreshRSS_Auth::giveAccess();
+	$app->init();
 	$app->run();
 
 
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index fe415e22b..ab5bb4fc2 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -16,16 +16,9 @@ class Minz_Configuration {
 	 * @param $config_filename the filename of the configuration
 	 * @param $default_filename a filename containing default values for the configuration
 	 * @param $configuration_setter an optional helper to set values in configuration
-	 * @throws Minz_ConfigurationNamespaceException if the namespace already exists.
 	 */
 	public static function register($namespace, $config_filename, $default_filename = null,
 	                                $configuration_setter = null) {
-		if (isset(self::$config_list[$namespace])) {
-			throw new Minz_ConfigurationNamespaceException(
-				$namespace . ' namespace already exists'
-			);
-		}
-
 		self::$config_list[$namespace] = new Minz_Configuration(
 			$namespace, $config_filename, $default_filename, $configuration_setter
 		);

From 211569ef85f50891035e3e2645ec0c87badec1e1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 21 Jan 2015 00:44:26 +0100
Subject: [PATCH 339/363] Minz: missing URL key/param encoding

Caused searches such as "intitle:&amp;" to fail after paging, and
possible XSS vulnerabilities.
Discovered during https://github.com/FreshRSS/FreshRSS/issues/754
---
 app/layout/header.phtml   |  3 +--
 app/layout/nav_menu.phtml |  3 +--
 lib/Minz/Url.php          | 34 +++++++++++++++++-----------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 2b968252b..41a63a565 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -25,8 +25,7 @@ if (FreshRSS_Auth::accessNeedsAction()) {
 		<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?>
 		<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 _t('gen.menu.search'); ?>" />
+				<input type="search" name="search" id="search" class="extend" value="<?php echo FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('gen.menu.search'); ?>" />
 
 				<?php $get = Minz_Request::param('get', ''); ?>
 				<?php if ($get != '') { ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index d35a0b5fb..3a755b560 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -156,8 +156,7 @@
 
 	<div class="item search">
 		<form action="<?php echo _url('index', 'index'); ?>" method="get">
-			<?php $search = Minz_Request::param('search', ''); ?>
-			<input type="search" name="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
+			<input type="search" name="search" class="extend" value="<?php echo FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
 
 			<?php $get = Minz_Request::param('get', ''); ?>
 			<?php if($get != '') { ?>
diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index e9f9a69ba..af555a277 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -45,45 +45,45 @@ class Minz_Url {
 
 		return $url_string;
 	}
-	
+
 	/**
 	 * Construit l'URI d'une URL
 	 * @param l'url sous forme de tableau
 	 * @param $encodage pour indiquer comment encoder les & (& ou &amp; pour html)
 	 * @return l'uri sous la forme ?key=value&key2=value2
 	 */
-	private static function printUri ($url, $encodage) {
+	private static function printUri($url, $encodage) {
 		$uri = '';
 		$separator = '?';
-		
-		if($encodage == 'html') {
+
+		if ($encodage === 'html') {
 			$and = '&amp;';
 		} else {
 			$and = '&';
 		}
-		
-		if (isset ($url['c'])
-		 && $url['c'] != Minz_Request::defaultControllerName ()) {
+
+		if (isset($url['c'])
+		 && $url['c'] != Minz_Request::defaultControllerName()) {
 			$uri .= $separator . 'c=' . $url['c'];
 			$separator = $and;
 		}
-		
-		if (isset ($url['a'])
-		 && $url['a'] != Minz_Request::defaultActionName ()) {
+
+		if (isset($url['a'])
+		 && $url['a'] != Minz_Request::defaultActionName()) {
 			$uri .= $separator . 'a=' . $url['a'];
 			$separator = $and;
 		}
-		
-		if (isset ($url['params'])) {
+
+		if (isset($url['params'])) {
 			foreach ($url['params'] as $key => $param) {
-				$uri .= $separator . $key . '=' . $param;
+				$uri .= $separator . urlencode($key) . '=' . urlencode($param);
 				$separator = $and;
 			}
 		}
-		
+
 		return $uri;
 	}
-	
+
 	/**
 	 * Vérifie que les éléments du tableau représentant une url soit ok
 	 * @param l'url sous forme de tableau (sinon renverra directement $url)
@@ -91,7 +91,7 @@ class Minz_Url {
 	 */
 	public static function checkUrl ($url) {
 		$url_checked = $url;
-		
+
 		if (is_array ($url)) {
 			if (!isset ($url['c'])) {
 				$url_checked['c'] = Minz_Request::defaultControllerName ();
@@ -103,7 +103,7 @@ class Minz_Url {
 				$url_checked['params'] = array ();
 			}
 		}
-		
+
 		return $url_checked;
 	}
 }

From c741fba06c6d866c86306445d625a791249ad3fc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 21 Jan 2015 10:50:53 +0100
Subject: [PATCH 340/363] Update lib_opml.php

- lib_opml was not in its newest version
- FRSS supports OPML file without text attributes

Fix https://github.com/FreshRSS/FreshRSS/issues/758
---
 app/Controllers/importExportController.php |   2 +-
 lib/lib_opml.php                           | 128 ++++++++++++++++-----
 2 files changed, 103 insertions(+), 27 deletions(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index db9db66a7..589777b2a 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -151,7 +151,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	private function importOpml($opml_file) {
 		$opml_array = array();
 		try {
-			$opml_array = libopml_parse_string($opml_file);
+			$opml_array = libopml_parse_string($opml_file, false);
 		} catch (LibOPML_Exception $e) {
 			Minz_Log::warning($e->getMessage());
 			return true;
diff --git a/lib/lib_opml.php b/lib/lib_opml.php
index f320335bb..02ae5f55c 100644
--- a/lib/lib_opml.php
+++ b/lib/lib_opml.php
@@ -1,11 +1,19 @@
 <?php
 
-/* *
+/**
  * lib_opml is a free library to manage OPML format in PHP.
- * It takes in consideration only version 2.0 (http://dev.opml.org/spec2.html).
- * Basically it means "text" attribute for outline elements is required.
  *
- * lib_opml requires SimpleXML (http://php.net/manual/en/book.simplexml.php)
+ * By default, it takes in consideration version 2.0 but can be compatible with
+ * OPML 1.0. More information on http://dev.opml.org.
+ * Difference is "text" attribute is optional in version 1.0. It is highly
+ * recommended to use this attribute.
+ *
+ * lib_opml requires SimpleXML (php.net/simplexml) and DOMDocument (php.net/domdocument)
+ *
+ * @author   Marien Fressinaud <dev@marienfressinaud.fr>
+ * @link     https://github.com/marienfressinaud/lib_opml
+ * @version  0.2
+ * @license  public domain
  *
  * Usages:
  * > include('lib_opml.php');
@@ -23,21 +31,44 @@
  * > echo $opml_string;
  * > print_r($opml_object);
  *
+ * You can set $strict argument to false if you want to bypass "text" attribute
+ * requirement.
+ *
  * If parsing fails for any reason (e.g. not an XML string, does not match with
  * the specifications), a LibOPML_Exception is raised.
  *
- * Author: Marien Fressinaud <dev@marienfressinaud.fr>
- * Url: https://github.com/marienfressinaud/lib_opml
- * Version: 0.1
- * Date: 2014-03-29
- * License: public domain
+ * lib_opml array format is described here:
+ * $array = array(
+ *     'head' => array(       // 'head' element is optional (but recommended)
+ *         'key' => 'value',  // key must be a part of available OPML head elements
+ *     ),
+ *     'body' => array(              // body is required
+ *         array(                    // this array represents an outline (at least one)
+ *             'text' => 'value',    // 'text' element is required if $strict is true
+ *             'key' => 'value',     // key and value are what you want (optional)
+ *             '@outlines' = array(  // @outlines is a special value and represents sub-outlines
+ *                 array(
+ *                     [...]         // where [...] is a valid outline definition
+ *                 ),
+ *             ),
+ *         ),
+ *         array(                    // other outline definitions
+ *             [...]
+ *         ),
+ *         [...],
+ *     )
+ * )
  *
- * */
+ */
 
+/**
+ * A simple Exception class which represents any kind of OPML problem.
+ * Message should precise the current problem.
+ */
 class LibOPML_Exception extends Exception {}
 
 
-// These elements are optional
+// Define the list of available head attributes. All of them are optional.
 define('HEAD_ELEMENTS', serialize(array(
 	'title', 'dateCreated', 'dateModified', 'ownerName', 'ownerEmail',
 	'ownerId', 'docs', 'expansionState', 'vertScrollState', 'windowTop',
@@ -45,7 +76,16 @@ define('HEAD_ELEMENTS', serialize(array(
 )));
 
 
-function libopml_parse_outline($outline_xml) {
+/**
+ * Parse an XML object as an outline object and return corresponding array
+ *
+ * @param SimpleXMLElement $outline_xml the XML object we want to parse
+ * @param bool $strict true if "text" attribute is required, false else
+ * @return array corresponding to an outline and following format described above
+ * @throws LibOPML_Exception
+ * @access private
+ */
+function libopml_parse_outline($outline_xml, $strict = true) {
 	$outline = array();
 
 	// An outline may contain any kind of attributes but "text" attribute is
@@ -59,7 +99,7 @@ function libopml_parse_outline($outline_xml) {
 		}
 	}
 
-	if (!$text_is_present) {
+	if (!$text_is_present && $strict) {
 		throw new LibOPML_Exception(
 			'Outline does not contain any text attribute'
 		);
@@ -68,7 +108,7 @@ function libopml_parse_outline($outline_xml) {
 	foreach ($outline_xml->children() as $key => $value) {
 		// An outline may contain any number of outline children
 		if ($key === 'outline') {
-			$outline['@outlines'][] = libopml_parse_outline($value);
+			$outline['@outlines'][] = libopml_parse_outline($value, $strict);
 		} else {
 			throw new LibOPML_Exception(
 				'Body can contain only outline elements'
@@ -80,7 +120,16 @@ function libopml_parse_outline($outline_xml) {
 }
 
 
-function libopml_parse_string($xml) {
+/**
+ * Parse a string as a XML one and returns the corresponding array
+ *
+ * @param string $xml is the string we want to parse
+ * @param bool $strict true if "text" attribute is required, false else
+ * @return array corresponding to the XML string and following format described above
+ * @throws LibOPML_Exception
+ * @access public
+ */
+function libopml_parse_string($xml, $strict = true) {
 	$dom = new DOMDocument();
 	$dom->recover = true;
 	$dom->strictErrorChecking = false;
@@ -101,7 +150,6 @@ function libopml_parse_string($xml) {
 
 	// First, we get all "head" elements. Head is required but its sub-elements
 	// are optional.
-	// TODO: test head exists!
 	foreach ($opml->head->children() as $key => $value) {
 		if (in_array($key, unserialize(HEAD_ELEMENTS), true)) {
 			$array['head'][$key] = (string)$value;
@@ -115,11 +163,10 @@ function libopml_parse_string($xml) {
 	// Then, we get body oulines. Body must contain at least one outline
 	// element.
 	$at_least_one_outline = false;
-	// TODO: test body exists!
 	foreach ($opml->body->children() as $key => $value) {
 		if ($key === 'outline') {
 			$at_least_one_outline = true;
-			$array['body'][] = libopml_parse_outline($value);
+			$array['body'][] = libopml_parse_outline($value, $strict);
 		} else {
 			throw new LibOPML_Exception(
 				'Body can contain only outline elements'
@@ -137,7 +184,16 @@ function libopml_parse_string($xml) {
 }
 
 
-function libopml_parse_file($filename) {
+/**
+ * Parse a string contained into a file as a XML string and returns the corresponding array
+ *
+ * @param string $filename should indicates a valid XML file
+ * @param bool $strict true if "text" attribute is required, false else
+ * @return array corresponding to the file content and following format described above
+ * @throws LibOPML_Exception
+ * @access public
+ */
+function libopml_parse_file($filename, $strict = true) {
 	$file_content = file_get_contents($filename);
 
 	if ($file_content === false) {
@@ -146,11 +202,20 @@ function libopml_parse_file($filename) {
 		);
 	}
 
-	return libopml_parse_string($file_content);
+	return libopml_parse_string($file_content, $strict);
 }
 
 
-function libopml_render_outline($parent_elt, $outline) {
+/**
+ * Create a XML outline object in a parent object.
+ *
+ * @param SimpleXMLElement $parent_elt is the parent object of current outline
+ * @param array $outline array representing an outline object
+ * @param bool $strict true if "text" attribute is required, false else
+ * @throws LibOPML_Exception
+ * @access private
+ */
+function libopml_render_outline($parent_elt, $outline, $strict) {
 	// Outline MUST be an array!
 	if (!is_array($outline)) {
 		throw new LibOPML_Exception(
@@ -165,7 +230,7 @@ function libopml_render_outline($parent_elt, $outline) {
 		// outline elements.
 		if ($key === '@outlines' && is_array($value)) {
 			foreach ($value as $outline_child) {
-				libopml_render_outline($outline_elt, $outline_child);
+				libopml_render_outline($outline_elt, $outline_child, $strict);
 			}
 		} elseif (is_array($value)) {
 			throw new LibOPML_Exception(
@@ -181,7 +246,7 @@ function libopml_render_outline($parent_elt, $outline) {
 		}
 	}
 
-	if (!$text_is_present) {
+	if (!$text_is_present && $strict) {
 		throw new LibOPML_Exception(
 			'You must define at least a text element for all outlines'
 		);
@@ -189,8 +254,19 @@ function libopml_render_outline($parent_elt, $outline) {
 }
 
 
-function libopml_render($array, $as_xml_object = false) {
-	$opml = new SimpleXMLElement('<opml version="2.0"></opml>');
+/**
+ * Render an array as an OPML string or a XML object.
+ *
+ * @param array $array is the array we want to render and must follow structure defined above
+ * @param bool $as_xml_object false if function must return a string, true for a XML object
+ * @param bool $strict true if "text" attribute is required, false else
+ * @return string|SimpleXMLElement XML string corresponding to $array or XML object
+ * @throws LibOPML_Exception
+ * @access public
+ */
+function libopml_render($array, $as_xml_object = false, $strict = true) {
+	$opml = new SimpleXMLElement('<opml></opml>');
+	$opml->addAttribute('version', $strict ? '2.0' : '1.0');
 
 	// Create head element. $array['head'] is optional but head element will
 	// exist in the final XML object.
@@ -218,7 +294,7 @@ function libopml_render($array, $as_xml_object = false) {
 	// Create outline elements
 	$body = $opml->addChild('body');
 	foreach ($array['body'] as $outline) {
-		libopml_render_outline($body, $outline);
+		libopml_render_outline($body, $outline, $strict);
 	}
 
 	// And return the final result

From eec95ffb6a414f00f0ddd6cb1f81ac7ee55d4f6b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 21 Jan 2015 15:43:25 +0100
Subject: [PATCH 341/363] Fix bug related to cookie path

Fix https://github.com/FreshRSS/FreshRSS/issues/700
---
 lib/Minz/Session.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index cfe8debe9..4c0c37e54 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -65,7 +65,9 @@ class Minz_Session {
 	 * @param $l la durée de vie
 	 */
 	public static function keepCookie($l) {
-		$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '' : $_SERVER['REQUEST_URI'];
+		// Get the script_name (e.g. /p/i/index.php) and remove index.php
+		$cookie_dir = empty($_SERVER['SCRIPT_NAME']) ? '' : $_SERVER['SCRIPT_NAME'];
+		$cookie_dir = substr($cookie_dir, 0, -strlen(basename($cookie_dir)));
 		session_set_cookie_params($l, $cookie_dir, '', false, true);
 	}
 

From 22d7e0d638b91063741fe82fe77822b1d7d5be1d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 21 Jan 2015 16:28:29 +0100
Subject: [PATCH 342/363] Simplify code for cookie dir

See https://github.com/FreshRSS/FreshRSS/issues/700
See https://github.com/FreshRSS/FreshRSS/commit/eec95ffb6a414f00f0ddd6cb1f81ac7ee55d4f6b
---
 lib/Minz/Session.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 4c0c37e54..058685ada 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -65,9 +65,9 @@ class Minz_Session {
 	 * @param $l la durée de vie
 	 */
 	public static function keepCookie($l) {
-		// Get the script_name (e.g. /p/i/index.php) and remove index.php
+		// Get the script_name (e.g. /p/i/index.php) and keep only the path.
 		$cookie_dir = empty($_SERVER['SCRIPT_NAME']) ? '' : $_SERVER['SCRIPT_NAME'];
-		$cookie_dir = substr($cookie_dir, 0, -strlen(basename($cookie_dir)));
+		$cookie_dir = dirname($cookie_dir);
 		session_set_cookie_params($l, $cookie_dir, '', false, true);
 	}
 

From 964a768bc384425e45ae953bff0f6f757078e7d6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 21 Jan 2015 22:37:17 +0100
Subject: [PATCH 343/363] ! encoding problem

https://github.com/FreshRSS/FreshRSS/commit/211569ef85f50891035e3e2645ec0c87badec1e1#commitcomment-9384719
---
 app/layout/aside_feed.phtml | 10 +++++-----
 p/scripts/main.js           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index d2612e751..664071e8e 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -74,20 +74,20 @@
 <script id="feed_config_template" type="text/html">
 	<ul class="dropdown-menu">
 		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_______'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '______'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
 		<?php } ?>
 		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '______'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '______'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
 		<li class="item">
 			<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
-			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
+			        formaction="<?php echo _url('entry', 'read', 'get', 'f_______'); ?>"
 			        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 		</li>
 		<?php } ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 0561097e5..596ea2c32 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -519,7 +519,7 @@ function init_column_categories() {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
 			var feed_id = $(this).closest('.item').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
-				template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web);
+				template = $('#feed_config_template').html().replace(/______/g, feed_id).replace('http://example.net/', feed_web);
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});

From 3a5fcb651950db85676a25017cda88fccf9b6ab4 Mon Sep 17 00:00:00 2001
From: ealdraed <ealdraed@users.noreply.github.com>
Date: Thu, 22 Jan 2015 07:13:57 +0100
Subject: [PATCH 344/363] Add German translation

---
 app/i18n/de/admin.php    | 169 +++++++++++++++++++++++++++++++++++++++
 app/i18n/de/conf.php     | 168 ++++++++++++++++++++++++++++++++++++++
 app/i18n/de/feedback.php | 110 +++++++++++++++++++++++++
 app/i18n/de/gen.php      | 163 +++++++++++++++++++++++++++++++++++++
 app/i18n/de/index.php    |  62 ++++++++++++++
 app/i18n/de/install.php  | 106 ++++++++++++++++++++++++
 app/i18n/de/sub.php      |  61 ++++++++++++++
 app/i18n/en/gen.php      |   1 +
 app/i18n/fr/gen.php      |   1 +
 9 files changed, 841 insertions(+)
 create mode 100644 app/i18n/de/admin.php
 create mode 100644 app/i18n/de/conf.php
 create mode 100644 app/i18n/de/feedback.php
 create mode 100644 app/i18n/de/gen.php
 create mode 100644 app/i18n/de/index.php
 create mode 100644 app/i18n/de/install.php
 create mode 100644 app/i18n/de/sub.php

diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
new file mode 100644
index 000000000..597c653ff
--- /dev/null
+++ b/app/i18n/de/admin.php
@@ -0,0 +1,169 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Anonymes Lesen der Artikel des Standardbenutzers (%s) erlauben',
+		'allow_anonymous_refresh' => 'Anonymes Aktualisieren der Artikel erlauben',
+		'api_enabled' => '<abbr>API</abbr>-Zugriff erlauben <small>(für mobile Anwendungen benötigt)</small>',
+		'form' => 'Webformular (traditionell, benötigt JavaScript)',
+		'http' => 'HTTP (HTTPS für erfahrene Benutzer)',
+		'none' => 'Keine (gefährlich)',
+		'persona' => 'Mozilla Persona (modern, benötigt JavaScript)',
+		'title' => 'Authentifizierung',
+		'title_reset' => 'Zurücksetzen der Authentifizierung',
+		'token' => 'Authentifizierungs-Token',
+		'token_help' => 'Erlaubt den Zugriff auf die RSS-Ausgabe des Standardbenutzers ohne Authentifizierung.',
+		'type' => 'Authentifizierungsmethode',
+		'unsafe_autologin' => 'Erlaube unsicheres automatisches Anmelden mit folgendem Format: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/cache</em> sind in Ordnung.',
+		),
+		'categories' => array(
+			'nok' => 'Die Tabelle <em>category</em> ist schlecht konfiguriert.',
+			'ok' => 'Die Tabelle <em>category</em> ist in Ordnung.',
+		),
+		'connection' => array(
+			'nok' => 'Verbindung zur Datenbank kann nicht aufgebaut werden.',
+			'ok' => 'Verbindung zur Datenbank ist in Ordnung.',
+		),
+		'ctype' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für die Überprüfung von Zeichentypen (php-ctype).',
+			'ok' => 'Sie haben die benötigte Bibliothek für die Überprüfung von Zeichentypen (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Ihnen fehlt cURL (Paket php5-curl).',
+			'ok' => 'Sie haben die cURL-Erweiterung.',
+		),
+		'data' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
+		),
+		'database' => 'Datenbank-Installation',
+		'dom' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern (Paket php-xml).',
+			'ok' => 'Sie haben die benötigte Bibliothek um DOM zu durchstöbern.',
+		),
+		'entries' => array(
+			'nok' => 'Die Tabelle <em>entry</em> ist schlecht konfiguriert.',
+			'ok' => 'Die Tabelle <em>entry</em> ist in Ordnung.',
+		),
+		'favicons' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/favicons</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/favicons</em> sind in Ordnung.',
+		),
+		'feeds' => array(
+			'nok' => 'Die Tabelle <em>feed</em> ist schlecht konfiguriert.',
+			'ok' => 'Die Tabelle <em>feed</em> ist in Ordnung.',
+		),
+		'files' => 'Datei-Installation',
+		'json' => array(
+			'nok' => 'Ihnen fehlt JSON (Paket php5-json).',
+			'ok' => 'Sie haben die JSON-Erweiterung.',
+		),
+		'minz' => array(
+			'nok' => 'Ihnen fehlt das Minz-Framework.',
+			'ok' => 'Sie haben das Minz-Framework.',
+		),
+		'pcre' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für reguläre Ausdrücke (php-pcre).',
+			'ok' => 'Sie haben die benötigte Bibliothek für reguläre Ausdrücke (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Ihnen fehlt PDO oder einer der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Sie haben PDO und mindestens einen der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/persona</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/persona</em> sind in Ordnung.',
+		),
+		'php' => array(
+			'_' => 'PHP-Installation',
+			'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
+			'ok' => 'Ihre PHP-Version ist %s, welche kompatibel mit FreshRSS ist.',
+		),
+		'tables' => array(
+			'nok' => 'Es fehlen eine oder mehrere Tabellen in der Datenbank.',
+			'ok' => 'Tabellen existieren in der Datenbank.',
+		),
+		'title' => 'Installationsüberprüfung',
+		'tokens' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/tokens</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/tokens</em> sind in Ordnung.',
+		),
+		'users' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/users</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
+		),
+		'zip' => array(
+			'nok' => 'Ihnen fehlt die ZIP-Erweiterung (Paket php5-zip).',
+			'ok' => 'Sie haben die ZIP-Erweiterung.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Deaktiviert',
+		'empty_list' => 'Es gibt keine installierte Erweiterung.',
+		'enabled' => 'Aktiviert',
+		'no_configure_view' => 'Diese Erweiterung kann nicht konfiguriert werden.',
+		'system' => array(
+			'_' => 'System-Erweiterungen',
+			'no_rights' => 'System-Erweiterung (Sie haben keine Berechtigung dafür)',
+		),
+		'title' => 'Erweiterungen',
+		'user' => 'Benutzer-Erweiterungen',
+	),
+	'stats' => array(
+		'_' => 'Statistiken',
+		'all_feeds' => 'Alle Feeds',
+		'category' => 'Kategorie',
+		'entry_count' => 'Anzahl der Einträge',
+		'entry_per_category' => 'Einträge pro Kategorie',
+		'entry_per_day' => 'Einträge pro Tag (letzte 30 Tage)',
+		'entry_per_day_of_week' => 'Pro Wochentag (Durchschnitt: %.2f Nachrichten)',
+		'entry_per_hour' => 'Pro Stunde (Durchschnitt: %.2f Nachrichten)',
+		'entry_per_month' => 'Pro Monat (Durchschnitt: %.2f Nachrichten)',
+		'entry_repartition' => 'Einträge-Verteilung',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds pro Kategorie',
+		'idle' => 'Untätige Feeds',
+		'main' => 'Haupt-Statistiken',
+		'main_stream' => 'Haupt-Feeds',
+		'menu' => array(
+			'idle' => 'Untätige Feeds',
+			'main' => 'Haupt-Statistiken',
+			'repartition' => 'Artikel-Verteilung',
+		),
+		'no_idle' => 'Es gibt keinen untätigen Feed!',
+		'number_entries' => '%d Artikel',
+		'percent_of_total' => '%% Gesamt',
+		'repartition' => 'Artikel-Verteilung',
+		'status_favorites' => 'Favoriten',
+		'status_read' => 'Gelesen',
+		'status_total' => 'Gesamt',
+		'status_unread' => 'Ungelesen',
+		'title' => 'Statistiken',
+		'top_feed' => 'Top 10-Feeds',
+	),
+	'update' => array(
+		'_' => 'System aktualisieren',
+		'apply' => 'Anwenden',
+		'check' => 'Auf neue Aktualisierungen prüfen',
+		'current_version' => 'Ihre aktuelle Version von FreshRSS ist %s.',
+		'last' => 'Letzte Überprüfung: %s',
+		'none' => 'Keine Aktualisierung zum Anwenden',
+		'title' => 'System aktualisieren',
+	),
+	'user' => array(
+		'articles_and_size' => '%s Artikel (%s)',
+		'create' => 'Neuen Benutzer erstellen',
+		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Sprache',
+		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'title' => 'Benutzer verwalten',
+		'user_list' => 'Liste der Benutzer',
+		'username' => 'Nutzername',
+		'users' => 'Benutzer',
+	),
+);
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
new file mode 100644
index 000000000..46816c25b
--- /dev/null
+++ b/app/i18n/de/conf.php
@@ -0,0 +1,168 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archivierung',
+		'advanced' => 'Erweitert',
+		'delete_after' => 'Entferne Artikel nach',
+		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Nachrichten-Feeds vorhanden.',
+		'keep_history_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten wird',
+		'optimize' => 'Datenbank optimieren',
+		'optimize_help' => 'Sollte gelegentlich durchgeführt werden, um die Größe der Datenbank zu reduzieren.',
+		'purge_now' => 'Jetzt bereinigen',
+		'title' => 'Archivierung',
+		'ttl' => 'Aktualisiere automatisch nicht öfter als',
+	),
+	'display' => array(
+		'_' => 'Anzeige',
+		'icon' => array(
+			'bottom_line' => 'Fußzeile',
+			'entry' => 'Artikel-Symbole',
+			'publication_date' => 'Datum der Veröffentlichung',
+			'related_tags' => 'Verwandte Tags',
+			'sharing' => 'Teilen',
+			'top_line' => 'Kopfzeile',
+		),
+		'language' => 'Sprache',
+		'notif_html5' => array(
+			'seconds' => 'Sekunden (0 bedeutet keine Zeitüberschreitung)',
+			'timeout' => 'Zeitüberschreitung für HTML5-Benachrichtigung',
+		),
+		'theme' => 'Erscheinungsbild',
+		'title' => 'Anzeige',
+		'width' => array(
+			'content' => 'Inhaltsbreite',
+			'large' => 'Weit',
+			'medium' => 'Mittel',
+			'no_limit' => 'Keine Begrenzung',
+			'thin' => 'Schmal',
+		),
+	),
+	'query' => array(
+		'_' => 'Benutzerabfragen',
+		'deprecated' => 'Diese Abfrage ist nicht länger gültig. Die referenzierte Kategorie oder der Feed ist gelöscht worden.',
+		'filter' => 'Angewendeter Filter:',
+		'get_all' => 'Alle Artikel anzeigen',
+		'get_category' => 'Kategorie "%s" anzeigen',
+		'get_favorite' => 'Lieblingsartikel anzeigen',
+		'get_feed' => 'Feed "%s" anzeigen',
+		'no_filter' => 'Kein Filter',
+		'none' => 'Sie haben bisher keine Benutzerabfrage erstellt.',
+		'number' => 'Abfrage Nr. %d',
+		'order_asc' => 'Älteste Artikel zuerst anzeigen',
+		'order_desc' => 'Neueste Artikel zuerst anzeigen',
+		'search' => 'Suche nach "%s"',
+		'state_0' => 'Alle Artikel anzeigen',
+		'state_1' => 'Gelesene Artikel anzeigen',
+		'state_2' => 'Ungelesene Artikel anzeigen',
+		'state_3' => 'Alle Artikel anzeigen',
+		'state_4' => 'Lieblingsartikel anzeigen',
+		'state_5' => 'Gelesene Lieblingsartikel anzeigen',
+		'state_6' => 'Ungelesene Lieblingsartikel anzeigen',
+		'state_7' => 'Lieblingsartikel anzeigen',
+		'state_8' => 'Keine Lieblingsartikel anzeigen',
+		'state_9' => 'Gelesene ohne Lieblingsartikel anzeigen',
+		'state_10' => 'Ungelesene ohne Lieblingsartikel anzeigen',
+		'state_11' => 'Keine Lieblingsartikel anzeigen',
+		'state_12' => 'Alle Artikel anzeigen',
+		'state_13' => 'Gelesene Artikel anzeigen',
+		'state_14' => 'Ungelesene Artikel anzeigen',
+		'state_15' => 'Alle Artikel anzeigen',
+		'title' => 'Benutzerabfragen',
+	),
+	'profile' => array(
+		'_' => 'Profil-Verwaltung',
+		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Passwort-API<br /><small>(z. B. für mobile Anwendungen)</small>',
+		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'title' => 'Profil',
+	),
+	'reading' => array(
+		'_' => 'Lesen',
+		'after_onread' => 'Nach „Alle als gelesen markieren“,',
+		'articles_per_page' => 'Anzahl der Artikel pro Seite',
+		'auto_load_more' => 'Die nächsten Artikel am Seitenende laden',
+		'auto_remove_article' => 'Artikel nach dem Lesen verstecken',
+		'confirm_enabled' => 'Bei der Aktion „Alle als gelesen markieren“ einen Bestätigungsdialog anzeigen',
+		'display_articles_unfolded' => 'Artikel standardmäßig ausgeklappt zeigen',
+		'display_categories_unfolded' => 'Kategorien standardmäßig eingeklappt zeigen',
+		'hide_read_feeds' => 'Kategorien & Feeds ohne ungelesene Artikel verstecken (funktioniert nicht mit der Einstellung „Alle Artikel zeigen“)',
+		'img_with_lazyload' => 'Verwende die "träges Laden"-Methode zum Laden von Bildern',
+		'jump_next' => 'springe zum nächsten ungelesenen Geschwisterelement (Feed oder Kategorie)',
+		'number_divided_when_reader' => 'Geteilt durch 2 in der Lese-Ansicht.',
+		'read' => array(
+			'article_open_on_website' => 'wenn der Artikel auf der Original-Webseite geöffnet wird',
+			'article_viewed' => 'wenn der Artikel angesehen wird',
+			'scroll' => 'beim Blättern',
+			'upon_reception' => 'beim Empfang des Artikels',
+			'when' => 'Artikel als gelesen markieren…',
+		),
+		'show' => array(
+			'_' => 	'Artikel zum Anzeigen',
+			'adaptive' => 'Anzeige anpassen',
+			'all_articles' => 'Alle Artikel zeigen',
+			'unread' => 'Nur ungelesene zeigen',
+		),
+		'sort' => array(
+			'_' => 'Sortierreihenfolge',
+			'newer_first' => 'Neuere zuerst',
+			'older_first' => 'Ältere zuerst',
+		),
+		'sticky_post' => 'Wenn geöffnet, den Artikel ganz oben anheften',
+		'title' => 'Lesen',
+		'view' => array(
+			'default' => 'Standard-Ansicht',
+			'global' => 'Globale Ansicht',
+			'normal' => 'Normale Ansicht',
+			'reader' => 'Lese-Ansicht',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Teilen',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'E-Mail',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Weitere Informationen',
+		'print' => 'Drucken',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Anzuzeigender Teilen-Name',
+		'share_url' => 'Zu verwendende Teilen-URL',
+		'title' => 'Teilen',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Tastaturkürzel',
+		'article_action' => 'Artikelaktionen',
+		'auto_share' => 'Teilen',
+		'auto_share_help' => 'Wenn es nur eine Option zum Teilen gibt, wird diese verwendet. Ansonsten sind die Optionen über ihre Nummer erreichbar.',
+		'close_dropdown' => 'Menüs schließen',
+		'collapse_article' => 'Zusammenfalten',
+		'first_article' => 'Zum ersten Artikel springen',
+		'focus_search' => 'Auf Suchfeld zugreifen',
+		'help' => 'Dokumentation anzeigen',
+		'javascript' => 'JavaScript muss aktiviert sein, um Tastaturkürzel benutzen zu können',
+		'last_article' => 'Zum letzten Artikel springen',
+		'load_more' => 'Weitere Artikel laden',
+		'mark_read' => 'Als gelesen markieren',
+		'mark_favorite' => 'Als Favorit markieren',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'Mit der "Umschalttaste" finden die Tastaturkürzel auf Feeds Anwendung.<br/>Mit der "Alt-Taste" finden die Tastaturkürzel auf Kategorien Anwendung.',
+		'next_article' => 'Zum nächsten Artikel springen',
+		'other_action' => 'Andere Aktionen',
+		'previous_article' => 'Zum vorherigen Artikel springen',
+		'see_on_website' => 'Auf der Original-Webseite ansehen',
+		'shift_for_all_read' => '+ <code>Umschalttaste</code>, um alle Artikel als gelesen zu markieren.',
+		'title' => 'Tastaturkürzel',
+		'user_filter' => 'Auf Benutzerfilter zugreifen',
+		'user_filter_help' => 'Wenn es nur einen Benutzerfilter gibt, wird dieser verwendet. Ansonsten sind die Filter über ihre Nummer erreichbar.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s Artikel (%s)',
+		'current' => 'Aktueller Benutzer',
+		'is_admin' => 'ist Administrator',
+		'users' => 'Benutzer',
+	),
+);
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
new file mode 100644
index 000000000..48f8b74f5
--- /dev/null
+++ b/app/i18n/de/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimierung abgeschlossen',
+	),
+	'access' => array(
+		'denied' => 'Sie haben nicht die Berechtigung, diese Seite aufzurufen',
+		'not_found' => 'Sie suchen nach einer Seite, die nicht existiert',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Während der Konfiguration des Authentifikationssystems trat ein Fehler auf. Bitte versuchen Sie es später erneut.',
+			'set' => 'Formular ist ab sofort ihr Standard-Authentifikationssystem.',
+		),
+		'login' => array(
+			'invalid' => 'Anmeldung ist ungültig',
+			'success' => 'Sie sind verbunden',
+		),
+		'logout' => array(
+			'success' => 'Sie sind getrennt',
+		),
+		'no_password_set' => 'Administrator-Passwort ist nicht gesetzt worden. Dieses Feature ist nicht verfügbar.',
+		'not_persona' => 'Nur das Persona-System kann zurückgesetzt werden.',
+	),
+	'conf' => array(
+		'error' => 'Während des Speicherung der Konfiguration trat ein Fehler auf',
+		'query_created' => 'Abfrage "%s" ist erstellt worden.',
+		'shortcuts_updated' => 'Tastaturkürzel sind aktualisiert worden',
+		'updated' => 'Konfiguration ist aktualisiert worden',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s ist bereits aktiviert',
+		'disable' => array(
+			'ko' => '%s kann nicht deaktiviert werden. Für Details <a href="%s">prüfen Sie die FressRSS-Protokolle</a>.',
+			'ok' => '%s ist jetzt deaktiviert',
+		),
+		'enable' => array(
+			'ko' => '%s kann nicht aktiviert werden. Für Details <a href="%s">prüfen Sie die FressRSS-Protokolle</a>.',
+			'ok' => '%s ist jetzt aktiviert',
+		),
+		'no_access' => 'Sie haben keinen Zugang zu %s',
+		'not_enabled' => '%s ist noch nicht aktiviert',
+		'not_found' => '%s existiert nicht',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Die Zip-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie, Dateien eine nach der anderen zu exportieren.',
+		'feeds_imported' => 'Ihre Feeds sind importiert worden und werden jetzt aktualisiert',
+		'feeds_imported_with_errors' => 'Ihre Feeds sind importiert worden, aber es traten einige Fehler auf',
+		'file_cannot_be_uploaded' => 'Datei kann nicht hochgeladen werden!',
+		'no_zip_extension' => 'Die Zip-Erweiterung ist auf Ihrem Server nicht vorhanden.',
+		'zip_error' => 'Ein Fehler trat während des Zip-Imports auf.',
+	),
+	'sub' => array(
+		'actualize' => 'Aktualisieren',
+		'category' => array(
+			'created' => 'Kategorie %s ist erstellt worden.',
+			'deleted' => 'Kategorie ist gelöscht worden.',
+			'emptied' => 'Kategorie ist geleert worden.',
+			'error' => 'Kategorie kann nicht aktualisiert werden',
+			'name_exists' => 'Kategorie-Name existiert bereits.',
+			'no_id' => 'Sie müssen die ID der Kategorie präzisieren.',
+			'no_name' => 'Kategorie-Name kann nicht leer sein.',
+			'not_delete_default' => 'Sie können die Vorgabe-Kategorie nicht löschen!',
+			'not_exist' => 'Die Kategorie existiert nicht!',
+			'over_max' => 'Sie haben Ihr Kategorien-Limit erreicht (%d)',
+			'updated' => 'Kategorie ist aktualisiert worden.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> ist aktualisiert worden',
+			'actualizeds' => 'RSS-Feeds sind aktualisiert worden',
+			'added' => 'RSS-Feed <em>%s</em> ist hinzugefügt worden',
+			'already_subscribed' => 'Sie haben <em>%s</em> bereits abonniert',
+			'deleted' => 'Feed ist gelöscht worden',
+			'error' => 'Feed kann nicht aktualisiert werden',
+			'internal_problem' => 'Der RSS-Feed konnte nicht hinzugefügt werden. Für Details <a href="%s">prüfen Sie die FressRSS-Protokolle</a>.',
+			'invalid_url' => 'URL <em>%s</em> ist ungültig',
+			'marked_read' => 'Feeds sind als gelesen markiert worden',
+			'n_actualized' => '%d Feeds sind aktualisiert worden',
+			'n_entries_deleted' => '%d Artikel sind gelöscht worden',
+			'no_refresh' => 'Es gibt keinen Feed zum Aktualisieren…',
+			'not_added' => '<em>%s</em> konnte nicht hinzugefügt werden',
+			'over_max' => 'Sie haben Ihr Feeds-Limit erreicht (%d)',
+			'updated' => 'Feed ist aktualisiert worden',
+		),
+		'purge_completed' => 'Bereinigung abgeschlossen (%d Artikel gelöscht)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS wird nun auf die <strong>Version %s</strong> aktualisiert.',
+		'error' => 'Der Aktualisierungsvorgang stieß auf einen Fehler: %s',
+		'file_is_nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen',
+		'finished' => 'Aktualisierung abgeschlossen!',
+		'none' => 'Keine Aktualisierung zum Anwenden',
+		'server_not_found' => 'Aktualisierungs-Server kann nicht gefunden werden. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'Benutzer %s ist erstellt worden',
+			'error' => 'Benutzer %s kann nicht erstellt werden',
+		),
+		'deleted' => array(
+			'_' => 'Benutzer %s ist gelöscht worden',
+			'error' => 'Benutzer %s kann nicht gelöscht werden',
+		),
+	),
+	'profile' => array(
+		'error' => 'Ihr Profil kann nicht geändert werden',
+		'updated' => 'Ihr Profil ist geändert worden',
+	),
+);
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
new file mode 100644
index 000000000..b9ef55b60
--- /dev/null
+++ b/app/i18n/de/gen.php
@@ -0,0 +1,163 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Aktualisieren',
+		'back_to_rss_feeds' => '← Zurück zu Ihren RSS-Feeds gehen',
+		'cancel' => 'Abbrechen',
+		'create' => 'Erstellen',
+		'disable' => 'Deaktivieren',
+		'empty' => 'Leeren',
+		'enable' => 'Aktivieren',
+		'export' => 'Exportieren',
+		'filter' => 'Filtern',
+		'import' => 'Importieren',
+		'manage' => 'Verwalten',
+		'mark_read' => 'Als gelesen markieren',
+		'mark_favorite' => 'Als Favorit markieren',
+		'remove' => 'Entfernen',
+		'see_website' => 'Webseite ansehen',
+		'submit' => 'Abschicken',
+		'truncate' => 'Alle Artikel löschen',
+	),
+	'auth' => array(
+		'keep_logged_in' => 'Eingeloggt bleiben <small>(1 Monat)</small>',
+		'login' => 'Anmelden',
+		'login_persona' => 'Anmelden mit Persona',
+		'login_persona_problem' => 'Verbindungsproblem mit Persona?',
+		'logout' => 'Abmelden',
+		'password' => 'Passwort',
+		'reset' => 'Zurücksetzen der Authentifizierung',
+		'username' => 'Nutzername',
+		'username_admin' => 'Administrator-Nutzername',
+		'will_reset' => 'Authentifikationssystem wird zurückgesetzt: ein Formular wird anstelle von Persona benutzt.',
+	),
+	'date' => array(
+		'Apr' => '\\A\\p\\r\\i\\l',
+		'Aug' => '\\A\\u\\g\\u\\s\\t',
+		'Dec' => '\\D\\e\\z\\e\\m\\b\\e\\r',
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r',
+		'Jan' => '\\J\\a\\n\\u\\a\\r',
+		'Jul' => '\\J\\u\\l\\i',
+		'Jun' => '\\J\\u\\n\\i',
+		'Mar' => '\\M\\ä\\r\\z',
+		'May' => '\\M\\a\\i',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+		'Oct' => '\\O\\k\\t\\o\\b\\e\\r',
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'apr' => 'Apr',
+		'april' => 'April',
+		'aug' => 'Aug',
+		'august' => 'August',
+		'before_yesterday' => 'Vor gestern',
+		'dec' => 'Dez',
+		'december' => 'Dezember',
+		'feb' => 'Feb',
+		'february' => 'Februar',
+		'format_date' => 'd\\. %s Y',
+		'format_date_hour' => 'd\\. %s Y \\u\\m H\\:i',
+		'fri' => 'Fr',
+		'jan' => 'Jan',
+		'january' => 'Januar',
+		'jul' => 'Jul',
+		'july' => 'Juli',
+		'jun' => 'Jun',
+		'june' => 'Juni',
+		'last_3_month' => 'Letzte drei Monate',
+		'last_6_month' => 'Letzte sechs Monate',
+		'last_month' => 'Letzter Monat',
+		'last_week' => 'Letzte Woche',
+		'last_year' => 'Letztes Jahr',
+		'mar' => 'Mär',
+		'march' => 'März',
+		'may' => 'Mai',
+		'mon' => 'Mo',
+		'month' => 'Monat(en)',
+		'nov' => 'Nov',
+		'november' => 'November',
+		'oct' => 'Okt',
+		'october' => 'Oktober',
+		'sat' => 'Sa',
+		'sep' => 'Sep',
+		'september' => 'September',
+		'sun' => 'So',
+		'thu' => 'Do',
+		'today' => 'Heute',
+		'tue' => 'Di',
+		'wed' => 'Mi',
+		'yesterday' => 'Gestern',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'Über FreshRSS',
+	),
+	'js' => array(
+		'category_empty' => 'Kategorie leeren',
+		'confirm_action' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Dies kann nicht abgebrochen werden!',
+		'confirm_action_feed_cat' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Sie werden zugehörige Favoriten und Benutzerabfragen verlieren. Dies kann nicht abgebrochen werden!',
+		'feedback' => array(
+			'body_new_articles' => 'Es gibt \\d neue Artikel zum Lesen auf FreshRSS.',
+			'request_failed' => 'Ein Problem trat auf und die Anfrage schlug fehl.',
+			'title_new_articles' => 'FreshRSS: neue Artikel!',
+		),
+		'new_article' => 'Es gibt neue verfügbare Artikel. Klicken Sie, um die Seite zu aktualisieren.',
+		'should_be_activated' => 'JavaScript muss aktiviert sein',
+	),
+	'lang' => array(
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+	),
+	'menu' => array(
+		'about' => 'Über',
+		'admin' => 'Administration',
+		'archiving' => 'Archivierung',
+		'authentication' => 'Authentifizierung',
+		'check_install' => 'Installationsüberprüfung',
+		'configuration' => 'Konfiguration',
+		'display' => 'Anzeige',
+		'extensions' => 'Erweiterungen',
+		'logs' => 'Protokolle',
+		'queries' => 'Benutzerabfragen',
+		'reading' => 'Lesen',
+		'search' => 'Suche Worte oder #Tags',
+		'sharing' => 'Teilen',
+		'shortcuts' => 'Tastaturkürzel',
+		'stats' => 'Statistiken',
+		'update' => 'Aktualisieren',
+		'user_management' => 'Benutzer verwalten',
+		'user_profile' => 'Profil',
+	),
+	'pagination' => array(
+		'first' => 'Erste',
+		'last' => 'Letzte',
+		'load_more' => 'Weitere Artikel laden',
+		'mark_all_read' => 'Alle als gelesen markieren',
+		'next' => 'Nächste',
+		'nothing_to_load' => 'Es gibt keine weiteren Artikel',
+		'previous' => 'Vorherige',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'E-Mail',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Drucken',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Achtung!',
+		'blank_to_disable' => 'Zum Deaktivieren frei lassen',
+		'by_author' => 'Von <em>%s</em>',
+		'by_default' => 'standardmäßig',
+		'damn' => 'Verdammt!',
+		'default_category' => 'Unkategorisiert',
+		'no' => 'Nein',
+		'ok' => 'OK!',
+		'or' => 'oder',
+		'yes' => 'Ja',
+	),
+);
diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
new file mode 100644
index 000000000..8538bf3de
--- /dev/null
+++ b/app/i18n/de/index.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'Über',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Fehlerberichte',
+		'credits' => 'Credits',
+		'credits_content' => 'Einige Designelemente stammen von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> stammen vom <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> Font wurde von <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a> erstellt. Favicons werden mit <a href="https://getfavicon.appspot.com/">getFavicon API</a> gesammelt. FreshRSS basiert auf <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, einem PHP-Framework.',
+		'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="http://projet.idleman.fr/leed/">Leed</a>. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.',
+		'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
+		'lead_developer' => 'Hauptentwickler',
+		'license' => 'Lizenz',
+		'project_website' => 'Projekt-Webseite',
+		'title' => 'Über',
+		'version' => 'Version',
+		'website' => 'Webseite',
+	),
+	'feed' => array(
+		'add' => 'Sie können Feeds hinzufügen.',
+		'empty' => 'Es gibt keinen Artikel zum Zeigen.',
+		'rss_of' => 'RSS-Feed von %s',
+		'title' => 'Ihre RSS-Feeds',
+		'title_global' => 'Globale Ansicht',
+		'title_fav' => 'Ihre Favoriten',
+	),
+	'log' => array(
+		'_' => 'Protokolle',
+		'clear' => 'Protokolle leeren',
+		'empty' => 'Protokolldatei ist leer.',
+		'title' => 'Protokolle',
+	),
+	'menu' => array(
+		'about' => 'Über FreshRSS',
+		'add_query' => 'Eine Abfrage hinzufügen',
+		'before_one_day' => 'Vor einem Tag',
+		'before_one_week' => 'Vor einer Woche',
+		'favorites' => 'Favoriten (%s)',
+		'global_view' => 'Globale Ansicht',
+		'main_stream' => 'Haupt-Feeds',
+		'mark_all_read' => 'Alle als gelesen markieren',
+		'mark_cat_read' => 'Kategorie als gelesen markieren',
+		'mark_feed_read' => 'Feed als gelesen markieren',
+		'newer_first' => 'Neuere zuerst',
+		'non-starred' => 'Alle außer Favoriten zeigen',
+		'normal_view' => 'Normale Ansicht',
+		'older_first' => 'Ältere zuerst',
+		'queries' => 'Benutzerabfragen',
+		'read' => 'Nur gelesene zeigen',
+		'reader_view' => 'Lese-Ansicht',
+		'rss_view' => 'RSS-Feed',
+		'search_short' => 'Suchen',
+		'starred' => 'Nur Favoriten zeigen',
+		'stats' => 'Statistiken',
+		'subscription' => 'Abonnementverwaltung',
+		'unread' => 'Nur ungelesene zeigen',
+	),
+	'share' => 'Teilen',
+	'tag' => array(
+		'related' => 'Verwandte Tags',
+	),
+);
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
new file mode 100644
index 000000000..1e324251a
--- /dev/null
+++ b/app/i18n/de/install.php
@@ -0,0 +1,106 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Installation fertigstellen',
+		'fix_errors_before' => 'Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
+		'next_step' => 'Zum nächsten Schritt gehen',
+	),
+	'auth' => array(
+		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Webformular (traditionell, benötigt JavaScript)',
+		'http' => 'HTTP (HTTPS für erfahrene Benutzer)',
+		'none' => 'Keine (gefährlich)',
+		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'persona' => 'Mozilla Persona (modern, benötigt JavaScript)',
+		'type' => 'Authentifizierungsmethode',
+	),
+	'bdd' => array(
+		'_' => 'Datenbank',
+		'conf' => array(
+			'_' => 'Datenbank-Konfiguration',
+			'ko' => 'Überprüfen Sie Ihre Datenbank-Information.',
+			'ok' => 'Datenbank-Konfiguration ist gespeichert worden.',
+		),
+		'host' => 'Host',
+		'prefix' => 'Tabellen-Präfix',
+		'password' => 'HTTP-Password',
+		'type' => 'Datenbank-Typ',
+		'username' => 'HTTP-Nutzername',
+	),
+	'check' => array(
+		'_' => 'Überprüfungen',
+		'cache' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/cache</em> sind in Ordnung.',
+		),
+		'ctype' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für die Überprüfung von Zeichentypen (php-ctype).',
+			'ok' => 'Sie haben die benötigte Bibliothek für die Überprüfung von Zeichentypen (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Ihnen fehlt cURL (Paket php5-curl).',
+			'ok' => 'Sie haben die cURL-Erweiterung.',
+		),
+		'data' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
+		),
+		'dom' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern (Paket php-xml).',
+			'ok' => 'Sie haben die benötigte Bibliothek um DOM zu durchstöbern.',
+		),
+		'favicons' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/favicons</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/favicons</em> sind in Ordnung.',
+		),
+		'http_referer' => array(
+			'nok' => 'Bitte stellen Sie sicher, dass Sie Ihren HTTP REFERER nicht abändern.',
+			'ok' => 'Ihr HTTP REFERER ist bekannt und entspricht Ihrem Server.',
+		),
+		'minz' => array(
+			'nok' => 'Ihnen fehlt das Minz-Framework.',
+			'ok' => 'Sie haben das Minz-Framework.',
+		),
+		'pcre' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für reguläre Ausdrücke (php-pcre).',
+			'ok' => 'Sie haben die benötigte Bibliothek für reguläre Ausdrücke (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Ihnen fehlt PDO oder einer der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Sie haben PDO und mindestens einen der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/persona</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/persona</em> sind in Ordnung.',
+		),
+		'php' => array(
+			'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
+			'ok' => 'Ihre PHP-Version ist %s, welche kompatibel mit FreshRSS ist.',
+		),
+		'users' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/users</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Allgemeine Konfiguration',
+		'ok' => 'Allgemeine Konfiguration ist gespeichert worden.',
+	),
+	'congratulations' => 'Glückwunsch!',
+	'default_user' => 'Nutzername des Standardbenutzers <small>(maximal 16 alphanumerische Zeichen)</small>',
+	'delete_articles_after' => 'Entferne Artikel nach',
+	'fix_errors_before' => 'Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
+	'javascript_is_better' => 'FreshRSS ist ansprechender mit aktiviertem JavaScript',
+	'language' => array(
+		'_' => 'Sprache',
+		'choose' => 'Wählen Sie eine Sprache für FreshRSS',
+		'defined' => 'Sprache ist festgelegt worden.',
+	),
+	'not_deleted' => 'Etwas ist schiefgelaufen; Sie müssen die Datei <em>%s</em> manuell löschen.',
+	'ok' => 'Der Installationsvorgang war erfolgreich.',
+	'step' => 'Schritt %d',
+	'steps' => 'Schritte',
+	'title' => 'Installation · FreshRSS',
+	'this_is_the_end' => 'Das ist das Ende',
+);
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
new file mode 100644
index 000000000..0479b8f46
--- /dev/null
+++ b/app/i18n/de/sub.php
@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Kategorie',
+		'add' => 'Eine Kategorie hinzufügen',
+		'empty' => 'Leere Kategorie',
+		'new' => 'Neue Kategorie',
+	),
+	'feed' => array(
+		'add' => 'Einen RSS-Feed hinzufügen',
+		'advanced' => 'Erweitert',
+		'archiving' => 'Archivierung',
+		'auth' => array(
+			'configuration' => 'Anmelden',
+			'help' => 'Die Verbindung erlaubt Zugriff auf HTTP-geschützte RSS-Feeds',
+			'http' => 'HTTP-Authentifizierung',
+			'password' => 'HTTP-Passwort',
+			'username' => 'HTTP-Nutzername',
+		),
+		'css_help' => 'Ruft gekürzte RSS-Feeds ab (Achtung, benötigt mehr Zeit!)',
+		'css_path' => 'Pfad zur CSS-Datei des Artikels auf der Original-Webseite',
+		'description' => 'Beschreibung',
+		'empty' => 'Dieser Feed ist leer. Bitte stellen Sie sicher, dass er noch gepflegt wird.',
+		'error' => 'Dieser Feed ist auf ein Problem gestoßen. Bitte stellen Sie sicher, dass er immer lesbar ist und aktualisieren Sie ihn dann.',
+		'in_main_stream' => 'In Haupt-Feeds zeigen',
+		'informations' => 'Information',
+		'keep_history' => 'Minimale Anzahl an Artikeln, die behalten wird',
+		'moved_category_deleted' => 'Wenn Sie eine Kategorie entfernen, werden deren Feeds automatisch in die Kategorie <em>%s</em> eingefügt.',
+		'no_selected' => 'Kein Feed ausgewählt.',
+		'number_entries' => '%d Artikel',
+		'stats' => 'Statistiken',
+		'think_to_add' => 'Sie können Feeds hinzufügen.',
+		'title' => 'Titel',
+		'title_add' => 'Einen RSS-Feed hinzufügen',
+		'ttl' => 'Aktualisiere automatisch nicht öfter als',
+		'url' => 'Feed-URL',
+		'validator' => 'Überprüfen Sie die Gültigkeit des Feeds',
+		'website' => 'Webseiten-URL',
+	),
+	'import_export' => array(
+		'export' => 'Exportieren',
+		'export_opml' => 'Liste der Feeds exportieren (OPML)',
+		'export_starred' => 'Ihre Favoriten exportieren',
+		'feed_list' => 'Liste von %s Artikeln',
+		'file_to_import' => 'Zu importierende Datei<br />(OPML, JSON oder Zip)',
+		'file_to_import_no_zip' => 'Zu importierende Datei<br />(OPML oder JSON)',
+		'import' => 'Importieren',
+		'starred_list' => 'Liste der Lieblingsartikel',
+		'title' => 'Importieren / Exportieren',
+	),
+	'menu' => array(
+		'bookmark' => 'Abonnieren (FreshRSS-Lesezeichen)',
+		'import_export' => 'Importieren / Exportieren',
+		'subscription_management' => 'Abonnementverwaltung',
+	),
+	'title' => array(
+		'_' => 'Abonnementverwaltung',
+		'feed_management' => 'Verwaltung der RSS-Feeds',
+	),
+);
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 4e9e2e7d6..963b87a14 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -104,6 +104,7 @@ return array(
 		'should_be_activated' => 'JavaScript must be enabled',
 	),
 	'lang' => array(
+		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
 	),
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 10b2c8d28..a266b51c2 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -104,6 +104,7 @@ return array(
 		'should_be_activated' => 'Le JavaScript doit être activé.',
 	),
 	'lang' => array(
+		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
 	),

From dfaf1c451fa418b562aff40935d53a2128dc19a3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Thu, 22 Jan 2015 08:29:58 +0100
Subject: [PATCH 345/363] Revert "! encoding problem"

This reverts commit 964a768bc384425e45ae953bff0f6f757078e7d6.
---
 app/layout/aside_feed.phtml | 10 +++++-----
 p/scripts/main.js           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 664071e8e..d2612e751 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -74,20 +74,20 @@
 <script id="feed_config_template" type="text/html">
 	<ul class="dropdown-menu">
 		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_______'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '______'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
 		<?php } ?>
 		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '______'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '______'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
 		<li class="item">
 			<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
-			        formaction="<?php echo _url('entry', 'read', 'get', 'f_______'); ?>"
+			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
 			        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 		</li>
 		<?php } ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 596ea2c32..0561097e5 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -519,7 +519,7 @@ function init_column_categories() {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
 			var feed_id = $(this).closest('.item').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
-				template = $('#feed_config_template').html().replace(/______/g, feed_id).replace('http://example.net/', feed_web);
+				template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web);
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});

From 963dd6d26077a3e6a316736ab5ba1befcb8ad97c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Thu, 22 Jan 2015 08:31:54 +0100
Subject: [PATCH 346/363] ! encoding problem 2

https://github.com/FreshRSS/FreshRSS/commit/964a768bc384425e45ae953bff0f6f757078e7d6#commitcomment-9385695
---
 app/layout/aside_feed.phtml | 10 +++++-----
 p/scripts/main.js           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index d2612e751..a6d22f878 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -74,20 +74,20 @@
 <script id="feed_config_template" type="text/html">
 	<ul class="dropdown-menu">
 		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_------'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '------'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
 		<?php } ?>
 		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '------'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '------'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
 		<li class="item">
 			<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
-			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
+			        formaction="<?php echo _url('entry', 'read', 'get', 'f_------'); ?>"
 			        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 		</li>
 		<?php } ?>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 0561097e5..1be75bb12 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -519,7 +519,7 @@ function init_column_categories() {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
 			var feed_id = $(this).closest('.item').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
-				template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web);
+				template = $('#feed_config_template').html().replace(/------/g, feed_id).replace('http://example.net/', feed_web);
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});

From 7156a646b28dbdd848fe39acce3e9ba67d880410 Mon Sep 17 00:00:00 2001
From: ealdraed <ealdraed@users.noreply.github.com>
Date: Fri, 23 Jan 2015 01:48:02 +0100
Subject: [PATCH 347/363] Fix double quotes not escaped in RSS title (share by
 email) If an RSS feed title contains double quotes, this prematurely
 terminates the subject line and prohibits the URL to be added to the email
 body when using Share->Email. Replace urlencode() with rawurlencode() for all
 transform functions.

---
 data/shares.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/data/shares.php b/data/shares.php
index 44176f1bf..6e0e9ea0c 100644
--- a/data/shares.php
+++ b/data/shares.php
@@ -19,7 +19,7 @@
 return array(
 	'shaarli' => array(
 		'url' => '~URL~?post=~LINK~&amp;title=~TITLE~&amp;source=FreshRSS',
-		'transform' => array('urlencode'),
+		'transform' => array('rawurlencode'),
 		'help' => 'http://sebsauvage.net/wiki/doku.php?id=php:shaarli',
 		'form' => 'advanced',
 	),
@@ -40,31 +40,28 @@ return array(
 	),
 	'diaspora' => array(
 		'url' => '~URL~/bookmarklet?url=~LINK~&amp;title=~TITLE~',
-		'transform' => array('urlencode'),
+		'transform' => array('rawurlencode'),
 		'help' => 'https://diasporafoundation.org/',
 		'form' => 'advanced',
 	),
 	'twitter' => array(
 		'url' => 'https://twitter.com/share?url=~LINK~&amp;text=~TITLE~',
-		'transform' => array('urlencode'),
+		'transform' => array('rawurlencode'),
 		'form' => 'simple',
 	),
 	'g+' => array(
 		'url' => 'https://plus.google.com/share?url=~LINK~',
-		'transform' => array('urlencode'),
+		'transform' => array('rawurlencode'),
 		'form' => 'simple',
 	),
 	'facebook' => array(
 		'url' => 'https://www.facebook.com/sharer.php?u=~LINK~&amp;t=~TITLE~',
-		'transform' => array('urlencode'),
+		'transform' => array('rawurlencode'),
 		'form' => 'simple',
 	),
 	'email' => array(
 		'url' => 'mailto:?subject=~TITLE~&amp;body=~LINK~',
-		'transform' => array(
-			'link' => array('urlencode'),
-			'title' => array(),
-		),
+		'transform' => array('rawurlencode'),
 		'form' => 'simple',
 	),
 	'print' => array(

From 65fb4ac1fdc41f91c190b5fa82ed2f9ce2817fe5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 22 Jan 2015 10:26:41 +0100
Subject: [PATCH 348/363] Update CREDITS file

See https://github.com/FreshRSS/FreshRSS/pull/766
---
 CREDITS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CREDITS b/CREDITS
index d88535a99..47a968deb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -18,6 +18,9 @@ https://github.com/Alwaysin
 Amaury Carrade
 https://github.com/AmauryCarrade
 
+ealdraed
+https://github.com/ealdraed
+
 Luc Didry
 https://github.com/ldidry
 

From ec75139939780810f43f4e85fbf37de2409fe584 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 26 Jan 2015 10:46:29 +0100
Subject: [PATCH 349/363] Give indication on password format

Fix https://github.com/FreshRSS/FreshRSS/issues/769
---
 app/i18n/de/install.php | 1 +
 app/i18n/en/install.php | 1 +
 app/i18n/fr/install.php | 1 +
 app/install.php         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 1e324251a..e9267bbbd 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -12,6 +12,7 @@ return array(
 		'http' => 'HTTP (HTTPS für erfahrene Benutzer)',
 		'none' => 'Keine (gefährlich)',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
 		'persona' => 'Mozilla Persona (modern, benötigt JavaScript)',
 		'type' => 'Authentifizierungsmethode',
 	),
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index e8073e8b6..2bc6bd38f 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -12,6 +12,7 @@ return array(
 		'http' => 'HTTP (for advanced users with HTTPS)',
 		'none' => 'None (dangerous)',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
 		'persona' => 'Mozilla Persona (modern, requires JavaScript)',
 		'type' => 'Authentication method',
 	),
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index d1b78ffb6..1aa4854ef 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -12,6 +12,7 @@ return array(
 		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
 		'none' => 'Aucune (dangereux)',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => 'Minimum 7 caractères',
 		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
 		'type' => 'Méthode d’authentification',
 	),
diff --git a/app/install.php b/app/install.php
index eb2f764f9..177173fdb 100644
--- a/app/install.php
+++ b/app/install.php
@@ -598,6 +598,7 @@ function printStep2() {
 					<input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" autocomplete="off" <?php echo $auth_type === 'form' ? ' required="required"' : ''; ?> />
 					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo FreshRSS_Themes::icon('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <?php echo _t('install.auth.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>

From 39b8c75c40c74dce2730ad99cd1e0a5392c4f5f5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 26 Jan 2015 11:48:25 +0100
Subject: [PATCH 350/363] Password format on profile and manage user pages

Related to https://github.com/FreshRSS/FreshRSS/commit/ec75139939780810f43f4e85fbf37de2409fe584
See https://github.com/FreshRSS/FreshRSS/issues/769
---
 app/i18n/de/admin.php        | 1 +
 app/i18n/de/conf.php         | 1 +
 app/i18n/en/admin.php        | 1 +
 app/i18n/en/conf.php         | 1 +
 app/i18n/fr/admin.php        | 1 +
 app/i18n/fr/conf.php         | 1 +
 app/i18n/fr/install.php      | 2 +-
 app/views/user/manage.phtml  | 1 +
 app/views/user/profile.phtml | 1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 597c653ff..bcd0fcc61 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -161,6 +161,7 @@ return array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Sprache',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
 		'title' => 'Benutzer verwalten',
 		'user_list' => 'Liste der Benutzer',
 		'username' => 'Nutzername',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 46816c25b..64c2c0945 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -75,6 +75,7 @@ return array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Passwort-API<br /><small>(z. B. für mobile Anwendungen)</small>',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
 		'title' => 'Profil',
 	),
 	'reading' => array(
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 947d0e6c7..d2fcd3e82 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -161,6 +161,7 @@ return array(
 		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Language',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
 		'title' => 'Manage users',
 		'user_list' => 'List of users',
 		'username' => 'Username',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 13efb650b..308c45d2c 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -75,6 +75,7 @@ return array(
 		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
 		'title' => 'Profile',
 	),
 	'reading' => array(
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 980f1fccf..b740bd0d2 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -161,6 +161,7 @@ return array(
 		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Langue',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => '7 caractères minimum',
 		'title' => 'Gestion des utilisateurs',
 		'user_list' => 'Liste des utilisateurs',
 		'username' => 'Nom d’utilisateur',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index e91aeb66a..d38445b99 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -75,6 +75,7 @@ return array(
 		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => '7 caractères minimum',
 		'title' => 'Profil',
 	),
 	'reading' => array(
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 1aa4854ef..245a20c56 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -12,7 +12,7 @@ return array(
 		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
 		'none' => 'Aucune (dangereux)',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
-		'password_format' => 'Minimum 7 caractères',
+		'password_format' => '7 caractères minimum',
 		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
 		'type' => 'Méthode d’authentification',
 	),
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 11562093e..fe1b6618b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -32,6 +32,7 @@
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
 					<a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <?php echo _t('admin.user.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 4e61664bc..c44202edd 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -24,6 +24,7 @@
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <?php echo _t('conf.profile.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>

From da7d34d2ef45e4cfcf1410a279998f680a6338ea Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 26 Jan 2015 13:02:47 +0100
Subject: [PATCH 351/363] Default favicon served with HTTP code 200

Fix https://github.com/FreshRSS/FreshRSS/issues/760
---
 p/f.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/p/f.php b/p/f.php
index fefbf9a10..411f65081 100644
--- a/p/f.php
+++ b/p/f.php
@@ -46,7 +46,6 @@ function download_favicon($website, $dest) {
 function show_default_favicon() {
 	global $default_favicon;
 
-	header('HTTP/1.1 404 Not Found');
 	header('Content-Type: image/ico');
 	readfile($default_favicon);
 	die();

From f5043dbf719df913c7600be12528c0355b48fce7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 26 Jan 2015 14:49:24 +0100
Subject: [PATCH 352/363] Serve HTTP cache for default favicon + better headers

See https://github.com/FreshRSS/FreshRSS/commit/da7d34d2ef45e4cfcf1410a279998f680a6338ea#commitcomment-9439610
---
 p/f.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/p/f.php b/p/f.php
index 411f65081..c904e1fcb 100644
--- a/p/f.php
+++ b/p/f.php
@@ -4,6 +4,7 @@ require('../constants.php');
 
 include(LIB_PATH . '/Favicon/Favicon.php');
 include(LIB_PATH . '/Favicon/DataAccess.php');
+require(LIB_PATH . '/http-conditional.php');
 
 
 $favicons_dir = DATA_PATH . '/favicons/';
@@ -46,9 +47,13 @@ function download_favicon($website, $dest) {
 function show_default_favicon() {
 	global $default_favicon;
 
-	header('Content-Type: image/ico');
-	readfile($default_favicon);
-	die();
+	header('Content-Type: image/x-icon');
+	header('Content-Disposition: inline; filename="default_favicon.ico"');
+
+	$default_mtime = @filemtime($default_favicon);
+	if (!httpConditional($default_mtime, 2592000, 2)) {
+		readfile($default_favicon);
+	}
 }
 
 
@@ -63,19 +68,22 @@ $ico = $favicons_dir . $id . '.ico';
 $ico_mtime = @filemtime($ico);
 $txt_mtime = @filemtime($txt);
 
-if (($ico_mtime == false) || ($txt_mtime > $ico_mtime)) {
+
+if ($ico_mtime == false || $txt_mtime > $ico_mtime) {
 	if ($txt_mtime == false) {
 		show_default_favicon();
+		return;
 	}
 
+	// no ico file or we should download a new one.
 	$url = file_get_contents($txt);
 	if (!download_favicon($url, $ico)) {
+		// Download failed, show the default favicon
 		show_default_favicon();
+		return;
 	}
 }
 
-require(LIB_PATH . '/http-conditional.php');
-
 header('Content-Type: image/x-icon');
 header('Content-Disposition: inline; filename="' . $id . '.ico"');
 

From b4b5fcf86b1126b044a3a89b30b512902eb8eccf Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 27 Jan 2015 11:09:05 +0100
Subject: [PATCH 353/363] Change translation for gen.js.request_failed

See https://github.com/FreshRSS/FreshRSS/issues/775
---
 app/i18n/de/gen.php | 2 +-
 app/i18n/en/gen.php | 2 +-
 app/i18n/fr/gen.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index b9ef55b60..a45d86477 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -97,7 +97,7 @@ return array(
 		'confirm_action_feed_cat' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Sie werden zugehörige Favoriten und Benutzerabfragen verlieren. Dies kann nicht abgebrochen werden!',
 		'feedback' => array(
 			'body_new_articles' => 'Es gibt \\d neue Artikel zum Lesen auf FreshRSS.',
-			'request_failed' => 'Ein Problem trat auf und die Anfrage schlug fehl.',
+			'request_failed' => 'Eine Anforderung ist fehlgeschlagen, kann es von einigen Internet-Verbindungsprobleme aufgetreten sind.',
 			'title_new_articles' => 'FreshRSS: neue Artikel!',
 		),
 		'new_article' => 'Es gibt neue verfügbare Artikel. Klicken Sie, um die Seite zu aktualisieren.',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 963b87a14..2143822ed 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -97,7 +97,7 @@ return array(
 		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
 		'feedback' => array(
 			'body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
-			'request_failed' => 'A problem happened and the request failed.',
+			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
 			'title_new_articles' => 'FreshRSS: new articles!',
 		),
 		'new_article' => 'There are new available articles, click to refresh the page.',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index a266b51c2..1cfec6969 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -97,7 +97,7 @@ return array(
 		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
 		'feedback' => array(
 			'body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
-			'request_failed' => 'Un problème est survenu et la requête a échoué.',
+			'request_failed' => 'Une requête a échoué, cela peut être dû à des problèmes de connexion à Internet.',
 			'title_new_articles' => 'FreshRSS : nouveaux articles !',
 		),
 		'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',

From 01683ba1364abc9ea48bd2b637d9faad942b0721 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 27 Jan 2015 17:19:57 +0100
Subject: [PATCH 354/363] Remove information about me and update links

FreshRSS should not be associated to me but to the community:

- Remove links to send me email or references to a "lead developer"
- Change old Github links marienfressinaud/FreshRSS to FreshRSS/FreshRSS
---
 README.fr.md                   | 15 ++++++---------
 README.md                      | 15 ++++++---------
 app/i18n/de/index.php          |  3 +--
 app/i18n/en/index.php          |  3 +--
 app/i18n/fr/index.php          |  3 +--
 app/views/index/about.phtml    |  5 +----
 p/themes/BlueLagoon/README.md  |  2 +-
 p/themes/Screwdriver/README.md |  2 +-
 p/themes/base-theme/README.md  |  2 +-
 9 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 4e6c52d68..380d7bc1e 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -9,26 +9,23 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an
 
 * Site officiel : http://freshrss.org
 * Démo : http://demo.freshrss.org/
-* Développeur : Marien Fressinaud <dev@marienfressinaud.fr>
-* Version actuelle : 0.10-dev
-* Date de publication 2014-xx-xx
-* License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
+* Licence : [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
 # Note sur les branches
 **Ce logiciel est encore en développement !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
 
-* Utilisez [la branche master](https://github.com/marienfressinaud/FreshRSS/tree/master/) si vous visez la stabilité.
-* [La branche beta](https://github.com/marienfressinaud/FreshRSS/tree/beta) est celle par défaut : les nouveautés y sont ajoutées environ tous les mois.
-* Pour les développeurs et ceux qui savent ce qu'ils font, [la branche dev](https://github.com/marienfressinaud/FreshRSS/tree/dev) vous ouvre les bras !
+* Utilisez [la branche master](https://github.com/FreshRSS/FreshRSS/tree/master/) si vous visez la stabilité.
+* [La branche beta](https://github.com/FreshRSS/FreshRSS/tree/beta) est celle par défaut : les nouveautés y sont ajoutées environ tous les mois.
+* Pour les développeurs et ceux qui savent ce qu'ils font, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
 
 # Disclaimer
 Cette application a été développée pour s’adapter à des besoins personnels et non professionnels.
 Je ne garantis en aucun cas la sécurité de celle-ci, ni son bon fonctionnement.
 Je m’engage néanmoins à répondre dans la mesure du possible aux demandes d’évolution si celles-ci me semblent justifiées.
 Privilégiez pour cela des demandes sur GitHub
-(https://github.com/marienfressinaud/FreshRSS/issues) ou par mail (dev@marienfressinaud.fr)
+(https://github.com/FreshRSS/FreshRSS/issues).
 
 # Pré-requis
 * Serveur modeste, par exemple sous Linux ou Windows
@@ -44,7 +41,7 @@ Privilégiez pour cela des demandes sur GitHub
 ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
 
 # Installation
-1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](https://github.com/marienfressinaud/FreshRSS/archive/master.zip)
+1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip)
 2. Placez l’application sur votre serveur (la partie à exposer au Web est le répertoire `./p/`)
 3. Le serveur Web doit avoir les droits d’écriture dans le répertoire `./data/`
 4. Accédez à FreshRSS à travers votre navigateur Web et suivez les instructions d’installation
diff --git a/README.md b/README.md
index 430dd82bc..a09a64639 100644
--- a/README.md
+++ b/README.md
@@ -9,26 +9,23 @@ It is a multi-user application with an anonymous reading mode.
 
 * Official website: http://freshrss.org
 * Demo: http://demo.freshrss.org/
-* Developer: Marien Fressinaud <dev@marienfressinaud.fr>
-* Current version: 0.10-dev
-* Publication date: 2014-xx-xx
-* License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
+* License: [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
 # Note on branches
 **This application is still in development!** Please use the branch that suits your needs:
 
-* Use [the master branch](https://github.com/marienfressinaud/FreshRSS/tree/master/) if you need a stable version.
-* [The beta branch](https://github.com/marienfressinaud/FreshRSS/tree/beta) is the default branch: new features are added on a monthly basis.
-* For developers and tech savvy persons, [the dev branch](https://github.com/marienfressinaud/FreshRSS/tree/dev) is waiting for you!
+* Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version.
+* [The beta branch](https://github.com/FreshRSS/FreshRSS/tree/beta) is the default branch: new features are added on a monthly basis.
+* For developers and tech savvy persons, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
 
 # Disclaimer
 This application was developed to fulfill personal needs not professional needs.
 There is no guarantee neither on its security nor its proper functioning.
 If there is feature requests which I think are good for the project, I'll do my best to include them.
 The best way is to open issues on GitHub
-(https://github.com/marienfressinaud/FreshRSS/issues) or by email (dev@marienfressinaud.fr)
+(https://github.com/FreshRSS/FreshRSS/issues).
 
 # Requirements
 * Light server running Linux or Windows
@@ -44,7 +41,7 @@ The best way is to open issues on GitHub
 ![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
 
 # Installation
-1. Get FreshRSS with git or [by downloading the archive](https://github.com/marienfressinaud/FreshRSS/archive/master.zip)
+1. Get FreshRSS with git or [by downloading the archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip)
 2. Dump the application on your server (expose only the `./p/` folder)
 3. Add write access on `./data/` folder to the webserver user
 4. Access FreshRSS with your browser and follow the installation process
diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 8538bf3de..3449de87d 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -8,8 +8,7 @@ return array(
 		'credits' => 'Credits',
 		'credits_content' => 'Einige Designelemente stammen von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> stammen vom <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> Font wurde von <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a> erstellt. Favicons werden mit <a href="https://getfavicon.appspot.com/">getFavicon API</a> gesammelt. FreshRSS basiert auf <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, einem PHP-Framework.',
 		'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="http://projet.idleman.fr/leed/">Leed</a>. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.',
-		'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
-		'lead_developer' => 'Hauptentwickler',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'Lizenz',
 		'project_website' => 'Projekt-Webseite',
 		'title' => 'Über',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 8e7d81db8..80fa3d950 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -8,8 +8,7 @@ return array(
 		'credits' => 'Credits',
 		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
 		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
-		'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
-		'lead_developer' => 'Lead developer',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'License',
 		'project_website' => 'Project website',
 		'title' => 'About',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index f9975c593..7e028ab92 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -8,8 +8,7 @@ return array(
 		'credits' => 'Crédits',
 		'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
 		'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
-		'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
-		'lead_developer' => 'Développeur principal',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sur Github</a>',
 		'license' => 'Licence',
 		'project_website' => 'Site du projet',
 		'title' => 'À propos',
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index ff2c538a2..3fdb5160d 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -7,11 +7,8 @@
 		<dt><?php echo _t('index.about.project_website'); ?></dt>
 		<dd><a href="<?php echo FRESHRSS_WEBSITE; ?>"><?php echo FRESHRSS_WEBSITE; ?></a></dd>
 
-		<dt><?php echo _t('index.about.lead_developer'); ?></dt>
-		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo _t('index.about.website'); ?></a></dd>
-
 		<dt><?php echo _t('index.about.bugs_reports'); ?></dt>
-		<dd><?php echo _t('index.about.github_or_email'); ?></dd>
+		<dd><?php echo _t('index.about.github'); ?></dd>
 
 		<dt><?php echo _t('index.about.license'); ?></dt>
 		<dd><?php echo _t('index.about.agpl3'); ?></dd>
diff --git a/p/themes/BlueLagoon/README.md b/p/themes/BlueLagoon/README.md
index 62afc234b..a83dd6743 100644
--- a/p/themes/BlueLagoon/README.md
+++ b/p/themes/BlueLagoon/README.md
@@ -1,7 +1,7 @@
 Blue Lagoon
 =======
 
-**C'est un cocktail (bis)! C'est la version plus "fresh" de [Screwdriver](https://github.com/misterair/Screwdriver). C'est... c'est... un thème pour l'agrégateur de flux RSS [FreshRSS](https://github.com/marienfressinaud/FreshRSS/)**
+**C'est un cocktail (bis)! C'est la version plus "fresh" de [Screwdriver](https://github.com/misterair/Screwdriver). C'est... c'est... un thème pour l'agrégateur de flux RSS [FreshRSS](https://github.com/FreshRSS/FreshRSS/)**
 
 
 En toute modestie, ce thème tue du Nyan Cat.
diff --git a/p/themes/Screwdriver/README.md b/p/themes/Screwdriver/README.md
index 4b10eb90f..385e1dc71 100644
--- a/p/themes/Screwdriver/README.md
+++ b/p/themes/Screwdriver/README.md
@@ -1,7 +1,7 @@
 Screwdriver 
 =======
 
-**C'est un cocktail! C'est chaud mais "fresh" à la fois. C'est... c'est... un thème pour l'agrégateur de flux RSS<a href="https://github.com/marienfressinaud/FreshRSS/" target="blank">FreshRSS</a>!!**
+**C'est un cocktail! C'est chaud mais "fresh" à la fois. C'est... c'est... un thème pour l'agrégateur de flux RSS<a href="https://github.com/FreshRSS/FreshRSS/" target="blank">FreshRSS</a>!!**
 En toute modestie, ce thème tue du chaton.
 
 ![screenshot](https://github.com/misterair/Screwdriver/blob/master/screenshot.png)
diff --git a/p/themes/base-theme/README.md b/p/themes/base-theme/README.md
index 6f186e15c..9f7d635ca 100644
--- a/p/themes/base-theme/README.md
+++ b/p/themes/base-theme/README.md
@@ -8,5 +8,5 @@ A base theme for [FreshRSS](http://freshrss.org)
 3. Choose your new theme in FreshRSS configuration
 4. Enjoy your wonderful theme!
 
-Don't hesitate to share your theme with us [on Github](https://github.com/marienfressinaud/FreshRSS/issues) :)
+Don't hesitate to share your theme with us [on Github](https://github.com/FreshRSS/FreshRSS/issues) :)
 

From 403b0a24a5295281eedca8aebfaa334b3df6d7d8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 27 Jan 2015 20:46:36 +0100
Subject: [PATCH 355/363] Fix german gen.js.request_failed

---
 app/i18n/de/gen.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index a45d86477..f3479ed53 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -97,7 +97,7 @@ return array(
 		'confirm_action_feed_cat' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Sie werden zugehörige Favoriten und Benutzerabfragen verlieren. Dies kann nicht abgebrochen werden!',
 		'feedback' => array(
 			'body_new_articles' => 'Es gibt \\d neue Artikel zum Lesen auf FreshRSS.',
-			'request_failed' => 'Eine Anforderung ist fehlgeschlagen, kann es von einigen Internet-Verbindungsprobleme aufgetreten sind.',
+			'request_failed' => 'Eine Anfrage ist fehlgeschlagen, dies könnte durch Probleme mit der Internetverbindung verursacht worden sein.',
 			'title_new_articles' => 'FreshRSS: neue Artikel!',
 		),
 		'new_article' => 'Es gibt neue verfügbare Artikel. Klicken Sie, um die Seite zu aktualisieren.',

From b355a45c35b366fe2ad56b461dd28b11956ef6d9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 09:52:43 +0100
Subject: [PATCH 356/363] Change behaviour of #add_rss input.extend

UI was frustrating when input had the focus: we needed to click elsewhere to
be able to open the next dropdown.

See https://github.com/FreshRSS/FreshRSS/issues/777
---
 app/views/subscription/index.phtml | 2 +-
 p/themes/base-theme/template.css   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index b9e40988c..331e8244e 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -7,7 +7,7 @@
 
 	<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
 		<div class="stick">
-			<input type="url" name="url_rss" class="extend" placeholder="<?php echo _t('sub.feed.add'); ?>" />
+			<input type="url" name="url_rss" class="long" placeholder="<?php echo _t('sub.feed.add'); ?>" />
 			<div class="dropdown">
 				<div id="dropdown-cat" class="dropdown-target"></div>
 
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index c6ea40f66..a299a5ddf 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -75,6 +75,7 @@ input {
 }
 textarea,
 input[type="file"],
+input.long,
 input.extend:focus {
 	width: 300px;
 }

From 59ea9f2a3b131432236745483e20cb50338110df Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 10:14:45 +0100
Subject: [PATCH 357/363] Remove calls to syslog()

Temporary fix:

- Change syslog by Minz_Log::notice in most of the files
- Logs are stored in USERS_PATH/_/log.txt for actualize_script.php
- Simply comment syslog in SimplePie

See https://github.com/FreshRSS/FreshRSS/issues/711
---
 app/Models/Feed.php              |  4 ++--
 app/actualize_script.php         | 12 ++++++++----
 lib/SimplePie/SimplePie.php      |  4 ++--
 lib/SimplePie/SimplePie/File.php |  2 +-
 lib/lib_rss.php                  |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 86cbb783e..74869bf11 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -249,10 +249,10 @@ class FreshRSS_Feed extends Minz_Model {
 				}
 
 				if (($mtime === true) ||($mtime > $this->lastUpdate)) {
-					syslog(LOG_DEBUG, 'FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url);
+					Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url);
 					$this->loadEntries($feed);	// et on charge les articles du flux
 				} else {
-					syslog(LOG_DEBUG, 'FreshRSS use cache for ' . $subscribe_url);
+					Minz_Log::notice('FreshRSS use cache for ' . $subscribe_url);
 					$this->entries = array();
 				}
 
diff --git a/app/actualize_script.php b/app/actualize_script.php
index bae40aa56..fc4f9bfbb 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -21,6 +21,9 @@ $_GET['force'] = true;
 $_SERVER['HTTP_HOST'] = '';
 
 
+$log_file = join_path(USERS_PATH, '_', 'log.txt');
+
+
 $app = new FreshRSS();
 
 $system_conf = Minz_Configuration::get('system');
@@ -41,13 +44,13 @@ $min_last_activity = time() - $limits['max_inactivity'];
 foreach ($users as $user) {
 	if (($user !== $system_conf->default_user) &&
 			(FreshRSS_UserDAO::mtime($user) < $min_last_activity)) {
-		syslog(LOG_INFO, 'FreshRSS skip inactive user ' . $user);
+		Minz_Log::notice('FreshRSS skip inactive user ' . $user, $log_file);
 		if (defined('STDOUT')) {
 			fwrite(STDOUT, 'FreshRSS skip inactive user ' . $user . "\n");	//Unbuffered
 		}
 		continue;
 	}
-	syslog(LOG_INFO, 'FreshRSS actualize ' . $user);
+	Minz_Log::notice('FreshRSS actualize ' . $user, $log_file);
 	if (defined('STDOUT')) {
 		fwrite(STDOUT, 'Actualize ' . $user . "...\n");	//Unbuffered
 	}
@@ -62,7 +65,8 @@ foreach ($users as $user) {
 
 
 	if (!invalidateHttpCache()) {
-		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . join_path(USERS_PATH, $user, 'log.txt'));
+		Minz_Log::notice('FreshRSS write access problem in ' . join_path(USERS_PATH, $user, 'log.txt'),
+		                 $log_file);
 		if (defined('STDERR')) {
 			fwrite(STDERR, 'Write access problem in ' . join_path(USERS_PATH, $user, 'log.txt') . "\n");
 		}
@@ -70,7 +74,7 @@ foreach ($users as $user) {
 }
 
 
-syslog(LOG_INFO, 'FreshRSS actualize done.');
+Minz_Log::notice('FreshRSS actualize done.', $log_file);
 if (defined('STDOUT')) {
 	fwrite(STDOUT, 'Done.' . "\n");
 	$end_date = date_create('now');
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index dc4bbb6cb..c4872b5be 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1529,11 +1529,11 @@ class SimplePie
 					{	//FreshRSS
 						$md5 = $this->cleanMd5($file->body);
 						if ($this->data['md5'] === $md5) {
-							syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . $this->feed_url);
+							// syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . $this->feed_url);
 							$cache->touch();
 							return true;	//Content unchanged even though server did not send a 304
 						} else {
-							syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . $this->feed_url);
+							// syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . $this->feed_url);
 							$this->data['md5'] = $md5;
 						}
 					}
diff --git a/lib/SimplePie/SimplePie/File.php b/lib/SimplePie/SimplePie/File.php
index b1bbe4420..9625af2a9 100644
--- a/lib/SimplePie/SimplePie/File.php
+++ b/lib/SimplePie/SimplePie/File.php
@@ -79,7 +79,7 @@ class SimplePie_File
 		$this->useragent = $useragent;
 		if (preg_match('/^http(s)?:\/\//i', $url))
 		{
-			syslog(LOG_INFO, 'SimplePie GET ' . $url);	//FreshRSS
+			// syslog(LOG_INFO, 'SimplePie GET ' . $url);	//FreshRSS
 			if ($useragent === null)
 			{
 				$useragent = ini_get('user_agent');
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 083e87745..3b3f6d279 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -180,7 +180,7 @@ function sanitizeHTML($data, $base = '') {
 function get_content_by_parsing ($url, $path) {
 	require_once (LIB_PATH . '/lib_phpQuery.php');
 
-	syslog(LOG_INFO, 'FreshRSS GET ' . $url);
+	Minz_Log::notice('FreshRSS GET ' . $url);
 	$html = file_get_contents ($url);
 
 	if ($html) {

From a47ce4f6af9e55267c4ce50af1bcc052229535ad Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 10:17:29 +0100
Subject: [PATCH 358/363] Fix including extensions for actualize_script

Extensions could be included multiple times. It resulted in an error.
---
 lib/Minz/ExtensionManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index f00453f6c..c5c68a8d4 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -114,7 +114,7 @@ class Minz_ExtensionManager {
 		$entry_point_filename = $info['path'] . '/' . self::$ext_entry_point;
 		$ext_class_name = $info['entrypoint'] . 'Extension';
 
-		include($entry_point_filename);
+		include_once($entry_point_filename);
 
 		// Test if the given extension class exists.
 		if (!class_exists($ext_class_name)) {

From 40f45c92ed96c34e1342cb50b3582b587e36a9bb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 10:26:16 +0100
Subject: [PATCH 359/363] Fix get_user_configuration()

There is no need to prefix namespace by the time: if conf has already been
registered, it will be returned anyway!
---
 lib/lib_rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 3b3f6d279..68abe602c 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -248,7 +248,7 @@ function listUsers() {
  * @return a Minz_Configuration object, null if the configuration cannot be loaded.
  */
 function get_user_configuration($username) {
-	$namespace = time() . '_user_' . $username;
+	$namespace = 'user_' . $username;
 	try {
 		Minz_Configuration::register($namespace,
 		                             join_path(USERS_PATH, $username, 'config.php'),

From e078f9fdac8f666e2d2aad1b1cc8ba3aadb68ab2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 10:47:33 +0100
Subject: [PATCH 360/363] Introduce url_remove_credentials() function

See https://github.com/FreshRSS/FreshRSS/issues/711
---
 lib/lib_rss.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 68abe602c..d4f41cf5c 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -429,3 +429,13 @@ function array_push_unique(&$array, $value) {
 function array_remove(&$array, $value) {
 	$array = array_diff($array, array($value));
 }
+
+
+/**
+ * Sanitize a URL by removing HTTP credentials.
+ * @param $url the URL to sanitize.
+ * @return the same URL without HTTP credentials.
+ */
+function url_remove_credentials($url) {
+	return preg_replace('#((.+)://)((.+)@)?(.+)#', '${1}${5}', $url);
+}

From 8ff3e5363d28dff2eed6d7f152921ed093196a04 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 10:57:11 +0100
Subject: [PATCH 361/363] Use url_remove_credentials to log URL

See https://github.com/FreshRSS/FreshRSS/issues/711
---
 app/Models/Feed.php | 11 ++++-------
 lib/lib_rss.php     |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 74869bf11..5ce03be5d 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -240,19 +240,16 @@ class FreshRSS_Feed extends Minz_Model {
 					$subscribe_url = $feed->subscribe_url(true);
 				}
 
+				$clean_url = url_remove_credentials($subscribe_url);
 				if ($subscribe_url !== null && $subscribe_url !== $url) {
-					if ($this->httpAuth != '') {
-						// on enlève les id si authentification HTTP
-						$subscribe_url = preg_replace('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url);
-					}
-					$this->_url($subscribe_url);
+					$this->_url($clean_url);
 				}
 
 				if (($mtime === true) ||($mtime > $this->lastUpdate)) {
-					Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url);
+					Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $clean_url);
 					$this->loadEntries($feed);	// et on charge les articles du flux
 				} else {
-					Minz_Log::notice('FreshRSS use cache for ' . $subscribe_url);
+					Minz_Log::notice('FreshRSS use cache for ' . $clean_url);
 					$this->entries = array();
 				}
 
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index d4f41cf5c..e2fcb1fee 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -180,7 +180,7 @@ function sanitizeHTML($data, $base = '') {
 function get_content_by_parsing ($url, $path) {
 	require_once (LIB_PATH . '/lib_phpQuery.php');
 
-	Minz_Log::notice('FreshRSS GET ' . $url);
+	Minz_Log::notice('FreshRSS GET ' . url_remove_credentials($url));
 	$html = file_get_contents ($url);
 
 	if ($html) {

From 01a1179b1ae0ee92234a0ef0a67c3e5d6d0b3c7e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 11:05:20 +0100
Subject: [PATCH 362/363] Improve url_remove_credentials

Use @aledeg old function instead

See https://github.com/FreshRSS/FreshRSS/pull/715
See https://github.com/FreshRSS/FreshRSS/issues/711
---
 lib/lib_rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index e2fcb1fee..e5fe73041 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -437,5 +437,5 @@ function array_remove(&$array, $value) {
  * @return the same URL without HTTP credentials.
  */
 function url_remove_credentials($url) {
-	return preg_replace('#((.+)://)((.+)@)?(.+)#', '${1}${5}', $url);
+	return preg_replace('/[^\/]*:[^:]*@/', '', $url);
 }

From e91b72b63cd11ae3c4f59e48439e93955242c673 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Jan 2015 14:47:54 +0100
Subject: [PATCH 363/363] Update changelog

---
 CHANGELOG | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2eca6fef3..b389f184b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,29 @@
-# Journal des modifications
+# Changelog
+
+## 2015-01-31 FreshRSS 1.0.0 / 1.1.0 (beta)
+
+* UI
+	* Slider math with Dark theme
+	* Add a message if request failed for mark as read / favourite
+* I18n
+	* Fix some sentences
+	* Add German as a supported language
+	* Add some indications on password format
+* Bug fixing
+	* Some shortcuts was never saved
+	* Global view didn't work if set by default
+	* Minz_Error was badly raised
+	* Feed update failed if nothing had changed (MySQL only)
+	* CRON task failed with multiple users
+	* Tricky bug caused by cookie path
+	* Email sharing was badly supported (no urlencode())
+* Misc.
+	* Add a CREDIT file with contributor names
+	* Update lib_opml
+	* Default favicon is now served by HTTP code 200
+	* Change calls to syslog by Minz_Log::notice
+	* HTTP credentials are no longer logged
+
 
 ## 2015-01-15 FreshRSS 0.9.4 (beta)
 
@@ -61,7 +86,6 @@
 	* Introduce ```checkInstallAction``` to test if FreshRSS installation is ok
 
 
-
 ## 2014-10-09 FreshRSS 0.8.1 / 0.9.1 (beta)
 
 * UI