From a4dac0f791ae6d34b64cee5a3fae1815f6f70a2b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 13 Jun 2014 18:54:26 +0200
Subject: Version 0.7.2

---
 README.md     | 4 ++--
 constants.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ce3c8ef32..172ffd394 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,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.7.2
+* Date de publication 2014-06-13
 * 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/constants.php b/constants.php
index e32b8cbc3..b75aa4576 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.8-dev');
+define('FRESHRSS_VERSION', '0.7.2');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
-- 
cgit v1.2.3


From 50a5079b71a33f088696d06203916a9be4374b2d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 21 Jul 2014 18:10:34 +0200
Subject: Version 0.7.3

---
 README.md     | 4 ++--
 constants.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5e6912524..f857bae99 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,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.7.2
-* Date de publication 2014-06-13
+* Version actuelle : 0.7.3
+* Date de publication 2014-07-21
 * 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/constants.php b/constants.php
index b75aa4576..0850219c5 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.7.2');
+define('FRESHRSS_VERSION', '0.7.3');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
-- 
cgit v1.2.3


From 4beabd52922a1e4769be58c8c7a01bf009b687a4 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Sat, 9 Aug 2014 00:06:21 +0200
Subject: Correct typo in french translation (missing 's')

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

diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index e04078dba..a3b966c6d 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -224,7 +224,7 @@ return array (
 	'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 connexion automatiques non-sûres au format : ',
+	'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&token=%s</kbd>',
-- 
cgit v1.2.3


From 1d2527b8bc2a125cc8b8508402417f60d314e330 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 9 Aug 2014 12:03:24 +0200
Subject: Revert "Correct typo in french translation (missing 's')"

This reverts commit 4beabd52922a1e4769be58c8c7a01bf009b687a4.

This PR should not be merged directly in beta!
See https://github.com/marienfressinaud/FreshRSS/pull/572
---
 app/i18n/fr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index a3b966c6d..e04078dba 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -224,7 +224,7 @@ return array (
 	'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 : ',
+	'unsafe_autologin'		=> 'Autoriser les connexion 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&token=%s</kbd>',
-- 
cgit v1.2.3


From 94ad9cf073962d9ff8076ef8e0db35e513d565a7 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 24 Aug 2014 15:29:48 +0200
Subject: Version 0.7.4

---
 README.fr.md  | 4 ++--
 README.md     | 4 ++--
 constants.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index df43ef7e8..9c18f5656 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.7.4
+* Date de publication 2014-08-24
 * 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..47beee892 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.7.4
+* Publication date: 2014-08-24
 * 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 0850219c5..b3ff177b2 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.7.3');
+define('FRESHRSS_VERSION', '0.7.4');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
-- 
cgit v1.2.3


From 444b1552364b39761c3278c7da5152fd3998f216 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 26 Sep 2014 14:47:48 +0200
Subject: Version 0.8.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..46f1e7c8f 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.8.0
+* Date de publication 2014-09-26
 * 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..501dca342 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.8.0
+* Publication date: 2014-09-26
 * 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..464e2da66 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.8-dev');
+define('FRESHRSS_VERSION', '0.8.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


From 6dfbc28042c6e18da9c7578ed626064a4d8c7cb3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 26 Sep 2014 14:51:53 +0200
Subject: Version 0.9.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 9c18f5656..3e15c29fa 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.7.4
-* Date de publication 2014-08-24
+* Version actuelle : 0.9.0
+* Date de publication 2014-09-26
 * 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 47beee892..0c2872944 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.7.4
-* Publication date: 2014-08-24
+* Current version: 0.9.0
+* Publication date: 2014-09-26
 * 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 d9f2eab08..5bbb1a6a8 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.7.4');
+define('FRESHRSS_VERSION', '0.9.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


From 5e2a01d61f69d1720cea98c6d54f09505a47e08e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 10:05:26 +0200
Subject: 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 f6d5d2907..9e39010bd 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;
-- 
cgit v1.2.3


From 2fc3068d1b796152f374cfba3528f4273ad37bce Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 11:08:30 +0200
Subject: 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>
-- 
cgit v1.2.3


From e7c36d515286079491c5dd6d6db7cc87d47dd043 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 27 Sep 2014 08:20:13 -0400
Subject: 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 9e39010bd..00cd96fbe 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
 	});
-- 
cgit v1.2.3


From d6396be41ad140fb61f9d31a6a5d51aab427cc65 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 Oct 2014 22:02:09 +0200
Subject: 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 c7cc25fbb..f75c969d9 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
-- 
cgit v1.2.3


From 0965aecefef0fa1e67e649d24c6d4b3ba0e143c1 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 29 Sep 2014 18:57:40 -0400
Subject: 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.

Conflicts:
	app/views/stats/index.phtml
---
 app/views/stats/index.phtml       | 9 ++++++++-
 app/views/stats/repartition.phtml | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 412e77e16..bbdcfaec8 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -92,7 +92,14 @@ function initStats() {
 	}
 	// Entry per day
 	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},
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
 		}],
 		{
-- 
cgit v1.2.3


From 57d4914bf81f3380fe55fa06b7b312f1c463e3e3 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 29 Sep 2014 18:54:03 -0400
Subject: Add an average per day for the 30 day period

Conflicts:
	app/views/stats/index.phtml
---
 app/Controllers/statsController.php |  1 +
 app/Models/StatsDAO.php             | 27 ++++++++++++++++++++++++---
 app/Models/StatsDAOSQLite.php       | 23 +++++++++++++++++++++++
 app/views/stats/index.phtml         |  7 +++++--
 4 files changed, 53 insertions(+), 5 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 bbdcfaec8..37803f2f9 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -91,6 +91,10 @@ 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'),
 		[{
 			data: <?php echo $this->count ?>,
@@ -102,8 +106,7 @@ function initStats() {
 		}],
 		{
 			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);}}
 		});
-- 
cgit v1.2.3


From 8a09958281e7a4352c86d5734cbc9c6dc90b3c96 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 29 Sep 2014 18:26:28 -0400
Subject: 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 37803f2f9..fa57a77c0 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>
-- 
cgit v1.2.3


From d842f85966b2873f1074c73ad79ec5169e7090f2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Oct 2014 16:53:43 +0200
Subject: 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]);
 					}
 				}
 			}
-- 
cgit v1.2.3


From ba163baa84c78bbb642a57bbba810ef5e7aa1bc3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 9 Oct 2014 16:02:56 +0200
Subject: Fix bug with getExtension()

getExtension() is not available on PHP < 5.3.7
Replaced by pathinfo(..., PATHINFO_EXTENSION)

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

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index e8e26b142..d3b299f4e 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -330,7 +330,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	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) {
+			$extension = pathinfo($fileInfo->getFilename(), PATHINFO_EXTENSION);
+			if ($extension === 'txt' && $fileInfo->getMTime() < $oldest) {
 				@unlink($fileInfo->getPathname());
 			}
 		}
-- 
cgit v1.2.3


From db12b30e4d8a0327fd3829fa93dcdce6a6044248 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 9 Oct 2014 16:13:19 +0200
Subject: CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 44d3452ae..1a4a8879b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,20 @@
 # Journal des modifications
 
+## 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)
 
 * UI
-- 
cgit v1.2.3


From caf98a6468dcea5ae8c38062e4eb527cb3667db9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 9 Oct 2014 16:15:02 +0200
Subject: Prepare READMEs

---
 README.fr.md | 4 ++--
 README.md    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 46f1e7c8f..050f49ec6 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.0
-* Date de publication 2014-09-26
+* Version actuelle : x.y.z
+* Date de publication : YYYY-MM-DD
 * 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 501dca342..7c74e8ada 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.0
-* Publication date: 2014-09-26
+* Current version: x.y.z
+* Publication date: YYYY-MM-DD
 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
-- 
cgit v1.2.3


From 42fd539a1b14f883077048a35864b4294b6efe94 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 9 Oct 2014 16:16:31 +0200
Subject: Version 0.8.1

---
 README.fr.md  | 4 ++--
 README.md     | 4 ++--
 constants.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 050f49ec6..2bc887290 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 : x.y.z
-* Date de publication : YYYY-MM-DD
+* Version actuelle : 0.8.1
+* Date de publication : 2014-10-09
 * 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 7c74e8ada..77fa9f948 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: x.y.z
-* Publication date: YYYY-MM-DD
+* Current version: 0.8.1
+* Publication date: 2014-10-09
 * 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 464e2da66..adc965244 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.8.0');
+define('FRESHRSS_VERSION', '0.8.1');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


From cff8636e770b2072a41928cd918b37654c0dafbb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 9 Oct 2014 16:19:05 +0200
Subject: Version 0.9.1

---
 README.fr.md  | 4 ++--
 README.md     | 4 ++--
 constants.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 050f49ec6..a90737ceb 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 : x.y.z
-* Date de publication : YYYY-MM-DD
+* Version actuelle : 0.9.1
+* Date de publication : 2014-10-09
 * 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 7c74e8ada..30971f697 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: x.y.z
-* Publication date: YYYY-MM-DD
+* Current version: 0.9.1
+* Publication date: 2014-10-09
 * 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 5bbb1a6a8..615e31abf 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.9.0');
+define('FRESHRSS_VERSION', '0.9.1');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


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: 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);
-- 
cgit v1.2.3


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: 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              | 103 ++++++----------
 app/layout/nav_menu.phtml                | 205 +++++++------------------------
 app/views/helpers/view/normal_view.phtml | 191 ----------------------------
 app/views/helpers/view/rss_view.phtml    |  29 -----
 app/views/index/global.phtml             |   4 +-
 app/views/index/normal.phtml             | 191 ++++++++++++++++++++++++++++
 app/views/index/rss.phtml                |  29 +++++
 lib/Minz/Request.php                     |   7 ++
 11 files changed, 425 insertions(+), 506 deletions(-)
 delete mode 100644 app/views/helpers/view/normal_view.phtml
 delete mode 100755 app/views/helpers/view/rss_view.phtml
 create mode 100644 app/views/index/normal.phtml
 create mode 100755 app/views/index/rss.phtml

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;
-
-		// 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;
-			}
-		}
+		// TODO: update the context with information from request.
+		// TODO: then, in dedicated action, get corresponding entries
 
-		$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 } ?>
+
+	<form id="mark-read-aside" method="post" style="display: none"></form>
 
-		<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>
+	<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>
-			<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 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>
-			<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>
+			<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
-		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;
-
-			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 = '';
-			}
-		?>
-		<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 = '';
-			}
+			$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,
+			);
+
+			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-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/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
deleted file mode 100644
index afe8ed872..000000000
--- a/app/views/helpers/view/normal_view.phtml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-$this->partial('aside_flux');
-$this->partial('nav_menu');
-
-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;
-?>
-
-<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>
-	</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 _t('today');
-				?><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)) {
-			?><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
-			?></div><?php
-			$display_yesterday = false;
-		}
-		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(); ?>">
-		<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->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 } ?>
-		</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>
-				<?php
-					$author = $item->author();
-					echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
-						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->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>
-
-						<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 } ?>
-
-	<?php $this->renderHelper('pagination'); ?>
-</div>
-
-<?php $this->partial('nav_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 />
-</div>
-<?php } ?>
diff --git a/app/views/helpers/view/rss_view.phtml b/app/views/helpers/view/rss_view.phtml
deleted file mode 100755
index e34b15ab1..000000000
--- a/app/views/helpers/view/rss_view.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php echo '<?xml version="1.0" encoding="UTF-8" ?>'; ?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<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>
-		<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" />
-<?php
-foreach ($this->entries as $item) {
-?>
-		<item>
-			<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();
-?>]]></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>
-		</item>
-<?php } ?>
-
-	</channel>
-</rss>
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/index/normal.phtml b/app/views/index/normal.phtml
new file mode 100644
index 000000000..6333d63db
--- /dev/null
+++ b/app/views/index/normal.phtml
@@ -0,0 +1,191 @@
+<?php
+
+$this->partial('aside_flux');
+$this->partial('nav_menu');
+
+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;
+?>
+
+<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>
+	</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 _t('today');
+				?><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)) {
+			?><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
+			?></div><?php
+			$display_yesterday = false;
+		}
+		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(); ?>">
+		<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_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>
+				<?php
+					$author = $item->author();
+					echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
+						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->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>
+
+						<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 } ?>
+
+	<?php $this->renderHelper('pagination'); ?>
+</div>
+
+<?php $this->partial('nav_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 />
+</div>
+<?php } ?>
diff --git a/app/views/index/rss.phtml b/app/views/index/rss.phtml
new file mode 100755
index 000000000..e34b15ab1
--- /dev/null
+++ b/app/views/index/rss.phtml
@@ -0,0 +1,29 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8" ?>'; ?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
+	<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>
+		<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" />
+<?php
+foreach ($this->entries as $item) {
+?>
+		<item>
+			<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();
+?>]]></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>
+		</item>
+<?php } ?>
+
+	</channel>
+</rss>
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
-- 
cgit v1.2.3


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: 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';
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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;
 		}
-- 
cgit v1.2.3


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: 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); ?>">
-- 
cgit v1.2.3


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: 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();
 
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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) {
-- 
cgit v1.2.3


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: 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,
 			)
 		);
 	?>
-- 
cgit v1.2.3


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: 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 />
-- 
cgit v1.2.3


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: 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;
 			}
 		}
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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;
 }
 
-- 
cgit v1.2.3


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: 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;
-}
-.category.stick .btn:first-child {
-	width: 176px;
+	margin: 5px 0;
 }
-.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;
-- 
cgit v1.2.3


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: Rename aside_flux in aside_feed.

---
 app/layout/aside_feed.phtml      | 95 ++++++++++++++++++++++++++++++++++++++++
 app/layout/aside_flux.phtml      | 95 ----------------------------------------
 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 +++++-----
 8 files changed, 129 insertions(+), 129 deletions(-)
 create mode 100644 app/layout/aside_feed.phtml
 delete mode 100644 app/layout/aside_flux.phtml

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
new file mode 100644
index 000000000..66b7b51af
--- /dev/null
+++ b/app/layout/aside_feed.phtml
@@ -0,0 +1,95 @@
+<?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_feed<?php echo $class; ?>" id="aside_feed">
+	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
+
+	<?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 } ?>
+
+	<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' : ''; ?>">
+			<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' : ''; ?>">
+			<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 $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="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>
+						<?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
+				}
+			}
+		?>
+	</ul>
+</div>
+
+<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>
+		<?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 (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">
+			<?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>
+		</li>
+		<?php } ?>
+	</ul>
+</script>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
deleted file mode 100644
index 30f362348..000000000
--- a/app/layout/aside_flux.phtml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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()) { ?>
-	<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 } ?>
-
-	<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' : ''; ?>">
-			<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' : ''; ?>">
-			<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 $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="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>
-						<?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
-				}
-			}
-		?>
-	</ul>
-</div>
-
-<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>
-		<?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 (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">
-			<?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>
-		</li>
-		<?php } ?>
-	</ul>
-</script>
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;
 }
 
-- 
cgit v1.2.3


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: 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);
 }
 
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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 {
-- 
cgit v1.2.3


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: 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) */
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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 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;
+	position: sticky;
+	top: 0;
 }
+
+/*=== Aside main page (categories) */
 .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;
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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 main page (categories) */
 .aside.aside_feed .tree {
-	text-align: left;
-}
-.aside_feed .tree-folder-title {
-	position: relative;
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
 }
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+
+/*=== 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) */
-.categories .feeds .item.active {
-}
-.categories .feeds .item.empty.active {
+.aside_feed .tree-folder-items > .item.empty.active {
 }
-.categories .feeds .item.error.active {
+.aside_feed .tree-folder-items > .item.error.active {
 }
-.categories .feeds .item.empty .feed {
+.aside_feed .tree-folder-items > .item.empty > a {
 }
-.categories .feeds .item.error .feed {
+.aside_feed .tree-folder-items > .item.error > a {
 }
-.categories .feeds .item.active .feed,
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
 }
-.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"],
-- 
cgit v1.2.3


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: 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) */
-- 
cgit v1.2.3


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: 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 {
-- 
cgit v1.2.3


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: 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 */
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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 {
-- 
cgit v1.2.3


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: Reader view comes back!

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Controllers/indexController.php      |  9 +++++++
 app/layout/nav_menu.phtml                |  5 ++++
 app/views/helpers/view/reader_view.phtml | 44 --------------------------------
 app/views/index/reader.phtml             | 44 ++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 44 deletions(-)
 delete mode 100644 app/views/helpers/view/reader_view.phtml
 create mode 100644 app/views/index/reader.phtml

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/helpers/view/reader_view.phtml
deleted file mode 100644
index 821a50f7f..000000000
--- a/app/views/helpers/view/reader_view.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$this->partial('nav_menu');
-
-if (!empty($this->entries)) {
-	$lazyload = FreshRSS_Context::$conf->lazyload;
-	$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 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);
-				?>
-				<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>
-
-				<div class="author"><?php
-					$author = $item->author();
-					echo $author != '' ? _t('by_author', $author) . ' — ' : '',
-						$item->date();
-				?></div>
-
-				<?php echo $item->content(); ?>
-			</div>
-		</div>
-	</div>
-	<?php } ?>
-
-	<?php $this->renderHelper('pagination'); ?>
-</div>
-
-<?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 />
-</div>
-<?php } ?>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
new file mode 100644
index 000000000..f07868488
--- /dev/null
+++ b/app/views/index/reader.phtml
@@ -0,0 +1,44 @@
+<?php
+$this->partial('nav_menu');
+
+if (!empty($this->entries)) {
+	$lazyload = FreshRSS_Context::$conf->lazyload;
+	$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 class="flux_content">
+			<div class="content <?php echo $content_width; ?>">
+				<?php
+					$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(); ?>">
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span>
+				</a>
+				<h1 class="title"><?php echo $item->title(); ?></h1>
+
+				<div class="author"><?php
+					$author = $item->author();
+					echo $author != '' ? _t('by_author', $author) . ' — ' : '',
+						$item->date();
+				?></div>
+
+				<?php echo $item->content(); ?>
+			</div>
+		</div>
+	</div>
+	<?php } ?>
+
+	<?php $this->renderHelper('pagination'); ?>
+</div>
+
+<?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 />
+</div>
+<?php } ?>
-- 
cgit v1.2.3


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: 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');
+
+	$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 categories">
+<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 */
-
-/* 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 .category {
-	width: 100%;
-}
-#stream.global .btn {
-	display: block;
-}
-#stream.global .box-category .feeds {
-	display: block;
-	overflow: auto;
+#stream.global {
+	text-align: center;
 }
-#stream.global .box-category .feed {
-	width: 19em;
-	max-width: 90%;
+
+#stream.global .box {
+	text-align: left;
 }
-/* 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,
-- 
cgit v1.2.3


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: 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"]) {
-	font-weight: bold;
+.box.category:not([data-unread="0"]) .box-title:active {
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
 }
-#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/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;
 }
-- 
cgit v1.2.3


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: 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               | 45 +++++++++++------------------
 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, 75 insertions(+), 132 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;
-}
-#stream.global .box-category .feeds {
-	max-height: 250px;
+	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;
 }
 
 /*=== 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;
+.box.category:not([data-unread="0"]) .box-title {
+	background: #3498db;
 }
-#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;
+.box.category:not([data-unread="0"]) .box-title:active {
+	background: #2980b9;
 }
-#stream.global .btn:not([data-unread="0"]) {
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
-	background: #3498db;
 	color: #fff;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
-	font-weight: bold;
-	background: none;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
-	color: #fff;
-}
-#stream.global .box-category .feeds {
-	max-height: 250px;
+	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"] {
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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) {
-- 
cgit v1.2.3


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: 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'),
-- 
cgit v1.2.3


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: 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 . ' · ');
 	}
 
 	/**
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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        | 59 --------------------------------------
 app/views/user/profile.phtml       | 59 ++++++++++++++++++++++++++++++++++++++
 8 files changed, 97 insertions(+), 85 deletions(-)
 delete mode 100644 app/views/user/profil.phtml
 create mode 100644 app/views/user/profile.phtml

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/profil.phtml
deleted file mode 100644
index a2af53c96..000000000
--- a/app/views/user/profil.phtml
+++ /dev/null
@@ -1,59 +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('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 = 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>
-			</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/profile.phtml b/app/views/user/profile.phtml
new file mode 100644
index 000000000..60257012c
--- /dev/null
+++ b/app/views/user/profile.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', 'profile'); ?>">
+		<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 = 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>
+			</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>
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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'),
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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();
-- 
cgit v1.2.3


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: 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;
 }
-- 
cgit v1.2.3


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: 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();
-- 
cgit v1.2.3


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: 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;
 }
-- 
cgit v1.2.3


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: 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');
-- 
cgit v1.2.3


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: 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'];
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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;
 			}
 
-- 
cgit v1.2.3


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: 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
 	}
 
 	/**
-- 
cgit v1.2.3


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: Ne pas rafraîchir les flux des utilisateurs non logués depuis x jours
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) {
-- 
cgit v1.2.3


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: 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.',
-- 
cgit v1.2.3


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: 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.',
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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'));
-- 
cgit v1.2.3


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: 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'];
-- 
cgit v1.2.3


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: 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) {
-- 
cgit v1.2.3


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: 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, '.', ' ')
 	);
 }
-- 
cgit v1.2.3


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: 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') . ' · ');
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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)
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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 {
-- 
cgit v1.2.3


From ee50df518310d3aee5efb5a0c15548b457d10e7e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 31 Oct 2014 16:58:53 +0100
Subject: Version 0.9.2

---
 README.fr.md  | 4 ++--
 README.md     | 4 ++--
 constants.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index a90737ceb..937db486c 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.9.1
-* Date de publication : 2014-10-09
+* Version actuelle : 0.9.2
+* Date de publication : 2014-10-31
 * 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 30971f697..b91d7ff1f 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.9.1
-* Publication date: 2014-10-09
+* Current version: 0.9.2
+* Publication date: 2014-10-31
 * 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 615e31abf..39e5f95c1 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.9.1');
+define('FRESHRSS_VERSION', '0.9.2');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


From 99763412c2f49e4e52b5a0343bb465141be76188 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 31 Oct 2014 17:21:35 +0100
Subject: 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();
 
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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) */
-- 
cgit v1.2.3


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: 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');
 	}
-- 
cgit v1.2.3


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: 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>
 
-- 
cgit v1.2.3


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: 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;
 }
 
 
-- 
cgit v1.2.3


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: 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();
 
-- 
cgit v1.2.3


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: 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
-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
+{$filter}
 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>
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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;
 					}
-- 
cgit v1.2.3


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: 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;
 			}
-- 
cgit v1.2.3


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: 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 = '';
-- 
cgit v1.2.3


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: 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);
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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 000000000..fd574319f
Binary files /dev/null and b/p/themes/Dark/thumbs/original.png differ
diff --git a/p/themes/Flat/thumbs/original.png b/p/themes/Flat/thumbs/original.png
new file mode 100644
index 000000000..b9cafa9c8
Binary files /dev/null and b/p/themes/Flat/thumbs/original.png differ
diff --git a/p/themes/Origine/thumbs/original.png b/p/themes/Origine/thumbs/original.png
new file mode 100644
index 000000000..d26d4fbed
Binary files /dev/null and b/p/themes/Origine/thumbs/original.png differ
diff --git a/p/themes/Pafat/thumbs/original.png b/p/themes/Pafat/thumbs/original.png
new file mode 100644
index 000000000..fe05f7260
Binary files /dev/null and b/p/themes/Pafat/thumbs/original.png differ
diff --git a/p/themes/Screwdriver/thumbs/original.png b/p/themes/Screwdriver/thumbs/original.png
new file mode 100644
index 000000000..ba9bacf90
Binary files /dev/null and b/p/themes/Screwdriver/thumbs/original.png differ
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 {
-- 
cgit v1.2.3


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: Theme properties are more visible

---
 app/views/configure/display.phtml |  4 +++-
 p/themes/base-theme/template.css  | 25 +++++++++++--------------
 2 files changed, 14 insertions(+), 15 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;
+	bottom: -35px;
+	position: absolute;
+	width: 100%;
 	display: none;
-	left: 15%;
-	padding: 5px;
+}
+.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 */
 /*===========*/
-- 
cgit v1.2.3


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: 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', ',',
-- 
cgit v1.2.3


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: Update Screwdriver theme

---
 p/themes/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 000000000..7c5eb5517
Binary files /dev/null and b/p/themes/Screwdriver/icons/favicon-16-32-48-64.ico differ
diff --git a/p/themes/Screwdriver/icons/favicon-256.png b/p/themes/Screwdriver/icons/favicon-256.png
new file mode 100644
index 000000000..235b18c97
Binary files /dev/null and b/p/themes/Screwdriver/icons/favicon-256.png differ
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) {
-- 
cgit v1.2.3


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: Add BlueLagoon theme

---
 p/themes/BlueLagoon/BlueLagoon.css                | 1210 +++++++++++++++++++++
 p/themes/BlueLagoon/README.md                     |   38 +
 p/themes/BlueLagoon/icons/bookmark.svg            |   61 ++
 p/themes/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 000000000..7c5eb5517
Binary files /dev/null and b/p/themes/BlueLagoon/icons/favicon-16-32-48-64.ico differ
diff --git a/p/themes/BlueLagoon/icons/favicon-256.png b/p/themes/BlueLagoon/icons/favicon-256.png
new file mode 100644
index 000000000..dbe4ec4b7
Binary files /dev/null and b/p/themes/BlueLagoon/icons/favicon-256.png differ
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 000000000..a0839dcc7
Binary files /dev/null and b/p/themes/BlueLagoon/loader.gif differ
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 000000000..bb8695945
Binary files /dev/null and b/p/themes/BlueLagoon/thumbs/original.png differ
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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;
 	});
 
-- 
cgit v1.2.3


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: 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;
+
+	/**
+	 * $lang_path is the pathname of i18n files (e.g. ./app/i18n/en/).
+	 */
+	private static $lang_path;
+
 	/**
-	 * $translates est le tableau de correspondance
-	 * 	$key => $traduction
+	 * $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]);
-- 
cgit v1.2.3


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: 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() {
-- 
cgit v1.2.3


From 7161eacb4042de4fd994b727800038d3ec286374 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Wed, 3 Dec 2014 23:42:38 +0100
Subject: 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',
-- 
cgit v1.2.3


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: 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;
 	});
 
-- 
cgit v1.2.3


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: 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;
 	});
 
-- 
cgit v1.2.3


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: 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;
 	});
 
-- 
cgit v1.2.3


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: 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/README.md            |  15 ++++
 extensions/Read-me.txt          |  15 ----
 lib/Minz/Configuration.php      |  10 +++
 lib/Minz/Extension.php          |  96 +++++++++++++++++++++++++
 lib/Minz/ExtensionException.php |  15 ++++
 lib/Minz/ExtensionManager.php   | 150 ++++++++++++++++++++++++++++++++++++++++
 8 files changed, 310 insertions(+), 36 deletions(-)
 create mode 100644 extensions/README.md
 delete mode 100644 extensions/Read-me.txt
 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/README.md b/extensions/README.md
new file mode 100644
index 000000000..e7b66d5bc
--- /dev/null
+++ b/extensions/README.md
@@ -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/extensions/Read-me.txt b/extensions/Read-me.txt
deleted file mode 100644
index e7b66d5bc..000000000
--- a/extensions/Read-me.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-== 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/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();
+		}
+	}
+}
-- 
cgit v1.2.3


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: 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);
+		}
+	}
 }
-- 
cgit v1.2.3


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: 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]*
-- 
cgit v1.2.3


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: 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);
 }
-- 
cgit v1.2.3


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: 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
-	// 			} 
-	// 		}
-	// 	}
-	// }
 }
-- 
cgit v1.2.3


From 2a74b9e9a69fcfe74b513c487430669540ef18fc Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Fri, 5 Dec 2014 09:41:54 +0100
Subject: 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',
-- 
cgit v1.2.3


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: 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':
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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;
+		}
+	}
 }
-- 
cgit v1.2.3


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: 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);
+	}
 }
-- 
cgit v1.2.3


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: 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 . '`');
 		}
 	}
-- 
cgit v1.2.3


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: 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 . '`');
 		}
 	}
-- 
cgit v1.2.3


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: 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];
+	}
 }
-- 
cgit v1.2.3


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: 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';
-- 
cgit v1.2.3


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: 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 | 42 ++++++++++++++++++++++-----------
 app/FreshRSS.php                        |  8 ++++---
 app/views/extension/index.phtml         |  4 ++++
 lib/Minz/Configuration.php              | 19 +++++++++++++--
 4 files changed, 54 insertions(+), 19 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')) {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
-			}
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$ext->install();
+
+				Minz_Configuration::addExtension($ext_name);
+				Minz_Configuration::writeFile();
 
-			$ext->install();
+				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+			} elseif ($ext->getType() === 'user') {
+				$ext->install();
 
-			FreshRSS_Context::$conf->addExtension($ext_name);
-			FreshRSS_Context::$conf->save();
+				FreshRSS_Context::$conf->addExtension($ext_name);
+				FreshRSS_Context::$conf->save();
 
-			Minz_Request::good('feedback.extension.enabled', $url_redirect);
+				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+			} else {
+				Minz_Request::bad('feedback.extension.no_access', $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')) {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
-			}
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$ext->uninstall();
+
+				Minz_Configuration::removeExtension($ext_name);
+				Minz_Configuration::writeFile();
 
-			$ext->uninstall();
+				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+			} elseif ($ext->getType() === 'user') {
+				$ext->uninstall();
 
-			FreshRSS_Context::$conf->removeExtension($ext_name);
-			FreshRSS_Context::$conf->save();
+				FreshRSS_Context::$conf->removeExtension($ext_name);
+				FreshRSS_Context::$conf->save();
 
-			Minz_Request::good('feedback.extension.disabled', $url_redirect);
+				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+			} else {
+				Minz_Request::bad('feedback.extension.no_access', $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
-- 
cgit v1.2.3


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: 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 } ?>
-- 
cgit v1.2.3


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: 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 { ?>
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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;
+	}
 }
-- 
cgit v1.2.3


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: 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);
 
-- 
cgit v1.2.3


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: 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);
 
-- 
cgit v1.2.3


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: 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
---
 app/views/helpers/index/normal/entry_bottom.phtml |  84 ++++++++++++
 app/views/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
+
+			$this->renderHelper('index/normal/entry_header');
 
-		<div class="flux_content">
+		?><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'); ?>
 
-- 
cgit v1.2.3


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: 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 . '`');
 		}
 	}
-- 
cgit v1.2.3


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: 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() {
-- 
cgit v1.2.3


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: 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.
 	 */
-- 
cgit v1.2.3


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: 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';
 
-- 
cgit v1.2.3


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: 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();
 
-- 
cgit v1.2.3


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: 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(
-- 
cgit v1.2.3


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: 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);
-- 
cgit v1.2.3


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: 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);
+}
-- 
cgit v1.2.3


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: 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 {
-- 
cgit v1.2.3


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: 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)
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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);
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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']);
-- 
cgit v1.2.3


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: 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" />
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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>
 
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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 } ?>
-- 
cgit v1.2.3


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: 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">
-- 
cgit v1.2.3


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: 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',
-- 
cgit v1.2.3


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: 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"',
-- 
cgit v1.2.3


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: 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(
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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;
 }
-- 
cgit v1.2.3


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: 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;
 }
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


From caa274c75b6a7471f09f9c21057749c686e155fb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Dec 2014 19:01:20 +0100
Subject: Version 0.9.3

---
 README.fr.md  | 4 ++--
 README.md     | 4 ++--
 constants.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 937db486c..bf14797c1 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.9.2
-* Date de publication : 2014-10-31
+* Version actuelle : 0.9.3
+* Date de publication : 2014-12-12
 * 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 b91d7ff1f..393e696bf 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.9.2
-* Publication date: 2014-10-31
+* Current version: 0.9.3
+* Publication date: 2014-12-12
 * 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 39e5f95c1..3ddace95d 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.9.2');
+define('FRESHRSS_VERSION', '0.9.3');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


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: 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 } ?>
-- 
cgit v1.2.3


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: 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;?>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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');
-- 
cgit v1.2.3


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: 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 { ?>
-- 
cgit v1.2.3


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: 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();
 	}
 
 	/**
-- 
cgit v1.2.3


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: 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});
-- 
cgit v1.2.3


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: 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.
-- 
cgit v1.2.3


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: 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/log/index.html                | 13 -------------
 data/users/.gitignore              |  4 ++++
 data/users/index.html              | 13 +++++++++++++
 lib/Minz/Log.php                   |  2 +-
 lib/Minz/ModelPdo.php              |  2 +-
 lib/lib_rss.php                    | 24 +++++++++++++++---------
 12 files changed, 50 insertions(+), 41 deletions(-)
 delete mode 100644 data/log/.gitignore
 delete mode 100644 data/log/index.html
 create mode 100644 data/users/.gitignore
 create mode 100644 data/users/index.html

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/log/index.html b/data/log/index.html
deleted file mode 100644
index 85faaa37e..000000000
--- a/data/log/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
-<head>
-<meta charset="UTF-8" />
-<meta http-equiv="Refresh" content="0; url=/" />
-<title>Redirection</title>
-<meta name="robots" content="noindex" />
-</head>
-
-<body>
-<p><a href="/">Redirection</a></p>
-</body>
-</html>
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/users/index.html b/data/users/index.html
new file mode 100644
index 000000000..85faaa37e
--- /dev/null
+++ b/data/users/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+<head>
+<meta charset="UTF-8" />
+<meta http-equiv="Refresh" content="0; url=/" />
+<title>Redirection</title>
+<meta name="robots" content="noindex" />
+</head>
+
+<body>
+<p><a href="/">Redirection</a></p>
+</body>
+</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() {
-- 
cgit v1.2.3


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: 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() {
-- 
cgit v1.2.3


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: 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'));
 	}
 }
-- 
cgit v1.2.3


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: 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);
+}
-- 
cgit v1.2.3


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: 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');
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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.',
-- 
cgit v1.2.3


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: 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 000000000..1e660b740
Binary files /dev/null and b/p/themes/icons/default_favicon.png differ
-- 
cgit v1.2.3


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: Change favicon getter behaviour

- Use Favicon library
- Fix coding style
- Change default favicon

Fix https://github.com/FreshRSS/FreshRSS/issues/290
---
 p/f.php | 85 ++++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 32 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;
-
-	$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);
-
-	if (curl_getinfo ($c, CURLINFO_HTTP_CODE) == 200) {
-		$file = fopen ($dest, 'w');
-		if ($file !== false) {
-			fwrite ($file, $imgRaw);
-			fclose ($file);
-			$ok = true;
-		}
+function download_favicon($website, $dest) {
+	global $favicons_dir;
+
+	$favicon_getter = new \Favicon\Favicon();
+	$favicon_getter->setCacheDir($favicons_dir);
+	$favicon_url = $favicon_getter->get($website);
+
+	if ($favicon_url === false) {
+		return false;
 	}
+
+	$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 (!$ok) {
-		header('Location: ' . $url);
-		return false;
+
+	if ($status_code === 200) {
+		$file = fopen($dest, 'w');
+		if ($file !== false) {
+			fwrite($file, $img_raw);
+			fclose($file);
+			return true;
+		}
 	}
-	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);
 }
-- 
cgit v1.2.3


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: 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');
-- 
cgit v1.2.3


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: 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 000000000..e4d5e8f67
Binary files /dev/null and b/p/themes/icons/default_favicon.ico differ
diff --git a/p/themes/icons/default_favicon.png b/p/themes/icons/default_favicon.png
deleted file mode 100644
index 1e660b740..000000000
Binary files a/p/themes/icons/default_favicon.png and /dev/null differ
-- 
cgit v1.2.3


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: 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           |  36 +-
 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                   | 517 ++++++++-------------------
 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, 384 insertions(+), 441 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()) {
-
-				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 ($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']) {
+
+				// 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';
-
 	/**
-	 * VERSION est la version actuelle de MINZ
+	 * The list of configurations.
 	 */
-	const VERSION = '1.3.1.freshrss';  // version spéciale FreshRSS
+	private static $config_list = array();
 
 	/**
-	 * 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
+	 * 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 SILENT = 0;
-	const PRODUCTION = 1;
-	const DEVELOPMENT = 2;
+	public static function register($namespace, $config_filename, $default_filename = 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
+		);
+	}
 
 	/**
-	 * 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
+	 * 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 $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,
-	);
+	public static function parseFile($filename) {
+		if (!file_exists($filename)) {
+			throw new Minz_FileNotExistException($filename);
+		}
 
-	/*
-	 * Getteurs
-	 */
-	public static function salt () {
-		return self::$salt;
+		$data = @include($filename);
+		if (is_array($data)) {
+			return $data;
+		} else {
+			return array();
+		}
 	}
-	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';
-			}
+	/**
+	 * 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 $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;
+		return self::$config_list[$namespace];
 	}
 
-	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);
-	}
+	/**
+	 * The namespace of the current configuration.
+	 */
+	private $namespace = '';
 
-	public static function _enableApi($value = false) {
-		self::$api_enabled = (bool)$value;
-	}
-	public static function _enableAutologin($value = false) {
-		self::$unsafe_autologin_enabled = (bool)$value;
-	}
+	/**
+	 * 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();
 
 	/**
-	 * 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é
+	 * 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.
 	 */
-	public static function init () {
+	private function __construct($namespace, $config_filename, $default_filename = null) {
+		$this->namespace = $namespace;
+		$this->config_filename = $config_filename;
+
 		try {
-			self::parseFile ();
-			self::setReporting ();
+			$this->data = self::parseFile($this->config_filename);
 		} catch (Minz_FileNotExistException $e) {
-			throw $e;
-		} catch (Minz_BadConfigurationException $e) {
-			throw $e;
+			if (is_null($default_filename)) {
+				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,
-		);
-		@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
+		$this->default_filename = $default_filename;
+		if (!is_null($this->default_filename)) {
+			$this->data_default = self::parseFile($this->default_filename);
 		}
-		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é
+	 * 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
 	 */
-	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 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'
 			);
 		}
+	}
 
-		// [general] est obligatoire
-		if (!isset ($ini_array['general'])) {
-			throw new Minz_BadConfigurationException (
-				'[general]',
-				Minz_Exception::ERROR
-			);
-		}
-		$general = $ini_array['general'];
+	/**
+	 * A wrapper for param().
+	 */
+	public function __get($key) {
+		return $this->param($key);
+	}
 
-		// 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
-				);
-			}
+	/**
+	 * 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;
 		}
-		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'];
-		}
+	/**
+	 * A wrapper for _param().
+	 */
+	public function __set($key, $value) {
+		$this->_param($key, $value);
+	}
 
-		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')
-			);
-		}
+	/**
+	 * 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 (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;
-				}
-			}
+		if (file_put_contents($this->config_filename,
+		                      "<?php\nreturn " . var_export($this->data, true) . ';',
+		                      LOCK_EX) === false) {
+			return false;
 		}
 
-		// 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'];
+		// Clear PHP 5.5+ cache for include
+		if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($this->config_filename);
 		}
-	}
 
-	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 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
-- 
cgit v1.2.3


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: 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    |  94 ++++----
 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, 196 insertions(+), 544 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();
-
-			Minz_Session::_param('language', FreshRSS_Context::$conf->language);
+			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();
 			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>
-- 
cgit v1.2.3


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: 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);
-- 
cgit v1.2.3


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: 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;
 	}
 
 	/**
-- 
cgit v1.2.3


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: 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">
-- 
cgit v1.2.3


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: 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($lang_name) {
+		self::init(self::$lang_list, $lang_name);
+	}
+
+	/**
+	 * Return the list of available languages.
+	 * @return an array.
 	 */
-	public static function reset() {
-		self::init();
+	public static function availableLanguages() {
+		return self::$lang_list;
 	}
 
 	/**
-- 
cgit v1.2.3


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: 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);
 		}
 	}
 
-- 
cgit v1.2.3


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: 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'] : '';
 }
-- 
cgit v1.2.3


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: 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);
-- 
cgit v1.2.3


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: 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();
 
-$users = listUsers();
-shuffle($users);	//Process users in random order
+// 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();
 
-if (Minz_Configuration::defaultUser() !== ''){
-	array_unshift($users, Minz_Configuration::defaultUser());	//But always start with admin
+$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);
+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");
-- 
cgit v1.2.3


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: 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;
 			}
-- 
cgit v1.2.3


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: 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();
-- 
cgit v1.2.3


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: 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);
 }
 
 
-- 
cgit v1.2.3


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: 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();
 
 
-- 
cgit v1.2.3


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: 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");
 		}
 	}
 }
-- 
cgit v1.2.3


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: 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();
 }
 
-- 
cgit v1.2.3


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: 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() {
-- 
cgit v1.2.3


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: 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;
 		}
 	}
 
-- 
cgit v1.2.3


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: 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              | 232 +++++++++++++++++++++++++++++++++++---
 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, 272 insertions(+), 70 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;
+	/**
+	 * Return the title.
+	 * @param $raw true if we should get the title without transformations.
+	 */
+	public function title($raw = false) {
+		if ($raw) {
+			return $this->title;
 		}
-		if (count($transform) === 0) {
+
+		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');
-- 
cgit v1.2.3


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: 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;
+}
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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;
 		}
 	}
-- 
cgit v1.2.3


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: 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;
+		}
 	}
 
 	/**
-- 
cgit v1.2.3


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: 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() {
-- 
cgit v1.2.3


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: 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;
+	}
+}
-- 
cgit v1.2.3


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: 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 | 44 +++++++++++++++++++++++---------------
 lib/Minz/Configuration.php         |  8 +++----
 2 files changed, 30 insertions(+), 22 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',
-	);
+	/**
+	 * 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));
+	}
 
-	public function handle($key, $value) {
-		if (isset($this->setters[$key])) {
-			$value = call_user_func(array($this, $this->setters[$key]), $value);
-		}
-		return $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));
 	}
 
-	private function _language($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;
-- 
cgit v1.2.3


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: 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);
+	}
 }
-- 
cgit v1.2.3


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: 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);
+	}
 }
-- 
cgit v1.2.3


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: Fix i18n in install.php

---
 app/install.php | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 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() {
+	$available_languages = array(
+		'en' => 'English',
+		'fr' => 'Français'
+	);
+
 	if (!isset($_SESSION['language'])) {
-		$_SESSION['language'] = getBetterLanguage('en');
+		$best = get_best_language();
+		if (!isset($available_languages[$best])) {
+			$best = 'en';
+		}
+
+		$_SESSION['language'] = $best;
 	}
 
-	Minz_Translate::init();
+	Minz_Translate::init(array(
+		'en' => 'English',
+		'fr' => 'Français',
+	), $_SESSION['language']);
 }
 
-function getBetterLanguage($fallback) {
-	$available = availableLanguages();
+function get_best_language() {
 	$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-	$language = strtolower(substr($accept, 0, 2));
-
-	if (isset($available[$language])) {
-		return $language;
-	} else {
-		return $fallback;
-	}
-}
-
-function availableLanguages() {
-	return array(
-		'en' => 'English',
-		'fr' => 'Français'
-	);
+	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 } ?>
-- 
cgit v1.2.3


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: 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:
-- 
cgit v1.2.3


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: 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();
 
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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.
 	 */
-- 
cgit v1.2.3


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: 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(
-- 
cgit v1.2.3


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: 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) {
-- 
cgit v1.2.3


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: Fix install.php script (choice of lang)

Fix a bug in Minz_Translate too
---
 app/install.php        | 25 ++++++++++++-------------
 lib/Minz/Translate.php |  2 +-
 2 files changed, 13 insertions(+), 14 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'] = get_best_language();
+	}
 
-		$_SESSION['language'] = $best;
+	if (!in_array($_SESSION['language'], $available_languages)) {
+		$_SESSION['language'] = 'en';
 	}
 
-	Minz_Translate::init($_SESSION['language']);
+	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);
 		}
 	}
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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);
 	}
 
 	/**
-- 
cgit v1.2.3


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: 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'.
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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()) {
-- 
cgit v1.2.3


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: 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
 
-- 
cgit v1.2.3


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: 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;
 	});
-- 
cgit v1.2.3


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: 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)) { ?>
-- 
cgit v1.2.3


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: 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 !',
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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');
-- 
cgit v1.2.3


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: 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();
 		}
 
-- 
cgit v1.2.3


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: 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");
 
-- 
cgit v1.2.3


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: 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");
 
-- 
cgit v1.2.3


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: 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') {
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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'])));
 	}
 
 	/**
-- 
cgit v1.2.3


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: 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;
 	}
 
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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;
 		}
-- 
cgit v1.2.3


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: 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')) { ?>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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        | 74 +++++++++++++++++++++++++++++-------
 2 files changed, 63 insertions(+), 13 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) {
+		if (!isset(self::$hook_list[$hook_name])) {
+			return;
+		}
+
+		$signature = self::$hook_list[$hook_name]['signature'];
+		$signature = 'self::call' . $signature;
 		$args = func_get_args();
-		unset($args[0]);
 
-		$result = $args[1];
-		foreach (self::$hook_list[$hook_name] as $function) {
-			$result = call_user_func_array($function, $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);
+		}
+	}
 }
-- 
cgit v1.2.3


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: 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;
-- 
cgit v1.2.3


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: 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)
-- 
cgit v1.2.3


From e92acfd8227bc3ac94e9039343ff76c20facf29a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 15 Jan 2015 14:18:48 +0100
Subject: Version 0.9.4

---
 README.fr.md  | 4 ++--
 README.md     | 4 ++--
 constants.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index bf14797c1..f1cf64a08 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.9.3
-* Date de publication : 2014-12-12
+* Version actuelle : 0.9.4
+* Date de publication : 2015-01-15
 * 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 393e696bf..9ff10747e 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.9.3
-* Publication date: 2014-12-12
+* Current version: 0.9.4
+* Publication date: 2015-01-15
 * 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 afa5fe7ff..a5f2eb4bb 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.9.3');
+define('FRESHRSS_VERSION', '0.9.4');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


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: 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>
 
-- 
cgit v1.2.3


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: 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()
 	);
 
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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) {
-- 
cgit v1.2.3


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: 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 */
 /*===========*/
-- 
cgit v1.2.3


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: 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 */
 /*===========*/
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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'));
 			}
 		}
 	}
-- 
cgit v1.2.3


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: 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 | 40 +++++++++++++++++++------------------
 lib/Minz/Error.php                  | 39 +++++-------------------------------
 2 files changed, 26 insertions(+), 53 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 200 :
+			header('HTTP/1.1 200 OK');
+			break;
 		case 403:
+			header('HTTP/1.1 403 Forbidden');
 			$this->view->code = 'Error 403 - Forbidden';
-			break;
-		case 404:
-			$this->view->code = 'Error 404 - Not found';
+			$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";
 
-- 
cgit v1.2.3


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: 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);
 	});
 }
-- 
cgit v1.2.3


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: 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";
-- 
cgit v1.2.3


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: 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;
 }
-- 
cgit v1.2.3


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: 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);
 			}
 		}
 	}
-- 
cgit v1.2.3


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: 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);
 		}
 	}
 
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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.
-- 
cgit v1.2.3


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: 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={',
-- 
cgit v1.2.3


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: 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
 		);
-- 
cgit v1.2.3


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: 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;
 	}
 }
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


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: 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);
 	}
 
-- 
cgit v1.2.3


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: 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);
 	}
 
-- 
cgit v1.2.3


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: ! 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);
 		}
 	});
-- 
cgit v1.2.3


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: 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',
 	),
-- 
cgit v1.2.3


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: 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);
 		}
 	});
-- 
cgit v1.2.3


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: ! 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);
 		}
 	});
-- 
cgit v1.2.3


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: 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(
-- 
cgit v1.2.3


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: 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
 
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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>
-- 
cgit v1.2.3


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: 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();
-- 
cgit v1.2.3


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: 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"');
 
-- 
cgit v1.2.3


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: 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.',
-- 
cgit v1.2.3


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: 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) :)
 
-- 
cgit v1.2.3


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: 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.',
-- 
cgit v1.2.3


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: 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;
 }
-- 
cgit v1.2.3


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: 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) {
-- 
cgit v1.2.3


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: 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)) {
-- 
cgit v1.2.3


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: 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'),
-- 
cgit v1.2.3


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: 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);
+}
-- 
cgit v1.2.3


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: 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) {
-- 
cgit v1.2.3


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: 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);
 }
-- 
cgit v1.2.3


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: 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
-- 
cgit v1.2.3


From 4c99fd689f0778cbf6a987471ebf72b3787739c2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 31 Jan 2015 14:47:08 +0100
Subject: Version 1.0.0

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f52599184..a09a64639 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,7 @@ 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.1
-* Publication date: 2014-10-09
-* 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)
 
-- 
cgit v1.2.3


From 4a9c228d9dd684ad873f82218c786822ed090ecb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 31 Jan 2015 14:48:55 +0100
Subject: Version 1.1.0

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index a5f2eb4bb..ce1694590 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.9.4');
+define('FRESHRSS_VERSION', '1.1.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


From 88f94661f3e4a7007938f237f3a74753446abeae Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 3 Feb 2015 10:32:41 +0100
Subject: New version number for dev (1.2-dev)

---
 CHANGELOG     | 2 ++
 constants.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b389f184b..d1b49d339 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Changelog
 
+## 2015-xx-xx FreshRSS 1.1.1 (beta)
+
 ## 2015-01-31 FreshRSS 1.0.0 / 1.1.0 (beta)
 
 * UI
diff --git a/constants.php b/constants.php
index 8136afc85..b20bf0710 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '0.10-dev');
+define('FRESHRSS_VERSION', '1.2-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');
-- 
cgit v1.2.3


From 59fb3dfe180179bfde70f5040c1514f89a7d9ba6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 3 Feb 2015 10:36:45 +0100
Subject: Update CREDITS file

---
 CREDITS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CREDITS b/CREDITS
index 47a968deb..c2c6642dc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -29,6 +29,9 @@ dev@marienfressinaud.fr
 http://marienfressinaud.fr
 https://github.com/marienfressinaud
 
+Melvyn Laïly
+https://github.com/yaurthek
+
 Nicolas Elie
 https://github.com/nicolaselie
 
-- 
cgit v1.2.3


From 694212cce8d5538ace1e86096c0eb93907b947e5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 3 Feb 2015 15:57:33 +0100
Subject: Create CONTRIBUTING.md file

See https://github.com/FreshRSS/FreshRSS/issues/783
---
 CONTRIBUTING.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..fb1610a1f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,56 @@
+# How to contribute to FreshRSS?
+
+## Report a bug
+
+You found a bug? Don't panic, here are some steps to report it easily:
+
+1. Search for it on [the bug tracker](https://github.com/FreshRSS/FreshRSS/issues) (don't forget to use the search bar).
+2. If you find a similar bug, don't hesitate to post a comment to add more importance to the related ticket.
+3. If you didn't find it, [open a new ticket](https://github.com/FreshRSS/FreshRSS/issues/new).
+
+If you have to create a new ticket, try to apply the following advices:
+
+- Give an explicit title to the ticket so it will be easier to find it later.
+- Be as exhaustive as possible in the description: what did you do? What is the bug? What are the steps to reproduce the bug?
+- We also need some information:
+    + Your FreshRSS version (on about page or `constants.php` file)
+    + Your server configuration: type of hosting, PHP version
+    + Your storage system (MySQL / MariaDB or SQLite)
+    + If possible, the related logs (PHP logs and FreshRSS logs under `data/users/your_user/log.txt`)
+
+## Fix a bug
+
+Did you want to fix a bug? To keep a great coordination between collaborators, you will have to follow these indications:
+
+1. Be sure the bug is associated to a ticket and say you work on it.
+2. Fork the FreshRSS repository.
+3. Get your repository `git clone -b dev git@github.com:your_username/FreshRSS.git && cd FreshRSS`
+4. It's better to create a dedicated branch to fix your bug: the name of the branch must be explicit and being prefixed by the related ticket id. For instance, `783-contributing-file` to fix [ticket #783](https://github.com/FreshRSS/FreshRSS/issues/783).
+5. Once you'll have finished, commit your work, push your branch upstream (`git push --set-upstream origin your_branch_name`) and do a [pull request](https://github.com/FreshRSS/FreshRSS/compare) on the **dev branch**.
+6. Wait and see.
+
+If you have to write code, please follow [our coding style recommendations](http://doc2.freshrss.org/en/Developer_documentation/First_steps/Coding_style).
+
+**Tip:** if you are searching for bugs easy to fix, have a look at the « [New comers](https://github.com/FreshRSS/FreshRSS/labels/New%20comers) » ticket label.
+
+## Submit an idea
+
+You have great ideas, yes! Don't be shy and open [a new ticket](https://github.com/FreshRSS/FreshRSS/issues/new) on our bug tracker to ask if we can implement it. The greatest ideas often come from the shyest suggestions!
+
+If your idea is nice, we'll have a look at it.
+
+TODO: complete
+
+## Contribute to internationalization (i18n)
+
+If you want to improve internationalization, please open a new ticket first and follow indications from « Fix a bug » section.
+
+TODO: finish
+
+We are working on a better way to handle internationalization.
+
+## Contribute to documentation
+
+The documentation needs a lot of improvements in order to be more useful to new contributors and we are working on it. If you want to give some help, meet us on [the dedicated repository](https://github.com/FreshRSS/documentation)!
+
+TODO: finish
-- 
cgit v1.2.3


From 4bb8548eccf22b40c25352fe27c66f1f8039ebcd Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 8 Feb 2015 20:51:41 -0500
Subject: Add a way to parse search string to extract keywords

This feature is not in use at the moment, but it will be handy to reorganize the query building process. It allows to have more than one keyword in the search box.
Full tests are available as well.

It probably needs a refactoring later, but I think this is the first step to make the application full object oriented and testable.
---
 app/Models/Context.php           | 149 ++++++++++++++++++++++++
 tests/app/Models/ContextTest.php | 241 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 390 insertions(+)
 create mode 100644 tests/app/Models/ContextTest.php

diff --git a/app/Models/Context.php b/app/Models/Context.php
index 1c770c756..645639907 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -301,4 +301,153 @@ class FreshRSS_Context {
 		}
 		return false;
 	}
+
+	/**
+	 * Parse search string to extract the different keywords.
+	 *
+	 * @return array
+	 */
+	public function parseSearch() {
+		$search = self::$search;
+		$intitle = $this->parseIntitleSearch($search);
+		$author = $this->parseAuthorSearch($intitle['string']);
+		$inurl = $this->parseInurlSearch($author['string']);
+		$pubdate = $this->parsePubdateSearch($inurl['string']);
+		$date = $this->parseDateSearch($pubdate['string']);
+
+		$remaining = array();
+		$remaining_search = trim($date['string']);
+		if (strcmp($remaining_search, '') != 0) {
+			$remaining['search'] = $remaining_search;
+		}
+
+		return array_merge($intitle['search'], $author['search'], $inurl['search'], $date['search'], $pubdate['search'], $remaining);
+	}
+
+	/**
+	 * Parse the search string to find intitle keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword.
+	 * It returns an array containing the matched string and the search.
+	 *
+	 * @param string $search
+	 * @return array
+	 */
+	private function parseIntitleSearch($search) {
+		if (preg_match('/intitle:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $search, $matches)) {
+			return array(
+			    'string' => str_replace($matches[0], '', $search),
+			    'search' => array('intitle' => $matches['search']),
+			);
+		}
+		if (preg_match('/intitle:(?P<search>\w*)/', $search, $matches)) {
+			return array(
+			    'string' => str_replace($matches[0], '', $search),
+			    'search' => array('intitle' => $matches['search']),
+			);
+		}
+		return array(
+		    'string' => $search,
+		    'search' => array(),
+		);
+	}
+
+	/**
+	 * Parse the search string to find author keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword except when using
+	 * a delimiter. Supported delimiters are single quote (') and double
+	 * quotes (").
+	 * It returns an array containing the matched string and the search.
+	 *
+	 * @param string $search
+	 * @return array
+	 */
+	private function parseAuthorSearch($search) {
+		if (preg_match('/author:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $search, $matches)) {
+			return array(
+			    'string' => str_replace($matches[0], '', $search),
+			    'search' => array('author' => $matches['search']),
+			);
+		}
+		if (preg_match('/author:(?P<search>\w*)/', $search, $matches)) {
+			return array(
+			    'string' => str_replace($matches[0], '', $search),
+			    'search' => array('author' => $matches['search']),
+			);
+		}
+		return array(
+		    'string' => $search,
+		    'search' => array(),
+		);
+	}
+
+	/**
+	 * Parse the search string to find inurl keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword except.
+	 * It returns an array containing the matched string and the search.
+	 *
+	 * @param string $search
+	 * @return array
+	 */
+	private function parseInurlSearch($search) {
+		if (preg_match('/inurl:(?P<search>[^\s]*)/', $search, $matches)) {
+			return array(
+			    'string' => str_replace($matches[0], '', $search),
+			    'search' => array('inurl' => $matches['search']),
+			);
+		}
+		return array(
+		    'string' => $search,
+		    'search' => array(),
+		);
+	}
+
+	/**
+	 * Parse the search string to find date keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword.
+	 * It returns an array containing the matched string and the search.
+	 *
+	 * @param string $search
+	 * @return array
+	 */
+	private function parseDateSearch($search) {
+		if (preg_match('/date:(?P<search>[^\s]*)/', $search, $matches)) {
+			list($min_date, $max_date) = parseDateInterval($matches['search']);
+			return array(
+			    'string' => str_replace($matches[0], '', $search),
+			    'search' => array('min_date' => $min_date, 'max_date' => $max_date),
+			);
+		}
+		return array(
+		    'string' => $search,
+		    'search' => array(),
+		);
+	}
+
+	/**
+	 * Parse the search string to find pubdate keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword.
+	 * It returns an array containing the matched string and the search.
+	 *
+	 * @param string $search
+	 * @return array
+	 */
+	private function parsePubdateSearch($search) {
+		if (preg_match('/pubdate:(?P<search>[^\s]*)/', $search, $matches)) {
+			list($min_date, $max_date) = parseDateInterval($matches['search']);
+			return array(
+			    'string' => str_replace($matches[0], '', $search),
+			    'search' => array('min_pubdate' => $min_date, 'max_pubdate' => $max_date),
+			);
+		}
+		return array(
+		    'string' => $search,
+		    'search' => array(),
+		);
+	}
+
 }
diff --git a/tests/app/Models/ContextTest.php b/tests/app/Models/ContextTest.php
new file mode 100644
index 000000000..c5da6f667
--- /dev/null
+++ b/tests/app/Models/ContextTest.php
@@ -0,0 +1,241 @@
+<?php
+
+require_once(LIB_PATH . '/lib_date.php');
+
+class ContextTest extends \PHPUnit_Framework_TestCase {
+
+	private $context;
+
+	public function setUp() {
+		$this->context = new FreshRSS_Context();
+	}
+
+	public function testParseSearch_whenEmpty_returnsEmptyArray() {
+		$this->assertCount(0, $this->context->parseSearch());
+	}
+
+	/**
+	 * @dataProvider provideMultipleKeywordSearch
+	 * @param string $search
+	 * @param string $expected_values
+	 */
+	public function testParseSearch_whenMultipleKeywords_returnArrayWithMultipleValues($search, $expected_values) {
+		FreshRSS_Context::$search = $search;
+		$parsed_search = $this->context->parseSearch();
+		$this->assertEquals($expected_values, $parsed_search);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideMultipleKeywordSearch() {
+		return array(
+		    array(
+			'intitle:word1 author:word2',
+			array(
+			    'intitle' => 'word1',
+			    'author' => 'word2',
+			),
+		    ),
+		    array(
+			'author:word2 intitle:word1',
+			array(
+			    'intitle' => 'word1',
+			    'author' => 'word2',
+			),
+		    ),
+		    array(
+			'author:word1 inurl:word2',
+			array(
+			    'author' => 'word1',
+			    'inurl' => 'word2',
+			),
+		    ),
+		    array(
+			'inurl:word2 author:word1',
+			array(
+			    'author' => 'word1',
+			    'inurl' => 'word2',
+			),
+		    ),
+		    array(
+			'date:2008-01-01/2008-02-01 pubdate:2007-01-01/2007-02-01',
+			array(
+			    'min_date' => '1199163600',
+			    'max_date' => '1201928399',
+			    'min_pubdate' => '1167627600',
+			    'max_pubdate' => '1170392399',
+			),
+		    ),
+		    array(
+			'pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01',
+			array(
+			    'min_date' => '1199163600',
+			    'max_date' => '1201928399',
+			    'min_pubdate' => '1167627600',
+			    'max_pubdate' => '1170392399',
+			),
+		    ),
+		    array(
+			'inurl:word1 author:word2 intitle:word3 pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01 hello world',
+			array(
+			    'inurl' => 'word1',
+			    'author' => 'word2',
+			    'intitle' => 'word3',
+			    'min_date' => '1199163600',
+			    'max_date' => '1201928399',
+			    'min_pubdate' => '1167627600',
+			    'max_pubdate' => '1170392399',
+			    'search' => 'hello world',
+			),
+		    ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideIntitleSearch
+	 * @param string $search
+	 * @param string $expected_value
+	 */
+	public function testParseSearch_whenIntitleKeyword_returnArrayWithIntitleValue($search, $expected_value) {
+		FreshRSS_Context::$search = $search;
+		$parsed_search = $this->context->parseSearch();
+		$this->assertEquals($expected_value, $parsed_search['intitle']);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideIntitleSearch() {
+		return array(
+		    array('intitle:word1', 'word1'),
+		    array('intitle:word1 word2', 'word1'),
+		    array('intitle:"word1 word2"', 'word1 word2'),
+		    array("intitle:'word1 word2'", 'word1 word2'),
+		    array('word1 intitle:word2', 'word2'),
+		    array('word1 intitle:word2 word3', 'word2'),
+		    array('word1 intitle:"word2 word3"', 'word2 word3'),
+		    array("word1 intitle:'word2 word3'", 'word2 word3'),
+		    array('intitle:word1 intitle:word2', 'word1'),
+		    array('intitle: word1 word2', ''),
+		    array('intitle:123', '123'),
+		    array('intitle:"word1 word2" word3"', 'word1 word2'),
+		    array("intitle:'word1 word2' word3'", 'word1 word2'),
+		    array('intitle:"word1 word2\' word3"', "word1 word2' word3"),
+		    array("intitle:'word1 word2\" word3'", 'word1 word2" word3'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideAuthorSearch
+	 * @param string $search
+	 * @param string $expected_value
+	 */
+	public function testParseSearch_whenAuthorKeyword_returnArrayWithAuthorValue($search, $expected_value) {
+		FreshRSS_Context::$search = $search;
+		$parsed_search = $this->context->parseSearch();
+		$this->assertEquals($expected_value, $parsed_search['author']);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideAuthorSearch() {
+		return array(
+		    array('author:word1', 'word1'),
+		    array('author:word1 word2', 'word1'),
+		    array('author:"word1 word2"', 'word1 word2'),
+		    array("author:'word1 word2'", 'word1 word2'),
+		    array('word1 author:word2', 'word2'),
+		    array('word1 author:word2 word3', 'word2'),
+		    array('word1 author:"word2 word3"', 'word2 word3'),
+		    array("word1 author:'word2 word3'", 'word2 word3'),
+		    array('author:word1 author:word2', 'word1'),
+		    array('author: word1 word2', ''),
+		    array('author:123', '123'),
+		    array('author:"word1 word2" word3"', 'word1 word2'),
+		    array("author:'word1 word2' word3'", 'word1 word2'),
+		    array('author:"word1 word2\' word3"', "word1 word2' word3"),
+		    array("author:'word1 word2\" word3'", 'word1 word2" word3'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideInurlSearch
+	 * @param string $search
+	 * @param string $expected_value
+	 */
+	public function testParseSearch_whenInurlKeyword_returnArrayWithInurlValue($search, $expected_value) {
+		FreshRSS_Context::$search = $search;
+		$parsed_search = $this->context->parseSearch();
+		$this->assertEquals($expected_value, $parsed_search['inurl']);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideInurlSearch() {
+		return array(
+		    array('inurl:word1', 'word1'),
+		    array('inurl: word1', ''),
+		    array('inurl:123', '123'),
+		    array('inurl:word1 word2', 'word1'),
+		    array('inurl:"word1 word2"', '"word1'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideDateSearch
+	 * @param string $search
+	 * @param string $expected_min_value
+	 * @param string $expected_max_value
+	 */
+	public function testParseSearch_whenDateKeyword_returnArrayWithDateValues($search, $expected_min_value, $expected_max_value) {
+		FreshRSS_Context::$search = $search;
+		$parsed_search = $this->context->parseSearch();
+		$this->assertEquals($expected_min_value, $parsed_search['min_date']);
+		$this->assertEquals($expected_max_value, $parsed_search['max_date']);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideDateSearch() {
+		return array(
+		    array('date:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+		    array('date:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+		    array('date:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+		    array('date:2007-03-01/2008-05-11', '1172725200', '1210564799'),
+		    array('date:2007-03-01/', '1172725200', ''),
+		    array('date:/2008-05-11', '', '1210564799'),
+		);
+	}
+
+	/**
+	 * @dataProvider providePubdateSearch
+	 * @param string $search
+	 * @param string $expected_min_value
+	 * @param string $expected_max_value
+	 */
+	public function testParseSearch_whenPubdateKeyword_returnArrayWithPubdateValues($search, $expected_min_value, $expected_max_value) {
+		FreshRSS_Context::$search = $search;
+		$parsed_search = $this->context->parseSearch();
+		$this->assertEquals($expected_min_value, $parsed_search['min_pubdate']);
+		$this->assertEquals($expected_max_value, $parsed_search['max_pubdate']);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePubdateSearch() {
+		return array(
+		    array('pubdate:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+		    array('pubdate:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+		    array('pubdate:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+		    array('pubdate:2007-03-01/2008-05-11', '1172725200', '1210564799'),
+		    array('pubdate:2007-03-01/', '1172725200', ''),
+		    array('pubdate:/2008-05-11', '', '1210564799'),
+		);
+	}
+
+}
-- 
cgit v1.2.3


From f30ded2f863ed4a33ae8194d6cf00eaa877c9b6a Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 11 Feb 2015 20:41:00 -0500
Subject: Extract the search code from the context

I figured that the code for the search could be extracted from the context to have separation of concern.
It supports multiple keywords. It suports also multiple tag keywords.
---
 app/Models/Context.php           | 148 ---------------------
 app/Models/Search.php            | 189 +++++++++++++++++++++++++++
 tests/app/Models/ContextTest.php | 236 ---------------------------------
 tests/app/Models/SearchTest.php  | 276 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 465 insertions(+), 384 deletions(-)
 create mode 100644 app/Models/Search.php
 create mode 100644 tests/app/Models/SearchTest.php

diff --git a/app/Models/Context.php b/app/Models/Context.php
index 645639907..f00bb1e97 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -302,152 +302,4 @@ class FreshRSS_Context {
 		return false;
 	}
 
-	/**
-	 * Parse search string to extract the different keywords.
-	 *
-	 * @return array
-	 */
-	public function parseSearch() {
-		$search = self::$search;
-		$intitle = $this->parseIntitleSearch($search);
-		$author = $this->parseAuthorSearch($intitle['string']);
-		$inurl = $this->parseInurlSearch($author['string']);
-		$pubdate = $this->parsePubdateSearch($inurl['string']);
-		$date = $this->parseDateSearch($pubdate['string']);
-
-		$remaining = array();
-		$remaining_search = trim($date['string']);
-		if (strcmp($remaining_search, '') != 0) {
-			$remaining['search'] = $remaining_search;
-		}
-
-		return array_merge($intitle['search'], $author['search'], $inurl['search'], $date['search'], $pubdate['search'], $remaining);
-	}
-
-	/**
-	 * Parse the search string to find intitle keyword and the search related
-	 * to it.
-	 * The search is the first word following the keyword.
-	 * It returns an array containing the matched string and the search.
-	 *
-	 * @param string $search
-	 * @return array
-	 */
-	private function parseIntitleSearch($search) {
-		if (preg_match('/intitle:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $search, $matches)) {
-			return array(
-			    'string' => str_replace($matches[0], '', $search),
-			    'search' => array('intitle' => $matches['search']),
-			);
-		}
-		if (preg_match('/intitle:(?P<search>\w*)/', $search, $matches)) {
-			return array(
-			    'string' => str_replace($matches[0], '', $search),
-			    'search' => array('intitle' => $matches['search']),
-			);
-		}
-		return array(
-		    'string' => $search,
-		    'search' => array(),
-		);
-	}
-
-	/**
-	 * Parse the search string to find author keyword and the search related
-	 * to it.
-	 * The search is the first word following the keyword except when using
-	 * a delimiter. Supported delimiters are single quote (') and double
-	 * quotes (").
-	 * It returns an array containing the matched string and the search.
-	 *
-	 * @param string $search
-	 * @return array
-	 */
-	private function parseAuthorSearch($search) {
-		if (preg_match('/author:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $search, $matches)) {
-			return array(
-			    'string' => str_replace($matches[0], '', $search),
-			    'search' => array('author' => $matches['search']),
-			);
-		}
-		if (preg_match('/author:(?P<search>\w*)/', $search, $matches)) {
-			return array(
-			    'string' => str_replace($matches[0], '', $search),
-			    'search' => array('author' => $matches['search']),
-			);
-		}
-		return array(
-		    'string' => $search,
-		    'search' => array(),
-		);
-	}
-
-	/**
-	 * Parse the search string to find inurl keyword and the search related
-	 * to it.
-	 * The search is the first word following the keyword except.
-	 * It returns an array containing the matched string and the search.
-	 *
-	 * @param string $search
-	 * @return array
-	 */
-	private function parseInurlSearch($search) {
-		if (preg_match('/inurl:(?P<search>[^\s]*)/', $search, $matches)) {
-			return array(
-			    'string' => str_replace($matches[0], '', $search),
-			    'search' => array('inurl' => $matches['search']),
-			);
-		}
-		return array(
-		    'string' => $search,
-		    'search' => array(),
-		);
-	}
-
-	/**
-	 * Parse the search string to find date keyword and the search related
-	 * to it.
-	 * The search is the first word following the keyword.
-	 * It returns an array containing the matched string and the search.
-	 *
-	 * @param string $search
-	 * @return array
-	 */
-	private function parseDateSearch($search) {
-		if (preg_match('/date:(?P<search>[^\s]*)/', $search, $matches)) {
-			list($min_date, $max_date) = parseDateInterval($matches['search']);
-			return array(
-			    'string' => str_replace($matches[0], '', $search),
-			    'search' => array('min_date' => $min_date, 'max_date' => $max_date),
-			);
-		}
-		return array(
-		    'string' => $search,
-		    'search' => array(),
-		);
-	}
-
-	/**
-	 * Parse the search string to find pubdate keyword and the search related
-	 * to it.
-	 * The search is the first word following the keyword.
-	 * It returns an array containing the matched string and the search.
-	 *
-	 * @param string $search
-	 * @return array
-	 */
-	private function parsePubdateSearch($search) {
-		if (preg_match('/pubdate:(?P<search>[^\s]*)/', $search, $matches)) {
-			list($min_date, $max_date) = parseDateInterval($matches['search']);
-			return array(
-			    'string' => str_replace($matches[0], '', $search),
-			    'search' => array('min_pubdate' => $min_date, 'max_pubdate' => $max_date),
-			);
-		}
-		return array(
-		    'string' => $search,
-		    'search' => array(),
-		);
-	}
-
 }
diff --git a/app/Models/Search.php b/app/Models/Search.php
new file mode 100644
index 000000000..0475bc685
--- /dev/null
+++ b/app/Models/Search.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * Contains a search from the search form.
+ *
+ * It allows to extract meaningful bits of the search and store them in a
+ * convenient object
+ *
+ * @author alexis
+ */
+class FreshRSS_Search {
+
+	// This contains the user input string
+	private $raw_input;
+	// The following properties are extracted from the raw input
+	private $intitle;
+	private $min_date;
+	private $max_date;
+	private $min_pubdate;
+	private $max_pubdate;
+	private $inurl;
+	private $author;
+	private $tags;
+	private $search;
+
+	public function __construct($input) {
+		if (strcmp($input, '') == 0) {
+			return;
+		}
+		$this->raw_input = $input;
+		$input = $this->parseIntitleSearch($input);
+		$input = $this->parseAuthorSearch($input);
+		$input = $this->parseInurlSearch($input);
+		$input = $this->parsePubdateSearch($input);
+		$input = $this->parseDateSearch($input);
+		$input = $this->parseTagsSeach($input);
+		$this->search = $input;
+	}
+
+	public function getRawInput() {
+		return $this->raw_input;
+	}
+
+	public function getIntitle() {
+		return $this->intitle;
+	}
+
+	public function getMinDate() {
+		return $this->min_date;
+	}
+
+	public function getMaxDate() {
+		return $this->max_date;
+	}
+
+	public function getMinPubdate() {
+		return $this->min_pubdate;
+	}
+
+	public function getMaxPubdate() {
+		return $this->max_pubdate;
+	}
+
+	public function getInurl() {
+		return $this->inurl;
+	}
+
+	public function getAuthor() {
+		return $this->author;
+	}
+
+	public function getTags() {
+		return $this->tags;
+	}
+
+	public function getSearch() {
+		return $this->search;
+	}
+
+	/**
+	 * Parse the search string to find intitle keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword.
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	private function parseIntitleSearch($input) {
+		if (preg_match('/intitle:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $input, $matches)) {
+			$this->intitle = $matches['search'];
+			$input = str_replace($matches[0], '', $input);
+		} else if (preg_match('/intitle:(?P<search>\w*)/', $input, $matches)) {
+			$this->intitle = $matches['search'];
+			$input = str_replace($matches[0], '', $input);
+		}
+		return $this->cleanSearch($input);
+	}
+
+	/**
+	 * Parse the search string to find author keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword except when using
+	 * a delimiter. Supported delimiters are single quote (') and double
+	 * quotes (").
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	private function parseAuthorSearch($input) {
+		if (preg_match('/author:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $input, $matches)) {
+			$this->author = $matches['search'];
+			$input = str_replace($matches[0], '', $input);
+		} else if (preg_match('/author:(?P<search>\w*)/', $input, $matches)) {
+			$this->author = $matches['search'];
+			$input = str_replace($matches[0], '', $input);
+		}
+		return $this->cleanSearch($input);
+	}
+
+	/**
+	 * Parse the search string to find inurl keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword except.
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	private function parseInurlSearch($input) {
+		if (preg_match('/inurl:(?P<search>[^\s]*)/', $input, $matches)) {
+			$this->inurl = $matches['search'];
+			$input = str_replace($matches[0], '', $input);
+		}
+		return $this->cleanSearch($input);
+	}
+
+	/**
+	 * Parse the search string to find date keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword.
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	private function parseDateSearch($input) {
+		if (preg_match('/date:(?P<search>[^\s]*)/', $input, $matches)) {
+			list($this->min_date, $this->max_date) = parseDateInterval($matches['search']);
+			$input = str_replace($matches[0], '', $input);
+		}
+		return $this->cleanSearch($input);
+	}
+
+	/**
+	 * Parse the search string to find pubdate keyword and the search related
+	 * to it.
+	 * The search is the first word following the keyword.
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	private function parsePubdateSearch($input) {
+		if (preg_match('/pubdate:(?P<search>[^\s]*)/', $input, $matches)) {
+			list($this->min_pubdate, $this->max_pubdate) = parseDateInterval($matches['search']);
+			$input = str_replace($matches[0], '', $input);
+		}
+		return $this->cleanSearch($input);
+	}
+
+	/**
+	 * Parse the search string to find tags keyword (# followed by a word)
+	 * and the search related to it.
+	 * The search is the first word following the #.
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	private function parseTagsSeach($input) {
+		if (preg_match_all('/#(?P<search>[^\s]+)/', $input, $matches)) {
+			$this->tags = $matches['search'];
+			$input = str_replace($matches[0], '', $input);
+		}
+		return $this->cleanSearch($input);
+	}
+
+	private function cleanSearch($input) {
+		$input = preg_replace('/\s+/', ' ', $input);
+		return trim($input);
+	}
+
+}
diff --git a/tests/app/Models/ContextTest.php b/tests/app/Models/ContextTest.php
index c5da6f667..4dc8b7757 100644
--- a/tests/app/Models/ContextTest.php
+++ b/tests/app/Models/ContextTest.php
@@ -1,241 +1,5 @@
 <?php
 
-require_once(LIB_PATH . '/lib_date.php');
-
 class ContextTest extends \PHPUnit_Framework_TestCase {
 
-	private $context;
-
-	public function setUp() {
-		$this->context = new FreshRSS_Context();
-	}
-
-	public function testParseSearch_whenEmpty_returnsEmptyArray() {
-		$this->assertCount(0, $this->context->parseSearch());
-	}
-
-	/**
-	 * @dataProvider provideMultipleKeywordSearch
-	 * @param string $search
-	 * @param string $expected_values
-	 */
-	public function testParseSearch_whenMultipleKeywords_returnArrayWithMultipleValues($search, $expected_values) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_values, $parsed_search);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideMultipleKeywordSearch() {
-		return array(
-		    array(
-			'intitle:word1 author:word2',
-			array(
-			    'intitle' => 'word1',
-			    'author' => 'word2',
-			),
-		    ),
-		    array(
-			'author:word2 intitle:word1',
-			array(
-			    'intitle' => 'word1',
-			    'author' => 'word2',
-			),
-		    ),
-		    array(
-			'author:word1 inurl:word2',
-			array(
-			    'author' => 'word1',
-			    'inurl' => 'word2',
-			),
-		    ),
-		    array(
-			'inurl:word2 author:word1',
-			array(
-			    'author' => 'word1',
-			    'inurl' => 'word2',
-			),
-		    ),
-		    array(
-			'date:2008-01-01/2008-02-01 pubdate:2007-01-01/2007-02-01',
-			array(
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			),
-		    ),
-		    array(
-			'pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01',
-			array(
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			),
-		    ),
-		    array(
-			'inurl:word1 author:word2 intitle:word3 pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01 hello world',
-			array(
-			    'inurl' => 'word1',
-			    'author' => 'word2',
-			    'intitle' => 'word3',
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			    'search' => 'hello world',
-			),
-		    ),
-		);
-	}
-
-	/**
-	 * @dataProvider provideIntitleSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenIntitleKeyword_returnArrayWithIntitleValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['intitle']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideIntitleSearch() {
-		return array(
-		    array('intitle:word1', 'word1'),
-		    array('intitle:word1 word2', 'word1'),
-		    array('intitle:"word1 word2"', 'word1 word2'),
-		    array("intitle:'word1 word2'", 'word1 word2'),
-		    array('word1 intitle:word2', 'word2'),
-		    array('word1 intitle:word2 word3', 'word2'),
-		    array('word1 intitle:"word2 word3"', 'word2 word3'),
-		    array("word1 intitle:'word2 word3'", 'word2 word3'),
-		    array('intitle:word1 intitle:word2', 'word1'),
-		    array('intitle: word1 word2', ''),
-		    array('intitle:123', '123'),
-		    array('intitle:"word1 word2" word3"', 'word1 word2'),
-		    array("intitle:'word1 word2' word3'", 'word1 word2'),
-		    array('intitle:"word1 word2\' word3"', "word1 word2' word3"),
-		    array("intitle:'word1 word2\" word3'", 'word1 word2" word3'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideAuthorSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenAuthorKeyword_returnArrayWithAuthorValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['author']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideAuthorSearch() {
-		return array(
-		    array('author:word1', 'word1'),
-		    array('author:word1 word2', 'word1'),
-		    array('author:"word1 word2"', 'word1 word2'),
-		    array("author:'word1 word2'", 'word1 word2'),
-		    array('word1 author:word2', 'word2'),
-		    array('word1 author:word2 word3', 'word2'),
-		    array('word1 author:"word2 word3"', 'word2 word3'),
-		    array("word1 author:'word2 word3'", 'word2 word3'),
-		    array('author:word1 author:word2', 'word1'),
-		    array('author: word1 word2', ''),
-		    array('author:123', '123'),
-		    array('author:"word1 word2" word3"', 'word1 word2'),
-		    array("author:'word1 word2' word3'", 'word1 word2'),
-		    array('author:"word1 word2\' word3"', "word1 word2' word3"),
-		    array("author:'word1 word2\" word3'", 'word1 word2" word3'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideInurlSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenInurlKeyword_returnArrayWithInurlValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['inurl']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideInurlSearch() {
-		return array(
-		    array('inurl:word1', 'word1'),
-		    array('inurl: word1', ''),
-		    array('inurl:123', '123'),
-		    array('inurl:word1 word2', 'word1'),
-		    array('inurl:"word1 word2"', '"word1'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideDateSearch
-	 * @param string $search
-	 * @param string $expected_min_value
-	 * @param string $expected_max_value
-	 */
-	public function testParseSearch_whenDateKeyword_returnArrayWithDateValues($search, $expected_min_value, $expected_max_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_min_value, $parsed_search['min_date']);
-		$this->assertEquals($expected_max_value, $parsed_search['max_date']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideDateSearch() {
-		return array(
-		    array('date:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
-		    array('date:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
-		    array('date:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
-		    array('date:2007-03-01/2008-05-11', '1172725200', '1210564799'),
-		    array('date:2007-03-01/', '1172725200', ''),
-		    array('date:/2008-05-11', '', '1210564799'),
-		);
-	}
-
-	/**
-	 * @dataProvider providePubdateSearch
-	 * @param string $search
-	 * @param string $expected_min_value
-	 * @param string $expected_max_value
-	 */
-	public function testParseSearch_whenPubdateKeyword_returnArrayWithPubdateValues($search, $expected_min_value, $expected_max_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_min_value, $parsed_search['min_pubdate']);
-		$this->assertEquals($expected_max_value, $parsed_search['max_pubdate']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function providePubdateSearch() {
-		return array(
-		    array('pubdate:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
-		    array('pubdate:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
-		    array('pubdate:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
-		    array('pubdate:2007-03-01/2008-05-11', '1172725200', '1210564799'),
-		    array('pubdate:2007-03-01/', '1172725200', ''),
-		    array('pubdate:/2008-05-11', '', '1210564799'),
-		);
-	}
-
 }
diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
new file mode 100644
index 000000000..6ddfc0370
--- /dev/null
+++ b/tests/app/Models/SearchTest.php
@@ -0,0 +1,276 @@
+<?php
+
+require_once(LIB_PATH . '/lib_date.php');
+
+class SearchTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @dataProvider provideEmptyInput
+	 * @param string|null $input
+	 */
+	public function test__construct_whenInputIsEmpty_getsOnlyNullValues($input) {
+		$search = new FreshRSS_Search($input);
+		$this->assertNull($search->getRawInput());
+		$this->assertNull($search->getIntitle());
+		$this->assertNull($search->getMinDate());
+		$this->assertNull($search->getMaxDate());
+		$this->assertNull($search->getMinPubdate());
+		$this->assertNull($search->getMaxPubdate());
+		$this->assertNull($search->getAuthor());
+		$this->assertNull($search->getTags());
+		$this->assertNull($search->getSearch());
+	}
+
+	/**
+	 * Return an array of values for the search object.
+	 * Here is the description of the values
+	 * @return array
+	 */
+	public function provideEmptyInput() {
+		return array(
+		    array(''),
+		    array(null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideIntitleSearch
+	 * @param string $input
+	 * @param string $intitle_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsIntitle_setsIntitlePropery($input, $intitle_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($intitle_value, $search->getIntitle());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideIntitleSearch() {
+		return array(
+		    array('intitle:word1', 'word1', null),
+		    array('intitle:word1 word2', 'word1', 'word2'),
+		    array('intitle:"word1 word2"', 'word1 word2', null),
+		    array("intitle:'word1 word2'", 'word1 word2', null),
+		    array('word1 intitle:word2', 'word2', 'word1'),
+		    array('word1 intitle:word2 word3', 'word2', 'word1 word3'),
+		    array('word1 intitle:"word2 word3"', 'word2 word3', 'word1'),
+		    array("word1 intitle:'word2 word3'", 'word2 word3', 'word1'),
+		    array('intitle:word1 intitle:word2', 'word1', 'intitle:word2'),
+		    array('intitle: word1 word2', null, 'word1 word2'),
+		    array('intitle:123', '123', null),
+		    array('intitle:"word1 word2" word3"', 'word1 word2', 'word3"'),
+		    array("intitle:'word1 word2' word3'", 'word1 word2', "word3'"),
+		    array('intitle:"word1 word2\' word3"', "word1 word2' word3", null),
+		    array("intitle:'word1 word2\" word3'", 'word1 word2" word3', null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideAuthorSearch
+	 * @param string $input
+	 * @param string $author_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsAuthor_setsAuthorValue($input, $author_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($author_value, $search->getAuthor());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideAuthorSearch() {
+		return array(
+		    array('author:word1', 'word1', null),
+		    array('author:word1 word2', 'word1', 'word2'),
+		    array('author:"word1 word2"', 'word1 word2', null),
+		    array("author:'word1 word2'", 'word1 word2', null),
+		    array('word1 author:word2', 'word2', 'word1'),
+		    array('word1 author:word2 word3', 'word2', 'word1 word3'),
+		    array('word1 author:"word2 word3"', 'word2 word3', 'word1'),
+		    array("word1 author:'word2 word3'", 'word2 word3', 'word1'),
+		    array('author:word1 author:word2', 'word1', 'author:word2'),
+		    array('author: word1 word2', null, 'word1 word2'),
+		    array('author:123', '123', null),
+		    array('author:"word1 word2" word3"', 'word1 word2', 'word3"'),
+		    array("author:'word1 word2' word3'", 'word1 word2', "word3'"),
+		    array('author:"word1 word2\' word3"', "word1 word2' word3", null),
+		    array("author:'word1 word2\" word3'", 'word1 word2" word3', null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideInurlSearch
+	 * @param string $input
+	 * @param string $inurl_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsInurl_setsInurlValue($input, $inurl_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($inurl_value, $search->getInurl());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideInurlSearch() {
+		return array(
+		    array('inurl:word1', 'word1', null),
+		    array('inurl: word1', null, 'word1'),
+		    array('inurl:123', '123', null),
+		    array('inurl:word1 word2', 'word1', 'word2'),
+		    array('inurl:"word1 word2"', '"word1', 'word2"'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideDateSearch
+	 * @param string $input
+	 * @param string $min_date_value
+	 * @param string $max_date_value
+	 */
+	public function test__construct_whenInputContainsDate_setsDateValues($input, $min_date_value, $max_date_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($min_date_value, $search->getMinDate());
+		$this->assertEquals($max_date_value, $search->getMaxDate());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideDateSearch() {
+		return array(
+		    array('date:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+		    array('date:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+		    array('date:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+		    array('date:2007-03-01/2008-05-11', '1172725200', '1210564799'),
+		    array('date:2007-03-01/', '1172725200', ''),
+		    array('date:/2008-05-11', '', '1210564799'),
+		);
+	}
+
+	/**
+	 * @dataProvider providePubdateSearch
+	 * @param string $input
+	 * @param string $min_pubdate_value
+	 * @param string $max_pubdate_value
+	 */
+	public function test__construct_whenInputContainsPubdate_setsPubdateValues($input, $min_pubdate_value, $max_pubdate_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($min_pubdate_value, $search->getMinPubdate());
+		$this->assertEquals($max_pubdate_value, $search->getMaxPubdate());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePubdateSearch() {
+		return array(
+		    array('pubdate:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+		    array('pubdate:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+		    array('pubdate:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+		    array('pubdate:2007-03-01/2008-05-11', '1172725200', '1210564799'),
+		    array('pubdate:2007-03-01/', '1172725200', ''),
+		    array('pubdate:/2008-05-11', '', '1210564799'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideTagsSearch
+	 * @param string $input
+	 * @param string $tags_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsTags_setsTagsValue($input, $tags_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($tags_value, $search->getTags());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideTagsSearch() {
+		return array(
+		    array('#word1', array('word1'), null),
+		    array('# word1', null, '# word1'),
+		    array('#123', array('123'), null),
+		    array('#word1 word2', array('word1'), 'word2'),
+		    array('#"word1 word2"', array('"word1'), 'word2"'),
+		    array('#word1 #word2', array('word1', 'word2'), null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMultipleSearch
+	 * @param string $input
+	 * @param string $author_value
+	 * @param string $min_date_value
+	 * @param string $max_date_value
+	 * @param string $intitle_value
+	 * @param string $inurl_value
+	 * @param string $min_pubdate_value
+	 * @param string $max_pubdate_value
+	 * @param array $tags_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsMultipleKeywords_setsValues($input, $author_value, $min_date_value, $max_date_value, $intitle_value, $inurl_value, $min_pubdate_value, $max_pubdate_value, $tags_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($author_value, $search->getAuthor());
+		$this->assertEquals($min_date_value, $search->getMinDate());
+		$this->assertEquals($max_date_value, $search->getMaxDate());
+		$this->assertEquals($intitle_value, $search->getIntitle());
+		$this->assertEquals($inurl_value, $search->getInurl());
+		$this->assertEquals($min_pubdate_value, $search->getMinPubdate());
+		$this->assertEquals($max_pubdate_value, $search->getMaxPubdate());
+		$this->assertEquals($tags_value, $search->getTags());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	public function provideMultipleSearch() {
+		return array(
+		    array(
+			'author:word1 date:2007-03-01/2008-05-11 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 #word5',
+			'word1',
+			'1172725200',
+			'1210564799',
+			'word2',
+			'word3',
+			'1172725200',
+			'1210564799',
+			array('word4', 'word5'),
+			null,
+		    ),
+		    array(
+			'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 date:2007-03-01/2008-05-11',
+			'word1',
+			'1172725200',
+			'1210564799',
+			'word2',
+			'word3',
+			'1172725200',
+			'1210564799',
+			array('word4', 'word5'),
+			'word6',
+		    ),
+		    array(
+			'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 word7 date:2007-03-01/2008-05-11',
+			'word1',
+			'1172725200',
+			'1210564799',
+			'word2',
+			'word3',
+			'1172725200',
+			'1210564799',
+			array('word4', 'word5'),
+			'word6 word7',
+		    ),
+		);
+	}
+
+}
-- 
cgit v1.2.3


From 9cee5c1a17947d3f3d10554844b7089e28cf8500 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 11 Feb 2015 21:52:10 -0500
Subject: Remove code generated by netbeans

---
 app/Models/Search.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Models/Search.php b/app/Models/Search.php
index 0475bc685..e64f6cb88 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -5,8 +5,6 @@
  *
  * It allows to extract meaningful bits of the search and store them in a
  * convenient object
- *
- * @author alexis
  */
 class FreshRSS_Search {
 
-- 
cgit v1.2.3


From 9f83aa5fe79618be98cb027bb1070f5a11c51723 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Thu, 12 Feb 2015 21:05:33 -0500
Subject: Refactor the code to make less unnecessaty calls

There were multiple calls made to the cleaning method that were unnecessary since it is useful only on the last call.
It allows to simplify code by returning values ealier.
---
 app/Models/Search.php | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/Models/Search.php b/app/Models/Search.php
index e64f6cb88..ef8fc883d 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -32,7 +32,7 @@ class FreshRSS_Search {
 		$input = $this->parsePubdateSearch($input);
 		$input = $this->parseDateSearch($input);
 		$input = $this->parseTagsSeach($input);
-		$this->search = $input;
+		$this->search = $this->cleanSearch($input);
 	}
 
 	public function getRawInput() {
@@ -86,12 +86,13 @@ class FreshRSS_Search {
 	private function parseIntitleSearch($input) {
 		if (preg_match('/intitle:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $input, $matches)) {
 			$this->intitle = $matches['search'];
-			$input = str_replace($matches[0], '', $input);
-		} else if (preg_match('/intitle:(?P<search>\w*)/', $input, $matches)) {
+			return str_replace($matches[0], '', $input);
+		}
+		if (preg_match('/intitle:(?P<search>\w*)/', $input, $matches)) {
 			$this->intitle = $matches['search'];
-			$input = str_replace($matches[0], '', $input);
+			return str_replace($matches[0], '', $input);
 		}
-		return $this->cleanSearch($input);
+		return $input;
 	}
 
 	/**
@@ -107,12 +108,13 @@ class FreshRSS_Search {
 	private function parseAuthorSearch($input) {
 		if (preg_match('/author:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $input, $matches)) {
 			$this->author = $matches['search'];
-			$input = str_replace($matches[0], '', $input);
-		} else if (preg_match('/author:(?P<search>\w*)/', $input, $matches)) {
+			return str_replace($matches[0], '', $input);
+		}
+		if (preg_match('/author:(?P<search>\w*)/', $input, $matches)) {
 			$this->author = $matches['search'];
-			$input = str_replace($matches[0], '', $input);
+			return str_replace($matches[0], '', $input);
 		}
-		return $this->cleanSearch($input);
+		return $input;
 	}
 
 	/**
@@ -126,9 +128,9 @@ class FreshRSS_Search {
 	private function parseInurlSearch($input) {
 		if (preg_match('/inurl:(?P<search>[^\s]*)/', $input, $matches)) {
 			$this->inurl = $matches['search'];
-			$input = str_replace($matches[0], '', $input);
+			return str_replace($matches[0], '', $input);
 		}
-		return $this->cleanSearch($input);
+		return $input;
 	}
 
 	/**
@@ -142,9 +144,9 @@ class FreshRSS_Search {
 	private function parseDateSearch($input) {
 		if (preg_match('/date:(?P<search>[^\s]*)/', $input, $matches)) {
 			list($this->min_date, $this->max_date) = parseDateInterval($matches['search']);
-			$input = str_replace($matches[0], '', $input);
+			return str_replace($matches[0], '', $input);
 		}
-		return $this->cleanSearch($input);
+		return $input;
 	}
 
 	/**
@@ -158,9 +160,9 @@ class FreshRSS_Search {
 	private function parsePubdateSearch($input) {
 		if (preg_match('/pubdate:(?P<search>[^\s]*)/', $input, $matches)) {
 			list($this->min_pubdate, $this->max_pubdate) = parseDateInterval($matches['search']);
-			$input = str_replace($matches[0], '', $input);
+			return str_replace($matches[0], '', $input);
 		}
-		return $this->cleanSearch($input);
+		return $input;
 	}
 
 	/**
@@ -174,11 +176,17 @@ class FreshRSS_Search {
 	private function parseTagsSeach($input) {
 		if (preg_match_all('/#(?P<search>[^\s]+)/', $input, $matches)) {
 			$this->tags = $matches['search'];
-			$input = str_replace($matches[0], '', $input);
+			return str_replace($matches[0], '', $input);
 		}
-		return $this->cleanSearch($input);
+		return $input;
 	}
 
+	/**
+	 * Remove all unnecessary spaces in the search
+	 *
+	 * @param string $input
+	 * @return string
+	 */
 	private function cleanSearch($input) {
 		$input = preg_replace('/\s+/', ' ', $input);
 		return trim($input);
-- 
cgit v1.2.3


From 964e67d4a4914008b0f7bc941d77215b2038012c Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Thu, 12 Feb 2015 21:08:37 -0500
Subject: Add a test to verify if the search input is stored correctly

---
 tests/app/Models/SearchTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
index 6ddfc0370..20ea09433 100644
--- a/tests/app/Models/SearchTest.php
+++ b/tests/app/Models/SearchTest.php
@@ -230,6 +230,7 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($max_pubdate_value, $search->getMaxPubdate());
 		$this->assertEquals($tags_value, $search->getTags());
 		$this->assertEquals($search_value, $search->getSearch());
+		$this->assertEquals($input, $search->getRawInput());
 	}
 
 	public function provideMultipleSearch() {
-- 
cgit v1.2.3


From b8fd3caf8306e8616fcb2f2c0add95b74c2ec024 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 14 Feb 2015 11:00:26 -0500
Subject: Harmonize share configuration view.

Before, for shares that don't need options, only a button to remove it was visible. It was source of confusion for users.
I changed the look of those shares by using the same layout as others (minus the help). As there is no configuration possible for the url, the field is disabled but it is possible to change the name of the share.

See #787
---
 app/Models/Share.php              |  2 +-
 app/i18n/de/gen.php               |  1 +
 app/i18n/en/gen.php               |  1 +
 app/i18n/fr/gen.php               |  1 +
 app/views/configure/sharing.phtml | 20 +++++++++++---------
 p/scripts/main.js                 |  2 +-
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/Models/Share.php b/app/Models/Share.php
index db6feda19..2a05f2ee9 100644
--- a/app/Models/Share.php
+++ b/app/Models/Share.php
@@ -152,7 +152,7 @@ class FreshRSS_Share {
 	 * Return the current name of the share option.
 	 */
 	public function name($real = false) {
-		if ($real || is_null($this->custom_name)) {
+		if ($real || is_null($this->custom_name) || empty($this->custom_name)) {
 			return $this->name;
 		} else {
 			return $this->custom_name;
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index f3479ed53..3170b29c2 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -156,6 +156,7 @@ return array(
 		'damn' => 'Verdammt!',
 		'default_category' => 'Unkategorisiert',
 		'no' => 'Nein',
+		'not_applicable' => 'N/A',
 		'ok' => 'OK!',
 		'or' => 'oder',
 		'yes' => 'Ja',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 2143822ed..420e73f36 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -156,6 +156,7 @@ return array(
 		'damn' => 'Damn!',
 		'default_category' => 'Uncategorized',
 		'no' => 'No',
+		'not_applicable' => 'N/A',
 		'ok' => 'Ok!',
 		'or' => 'or',
 		'yes' => 'Yes',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 1cfec6969..ae946ce0c 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -156,6 +156,7 @@ return array(
 		'damn' => 'Arf !',
 		'default_category' => 'Sans catégorie',
 		'no' => 'Non',
+		'not_applicable' => 'N/A',
 		'ok' => 'Ok !',
 		'or' => 'ou',
 		'yes' => 'Oui',
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index da7557480..deb1ed6b7 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -4,7 +4,8 @@
 	<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>
+		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><div class="stick"><input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="##label##" 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('gen.short.not_applicable'); ?>" size="64" disabled /><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a></div>
 			<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##" />
@@ -26,16 +27,17 @@
 				</label>
 				<div class="group-controls">
 					<input type='hidden' id='share_<?php echo $key; ?>_type' name="share[<?php echo $key; ?>][type]" value='<?php echo $share->type(); ?>' />
+					<div class="stick">
+						<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" />
 					<?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 $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>
+						<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" />
 					<?php } else { ?>
-					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
+						<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('gen.short.not_applicable'); ?>" size="64" disabled/>
+					<?php } ?>
+						<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
+					</div>
+					<?php if ($share->formType() === 'advanced') { ?>
+						<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="<?php echo $share->help(); ?>"><?php echo _i('help'); ?></a>
 					<?php } ?>
 				</div>
 			</div>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 1be75bb12..7fb583d39 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1097,7 +1097,7 @@ function init_share_observers() {
 	$('.share.add').on('click', function(e) {
 		var opt = $(this).siblings('select').find(':selected');
 		var row = $(this).parents('form').data(opt.data('form'));
-		row = row.replace('##label##', opt.html(), 'g');
+		row = row.replace('##label##', opt.html().trim(), 'g');
 		row = row.replace('##type##', opt.val(), 'g');
 		row = row.replace('##help##', opt.data('help'), 'g');
 		row = row.replace('##key##', shares, 'g');
-- 
cgit v1.2.3


From 6e7bdb1709deaa0a1e6e5f4de10139a1e653e500 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 15 Feb 2015 18:18:28 -0500
Subject: Add a cleaning process in the auto-remove feature.

Before, when the status change was too quick, sometimes, articles weren't removed from the view.
Now they are removed by adding a statement that grabs past articles with specific properties and remove them.

See #738
---
 p/scripts/main.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 1be75bb12..b58d4de81 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -238,12 +238,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();
+			auto_remove(old_active);
 		}
 	} else {
 		new_active.toggleClass('active');
@@ -258,7 +253,7 @@ function toggleContent(new_active, old_active) {
 
 	if (context['sticky_post']) {
 		var prev_article = new_active.prevAll('.flux'),
-		    new_pos = new_active.position().top,
+			new_pos = new_active.position().top,
 			old_scroll = $(box_to_move).scrollTop();
 
 		if (prev_article.length > 0 && new_pos - prev_article.position().top <= 150) {
@@ -289,6 +284,16 @@ function toggleContent(new_active, old_active) {
 	}
 }
 
+function auto_remove(element) {
+	var p = element.prev();
+	var n = element.next();
+	if (p.hasClass('day') && n.hasClass('day')) {
+		p.remove();
+	}
+	element.remove();
+	$('#stream > .flux:not(.not_read):not(.active)').remove();
+}
+
 function prev_entry() {
 	var old_active = $(".flux.current"),
 		new_active = old_active.length === 0 ? $(".flux:last") : old_active.prevAll(".flux:first");
@@ -683,7 +688,7 @@ function init_stream(divStream) {
 		}
 		var old_active = $(".flux.current"),
 			new_active = $(this).parent();
-			isCollapsed = true;
+		isCollapsed = true;
 		if (e.target.tagName.toUpperCase() === 'A') {	//Leave real links alone
 			if (context['auto_mark_article']) {
 				mark_read(new_active, true);
@@ -696,12 +701,7 @@ function init_stream(divStream) {
 	divStream.on('click', '.flux a.read', function () {
 		var active = $(this).parents(".flux");
 		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();
+			auto_remove(active);
 		}
 		mark_read(active, false);
 		return false;
@@ -882,8 +882,8 @@ function notifs_html5_show(nb) {
 
 	if (context['html5_notif_timeout'] !== 0){
 		setTimeout(function() {
-					notification.close();
-				}, context['html5_notif_timeout'] * 1000);
+			notification.close();
+		}, context['html5_notif_timeout'] * 1000);
 	}
 }
 
@@ -899,7 +899,7 @@ function init_notifs_html5() {
 function refreshUnreads() {
 	$.getJSON('./?c=javascript&a=nbUnreadsPerFeed').done(function (data) {
 		var isAll = $('.category.all.active').length > 0,
-		    new_articles = false;
+			new_articles = false;
 
 		$.each(data, function(feed_id, nbUnreads) {
 			feed_id = 'f_' + feed_id;
@@ -1195,7 +1195,7 @@ function faviconNbUnread(n) {
 
 function init_slider_observers() {
 	var slider = $('#slider'),
-	    closer = $('#close-slider');
+		closer = $('#close-slider');
 	if (slider.length < 1) {
 		return;
 	}
-- 
cgit v1.2.3


From ee56f3607df3f6f31082b1f86d89e9b705dc93c8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 17 Feb 2015 14:45:26 +0100
Subject: Improve CONTRIBUTING file

- remove TODO
- simplify info about "fix a bug" (get from https://github.com/github/gitignore
  README)
- add few info

See https://github.com/FreshRSS/FreshRSS/issues/783
---
 CONTRIBUTING.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fb1610a1f..a80664f67 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,11 +23,9 @@ If you have to create a new ticket, try to apply the following advices:
 Did you want to fix a bug? To keep a great coordination between collaborators, you will have to follow these indications:
 
 1. Be sure the bug is associated to a ticket and say you work on it.
-2. Fork the FreshRSS repository.
-3. Get your repository `git clone -b dev git@github.com:your_username/FreshRSS.git && cd FreshRSS`
-4. It's better to create a dedicated branch to fix your bug: the name of the branch must be explicit and being prefixed by the related ticket id. For instance, `783-contributing-file` to fix [ticket #783](https://github.com/FreshRSS/FreshRSS/issues/783).
-5. Once you'll have finished, commit your work, push your branch upstream (`git push --set-upstream origin your_branch_name`) and do a [pull request](https://github.com/FreshRSS/FreshRSS/compare) on the **dev branch**.
-6. Wait and see.
+2. [Fork this project repository](https://help.github.com/articles/fork-a-repo/).
+3. [Create a new branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/). The name of the branch must be explicit and being prefixed by the related ticket id. For instance, `783-contributing-file` to fix [ticket #783](https://github.com/FreshRSS/FreshRSS/issues/783).
+4. Make your changes to your fork and [send a pull request](https://help.github.com/articles/using-pull-requests/) on the **dev branch**.
 
 If you have to write code, please follow [our coding style recommendations](http://doc2.freshrss.org/en/Developer_documentation/First_steps/Coding_style).
 
@@ -39,18 +37,16 @@ You have great ideas, yes! Don't be shy and open [a new ticket](https://github.c
 
 If your idea is nice, we'll have a look at it.
 
-TODO: complete
-
 ## Contribute to internationalization (i18n)
 
 If you want to improve internationalization, please open a new ticket first and follow indications from « Fix a bug » section.
 
-TODO: finish
+Translations are present in the subdirectories of `./app/i18n/`.
 
-We are working on a better way to handle internationalization.
+We are working on a better way to handle internationalization but don't hesitate to suggest any idea!
 
 ## Contribute to documentation
 
 The documentation needs a lot of improvements in order to be more useful to new contributors and we are working on it. If you want to give some help, meet us on [the dedicated repository](https://github.com/FreshRSS/documentation)!
 
-TODO: finish
+The best is to open tickets to ask your questions or to do any suggestions.
-- 
cgit v1.2.3


From 3aec3e717173713d6a817110fb61b3702c929b1d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 17 Feb 2015 14:52:18 +0100
Subject: Improve CONTRIBUTING.md file

Add a section about mailing lists

See https://github.com/FreshRSS/FreshRSS/issues/783
---
 CONTRIBUTING.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a80664f67..3f72c5cd7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,12 @@
 # How to contribute to FreshRSS?
 
+## Join us on the mailing lists
+
+Do you want to ask us some questions? Do you want to discuss with us? Don't hesitate to subscribe to our mailing lists!
+
+- The first mailing is destined to generic information, it should be adapted to users. [Join mailing@freshrss.org](https://freshrss.org/mailman/listinfo/mailing).
+- The second mailing is mainly for developers. [Join dev@freshrss.org](https://freshrss.org/mailman/listinfo/dev)
+
 ## Report a bug
 
 You found a bug? Don't panic, here are some steps to report it easily:
-- 
cgit v1.2.3


From 58bf976f6923b5ad9c6e8e57a0daa06ec05462f4 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Tue, 17 Feb 2015 21:05:28 -0500
Subject: Change translation

I change the translation for the 3 languages. German has to be checked since I used Google translate to get the translation.
---
 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 3170b29c2..1b30a5be4 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -156,7 +156,7 @@ return array(
 		'damn' => 'Verdammt!',
 		'default_category' => 'Unkategorisiert',
 		'no' => 'Nein',
-		'not_applicable' => 'N/A',
+		'not_applicable' => 'Nicht verfügbar',
 		'ok' => 'OK!',
 		'or' => 'oder',
 		'yes' => 'Ja',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 420e73f36..fdca01a43 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -156,7 +156,7 @@ return array(
 		'damn' => 'Damn!',
 		'default_category' => 'Uncategorized',
 		'no' => 'No',
-		'not_applicable' => 'N/A',
+		'not_applicable' => 'Not available',
 		'ok' => 'Ok!',
 		'or' => 'or',
 		'yes' => 'Yes',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index ae946ce0c..48fc4a7e9 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -156,7 +156,7 @@ return array(
 		'damn' => 'Arf !',
 		'default_category' => 'Sans catégorie',
 		'no' => 'Non',
-		'not_applicable' => 'N/A',
+		'not_applicable' => 'Non disponible',
 		'ok' => 'Ok !',
 		'or' => 'ou',
 		'yes' => 'Oui',
-- 
cgit v1.2.3


From e7a35161e29b3319ff3c0956c3de671735cd6d9a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 18 Feb 2015 16:05:55 +0100
Subject: Update CONTRIBUTING file

Remove unnecessary sentences in "Contribute to documentation"

See https://github.com/FreshRSS/FreshRSS/issues/783
---
 CONTRIBUTING.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3f72c5cd7..133813711 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,5 +55,3 @@ We are working on a better way to handle internationalization but don't hesitate
 ## Contribute to documentation
 
 The documentation needs a lot of improvements in order to be more useful to new contributors and we are working on it. If you want to give some help, meet us on [the dedicated repository](https://github.com/FreshRSS/documentation)!
-
-The best is to open tickets to ask your questions or to do any suggestions.
-- 
cgit v1.2.3


From 457fd7936e95b18ad1b282e4a84b972cd833fee6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 18 Feb 2015 16:05:55 +0100
Subject: Add Contributing file in beta branch

See https://github.com/FreshRSS/FreshRSS/issues/783
---
 CONTRIBUTING.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..133813711
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,57 @@
+# How to contribute to FreshRSS?
+
+## Join us on the mailing lists
+
+Do you want to ask us some questions? Do you want to discuss with us? Don't hesitate to subscribe to our mailing lists!
+
+- The first mailing is destined to generic information, it should be adapted to users. [Join mailing@freshrss.org](https://freshrss.org/mailman/listinfo/mailing).
+- The second mailing is mainly for developers. [Join dev@freshrss.org](https://freshrss.org/mailman/listinfo/dev)
+
+## Report a bug
+
+You found a bug? Don't panic, here are some steps to report it easily:
+
+1. Search for it on [the bug tracker](https://github.com/FreshRSS/FreshRSS/issues) (don't forget to use the search bar).
+2. If you find a similar bug, don't hesitate to post a comment to add more importance to the related ticket.
+3. If you didn't find it, [open a new ticket](https://github.com/FreshRSS/FreshRSS/issues/new).
+
+If you have to create a new ticket, try to apply the following advices:
+
+- Give an explicit title to the ticket so it will be easier to find it later.
+- Be as exhaustive as possible in the description: what did you do? What is the bug? What are the steps to reproduce the bug?
+- We also need some information:
+    + Your FreshRSS version (on about page or `constants.php` file)
+    + Your server configuration: type of hosting, PHP version
+    + Your storage system (MySQL / MariaDB or SQLite)
+    + If possible, the related logs (PHP logs and FreshRSS logs under `data/users/your_user/log.txt`)
+
+## Fix a bug
+
+Did you want to fix a bug? To keep a great coordination between collaborators, you will have to follow these indications:
+
+1. Be sure the bug is associated to a ticket and say you work on it.
+2. [Fork this project repository](https://help.github.com/articles/fork-a-repo/).
+3. [Create a new branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/). The name of the branch must be explicit and being prefixed by the related ticket id. For instance, `783-contributing-file` to fix [ticket #783](https://github.com/FreshRSS/FreshRSS/issues/783).
+4. Make your changes to your fork and [send a pull request](https://help.github.com/articles/using-pull-requests/) on the **dev branch**.
+
+If you have to write code, please follow [our coding style recommendations](http://doc2.freshrss.org/en/Developer_documentation/First_steps/Coding_style).
+
+**Tip:** if you are searching for bugs easy to fix, have a look at the « [New comers](https://github.com/FreshRSS/FreshRSS/labels/New%20comers) » ticket label.
+
+## Submit an idea
+
+You have great ideas, yes! Don't be shy and open [a new ticket](https://github.com/FreshRSS/FreshRSS/issues/new) on our bug tracker to ask if we can implement it. The greatest ideas often come from the shyest suggestions!
+
+If your idea is nice, we'll have a look at it.
+
+## Contribute to internationalization (i18n)
+
+If you want to improve internationalization, please open a new ticket first and follow indications from « Fix a bug » section.
+
+Translations are present in the subdirectories of `./app/i18n/`.
+
+We are working on a better way to handle internationalization but don't hesitate to suggest any idea!
+
+## Contribute to documentation
+
+The documentation needs a lot of improvements in order to be more useful to new contributors and we are working on it. If you want to give some help, meet us on [the dedicated repository](https://github.com/FreshRSS/documentation)!
-- 
cgit v1.2.3


From f5028d30d047ae50ac2d89a9a66266de086ac718 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 21 Feb 2015 07:53:45 -0500
Subject: Add required library

The lib_date.php library was missing in the Search object file. It is required to make date conversion in that object.
---
 app/Models/Search.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Models/Search.php b/app/Models/Search.php
index ef8fc883d..a22e242af 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once(LIB_PATH . '/lib_date.php');
+
 /**
  * Contains a search from the search form.
  *
-- 
cgit v1.2.3


From 115612959302fc51c4720b7a954bf8cbe1b14f3b Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 21 Feb 2015 09:08:06 -0500
Subject: Use the search object to get values in the search

It is now possible to combine multiple keywords to do a search. The separation of concern is better now since the search extraction is not done in the DAO anymore.
At the moment, a multiple keyword search is stored as this. It could be nice to have it rendered differently in the search page to make it more readable.
At the moment, there is a problem with search enclosed by ". Same search works well when enclosed by '.
---
 app/Controllers/indexController.php |  2 +-
 app/Models/Context.php              |  2 +-
 app/Models/EntryDAO.php             | 84 +++++++++++++++++--------------------
 3 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index c53d3223e..c1aaca53f 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -173,7 +173,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			FreshRSS_Context::$state |= FreshRSS_Entry::STATE_READ;
 		}
 
-		FreshRSS_Context::$search = Minz_Request::param('search', '');
+		FreshRSS_Context::$search = new FreshRSS_Search(Minz_Request::param('search', ''));
 		FreshRSS_Context::$order = Minz_Request::param(
 			'order', FreshRSS_Context::$user_conf->sort_order
 		);
diff --git a/app/Models/Context.php b/app/Models/Context.php
index f00bb1e97..dbdbfaa69 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -30,7 +30,7 @@ class FreshRSS_Context {
 	public static $state = 0;
 	public static $order = 'DESC';
 	public static $number = 0;
-	public static $search = '';
+	public static $search;
 	public static $first_id = '';
 	public static $next_id = '';
 	public static $id_max = '';
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 61beeea13..0cf4e1367 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -441,54 +441,46 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			$where .= 'AND e1.id >= ' . $date_min . '000000 ';
 		}
 		$search = '';
-		if ($filter !== '') {
-			require_once(LIB_PATH . '/lib_date.php');
-			$filter = trim($filter);
-			$filter = addcslashes($filter, '\\%_');
-			$terms = array_unique(explode(' ', $filter));
-			//sort($terms);	//Put #tags first	//TODO: Put the cheapest filters first
-			foreach ($terms as $word) {
-				$word = trim($word);
-				if (stripos($word, 'intitle:') === 0) {
-					$word = substr($word, strlen('intitle:'));
-					$search .= 'AND e1.title LIKE ? ';
-					$values[] = '%' . $word .'%';
-				} elseif (stripos($word, 'inurl:') === 0) {
-					$word = substr($word, strlen('inurl:'));
-					$search .= 'AND CONCAT(e1.link, e1.guid) LIKE ? ';
-					$values[] = '%' . $word .'%';
-				} elseif (stripos($word, 'author:') === 0) {
-					$word = substr($word, strlen('author:'));
-					$search .= 'AND e1.author LIKE ? ';
-					$values[] = '%' . $word .'%';
-				} elseif (stripos($word, 'date:') === 0) {
-					$word = substr($word, strlen('date:'));
-					list($minDate, $maxDate) = parseDateInterval($word);
-					if ($minDate) {
-						$search .= 'AND e1.id >= ' . $minDate . '000000 ';
-					}
-					if ($maxDate) {
-						$search .= 'AND e1.id <= ' . $maxDate . '000000 ';
-					}
-				} elseif (stripos($word, 'pubdate:') === 0) {
-					$word = substr($word, strlen('pubdate:'));
-					list($minDate, $maxDate) = parseDateInterval($word);
-					if ($minDate) {
-						$search .= 'AND e1.date >= ' . $minDate . ' ';
-					}
-					if ($maxDate) {
-						$search .= 'AND e1.date <= ' . $maxDate . ' ';
-					}
-				} else {
-					if ($word[0] === '#' && isset($word[1])) {
-						$search .= 'AND e1.tags LIKE ? ';
-						$values[] = '%' . $word .'%';
-					} else {
-						$search .= 'AND ' . $this->sqlconcat('e1.title', $this->isCompressed() ? 'UNCOMPRESS(content_bin)' : 'content') . ' LIKE ? ';
-						$values[] = '%' . $word .'%';
-					}
+		if ($filter instanceof FreshRSS_Search) {
+			if ($filter->getIntitle()) {
+				$search .= 'AND e1.title LIKE ? ';
+				$values[] = "%{$filter->getIntitle()}%";
+			}
+			if ($filter->getInurl()) {
+				$search .= 'AND CONCAT(e1.link, e1.guid) LIKE ? ';
+				$values[] = "%{$filter->getInurl()}%";
+			}
+			if ($filter->getAuthor()) {
+				$search .= 'AND e1.author LIKE ? ';
+				$values[] = "%{$filter->getAuthor()}%";
+			}
+			if ($filter->getMinDate()) {
+				$search .= 'AND e1.id >= ? ';
+				$values[] = "{$filter->getMinDate()}000000";
+			}
+			if ($filter->getMaxDate()) {
+				$search .= 'AND e1.id <= ?';
+				$values[] = "{$filter->getMaxDate()}000000";
+			}
+			if ($filter->getMinPubdate()) {
+				$search .= 'AND e1.date >= ? ';
+				$values[] = $filter->getMinPubdate();
+			}
+			if ($filter->getMaxPubdate()) {
+				$search .= 'AND e1.date <= ? ';
+				$values[] = $filter->getMaxPubdate();
+			}
+			if ($filter->getTags()) {
+				$tags = $filter->getTags();
+				foreach ($tags as $tag) {
+					$search .= 'AND e1.tags LIKE ? ';
+					$values[] = "%{$tag}%";
 				}
 			}
+			if ($filter->getSearch()) {
+				$search .= 'AND ' . $this->sqlconcat('e1.title', $this->isCompressed() ? 'UNCOMPRESS(content_bin)' : 'content') . ' LIKE ? ';
+				$values[] = "%{$filter->getSearch()}%";
+			}
 		}
 
 		return array($values,
-- 
cgit v1.2.3


From 50b6a02578c29c780e6fe36af712bdc7cfe81d3d Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 21 Feb 2015 09:42:06 -0500
Subject: Add search default raw value

Before, the default value was undefined. Now it always has a value even when no value is provided.
---
 app/Models/Search.php           | 2 +-
 tests/app/Models/SearchTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Search.php b/app/Models/Search.php
index a22e242af..85340ff13 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -11,7 +11,7 @@ require_once(LIB_PATH . '/lib_date.php');
 class FreshRSS_Search {
 
 	// This contains the user input string
-	private $raw_input;
+	private $raw_input = '';
 	// The following properties are extracted from the raw input
 	private $intitle;
 	private $min_date;
diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
index 20ea09433..9e3ca6765 100644
--- a/tests/app/Models/SearchTest.php
+++ b/tests/app/Models/SearchTest.php
@@ -10,7 +10,7 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function test__construct_whenInputIsEmpty_getsOnlyNullValues($input) {
 		$search = new FreshRSS_Search($input);
-		$this->assertNull($search->getRawInput());
+		$this->assertEquals('', $search->getRawInput());
 		$this->assertNull($search->getIntitle());
 		$this->assertNull($search->getMinDate());
 		$this->assertNull($search->getMaxDate());
-- 
cgit v1.2.3


From 74c020edc846d0afdecb05ae1e1f30a516dee002 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 21 Feb 2015 09:44:02 -0500
Subject: Add a default string representation

In some part of the code, the search is displayed as is and crash since there is no way to display the search object as a string.
---
 app/Models/Search.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Models/Search.php b/app/Models/Search.php
index 85340ff13..84688be2e 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -36,6 +36,10 @@ class FreshRSS_Search {
 		$input = $this->parseTagsSeach($input);
 		$this->search = $this->cleanSearch($input);
 	}
+	
+	public function __toString() {
+		return $this->getRawInput();
+	}
 
 	public function getRawInput() {
 		return $this->raw_input;
-- 
cgit v1.2.3


From e897afa7ccb2c625705bce25c003d9cf37179227 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 22 Feb 2015 17:38:33 -0500
Subject: Change test to verify if there is a filter

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

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 0cf4e1367..d2a8e0fd9 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -441,7 +441,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			$where .= 'AND e1.id >= ' . $date_min . '000000 ';
 		}
 		$search = '';
-		if ($filter instanceof FreshRSS_Search) {
+		if ($filter !== null) {
 			if ($filter->getIntitle()) {
 				$search .= 'AND e1.title LIKE ? ';
 				$values[] = "%{$filter->getIntitle()}%";
-- 
cgit v1.2.3


From fe24636e0416df4bb3507a0ac8cfe7e27d5b4c90 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 2 Mar 2015 20:27:15 -0500
Subject: Add missing white space

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

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index d2a8e0fd9..cf75a02c9 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -459,7 +459,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 				$values[] = "{$filter->getMinDate()}000000";
 			}
 			if ($filter->getMaxDate()) {
-				$search .= 'AND e1.id <= ?';
+				$search .= 'AND e1.id <= ? ';
 				$values[] = "{$filter->getMaxDate()}000000";
 			}
 			if ($filter->getMinPubdate()) {
-- 
cgit v1.2.3


From f3f8d73dda3c9882f383e721eb3cc47be5a6c706 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Tue, 3 Mar 2015 22:35:22 -0500
Subject: Fix API to use the search object

Since the internal of the listWhere method was changed, the API wasn't working. It was still calling the method with the old parameters.
I didn't test it but now, it should work.
---
 p/api/greader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index ab1a02244..060aa45ee 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -371,7 +371,7 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex
 	}
 
 	$entryDAO = FreshRSS_Factory::createEntryDao();
-	$entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, '', $start_time);
+	$entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, new FreshRSS_Search(''), $start_time);
 
 	$items = array();
 	foreach ($entries as $entry) {
-- 
cgit v1.2.3


From d1c9378d338027e39174fecb5f7a047218ad2113 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 4 Mar 2015 23:04:12 -0500
Subject: Fix entry DAO query usage

I did not fix the call in the previous commit. I hope this one is the last change needed.

We definitely need a templating engine so we could use the same controller to output different things.
This will remove code duplication between the api and the web interface.
It will allows us to build other type of api, and also refactor the rss feed as a different view of the same dataset.
---
 p/api/greader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 060aa45ee..4554a3f9c 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -465,7 +465,7 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 	}
 
 	$entryDAO = FreshRSS_Factory::createEntryDao();
-	$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', '', $start_time);
+	$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', new FreshRSS_Search(''), $start_time);
 
 	$itemRefs = array();
 	foreach ($ids as $id) {
-- 
cgit v1.2.3


From aacd1ffd4052b04c724c2783b3ee2845ca4ada35 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 4 Mar 2015 23:32:20 -0500
Subject: Refactor exceptions

I removed unnecessary constructors and unnecessary inheritance
---
 app/Exceptions/BadUrlException.php        | 5 ++++-
 app/Exceptions/ContextException.php       | 6 ++----
 app/Exceptions/EntriesGetterException.php | 6 ++----
 app/Exceptions/FeedException.php          | 7 +++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php
index 59574e1e5..406efb9b3 100644
--- a/app/Exceptions/BadUrlException.php
+++ b/app/Exceptions/BadUrlException.php
@@ -1,6 +1,9 @@
 <?php
-class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
+
+class FreshRSS_BadUrl_Exception extends \Exception {
+
 	public function __construct($url) {
 		parent::__construct('`' . $url . '` is not a valid URL');
 	}
+
 }
diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
index 357751b7c..8f05eccd6 100644
--- a/app/Exceptions/ContextException.php
+++ b/app/Exceptions/ContextException.php
@@ -3,8 +3,6 @@
 /**
  * An exception raised when a context is invalid
  */
-class FreshRSS_Context_Exception extends Exception {
-	public function __construct($message) {
-		parent::__construct($message);
-	}
+class FreshRSS_Context_Exception extends \Exception {
+
 }
diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
index 5f47c830b..8aace1840 100644
--- a/app/Exceptions/EntriesGetterException.php
+++ b/app/Exceptions/EntriesGetterException.php
@@ -1,7 +1,5 @@
 <?php
 
-class FreshRSS_EntriesGetter_Exception extends Exception {
-	public function __construct($message) {
-		parent::__construct($message);
-	}
+class FreshRSS_EntriesGetter_Exception extends \Exception {
+
 }
diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
index 2433b3964..6c0cb3755 100644
--- a/app/Exceptions/FeedException.php
+++ b/app/Exceptions/FeedException.php
@@ -1,6 +1,5 @@
 <?php
-class FreshRSS_Feed_Exception extends Exception {
-	public function __construct($message) {
-		parent::__construct($message);
-	}
+
+class FreshRSS_Feed_Exception extends \Exception {
+
 }
-- 
cgit v1.2.3


From 32c439a5d6ae18249ce739a0b859a1c766510d1c Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Thu, 5 Mar 2015 06:51:16 -0500
Subject: Revert inheritance

As I do not have the time at the moment to verify the change of inheritance, I changed it back to the original.
---
 app/Exceptions/BadUrlException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php
index 406efb9b3..d2509e4ba 100644
--- a/app/Exceptions/BadUrlException.php
+++ b/app/Exceptions/BadUrlException.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_BadUrl_Exception extends \Exception {
+class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
 
 	public function __construct($url) {
 		parent::__construct('`' . $url . '` is not a valid URL');
-- 
cgit v1.2.3


From 5b90e1f4a0057aa78fd7d8d4d748b01676ec9073 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 1 Mar 2015 09:18:06 -0500
Subject: Introduce user queries objects

There is now an object to manipulate user queries. It allows to move logic to handle those from the view and the controller in the model.
Thus making the view and the controller easier to read.
I introduced a new interface to start using dependency injection. There is still some rough edges but we are moving in the right direction.
The new object is fully tested but it still need some improvements, for instance, it is still tied to the search object.
There might be a better way to do that.
---
 app/Controllers/configureController.php |  83 +++---------
 app/Exceptions/DAOException.php         |   5 +
 app/Models/CategoryDAO.php              |   2 +-
 app/Models/ConfigurationSetter.php      |   7 +-
 app/Models/EntryDAO.php                 |   2 +-
 app/Models/FeedDAO.php                  |   2 +-
 app/Models/Searchable.php               |   6 +
 app/Models/UserQuery.php                | 226 +++++++++++++++++++++++++++++++
 app/views/configure/queries.phtml       |  47 +++----
 tests/app/Models/UserQueryTest.php      | 229 ++++++++++++++++++++++++++++++++
 10 files changed, 505 insertions(+), 104 deletions(-)
 create mode 100644 app/Exceptions/DAOException.php
 create mode 100644 app/Models/Searchable.php
 create mode 100644 app/Models/UserQuery.php
 create mode 100644 tests/app/Models/UserQueryTest.php

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 38ccd2b2d..fc92aa0c2 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -241,13 +241,16 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * checking if categories and feeds are still in use.
 	 */
 	public function queriesAction() {
+		$category_dao = new FreshRSS_CategoryDAO();
+		$feed_dao = FreshRSS_Factory::createFeedDao();
 		if (Minz_Request::isPost()) {
-			$queries = Minz_Request::param('queries', array());
+			$params = Minz_Request::param('queries', array());
 
-			foreach ($queries as $key => $query) {
+			foreach ($params as $key => $query) {
 				if (!$query['name']) {
 					$query['name'] = _t('conf.query.number', $key + 1);
 				}
+				$queries[] = new FreshRSS_UserQuery($query, $feed_dao, $category_dao);
 			}
 			FreshRSS_Context::$user_conf->queries = $queries;
 			FreshRSS_Context::$user_conf->save();
@@ -255,62 +258,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'queries'));
 		} else {
-			$this->view->query_get = array();
-			$cat_dao = new FreshRSS_CategoryDAO();
-			$feed_dao = FreshRSS_Factory::createFeedDao();
+			$this->view->queries = array();
 			foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
-				if (!isset($query['get'])) {
-					continue;
-				}
-
-				switch ($query['get'][0]) {
-				case 'c':
-					$category = $cat_dao->searchById(substr($query['get'], 2));
-
-					$deprecated = true;
-					$cat_name = '';
-					if ($category) {
-						$cat_name = $category->name();
-						$deprecated = false;
-					}
-
-					$this->view->query_get[$key] = array(
-						'type' => 'category',
-						'name' => $cat_name,
-						'deprecated' => $deprecated,
-					);
-					break;
-				case 'f':
-					$feed = $feed_dao->searchById(substr($query['get'], 2));
-
-					$deprecated = true;
-					$feed_name = '';
-					if ($feed) {
-						$feed_name = $feed->name();
-						$deprecated = false;
-					}
-
-					$this->view->query_get[$key] = array(
-						'type' => 'feed',
-						'name' => $feed_name,
-						'deprecated' => $deprecated,
-					);
-					break;
-				case 's':
-					$this->view->query_get[$key] = array(
-						'type' => 'favorite',
-						'name' => 'favorite',
-						'deprecated' => false,
-					);
-					break;
-				case 'a':
-					$this->view->query_get[$key] = array(
-						'type' => 'all',
-						'name' => 'all',
-						'deprecated' => false,
-					);
-					break;
-				}
+				$this->view->queries[$key] = new FreshRSS_UserQuery($query, $feed_dao, $category_dao);
 			}
 		}
 
@@ -325,16 +275,17 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * lean data.
 	 */
 	public function addQueryAction() {
-		$whitelist = array('get', 'order', 'name', 'search', 'state');
-		$queries = FreshRSS_Context::$user_conf->queries;
-		$query = Minz_Request::params();
-		$query['name'] = _t('conf.query.number', count($queries) + 1);
-		foreach ($query as $key => $value) {
-			if (!in_array($key, $whitelist)) {
-				unset($query[$key]);
-			}
+		$category_dao = new FreshRSS_CategoryDAO();
+		$feed_dao = FreshRSS_Factory::createFeedDao();
+		$queries = array();
+		foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
+			$queries[$key] = new FreshRSS_UserQuery($query, $feed_dao, $category_dao);
 		}
-		$queries[] = $query;
+		$params = Minz_Request::params();
+		$params['url'] = Minz_Url::display(array('params' => $params));
+		$params['name'] = _t('conf.query.number', count($queries) + 1);
+		$queries[] = new FreshRSS_UserQuery($params, $feed_dao, $category_dao);
+
 		FreshRSS_Context::$user_conf->queries = $queries;
 		FreshRSS_Context::$user_conf->save();
 
diff --git a/app/Exceptions/DAOException.php b/app/Exceptions/DAOException.php
new file mode 100644
index 000000000..6bd8f4ff0
--- /dev/null
+++ b/app/Exceptions/DAOException.php
@@ -0,0 +1,5 @@
+<?php
+
+class FreshRSS_DAOException extends \Exception {
+
+}
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 27a558522..4eee226ba 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_CategoryDAO extends Minz_ModelPdo {
+class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable{
 	public function addCategory($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'category`(name) VALUES(?)';
 		$stm = $this->bd->prepare($sql);
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index eeb1f2f4c..d7689752f 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -117,12 +117,7 @@ class FreshRSS_ConfigurationSetter {
 	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;
+			$data['queries'][] = $value->toArray();
 		}
 	}
 
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index cf75a02c9..b8a1a43b0 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_EntryDAO extends Minz_ModelPdo {
+class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable{
 
 	public function isCompressed() {
 		return parent::$sharedDbType !== 'sqlite';
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 74597c730..e8b07acbd 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_FeedDAO extends Minz_ModelPdo {
+class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable{
 	public function addFeed($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history, ttl) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2, -2)';
 		$stm = $this->bd->prepare($sql);
diff --git a/app/Models/Searchable.php b/app/Models/Searchable.php
new file mode 100644
index 000000000..d5bcea49d
--- /dev/null
+++ b/app/Models/Searchable.php
@@ -0,0 +1,6 @@
+<?php
+
+interface FreshRSS_Searchable {
+
+	public function searchById($id);
+}
diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php
new file mode 100644
index 000000000..754b6996b
--- /dev/null
+++ b/app/Models/UserQuery.php
@@ -0,0 +1,226 @@
+<?php
+
+/**
+ * Contains the description of a user query
+ *
+ * It allows to extract the meaningful bits of the query to be manipulated in an
+ * easy way.
+ */
+class FreshRSS_UserQuery {
+
+	private $deprecated = false;
+	private $get;
+	private $get_name;
+	private $get_type;
+	private $name;
+	private $order;
+	private $search;
+	private $state;
+	private $url;
+	private $feed_dao;
+	private $category_dao;
+
+	/**
+	 * @param array $query
+	 * @param FreshRSS_Searchable $feed_dao
+	 * @param FreshRSS_Searchable $category_dao
+	 */
+	public function __construct($query, FreshRSS_Searchable $feed_dao = null, FreshRSS_Searchable $category_dao = null) {
+		$this->category_dao = $category_dao;
+		$this->feed_dao = $feed_dao;
+		if (isset($query['get'])) {
+			$this->parseGet($query['get']);
+		}
+		if (isset($query['name'])) {
+			$this->name = $query['name'];
+		}
+		if (isset($query['order'])) {
+			$this->order = $query['order'];
+		}
+		if (!isset($query['search'])) {
+			$query['search'] = '';
+		}
+		// linked to deeply with the search object, need to use dependency injection
+		$this->search = new FreshRSS_Search($query['search']);
+		if (isset($query['state'])) {
+			$this->state = $query['state'];
+		}
+		if (isset($query['url'])) {
+			$this->url = $query['url'];
+		}
+	}
+
+	/**
+	 * Convert the current object to an array.
+	 *
+	 * @return array
+	 */
+	public function toArray() {
+		return array_filter(array(
+		    'get' => $this->get,
+		    'name' => $this->name,
+		    'order' => $this->order,
+		    'search' => $this->search->__toString(),
+		    'state' => $this->state,
+		    'url' => $this->url,
+		));
+	}
+
+	/**
+	 * Parse the get parameter in the query string to extract its name and
+	 * type
+	 *
+	 * @param string $get
+	 */
+	private function parseGet($get) {
+		$this->get = $get;
+		if (preg_match('/(?P<type>[acfs])(_(?P<id>\d+))?/', $get, $matches)) {
+			switch ($matches['type']) {
+				case 'a':
+					$this->parseAll();
+					break;
+				case 'c':
+					$this->parseCategory($matches['id']);
+					break;
+				case 'f':
+					$this->parseFeed($matches['id']);
+					break;
+				case 's':
+					$this->parseFavorite();
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse the query string when it is an "all" query
+	 */
+	private function parseAll() {
+		$this->get_name = 'all';
+		$this->get_type = 'all';
+	}
+
+	/**
+	 * Parse the query string when it is a "category" query
+	 *
+	 * @param integer $id
+	 * @throws FreshRSS_DAOException
+	 */
+	private function parseCategory($id) {
+		if (is_null($this->category_dao)) {
+			throw new FreshRSS_DAOException('Category DAO is not loaded i UserQuery');
+		}
+		$category = $this->category_dao->searchById($id);
+		if ($category) {
+			$this->get_name = $category->name();
+		} else {
+			$this->deprecated = true;
+		}
+		$this->get_type = 'category';
+	}
+
+	/**
+	 * Parse the query string when it is a "feed" query
+	 *
+	 * @param integer $id
+	 * @throws FreshRSS_DAOException
+	 */
+	private function parseFeed($id) {
+		if (is_null($this->feed_dao)) {
+			throw new FreshRSS_DAOException('Feed DAO is not loaded i UserQuery');
+		}
+		$feed = $this->feed_dao->searchById($id);
+		if ($feed) {
+			$this->get_name = $feed->name();
+		} else {
+			$this->deprecated = true;
+		}
+		$this->get_type = 'feed';
+	}
+
+	/**
+	 * Parse the query string when it is a "favorite" query
+	 */
+	private function parseFavorite() {
+		$this->get_name = 'favorite';
+		$this->get_type = 'favorite';
+	}
+
+	/**
+	 * Check if the current user query is deprecated.
+	 * It is deprecated if the category or the feed used in the query are
+	 * not existing.
+	 *
+	 * @return boolean
+	 */
+	public function isDeprecated() {
+		return $this->deprecated;
+	}
+
+	/**
+	 * Check if the user query has parameters.
+	 * If the type is 'all', it is considered equal to no parameters
+	 *
+	 * @return boolean
+	 */
+	public function hasParameters() {
+		if ($this->get_type === 'all') {
+			return false;
+		}
+		if ($this->hasSearch()) {
+			return true;
+		}
+		if ($this->state) {
+			return true;
+		}
+		if ($this->order) {
+			return true;
+		}
+		if ($this->get) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Check if there is a search in the search object
+	 *
+	 * @return boolean
+	 */
+	public function hasSearch() {
+		return $this->search->getRawInput() != "";
+	}
+
+	public function getGet() {
+		return $this->get;
+	}
+
+	public function getGetName() {
+		return $this->get_name;
+	}
+
+	public function getGetType() {
+		return $this->get_type;
+	}
+
+	public function getName() {
+		return $this->name;
+	}
+
+	public function getOrder() {
+		return $this->order;
+	}
+
+	public function getSearch() {
+		return $this->search;
+	}
+
+	public function getState() {
+		return $this->state;
+	}
+
+	public function getUrl() {
+		return $this->url;
+	}
+
+}
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index 5f449deb3..69efcf365 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -6,27 +6,28 @@
 	<form method="post" action="<?php echo _url('configure', 'queries'); ?>">
 		<legend><?php echo _t('conf.query'); ?></legend>
 
-		<?php foreach (FreshRSS_Context::$user_conf->queries as $key => $query) { ?>
+		<?php foreach ($this->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); ?>
 			</label>
 
 			<div class="group-controls">
-				<input type="hidden" id="queries_<?php echo $key; ?>_search" name="queries[<?php echo $key; ?>][search]" value="<?php echo isset($query['search']) ? $query['search'] : ""; ?>"/>
-				<input type="hidden" id="queries_<?php echo $key; ?>_state" name="queries[<?php echo $key; ?>][state]" value="<?php echo isset($query['state']) ? $query['state'] : ""; ?>"/>
-				<input type="hidden" id="queries_<?php echo $key; ?>_order" name="queries[<?php echo $key; ?>][order]" value="<?php echo isset($query['order']) ? $query['order'] : ""; ?>"/>
-				<input type="hidden" id="queries_<?php echo $key; ?>_get" name="queries[<?php echo $key; ?>][get]" value="<?php echo isset($query['get']) ? $query['get'] : ""; ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_search" name="queries[<?php echo $key; ?>][url]" value="<?php echo $query->getUrl(); ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_search" name="queries[<?php echo $key; ?>][search]" value="<?php echo $query->getSearch(); ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_state" name="queries[<?php echo $key; ?>][state]" value="<?php echo $query->getState(); ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_order" name="queries[<?php echo $key; ?>][order]" value="<?php echo $query->getOrder(); ?>"/>
+				<input type="hidden" id="queries_<?php echo $key; ?>_get" name="queries[<?php echo $key; ?>][get]" value="<?php echo $query->getGet(); ?>"/>
 
 				<div class="stick">
 					<input class="extend"
 					       type="text"
 					       id="queries_<?php echo $key; ?>_name"
 					       name="queries[<?php echo $key; ?>][name]"
-					       value="<?php echo $query['name']; ?>"
+					       value="<?php echo $query->getName(); ?>"
 					/>
 
-					<a class="btn" href="<?php echo $query['url']; ?>">
+					<a class="btn" href="<?php echo $query->getUrl(); ?>">
 						<?php echo _i('link'); ?>
 					</a>
 
@@ -35,23 +36,11 @@
 					</a>
 				</div>
 
-				<?php
-					$exist = (isset($query['search']) ? 1 : 0)
-						   + (isset($query['state']) ? 1 : 0)
-						   + (isset($query['order']) ? 1 : 0)
-						   + (isset($query['get']) ? 1 : 0);
-					// If the only filter is "all" articles, we consider there is no filter
-					$exist = ($exist === 1 && isset($query['get']) && $query['get'] === 'a') ? 0 : $exist;
-
-					$deprecated = (isset($this->query_get[$key]) &&
-					               $this->query_get[$key]['deprecated']);
-				?>
-
-				<?php if ($exist === 0) { ?>
+				<?php if (!$query->hasParameters()) { ?>
 				<div class="alert alert-warn">
 					<div class="alert-head"><?php echo _t('conf.query.no_filter'); ?></div>
 				</div>
-				<?php } elseif ($deprecated) { ?>
+				<?php } elseif ($query->isDeprecated()) { ?>
 				<div class="alert alert-error">
 					<div class="alert-head"><?php echo _t('conf.query.deprecated'); ?></div>
 				</div>
@@ -60,20 +49,20 @@
 					<div class="alert-head"><?php echo _t('conf.query.filter'); ?></div>
 
 					<ul>
-						<?php if (isset($query['search'])) { ?>
-						<li class="item"><?php echo _t('conf.query.search', $query['search']); ?></li>
+						<?php if ($query->hasSearch()) { ?>
+						<li class="item"><?php echo _t('conf.query.search', $query->getSearch()->getRawInput()); ?></li>
 						<?php } ?>
 
-						<?php if (isset($query['state'])) { ?>
-						<li class="item"><?php echo _t('conf.query.state_' . $query['state']); ?></li>
+						<?php if ($query->getState()) { ?>
+						<li class="item"><?php echo _t('conf.query.state_' . $query->getState()); ?></li>
 						<?php } ?>
 
-						<?php if (isset($query['order'])) { ?>
-						<li class="item"><?php echo _t('conf.query.order_' . strtolower($query['order'])); ?></li>
+						<?php if ($query->getOrder()) { ?>
+						<li class="item"><?php echo _t('conf.query.order_' . strtolower($query->getOrder())); ?></li>
 						<?php } ?>
 
-						<?php if (isset($query['get'])) { ?>
-						<li class="item"><?php echo _t('conf.query.get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
+						<?php if ($query->getGet()) { ?>
+						<li class="item"><?php echo _t('conf.query.get_' . $query->getGetType(), $query->getGetName()); ?></li>
 						<?php } ?>
 					</ul>
 				</div>
diff --git a/tests/app/Models/UserQueryTest.php b/tests/app/Models/UserQueryTest.php
new file mode 100644
index 000000000..2234be6e1
--- /dev/null
+++ b/tests/app/Models/UserQueryTest.php
@@ -0,0 +1,229 @@
+<?php
+
+/**
+ * Description of UserQueryTest
+ */
+class UserQueryTest extends \PHPUnit_Framework_TestCase {
+
+	public function test__construct_whenAllQuery_storesAllParameters() {
+		$query = array('get' => 'a');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals('all', $user_query->getGetName());
+		$this->assertEquals('all', $user_query->getGetType());
+	}
+
+	public function test__construct_whenFavoriteQuery_storesFavoriteParameters() {
+		$query = array('get' => 's');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals('favorite', $user_query->getGetName());
+		$this->assertEquals('favorite', $user_query->getGetType());
+	}
+
+	/**
+	 * @expectedException Exceptions/FreshRSS_DAOException
+	 * @expectedExceptionMessage Category DAO is not loaded in UserQuery
+	 */
+	public function test__construct_whenCategoryQueryAndNoDao_throwsException() {
+		$this->markTestIncomplete('There is a problem with the exception autoloading. We need to make a better autoloading process');
+		$query = array('get' => 'c_1');
+		new FreshRSS_UserQuery($query);
+	}
+
+	public function test__construct_whenCategoryQuery_storesCategoryParameters() {
+		$category_name = 'some category name';
+		$cat = $this->getMock('FreshRSS_Category');
+		$cat->expects($this->atLeastOnce())
+		    ->method('name')
+		    ->withAnyParameters()
+		    ->willReturn($category_name);
+		$cat_dao = $this->getMock('FreshRSS_Searchable');
+		$cat_dao->expects($this->atLeastOnce())
+		    ->method('searchById')
+		    ->withAnyParameters()
+		    ->willReturn($cat);
+		$query = array('get' => 'c_1');
+		$user_query = new FreshRSS_UserQuery($query, null, $cat_dao);
+		$this->assertEquals($category_name, $user_query->getGetName());
+		$this->assertEquals('category', $user_query->getGetType());
+	}
+
+	/**
+	 * @expectedException Exceptions/FreshRSS_DAOException
+	 * @expectedExceptionMessage Feed DAO is not loaded in UserQuery
+	 */
+	public function test__construct_whenFeedQueryAndNoDao_throwsException() {
+		$this->markTestIncomplete('There is a problem with the exception autoloading. We need to make a better autoloading process');
+		$query = array('get' => 'c_1');
+		new FreshRSS_UserQuery($query);
+	}
+
+	public function test__construct_whenFeedQuery_storesFeedParameters() {
+		$feed_name = 'some feed name';
+		$feed = $this->getMock('FreshRSS_Feed', array(), array('', false));
+		$feed->expects($this->atLeastOnce())
+		    ->method('name')
+		    ->withAnyParameters()
+		    ->willReturn($feed_name);
+		$feed_dao = $this->getMock('FreshRSS_Searchable');
+		$feed_dao->expects($this->atLeastOnce())
+		    ->method('searchById')
+		    ->withAnyParameters()
+		    ->willReturn($feed);
+		$query = array('get' => 'f_1');
+		$user_query = new FreshRSS_UserQuery($query, $feed_dao, null);
+		$this->assertEquals($feed_name, $user_query->getGetName());
+		$this->assertEquals('feed', $user_query->getGetType());
+	}
+
+	public function test__construct_whenUnknownQuery_doesStoreParameters() {
+		$query = array('get' => 'q');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertNull($user_query->getGetName());
+		$this->assertNull($user_query->getGetType());
+	}
+
+	public function test__construct_whenName_storesName() {
+		$name = 'some name';
+		$query = array('name' => $name);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($name, $user_query->getName());
+	}
+
+	public function test__construct_whenOrder_storesOrder() {
+		$order = 'some order';
+		$query = array('order' => $order);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($order, $user_query->getOrder());
+	}
+
+	public function test__construct_whenState_storesState() {
+		$state = 'some state';
+		$query = array('state' => $state);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($state, $user_query->getState());
+	}
+
+	public function test__construct_whenUrl_storesUrl() {
+		$url = 'some url';
+		$query = array('url' => $url);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($url, $user_query->getUrl());
+	}
+
+	public function testToArray_whenNoData_returnsEmptyArray() {
+		$user_query = new FreshRSS_UserQuery(array());
+		$this->assertInternalType('array', $user_query->toArray());
+		$this->assertCount(0, $user_query->toArray());
+	}
+
+	public function testToArray_whenData_returnsArray() {
+		$query = array(
+		    'get' => 's',
+		    'name' => 'some name',
+		    'order' => 'some order',
+		    'search' => 'some search',
+		    'state' => 'some state',
+		    'url' => 'some url',
+		);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertInternalType('array', $user_query->toArray());
+		$this->assertCount(6, $user_query->toArray());
+		$this->assertEquals($query, $user_query->toArray());
+	}
+
+	public function testHasSearch_whenSearch_returnsTrue() {
+		$query = array(
+		    'search' => 'some search',
+		);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertTrue($user_query->hasSearch());
+	}
+
+	public function testHasSearch_whenNoSearch_returnsFalse() {
+		$user_query = new FreshRSS_UserQuery(array());
+		$this->assertFalse($user_query->hasSearch());
+	}
+
+	public function testHasParameters_whenAllQuery_returnsFalse() {
+		$query = array('get' => 'a');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->hasParameters());
+	}
+
+	public function testHasParameters_whenNoParameter_returnsFalse() {
+		$query = array();
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->hasParameters());
+	}
+
+	public function testHasParameters_whenParameter_returnTrue() {
+		$query = array('get' => 's');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertTrue($user_query->hasParameters());
+	}
+
+	public function testIsDeprecated_whenCategoryExists_returnFalse() {
+		$cat = $this->getMock('FreshRSS_Category');
+		$cat_dao = $this->getMock('FreshRSS_Searchable');
+		$cat_dao->expects($this->atLeastOnce())
+		    ->method('searchById')
+		    ->withAnyParameters()
+		    ->willReturn($cat);
+		$query = array('get' => 'c_1');
+		$user_query = new FreshRSS_UserQuery($query, null, $cat_dao);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenCategoryDoesNotExist_returnTrue() {
+		$cat_dao = $this->getMock('FreshRSS_Searchable');
+		$cat_dao->expects($this->atLeastOnce())
+		    ->method('searchById')
+		    ->withAnyParameters()
+		    ->willReturn(null);
+		$query = array('get' => 'c_1');
+		$user_query = new FreshRSS_UserQuery($query, null, $cat_dao);
+		$this->assertTrue($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenFeedExists_returnFalse() {
+		$feed = $this->getMock('FreshRSS_Feed', array(), array('', false));
+		$feed_dao = $this->getMock('FreshRSS_Searchable');
+		$feed_dao->expects($this->atLeastOnce())
+		    ->method('searchById')
+		    ->withAnyParameters()
+		    ->willReturn($feed);
+		$query = array('get' => 'f_1');
+		$user_query = new FreshRSS_UserQuery($query, $feed_dao, null);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenFeedDoesNotExist_returnTrue() {
+		$feed_dao = $this->getMock('FreshRSS_Searchable');
+		$feed_dao->expects($this->atLeastOnce())
+		    ->method('searchById')
+		    ->withAnyParameters()
+		    ->willReturn(null);
+		$query = array('get' => 'f_1');
+		$user_query = new FreshRSS_UserQuery($query, $feed_dao, null);
+		$this->assertTrue($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenAllQuery_returnFalse() {
+		$query = array('get' => 'a');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenFavoriteQuery_returnFalse() {
+		$query = array('get' => 's');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenUnknownQuery_returnFalse() {
+		$query = array('get' => 'q');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+}
-- 
cgit v1.2.3


From 96d5d9d034daadb2357f27b3763854b647f2086c Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Thu, 5 Mar 2015 06:45:00 -0500
Subject: Fix DAO exception

Change the name and messages
---
 app/Exceptions/DAOException.php    | 2 +-
 app/Models/UserQuery.php           | 8 ++++----
 tests/app/Models/UserQueryTest.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Exceptions/DAOException.php b/app/Exceptions/DAOException.php
index 6bd8f4ff0..e48e521ab 100644
--- a/app/Exceptions/DAOException.php
+++ b/app/Exceptions/DAOException.php
@@ -1,5 +1,5 @@
 <?php
 
-class FreshRSS_DAOException extends \Exception {
+class FreshRSS_DAO_Exception extends \Exception {
 
 }
diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php
index 754b6996b..52747f538 100644
--- a/app/Models/UserQuery.php
+++ b/app/Models/UserQuery.php
@@ -104,11 +104,11 @@ class FreshRSS_UserQuery {
 	 * Parse the query string when it is a "category" query
 	 *
 	 * @param integer $id
-	 * @throws FreshRSS_DAOException
+	 * @throws FreshRSS_DAO_Exception
 	 */
 	private function parseCategory($id) {
 		if (is_null($this->category_dao)) {
-			throw new FreshRSS_DAOException('Category DAO is not loaded i UserQuery');
+			throw new FreshRSS_DAO_Exception('Category DAO is not loaded in UserQuery');
 		}
 		$category = $this->category_dao->searchById($id);
 		if ($category) {
@@ -123,11 +123,11 @@ class FreshRSS_UserQuery {
 	 * Parse the query string when it is a "feed" query
 	 *
 	 * @param integer $id
-	 * @throws FreshRSS_DAOException
+	 * @throws FreshRSS_DAO_Exception
 	 */
 	private function parseFeed($id) {
 		if (is_null($this->feed_dao)) {
-			throw new FreshRSS_DAOException('Feed DAO is not loaded i UserQuery');
+			throw new FreshRSS_DAO_Exception('Feed DAO is not loaded in UserQuery');
 		}
 		$feed = $this->feed_dao->searchById($id);
 		if ($feed) {
diff --git a/tests/app/Models/UserQueryTest.php b/tests/app/Models/UserQueryTest.php
index 2234be6e1..a0928d5ae 100644
--- a/tests/app/Models/UserQueryTest.php
+++ b/tests/app/Models/UserQueryTest.php
@@ -20,7 +20,7 @@ class UserQueryTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException Exceptions/FreshRSS_DAOException
+	 * @expectedException Exceptions/FreshRSS_DAO_Exception
 	 * @expectedExceptionMessage Category DAO is not loaded in UserQuery
 	 */
 	public function test__construct_whenCategoryQueryAndNoDao_throwsException() {
@@ -48,7 +48,7 @@ class UserQueryTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException Exceptions/FreshRSS_DAOException
+	 * @expectedException Exceptions/FreshRSS_DAO_Exception
 	 * @expectedExceptionMessage Feed DAO is not loaded in UserQuery
 	 */
 	public function test__construct_whenFeedQueryAndNoDao_throwsException() {
-- 
cgit v1.2.3


From 24f6c1eabb4cea941e40307c2f732c0ca384ffd2 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Thu, 5 Mar 2015 06:47:13 -0500
Subject: Fix spacing

---
 app/Models/CategoryDAO.php | 2 +-
 app/Models/EntryDAO.php    | 2 +-
 app/Models/FeedDAO.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 4eee226ba..189a5f0e4 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable{
+class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	public function addCategory($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'category`(name) VALUES(?)';
 		$stm = $this->bd->prepare($sql);
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index b8a1a43b0..9736d5cd3 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable{
+class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 	public function isCompressed() {
 		return parent::$sharedDbType !== 'sqlite';
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index e8b07acbd..f48beee6e 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable{
+class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	public function addFeed($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history, ttl) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2, -2)';
 		$stm = $this->bd->prepare($sql);
-- 
cgit v1.2.3


From dd4fb519be801254a8aa9baedb2a7f87dd608f2b Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 14 Mar 2015 09:43:08 -0400
Subject: Add an unsaved changes alert on config pages

Before, you could leave a configuration page without knowing if you saved your changes or not.
Now, there is an alert poping up if you have unsaved changes. It will ask you if you want to stay on the page and save your changes or leave the page and loose your changes.

See #739
---
 app/views/auth/index.phtml          | 12 ++++++------
 app/views/configure/archiving.phtml |  6 +++---
 app/views/configure/display.phtml   | 28 ++++++++++++++--------------
 app/views/configure/queries.phtml   |  1 +
 app/views/configure/reading.phtml   | 34 +++++++++++++++++-----------------
 app/views/configure/sharing.phtml   |  4 ++--
 app/views/configure/shortcut.phtml  | 28 ++++++++++++++--------------
 p/scripts/main.js                   | 28 ++++++++++++++++++++++++++++
 8 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index f7a862ac9..8e4df8c2c 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -9,7 +9,7 @@
 		<div class="form-group">
 			<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">
+				<select id="auth_type" name="auth_type" required="required" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->auth_type; ?>">
 					<?php if (!in_array(FreshRSS_Context::$system_conf->auth_type, array('form', 'persona', 'http_auth', 'none'))) { ?>
 						<option selected="selected"></option>
 					<?php } ?>
@@ -25,7 +25,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="anon_access">
 					<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"'; ?> />
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?php echo FreshRSS_Context::$system_conf->allow_anonymous; ?>"/>
 					<?php echo _t('admin.auth.allow_anonymous', FreshRSS_Context::$system_conf->default_user); ?>
 				</label>
 			</div>
@@ -35,7 +35,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="anon_refresh">
 					<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"'; ?> />
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?php echo FreshRSS_Context::$system_conf->allow_anonymous_refresh; ?>"/>
 					<?php echo _t('admin.auth.allow_anonymous_refresh'); ?>
 				</label>
 			</div>
@@ -45,7 +45,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="unsafe_autologin">
 					<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"'; ?> />
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?php echo FreshRSS_Context::$system_conf->unsafe_autologin_enabled; ?>"/>
 					<?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>
@@ -58,7 +58,7 @@
 			<?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 FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
+					echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?php echo $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>
@@ -69,7 +69,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="api_enabled">
 					<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"'; ?> />
+						FreshRSS_Auth::accessNeedsLogin() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?php echo FreshRSS_Context::$system_conf->api_enabled; ?>"/>
 					<?php echo _t('admin.auth.api_enabled'); ?>
 				</label>
 			</div>
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 875463137..52ee98a48 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -10,14 +10,14 @@
 		<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::$user_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; ?>" data-leave-validation="<?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>
 		<div class="form-group">
 			<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
+				<select class="number" name="keep_history_default" id="keep_history_default" required="required" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->keep_history_default; ?>"><?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::$user_conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
@@ -27,7 +27,7 @@
 		<div class="form-group">
 			<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
+				<select class="number" name="ttl_default" id="ttl_default" required="required" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->ttl_default; ?>"><?php
 					$found = false;
 					foreach (array(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',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 02249bc55..91b0b8189 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -9,7 +9,7 @@
 		<div class="form-group">
 			<label class="group-name" for="language"><?php echo _t('conf.display.language'); ?></label>
 			<div class="group-controls">
-				<select name="language" id="language">
+				<select name="language" id="language" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->language; ?>">
 				<?php $languages = Minz_Translate::availableLanguages(); ?>
 				<?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>
@@ -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::$user_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'] ?>" data-leave-validation="<?php echo (FreshRSS_Context::$user_conf->theme === $theme['id']) ? 1 : 0; ?>"/>
 						<li class="slide-container">
 							<div class="slide">
 								<img src="<?php echo Minz_Url::display('/themes/' . $theme['id'] . '/thumbs/original.png')?>"/>
@@ -53,7 +53,7 @@
 		<div class="form-group">
 			<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="">
+				<select name="content_width" id="content_width" required="" data-leave-validation="<?php echo $width; ?>">
 					<option value="thin" <?php echo $width === 'thin'? 'selected="selected"' : ''; ?>>
 						<?php echo _t('conf.display.width.thin'); ?>
 					</option>
@@ -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::$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" name="topline_read" value="1"<?php echo FreshRSS_Context::$user_conf->topline_read ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_read; ?>"/></td>
+						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->topline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_favorite; ?>"/></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::$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>
+						<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$user_conf->topline_date ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_date; ?>"/></td>
+						<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$user_conf->topline_link ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_link; ?>"/></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::$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>
+						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_read ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_read; ?>"/></td>
+						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_favorite; ?>"/></td>
+						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_sharing ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_sharing; ?>"/></td>
+						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_tags ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_tags; ?>"/></td>
+						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_date ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_date; ?>"/></td>
+						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_link ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_link; ?>"/></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::$user_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; ?>" data-leave-validation="<?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 69efcf365..50df4cfea 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -25,6 +25,7 @@
 					       id="queries_<?php echo $key; ?>_name"
 					       name="queries[<?php echo $key; ?>][name]"
 					       value="<?php echo $query->getName(); ?>"
+					       data-leave-validation="<?php echo $query->getName(); ?>"
 					/>
 
 					<a class="btn" href="<?php echo $query->getUrl(); ?>">
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 636671f14..8b123afa8 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::$user_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" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>"/>
 				<?php echo _i('help'); ?> <?php echo _t('conf.reading.number_divided_when_reader'); ?>
 			</div>
 		</div>
@@ -17,7 +17,7 @@
 		<div class="form-group">
 			<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">
+				<select name="sort_order" id="sort_order" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->sort_order; ?>">
 					<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>
@@ -27,7 +27,7 @@
 		<div class="form-group">
 			<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">
+				<select name="view_mode" id="view_mode" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->view_mode; ?>">
 					<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>
@@ -38,7 +38,7 @@
 		<div class="form-group">
 			<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">
+				<select name="default_view" id="default_view" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->default_view; ?>">
 					<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>
@@ -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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->hide_read_feeds; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->display_posts; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->display_categories; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->sticky_post; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->auto_load_more; ?>"/>
 					<?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::$user_conf->lazyload ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo FreshRSS_Context::$user_conf->lazyload ? ' checked="checked"' : ''; ?>  data-leave-validation="<?php echo FreshRSS_Context::$user_conf->lazyload; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->reading_confirm; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->auto_remove_article; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->mark_when['article']; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->mark_when['site']; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->mark_when['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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->mark_when['reception']; ?>"/>
 					<?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::$user_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"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->onread_jump_next; ?>"/>
 					<?php echo _t('conf.reading.jump_next'); ?>
 				</label>
 			</div>
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index deb1ed6b7..7bf435777 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -28,9 +28,9 @@
 				<div class="group-controls">
 					<input type='hidden' id='share_<?php echo $key; ?>_type' name="share[<?php echo $key; ?>][type]" value='<?php echo $share->type(); ?>' />
 					<div class="stick">
-						<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="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" data-leave-validation="<?php echo $share->name(); ?>"/>
 					<?php if ($share->formType() === 'advanced') { ?>
-						<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" />
+						<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" data-leave-validation="<?php echo $share->baseUrl(); ?>"/>
 					<?php } else { ?>
 						<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('gen.short.not_applicable'); ?>" size="64" disabled/>
 					<?php } ?>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index f68091af9..264a5f805 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -23,28 +23,28 @@
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?php echo $s['next_entry']; ?>" data-leave-validation="<?php echo $s['next_entry']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?php echo $s['prev_entry']; ?>" data-leave-validation="<?php echo $s['prev_entry']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="first_entry" name="shortcuts[first_entry]" list="keys" value="<?php echo $s['first_entry']; ?>" data-leave-validation="<?php echo $s['first_entry']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="last_entry" name="shortcuts[last_entry]" list="keys" value="<?php echo $s['last_entry']; ?>" data-leave-validation="<?php echo $s['last_entry']; ?>"/>
 			</div>
 		</div>
 
@@ -53,7 +53,7 @@
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?php echo $s['mark_read']; ?>" data-leave-validation="<?php echo $s['mark_read']; ?>"/>
 				<?php echo _t('conf.shortcut.shift_for_all_read'); ?>
 			</div>
 		</div>
@@ -61,21 +61,21 @@
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?php echo $s['mark_favorite']; ?>" data-leave-validation="<?php echo $s['mark_favorite']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?php echo $s['go_website']; ?>" data-leave-validation="<?php echo $s['go_website']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?php echo $s['auto_share']; ?>" data-leave-validation="<?php echo $s['auto_share']; ?>"/>
 				<?php echo _t('conf.shortcut.auto_share_help'); ?>
 			</div>
 		</div>
@@ -83,7 +83,7 @@
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?php echo $s['collapse_entry']; ?>" data-leave-validation="<?php echo $s['collapse_entry']; ?>"/>
 			</div>
 		</div>
 
@@ -92,21 +92,21 @@
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?php echo $s['load_more']; ?>" data-leave-validation="<?php echo $s['load_more']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="focus_search_shortcut" name="shortcuts[focus_search]" list="keys" value="<?php echo $s['focus_search']; ?>" data-leave-validation="<?php echo $s['focus_search']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="user_filter_shortcut" name="shortcuts[user_filter]" list="keys" value="<?php echo $s['user_filter']; ?>" data-leave-validation="<?php echo $s['user_filter']; ?>"/>
 				<?php echo _t('conf.shortcut.user_filter_help'); ?>
 			</div>
 		</div>
@@ -114,14 +114,14 @@
 		<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="close_dropdown" 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']; ?>" data-leave-validation="<?php echo $s['close_dropdown']; ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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']; ?>" />
+				<input type="text" id="help_shortcut" name="shortcuts[help]" list="keys" value="<?php echo $s['help']; ?>" data-leave-validation="<?php echo $s['help']; ?>"/>
 			</div>
 		</div>
 
diff --git a/p/scripts/main.js b/p/scripts/main.js
index b7c143cc1..eaf6067f7 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1229,6 +1229,33 @@ function init_slider_observers() {
 	});
 }
 
+function init_configuration_alert() {
+	$(window).on('beforeunload', function(e){
+		if (e.originalEvent.explicitOriginalTarget.type === 'submit') {
+			// we don't want an alert when submitting the form with the submit button
+			return;
+		}
+		if ($(e.originalEvent.explicitOriginalTarget).attr('data-leave-validation') !== undefined) {
+			// we don't want an alert when submitting the form by pressing the enter key
+			return;
+		}
+		var fields = $("[data-leave-validation]");
+		for (var i = 0; i < fields.length; i++) {
+			if ($(fields[i]).attr('type') === 'checkbox' || $(fields[i]).attr('type') === 'radio') {
+				// The use of != is done on purpose to check boolean against integer
+				if ($(fields[i]).is(':checked') != $(fields[i]).attr('data-leave-validation')) {
+					return false;
+				}
+			} else {
+				if ($(fields[i]).attr('data-leave-validation') !== $(fields[i]).val()) {
+					return false;
+				}
+			}
+		}
+		return;
+	});
+}
+
 function init_all() {
 	if (!(window.$ && window.context)) {
 		if (window.console) {
@@ -1260,6 +1287,7 @@ function init_all() {
 		init_password_observers();
 		init_stats_observers();
 		init_slider_observers();
+		init_configuration_alert();
 	}
 
 	if (window.console) {
-- 
cgit v1.2.3


From ec611d7d543e27fe8c794cd98177d00cf636c58f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 16 Mar 2015 21:37:28 +0100
Subject: SimplePie: decode special chars for MAYBE_HTML

https://github.com/FreshRSS/FreshRSS/issues/754
Needs to check with many feeds to see if this does not introduce
incompatibilities with some valid feeds.
---
 lib/SimplePie/SimplePie/Sanitize.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index 168a5e2e8..3da7239be 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -249,6 +249,11 @@ class SimplePie_Sanitize
 		{
 			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
 			{
+				if (preg_match('/&amp;#(x[0-9a-fA-F]+|[0-9]+);/', $data))	//FreshRSS
+				{
+					$data = htmlspecialchars_decode($data, ENT_QUOTES);	//FreshRSS
+					//syslog(LOG_DEBUG, 'SimplePie sanitize MAYBE_HTML htmlspecialchars_decode: ' . $data);	//FreshRSS
+				}
 				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
-- 
cgit v1.2.3


From 0e08b5ba56b2117e0f3d9bea6ae725295e8700d5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 21 Mar 2015 15:13:08 +0100
Subject: htmlspecialchars_decode for all SIMPLEPIE_CONSTRUCT_MAYBE_HTML

https://github.com/FreshRSS/FreshRSS/issues/754
---
 lib/SimplePie/SimplePie/Sanitize.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index 3da7239be..e7c9f925f 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -249,11 +249,7 @@ class SimplePie_Sanitize
 		{
 			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
 			{
-				if (preg_match('/&amp;#(x[0-9a-fA-F]+|[0-9]+);/', $data))	//FreshRSS
-				{
-					$data = htmlspecialchars_decode($data, ENT_QUOTES);	//FreshRSS
-					//syslog(LOG_DEBUG, 'SimplePie sanitize MAYBE_HTML htmlspecialchars_decode: ' . $data);	//FreshRSS
-				}
+				$data = htmlspecialchars_decode($data, ENT_QUOTES);	//FreshRSS 
 				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
-- 
cgit v1.2.3


From 1a35e2271d3b9383e882371d37d5fef16abd745d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 21 Mar 2015 18:20:36 +0100
Subject: SimplePie option to restaure syslog of HTTP requests

https://github.com/FreshRSS/FreshRSS/issues/711
---
 app/Models/Feed.php              |  4 ++--
 data/config.default.php          |  1 +
 lib/SimplePie/SimplePie.php      | 41 ++++++++++++++++++++++++++++++++++------
 lib/SimplePie/SimplePie/File.php |  7 +++++--
 lib/lib_rss.php                  |  1 +
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5ce03be5d..5f67ea6ce 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -246,10 +246,10 @@ class FreshRSS_Feed extends Minz_Model {
 				}
 
 				if (($mtime === true) ||($mtime > $this->lastUpdate)) {
-					Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $clean_url);
+					//Minz_Log::debug('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 ' . $clean_url);
+					//Minz_Log::debug('FreshRSS use cache for ' . $clean_url);
 					$this->entries = array();
 				}
 
diff --git a/data/config.default.php b/data/config.default.php
index 97df3a299..839bd1687 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -12,6 +12,7 @@ return array(
 	'auth_type' => 'none',
 	'api_enabled' => false,
 	'unsafe_autologin_enabled' => false,
+	'simplepie_syslog_enabled' => true,
 	'limits' => array(
 		'cache_duration' => 800,
 		'timeout' => 10,
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index c4872b5be..bb8ce4191 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -74,6 +74,12 @@ define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed
  */
 define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
 
+/**
+ * Use syslog to report HTTP requests done by SimplePie.
+ * @see SimplePie::set_syslog()
+ */
+define('SIMPLEPIE_SYSLOG', true);	//FreshRSS
+
 /**
  * No Autodiscovery
  * @see SimplePie::set_autodiscovery_level()
@@ -622,6 +628,12 @@ class SimplePie
 	 */
 	public $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
 
+	/**
+	 * Use syslog to report HTTP requests done by SimplePie.
+	 * @see SimplePie::set_syslog()
+	 */
+	public $syslog_enabled = SIMPLEPIE_SYSLOG;
+
 	/**
 	 * The SimplePie class contains feed level data and options
 	 *
@@ -1136,7 +1148,7 @@ class SimplePie
 		$this->sanitize->strip_attributes($attribs);
 	}
 
-	public function add_attributes($attribs = '')
+	public function add_attributes($attribs = '')	//FreshRSS
 	{
 		if ($attribs === '')
 		{
@@ -1145,6 +1157,14 @@ class SimplePie
 		$this->sanitize->add_attributes($attribs);
 	}
 
+	/**
+	 * Use syslog to report HTTP requests done by SimplePie.
+	 */
+	public function set_syslog($value = SIMPLEPIE_SYSLOG)	//FreshRSS
+	{
+		$this->syslog_enabled = $value == true;
+	}
+
 	/**
 	 * Set the output encoding
 	 *
@@ -1231,7 +1251,8 @@ class SimplePie
 		$this->enable_exceptions = $enable;
 	}
 
-	function cleanMd5($rss) {	//FreshRSS
+	function cleanMd5($rss)	//FreshRSS
+	{
 		return md5(preg_replace(array('#<(lastBuildDate|pubDate|updated|feedDate|dc:date|slash:comments)>[^<]+</\\1>#', '#<!--.+?-->#s'), '', $rss));
 	}
 
@@ -1329,7 +1350,8 @@ class SimplePie
 
 			list($headers, $sniffed) = $fetched;
 
-			if (isset($this->data['md5'])) {	//FreshRSS
+			if (isset($this->data['md5']))	//FreshRSS
+			{
 				$md5 = $this->data['md5'];
 			}
 		}
@@ -1455,7 +1477,8 @@ class SimplePie
 		{
 			// Load the Cache
 			$this->data = $cache->load();
-			if ($cache->mtime() + $this->cache_duration > time()) {	//FreshRSS
+			if ($cache->mtime() + $this->cache_duration > time())	//FreshRSS
+			{
 				$this->raw_data = false;
 				return true;	// If the cache is still valid, just return true
 			}
@@ -1529,11 +1552,17 @@ class SimplePie
 					{	//FreshRSS
 						$md5 = $this->cleanMd5($file->body);
 						if ($this->data['md5'] === $md5) {
-							// syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . $this->feed_url);
+							if ($this->syslog_enabled)
+							{
+								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);
+							if ($this->syslog_enabled)
+							{
+								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 9625af2a9..56fe72196 100644
--- a/lib/SimplePie/SimplePie/File.php
+++ b/lib/SimplePie/SimplePie/File.php
@@ -66,7 +66,7 @@ class SimplePie_File
 	var $method = SIMPLEPIE_FILE_SOURCE_NONE;
 	var $permanent_url;	//FreshRSS
 
-	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false)
+	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $syslog_enabled = SIMPLEPIE_SYSLOG)
 	{
 		if (class_exists('idna_convert'))
 		{
@@ -79,7 +79,10 @@ class SimplePie_File
 		$this->useragent = $useragent;
 		if (preg_match('/^http(s)?:\/\//i', $url))
 		{
-			// syslog(LOG_INFO, 'SimplePie GET ' . $url);	//FreshRSS
+			if ($syslog_enabled)
+			{
+				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 e5fe73041..16ae3097f 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -123,6 +123,7 @@ function customSimplePie() {
 	$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_syslog($system_conf->simplepie_syslog_enabled);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration($limits['cache_duration']);
 	$simplePie->set_timeout($limits['timeout']);
-- 
cgit v1.2.3


From ad9fe52f5a76faf58d13fcf7bde8f58e85abe82b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 22 Mar 2015 22:54:29 +0100
Subject: SimplePie sanitize URLs for syslog

https://github.com/FreshRSS/FreshRSS/issues/711
https://github.com/FreshRSS/FreshRSS/pull/715
---
 app/Models/Feed.php              |  2 +-
 lib/SimplePie/SimplePie.php      |  4 ++--
 lib/SimplePie/SimplePie/File.php |  2 +-
 lib/SimplePie/SimplePie/Misc.php | 10 ++++++++++
 lib/lib_rss.php                  | 12 +-----------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5f67ea6ce..15cbb7d0a 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -240,7 +240,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$subscribe_url = $feed->subscribe_url(true);
 				}
 
-				$clean_url = url_remove_credentials($subscribe_url);
+				$clean_url = SimplePie_Misc::url_remove_credentials($subscribe_url);
 				if ($subscribe_url !== null && $subscribe_url !== $url) {
 					$this->_url($clean_url);
 				}
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index bb8ce4191..54f4c5770 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1554,14 +1554,14 @@ class SimplePie
 						if ($this->data['md5'] === $md5) {
 							if ($this->syslog_enabled)
 							{
-								syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . $this->feed_url);
+								syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . SimplePie_Misc::url_remove_credentials($this->feed_url));
 							}
 							$cache->touch();
 							return true;	//Content unchanged even though server did not send a 304
 						} else {
 							if ($this->syslog_enabled)
 							{
-								syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . $this->feed_url);
+								syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . SimplePie_Misc::url_remove_credentials($this->feed_url));
 							}
 							$this->data['md5'] = $md5;
 						}
diff --git a/lib/SimplePie/SimplePie/File.php b/lib/SimplePie/SimplePie/File.php
index 56fe72196..1f9e3d502 100644
--- a/lib/SimplePie/SimplePie/File.php
+++ b/lib/SimplePie/SimplePie/File.php
@@ -81,7 +81,7 @@ class SimplePie_File
 		{
 			if ($syslog_enabled)
 			{
-				syslog(LOG_INFO, 'SimplePie GET ' . $url);	//FreshRSS
+				syslog(LOG_INFO, 'SimplePie GET ' . SimplePie_Misc::url_remove_credentials($url));	//FreshRSS
 			}
 			if ($useragent === null)
 			{
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 5a263a2e5..de50d37b8 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -2240,5 +2240,15 @@ function embed_wmedia(width, height, link) {
 	{
 		// No-op
 	}
+
+	/**
+	 * 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)	//FreshRSS
+	{
+		return preg_replace('#(?<=//)[^/:@]+:[^/:@]+@#', '', $url);
+	}
 }
 
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 16ae3097f..65a1a8e04 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -181,7 +181,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_remove_credentials($url));
+	Minz_Log::notice('FreshRSS GET ' . SimplePie_Misc::url_remove_credentials($url));
 	$html = file_get_contents ($url);
 
 	if ($html) {
@@ -430,13 +430,3 @@ 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('/[^\/]*:[^:]*@/', '', $url);
-}
-- 
cgit v1.2.3


From 1c38e646c3223571988b33e6a0d481426e3b6931 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 22 Mar 2015 23:53:59 +0100
Subject: SimplePie seems to only supports HTTP schemes

Can simplify the regex (faster because anchored) for cleaning URLs based
on the fact that we only have to deal with HTTP or HTTPS
---
 lib/SimplePie/SimplePie/Misc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index de50d37b8..90f01f737 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -2248,7 +2248,7 @@ function embed_wmedia(width, height, link) {
 	 */
 	function url_remove_credentials($url)	//FreshRSS
 	{
-		return preg_replace('#(?<=//)[^/:@]+:[^/:@]+@#', '', $url);
+		return preg_replace('#(?<=^https?://)[^/:@]+:[^/:@]+@#', '', $url);
 	}
 }
 
-- 
cgit v1.2.3


From 0ed213d97f566d7f46747d28a318cf58cdb5d699 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 22 Mar 2015 23:56:47 +0100
Subject: Revert "SimplePie seems to only supports HTTP schemes"

This reverts commit 1c38e646c3223571988b33e6a0d481426e3b6931.
---
 lib/SimplePie/SimplePie/Misc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 90f01f737..de50d37b8 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -2248,7 +2248,7 @@ function embed_wmedia(width, height, link) {
 	 */
 	function url_remove_credentials($url)	//FreshRSS
 	{
-		return preg_replace('#(?<=^https?://)[^/:@]+:[^/:@]+@#', '', $url);
+		return preg_replace('#(?<=//)[^/:@]+:[^/:@]+@#', '', $url);
 	}
 }
 
-- 
cgit v1.2.3


From 7735471140e1c6087a177192a09c7fb849decd77 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 23 Mar 2015 21:58:37 +0100
Subject: SimplePie faster regex for sanitizing URLs

Can simplify the regex (faster because anchored) for cleaning URLs based
on the fact that we only have to deal with HTTP or HTTPS
https://github.com/FreshRSS/FreshRSS/pull/715
---
 lib/SimplePie/SimplePie/Misc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index de50d37b8..91549f93a 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -2248,7 +2248,7 @@ function embed_wmedia(width, height, link) {
 	 */
 	function url_remove_credentials($url)	//FreshRSS
 	{
-		return preg_replace('#(?<=//)[^/:@]+:[^/:@]+@#', '', $url);
+		return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url);
 	}
 }
 
-- 
cgit v1.2.3


From 2bfc4dbf8b19cd2b892526ef65a966ff3bfef718 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 24 Mar 2015 21:58:00 +0100
Subject: SimplePie forgot static keyword

https://github.com/FreshRSS/FreshRSS/issues/711
---
 lib/SimplePie/SimplePie/Misc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 91549f93a..956a284cb 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -2246,7 +2246,7 @@ function embed_wmedia(width, height, link) {
 	 * @param $url the URL to sanitize.
 	 * @return the same URL without HTTP credentials.
 	 */
-	function url_remove_credentials($url)	//FreshRSS
+	public static function url_remove_credentials($url)	//FreshRSS
 	{
 		return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url);
 	}
-- 
cgit v1.2.3


From 239a010ef23127429698b6be5f4a5453b0bfbad7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 24 Mar 2015 22:45:27 +0100
Subject: Error when deleting a feed

https://github.com/FreshRSS/FreshRSS/issues/816
---
 app/Models/ConfigurationSetter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index d7689752f..978cc8cb9 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -117,7 +117,9 @@ class FreshRSS_ConfigurationSetter {
 	private function _queries(&$data, $values) {
 		$data['queries'] = array();
 		foreach ($values as $value) {
-			$data['queries'][] = $value->toArray();
+			if ($value != null) {
+				$data['queries'][] = $value->toArray();
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From d7706b66f586b36e44e471b5c06526de258af8b8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 24 Mar 2015 22:51:51 +0100
Subject: Error when deleting a feed, wrong object

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

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 978cc8cb9..7f433239c 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -117,7 +117,7 @@ class FreshRSS_ConfigurationSetter {
 	private function _queries(&$data, $values) {
 		$data['queries'] = array();
 		foreach ($values as $value) {
-			if ($value != null) {
+			if ($value instanceof FreshRSS_UserQuery) {
 				$data['queries'][] = $value->toArray();
 			}
 		}
-- 
cgit v1.2.3


From 4744a2a2d82f2b18df70b37f8cff5043dde12770 Mon Sep 17 00:00:00 2001
From: Tets <github@tets.cz>
Date: Thu, 26 Mar 2015 09:27:23 +0100
Subject: Added Czech translation

---
 app/i18n/cz/admin.php    | 170 +++++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/cz/conf.php     | 169 ++++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/cz/feedback.php | 110 ++++++++++++++++++++++++++++++
 app/i18n/cz/gen.php      | 164 +++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/cz/index.php    |  61 +++++++++++++++++
 app/i18n/cz/install.php  | 107 +++++++++++++++++++++++++++++
 app/i18n/cz/sub.php      |  61 +++++++++++++++++
 7 files changed, 842 insertions(+)
 create mode 100644 app/i18n/cz/admin.php
 create mode 100644 app/i18n/cz/conf.php
 create mode 100644 app/i18n/cz/feedback.php
 create mode 100644 app/i18n/cz/gen.php
 create mode 100644 app/i18n/cz/index.php
 create mode 100644 app/i18n/cz/install.php
 create mode 100644 app/i18n/cz/sub.php

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
new file mode 100644
index 000000000..b9ef707cf
--- /dev/null
+++ b/app/i18n/cz/admin.php
@@ -0,0 +1,170 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Umožnit anonymně číst články výchozího uživatele (%s)',
+		'allow_anonymous_refresh' => 'Umožnit anonymní obnovení článků',
+		'api_enabled' => 'Povolit přístup k <abbr>API</abbr> <small>(vyžadováno mobilními aplikacemi)</small>',
+		'form' => 'Webový formulář (tradiční, vyžaduje JavaScript)',
+		'http' => 'HTTP (pro pokročilé uživatele s HTTPS)',
+		'none' => 'Žádný (nebezpečné)',
+		'persona' => 'Mozilla Persona (moderní, vyžaduje JavaScript)',
+		'title' => 'Přihlášení',
+		'title_reset' => 'Reset přihlášení',
+		'token' => 'Authentizační token',
+		'token_help' => 'Umožňuje přístup k RSS kanálu článků výchozího uživatele bez přihlášení:',
+		'type' => 'Způsob přihlášení',
+		'unsafe_autologin' => 'Povolit nebezpečné automatické přihlášení přes: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/cache</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře cache jsou v pořádku.',
+		),
+		'categories' => array(
+			'nok' => 'Tabulka kategorií je nastavena špatně.',
+			'ok' => 'Tabulka kategorií je v pořádku.',
+		),
+		'connection' => array(
+			'nok' => 'Nelze navázat spojení s databází.',
+			'ok' => 'Připojení k databázi je v pořádku.',
+		),
+		'ctype' => array(
+			'nok' => 'Nemáte požadovanou knihovnu pro ověřování znaků (php-ctype).',
+			'ok' => 'Máte požadovanou knihovnu pro ověřování znaků (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Nemáte cURL (balíček php5-curl).',
+			'ok' => 'Máte rozšíření cURL.',
+		),
+		'data' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře data jsou v pořádku.',
+		),
+		'database' => 'Instalace databáze',
+		'dom' => array(
+			'nok' => 'Nemáte požadovanou knihovnu pro procházení DOM (balíček php-xml).',
+			'ok' => 'Máte požadovanou knihovnu pro procházení DOM.',
+		),
+		'entries' => array(
+			'nok' => 'Tabulka článků je nastavena špatně.',
+			'ok' => 'Tabulka kategorií je v pořádku.',
+		),
+		'favicons' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/favicons</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře favicons jsou v pořádku.',
+		),
+		'feeds' => array(
+			'nok' => 'Tabulka kanálů je nastavena špatně.',
+			'ok' => 'Tabulka kanálů je v pořádku.',
+		),
+		'files' => 'Instalace souborů',
+		'json' => array(
+			'nok' => 'Nemáte JSON (balíček php5-json).',
+			'ok' => 'Máte rozšíření JSON.',
+		),
+		'minz' => array(
+			'nok' => 'Nemáte framework Minz.',
+			'ok' => 'Máte framework Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'Nemáte požadovanou knihovnu pro regulární výrazy (php-pcre).',
+			'ok' => 'Máte požadovanou knihovnu pro regulární výrazy (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/persona</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře Mozilla Persona jsou v pořádku.',
+		),
+		'php' => array(
+			'_' => 'PHP instalace',
+			'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
+			'ok' => 'Vaše verze PHP je %s a je kompatibilní s FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'V databázi chybí jedna nevo více tabulek.',
+			'ok' => 'V databázi jsou všechny tabulky.',
+		),
+		'title' => 'Kontrola instalace',
+		'tokens' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/tokens</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře tokens jsou v pořádku.',
+		),
+		'users' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/users</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
+		),
+		'zip' => array(
+			'nok' => 'Nemáte rozšíření ZIP (balíček php5-zip).',
+			'ok' => 'Máte rozšíření ZIP.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Vypnuto',
+		'empty_list' => 'Není naistalováno žádné rozšíření',
+		'enabled' => 'Zapnuto',
+		'no_configure_view' => 'Toto rozšíření nemá žádné možnosti nastavení.',
+		'system' => array(
+			'_' => 'Systémová rozšíření',
+			'no_rights' => 'Systémová rozšíření (na ně nemáte oprávnění)',
+		),
+		'title' => 'Rozšíření',
+		'user' => 'Uživatelská rozšíření',
+	),
+	'stats' => array(
+		'_' => 'Statistika',
+		'all_feeds' => 'Všechny kanály',
+		'category' => 'Kategorie',
+		'entry_count' => 'Počet článků',
+		'entry_per_category' => 'Článků na kategorii',
+		'entry_per_day' => 'Článků za den (posledních 30 dní)',
+		'entry_per_day_of_week' => 'Za den v týdnu (průměr: %.2f zprávy)',
+		'entry_per_hour' => 'Za hodinu (průměr: %.2f zprávy)',
+		'entry_per_month' => 'Za měsíc (průměr: %.2f zprávy)',
+		'entry_repartition' => 'Rozdělení článků',
+		'feed' => 'Kanál',
+		'feed_per_category' => 'Článků na kategorii',
+		'idle' => 'Neaktivní kanály',
+		'main' => 'Přehled',
+		'main_stream' => 'Všechny kanály',
+		'menu' => array(
+			'idle' => 'Neaktivní kanály',
+			'main' => 'Přehled',
+			'repartition' => 'Rozdělení článků',
+		),
+		'no_idle' => 'Žádné neaktivní kanály!',
+		'number_entries' => '%d článků',
+		'percent_of_total' => '%% ze všech',
+		'repartition' => 'Rozdělení článků',
+		'status_favorites' => 'Oblíbené',
+		'status_read' => 'Přečtené',
+		'status_total' => 'Celkem',
+		'status_unread' => 'Nepřečtené',
+		'title' => 'Statistika',
+		'top_feed' => 'Top ten kanálů',
+	),
+	'update' => array(
+		'_' => 'Aktualizace systému',
+		'apply' => 'Použít',
+		'check' => 'Zkontrolovat aktualizace',
+		'current_version' => 'Vaše instalace FreshRSS je verze %s.',
+		'last' => 'Poslední kontrola: %s',
+		'none' => 'Žádné nové aktualizace',
+		'title' => 'Aktualizovat systém',
+	),
+	'user' => array(
+		'articles_and_size' => '%s článků (%s)',
+		'create' => 'Vytvořit nového uživatele',
+		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Jazyk',
+		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
+		'password_format' => 'Alespoň 7 znaků',
+		'title' => 'Správa uživatelů',
+		'user_list' => 'Seznam uživatelů',
+		'username' => 'Přihlašovací jméno',
+		'users' => 'Uživatelé',
+	),
+);
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
new file mode 100644
index 000000000..29fb1e4d4
--- /dev/null
+++ b/app/i18n/cz/conf.php
@@ -0,0 +1,169 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archivace',
+		'advanced' => 'Pokročilé',
+		'delete_after' => 'Smazat články starší než',
+		'help' => 'Více možností je dostupných v nastavení jednotlivých kanálů',
+		'keep_history_by_feed' => 'Zachovat tento minimální počet článků v každém kanálu',
+		'optimize' => 'Optimalizovat databázi',
+		'optimize_help' => 'Občasná údržba zmenší velikost databáze',
+		'purge_now' => 'Vyčistit nyní',
+		'title' => 'Archivace',
+		'ttl' => 'Neaktualizovat častěji než',
+	),
+	'display' => array(
+		'_' => 'Zobrazení',
+		'icon' => array(
+			'bottom_line' => 'Spodní řádek',
+			'entry' => 'Ikony článků',
+			'publication_date' => 'Datum vydání',
+			'related_tags' => 'Související tagy',
+			'sharing' => 'Sdílení',
+			'top_line' => 'Horní řádek',
+		),
+		'language' => 'Jazyk',
+		'notif_html5' => array(
+			'seconds' => 'sekund (0 znamená žádný timeout)',
+			'timeout' => 'Timeout HTML5 notifikací',
+		),
+		'theme' => 'Vzhled',
+		'title' => 'Zobrazení',
+		'width' => array(
+			'content' => 'Šířka obsahu',
+			'large' => 'Velká',
+			'medium' => 'Střední',
+			'no_limit' => 'Bez limitu',
+			'thin' => 'Tenká',
+		),
+	),
+	'query' => array(
+		'_' => 'Uživatelské dotazy',
+		'deprecated' => 'Tento dotaz již není platný. Odkazovaná kategorie nebo kanál byly smazány.',
+		'filter' => 'Filtr aplikován:',
+		'get_all' => 'Zobrazit všechny články',
+		'get_category' => 'Zobrazit "%s" kategorii',
+		'get_favorite' => 'Zobrazit oblíbené články',
+		'get_feed' => 'Zobrazit "%s" článkek',
+		'no_filter' => 'Zrušit filtr',
+		'none' => 'Ještě jste nevytvořil žádný uživatelský dotaz.',
+		'number' => 'Dotaz n°%d',
+		'order_asc' => 'Zobrazit nejdříve nejstarší články',
+		'order_desc' => 'Zobrazit nejdříve nejnovější články',
+		'search' => 'Hledat "%s"',
+		'state_0' => 'Zobrazit všechny články',
+		'state_1' => 'Zobrazit přečtené články',
+		'state_2' => 'Zobrazit nepřečtené články',
+		'state_3' => 'Zobrazit všechny články',
+		'state_4' => 'Zobrazit oblíbené články',
+		'state_5' => 'Zobrazit oblíbené přečtené články',
+		'state_6' => 'Zobrazit oblíbené nepřečtené články',
+		'state_7' => 'Zobrazit oblíbené články',
+		'state_8' => 'Zobrazit všechny články vyjma oblíbených',
+		'state_9' => 'Zobrazit všechny přečtené články vyjma  oblíbených',
+		'state_10' => 'Zobrazit všechny nepřečtené články vyjma  oblíbených',
+		'state_11' => 'Zobrazit všechny články vyjma oblíbených',
+		'state_12' => 'Zobrazit všechny články',
+		'state_13' => 'Zobrazit přečtené články',
+		'state_14' => 'Zobrazit nepřečtené články',
+		'state_15' => 'Zobrazit všechny články',
+		'title' => 'Uživatelské dotazy',
+	),
+	'profile' => array(
+		'_' => 'Správa profilu',
+		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Password API<br /><small>(tzn. pro mobilní aplikace)</small>',
+		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
+		'password_format' => 'Alespoň 7 znaků',
+		'title' => 'Profil',
+	),
+	'reading' => array(
+		'_' => 'Čtení',
+		'after_onread' => 'Po “označit vše jako přečtené”,',
+		'articles_per_page' => 'Počet článků na stranu',
+		'auto_load_more' => 'Načítat další články dole na stránce',
+		'auto_remove_article' => 'Po přečtení články schovat',
+		'confirm_enabled' => 'Vyžadovat potvrzení pro akci “označit vše jako přečtené”',
+		'display_articles_unfolded' => 'Ve výchozím stavu zobrazovat články otevřené',
+		'display_categories_unfolded' => 'Ve výchozím stavu zobrazovat kategorie zavřené',
+		'hide_read_feeds' => 'Schovat kategorie a kanály s nulovým počtem nepřečtených článků (nefunguje s nastavením “Zobrazit všechny články”)',
+		'img_with_lazyload' => 'Použít "lazy load" mód pro načítaní obrázků',
+		'jump_next' => 'skočit na další nepřečtený (kanál nebo kategorii)',
+		'number_divided_when_reader' => 'V režimu “Čtení” děleno dvěma.',
+		'read' => array(
+			'article_open_on_website' => 'když je otevřen původní web s článkem',
+			'article_viewed' => 'během čtení článku',
+			'scroll' => 'během skrolování',
+			'upon_reception' => 'po načtení článku',
+			'when' => 'Označit článek jako přečtený…',
+		),
+		'show' => array(
+			'_' => 	'Počet zobrazených článků',
+			'adaptive' => 'Vyberte zobrazení',
+			'all_articles' => 'Zobrazit všechny články',
+			'unread' => 'Zobrazit jen nepřečtené',
+		),
+		'sort' => array(
+			'_' => 'Řazení',
+			'newer_first' => 'Nejdříve nejnovější',
+			'older_first' => 'Nejdříve nejstarší',
+		),
+		'sticky_post' => 'Při otevření posunout článek nahoru',
+		'title' => 'Čtení',
+		'view' => array(
+			'default' => 'Výchozí',
+			'global' => 'Přehled',
+			'normal' => 'Normální',
+			'reader' => 'Čtení',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Sdílení',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Více informací',
+		'print' => 'Tisk',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Jméno pro zobrazení',
+		'share_url' => 'Jakou URL použít pro sdílení',
+		'title' => 'Sdílení',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Zkratky',
+		'article_action' => 'Články - akce',
+		'auto_share' => 'Sdílet',
+		'auto_share_help' => 'Je-li nastavena pouze jedna možnost sdílení, bude použita. Další možnosti jsou dostupné pomocí jejich čísla.',
+		'close_dropdown' => 'Zavřít menu',
+		'collapse_article' => 'Srolovat',
+		'first_article' => 'Skočit na první článek',
+		'focus_search' => 'Hledání',
+		'help' => 'Zobrazit documentaci',
+		'javascript' => 'Pro použití zkratek musí být povolen JavaScript',
+		'last_article' => 'Skočit na poslední článek',
+		'load_more' => 'Načíst více článků',
+		'mark_read' => 'Označit jako přečtené',
+		'mark_favorite' => 'Označit jako oblíbené',
+		'navigation' => 'Navigace',
+		'navigation_help' => 'Pomocí přepínače "Shift" fungují navigační zkratky v rámci kanálů.<br/>Pomocí přepínače "Alt" fungují v rámci kategorií.',
+		'next_article' => 'Skočit na další článek',
+		'other_action' => 'Ostatní akce',
+		'previous_article' => 'Skočit na předchozí článek',
+		'see_on_website' => 'Navštívit původní webovou stránku',
+		'shift_for_all_read' => '+ <code>shift</code> označí vše jako přečtené',
+		'title' => 'Zkratky',
+		'user_filter' => 'Aplikovat uživatelské filtry',
+		'user_filter_help' => 'Je-li nastaven pouze jeden filtr, bude použit. Další filtry jsou dostupné pomocí jejich čísla.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s článků (%s)',
+		'current' => 'Aktuální uživatel',
+		'is_admin' => 'je administrátor',
+		'users' => 'Uživatelé',
+	),
+);
diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
new file mode 100644
index 000000000..52ff029ef
--- /dev/null
+++ b/app/i18n/cz/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimalizace dokončena',
+	),
+	'access' => array(
+		'denied' => 'Nemáte oprávnění přistupovat na tuto stránku',
+		'not_found' => 'Tato stránka neexistuje',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Nastal problém s konfigurací přihlašovacího systému. Zkuste to prosím později.',
+			'set' => 'Webové formulář je nyní výchozí přihlašovací systém.',
+		),
+		'login' => array(
+			'invalid' => 'Login není platný',
+			'success' => 'Jste přihlášen',
+		),
+		'logout' => array(
+			'success' => 'Jste odhlášen',
+		),
+		'no_password_set' => 'Heslo administrátora nebylo nastaveno. Tato funkce není k dispozici.',
+		'not_persona' => 'Resetovat lze pouze systém Persona.',
+	),
+	'conf' => array(
+		'error' => 'Během ukládání nastavení došlo k chybě',
+		'query_created' => 'Dotaz "%s" byl vytvořen.',
+		'shortcuts_updated' => 'Zkratky byly aktualizovány',
+		'updated' => 'Nastavení bylo aktualizováno',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s je již zapnut',
+		'disable' => array(
+			'ko' => '%s nelze vypnout. Pro více detailů <a href="%s">zkontrolujte logy FressRSS</a>.',
+			'ok' => '%s je nyní vypnut',
+		),
+		'enable' => array(
+			'ko' => '%s nelze zapnout. Pro více detailů <a href="%s">zkontrolujte logy FressRSS</a>.',
+			'ok' => '%s je nyní zapnut',
+		),
+		'no_access' => 'Nemáte přístup k %s',
+		'not_enabled' => '%s není ještě zapnut',
+		'not_found' => '%s neexistuje',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Na serveru není naistalována podpora zip. Zkuste prosím exportovat soubory jeden po druhém.',
+		'feeds_imported' => 'Vaše kanály byly naimportovány a nyní budou aktualizovány',
+		'feeds_imported_with_errors' => 'Vaše kanály byly naimportovány, došlo ale k nějakým chybám',
+		'file_cannot_be_uploaded' => 'Soubor nelze nahrát!',
+		'no_zip_extension' => 'Na serveru není naistalována podpora zip.',
+		'zip_error' => 'Během importu zip souboru došlo k chybě.',
+	),
+	'sub' => array(
+		'actualize' => 'Aktualizovat',
+		'category' => array(
+			'created' => 'Kategorie %s byla vytvořena.',
+			'deleted' => 'Kategorie byla smazána.',
+			'emptied' => 'Kategorie byla vyprázdněna',
+			'error' => 'Kategorii nelze aktualizovat',
+			'name_exists' => 'Název kategorie již existuje.',
+			'no_id' => 'Musíte upřesnit id kategorie.',
+			'no_name' => 'Název kategorie nemůže být prázdný.',
+			'not_delete_default' => 'Nelze smazat výchozí kategorii!',
+			'not_exist' => 'Tato kategorie neexistuje!',
+			'over_max' => 'Dosáhl jste maximálního počtu kategorií (%d)',
+			'updated' => 'Kategorie byla aktualizována.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> bylo aktualizováno',
+			'actualizeds' => 'RSS kanály byly aktualizovány',
+			'added' => 'RSS kanál <em>%s</em> byl přidán',
+			'already_subscribed' => 'Již jste přihlášen k odběru <em>%s</em>',
+			'deleted' => 'Kanál byl smazán',
+			'error' => 'Kanál nelze aktualizovat',
+			'internal_problem' => 'RSS kanál nelze přidat. Pro detaily <a href="%s">zkontrolujte logy FressRSS</a>.',
+			'invalid_url' => 'URL <em>%s</em> není platné',
+			'marked_read' => 'Kanály byly označeny jako přečtené',
+			'n_actualized' => '%d kanálů bylo aktualizováno',
+			'n_entries_deleted' => '%d článků bylo smazáno',
+			'no_refresh' => 'Nelze obnovit žádné kanály…',
+			'not_added' => '<em>%s</em> nemůže být přidán',
+			'over_max' => 'Dosáhl jste maximálního počtu kanálů (%d)',
+			'updated' => 'Kanál byl aktualizován',
+		),
+		'purge_completed' => 'Vyprázdněno (smazáno %d článků)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS bude nyní upgradováno na <strong>verzi %s</strong>.',
+		'error' => 'Během upgrade došlo k chybě: %s',
+		'file_is_nok' => 'Zkontrolujte oprávnění adresáře <em>%s</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+		'finished' => 'Upgrade hotov!',
+		'none' => 'Novější verze není k dispozici',
+		'server_not_found' => 'Nelze nalézt server s instalačním souborem. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'Uživatel %s byl vytvořen',
+			'error' => 'Uživatele %s nelze vytvořit',
+		),
+		'deleted' => array(
+			'_' => 'Uživatel %s byl smazán',
+			'error' => 'Uživatele %s nelze smazat',
+		),
+	),
+	'profile' => array(
+		'error' => 'Váš profil nelze změnit',
+		'updated' => 'Váš profil byl změněn',
+	),
+);
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
new file mode 100644
index 000000000..7c333a9c8
--- /dev/null
+++ b/app/i18n/cz/gen.php
@@ -0,0 +1,164 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Aktualizovat',
+		'back_to_rss_feeds' => '← Zpět na seznam RSS kanálů',
+		'cancel' => 'Zrušit',
+		'create' => 'Vytvořit',
+		'disable' => 'Zakázat',
+		'empty' => 'Vyprázdnit',
+		'enable' => 'Povolit',
+		'export' => 'Export',
+		'filter' => 'Filtrovat',
+		'import' => 'Import',
+		'manage' => 'Spravovat',
+		'mark_read' => 'Označit jako přečtené',
+		'mark_favorite' => 'Označit jako oblíbené',
+		'remove' => 'Odstranit',
+		'see_website' => 'Navštívit WWW stránku',
+		'submit' => 'Odeslat',
+		'truncate' => 'Smazat všechny články',
+	),
+	'auth' => array(
+		'keep_logged_in' => 'Zapamatovat přihlášení <small>(1 měsíc)</small>',
+		'login' => 'Login',
+		'login_persona' => 'Přihlášení pomocí Persona',
+		'login_persona_problem' => 'Problém s připojením k Persona?',
+		'logout' => 'Odhlášení',
+		'password' => 'Heslo',
+		'reset' => 'Reset přihlášení',
+		'username' => 'Uživatel',
+		'username_admin' => 'Název administrátorského účtu',
+		'will_reset' => 'Přihlašovací systém bude vyresetován: místo sytému Persona bude použito přihlášení formulářem.',
+	),
+	'date' => array(
+		'Apr' => '\\D\\u\\b\\e\\n',
+		'Aug' => '\\S\\r\\p\\e\\n',
+		'Dec' => '\\P\\r\\o\\s\\i\\n\\e\\c',
+		'Feb' => '\\Ú\\n\\o\\r',
+		'Jan' => '\\L\\e\\d\\e\\n',
+		'Jul' => '\\Č\\e\\r\\v\\e\\n\\e\\c',
+		'Jun' => '\\Č\\e\\r\\v\\e\\n',
+		'Mar' => '\\B\\ř\\e\\z\\e\\n',
+		'May' => '\\K\\v\\ě\\t\\e\\n',
+		'Nov' => '\\L\\i\\s\\t\\o\\p\\a\\d',
+		'Oct' => '\\Ř\\í\\j\\e\\n',
+		'Sep' => '\\Z\\á\\ř\\í',
+		'apr' => 'dub',
+		'april' => 'Dub',
+		'aug' => 'srp',
+		'august' => 'Srp',
+		'before_yesterday' => 'Předevčírem',
+		'dec' => 'pro',
+		'december' => 'Pro',
+		'feb' => 'úno',
+		'february' => 'Úno',
+		'format_date' => 'j\\. %s Y',
+		'format_date_hour' => 'j\\. %s Y \\v H\\:i',
+		'fri' => 'Pá',
+		'jan' => 'led',
+		'january' => 'Led',
+		'jul' => 'čvn',
+		'july' => 'Čvn',
+		'jun' => 'čer',
+		'june' => 'Čer',
+		'last_3_month' => 'Minulé tři měsíce',
+		'last_6_month' => 'Minulých šest měsíců',
+		'last_month' => 'Minulý měsíc',
+		'last_week' => 'Minulý týden',
+		'last_year' => 'Minulý rok',
+		'mar' => 'bře',
+		'march' => 'Bře',
+		'may' => 'Kvě',
+		'mon' => 'Po',
+		'month' => 'měsíce',
+		'nov' => 'lis',
+		'november' => 'Lis',
+		'oct' => 'říj',
+		'october' => 'Říj',
+		'sat' => 'So',
+		'sep' => 'zář',
+		'september' => 'Zář',
+		'sun' => 'Ne',
+		'thu' => 'Čt',
+		'today' => 'Dnes',
+		'tue' => 'Út',
+		'wed' => 'St',
+		'yesterday' => 'Včera',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'O FreshRSS',
+	),
+	'js' => array(
+		'category_empty' => 'Prázdná kategorie',
+		'confirm_action' => 'Jste si jist, že chcete provést tuto akci? Změny nelze vrátit zpět!',
+		'confirm_action_feed_cat' => 'Jste si jist, že chcete provést tuto akci? Přijdete o související oblíbené položky a uživatelské dotazy. Změny nelze vrátit zpět!',
+		'feedback' => array(
+			'body_new_articles' => 'Je \\d nových článků k přečtení v FreshRSS.',
+			'request_failed' => 'Požadavek selhal, což může být způsobeno problémy s připojení k internetu.',
+			'title_new_articles' => 'FreshRSS: nové články!',
+		),
+		'new_article' => 'Jsou k dispozici nové články, stránku obnovíte kliknutím zde.',
+		'should_be_activated' => 'JavaScript musí být povolen',
+	),
+	'lang' => array(
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'cz' => 'Čeština',
+	),
+	'menu' => array(
+		'about' => 'O aplikaci',
+		'admin' => 'Administrace',
+		'archiving' => 'Archivace',
+		'authentication' => 'Přihlášení',
+		'check_install' => 'Ověření instalace',
+		'configuration' => 'Nastavení',
+		'display' => 'Zobrazení',
+		'extensions' => 'Rozšíření',
+		'logs' => 'Logy',
+		'queries' => 'Uživatelské dotazy',
+		'reading' => 'Čtení',
+		'search' => 'Hledat výraz nebo #tagy',
+		'sharing' => 'Sdílení',
+		'shortcuts' => 'Zkratky',
+		'stats' => 'Statistika',
+		'update' => 'Aktualizace',
+		'user_management' => 'Správa uživatelů',
+		'user_profile' => 'Profil',
+	),
+	'pagination' => array(
+		'first' => 'První',
+		'last' => 'Poslední',
+		'load_more' => 'Načíst více článků',
+		'mark_all_read' => 'Označit vše jako přečtené',
+		'next' => 'Další',
+		'nothing_to_load' => 'Žádné nové články',
+		'previous' => 'Předchozí',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Tisk',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Upozornění!',
+		'blank_to_disable' => 'Zakázat - ponechte prázdné',
+		'by_author' => 'Od <em>%s</em>',
+		'by_default' => 'Výchozí',
+		'damn' => 'Sakra!',
+		'default_category' => 'Nezařazeno',
+		'no' => 'Ne',
+		'ok' => 'Ok!',
+		'or' => 'nebo',
+		'yes' => 'Ano',
+	),
+);
diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php
new file mode 100644
index 000000000..5691d12af
--- /dev/null
+++ b/app/i18n/cz/index.php
@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'O FreshRSS',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Hlášení chyb',
+		'credits' => 'Poděkování',
+		'credits_content' => 'Některé designové prvky pocházejí z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, FreshRSS ale tuto platformu nevyužívá. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> pocházejí z <a href="https://www.gnome.org/">GNOME projektu</a>. Font <em>Open Sans</em> vytvořil <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicony jsou shromažďovány pomocí <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS je založen na PHP framework <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
+		'freshrss_description' => 'FreshRSS je čtečka RSS kanálů určená k provozu na vlastním serveru, podobná <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> nebo <a href="http://projet.idleman.fr/leed/">Leed</a>. Je to nenáročný a jednoduchý, zároveň ale mocný a konfigurovatelný nástroj.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Github</a>',
+		'license' => 'Licence',
+		'project_website' => 'Stránka projektu',
+		'title' => 'O FreshRSS',
+		'version' => 'Verze',
+		'website' => 'Webové stránka',
+	),
+	'feed' => array(
+		'add' => 'Můžete přidat kanály.',
+		'empty' => 'Žádné články k zobrazení.',
+		'rss_of' => 'RSS kanál %s',
+		'title' => 'RSS kanály',
+		'title_global' => 'Přehled',
+		'title_fav' => 'Oblíbené',
+	),
+	'log' => array(
+		'_' => 'Logy',
+		'clear' => 'Vymazat logy',
+		'empty' => 'Log je prázdný',
+		'title' => 'Logy',
+	),
+	'menu' => array(
+		'about' => 'O FreshRSS',
+		'add_query' => 'Vytvořit dotaz',
+		'before_one_day' => 'Den nazpět',
+		'before_one_week' => 'Před týdnem',
+		'favorites' => 'Oblíbené (%s)',
+		'global_view' => 'Přehled',
+		'main_stream' => 'Všechny kanály',
+		'mark_all_read' => 'Označit vše jako přečtené',
+		'mark_cat_read' => 'Označit kategorii jako přečtenou',
+		'mark_feed_read' => 'Označit kanál jako přečtený',
+		'newer_first' => 'Nové nejdříve',
+		'non-starred' => 'Zobrazit vše vyjma oblíbených',
+		'normal_view' => 'Normální',
+		'older_first' => 'Nejstarší nejdříve',
+		'queries' => 'Uživatelské dotazy',
+		'read' => 'Zobrazovat přečtené',
+		'reader_view' => 'Čtení',
+		'rss_view' => 'RSS kanál',
+		'search_short' => 'Hledat',
+		'starred' => 'Zobrazit oblíbené',
+		'stats' => 'Statistika',
+		'subscription' => 'Správa subskripcí',
+		'unread' => 'Zobrazovat nepřečtené',
+	),
+	'share' => 'Sdílet',
+	'tag' => array(
+		'related' => 'Související tagy',
+	),
+);
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
new file mode 100644
index 000000000..53257c84f
--- /dev/null
+++ b/app/i18n/cz/install.php
@@ -0,0 +1,107 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Dokončit instalaci',
+		'fix_errors_before' => 'Chyby prosím před přechodem na další krok opravte.',
+		'next_step' => 'Přejít na další krok',
+	),
+	'auth' => array(
+		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Webový formulář (tradiční, vyžaduje JavaScript)',
+		'http' => 'HTTP (pro pokročilé uživatele s HTTPS)',
+		'none' => 'Žádný (nebezpečné)',
+		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
+		'password_format' => 'Alespoň 7 znaků',
+		'persona' => 'Mozilla Persona (moderní, vyžaduje JavaScript)',
+		'type' => 'Způsob přihlášení',
+	),
+	'bdd' => array(
+		'_' => 'Databáze',
+		'conf' => array(
+			'_' => 'Nastavení databáze',
+			'ko' => 'Ověřte informace o databázi.',
+			'ok' => 'Nastavení databáze bylo uloženo.',
+		),
+		'host' => 'Hostitel',
+		'prefix' => 'Prefix tabulky',
+		'password' => 'Heslo',
+		'type' => 'Typ databáze',
+		'username' => 'Uživatel',
+	),
+	'check' => array(
+		'_' => 'Kontrola',
+		'cache' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/cache</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře cache jsou v pořádku.',
+		),
+		'ctype' => array(
+			'nok' => 'Není nainstalována požadovaná knihovna pro ověřování znaků (php-ctype).',
+			'ok' => 'Je nainstalována požadovaná knihovna pro ověřování znaků (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Nemáte cURL (balíček php5-curl).',
+			'ok' => 'Máte rozšíření cURL.',
+		),
+		'data' => array(
+		'nok' => 'Zkontrolujte oprávnění adresáře <em>./data</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře data jsou v pořádku.',
+		),
+		'dom' => array(
+			'nok' => 'Nemáte požadovanou knihovnu pro procházení DOM (balíček php-xml).',
+			'ok' => 'Máte požadovanou knihovnu pro procházení DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/favicons</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře favicons jsou v pořádku.',
+		),
+		'http_referer' => array(
+			'nok' => 'Zkontrolujte prosím že neměníte HTTP REFERER.',
+			'ok' => 'Váš HTTP REFERER je znám a odpovídá Vašemu serveru.',
+		),
+		'minz' => array(
+			'nok' => 'Nemáte framework Minz.',
+			'ok' => 'Máte framework Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'Nemáte požadovanou knihovnu pro regulární výrazy (php-pcre).',
+			'ok' => 'Máte požadovanou knihovnu pro regulární výrazy (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/persona</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře Mozilla Persona jsou v pořádku.',
+		),
+		'php' => array(
+			'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
+			'ok' => 'Vaše verze PHP je %s a je kompatibilní s FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/users</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Obecná nastavení',
+		'ok' => 'Nastavení bylo uloženo.',
+	),
+	'congratulations' => 'Gratulujeme!',
+	'default_user' => 'Jméno výchozího uživatele <small>(maximálně 16 alfanumerických znaků)</small>',
+	'delete_articles_after' => 'Smazat články starší než',
+	'fix_errors_before' => 'Chyby prosím před přechodem na další krok opravte.',
+	'javascript_is_better' => 'Práce s FreshRSS je příjemnější se zapnutým JavaScriptem',
+	'language' => array(
+		'_' => 'Jazyk',
+		'choose' => 'Vyberte jazyk FreshRSS',
+		'defined' => 'Jazyk byl nastaven.',
+	),
+	'not_deleted' => 'Nastala chyba, soubor <em>%s</em> musíte smazat ručně.',
+	'ok' => 'Instalace byla úspěšná.',
+	'step' => 'krok %d',
+	'steps' => 'Kroky',
+	'title' => 'Instalace · FreshRSS',
+	'this_is_the_end' => 'Konec',
+);
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
new file mode 100644
index 000000000..d7ff63fe9
--- /dev/null
+++ b/app/i18n/cz/sub.php
@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Kategorie',
+		'add' => 'Přidat kategorii',
+		'empty' => 'Vyprázdit kategorii',
+		'new' => 'Nová kategorie',
+	),
+	'feed' => array(
+		'add' => 'Přidat RSS kanál',
+		'advanced' => 'Pokročilé',
+		'archiving' => 'Archivace',
+		'auth' => array(
+			'configuration' => 'Přihlášení',
+			'help' => 'Umožní přístup k RSS kanálům chráneným HTTP autentizací',
+			'http' => 'HTTP přihlášení',
+			'password' => 'Heslo',
+			'username' => 'Přihlašovací jméno',
+		),
+		'css_help' => 'Stáhne zkrácenou verzi RSS kanálů (pozor, náročnější na čas!)',
+		'css_path' => 'Původní CSS soubor článku z webových stránek',
+		'description' => 'Popis',
+		'empty' => 'Kanál je prazdný. Ověřte prosím zda je ještě autorem udržován.',
+		'error' => 'Vyskytl se problém s kanálem. Ověřte že je vždy dostupný, prosím, a poté jej aktualizujte.',
+		'in_main_stream' => 'Zobrazit ve “Všechny kanály”',
+		'informations' => 'Informace',
+		'keep_history' => 'Zachovat tento minimální počet článků',
+		'moved_category_deleted' => 'Po smazání kategorie budou v ní obsažené kanály automaticky přesunuty do <em>%s</em>.',
+		'no_selected' => 'Nejsou označeny žádné kanály.',
+		'number_entries' => '%d článků',
+		'stats' => 'Statistika',
+		'think_to_add' => 'Můžete přidat kanály.',
+		'title' => 'Název',
+		'title_add' => 'Přidat RSS kanál',
+		'ttl' => 'Neobnovovat častěji než',
+		'url' => 'URL kanálu',
+		'validator' => 'Zkontrolovat platnost kanálu',
+		'website' => 'URL webové stránky',
+	),
+	'import_export' => array(
+		'export' => 'Export',
+		'export_opml' => 'Exportovat seznam kanálů (OPML)',
+		'export_starred' => 'Exportovat oblíbené',
+		'feed_list' => 'Seznam %s článků',
+		'file_to_import' => 'Soubor k importu<br />(OPML, Json nebo Zip)',
+		'file_to_import_no_zip' => 'Soubor k importu<br />(OPML nebo Json)',
+		'import' => 'Import',
+		'starred_list' => 'Seznam oblíbených článků',
+		'title' => 'Import / export',
+	),
+	'menu' => array(
+		'bookmark' => 'Přihlásit (FreshRSS bookmark)',
+		'import_export' => 'Import / export',
+		'subscription_management' => 'Správa subskripcí',
+	),
+	'title' => array(
+		'_' => 'Správa subskripcí',
+		'feed_management' => 'Správa RSS kanálů',
+	),
+);
-- 
cgit v1.2.3


From 91e5231b26acd330ff6c47e3de7b9979158d45a6 Mon Sep 17 00:00:00 2001
From: Tets <github@tets.cz>
Date: Fri, 27 Mar 2015 08:13:34 +0100
Subject: Added Czech translation

---
 app/i18n/de/gen.php | 1 +
 app/i18n/en/gen.php | 1 +
 app/i18n/fr/gen.php | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 1b30a5be4..8970d5003 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -104,6 +104,7 @@ return array(
 		'should_be_activated' => 'JavaScript muss aktiviert sein',
 	),
 	'lang' => array(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index fdca01a43..b02b9f0f2 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(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 48fc4a7e9..c81e57bf7 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(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-- 
cgit v1.2.3


From 6283fe99b2ded06d05d01c595a1d067010b4b886 Mon Sep 17 00:00:00 2001
From: Tets <github@tets.cz>
Date: Fri, 27 Mar 2015 08:13:34 +0100
Subject: Added Czech to the list in other languages in gen.php

---
 app/i18n/de/gen.php | 1 +
 app/i18n/en/gen.php | 1 +
 app/i18n/fr/gen.php | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 1b30a5be4..8970d5003 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -104,6 +104,7 @@ return array(
 		'should_be_activated' => 'JavaScript muss aktiviert sein',
 	),
 	'lang' => array(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index fdca01a43..b02b9f0f2 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(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 48fc4a7e9..c81e57bf7 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(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-- 
cgit v1.2.3


From 711530a512b370d79b079205ce1f8376174f7f03 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 4 Apr 2015 22:39:31 +0200
Subject: SQL: detection of updates, and preparation for better burge

https://github.com/FreshRSS/FreshRSS/issues/798
https://github.com/FreshRSS/FreshRSS/issues/493
SQLite not yet tested. Only MySQL tested so far.
---
 app/Controllers/feedController.php         |  98 ++++++++------
 app/Controllers/importExportController.php |   3 +-
 app/Models/Entry.php                       |  16 +++
 app/Models/EntryDAO.php                    | 198 +++++++++++++++++++++--------
 app/Models/Feed.php                        |   1 +
 app/SQL/install.sql.mysql.php              |   7 +-
 app/SQL/install.sql.sqlite.php             |   7 +-
 lib/lib_rss.php                            |   2 +-
 8 files changed, 231 insertions(+), 101 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 6f544d834..08a0257a2 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -145,7 +145,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// Call the extension hook
 			$name = $feed->name();
 			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
-			if (is_null($feed)) {
+			if ($feed === null) {
 				Minz_Request::bad(_t('feed_not_added', $name), $url_redirect);
 			}
 
@@ -181,7 +181,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			// 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.
@@ -190,13 +189,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$entry->_isRead($is_read);
 
 				$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
-				if (is_null($entry)) {
+				if ($entry === null) {
 					// An extension has returned a null value, there is nothing to insert.
 					continue;
 				}
 
 				$values = $entry->toArray();
-				$entryDAO->addEntry($values, $prepared_statement);
+				$entryDAO->addEntry($values);
 			}
 			$feedDAO->updateLastUpdate($feed->id());
 			$feedDAO->commit();
@@ -307,7 +306,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feed->load(false);
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::notice($e->getMessage());
-				$feedDAO->updateLastUpdate($feed->id(), 1);
+				$feedDAO->updateLastUpdate($feed->id(), true);
 				$feed->unlock();
 				continue;
 			}
@@ -323,50 +322,69 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// 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);
+				$newGuids = array();
+				foreach ($entries as $entry) {
+					$newGuids[] = $entry->guid();
+				}
+				// For this feed, check existing GUIDs already in database.
+				$existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
+				unset($newGuids);
+				$use_declared_date = empty($existingHashForGuids);
 
+				$oldGuids = array();
 				// 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();
+					if (isset($existingHashForGuids[$entry->guid()])) {
+						$existingHash = $existingHashForGuids[$entry->guid()];
+						if (strcasecmp($existingHash, $entry->hash()) === 0 || $existingHash === '00000000000000000000000000000000') {
+							//This entry already exists and is unchanged. TODO: Remove the test with the zero'ed hash in FreshRSS v1.3
+							$oldGuids[] = $entry->guid();
+						} else {	//This entry already exists but has been updated
+							Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
+								', old hash ' . $existingHash . ', new hash ' . $entry->hash());
+							$entry->_isRead($is_read);	//Reset is_read
+							if (!$entryDAO->hasTransaction()) {
+								$entryDAO->beginTransaction();
+							}
+							$entryDAO->updateEntry($entry->toArray());
+						}
+					} elseif ($feed_history == 0 && $entry_date < $date_min) {
+						// This entry should not be added considering configuration and date.
+						$oldGuids[] = $entry->guid();
+					} else {
+						$id = uTimeString();
+						if ($use_declared_date || $entry_date < $date_min) {
+							// Use declared date at first import.
+							$id = min(time(), $entry_date) . uSecString();
+						}
+
+						$entry->_id($id);
+						$entry->_isRead($is_read);
+
+						$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+						if ($entry === null) {
+							// An extension has returned a null value, there is nothing to insert.
+							continue;
+						}
+
+						if (!$entryDAO->hasTransaction()) {
+							$entryDAO->beginTransaction();
+						}
+						$entryDAO->addEntry($entry->toArray());
 					}
-
-					$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();
-					$entryDAO->addEntry($values, $prepared_statement);
 				}
+				$entryDAO->updateLastSeen($feed->id(), $oldGuids);
 			}
+			//TODO: updateLastSeen old GUIDS once in a while, in the case of caching (i.e. the whole feed content has not changed)
 
 			if ($feed_history >= 0 && rand(0, 30) === 1) {
 				// TODO: move this function in web cron when available (see entry::purge)
 				// Remove old entries once in 30.
-				if (!$feedDAO->hasTransaction()) {
-					$feedDAO->beginTransaction();
+				if (!$entryDAO->hasTransaction()) {
+					$entryDAO->beginTransaction();
 				}
+				//TODO: more robust system based on entry.lastSeen to avoid cleaning entries that are still published in the RSS feed.
 
 				$nb = $feedDAO->cleanOldEntries($feed->id(),
 				                                $date_min,
@@ -377,9 +395,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				}
 			}
 
-			$feedDAO->updateLastUpdate($feed->id(), 0, $feedDAO->hasTransaction());
-			if ($feedDAO->hasTransaction()) {
-				$feedDAO->commit();
+			$feedDAO->updateLastUpdate($feed->id(), 0, $entryDAO->hasTransaction());
+			if ($entryDAO->hasTransaction()) {
+				$entryDAO->commit();
 			}
 
 			if ($feed->url() !== $url) {
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 589777b2a..26b163e43 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -361,7 +361,6 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		}
 
 		// Then, articles are imported.
-		$prepared_statement = $this->entryDAO->addEntryPrepare();
 		$this->entryDAO->beginTransaction();
 		foreach ($article_object['items'] as $item) {
 			if (!isset($article_to_feed[$item['id']])) {
@@ -396,7 +395,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			}
 
 			$values = $entry->toArray();
-			$id = $this->entryDAO->addEntry($values, $prepared_statement);
+			$id = $this->entryDAO->addEntry($values);
 
 			if (!$error && ($id === false)) {
 				$error = true;
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 346c98a92..6931c9f25 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -14,6 +14,7 @@ class FreshRSS_Entry extends Minz_Model {
 	private $content;
 	private $link;
 	private $date;
+	private $hash = null;
 	private $is_read;
 	private $is_favorite;
 	private $feed;
@@ -88,6 +89,14 @@ class FreshRSS_Entry extends Minz_Model {
 		}
 	}
 
+	public function hash() {
+		if ($this->hash === null) {
+			//Do not include $this->date because it may be automatically generated when lacking
+			$this->hash = md5($this->link . $this->title . $this->author . $this->content . $this->tags(true));
+		}
+		return $this->hash;
+	}
+
 	public function _id($value) {
 		$this->id = $value;
 	}
@@ -95,18 +104,23 @@ class FreshRSS_Entry extends Minz_Model {
 		$this->guid = $value;
 	}
 	public function _title($value) {
+		$this->hash = null;
 		$this->title = $value;
 	}
 	public function _author($value) {
+		$this->hash = null;
 		$this->author = $value;
 	}
 	public function _content($value) {
+		$this->hash = null;
 		$this->content = $value;
 	}
 	public function _link($value) {
+		$this->hash = null;
 		$this->link = $value;
 	}
 	public function _date($value) {
+		$this->hash = null;
 		$value = intval($value);
 		$this->date = $value > 1 ? $value : time();
 	}
@@ -120,6 +134,7 @@ class FreshRSS_Entry extends Minz_Model {
 		$this->feed = $value;
 	}
 	public function _tags($value) {
+		$this->hash = null;
 		if (!is_array($value)) {
 			$value = array($value);
 		}
@@ -182,6 +197,7 @@ class FreshRSS_Entry extends Minz_Model {
 			'content' => $this->content(),
 			'link' => $this->link(),
 			'date' => $this->date(true),
+			'hash' => $this->hash(),
 			'is_read' => $this->isRead(),
 			'is_favorite' => $this->isFavorite(),
 			'id_feed' => $this->feed(),
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 9736d5cd3..5b4b85547 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -6,20 +6,57 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return parent::$sharedDbType !== 'sqlite';
 	}
 
-	public function addEntryPrepare() {
-		$sql = 'INSERT INTO `' . $this->prefix . 'entry`(id, guid, title, author, '
-		     . ($this->isCompressed() ? 'content_bin' : 'content')
-		     . ', link, date, is_read, is_favorite, id_feed, tags) '
-		     . 'VALUES(?, ?, ?, ?, '
-		     . ($this->isCompressed() ? 'COMPRESS(?)' : '?')
-		     . ', ?, ?, ?, ?, ?, ?)';
-		return $this->bd->prepare($sql);
+	protected function autoAddColumn($errorInfo) {
+		if (isset($errorInfo[0])) {
+			if ($errorInfo[0] == '42S22') {	//ER_BAD_FIELD_ERROR
+				$hasTransaction = false;
+				try {
+					$stm = null;
+					if (stripos($errorInfo[2], 'lastSeen') !== false) {	//v1.2
+						if (!$this->bd->inTransaction()) {
+							$this->bd->beginTransaction();
+							$hasTransaction = true;
+						}
+						$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN lastSeen INT(11) NOT NULL');
+						if ($stm && $stm->execute()) {
+							$stm = $this->bd->prepare('CREATE INDEX entry_lastSeen_index ON `' . $this->prefix . 'entry`(`lastSeen`);');	//"IF NOT EXISTS" does not exist in MySQL 5.7
+							if ($stm && $stm->execute()) {
+								if ($hasTransaction) {
+									$this->bd->commit();
+								}
+								return true;
+							}
+						}
+						if ($hasTransaction) {
+							$this->bd->rollBack();
+						}
+					} elseif (stripos($errorInfo[2], 'hash') !== false) {	//v1.2
+						$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16) NOT NULL');
+						return $stm && $stm->execute();
+					}
+				} catch (Exception $e) {
+					Minz_Log::debug('FreshRSS_EntryDAO::autoAddColumn error: ' . $e->getMessage());
+					if ($hasTransaction) {
+						$this->bd->rollBack();
+					}
+				}
+			}
+		}
+		return false;
 	}
 
-	public function addEntry($valuesTmp, $preparedStatement = null) {
-		$stm = $preparedStatement === null ?
-				FreshRSS_EntryDAO::addEntryPrepare() :
-				$preparedStatement;
+	private $addEntryPrepared = null;
+
+	public function addEntry($valuesTmp) {
+		if ($this->addEntryPrepared === null) {
+			$sql = 'INSERT INTO `' . $this->prefix . 'entry` (id, guid, title, author, '
+			     . ($this->isCompressed() ? 'content_bin' : 'content')
+			     . ', link, date, lastSeen, hash, is_read, is_favorite, id_feed, tags) '
+			     . 'VALUES(?, ?, ?, ?, '
+			     . ($this->isCompressed() ? 'COMPRESS(?)' : '?')
+			     . ', ?, ?, ?, X?, ?, ?, ?, ?)';
+			$this->addEntryPrepared = $this->bd->prepare($sql);
+		}
 
 		$values = array(
 			$valuesTmp['id'],
@@ -29,55 +66,65 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$valuesTmp['content'],
 			substr($valuesTmp['link'], 0, 1023),
 			$valuesTmp['date'],
+			time(),
+			$valuesTmp['hash'],
 			$valuesTmp['is_read'] ? 1 : 0,
 			$valuesTmp['is_favorite'] ? 1 : 0,
 			$valuesTmp['id_feed'],
 			substr($valuesTmp['tags'], 0, 1023),
 		);
 
-		if ($stm && $stm->execute($values)) {
+		if ($this->addEntryPrepared && $this->addEntryPrepared->execute($values)) {
 			return $this->bd->lastInsertId();
 		} 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
+			$info = $this->addEntryPrepared == null ? array(2 => 'syntax error') : $this->addEntryPrepared->errorInfo();
+			if ($this->autoAddColumn($info)) {
+				return $this->addEntry($valuesTmp);
+			} elseif ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
 				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::debug('SQL error ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
-			}*/
+			}
 			return false;
 		}
 	}
 
-	public function addEntryObject($entry, $conf, $feedHistory) {
-		$existingGuids = array_fill_keys(
-			$this->listLastGuidsByFeed($entry->feed(), 20), 1
-		);
-
-		$nb_month_old = max($conf->old_entries, 1);
-		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
+	private $updateEntryPrepared = null;
 
-		$eDate = $entry->date(true);
-
-		if ($feedHistory == -2) {
-			$feedHistory = $conf->keep_history_default;
+	public function updateEntry($valuesTmp) {
+		if ($this->updateEntryPrepared === null) {
+			$sql = 'UPDATE `' . $this->prefix . 'entry` '
+			     . 'SET title=?, author=?, '
+			     . ($this->isCompressed() ? 'content_bin=COMPRESS(?)' : 'content=?')
+			     . ', link=?, date=?, lastSeen=?, hash=X?, is_read=?, tags=? '
+			     . 'WHERE id_feed=? AND guid=?';
+			$this->updateEntryPrepared = $this->bd->prepare($sql);
 		}
 
-		if (!isset($existingGuids[$entry->guid()]) &&
-				($feedHistory != 0 || $eDate >= $date_min || $entry->isFavorite())) {
-			$values = $entry->toArray();
-
-			$useDeclaredDate = empty($existingGuids);
-			$values['id'] = ($useDeclaredDate || $eDate < $date_min) ?
-				min(time(), $eDate) . uSecString() :
-				uTimeString();
+		$values = array(
+			substr($valuesTmp['title'], 0, 255),
+			substr($valuesTmp['author'], 0, 255),
+			$valuesTmp['content'],
+			substr($valuesTmp['link'], 0, 1023),
+			$valuesTmp['date'],
+			time(),
+			$valuesTmp['hash'],
+			$valuesTmp['is_read'] ? 1 : 0,
+			substr($valuesTmp['tags'], 0, 1023),
+			$valuesTmp['id_feed'],
+			substr($valuesTmp['guid'], 0, 760),
+		);
 
-			return $this->addEntry($values);
+		if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute($values)) {
+			return $this->bd->lastInsertId();
+		} else {
+			$info = $this->updateEntryPrepared == null ? array(2 => 'syntax error') : $this->updateEntryPrepared->errorInfo();
+			if ($this->autoAddColumn($info)) {
+				return $this->updateEntry($valuesTmp);
+			}
+			Minz_Log::error('SQL error updateEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
+				. ' while updating entry with GUID ' . $valuesTmp['guid'] . ' in feed ' . $valuesTmp['id_feed']);
+			return false;
 		}
-
-		// We don't return Entry object to avoid a research in DB
-		return -1;
 	}
 
 	/**
@@ -94,6 +141,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if (!is_array($ids)) {
 			$ids = array($ids);
 		}
+		if (count($ids) < 1) {
+			return 0;
+		}
 		$sql = 'UPDATE `' . $this->prefix . 'entry` '
 		     . 'SET is_favorite=? '
 		     . 'WHERE id IN (' . str_repeat('?,', count($ids) - 1). '?)';
@@ -296,11 +346,11 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 *
 	 * If $idMax equals 0, a deprecated debug message is logged
 	 *
-	 * @param integer $id feed ID
+	 * @param integer $id_feed feed ID
 	 * @param integer $idMax fail safe article ID
 	 * @return integer affected rows
 	 */
-	public function markReadFeed($id, $idMax = 0) {
+	public function markReadFeed($id_feed, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadFeed(0) is deprecated!');
@@ -310,7 +360,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$sql = 'UPDATE `' . $this->prefix . 'entry` '
 			 . 'SET is_read=1 '
 			 . 'WHERE id_feed=? AND is_read=0 AND id <= ?';
-		$values = array($id, $idMax);
+		$values = array($id_feed, $idMax);
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
@@ -324,7 +374,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$sql = 'UPDATE `' . $this->prefix . 'feed` '
 				 . 'SET cache_nbUnreads=cache_nbUnreads-' . $affected
 				 . ' WHERE id=?';
-			$values = array($id);
+			$values = array($id_feed);
 			$stm = $this->bd->prepare($sql);
 			if (!($stm && $stm->execute($values))) {
 				$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
@@ -338,7 +388,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return $affected;
 	}
 
-	public function searchByGuid($feed_id, $id) {
+	public function searchByGuid($id_feed, $guid) {
 		// un guid est unique pour un flux donné
 		$sql = 'SELECT id, guid, title, author, '
 		     . ($this->isCompressed() ? 'UNCOMPRESS(content_bin) AS content' : 'content')
@@ -347,8 +397,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$stm = $this->bd->prepare($sql);
 
 		$values = array(
-			$feed_id,
-			$id
+			$id_feed,
+			$guid,
 		);
 
 		$stm->execute($values);
@@ -519,12 +569,52 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return $stm->fetchAll(PDO::FETCH_COLUMN, 0);
 	}
 
-	public function listLastGuidsByFeed($id, $n) {
-		$sql = 'SELECT guid FROM `' . $this->prefix . 'entry` WHERE id_feed=? ORDER BY id DESC LIMIT ' . intval($n);
+	public function listHashForFeedGuids($id_feed, $guids) {
+		if (count($guids) < 1) {
+			return array();
+		}
+		$sql = 'SELECT guid, hex(hash) AS hexHash FROM `' . $this->prefix . 'entry` WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
 		$stm = $this->bd->prepare($sql);
-		$values = array($id);
-		$stm->execute($values);
-		return $stm->fetchAll(PDO::FETCH_COLUMN, 0);
+		$values = array($id_feed);
+		$values = array_merge($values, $guids);
+		if ($stm && $stm->execute($values)) {
+			$result = array();
+			$rows = $stm->fetchAll(PDO::FETCH_ASSOC);
+			foreach ($rows as $row) {
+				$result[$row['guid']] = $row['hexHash'];
+			}
+			return $result;
+		} else {
+			
+			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
+			if ($this->autoAddColumn($info)) {
+				return $this->listHashForFeedGuids($id_feed, $guids);
+			}
+			Minz_Log::error('SQL error listHashForFeedGuids: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
+				. ' while querying feed ' . $id_feed);
+			return false;
+		}
+	}
+
+	public function updateLastSeen($id_feed, $guids) {
+		if (count($guids) < 1) {
+			return 0;
+		}
+		$sql = 'UPDATE `' . $this->prefix . 'entry` SET lastSeen=? WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
+		$stm = $this->bd->prepare($sql);
+		$values = array(time(), $id_feed);
+		$values = array_merge($values, $guids);
+		if ($stm && $stm->execute($values)) {
+			return $stm->rowCount();
+		} else {
+			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
+			if ($this->autoAddColumn($info)) {
+				return $this->updateLastSeen($id_feed, $guids);
+			}
+			Minz_Log::error('SQL error updateLastSeen: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
+				. ' while updating feed ' . $id_feed);
+			return false;
+		}
 	}
 
 	public function countUnreadRead() {
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5ce03be5d..27c83ffd5 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -255,6 +255,7 @@ class FreshRSS_Feed extends Minz_Model {
 
 				$feed->__destruct();	//http://simplepie.org/wiki/faq/i_m_getting_memory_leaks
 				unset($feed);
+				//TODO: Return a different information in case of cache/no-cache, and give access to the GUIDs in case of cache
 			}
 		}
 	}
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index cf0159199..afdd821b2 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `%1$sfeed` (
 	`name` varchar(255) NOT NULL,
 	`website` varchar(255) CHARACTER SET latin1,
 	`description` text,
-	`lastUpdate` int(11) DEFAULT 0,
+	`lastUpdate` int(11) DEFAULT 0,	-- Until year 2038
 	`priority` tinyint(2) NOT NULL DEFAULT 10,
 	`pathEntries` varchar(511) DEFAULT NULL,
 	`httpAuth` varchar(511) DEFAULT NULL,
@@ -40,7 +40,9 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 	`author` varchar(255),
 	`content_bin` blob,	-- v0.7
 	`link` varchar(1023) CHARACTER SET latin1 NOT NULL,
-	`date` int(11),
+	`date` int(11),	-- Until year 2038
+	`lastSeen` INT(11) NOT NULL,	-- v1.2, Until year 2038
+	`hash` BINARY(16),	-- v1.2
 	`is_read` boolean NOT NULL DEFAULT 0,
 	`is_favorite` boolean NOT NULL DEFAULT 0,
 	`id_feed` SMALLINT,	-- v0.7
@@ -50,6 +52,7 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 	UNIQUE KEY (`id_feed`,`guid`),	-- v0.7
 	INDEX (`is_favorite`),	-- v0.7
 	INDEX (`is_read`)	-- v0.7
+	INDEX entry_lastSeen_index (`lastSeen`)	-- v1.2
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
 ENGINE = INNODB;
 
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 30bca2810..7517ead45 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -14,7 +14,7 @@ $SQL_CREATE_TABLES = array(
 	`name` varchar(255) NOT NULL,
 	`website` varchar(255),
 	`description` text,
-	`lastUpdate` int(11) DEFAULT 0,
+	`lastUpdate` int(11) DEFAULT 0,	-- Until year 2038
 	`priority` tinyint(2) NOT NULL DEFAULT 10,
 	`pathEntries` varchar(511) DEFAULT NULL,
 	`httpAuth` varchar(511) DEFAULT NULL,
@@ -38,7 +38,9 @@ $SQL_CREATE_TABLES = array(
 	`author` varchar(255),
 	`content` text,
 	`link` varchar(1023) NOT NULL,
-	`date` int(11),
+	`date` int(11),	-- Until year 2038
+	`lastSeen` INT(11) NOT NULL,	-- v1.2, Until year 2038
+	`hash` BINARY(16),	-- v1.2
 	`is_read` boolean NOT NULL DEFAULT 0,
 	`is_favorite` boolean NOT NULL DEFAULT 0,
 	`id_feed` SMALLINT,
@@ -50,6 +52,7 @@ $SQL_CREATE_TABLES = array(
 
 'CREATE INDEX IF NOT EXISTS entry_is_favorite_index ON `%1$sentry`(`is_favorite`);',
 'CREATE INDEX IF NOT EXISTS entry_is_read_index ON `%1$sentry`(`is_read`);',
+'CREATE INDEX IF NOT EXISTS entry_lastSeen_index ON `%1$sentry`(`lastSeen`);',	//v1.2
 
 'INSERT OR IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");',
 );
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index e5fe73041..c6bdfde0e 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -38,7 +38,7 @@ function classAutoloader($class) {
 				include(APP_PATH . '/Models/' . $components[1] . '.php');
 				return;
 			case 3:	//Controllers, Exceptions
-				@include(APP_PATH . '/' . $components[2] . 's/' . $components[1] . $components[2] . '.php');
+				include(APP_PATH . '/' . $components[2] . 's/' . $components[1] . $components[2] . '.php');
 				return;
 		}
 	} elseif (strpos($class, 'Minz') === 0) {
-- 
cgit v1.2.3


From 2d18910d02d92098257b96766e5b89a780daab0b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Apr 2015 12:41:16 +0200
Subject: Support for Internationalized Domain Names (IDN)

https://github.com/FreshRSS/FreshRSS/issues/819
Add explicit conversion from IDN to Punycode.

Requires PHP 5.3 IDN extension http://php.net/intl.idn (php5-idn package
on Debian/Ubuntu).

For systems without PHP 5.3+ IDN extension, we may consider adding a
dependency (322 kB) to the third-party library
https://phlymail.com/en/downloads/idna-convert.html

See PHP bug 53474 FILTER_VALIDATE_URL should not fail URL's that use
IDNhttps://bugs.php.net/bug.php?id=53474
---
 README.fr.md    |  2 +-
 README.md       |  2 +-
 lib/lib_rss.php | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 380d7bc1e..ea5b07a9b 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -32,7 +32,7 @@ Privilégiez pour cela des demandes sur GitHub
 	* Fonctionne même sur un Raspberry Pi avec des temps de réponse < 1s (testé sur 150 flux, 22k articles, soit 32Mo de données partiellement compressées)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.2.1+ (PHP 5.3.7+ recommandé)
-	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (seulement pour accès API sur platformes < 64 bits)
+	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur platformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
 * MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
 * Un navigateur Web récent tel Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
diff --git a/README.md b/README.md
index a09a64639..92072b07d 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The best way is to open issues on GitHub
 	* It even works on Raspberry Pi with response time under a second (tested with 150 feeds, 22k articles, or 32Mo of compressed data)
 * A web server: Apache2 (recommanded), nginx, lighttpd (not tested on others)
 * 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)
+	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
 	* 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) or SQLite 3.7.4+
 * A recent browser like Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index e5fe73041..bc5d6fc5b 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -51,6 +51,21 @@ function classAutoloader($class) {
 spl_autoload_register('classAutoloader');
 //</Auto-loading>
 
+function idn_to_punny($url) {
+	if (function_exists('idn_to_ascii')) {
+		$parts = parse_url($url);
+		if (!empty($parts['host'])) {
+			$idn = $parts['host'];
+			$punny = idn_to_ascii($idn);
+			$pos = strpos($url, $idn);
+			if ($pos !== false) {
+				return substr_replace($url, $punny, $pos, strlen($idn));
+			}
+		}
+	}
+	return $url;
+}
+
 function checkUrl($url) {
 	if (empty ($url)) {
 		return '';
@@ -58,6 +73,7 @@ function checkUrl($url) {
 	if (!preg_match ('#^https?://#i', $url)) {
 		$url = 'http://' . $url;
 	}
+	$url = idn_to_punny($url);	//PHP bug #53474 IDN
 	if (filter_var($url, FILTER_VALIDATE_URL) ||
 		(version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($url, '-') > 0) &&	//PHP bug #51192
 		 ($url === filter_var($url, FILTER_SANITIZE_URL)))) {
-- 
cgit v1.2.3


From 06b76831dece01f836c9d0a3cc32c3f59910fe60 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Apr 2015 13:07:34 +0200
Subject: Punycode spelling mistake

https://github.com/FreshRSS/FreshRSS/pull/820
---
 data/subscriptions/.gitignore | 1 +
 lib/lib_rss.php               | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 data/subscriptions/.gitignore

diff --git a/data/subscriptions/.gitignore b/data/subscriptions/.gitignore
new file mode 100644
index 000000000..150f68c80
--- /dev/null
+++ b/data/subscriptions/.gitignore
@@ -0,0 +1 @@
+*/*
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index bc5d6fc5b..c4f6a6011 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -51,15 +51,15 @@ function classAutoloader($class) {
 spl_autoload_register('classAutoloader');
 //</Auto-loading>
 
-function idn_to_punny($url) {
+function idn_to_puny($url) {
 	if (function_exists('idn_to_ascii')) {
 		$parts = parse_url($url);
 		if (!empty($parts['host'])) {
 			$idn = $parts['host'];
-			$punny = idn_to_ascii($idn);
+			$puny = idn_to_ascii($idn);
 			$pos = strpos($url, $idn);
 			if ($pos !== false) {
-				return substr_replace($url, $punny, $pos, strlen($idn));
+				return substr_replace($url, $puny, $pos, strlen($idn));
 			}
 		}
 	}
@@ -73,7 +73,7 @@ function checkUrl($url) {
 	if (!preg_match ('#^https?://#i', $url)) {
 		$url = 'http://' . $url;
 	}
-	$url = idn_to_punny($url);	//PHP bug #53474 IDN
+	$url = idn_to_puny($url);	//PHP bug #53474 IDN
 	if (filter_var($url, FILTER_VALIDATE_URL) ||
 		(version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($url, '-') > 0) &&	//PHP bug #51192
 		 ($url === filter_var($url, FILTER_SANITIZE_URL)))) {
-- 
cgit v1.2.3


From 8ea9cdd703179cddaebfb35ab4584565b93d3507 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Apr 2015 13:11:50 +0200
Subject: Revert file supposed to be in another branch

---
 data/subscriptions/.gitignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 data/subscriptions/.gitignore

diff --git a/data/subscriptions/.gitignore b/data/subscriptions/.gitignore
deleted file mode 100644
index 150f68c80..000000000
--- a/data/subscriptions/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*/*
-- 
cgit v1.2.3


From d229216cccbd746b46630a44fa508ef0367ea1a1 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 22 Apr 2015 00:24:22 -0400
Subject: Split the search into values

Before, the search was a single value.
Now it is splited in chuncks when separated by spaces.
Except if they are enclosed by single quotes or double quotes.

For some reasons, the unit tests are working for both single and double quotes but the
search box isn't. It is working only with single quotes.
We need to investigate the reason of this behavior.

See #823
---
 app/Models/EntryDAO.php         |  8 +++--
 app/Models/Search.php           | 32 +++++++++++++++++--
 tests/app/Models/SearchTest.php | 68 +++++++++++++++++++++++++----------------
 3 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 9736d5cd3..5bdc216bc 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -478,11 +478,13 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				}
 			}
 			if ($filter->getSearch()) {
-				$search .= 'AND ' . $this->sqlconcat('e1.title', $this->isCompressed() ? 'UNCOMPRESS(content_bin)' : 'content') . ' LIKE ? ';
-				$values[] = "%{$filter->getSearch()}%";
+				$search_values = $filter->getSearch();
+				foreach ($search_values as $search_value) {
+					$search .= 'AND ' . $this->sqlconcat('e1.title', $this->isCompressed() ? 'UNCOMPRESS(content_bin)' : 'content') . ' LIKE ? ';
+					$values[] = "%{$search_value}%";
+				}
 			}
 		}
-
 		return array($values,
 			'SELECT e1.id FROM `' . $this->prefix . 'entry` e1 '
 			. ($joinFeed ? 'INNER JOIN `' . $this->prefix . 'feed` f ON e1.id_feed=f.id ' : '')
diff --git a/app/Models/Search.php b/app/Models/Search.php
index 84688be2e..575a9a2cb 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -34,9 +34,9 @@ class FreshRSS_Search {
 		$input = $this->parsePubdateSearch($input);
 		$input = $this->parseDateSearch($input);
 		$input = $this->parseTagsSeach($input);
-		$this->search = $this->cleanSearch($input);
+		$this->parseSearch($input);
 	}
-	
+
 	public function __toString() {
 		return $this->getRawInput();
 	}
@@ -187,6 +187,34 @@ class FreshRSS_Search {
 		return $input;
 	}
 
+	/**
+	 * Parse the search string to find search values.
+	 * Every word is a distinct search value, except when using a delimiter.
+	 * Supported delimiters are single quote (') and double quotes (").
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	private function parseSearch($input) {
+		$input = $this->cleanSearch($input);
+		if (strcmp($input, '') == 0) {
+			return;
+		}
+		if (preg_match_all('/(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $input, $matches)) {
+			$this->search = $matches['search'];
+			$input = str_replace($matches[0], '', $input);
+		}
+		$input = $this->cleanSearch($input);
+		if (strcmp($input, '') == 0) {
+			return;
+		}
+		if (is_array($this->search)) {
+			$this->search = array_merge($this->search, explode(' ', $input));
+		} else {
+			$this->search = explode(' ', $input);
+		}
+	}
+
 	/**
 	 * Remove all unnecessary spaces in the search
 	 *
diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
index 9e3ca6765..73ff56cc6 100644
--- a/tests/app/Models/SearchTest.php
+++ b/tests/app/Models/SearchTest.php
@@ -51,20 +51,21 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 	public function provideIntitleSearch() {
 		return array(
 		    array('intitle:word1', 'word1', null),
-		    array('intitle:word1 word2', 'word1', 'word2'),
+		    array('intitle:word1 word2', 'word1', array('word2')),
 		    array('intitle:"word1 word2"', 'word1 word2', null),
 		    array("intitle:'word1 word2'", 'word1 word2', null),
-		    array('word1 intitle:word2', 'word2', 'word1'),
-		    array('word1 intitle:word2 word3', 'word2', 'word1 word3'),
-		    array('word1 intitle:"word2 word3"', 'word2 word3', 'word1'),
-		    array("word1 intitle:'word2 word3'", 'word2 word3', 'word1'),
-		    array('intitle:word1 intitle:word2', 'word1', 'intitle:word2'),
-		    array('intitle: word1 word2', null, 'word1 word2'),
+		    array('word1 intitle:word2', 'word2', array('word1')),
+		    array('word1 intitle:word2 word3', 'word2', array('word1', 'word3')),
+		    array('word1 intitle:"word2 word3"', 'word2 word3', array('word1')),
+		    array("word1 intitle:'word2 word3'", 'word2 word3', array('word1')),
+		    array('intitle:word1 intitle:word2', 'word1', array('intitle:word2')),
+		    array('intitle: word1 word2', null, array('word1', 'word2')),
 		    array('intitle:123', '123', null),
-		    array('intitle:"word1 word2" word3"', 'word1 word2', 'word3"'),
-		    array("intitle:'word1 word2' word3'", 'word1 word2', "word3'"),
+		    array('intitle:"word1 word2" word3"', 'word1 word2', array('word3"')),
+		    array("intitle:'word1 word2' word3'", 'word1 word2', array("word3'")),
 		    array('intitle:"word1 word2\' word3"', "word1 word2' word3", null),
 		    array("intitle:'word1 word2\" word3'", 'word1 word2" word3', null),
+		    array("intitle:word1 'word2 word3' word4", 'word1', array('word2 word3', 'word4')),
 		);
 	}
 
@@ -86,20 +87,21 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 	public function provideAuthorSearch() {
 		return array(
 		    array('author:word1', 'word1', null),
-		    array('author:word1 word2', 'word1', 'word2'),
+		    array('author:word1 word2', 'word1', array('word2')),
 		    array('author:"word1 word2"', 'word1 word2', null),
 		    array("author:'word1 word2'", 'word1 word2', null),
-		    array('word1 author:word2', 'word2', 'word1'),
-		    array('word1 author:word2 word3', 'word2', 'word1 word3'),
-		    array('word1 author:"word2 word3"', 'word2 word3', 'word1'),
-		    array("word1 author:'word2 word3'", 'word2 word3', 'word1'),
-		    array('author:word1 author:word2', 'word1', 'author:word2'),
-		    array('author: word1 word2', null, 'word1 word2'),
+		    array('word1 author:word2', 'word2', array('word1')),
+		    array('word1 author:word2 word3', 'word2', array('word1', 'word3')),
+		    array('word1 author:"word2 word3"', 'word2 word3', array('word1')),
+		    array("word1 author:'word2 word3'", 'word2 word3', array('word1')),
+		    array('author:word1 author:word2', 'word1', array('author:word2')),
+		    array('author: word1 word2', null, array('word1', 'word2')),
 		    array('author:123', '123', null),
-		    array('author:"word1 word2" word3"', 'word1 word2', 'word3"'),
-		    array("author:'word1 word2' word3'", 'word1 word2', "word3'"),
+		    array('author:"word1 word2" word3"', 'word1 word2', array('word3"')),
+		    array("author:'word1 word2' word3'", 'word1 word2', array("word3'")),
 		    array('author:"word1 word2\' word3"', "word1 word2' word3", null),
 		    array("author:'word1 word2\" word3'", 'word1 word2" word3', null),
+		    array("author:word1 'word2 word3' word4", 'word1', array('word2 word3', 'word4')),
 		);
 	}
 
@@ -121,10 +123,11 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 	public function provideInurlSearch() {
 		return array(
 		    array('inurl:word1', 'word1', null),
-		    array('inurl: word1', null, 'word1'),
+		    array('inurl: word1', null, array('word1')),
 		    array('inurl:123', '123', null),
-		    array('inurl:word1 word2', 'word1', 'word2'),
-		    array('inurl:"word1 word2"', '"word1', 'word2"'),
+		    array('inurl:word1 word2', 'word1', array('word2')),
+		    array('inurl:"word1 word2"', '"word1', array('word2"')),
+		    array("inurl:word1 'word2 word3' word4", 'word1', array('word2 word3', 'word4')),
 		);
 	}
 
@@ -198,11 +201,12 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 	public function provideTagsSearch() {
 		return array(
 		    array('#word1', array('word1'), null),
-		    array('# word1', null, '# word1'),
+		    array('# word1', null, array('#', 'word1')),
 		    array('#123', array('123'), null),
-		    array('#word1 word2', array('word1'), 'word2'),
-		    array('#"word1 word2"', array('"word1'), 'word2"'),
+		    array('#word1 word2', array('word1'), array('word2')),
+		    array('#"word1 word2"', array('"word1'), array('word2"')),
 		    array('#word1 #word2', array('word1', 'word2'), null),
+		    array("#word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')),
 		);
 	}
 
@@ -257,7 +261,7 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 			'1172725200',
 			'1210564799',
 			array('word4', 'word5'),
-			'word6',
+			array('word6'),
 		    ),
 		    array(
 			'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 word7 date:2007-03-01/2008-05-11',
@@ -269,7 +273,19 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 			'1172725200',
 			'1210564799',
 			array('word4', 'word5'),
-			'word6 word7',
+			array('word6', 'word7'),
+		    ),
+		    array(
+			'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 "word7 word8" date:2007-03-01/2008-05-11',
+			'word1',
+			'1172725200',
+			'1210564799',
+			'word2',
+			'word3',
+			'1172725200',
+			'1210564799',
+			array('word4', 'word5'),
+			array('word7 word8', 'word6'),
 		    ),
 		);
 	}
-- 
cgit v1.2.3


From 7f7de31c1dcb6599be5c5713f36b4bde1d03d47a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 9 May 2015 13:07:54 +0200
Subject: SQL: update request for updated articles

https://github.com/FreshRSS/FreshRSS/issues/798
---
 app/Controllers/feedController.php |  2 +-
 app/Models/Entry.php               |  4 ++--
 app/Models/EntryDAO.php            | 16 +++++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 08a0257a2..59c9174fb 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -343,7 +343,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						} else {	//This entry already exists but has been updated
 							Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
 								', old hash ' . $existingHash . ', new hash ' . $entry->hash());
-							$entry->_isRead($is_read);	//Reset is_read
+							$entry->_isRead(null);	//Change is_read according to policy. //TODO: Implement option
 							if (!$entryDAO->hasTransaction()) {
 								$entryDAO->beginTransaction();
 							}
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 6931c9f25..a562a963a 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -15,7 +15,7 @@ class FreshRSS_Entry extends Minz_Model {
 	private $link;
 	private $date;
 	private $hash = null;
-	private $is_read;
+	private $is_read;	//Nullable boolean
 	private $is_favorite;
 	private $feed;
 	private $tags;
@@ -125,7 +125,7 @@ class FreshRSS_Entry extends Minz_Model {
 		$this->date = $value > 1 ? $value : time();
 	}
 	public function _isRead($value) {
-		$this->is_read = $value;
+		$this->is_read = $value === null ? null : (bool)$value;
 	}
 	public function _isFavorite($value) {
 		$this->is_favorite = $value;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 5b4b85547..543b61573 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -91,11 +91,17 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	private $updateEntryPrepared = null;
 
 	public function updateEntry($valuesTmp) {
+		if (!isset($valuesTmp['is_read'])) {
+			$valuesTmp['is_read'] = null;
+		}
+
 		if ($this->updateEntryPrepared === null) {
 			$sql = 'UPDATE `' . $this->prefix . 'entry` '
 			     . 'SET title=?, author=?, '
 			     . ($this->isCompressed() ? 'content_bin=COMPRESS(?)' : 'content=?')
-			     . ', link=?, date=?, lastSeen=?, hash=X?, is_read=?, tags=? '
+			     . ', link=?, date=?, lastSeen=?, hash=X?, '
+			     . ($valuesTmp['is_read'] === null ? '' : 'is_read=?, ')
+			     . 'tags=? '
 			     . 'WHERE id_feed=? AND guid=?';
 			$this->updateEntryPrepared = $this->bd->prepare($sql);
 		}
@@ -108,11 +114,15 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$valuesTmp['date'],
 			time(),
 			$valuesTmp['hash'],
-			$valuesTmp['is_read'] ? 1 : 0,
+		);
+		if ($valuesTmp['is_read'] !== null) {
+			$values[] = $valuesTmp['is_read'] ? 1 : 0;
+		}
+		$values = array_merge($values, array(
 			substr($valuesTmp['tags'], 0, 1023),
 			$valuesTmp['id_feed'],
 			substr($valuesTmp['guid'], 0, 760),
-		);
+		));
 
 		if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute($values)) {
 			return $this->bd->lastInsertId();
-- 
cgit v1.2.3


From 993466844405bd9854d890d6d5ebf763ed8b78cb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 9 May 2015 23:37:56 +0200
Subject: SQL: more robust purge

https://github.com/FreshRSS/FreshRSS/issues/798
https://github.com/FreshRSS/FreshRSS/issues/493
---
 app/Controllers/feedController.php | 13 +++++--------
 app/Models/Feed.php                |  3 +--
 app/Models/FeedDAO.php             |  8 +++++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 59c9174fb..5657d4a88 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -329,7 +329,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				// For this feed, check existing GUIDs already in database.
 				$existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
 				unset($newGuids);
-				$use_declared_date = empty($existingHashForGuids);
 
 				$oldGuids = array();
 				// Add entries in database if possible.
@@ -353,14 +352,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						// This entry should not be added considering configuration and date.
 						$oldGuids[] = $entry->guid();
 					} else {
-						$id = uTimeString();
-						if ($use_declared_date || $entry_date < $date_min) {
-							// Use declared date at first import.
+						if ($entry_date < $date_min) {
 							$id = min(time(), $entry_date) . uSecString();
+							$entry->_isRead(true);	//Old article that was not in database. Probably an error, so mark as read
+						} else {
+							$id = uTimeString();
+							$entry->_isRead($is_read);
 						}
-
 						$entry->_id($id);
-						$entry->_isRead($is_read);
 
 						$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
 						if ($entry === null) {
@@ -376,7 +375,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				}
 				$entryDAO->updateLastSeen($feed->id(), $oldGuids);
 			}
-			//TODO: updateLastSeen old GUIDS once in a while, in the case of caching (i.e. the whole feed content has not changed)
 
 			if ($feed_history >= 0 && rand(0, 30) === 1) {
 				// TODO: move this function in web cron when available (see entry::purge)
@@ -384,7 +382,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				if (!$entryDAO->hasTransaction()) {
 					$entryDAO->beginTransaction();
 				}
-				//TODO: more robust system based on entry.lastSeen to avoid cleaning entries that are still published in the RSS feed.
 
 				$nb = $feedDAO->cleanOldEntries($feed->id(),
 				                                $date_min,
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 27c83ffd5..5d377de9a 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -245,7 +245,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$this->_url($clean_url);
 				}
 
-				if (($mtime === true) ||($mtime > $this->lastUpdate)) {
+				if (($mtime === true) || ($mtime > $this->lastUpdate)) {
 					Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $clean_url);
 					$this->loadEntries($feed);	// et on charge les articles du flux
 				} else {
@@ -255,7 +255,6 @@ class FreshRSS_Feed extends Minz_Model {
 
 				$feed->__destruct();	//http://simplepie.org/wiki/faq/i_m_getting_memory_leaks
 				unset($feed);
-				//TODO: Return a different information in case of cache/no-cache, and give access to the GUIDs in case of cache
 			}
 		}
 	}
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index f48beee6e..c13e2b008 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -322,10 +322,12 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return $affected;
 	}
 
-	public function cleanOldEntries($id, $date_min, $keep = 15) {	//Remember to call updateLastUpdate($id) just after
+	public function cleanOldEntries($id, $date_min, $keep = 15) {	//Remember to call updateLastUpdate($id) or updateCachedValues() just after
 		$sql = 'DELETE FROM `' . $this->prefix . 'entry` '
-		     . 'WHERE id_feed = :id_feed AND id <= :id_max AND is_favorite=0 AND id NOT IN '
-		     . '(SELECT id FROM (SELECT e2.id FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed = :id_feed ORDER BY id DESC LIMIT :keep) keep)';	//Double select MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery'
+		     . 'WHERE id_feed = :id_feed AND id <= :id_max '
+		     . 'AND is_favorite=0 '	//Do not remove favourites
+		     . 'AND lastSeen < (SELECT maxLastSeen FROM (SELECT (MAX(e3.lastSeen) - 99) AS maxLastSeen FROM `' . $this->prefix . 'entry` e3 WHERE e3.id_feed = :id_feed) recent) '	//Do not remove the most newly seen articles, plus a few seconds of tolerance
+		     . 'AND id NOT IN (SELECT id FROM (SELECT e2.id FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed = :id_feed ORDER BY id DESC LIMIT :keep) keep)';	//Double select: MySQL doesn't support 'LIMIT & IN/ALL/ANY/SOME subquery'
 		$stm = $this->bd->prepare($sql);
 
 		$id_max = intval($date_min) . '000000';
-- 
cgit v1.2.3


From a7bc54bb996a87a66127101be548d181dc8dd935 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 9 May 2015 23:45:52 +0200
Subject: Minor spaces

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

diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index c13e2b008..76025ff53 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -324,10 +324,10 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 	public function cleanOldEntries($id, $date_min, $keep = 15) {	//Remember to call updateLastUpdate($id) or updateCachedValues() just after
 		$sql = 'DELETE FROM `' . $this->prefix . 'entry` '
-		     . 'WHERE id_feed = :id_feed AND id <= :id_max '
+		     . 'WHERE id_feed=:id_feed AND id<=:id_max '
 		     . 'AND is_favorite=0 '	//Do not remove favourites
-		     . 'AND lastSeen < (SELECT maxLastSeen FROM (SELECT (MAX(e3.lastSeen) - 99) AS maxLastSeen FROM `' . $this->prefix . 'entry` e3 WHERE e3.id_feed = :id_feed) recent) '	//Do not remove the most newly seen articles, plus a few seconds of tolerance
-		     . 'AND id NOT IN (SELECT id FROM (SELECT e2.id FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed = :id_feed ORDER BY id DESC LIMIT :keep) keep)';	//Double select: MySQL doesn't support 'LIMIT & IN/ALL/ANY/SOME subquery'
+		     . 'AND lastSeen < (SELECT maxLastSeen FROM (SELECT (MAX(e3.lastSeen)-99) AS maxLastSeen FROM `' . $this->prefix . 'entry` e3 WHERE e3.id_feed=:id_feed) recent) '	//Do not remove the most newly seen articles, plus a few seconds of tolerance
+		     . 'AND id NOT IN (SELECT id FROM (SELECT e2.id FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=:id_feed ORDER BY id DESC LIMIT :keep) keep)';	//Double select: MySQL doesn't support 'LIMIT & IN/ALL/ANY/SOME subquery'
 		$stm = $this->bd->prepare($sql);
 
 		$id_max = intval($date_min) . '000000';
-- 
cgit v1.2.3


From fedf062b4942a1e30608b662f713f06a83a0565c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 10 May 2015 11:50:08 +0200
Subject: Comments in config file

Documentation https://github.com/FreshRSS/FreshRSS/issues/123
---
 README.fr.md            |  1 +
 README.md               |  1 +
 data/config.default.php | 72 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/README.fr.md b/README.fr.md
index ea5b07a9b..6c77ccf51 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -46,6 +46,7 @@ Privilégiez pour cela des demandes sur GitHub
 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
 5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à me contacter.
+6. Des paramètres de configuration avancée peuvent être accédés depuis [config.php](./data/config.default.php).
 
 # Contrôle d’accès
 Il est requis pour le mode multi-utilisateur, et recommandé dans tous les cas, de limiter l’accès à votre FreshRSS. Au choix :
diff --git a/README.md b/README.md
index 92072b07d..089bbd780 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ The best way is to open issues on GitHub
 3. Add write access on `./data/` folder to the webserver user
 4. Access FreshRSS with your browser and follow the installation process
 5. Every thing should be working :) If you encounter any problem, feel free to contact me.
+6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
 # Access control
 It is needed for the multi-user mode to limit access to FreshRSS. You can:
diff --git a/data/config.default.php b/data/config.default.php
index 839bd1687..8be203d36 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -1,32 +1,104 @@
 <?php
 
+# Do not modify this file, which is only a template.
+# See `config.php` after the install process is completed.
 return array(
+
+	# Set to `development` to get additional error messages,
+	#	or to `production` to get only the most important messages.
 	'environment' => 'production',
+
+	# Used to make crypto more unique. Generated during install.
 	'salt' => '',
+
+	# Leave empty for most cases.
+	# Ability to override the address of the FreshRSS instance,
+	# used when building absolute URLs.
 	'base_url' => '',
+
+	# Natural language of the user interface, e.g. `en`, `fr`.
 	'language' => 'en',
+
+	# Title of this FreshRSS instance in the Web user interface.
 	'title' => 'FreshRSS',
+
+	# Name of the user that has administration rights.
 	'default_user' => '_',
+
+	# Allow or not visitors without login to see the articles
+	#	of the default user.
 	'allow_anonymous' => false,
+
+	# Allow or not anonymous users to start the refresh process.
 	'allow_anonymous_refresh' => false,
+
+	# Login method:
+	#	`none` is without password and shows only the default user;
+	#	`form` is a conventional Web login form;
+	#	`persona` is the email-based login by Mozilla;
+	#	`http_auth` is an access controled by the HTTP Web server (e.g. `/FreshRSS/p/i/.htaccess` for Apache)
+	#		if you use `http_auth`, remember to protect only `/FreshRSS/p/i/`,
+	#		and in particular not protect `/FreshRSS/p/api/` if you would like to use the API (different login system).
 	'auth_type' => 'none',
+
+	# Allow or not the use of the API, used for mobile apps.
+	#	End-point is http://example.net/FreshRSS/p/api/greader.php
+	#	You need to set the user's API password.
 	'api_enabled' => false,
+
+	# Allow or not the use of an unsafe login,
+	#	by providing username and password in the login URL:
+	#	http://example.net/FreshRSS/p/i/?c=auth&a=login&u=alice&p=1234
 	'unsafe_autologin_enabled' => false,
+
+	# Enable or not the use of syslog to log the activity of
+	#	SimplePie, which is retrieving RSS feeds via HTTP requests.
 	'simplepie_syslog_enabled' => true,
+
 	'limits' => array(
+
+		# Duration in seconds of the SimplePie cache,
+		#	during which a query to the RSS feed will return the local cached version.
+		# Especially important for multi-user setups.
 		'cache_duration' => 800,
+
+		# SimplePie HTTP request timeout in seconds.
 		'timeout' => 10,
+
+		# If a user has not used FreshRSS for more than x seconds,
+		#	then its feeds are not refreshed anymore.
 		'max_inactivity' => PHP_INT_MAX,
+
+		# Max number of feeds for a user.
 		'max_feeds' => 16384,
+
+		# Max number of categories for a user.
 		'max_categories' => 16384,
+
 	),
+
 	'db' => array(
+
+		# Type of database: `sqlite` or `mysql`.
 		'type' => 'sqlite',
+
+		# MySQL host.
 		'host' => '',
+
+		# MySQL user.
 		'user' => '',
+
+		# MySQL password.
 		'password' => '',
+
+		# MySQL database.
 		'base' => '',
+
+		# MySQL table prefix.
 		'prefix' => '',
+
 	),
+
+	# List of enabled FreshRSS extensions.
 	'extensions_enabled' => array(),
 );
-- 
cgit v1.2.3


From 5f545dfda2b6700579b856c815e1914a2dd62553 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 10 May 2015 12:14:38 +0200
Subject: Global option to mark updated articles as unread

https://github.com/FreshRSS/FreshRSS/issues/798
---
 app/Controllers/feedController.php | 3 ++-
 data/config.default.php            | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 5657d4a88..03f438888 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -342,7 +342,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						} else {	//This entry already exists but has been updated
 							Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
 								', old hash ' . $existingHash . ', new hash ' . $entry->hash());
-							$entry->_isRead(null);	//Change is_read according to policy. //TODO: Implement option
+							//TODO: Make an updated/is_read policy by feed, in addition to the global one.
+							$entry->_isRead(FreshRSS_Context::$system_conf->mark_updated_article_unread ? false : null);	//Change is_read according to policy.
 							if (!$entryDAO->hasTransaction()) {
 								$entryDAO->beginTransaction();
 							}
diff --git a/data/config.default.php b/data/config.default.php
index 8be203d36..dc947f154 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -55,6 +55,10 @@ return array(
 	#	SimplePie, which is retrieving RSS feeds via HTTP requests.
 	'simplepie_syslog_enabled' => true,
 
+	# In the case an article has changed (e.g. updated content):
+	#	Set to `true` to mark it unread, or `false` to leave it as-is.
+	'mark_updated_article_unread' => false,
+
 	'limits' => array(
 
 		# Duration in seconds of the SimplePie cache,
-- 
cgit v1.2.3


From 0d0c6b7493161d350ca2eb1d4c45c0c70cfcbb92 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 10 May 2015 14:04:12 +0200
Subject: Moved updated/unread option from global to user

https://github.com/FreshRSS/FreshRSS/issues/798
---
 app/Controllers/configureController.php | 1 +
 app/Controllers/feedController.php      | 2 +-
 app/Models/ConfigurationSetter.php      | 4 ++++
 app/i18n/de/conf.php                    | 1 +
 app/i18n/en/conf.php                    | 1 +
 app/i18n/fr/conf.php                    | 1 +
 app/views/configure/reading.phtml       | 9 +++++++++
 data/config.default.php                 | 4 ----
 data/users/_/config.default.php         | 5 +++++
 9 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index fc92aa0c2..248a3edcc 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -112,6 +112,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			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->mark_updated_article_unread = Minz_Request::param('mark_updated_article_unread', 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),
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 03f438888..a36a38ce2 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -343,7 +343,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
 								', old hash ' . $existingHash . ', new hash ' . $entry->hash());
 							//TODO: Make an updated/is_read policy by feed, in addition to the global one.
-							$entry->_isRead(FreshRSS_Context::$system_conf->mark_updated_article_unread ? false : null);	//Change is_read according to policy.
+							$entry->_isRead(FreshRSS_Context::$user_conf->mark_updated_article_unread ? false : null);	//Change is_read according to policy.
 							if (!$entryDAO->hasTransaction()) {
 								$entryDAO->beginTransaction();
 							}
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 7f433239c..4bd29ecb0 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -189,6 +189,10 @@ class FreshRSS_ConfigurationSetter {
 		$data['auto_remove_article'] = $this->handleBool($value);
 	}
 
+	private function _mark_updated_article_unread(&$data, $value) {
+		$data['mark_updated_article_unread'] = $this->handleBool($value);
+	}
+
 	private function _display_categories(&$data, $value) {
 		$data['display_categories'] = $this->handleBool($value);
 	}
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 64c2c0945..df2c07d49 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -84,6 +84,7 @@ return array(
 		'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',
+		'mark_updated_article_unread' => 'Markieren Sie aktualisierte Artikel als ungelesen',
 		'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',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 308c45d2c..683781696 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -84,6 +84,7 @@ return array(
 		'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',
+		'mark_updated_article_unread' => 'Mark updated articles as unread',
 		'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',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index d38445b99..87f9be290 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -84,6 +84,7 @@ return array(
 		'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',
+		'mark_updated_article_unread' => 'Marquer les articles mis à jour comme non-lus',
 		'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',
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 8b123afa8..1b7a101df 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -125,6 +125,15 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="mark_updated_article_unread">
+					<input type="checkbox" name="mark_updated_article_unread" id="mark_updated_article_unread" value="1"<?php echo FreshRSS_Context::$user_conf->mark_updated_article_unread ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->mark_updated_article_unread; ?>"/>
+					<?php echo _t('conf.reading.mark_updated_article_unread'); ?>
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name"><?php echo _t('conf.reading.read.when'); ?></label>
 			<div class="group-controls">
diff --git a/data/config.default.php b/data/config.default.php
index dc947f154..8be203d36 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -55,10 +55,6 @@ return array(
 	#	SimplePie, which is retrieving RSS feeds via HTTP requests.
 	'simplepie_syslog_enabled' => true,
 
-	# In the case an article has changed (e.g. updated content):
-	#	Set to `true` to mark it unread, or `false` to leave it as-is.
-	'mark_updated_article_unread' => false,
-
 	'limits' => array(
 
 		# Duration in seconds of the SimplePie cache,
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index 6d3f73a13..bf74ca1de 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -22,6 +22,11 @@ return array (
 	'sticky_post' => true,
 	'reading_confirm' => false,
 	'auto_remove_article' => false,
+
+	# In the case an article has changed (e.g. updated content):
+	#	Set to `true` to mark it unread, or `false` to leave it as-is.
+	'mark_updated_article_unread' => false,
+
 	'sort_order' => 'DESC',
 	'anon_access' => false,
 	'mark_when' => array (
-- 
cgit v1.2.3


From 79f0f2bbb48f5f4fb1ebd9350bf9bf6e1182e6cf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 10 May 2015 18:21:21 +0200
Subject: Bug Page 403 ne peut s'afficher si Translate n'est pas instancié
 avant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/FreshRSS/FreshRSS/issues/821
---
 app/Controllers/feedController.php | 2 +-
 app/FreshRSS.php                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index a36a38ce2..0443b4159 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -146,7 +146,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$name = $feed->name();
 			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
 			if ($feed === null) {
-				Minz_Request::bad(_t('feed_not_added', $name), $url_redirect);
+				Minz_Request::bad(_t('feedback.sub.feed.not_added', $name), $url_redirect);
 			}
 
 			$values = array(
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 021687999..044de9cd4 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -63,10 +63,11 @@ class FreshRSS extends Minz_FrontController {
 			// Basic protection against XSRF attacks
 			FreshRSS_Auth::removeAccess();
 			$http_referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
+			Minz_Translate::init('en');	//TODO: Better choice of fallback language
 			Minz_Error::error(
 				403,
 				array('error' => array(
-					_t('access_denied'),
+					_t('feedback.access.denied'),
 					' [HTTP_REFERER=' . htmlspecialchars($http_referer) . ']'
 				))
 			);
-- 
cgit v1.2.3


From f7a502b06e7b0fe0b8bbc5f41d96d4ea08eee98a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 10 May 2015 19:20:46 +0200
Subject: Cannot create an account with sqlite

https://github.com/FreshRSS/FreshRSS/issues/770
---
 app/install.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/install.php b/app/install.php
index 177173fdb..5f43b6415 100644
--- a/app/install.php
+++ b/app/install.php
@@ -741,6 +741,13 @@ function printStep3() {
 		<script>
 			function mySqlShowHide() {
 				document.getElementById('mysql').style.display = document.getElementById('type').value === 'mysql' ? 'block' : 'none';
+				if (document.getElementById('type').value !== 'mysql') {
+					document.getElementById('host').value = '';
+					document.getElementById('user').value = '';
+					document.getElementById('pass').value = '';
+					document.getElementById('base').value = '';
+					document.getElementById('prefix').value = '';
+				}
 			}
 			mySqlShowHide();
 		</script>
-- 
cgit v1.2.3


From 0745252b68f6f9b7c91ea437893b5f33b7a224c3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 10 May 2015 20:31:03 +0200
Subject: Hexadecimal literals do not work with SQLite/PDO

X'09AF' hexadecimal literals do not work with SQLite/PDO. Replaced by
PHP hex2bin().

https://github.com/FreshRSS/FreshRSS/commit/711530a512b370d79b079205ce1f8376174f7f03
---
 app/Models/EntryDAO.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index ebaeb3868..172eac897 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -54,7 +54,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			     . ', link, date, lastSeen, hash, is_read, is_favorite, id_feed, tags) '
 			     . 'VALUES(?, ?, ?, ?, '
 			     . ($this->isCompressed() ? 'COMPRESS(?)' : '?')
-			     . ', ?, ?, ?, X?, ?, ?, ?, ?)';
+			     . ', ?, ?, ?, ?, ?, ?, ?, ?)';
 			$this->addEntryPrepared = $this->bd->prepare($sql);
 		}
 
@@ -67,7 +67,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			substr($valuesTmp['link'], 0, 1023),
 			$valuesTmp['date'],
 			time(),
-			$valuesTmp['hash'],
+			hex2bin($valuesTmp['hash']),	// X'09AF' hexadecimal literals do not work with SQLite/PDO
 			$valuesTmp['is_read'] ? 1 : 0,
 			$valuesTmp['is_favorite'] ? 1 : 0,
 			$valuesTmp['id_feed'],
@@ -77,7 +77,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if ($this->addEntryPrepared && $this->addEntryPrepared->execute($values)) {
 			return $this->bd->lastInsertId();
 		} else {
-			$info = $this->addEntryPrepared == null ? array(2 => 'syntax error') : $this->addEntryPrepared->errorInfo();
+			$info = $this->addEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->addEntryPrepared->errorInfo();
 			if ($this->autoAddColumn($info)) {
 				return $this->addEntry($valuesTmp);
 			} elseif ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
@@ -99,7 +99,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$sql = 'UPDATE `' . $this->prefix . 'entry` '
 			     . 'SET title=?, author=?, '
 			     . ($this->isCompressed() ? 'content_bin=COMPRESS(?)' : 'content=?')
-			     . ', link=?, date=?, lastSeen=?, hash=X?, '
+			     . ', link=?, date=?, lastSeen=?, hash=?, '
 			     . ($valuesTmp['is_read'] === null ? '' : 'is_read=?, ')
 			     . 'tags=? '
 			     . 'WHERE id_feed=? AND guid=?';
@@ -113,7 +113,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			substr($valuesTmp['link'], 0, 1023),
 			$valuesTmp['date'],
 			time(),
-			$valuesTmp['hash'],
+			hex2bin($valuesTmp['hash']),
 		);
 		if ($valuesTmp['is_read'] !== null) {
 			$values[] = $valuesTmp['is_read'] ? 1 : 0;
@@ -127,7 +127,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute($values)) {
 			return $this->bd->lastInsertId();
 		} else {
-			$info = $this->updateEntryPrepared == null ? array(2 => 'syntax error') : $this->updateEntryPrepared->errorInfo();
+			$info = $this->updateEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->updateEntryPrepared->errorInfo();
 			if ($this->autoAddColumn($info)) {
 				return $this->updateEntry($valuesTmp);
 			}
@@ -598,7 +598,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			return $result;
 		} else {
 			
-			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
+			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
 			if ($this->autoAddColumn($info)) {
 				return $this->listHashForFeedGuids($id_feed, $guids);
 			}
@@ -619,7 +619,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if ($stm && $stm->execute($values)) {
 			return $stm->rowCount();
 		} else {
-			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
+			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
 			if ($this->autoAddColumn($info)) {
 				return $this->updateLastSeen($id_feed, $guids);
 			}
-- 
cgit v1.2.3


From ead849dbe3717966dff50e55d6bf849dafde87b7 Mon Sep 17 00:00:00 2001
From: Tets <github@tets.cz>
Date: Mon, 11 May 2015 10:20:17 +0200
Subject: Czech translation

---
 app/i18n/cz/feedback.php | 2 +-
 app/i18n/cz/sub.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index 52ff029ef..b75a4a15a 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -11,7 +11,7 @@ return array(
 	'auth' => array(
 		'form' => array(
 			'not_set' => 'Nastal problém s konfigurací přihlašovacího systému. Zkuste to prosím později.',
-			'set' => 'Webové formulář je nyní výchozí přihlašovací systém.',
+			'set' => 'Webový formulář je nyní výchozí přihlašovací systém.',
 		),
 		'login' => array(
 			'invalid' => 'Login není platný',
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index d7ff63fe9..78712506c 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -21,7 +21,7 @@ return array(
 		'css_help' => 'Stáhne zkrácenou verzi RSS kanálů (pozor, náročnější na čas!)',
 		'css_path' => 'Původní CSS soubor článku z webových stránek',
 		'description' => 'Popis',
-		'empty' => 'Kanál je prazdný. Ověřte prosím zda je ještě autorem udržován.',
+		'empty' => 'Kanál je prázdný. Ověřte prosím zda je ještě autorem udržován.',
 		'error' => 'Vyskytl se problém s kanálem. Ověřte že je vždy dostupný, prosím, a poté jej aktualizujte.',
 		'in_main_stream' => 'Zobrazit ve “Všechny kanály”',
 		'informations' => 'Informace',
-- 
cgit v1.2.3


From 217c191a1ba3ac03b847d261a32e19975380fcad Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 11 May 2015 22:42:41 +0200
Subject: More SQLite compatibility

Additional changes to add compatibility with SQLite for the new
hash/lastSeen mode of updating articles.
---
 app/Models/EntryDAO.php        | 71 ++++++++++++++++++++++++------------------
 app/Models/EntryDAOSQLite.php  | 15 +++++++++
 app/Models/FeedDAO.php         | 11 ++++---
 app/SQL/install.sql.mysql.php  |  2 +-
 app/SQL/install.sql.sqlite.php |  2 +-
 app/install.php                |  2 ++
 lib/Minz/ModelPdo.php          |  5 +++
 7 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 172eac897..eae9683ad 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -6,38 +6,48 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return parent::$sharedDbType !== 'sqlite';
 	}
 
-	protected function autoAddColumn($errorInfo) {
-		if (isset($errorInfo[0])) {
-			if ($errorInfo[0] == '42S22') {	//ER_BAD_FIELD_ERROR
-				$hasTransaction = false;
-				try {
-					$stm = null;
-					if (stripos($errorInfo[2], 'lastSeen') !== false) {	//v1.2
-						if (!$this->bd->inTransaction()) {
-							$this->bd->beginTransaction();
-							$hasTransaction = true;
-						}
-						$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN lastSeen INT(11) NOT NULL');
-						if ($stm && $stm->execute()) {
-							$stm = $this->bd->prepare('CREATE INDEX entry_lastSeen_index ON `' . $this->prefix . 'entry`(`lastSeen`);');	//"IF NOT EXISTS" does not exist in MySQL 5.7
-							if ($stm && $stm->execute()) {
-								if ($hasTransaction) {
-									$this->bd->commit();
-								}
-								return true;
-							}
-						}
+	protected function addColumn($name) {
+		Minz_Log::debug('FreshRSS_EntryDAO::autoAddColumn: ' . $name);
+		$hasTransaction = false;
+		try {
+			$stm = null;
+			if ($name === 'lastSeen') {	//v1.2
+				if (!$this->bd->inTransaction()) {
+					$this->bd->beginTransaction();
+					$hasTransaction = true;
+				}
+				$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN lastSeen INT(11) DEFAULT 0');
+				if ($stm && $stm->execute()) {
+					$stm = $this->bd->prepare('CREATE INDEX entry_lastSeen_index ON `' . $this->prefix . 'entry`(`lastSeen`);');	//"IF NOT EXISTS" does not exist in MySQL 5.7
+					if ($stm && $stm->execute()) {
 						if ($hasTransaction) {
-							$this->bd->rollBack();
+							$this->bd->commit();
 						}
-					} elseif (stripos($errorInfo[2], 'hash') !== false) {	//v1.2
-						$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16) NOT NULL');
-						return $stm && $stm->execute();
+						return true;
 					}
-				} catch (Exception $e) {
-					Minz_Log::debug('FreshRSS_EntryDAO::autoAddColumn error: ' . $e->getMessage());
-					if ($hasTransaction) {
-						$this->bd->rollBack();
+				}
+				if ($hasTransaction) {
+					$this->bd->rollBack();
+				}
+			} elseif ($name === 'hash') {	//v1.2
+				$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16)');
+				return $stm && $stm->execute();
+			}
+		} catch (Exception $e) {
+			Minz_Log::debug('FreshRSS_EntryDAO::autoAddColumn error: ' . $e->getMessage());
+			if ($hasTransaction) {
+				$this->bd->rollBack();
+			}
+		}
+		return false;
+	}
+
+	protected function autoAddColumn($errorInfo) {
+		if (isset($errorInfo[0])) {
+			if ($errorInfo[0] == '42S22') {	//ER_BAD_FIELD_ERROR
+				foreach (array('lastSeen', 'hash') as $column) {
+					if (stripos($errorInfo[2], $column) !== false) {
+						return $this->addColumn($column);
 					}
 				}
 			}
@@ -82,7 +92,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				return $this->addEntry($valuesTmp);
 			} elseif ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
 				Minz_Log::error('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
+				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']. ' ' . $this->addEntryPrepared);
 			}
 			return false;
 		}
@@ -597,7 +607,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			}
 			return $result;
 		} else {
-			
 			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
 			if ($this->autoAddColumn($info)) {
 				return $this->listHashForFeedGuids($id_feed, $guids);
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index ffe0f037c..ff049d813 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -2,6 +2,21 @@
 
 class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 
+	protected function autoAddColumn($errorInfo) {
+		if (empty($errorInfo[0]) || $errorInfo[0] == '42S22') {	//ER_BAD_FIELD_ERROR
+			if ($tableInfo = $this->bd->query("SELECT sql FROM sqlite_master where name='entry'")) {
+				$showCreate = $tableInfo->fetchColumn();
+				Minz_Log::debug('FreshRSS_EntryDAOSQLite::autoAddColumn: ' . $showCreate);
+				foreach (array('lastSeen', 'hash') as $column) {
+					if (stripos($showCreate, $column) === false) {
+						return $this->addColumn($column);
+					}
+				}
+			}
+		}
+		return false;
+	}
+
 	protected function sqlConcat($s1, $s2) {
 		return $s1 . '||' . $s2;
 	}
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 76025ff53..475d39286 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -330,11 +330,12 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		     . 'AND id NOT IN (SELECT id FROM (SELECT e2.id FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=:id_feed ORDER BY id DESC LIMIT :keep) keep)';	//Double select: MySQL doesn't support 'LIMIT & IN/ALL/ANY/SOME subquery'
 		$stm = $this->bd->prepare($sql);
 
-		$id_max = intval($date_min) . '000000';
-
-		$stm->bindParam(':id_feed', $id, PDO::PARAM_INT);
-		$stm->bindParam(':id_max', $id_max, PDO::PARAM_STR);
-		$stm->bindParam(':keep', $keep, PDO::PARAM_INT);
+		if ($stm) {
+			$id_max = intval($date_min) . '000000';
+			$stm->bindParam(':id_feed', $id, PDO::PARAM_INT);
+			$stm->bindParam(':id_max', $id_max, PDO::PARAM_STR);
+			$stm->bindParam(':keep', $keep, PDO::PARAM_INT);
+		}
 
 		if ($stm && $stm->execute()) {
 			return $stm->rowCount();
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index afdd821b2..9c6af405d 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 	`content_bin` blob,	-- v0.7
 	`link` varchar(1023) CHARACTER SET latin1 NOT NULL,
 	`date` int(11),	-- Until year 2038
-	`lastSeen` INT(11) NOT NULL,	-- v1.2, Until year 2038
+	`lastSeen` INT(11) DEFAULT 0,	-- v1.2, Until year 2038
 	`hash` BINARY(16),	-- v1.2
 	`is_read` boolean NOT NULL DEFAULT 0,
 	`is_favorite` boolean NOT NULL DEFAULT 0,
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 7517ead45..77e8e094c 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -39,7 +39,7 @@ $SQL_CREATE_TABLES = array(
 	`content` text,
 	`link` varchar(1023) NOT NULL,
 	`date` int(11),	-- Until year 2038
-	`lastSeen` INT(11) NOT NULL,	-- v1.2, Until year 2038
+	`lastSeen` INT(11) DEFAULT 0,	-- v1.2, Until year 2038
 	`hash` BINARY(16),	-- v1.2
 	`is_read` boolean NOT NULL DEFAULT 0,
 	`is_favorite` boolean NOT NULL DEFAULT 0,
diff --git a/app/install.php b/app/install.php
index 177173fdb..86afb9318 100644
--- a/app/install.php
+++ b/app/install.php
@@ -168,8 +168,10 @@ function saveStep3() {
 			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] .(empty($_SESSION['default_user']) ? '' :($_SESSION['default_user'] . '_'));
 		}
 
+		//TODO: load `config.default.php` as default
 		$config_array = array(
 			'environment' => 'production',
+			'simplepie_syslog_enabled' => true,
 			'salt' => $_SESSION['salt'],
 			'title' => $_SESSION['title'],
 			'default_user' => $_SESSION['default_user'],
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index ac7a1bed7..3e8ec1f43 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -134,4 +134,9 @@ class MinzPDO extends PDO {
 		MinzPDO::check($statement);
 		return parent::exec($statement);
 	}
+
+	public function query($statement) {
+		MinzPDO::check($statement);
+		return parent::query($statement);
+	}
 }
-- 
cgit v1.2.3


From 256c8613a4046931dcd28ab22b6aebe8752a98c2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 03:21:36 +0200
Subject: First draft of PubSubHubbub

https://github.com/FreshRSS/FreshRSS/issues/312
Requires setting base_url in config.php.
Currently using the filesystem (no change to the database)
---
 app/Controllers/feedController.php   |  55 +++++++++++------
 app/Models/Feed.php                  |  69 ++++++++++++++++++++-
 constants.php                        |   1 +
 data/PubSubHubbub/feeds/.gitignore   |   1 +
 data/PubSubHubbub/feeds/README.md    |  12 ++++
 data/PubSubHubbub/secrets/.gitignore |   1 +
 data/PubSubHubbub/secrets/README.md  |   4 ++
 data/config.default.php              |   8 ++-
 lib/lib_rss.php                      |   9 +++
 p/api/pshb.php                       | 116 +++++++++++++++++++++++++++++++++++
 10 files changed, 252 insertions(+), 24 deletions(-)
 create mode 100644 data/PubSubHubbub/feeds/.gitignore
 create mode 100644 data/PubSubHubbub/feeds/README.md
 create mode 100644 data/PubSubHubbub/secrets/.gitignore
 create mode 100644 data/PubSubHubbub/secrets/README.md
 create mode 100644 p/api/pshb.php

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0443b4159..9117da639 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -168,6 +168,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// Ok, feed has been added in database. Now we have to refresh entries.
 			$feed->_id($id);
 			$feed->faviconPrepare();
+			$feed->pubSubHubbubPrepare();
 
 			$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 
@@ -261,12 +262,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	 * This action actualizes entries from one or several feeds.
 	 *
 	 * Parameters are:
-	 *   - id (default: false)
+	 *   - id (default: false): Feed ID
+	 *   - url (default: false): Feed URL
 	 *   - force (default: false)
-	 * If id is not specified, all the feeds are actualized. But if force is
+	 * If id and url are 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() {
+	public function actualizeAction($simplePie = null) {
 		@set_time_limit(300);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -274,14 +276,15 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		Minz_Session::_param('actualize_feeds', false);
 		$id = Minz_Request::param('id');
+		$url = Minz_Request::param('url');
 		$force = Minz_Request::param('force');
 
 		// 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 ($id || $url) {
+			$feed = $id ? $feedDAO->searchById($id) : $feedDAO->searchByUrl($url);
 			if ($feed) {
 				$feeds[] = $feed;
 			}
@@ -302,8 +305,11 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			try {
-				// Load entries
-				$feed->load(false);
+				if ($simplePie) {
+					$feed->loadEntries($simplePie);	//Used by PubSubHubbub
+				} else {
+					$feed->load(false);
+				}
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::notice($e->getMessage());
 				$feedDAO->updateLastUpdate($feed->id(), true);
@@ -404,7 +410,16 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 			}
 
-			$feed->faviconPrepare();
+			if ($simplePie === null) {
+				$feed->faviconPrepare();
+				if ($feed->url() === 'http://push-pub.appspot.com/feed') {
+					$secret = $feed->pubSubHubbubPrepare();
+					if ($secret != '') {
+						Minz_Log::debug('PubSubHubbub subscribe ' . $feed->url());
+						$feed->pubSubHubbubSubscribe(true, $secret);
+					}
+				}
+			}
 			$feed->unlock();
 			$updated_feeds++;
 			unset($feed);
@@ -427,20 +442,20 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 			// 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('feedback.sub.feed.actualized', $feed->name()), array(
-				'params' => array('get' => 'f_' . $feed->id())
-			));
-		} elseif ($updated_feeds > 1) {
-			Minz_Request::good(_t('feedback.sub.feed.n_actualized', $updated_feeds), array());
 		} else {
-			Minz_Request::good(_t('feedback.sub.feed.no_refresh'), array());
+			// Redirect to the main page with correct notification.
+			if ($updated_feeds === 1) {
+				$feed = reset($feeds);
+				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('feedback.sub.feed.n_actualized', $updated_feeds), array());
+			} else {
+				Minz_Request::good(_t('feedback.sub.feed.no_refresh'), array());
+			}
 		}
+		return $updated_feeds;
 	}
 
 	/**
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 85fb173ec..dcf083ea8 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -19,6 +19,8 @@ class FreshRSS_Feed extends Minz_Model {
 	private $ttl = -2;
 	private $hash = null;
 	private $lockPath = '';
+	private $hubUrl = '';
+	private $selfUrl = '';
 
 	public function __construct($url, $validate=true) {
 		if ($validate) {
@@ -226,6 +228,11 @@ class FreshRSS_Feed extends Minz_Model {
 					throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Feed error' : $errorMessage) . ' [' . $url . ']');
 				}
 
+				$links = $feed->get_links('self');
+				$this->selfUrl = isset($links[0]) ? $links[0] : null;
+				$links = $feed->get_links('hub');
+				$this->hubUrl = isset($links[0]) ? $links[0] : null;
+
 				if ($loadDetails) {
 					// si on a utilisé l'auto-discover, notre url va avoir changé
 					$subscribe_url = $feed->subscribe_url(false);
@@ -259,7 +266,7 @@ class FreshRSS_Feed extends Minz_Model {
 		}
 	}
 
-	private function loadEntries($feed) {
+	public function loadEntries($feed) {
 		$entries = array();
 
 		foreach ($feed->get_items() as $item) {
@@ -333,4 +340,64 @@ class FreshRSS_Feed extends Minz_Model {
 	function unlock() {
 		@unlink($this->lockPath);
 	}
+
+	//<PubSubHubbub>
+
+	function pubSubHubbubPrepare() {
+		$secret = '';
+		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
+			$path = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl);
+			if (!file_exists($path . '/hub.txt')) {
+				@mkdir($path, 0777, true);
+				file_put_contents($path . '/hub.txt', $this->hubUrl);
+				$secret = sha1(FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
+				file_put_contents($path . '/secret.txt', $secret);
+				@mkdir(PSHB_PATH . '/secrets/');
+				file_put_contents(PSHB_PATH . '/secrets/' . $secret . '.txt', base64url_encode($this->selfUrl));
+				Minz_Log::notice('PubSubHubbub prepared for ' . $this->url);
+				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
+					'PubSubHubbub prepared for ' . $this->url . "\n", FILE_APPEND);
+			}
+			$path .= '/' . base64url_encode($this->url);
+			$currentUser = Minz_Session::param('currentUser');
+			if (ctype_alnum($currentUser) && !file_exists($path . '/' . $currentUser . '.txt')) {
+				@mkdir($path, 0777, true);
+				touch($path . '/' . $currentUser . '.txt');
+			}
+		}
+		return $secret;
+	}
+
+	//Parameter true to subscribe, false to unsubscribe.
+	function pubSubHubbubSubscribe($state, $secret = '') {
+		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
+			$callbackUrl = checkUrl(FreshRSS_Context::$system_conf->base_url . 'api/pshb.php?s=' . $secret);
+			if ($callbackUrl == '') {
+				return false;
+			}
+
+			$ch = curl_init();
+			curl_setopt_array($ch, array(
+				CURLOPT_URL => $this->hubUrl,
+				CURLOPT_FOLLOWLOCATION => true,
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_USERAGENT => _t('gen.freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')',
+				CURLOPT_POSTFIELDS => 'hub.verify=sync'
+					. '&hub.mode=' . ($state ? 'subscribe' : 'unsubscribe')
+					. '&hub.topic=' . urlencode($this->selfUrl)
+					. '&hub.callback=' . urlencode($callbackUrl)
+				)
+			);
+			$response = curl_exec($ch);
+			$info = curl_getinfo($ch);
+
+			file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
+				'PubSubHubbub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $this->selfUrl .
+				' with callback ' . $callbackUrl . ': ' . $info['http_code'] . ' ' . $response . "\n", FILE_APPEND);
+			return substr($info['http_code'], 0, 1) == '2';
+		}
+		return false;
+	}
+
+	//</PubSubHubbub>
 }
diff --git a/constants.php b/constants.php
index b20bf0710..5bb410e29 100644
--- a/constants.php
+++ b/constants.php
@@ -18,6 +18,7 @@ define('FRESHRSS_PATH', dirname(__FILE__));
 		define('UPDATE_FILENAME', DATA_PATH . '/update.php');
 		define('USERS_PATH', DATA_PATH . '/users');
 		define('CACHE_PATH', DATA_PATH . '/cache');
+		define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
 
 	define('LIB_PATH', FRESHRSS_PATH . '/lib');
 	define('APP_PATH', FRESHRSS_PATH . '/app');
diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore
new file mode 100644
index 000000000..150f68c80
--- /dev/null
+++ b/data/PubSubHubbub/feeds/.gitignore
@@ -0,0 +1 @@
+*/*
diff --git a/data/PubSubHubbub/feeds/README.md b/data/PubSubHubbub/feeds/README.md
new file mode 100644
index 000000000..15fa8e521
--- /dev/null
+++ b/data/PubSubHubbub/feeds/README.md
@@ -0,0 +1,12 @@
+List of canonical URLS of the various feeds users have subscribed to.
+Several feeds can share the same canonical URL (rel="self").
+Several users can have subscribed to the same feed.
+
+* ./base64url(canonicalUrl)/
+	* ./secret.txt
+	* ./base64url(feedUrl1)/
+		* ./user1.txt
+		* ./user2.txt
+	* ./base64url(feedUrl2)/
+		* ./user3.txt
+		* ./user4.txt
diff --git a/data/PubSubHubbub/secrets/.gitignore b/data/PubSubHubbub/secrets/.gitignore
new file mode 100644
index 000000000..2211df63d
--- /dev/null
+++ b/data/PubSubHubbub/secrets/.gitignore
@@ -0,0 +1 @@
+*.txt
diff --git a/data/PubSubHubbub/secrets/README.md b/data/PubSubHubbub/secrets/README.md
new file mode 100644
index 000000000..ad8158839
--- /dev/null
+++ b/data/PubSubHubbub/secrets/README.md
@@ -0,0 +1,4 @@
+List of secrets given to PubSubHubbub hubs
+
+* ./sha1(random + salt).txt
+	* base64url(canonicalUrl)
diff --git a/data/config.default.php b/data/config.default.php
index 8be203d36..80d331df7 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -11,9 +11,11 @@ return array(
 	# Used to make crypto more unique. Generated during install.
 	'salt' => '',
 
-	# Leave empty for most cases.
-	# Ability to override the address of the FreshRSS instance,
-	# used when building absolute URLs.
+	# Specify address of the FreshRSS instance,
+	# used when building absolute URLs, e.g. for PubSubHubbub.
+	# Examples:
+	# https://example.net/FreshRSS/p/
+	# https://freshrss.example.net/
 	'base_url' => '',
 
 	# Natural language of the user interface, e.g. `en`, `fr`.
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 6342011c8..191a58f35 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -446,3 +446,12 @@ function array_push_unique(&$array, $value) {
 function array_remove(&$array, $value) {
 	$array = array_diff($array, array($value));
 }
+
+//RFC 4648
+function base64url_encode($data) {
+	return strtr(rtrim(base64_encode($data), '='), '+/', '-_');
+}
+//RFC 4648
+function base64url_decode($data) {
+	return base64_decode(strtr($data, '-_', '+/'));
+}
diff --git a/p/api/pshb.php b/p/api/pshb.php
new file mode 100644
index 000000000..bcb8341b1
--- /dev/null
+++ b/p/api/pshb.php
@@ -0,0 +1,116 @@
+<?php
+require('../../constants.php');
+require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
+
+define('MAX_PAYLOAD', 3145728);
+
+header('Content-Type: text/plain; charset=UTF-8');
+
+function logMe($text) {
+	file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
+}
+
+$ORIGINAL_INPUT = file_get_contents('php://input', false, null, -1, MAX_PAYLOAD);
+
+logMe(print_r(array('_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true));
+
+$secret = isset($_GET['s']) ? substr($_GET['s'], 0, 128) : '';
+if (!ctype_xdigit($secret)) {
+	header('HTTP/1.1 422 Unprocessable Entity');
+	die('Invalid feed secret format!');
+}
+chdir(PSHB_PATH);
+$canonical64 = @file_get_contents('secrets/' . $secret . '.txt');
+if ($canonical64 === false) {
+	header('HTTP/1.1 404 Not Found');
+	logMe('Feed secret not found!: ' . $secret);
+	die('Feed secret not found!');
+}
+$canonical64 = trim($canonical64);
+if (!preg_match('/^[A-Za-z0-9_-]+$/D', $canonical64)) {
+	header('HTTP/1.1 500 Internal Server Error');
+	logMe('Invalid secret reference!: ' . $canonical64);
+	die('Invalid secret reference!');
+}
+$secret2 = @file_get_contents('feeds/' . $canonical64 . '/secret.txt');
+if ($secret2 === false) {
+	header('HTTP/1.1 404 Not Found');
+	//@unlink('secrets/' . $secret . '.txt');
+	logMe('Feed reverse secret not found!: ' . $canonical64);
+	die('Feed reverse secret not found!');
+}
+if ($secret !== $secret2) {
+	header('HTTP/1.1 500 Internal Server Error');
+	logMe('Invalid secret cross-check!: ' . $secret);
+	die('Invalid secret cross-check!');
+}
+chdir('feeds/' . $canonical64);
+$users = glob('*/*.txt', GLOB_NOSORT);
+if (empty($users)) {
+	header('HTTP/1.1 410 Gone');
+	logMe('Nobody is subscribed to this feed anymore!: ' . $canonical64);
+	die('Nobody is subscribed to this feed anymore!');
+}
+
+if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
+	//TODO: hub_lease_seconds
+	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
+}
+
+Minz_Configuration::register('system', DATA_PATH . '/config.php', DATA_PATH . '/config.default.php');
+$system_conf = Minz_Configuration::get('system');
+$system_conf->auth_type = 'none';	// avoid necessity to be logged in (not saved!)
+Minz_Translate::init('en');
+Minz_Request::_param('ajax', true);
+$feedController = new FreshRSS_feed_Controller();
+
+$simplePie = customSimplePie();
+$simplePie->set_raw_data($ORIGINAL_INPUT);
+$simplePie->init();
+unset($ORIGINAL_INPUT);
+
+$links = $simplePie->get_links('self');
+$self = isset($links[0]) ? $links[0] : null;
+
+if ($self !== base64url_decode($canonical64)) {
+	header('HTTP/1.1 422 Unprocessable Entity');
+	logMe('Self URL does not match registered canonical URL!: ' . $self);
+	die('Self URL does not match registered canonical URL!');
+}
+Minz_Request::_param('url', $self);
+
+$nb = 0;
+foreach ($users as $userLine) {
+	$userLine = strtr($userLine, '\\', '/');
+	$userInfos = explode('/', $userLine);
+	$feedUrl = isset($userInfos[0]) ? base64url_decode($userInfos[0]) : '';
+	$username = isset($userInfos[1]) ? basename($userInfos[1], '.txt') : '';
+	if (!file_exists(USERS_PATH . '/' . $username . '/config.php')) {
+		break;
+	}
+
+	try {
+		Minz_Session::_param('currentUser', $username);
+		Minz_Configuration::register('user',
+		                             join_path(USERS_PATH, $username, 'config.php'),
+		                             join_path(USERS_PATH, '_', 'config.default.php'));
+		FreshRSS_Context::init();
+		if ($feedController->actualizeAction($simplePie) > 0) {
+			$nb++;
+		}
+	} catch (Exception $e) {
+		logMe($e->getMessage());
+	}
+}
+
+$simplePie->__destruct();
+unset($simplePie);
+
+if ($nb === 0) {
+	header('HTTP/1.1 410 Gone');
+	logMe('Nobody is subscribed to this feed anymore after all!: ' . $self);
+	die('Nobody is subscribed to this feed anymore after all!');
+}
+
+logMe($self . ' done: ' . $nb);
+exit('Done: ' . $nb . "\n");
-- 
cgit v1.2.3


From c472569b3861541c322c850c4ff8ca3471572f40 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 15:34:51 +0200
Subject: First alpha of PubSubHubbub

https://github.com/FreshRSS/FreshRSS/issues/312
Using a white list limited to http://push-pub.appspot.com/feed for alpha
testing.
---
 app/Controllers/feedController.php   | 31 ++++++++++++++------
 app/Models/Feed.php                  | 53 +++++++++++++++++++++++++---------
 data/PubSubHubbub/feeds/README.md    | 11 ++------
 data/PubSubHubbub/keys/.gitignore    |  1 +
 data/PubSubHubbub/keys/README.md     |  4 +++
 data/PubSubHubbub/secrets/.gitignore |  1 -
 data/PubSubHubbub/secrets/README.md  |  4 ---
 p/api/pshb.php                       | 55 ++++++++++++++++++++----------------
 8 files changed, 102 insertions(+), 58 deletions(-)
 create mode 100644 data/PubSubHubbub/keys/.gitignore
 create mode 100644 data/PubSubHubbub/keys/README.md
 delete mode 100644 data/PubSubHubbub/secrets/.gitignore
 delete mode 100644 data/PubSubHubbub/secrets/README.md

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 9117da639..0fb4bdf03 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -304,6 +304,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
+			$url = $feed->url();	//For detection of HTTP 301
 			try {
 				if ($simplePie) {
 					$feed->loadEntries($simplePie);	//Used by PubSubHubbub
@@ -317,7 +318,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
-			$url = $feed->url();
 			$feed_history = $feed->keepHistory();
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
@@ -404,19 +404,34 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$entryDAO->commit();
 			}
 
-			if ($feed->url() !== $url) {
-				// HTTP 301 Moved Permanently
+			if ($feed->hubUrl() && $feed->selfUrl()) {	//selfUrl has priority for PubSubHubbub
+				if ($feed->selfUrl() !== $url) {	//https://code.google.com/p/pubsubhubbub/wiki/MovingFeedsOrChangingHubs
+					$selfUrl = checkUrl($feed->selfUrl());
+					if ($selfUrl) {
+						Minz_Log::debug('PubSubHubbub unsubscribe ' . $feed->url());
+						if (!$feed->pubSubHubbubSubscribe(false)) {	//Unsubscribe
+							Minz_Log::warning('Error while PubSubHubbub unsubscribing from ' . $feed->url());
+						}
+						$feed->_url($selfUrl, false);
+						Minz_Log::notice('Feed ' . $url . ' canonical address moved to ' . $feed->url());
+						$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
+					}
+				}
+			}
+			elseif ($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()));
 			}
 
 			if ($simplePie === null) {
 				$feed->faviconPrepare();
-				if ($feed->url() === 'http://push-pub.appspot.com/feed') {
-					$secret = $feed->pubSubHubbubPrepare();
-					if ($secret != '') {
-						Minz_Log::debug('PubSubHubbub subscribe ' . $feed->url());
-						$feed->pubSubHubbubSubscribe(true, $secret);
+				if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
+					Minz_Log::debug('PubSubHubbub match ' . $feed->url());
+					if ($feed->pubSubHubbubPrepare()) {
+						Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
+						if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
+							Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
+						}
 					}
 				}
 			}
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index dcf083ea8..a17cf415d 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -51,6 +51,12 @@ class FreshRSS_Feed extends Minz_Model {
 	public function url() {
 		return $this->url;
 	}
+	public function selfUrl() {
+		return $this->selfUrl;
+	}
+	public function hubUrl() {
+		return $this->hubUrl;
+	}
 	public function category() {
 		return $this->category;
 	}
@@ -344,38 +350,59 @@ class FreshRSS_Feed extends Minz_Model {
 	//<PubSubHubbub>
 
 	function pubSubHubbubPrepare() {
-		$secret = '';
+		$key = '';
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
 			$path = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl);
-			if (!file_exists($path . '/hub.txt')) {
+			if ($hubFile = @file_get_contents($path . '/!hub.json')) {
+				$hubJson = json_decode($hubFile, true);
+				if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key'])) {
+					Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url);
+					return false;
+				}
+				if (empty($hubJson['lease_end']) || $hubJson['lease_end'] <= time()) {
+					Minz_Log::warning('PubSubHubbub lease expired: ' . $this->url);
+					$key = $hubJson['key'];	//To renew our lease
+				}
+			} else {
 				@mkdir($path, 0777, true);
-				file_put_contents($path . '/hub.txt', $this->hubUrl);
-				$secret = sha1(FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
-				file_put_contents($path . '/secret.txt', $secret);
-				@mkdir(PSHB_PATH . '/secrets/');
-				file_put_contents(PSHB_PATH . '/secrets/' . $secret . '.txt', base64url_encode($this->selfUrl));
+				$key = sha1(FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
+				$hubJson = array(
+					'hub' => $this->hubUrl,
+					'key' => $key,
+				);
+				file_put_contents($path . '/!hub.json', json_encode($hubJson));
+				@mkdir(PSHB_PATH . '/keys/');
+				file_put_contents(PSHB_PATH . '/keys/' . $key . '.txt', base64url_encode($this->selfUrl));
 				Minz_Log::notice('PubSubHubbub prepared for ' . $this->url);
 				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
 					'PubSubHubbub prepared for ' . $this->url . "\n", FILE_APPEND);
 			}
-			$path .= '/' . base64url_encode($this->url);
 			$currentUser = Minz_Session::param('currentUser');
 			if (ctype_alnum($currentUser) && !file_exists($path . '/' . $currentUser . '.txt')) {
-				@mkdir($path, 0777, true);
 				touch($path . '/' . $currentUser . '.txt');
 			}
 		}
-		return $secret;
+		return $key;
 	}
 
 	//Parameter true to subscribe, false to unsubscribe.
-	function pubSubHubbubSubscribe($state, $secret = '') {
+	function pubSubHubbubSubscribe($state) {
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
-			$callbackUrl = checkUrl(FreshRSS_Context::$system_conf->base_url . 'api/pshb.php?s=' . $secret);
+			$hubFile = @file_get_contents(PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl) . '/!hub.json');
+			if ($hubFile === false) {
+				Minz_Log::warning('JSON not found for PubSubHubbub: ' . $this->url);
+				return false;
+			}
+			$hubJson = json_decode($hubFile, true);
+			if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key'])) {
+				Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url);
+				return false;
+			}
+			$callbackUrl = checkUrl(FreshRSS_Context::$system_conf->base_url . 'api/pshb.php?k=' . $hubJson['key']);
 			if ($callbackUrl == '') {
+				Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url);
 				return false;
 			}
-
 			$ch = curl_init();
 			curl_setopt_array($ch, array(
 				CURLOPT_URL => $this->hubUrl,
diff --git a/data/PubSubHubbub/feeds/README.md b/data/PubSubHubbub/feeds/README.md
index 15fa8e521..a01a3197f 100644
--- a/data/PubSubHubbub/feeds/README.md
+++ b/data/PubSubHubbub/feeds/README.md
@@ -1,12 +1,7 @@
 List of canonical URLS of the various feeds users have subscribed to.
-Several feeds can share the same canonical URL (rel="self").
 Several users can have subscribed to the same feed.
 
 * ./base64url(canonicalUrl)/
-	* ./secret.txt
-	* ./base64url(feedUrl1)/
-		* ./user1.txt
-		* ./user2.txt
-	* ./base64url(feedUrl2)/
-		* ./user3.txt
-		* ./user4.txt
+	* ./!hub.json
+	* ./user1.txt
+	* ./user2.txt
diff --git a/data/PubSubHubbub/keys/.gitignore b/data/PubSubHubbub/keys/.gitignore
new file mode 100644
index 000000000..2211df63d
--- /dev/null
+++ b/data/PubSubHubbub/keys/.gitignore
@@ -0,0 +1 @@
+*.txt
diff --git a/data/PubSubHubbub/keys/README.md b/data/PubSubHubbub/keys/README.md
new file mode 100644
index 000000000..bb1e57cd4
--- /dev/null
+++ b/data/PubSubHubbub/keys/README.md
@@ -0,0 +1,4 @@
+List of keys given to PubSubHubbub hubs
+
+* ./sha1(random + salt).txt
+	* base64url(canonicalUrl)
diff --git a/data/PubSubHubbub/secrets/.gitignore b/data/PubSubHubbub/secrets/.gitignore
deleted file mode 100644
index 2211df63d..000000000
--- a/data/PubSubHubbub/secrets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt
diff --git a/data/PubSubHubbub/secrets/README.md b/data/PubSubHubbub/secrets/README.md
deleted file mode 100644
index ad8158839..000000000
--- a/data/PubSubHubbub/secrets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-List of secrets given to PubSubHubbub hubs
-
-* ./sha1(random + salt).txt
-	* base64url(canonicalUrl)
diff --git a/p/api/pshb.php b/p/api/pshb.php
index bcb8341b1..90d4c52bb 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -12,40 +12,41 @@ function logMe($text) {
 
 $ORIGINAL_INPUT = file_get_contents('php://input', false, null, -1, MAX_PAYLOAD);
 
-logMe(print_r(array('_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true));
+logMe(print_r(array('_SERVER' => $_SERVER, '_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true));
 
-$secret = isset($_GET['s']) ? substr($_GET['s'], 0, 128) : '';
-if (!ctype_xdigit($secret)) {
+$key = isset($_GET['k']) ? substr($_GET['k'], 0, 128) : '';
+if (!ctype_xdigit($key)) {
 	header('HTTP/1.1 422 Unprocessable Entity');
-	die('Invalid feed secret format!');
+	die('Invalid feed key format!');
 }
 chdir(PSHB_PATH);
-$canonical64 = @file_get_contents('secrets/' . $secret . '.txt');
+$canonical64 = @file_get_contents('keys/' . $key . '.txt');
 if ($canonical64 === false) {
 	header('HTTP/1.1 404 Not Found');
-	logMe('Feed secret not found!: ' . $secret);
-	die('Feed secret not found!');
+	logMe('Feed key not found!: ' . $key);
+	die('Feed key not found!');
 }
 $canonical64 = trim($canonical64);
 if (!preg_match('/^[A-Za-z0-9_-]+$/D', $canonical64)) {
 	header('HTTP/1.1 500 Internal Server Error');
-	logMe('Invalid secret reference!: ' . $canonical64);
-	die('Invalid secret reference!');
+	logMe('Invalid key reference!: ' . $canonical64);
+	die('Invalid key reference!');
 }
-$secret2 = @file_get_contents('feeds/' . $canonical64 . '/secret.txt');
-if ($secret2 === false) {
+$hubFile = @file_get_contents('feeds/' . $canonical64 . '/!hub.json');
+if ($hubFile === false) {
 	header('HTTP/1.1 404 Not Found');
-	//@unlink('secrets/' . $secret . '.txt');
-	logMe('Feed reverse secret not found!: ' . $canonical64);
-	die('Feed reverse secret not found!');
+	//@unlink('keys/' . $key . '.txt');
+	logMe('Feed info not found!: ' . $canonical64);
+	die('Feed info not found!');
 }
-if ($secret !== $secret2) {
+$hubJson = json_decode($hubFile, true);
+if (!$hubJson || empty($hubJson['key']) || $hubJson['key'] !== $key) {
 	header('HTTP/1.1 500 Internal Server Error');
-	logMe('Invalid secret cross-check!: ' . $secret);
-	die('Invalid secret cross-check!');
+	logMe('Invalid key cross-check!: ' . $key);
+	die('Invalid key cross-check!');
 }
 chdir('feeds/' . $canonical64);
-$users = glob('*/*.txt', GLOB_NOSORT);
+$users = glob('*.txt', GLOB_NOSORT);
 if (empty($users)) {
 	header('HTTP/1.1 410 Gone');
 	logMe('Nobody is subscribed to this feed anymore!: ' . $canonical64);
@@ -53,10 +54,19 @@ if (empty($users)) {
 }
 
 if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
-	//TODO: hub_lease_seconds
+	$leaseSeconds = empty($_REQUEST['hub_lease_seconds']) ? 0 : intval($_REQUEST['hub_lease_seconds']);
+	if ($leaseSeconds > 60) {
+		$hubJson['lease_end'] = time() + $leaseSeconds;
+		file_put_contents('./!hub.json', json_encode($hubJson));
+	}
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
 
+if ($ORIGINAL_INPUT == '') {
+	header('HTTP/1.1 422 Unprocessable Entity');
+	die('Missing XML payload!');
+}
+
 Minz_Configuration::register('system', DATA_PATH . '/config.php', DATA_PATH . '/config.default.php');
 $system_conf = Minz_Configuration::get('system');
 $system_conf->auth_type = 'none';	// avoid necessity to be logged in (not saved!)
@@ -80,11 +90,8 @@ if ($self !== base64url_decode($canonical64)) {
 Minz_Request::_param('url', $self);
 
 $nb = 0;
-foreach ($users as $userLine) {
-	$userLine = strtr($userLine, '\\', '/');
-	$userInfos = explode('/', $userLine);
-	$feedUrl = isset($userInfos[0]) ? base64url_decode($userInfos[0]) : '';
-	$username = isset($userInfos[1]) ? basename($userInfos[1], '.txt') : '';
+foreach ($users as $userFilename) {
+	$username = basename($userFilename, '.txt');
 	if (!file_exists(USERS_PATH . '/' . $username . '/config.php')) {
 		break;
 	}
-- 
cgit v1.2.3


From 5adaf177210bcd7af0df30d8bebea9b3de67b443 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 15:38:54 +0200
Subject: Revert bug HTTP 301 introduced by Refactor feedController

https://github.com/FreshRSS/FreshRSS/commit/e2da6e6e6b871dc3dbc289cdd40ba401a21d8e91
---
 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 0443b4159..8db273aca 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -301,6 +301,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
+			$url = $feed->url();	//For detection of HTTP 301
 			try {
 				// Load entries
 				$feed->load(false);
@@ -311,7 +312,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
-			$url = $feed->url();
 			$feed_history = $feed->keepHistory();
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
-- 
cgit v1.2.3


From 18831a89efadf8a05fcc3285fa6af0051e41df2b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 15:46:51 +0200
Subject: PubSubHubbub active only when refreshing, not adding a feed

https://github.com/FreshRSS/FreshRSS/issues/312
---
 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 0fb4bdf03..ab73879d0 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -168,7 +168,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// Ok, feed has been added in database. Now we have to refresh entries.
 			$feed->_id($id);
 			$feed->faviconPrepare();
-			$feed->pubSubHubbubPrepare();
+			//$feed->pubSubHubbubPrepare();	//TODO: prepare PubSubHubbub already when adding the feed
 
 			$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 
-- 
cgit v1.2.3


From 0163564b9e02bc399c26d3083048f38d3374cbd7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 17:58:56 +0200
Subject: Change some error messages

---
 app/Models/Feed.php |  2 +-
 p/api/pshb.php      | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index a17cf415d..d2b552265 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -373,7 +373,7 @@ class FreshRSS_Feed extends Minz_Model {
 				file_put_contents($path . '/!hub.json', json_encode($hubJson));
 				@mkdir(PSHB_PATH . '/keys/');
 				file_put_contents(PSHB_PATH . '/keys/' . $key . '.txt', base64url_encode($this->selfUrl));
-				Minz_Log::notice('PubSubHubbub prepared for ' . $this->url);
+				Minz_Log::debug('PubSubHubbub prepared for ' . $this->url);
 				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
 					'PubSubHubbub prepared for ' . $this->url . "\n", FILE_APPEND);
 			}
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 90d4c52bb..6280c04ac 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -12,7 +12,7 @@ function logMe($text) {
 
 $ORIGINAL_INPUT = file_get_contents('php://input', false, null, -1, MAX_PAYLOAD);
 
-logMe(print_r(array('_SERVER' => $_SERVER, '_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true));
+//logMe(print_r(array('_SERVER' => $_SERVER, '_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true));
 
 $key = isset($_GET['k']) ? substr($_GET['k'], 0, 128) : '';
 if (!ctype_xdigit($key)) {
@@ -23,33 +23,33 @@ chdir(PSHB_PATH);
 $canonical64 = @file_get_contents('keys/' . $key . '.txt');
 if ($canonical64 === false) {
 	header('HTTP/1.1 404 Not Found');
-	logMe('Feed key not found!: ' . $key);
+	logMe('Error: Feed key not found!: ' . $key);
 	die('Feed key not found!');
 }
 $canonical64 = trim($canonical64);
 if (!preg_match('/^[A-Za-z0-9_-]+$/D', $canonical64)) {
 	header('HTTP/1.1 500 Internal Server Error');
-	logMe('Invalid key reference!: ' . $canonical64);
+	logMe('Error: Invalid key reference!: ' . $canonical64);
 	die('Invalid key reference!');
 }
 $hubFile = @file_get_contents('feeds/' . $canonical64 . '/!hub.json');
 if ($hubFile === false) {
 	header('HTTP/1.1 404 Not Found');
 	//@unlink('keys/' . $key . '.txt');
-	logMe('Feed info not found!: ' . $canonical64);
+	logMe('Error: Feed info not found!: ' . $canonical64);
 	die('Feed info not found!');
 }
 $hubJson = json_decode($hubFile, true);
 if (!$hubJson || empty($hubJson['key']) || $hubJson['key'] !== $key) {
 	header('HTTP/1.1 500 Internal Server Error');
-	logMe('Invalid key cross-check!: ' . $key);
+	logMe('Error: Invalid key cross-check!: ' . $key);
 	die('Invalid key cross-check!');
 }
 chdir('feeds/' . $canonical64);
 $users = glob('*.txt', GLOB_NOSORT);
 if (empty($users)) {
 	header('HTTP/1.1 410 Gone');
-	logMe('Nobody is subscribed to this feed anymore!: ' . $canonical64);
+	logMe('Error: Nobody is subscribed to this feed anymore!: ' . $canonical64);
 	die('Nobody is subscribed to this feed anymore!');
 }
 
@@ -83,9 +83,10 @@ $links = $simplePie->get_links('self');
 $self = isset($links[0]) ? $links[0] : null;
 
 if ($self !== base64url_decode($canonical64)) {
-	header('HTTP/1.1 422 Unprocessable Entity');
-	logMe('Self URL does not match registered canonical URL!: ' . $self);
-	die('Self URL does not match registered canonical URL!');
+	//header('HTTP/1.1 422 Unprocessable Entity');
+	logMe('Warning: Self URL ' . $self . ' does not match registered canonical URL!: ' . base64url_decode($canonical64));
+	//die('Self URL does not match registered canonical URL!');
+	$self = base64url_decode($canonical64);
 }
 Minz_Request::_param('url', $self);
 
@@ -106,7 +107,7 @@ foreach ($users as $userFilename) {
 			$nb++;
 		}
 	} catch (Exception $e) {
-		logMe($e->getMessage());
+		logMe('Error: ' . $e->getMessage());
 	}
 }
 
@@ -115,7 +116,7 @@ unset($simplePie);
 
 if ($nb === 0) {
 	header('HTTP/1.1 410 Gone');
-	logMe('Nobody is subscribed to this feed anymore after all!: ' . $self);
+	logMe('Error: Nobody is subscribed to this feed anymore after all!: ' . $self);
 	die('Nobody is subscribed to this feed anymore after all!');
 }
 
-- 
cgit v1.2.3


From c6e2e1aa515d1941056f5da575b050d4da0b3d92 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Fri, 15 May 2015 20:09:58 +0200
Subject: Update admin.php

---
 app/i18n/de/admin.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index bcd0fcc61..8550805ee 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -19,15 +19,15 @@ return array(
 	'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.',
+			'ok' => 'Die 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.',
+			'ok' => 'Die Tabelle <em>category</em> ist korrekt konfiguriert.',
 		),
 		'connection' => array(
 			'nok' => 'Verbindung zur Datenbank kann nicht aufgebaut werden.',
-			'ok' => 'Verbindung zur Datenbank ist in Ordnung.',
+			'ok' => 'Verbindung zur Datenbank konnte aufgebaut werden.',
 		),
 		'ctype' => array(
 			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für die Überprüfung von Zeichentypen (php-ctype).',
@@ -39,7 +39,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
 		),
 		'database' => 'Datenbank-Installation',
 		'dom' => array(
@@ -48,19 +48,19 @@ return array(
 		),
 		'entries' => array(
 			'nok' => 'Die Tabelle <em>entry</em> ist schlecht konfiguriert.',
-			'ok' => 'Die Tabelle <em>entry</em> ist in Ordnung.',
+			'ok' => 'Die Tabelle <em>entry</em> ist korrekt konfiguriert.',
 		),
 		'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.',
+			'ok' => 'Die 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.',
+			'ok' => 'Die Tabelle <em>feed</em> ist korrekt konfiguriert.',
 		),
 		'files' => 'Datei-Installation',
 		'json' => array(
-			'nok' => 'Ihnen fehlt JSON (Paket php5-json).',
+			'nok' => 'Ihnen fehlt die JSON-Erweiterung (Paket php5-json).',
 			'ok' => 'Sie haben die JSON-Erweiterung.',
 		),
 		'minz' => array(
@@ -77,7 +77,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/persona</em> sind in Ordnung.',
 		),
 		'php' => array(
 			'_' => 'PHP-Installation',
@@ -91,11 +91,11 @@ return array(
 		'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.',
+			'ok' => 'Die 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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
 		'zip' => array(
 			'nok' => 'Ihnen fehlt die ZIP-Erweiterung (Paket php5-zip).',
@@ -120,22 +120,22 @@ return array(
 		'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' => 'Einträge pro Tag (letzten 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',
+		'idle' => 'Inkative Feeds',
 		'main' => 'Haupt-Statistiken',
 		'main_stream' => 'Haupt-Feeds',
 		'menu' => array(
-			'idle' => 'Untätige Feeds',
+			'idle' => 'Inkative Feeds',
 			'main' => 'Haupt-Statistiken',
 			'repartition' => 'Artikel-Verteilung',
 		),
-		'no_idle' => 'Es gibt keinen untätigen Feed!',
+		'no_idle' => 'Es gibt keinen inaktiven Feed!',
 		'number_entries' => '%d Artikel',
 		'percent_of_total' => '%% Gesamt',
 		'repartition' => 'Artikel-Verteilung',
@@ -152,7 +152,7 @@ return array(
 		'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',
+		'none' => 'Keine ausstehende Aktualisierung',
 		'title' => 'System aktualisieren',
 	),
 	'user' => array(
-- 
cgit v1.2.3


From b14b1a11dc2d74b5fbb220af83afb771a022d2a2 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Fri, 15 May 2015 20:18:24 +0200
Subject: Update conf.php

---
 app/i18n/de/conf.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 64c2c0945..04ebfab7e 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -5,8 +5,8 @@ return 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',
+		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Feeds verfügbar.',
+		'keep_history_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten werden',
 		'optimize' => 'Datenbank optimieren',
 		'optimize_help' => 'Sollte gelegentlich durchgeführt werden, um die Größe der Datenbank zu reduzieren.',
 		'purge_now' => 'Jetzt bereinigen',
@@ -32,10 +32,10 @@ return array(
 		'title' => 'Anzeige',
 		'width' => array(
 			'content' => 'Inhaltsbreite',
-			'large' => 'Weit',
+			'large' => 'Gross',
 			'medium' => 'Mittel',
 			'no_limit' => 'Keine Begrenzung',
-			'thin' => 'Schmal',
+			'thin' => 'Klein',
 		),
 	),
 	'query' => array(
@@ -135,14 +135,14 @@ return array(
 		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
-		'_' => 'Tastaturkürzel',
+		'_' => 'Tastenkombination',
 		'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',
+		'collapse_article' => 'Einklappen',
 		'first_article' => 'Zum ersten Artikel springen',
-		'focus_search' => 'Auf Suchfeld zugreifen',
+		'focus_search' => 'Auf das Suchfeld zugreifen',
 		'help' => 'Dokumentation anzeigen',
 		'javascript' => 'JavaScript muss aktiviert sein, um Tastaturkürzel benutzen zu können',
 		'last_article' => 'Zum letzten Artikel springen',
@@ -150,13 +150,13 @@ return array(
 		'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.',
+		'navigation_help' => 'Mit der "Umschalttaste" finden die Tastenkombination auf Feeds Anwendung.<br/>Mit der "Alt-Taste" finden die Tastenkombination 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',
+		'title' => 'Tastenkombination',
 		'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.',
 	),
-- 
cgit v1.2.3


From 3adab4b70fab858048bd68ed72e71676c4d5badf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 13:05:43 +0200
Subject: More PubSubHubbub

https://github.com/FreshRSS/FreshRSS/issues/312
Show whether PubSubHubbub is enabled in the Web interface of feed
configuration.
When PubSubHubbub is used, do not pull refresh so often (hard-coded to
max once per 24h for now).
Improved logic for lease renewal, and some detection of lease problems.
Updated read-me and changelog.
---
 CHANGELOG                           |  9 ++++++
 README.fr.md                        | 22 +++++++-------
 README.md                           | 34 ++++++++++-----------
 app/Controllers/feedController.php  | 36 ++++++++++++++--------
 app/Models/Feed.php                 | 59 +++++++++++++++++++++++++++++++------
 app/i18n/cz/conf.php                |  1 +
 app/i18n/cz/sub.php                 |  1 +
 app/i18n/de/sub.php                 |  1 +
 app/i18n/en/sub.php                 |  1 +
 app/i18n/fr/sub.php                 |  1 +
 app/views/helpers/feed/update.phtml |  8 +++++
 data/users/_/config.default.php     |  2 +-
 p/api/pshb.php                      |  8 +++--
 13 files changed, 128 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d1b49d339..f3559ccc4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,15 @@
 
 ## 2015-xx-xx FreshRSS 1.1.1 (beta)
 
+* Features
+	* Support for PubSubHubbub for instant notifications from compatible Web sites.
+	* New option to detect and mark updated articles as unread.
+	* Support for internationalized domain name (IDN).
+* Misc.
+	* Improved logic for automatic deletion of old articles.
+	* Attempt to better handle encoded titles.
+
+
 ## 2015-01-31 FreshRSS 1.0.0 / 1.1.0 (beta)
 
 * UI
diff --git a/README.fr.md b/README.fr.md
index 6c77ccf51..1110eb8e5 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -6,6 +6,7 @@ FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de [Leed]
 Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.
 
 Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture anonyme.
+Il supporte [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) pour des notifications instantanées depuis les sites compatibles.
 
 * Site officiel : http://freshrss.org
 * Démo : http://demo.freshrss.org/
@@ -14,28 +15,25 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an
 ![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 :
+**Ce logiciel est en développement permanent !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
 
 * 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 !
+* Pour les développeurs et ceux qui veulent aider à tester les toutes dernières fonctionnalités, [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/FreshRSS/FreshRSS/issues).
+Cette application a été développée pour s’adapter principalement à des besoins personnels, et aucune garantie n'est fournie.
+Les demandes de fonctionnalités, rapports de bugs, et autres contributions sont les bienvenues. Privilégiez pour cela des [demandes sur GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 
-# Pré-requis
+# Prérequis
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi avec des temps de réponse < 1s (testé sur 150 flux, 22k articles, soit 32Mo de données partiellement compressées)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.2.1+ (PHP 5.3.7+ recommandé)
-	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur platformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
+	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
 * MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
-* Un navigateur Web récent tel Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
+* Un navigateur Web récent tel Firefox, Chrome, Opera, Safari. [Internet Explorer ne fonctionne plus, mais ce sera corrigé](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Fonctionne aussi sur mobile
 
 ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
@@ -63,7 +61,7 @@ C’est une bonne idée d’utiliser le même utilisateur que votre serveur Web
 Par exemple, pour exécuter le script toutes les heures :
 
 ```
-7 * * * * php /chemin/vers/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+7 * * * * php /votre-chemin/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 # Conseils
@@ -75,7 +73,7 @@ Par exemple, pour exécuter le script toutes les heures :
 # Sauvegarde
 * Il faut conserver vos fichiers `./data/config.php` ainsi que `./data/*_user.php` et éventuellement `./data/persona/`
 * Vous pouvez exporter votre liste de flux depuis FreshRSS au format OPML
-* Pour sauvegarder les articles eux-même, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
+* Pour sauvegarder les articles eux-mêmes, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
 
 ```bash
 mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
diff --git a/README.md b/README.md
index 089bbd780..4430560fe 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 * [Version française](README.fr.md)
 
 # FreshRSS
-FreshRSS is a self-hosted RSS feed agregator like [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
+FreshRSS is a self-hosted RSS feed aggregator such as [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
 
-It is at the same time light-weight, easy to work with, powerful and customizable.
+It is at the same time lightweight, easy to work with, powerful and customizable.
 
 It is a multi-user application with an anonymous reading mode.
+It supports [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) for instant notifications from compatible Web sites.
 
 * Official website: http://freshrss.org
 * Demo: http://demo.freshrss.org/
@@ -14,28 +15,25 @@ It is a multi-user application with an anonymous reading mode.
 ![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:
+**This application is under continuous development!** Please use the branch that suits your needs:
 
 * 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!
+* For developers and tech savvy persons willing to help testing the latest features, [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/FreshRSS/FreshRSS/issues).
+This application was developed to fulfil personal needs primarily, and comes with absolutely no warranty.
+Feature requests, bug reports, and other contributions are welcome. The best way is to [open issues on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 
 # Requirements
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi with response time under a second (tested with 150 feeds, 22k articles, or 32Mo of compressed data)
-* A web server: Apache2 (recommanded), nginx, lighttpd (not tested on others)
-* PHP 5.2.1+ (PHP 5.3.7+ recommanded)
+* A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
+* PHP 5.2.1+ (PHP 5.3.7+ recommended)
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
-	* 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) or SQLite 3.7.4+
-* A recent browser like Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
+	* Recommended 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+ (recommended) or SQLite 3.7.4+
+* A recent browser like Firefox, Chrome, Opera, Safari. [Internet Explorer currently not supported, but support will come back](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Works on mobile
 
 ![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
@@ -45,7 +43,7 @@ The best way is to open issues on GitHub
 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
-5. Every thing should be working :) If you encounter any problem, feel free to contact me.
+5. Everything should be working :) If you encounter any problem, feel free to contact me.
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
 # Access control
@@ -59,18 +57,18 @@ It is needed for the multi-user mode to limit access to FreshRSS. You can:
 # Automatic feed update
 * You can add a Cron job to launch the update script.
 Check the Cron documentation related to your distribution ([Debian/Ubuntu](https://help.ubuntu.com/community/CronHowto), [Red Hat/Fedora](https://fedoraproject.org/wiki/Administration_Guide_Draft/Cron), [Slackware](http://docs.slackware.com/fr:slackbook:process_control?#cron), [Gentoo](https://wiki.gentoo.org/wiki/Cron), [Arch Linux](https://wiki.archlinux.org/index.php/Cron)…).
-It’s a good idea to use the web server user .
+It’s a good idea to use the Web server user.
 For example, if you want to run the script every hour:
 
 ```
-7 * * * * php /chemin/vers/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+7 * * * * php /your-path/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 # Advices
 * For a better security, expose only the `./p/` folder on the web.
 	* 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.
+* If you encounter any problem, logs are accessible 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
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ab73879d0..dfdf0dc16 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -268,7 +268,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	 * If id and url are 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($simplePie = null) {
+	public function actualizeAction($simplePiePush = null) {
 		@set_time_limit(300);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -295,10 +295,16 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		// Calculate date of oldest entries we accept in DB.
 		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
+		$pshbMinAge = time() - (3600 * 24);	//TODO: Make a configuration.
 
 		$updated_feeds = 0;
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
+			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
+			if ((!$simplePiePush) && (!$id) && (!$force) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
+				continue;	//When PubSubHubbub is used, do not pull refresh so often
+			}
+
 			if (!$feed->lock()) {
 				Minz_Log::notice('Feed already being actualized: ' . $feed->url());
 				continue;
@@ -306,8 +312,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			$url = $feed->url();	//For detection of HTTP 301
 			try {
-				if ($simplePie) {
-					$feed->loadEntries($simplePie);	//Used by PubSubHubbub
+				if ($simplePiePush) {
+					$feed->loadEntries($simplePiePush);	//Used by PubSubHubbub
 				} else {
 					$feed->load(false);
 				}
@@ -374,6 +380,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							continue;
 						}
 
+						if ($pubSubHubbubEnabled && !$simplePiePush) {	//We use push, but have discovered an article by pull!
+							$text = 'An article was discovered by pull although we use PubSubHubbub!: Feed ' . $url . ' GUID ' . $entry->guid();
+							file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
+							Minz_Log::warning($text);
+							$pubSubHubbubEnabled = false;
+							$feed->pubSubHubbubEnabled(false);	//To force the renewal of our lease
+						}
+
 						if (!$entryDAO->hasTransaction()) {
 							$entryDAO->beginTransaction();
 						}
@@ -423,15 +437,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 			}
 
-			if ($simplePie === null) {
-				$feed->faviconPrepare();
-				if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
-					Minz_Log::debug('PubSubHubbub match ' . $feed->url());
-					if ($feed->pubSubHubbubPrepare()) {
-						Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
-						if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
-							Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
-						}
+			$feed->faviconPrepare();
+			if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
+				Minz_Log::debug('PubSubHubbub match ' . $feed->url());
+				if ($feed->pubSubHubbubPrepare()) {
+					Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
+					if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
+						Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
 					}
 				}
 			}
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index d2b552265..7bc60dfc9 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -104,6 +104,16 @@ class FreshRSS_Feed extends Minz_Model {
 	public function ttl() {
 		return $this->ttl;
 	}
+	// public function ttlExpire() {
+		// $ttl = $this->ttl;
+		// if ($ttl == -2) {	//Default
+			// $ttl = FreshRSS_Context::$user_conf->ttl_default;
+		// }
+		// if ($ttl == -1) {	//Never
+			// $ttl = 64000000;	//~2 years. Good enough for PubSubHubbub logic
+		// }
+		// return $this->lastUpdate + $ttl;
+	// }
 	public function nbEntries() {
 		if ($this->nbEntries < 0) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -349,18 +359,42 @@ class FreshRSS_Feed extends Minz_Model {
 
 	//<PubSubHubbub>
 
+	function pubSubHubbubEnabled($keep = true) {
+		$url = $this->selfUrl ? $this->selfUrl : $this->url;
+		$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json';
+		if ($hubFile = @file_get_contents($hubFilename)) {
+			$hubJson = json_decode($hubFile, true);
+			if (!$keep) {
+				$hubJson['lease_end'] = time() - 60;
+				file_put_contents($hubFilename, json_encode($hubJson));
+				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t"
+					. 'Force expire lease for ' . $url . "\n", FILE_APPEND);
+			} elseif ($hubJson && (empty($hubJson['lease_end']) || $hubJson['lease_end'] > time())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	function pubSubHubbubPrepare() {
 		$key = '';
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
 			$path = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl);
-			if ($hubFile = @file_get_contents($path . '/!hub.json')) {
+			$hubFilename = $path . '/!hub.json';
+			if ($hubFile = @file_get_contents($hubFilename)) {
 				$hubJson = json_decode($hubFile, true);
 				if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key'])) {
-					Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url);
+					$text = 'Invalid JSON for PubSubHubbub: ' . $this->url;
+					Minz_Log::warning($text);
+					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					return false;
 				}
-				if (empty($hubJson['lease_end']) || $hubJson['lease_end'] <= time()) {
-					Minz_Log::warning('PubSubHubbub lease expired: ' . $this->url);
+				if (empty($hubJson['lease_end']) || ($hubJson['lease_end'] <= (time() + (3600 * 24)))) {	//TODO: Make a better policy
+					$text = 'PubSubHubbub lease ends at '
+						. date('c', empty($hubJson['lease_end']) ? time() : $hubJson['lease_end'])
+						. ' and needs renewal: ' . $this->url;
+					Minz_Log::warning($text);
+					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					$key = $hubJson['key'];	//To renew our lease
 				}
 			} else {
@@ -370,12 +404,12 @@ class FreshRSS_Feed extends Minz_Model {
 					'hub' => $this->hubUrl,
 					'key' => $key,
 				);
-				file_put_contents($path . '/!hub.json', json_encode($hubJson));
+				file_put_contents($hubFilename, json_encode($hubJson));
 				@mkdir(PSHB_PATH . '/keys/');
 				file_put_contents(PSHB_PATH . '/keys/' . $key . '.txt', base64url_encode($this->selfUrl));
-				Minz_Log::debug('PubSubHubbub prepared for ' . $this->url);
-				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
-					'PubSubHubbub prepared for ' . $this->url . "\n", FILE_APPEND);
+				$text = 'PubSubHubbub prepared for ' . $this->url;
+				Minz_Log::debug($text);
+				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 			}
 			$currentUser = Minz_Session::param('currentUser');
 			if (ctype_alnum($currentUser) && !file_exists($path . '/' . $currentUser . '.txt')) {
@@ -388,7 +422,8 @@ class FreshRSS_Feed extends Minz_Model {
 	//Parameter true to subscribe, false to unsubscribe.
 	function pubSubHubbubSubscribe($state) {
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
-			$hubFile = @file_get_contents(PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl) . '/!hub.json');
+			$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl) . '/!hub.json';
+			$hubFile = @file_get_contents($hubFilename);
 			if ($hubFile === false) {
 				Minz_Log::warning('JSON not found for PubSubHubbub: ' . $this->url);
 				return false;
@@ -421,6 +456,12 @@ class FreshRSS_Feed extends Minz_Model {
 			file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
 				'PubSubHubbub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $this->selfUrl .
 				' with callback ' . $callbackUrl . ': ' . $info['http_code'] . ' ' . $response . "\n", FILE_APPEND);
+
+			if (!$state) {	//unsubscribe
+				$hubJson['lease_end'] = time() - 60;
+				file_put_contents($hubFilename, json_encode($hubJson));
+			}
+
 			return substr($info['http_code'], 0, 1) == '2';
 		}
 		return false;
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 29fb1e4d4..9518df66d 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -84,6 +84,7 @@ return array(
 		'articles_per_page' => 'Počet článků na stranu',
 		'auto_load_more' => 'Načítat další články dole na stránce',
 		'auto_remove_article' => 'Po přečtení články schovat',
+		'mark_updated_article_unread' => 'Označte aktualizované položky jako nepřečtené',
 		'confirm_enabled' => 'Vyžadovat potvrzení pro akci “označit vše jako přečtené”',
 		'display_articles_unfolded' => 'Ve výchozím stavu zobrazovat články otevřené',
 		'display_categories_unfolded' => 'Ve výchozím stavu zobrazovat kategorie zavřené',
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index 78712506c..cea0541e3 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'URL kanálu',
 		'validator' => 'Zkontrolovat platnost kanálu',
 		'website' => 'URL webové stránky',
+		'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Export',
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 0479b8f46..7433bd61c 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'Feed-URL',
 		'validator' => 'Überprüfen Sie die Gültigkeit des Feeds',
 		'website' => 'Webseiten-URL',
+		'pubsubhubbub' => 'Sofortige Benachrichtigung mit PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Exportieren',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 2b62e4775..d8b5ced04 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'Feed URL',
 		'validator' => 'Check the validity of the feed',
 		'website' => 'Website URL',
+		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Export',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index a3f7c4d6d..0a1a03e41 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'URL du flux',
 		'validator' => 'Vérifier la valididé du flux',
 		'website' => 'URL du site',
+		'pubsubhubbub' => 'Notification instantanée par PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Exporter',
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 0b08d036c..b2cf9f93c 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -126,6 +126,14 @@
 				?></select>
 			</div>
 		</div>
+		<div class="form-group">
+			<label class="group-name" for="pubsubhubbub"><?php echo _t('sub.feed.pubsubhubbub'); ?></label>
+			<div class="group-controls">
+				<label class="checkbox" for="pubsubhubbub">
+					<input type="checkbox" name="pubsubhubbub" id="pubsubhubbub" disabled="disabled" value="1"<?php echo $this->feed->pubSubHubbubEnabled() ? ' checked="checked"' : ''; ?> />
+				</label>
+			</div>
+		</div>
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index bf74ca1de..8f8ff528c 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -25,7 +25,7 @@ return array (
 
 	# In the case an article has changed (e.g. updated content):
 	#	Set to `true` to mark it unread, or `false` to leave it as-is.
-	'mark_updated_article_unread' => false,
+	'mark_updated_article_unread' => false, //TODO: -1 => ignore, 0 => update, 1 => update and mark as unread
 
 	'sort_order' => 'DESC',
 	'anon_access' => false,
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 6280c04ac..2f7f48cd8 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -57,8 +57,10 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
 	$leaseSeconds = empty($_REQUEST['hub_lease_seconds']) ? 0 : intval($_REQUEST['hub_lease_seconds']);
 	if ($leaseSeconds > 60) {
 		$hubJson['lease_end'] = time() + $leaseSeconds;
-		file_put_contents('./!hub.json', json_encode($hubJson));
+	} else {
+		unset($hubJson['lease_end']);
 	}
+	file_put_contents('./!hub.json', json_encode($hubJson));
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
 
@@ -84,7 +86,7 @@ $self = isset($links[0]) ? $links[0] : null;
 
 if ($self !== base64url_decode($canonical64)) {
 	//header('HTTP/1.1 422 Unprocessable Entity');
-	logMe('Warning: Self URL ' . $self . ' does not match registered canonical URL!: ' . base64url_decode($canonical64));
+	logMe('Warning: Self URL [' . $self . '] does not match registered canonical URL!: ' . base64url_decode($canonical64));
 	//die('Self URL does not match registered canonical URL!');
 	$self = base64url_decode($canonical64);
 }
@@ -120,5 +122,5 @@ if ($nb === 0) {
 	die('Nobody is subscribed to this feed anymore after all!');
 }
 
-logMe($self . ' done: ' . $nb);
+logMe('PubSubHubbub ' . $self . ' done: ' . $nb);
 exit('Done: ' . $nb . "\n");
-- 
cgit v1.2.3


From 247bc7578be4bcc1bdb1fb998f1304f5d9d34637 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:52:08 +0200
Subject: Update feedback.php

---
 app/i18n/de/feedback.php | 60 ++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index 48f8b74f5..4c15aadc3 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -15,19 +15,19 @@ return array(
 		),
 		'login' => array(
 			'invalid' => 'Anmeldung ist ungültig',
-			'success' => 'Sie sind verbunden',
+			'success' => 'Sie sind angemeldet',
 		),
 		'logout' => array(
-			'success' => 'Sie sind getrennt',
+			'success' => 'Sie sind abgemeldet',
 		),
 		'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',
+		'error' => 'Während der 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',
+		'shortcuts_updated' => 'Die Tastenkombinationen sind aktualisiert worden',
+		'updated' => 'Die Konfiguration ist aktualisiert worden',
 	),
 	'extensions' => array(
 		'already_enabled' => '%s ist bereits aktiviert',
@@ -44,44 +44,44 @@ return array(
 		'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.',
+		'export_no_zip_extension' => 'Die Zip-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie die 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!',
+		'file_cannot_be_uploaded' => 'Die 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.',
+			'created' => 'Die Kategorie %s ist erstellt worden.',
+			'deleted' => 'Die Kategorie ist gelöscht worden.',
+			'emptied' => 'Die Kategorie ist geleert worden.',
+			'error' => 'Die Kategorie kann nicht aktualisiert werden',
+			'name_exists' => 'Der Kategorie-Name existiert bereits.',
 			'no_id' => 'Sie müssen die ID der Kategorie präzisieren.',
-			'no_name' => 'Kategorie-Name kann nicht leer sein.',
+			'no_name' => 'Der 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.',
+			'over_max' => 'Sie haben Ihre Kategorien-Limite erreicht (%d)',
+			'updated' => 'Die 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',
+			'actualizeds' => 'Die RSS-Feeds sind aktualisiert worden',
+			'added' => 'Der 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',
+			'deleted' => 'Der Feed ist gelöscht worden',
+			'error' => 'Der 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',
+			'invalid_url' => 'Die URL <em>%s</em> ist ungültig',
+			'marked_read' => 'Die Feeds sind als gelesen markiert worden',
+			'n_actualized' => 'Die %d Feeds sind aktualisiert worden',
+			'n_entries_deleted' => 'Die %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',
+			'over_max' => 'Sie haben Ihre Feeds-Limite erreicht (%d)',
+			'updated' => 'Der Feed ist aktualisiert worden',
 		),
 		'purge_completed' => 'Bereinigung abgeschlossen (%d Artikel gelöscht)',
 	),
@@ -91,16 +91,16 @@ return array(
 		'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]',
+		'server_not_found' => 'Der Aktualisierungs-Server kann nicht gefunden werden. [%s]',
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Benutzer %s ist erstellt worden',
-			'error' => 'Benutzer %s kann nicht erstellt werden',
+			'_' => 'Der Benutzer %s ist erstellt worden',
+			'error' => 'Der Benutzer %s kann nicht erstellt werden',
 		),
 		'deleted' => array(
-			'_' => 'Benutzer %s ist gelöscht worden',
-			'error' => 'Benutzer %s kann nicht gelöscht werden',
+			'_' => 'Der Benutzer %s ist gelöscht worden',
+			'error' => 'Der Benutzer %s kann nicht gelöscht werden',
 		),
 	),
 	'profile' => array(
-- 
cgit v1.2.3


From 7bd97184c9fbac58359f1c457e209ebdc838c635 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:54:23 +0200
Subject: Update gen.php

---
 app/i18n/de/gen.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index f3479ed53..cce364d50 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -49,7 +49,7 @@ return array(
 		'april' => 'April',
 		'aug' => 'Aug',
 		'august' => 'August',
-		'before_yesterday' => 'Vor gestern',
+		'before_yesterday' => 'Vor vorgestern',
 		'dec' => 'Dez',
 		'december' => 'Dezember',
 		'feb' => 'Feb',
@@ -93,7 +93,7 @@ return array(
 	),
 	'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' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Diese Aktion 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.',
-- 
cgit v1.2.3


From 853957a74f00b668bdfc759c246217e5a05178a2 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:55:31 +0200
Subject: Update index.php

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

diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 3449de87d..04798cdce 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -17,7 +17,7 @@ return array(
 	),
 	'feed' => array(
 		'add' => 'Sie können Feeds hinzufügen.',
-		'empty' => 'Es gibt keinen Artikel zum Zeigen.',
+		'empty' => 'Es gibt keinen Artikel zum Anzeigen.',
 		'rss_of' => 'RSS-Feed von %s',
 		'title' => 'Ihre RSS-Feeds',
 		'title_global' => 'Globale Ansicht',
-- 
cgit v1.2.3


From ca58a265e6a702e42e25f5bf2393896b5517b0be Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:58:57 +0200
Subject: Update install.php

---
 app/i18n/de/install.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index e9267bbbd..a5899bb52 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -3,8 +3,8 @@
 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',
+		'fix_errors_before' => 'Bitte Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
+		'next_step' => 'Zum nächsten Schritt springen',
 	),
 	'auth' => array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -33,7 +33,7 @@ return 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.',
+			'ok' => 'Die 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).',
@@ -45,7 +45,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die 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).',
@@ -53,7 +53,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die 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.',
@@ -73,7 +73,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die 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.',
@@ -81,22 +81,22 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
 	),
 	'conf' => array(
 		'_' => 'Allgemeine Konfiguration',
-		'ok' => 'Allgemeine Konfiguration ist gespeichert worden.',
+		'ok' => 'Die 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.',
+	'fix_errors_before' => 'Bitte den 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.',
+		'defined' => 'Die 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.',
-- 
cgit v1.2.3


From 9fe8a7c62dcd815065983613991f000b17444f5c Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Fri, 15 May 2015 20:09:58 +0200
Subject: Update admin.php

---
 app/i18n/de/admin.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index bcd0fcc61..8550805ee 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -19,15 +19,15 @@ return array(
 	'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.',
+			'ok' => 'Die 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.',
+			'ok' => 'Die Tabelle <em>category</em> ist korrekt konfiguriert.',
 		),
 		'connection' => array(
 			'nok' => 'Verbindung zur Datenbank kann nicht aufgebaut werden.',
-			'ok' => 'Verbindung zur Datenbank ist in Ordnung.',
+			'ok' => 'Verbindung zur Datenbank konnte aufgebaut werden.',
 		),
 		'ctype' => array(
 			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für die Überprüfung von Zeichentypen (php-ctype).',
@@ -39,7 +39,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
 		),
 		'database' => 'Datenbank-Installation',
 		'dom' => array(
@@ -48,19 +48,19 @@ return array(
 		),
 		'entries' => array(
 			'nok' => 'Die Tabelle <em>entry</em> ist schlecht konfiguriert.',
-			'ok' => 'Die Tabelle <em>entry</em> ist in Ordnung.',
+			'ok' => 'Die Tabelle <em>entry</em> ist korrekt konfiguriert.',
 		),
 		'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.',
+			'ok' => 'Die 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.',
+			'ok' => 'Die Tabelle <em>feed</em> ist korrekt konfiguriert.',
 		),
 		'files' => 'Datei-Installation',
 		'json' => array(
-			'nok' => 'Ihnen fehlt JSON (Paket php5-json).',
+			'nok' => 'Ihnen fehlt die JSON-Erweiterung (Paket php5-json).',
 			'ok' => 'Sie haben die JSON-Erweiterung.',
 		),
 		'minz' => array(
@@ -77,7 +77,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/persona</em> sind in Ordnung.',
 		),
 		'php' => array(
 			'_' => 'PHP-Installation',
@@ -91,11 +91,11 @@ return array(
 		'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.',
+			'ok' => 'Die 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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
 		'zip' => array(
 			'nok' => 'Ihnen fehlt die ZIP-Erweiterung (Paket php5-zip).',
@@ -120,22 +120,22 @@ return array(
 		'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' => 'Einträge pro Tag (letzten 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',
+		'idle' => 'Inkative Feeds',
 		'main' => 'Haupt-Statistiken',
 		'main_stream' => 'Haupt-Feeds',
 		'menu' => array(
-			'idle' => 'Untätige Feeds',
+			'idle' => 'Inkative Feeds',
 			'main' => 'Haupt-Statistiken',
 			'repartition' => 'Artikel-Verteilung',
 		),
-		'no_idle' => 'Es gibt keinen untätigen Feed!',
+		'no_idle' => 'Es gibt keinen inaktiven Feed!',
 		'number_entries' => '%d Artikel',
 		'percent_of_total' => '%% Gesamt',
 		'repartition' => 'Artikel-Verteilung',
@@ -152,7 +152,7 @@ return array(
 		'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',
+		'none' => 'Keine ausstehende Aktualisierung',
 		'title' => 'System aktualisieren',
 	),
 	'user' => array(
-- 
cgit v1.2.3


From bd21838bd0edd0169c583d25a475f9eea7636333 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Fri, 15 May 2015 20:18:24 +0200
Subject: Update conf.php

---
 app/i18n/de/conf.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index df2c07d49..4a0a77ddd 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -5,8 +5,8 @@ return 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',
+		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Feeds verfügbar.',
+		'keep_history_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten werden',
 		'optimize' => 'Datenbank optimieren',
 		'optimize_help' => 'Sollte gelegentlich durchgeführt werden, um die Größe der Datenbank zu reduzieren.',
 		'purge_now' => 'Jetzt bereinigen',
@@ -32,10 +32,10 @@ return array(
 		'title' => 'Anzeige',
 		'width' => array(
 			'content' => 'Inhaltsbreite',
-			'large' => 'Weit',
+			'large' => 'Gross',
 			'medium' => 'Mittel',
 			'no_limit' => 'Keine Begrenzung',
-			'thin' => 'Schmal',
+			'thin' => 'Klein',
 		),
 	),
 	'query' => array(
@@ -136,14 +136,14 @@ return array(
 		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
-		'_' => 'Tastaturkürzel',
+		'_' => 'Tastenkombination',
 		'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',
+		'collapse_article' => 'Einklappen',
 		'first_article' => 'Zum ersten Artikel springen',
-		'focus_search' => 'Auf Suchfeld zugreifen',
+		'focus_search' => 'Auf das Suchfeld zugreifen',
 		'help' => 'Dokumentation anzeigen',
 		'javascript' => 'JavaScript muss aktiviert sein, um Tastaturkürzel benutzen zu können',
 		'last_article' => 'Zum letzten Artikel springen',
@@ -151,13 +151,13 @@ return array(
 		'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.',
+		'navigation_help' => 'Mit der "Umschalttaste" finden die Tastenkombination auf Feeds Anwendung.<br/>Mit der "Alt-Taste" finden die Tastenkombination 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',
+		'title' => 'Tastenkombination',
 		'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.',
 	),
-- 
cgit v1.2.3


From 70f0fc8d614ae49aa21ef9f1ce1b3f06e294512f Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:52:08 +0200
Subject: Update feedback.php

---
 app/i18n/de/feedback.php | 60 ++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index 48f8b74f5..4c15aadc3 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -15,19 +15,19 @@ return array(
 		),
 		'login' => array(
 			'invalid' => 'Anmeldung ist ungültig',
-			'success' => 'Sie sind verbunden',
+			'success' => 'Sie sind angemeldet',
 		),
 		'logout' => array(
-			'success' => 'Sie sind getrennt',
+			'success' => 'Sie sind abgemeldet',
 		),
 		'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',
+		'error' => 'Während der 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',
+		'shortcuts_updated' => 'Die Tastenkombinationen sind aktualisiert worden',
+		'updated' => 'Die Konfiguration ist aktualisiert worden',
 	),
 	'extensions' => array(
 		'already_enabled' => '%s ist bereits aktiviert',
@@ -44,44 +44,44 @@ return array(
 		'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.',
+		'export_no_zip_extension' => 'Die Zip-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie die 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!',
+		'file_cannot_be_uploaded' => 'Die 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.',
+			'created' => 'Die Kategorie %s ist erstellt worden.',
+			'deleted' => 'Die Kategorie ist gelöscht worden.',
+			'emptied' => 'Die Kategorie ist geleert worden.',
+			'error' => 'Die Kategorie kann nicht aktualisiert werden',
+			'name_exists' => 'Der Kategorie-Name existiert bereits.',
 			'no_id' => 'Sie müssen die ID der Kategorie präzisieren.',
-			'no_name' => 'Kategorie-Name kann nicht leer sein.',
+			'no_name' => 'Der 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.',
+			'over_max' => 'Sie haben Ihre Kategorien-Limite erreicht (%d)',
+			'updated' => 'Die 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',
+			'actualizeds' => 'Die RSS-Feeds sind aktualisiert worden',
+			'added' => 'Der 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',
+			'deleted' => 'Der Feed ist gelöscht worden',
+			'error' => 'Der 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',
+			'invalid_url' => 'Die URL <em>%s</em> ist ungültig',
+			'marked_read' => 'Die Feeds sind als gelesen markiert worden',
+			'n_actualized' => 'Die %d Feeds sind aktualisiert worden',
+			'n_entries_deleted' => 'Die %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',
+			'over_max' => 'Sie haben Ihre Feeds-Limite erreicht (%d)',
+			'updated' => 'Der Feed ist aktualisiert worden',
 		),
 		'purge_completed' => 'Bereinigung abgeschlossen (%d Artikel gelöscht)',
 	),
@@ -91,16 +91,16 @@ return array(
 		'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]',
+		'server_not_found' => 'Der Aktualisierungs-Server kann nicht gefunden werden. [%s]',
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Benutzer %s ist erstellt worden',
-			'error' => 'Benutzer %s kann nicht erstellt werden',
+			'_' => 'Der Benutzer %s ist erstellt worden',
+			'error' => 'Der Benutzer %s kann nicht erstellt werden',
 		),
 		'deleted' => array(
-			'_' => 'Benutzer %s ist gelöscht worden',
-			'error' => 'Benutzer %s kann nicht gelöscht werden',
+			'_' => 'Der Benutzer %s ist gelöscht worden',
+			'error' => 'Der Benutzer %s kann nicht gelöscht werden',
 		),
 	),
 	'profile' => array(
-- 
cgit v1.2.3


From 7c6ce30f59295d06ad7fc7f6c3e935d058836877 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:54:23 +0200
Subject: Update gen.php

---
 app/i18n/de/gen.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 8970d5003..f24a52c2e 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -49,7 +49,7 @@ return array(
 		'april' => 'April',
 		'aug' => 'Aug',
 		'august' => 'August',
-		'before_yesterday' => 'Vor gestern',
+		'before_yesterday' => 'Vor vorgestern',
 		'dec' => 'Dez',
 		'december' => 'Dezember',
 		'feb' => 'Feb',
@@ -93,7 +93,7 @@ return array(
 	),
 	'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' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Diese Aktion 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.',
-- 
cgit v1.2.3


From 450cc2d66f55817f85090ab742ebc351df9cbc43 Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:55:31 +0200
Subject: Update index.php

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

diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 3449de87d..04798cdce 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -17,7 +17,7 @@ return array(
 	),
 	'feed' => array(
 		'add' => 'Sie können Feeds hinzufügen.',
-		'empty' => 'Es gibt keinen Artikel zum Zeigen.',
+		'empty' => 'Es gibt keinen Artikel zum Anzeigen.',
 		'rss_of' => 'RSS-Feed von %s',
 		'title' => 'Ihre RSS-Feeds',
 		'title_global' => 'Globale Ansicht',
-- 
cgit v1.2.3


From fe2f6c74b9b2f5ed0f4c3f57b4bf2828e38e1f6a Mon Sep 17 00:00:00 2001
From: thomasE1993 <thomas.elsensohn@gmail.com>
Date: Sat, 16 May 2015 18:58:57 +0200
Subject: Update install.php

---
 app/i18n/de/install.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index e9267bbbd..a5899bb52 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -3,8 +3,8 @@
 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',
+		'fix_errors_before' => 'Bitte Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
+		'next_step' => 'Zum nächsten Schritt springen',
 	),
 	'auth' => array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -33,7 +33,7 @@ return 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.',
+			'ok' => 'Die 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).',
@@ -45,7 +45,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die 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).',
@@ -53,7 +53,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die 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.',
@@ -73,7 +73,7 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die 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.',
@@ -81,22 +81,22 @@ return array(
 		),
 		'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.',
+			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
 	),
 	'conf' => array(
 		'_' => 'Allgemeine Konfiguration',
-		'ok' => 'Allgemeine Konfiguration ist gespeichert worden.',
+		'ok' => 'Die 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.',
+	'fix_errors_before' => 'Bitte den 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.',
+		'defined' => 'Die 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.',
-- 
cgit v1.2.3


From 044c4428062ea215c9fe2f46fb47078854048e61 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 19:36:42 +0200
Subject: i18n: German

Completed cherry-pick of https://github.com/FreshRSS/FreshRSS/pull/832 +
corrections
---
 app/i18n/de/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 8550805ee..c0cbf6787 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -127,11 +127,11 @@ return array(
 		'entry_repartition' => 'Einträge-Verteilung',
 		'feed' => 'Feed',
 		'feed_per_category' => 'Feeds pro Kategorie',
-		'idle' => 'Inkative Feeds',
+		'idle' => 'Inaktive Feeds',
 		'main' => 'Haupt-Statistiken',
 		'main_stream' => 'Haupt-Feeds',
 		'menu' => array(
-			'idle' => 'Inkative Feeds',
+			'idle' => 'Inaktive Feeds',
 			'main' => 'Haupt-Statistiken',
 			'repartition' => 'Artikel-Verteilung',
 		),
-- 
cgit v1.2.3


From d3af903301ce2b59d2720e94727945cf9ff31a40 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 21:47:26 +0200
Subject: i18n: German PubSubHubbub

https://github.com/FreshRSS/FreshRSS/pull/831/files#r30463016
https://github.com/FreshRSS/FreshRSS/issues/312
---
 app/i18n/de/sub.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 7433bd61c..0f05a5635 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -37,7 +37,7 @@ return array(
 		'url' => 'Feed-URL',
 		'validator' => 'Überprüfen Sie die Gültigkeit des Feeds',
 		'website' => 'Webseiten-URL',
-		'pubsubhubbub' => 'Sofortige Benachrichtigung mit PubSubHubbub',
+		'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Exportieren',
-- 
cgit v1.2.3


From 99dd1d37e021733f27f6e09129a7133e6db5e584 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 21:52:57 +0200
Subject: PubSubHubbub changelog

Planned for version beta 1.1.2
https://github.com/FreshRSS/FreshRSS/issues/312
---
 CHANGELOG | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f3559ccc4..ed1f655f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,14 @@
 # Changelog
 
-## 2015-xx-xx FreshRSS 1.1.1 (beta)
+## 2015-xx-xx FreshRSS 1.1.2 (beta)
 
 * Features
 	* Support for PubSubHubbub for instant notifications from compatible Web sites.
+
+
+## 2015-xx-xx FreshRSS 1.1.1 (beta)
+
+* Features
 	* New option to detect and mark updated articles as unread.
 	* Support for internationalized domain name (IDN).
 * Misc.
-- 
cgit v1.2.3


From a19e908b73b3fe011bc40609d1edb7f7da6030c8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 22:04:47 +0200
Subject: Changelog, readme

Several spelling mistakes corrected. Slight rewording of some sentences.
Cherry-picked from PubSubHubbub
https://github.com/FreshRSS/FreshRSS/pull/831 (it should have been a
different branch)

https://github.com/Alkarex/FreshRSS/commit/3adab4b70fab858048bd68ed72e71676c4d5badf
---
 CHANGELOG    |  8 ++++++++
 README.fr.md | 21 +++++++++------------
 README.md    | 33 +++++++++++++++------------------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d1b49d339..fea4e8871 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,14 @@
 
 ## 2015-xx-xx FreshRSS 1.1.1 (beta)
 
+* Features
+	* New option to detect and mark updated articles as unread.
+	* Support for internationalized domain name (IDN).
+* Misc.
+	* Improved logic for automatic deletion of old articles.
+	* Attempt to better handle encoded titles.
+
+
 ## 2015-01-31 FreshRSS 1.0.0 / 1.1.0 (beta)
 
 * UI
diff --git a/README.fr.md b/README.fr.md
index 6c77ccf51..c8f573180 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -14,28 +14,25 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an
 ![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 :
+**Ce logiciel est en développement permanent !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
 
 * 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 !
+* Pour les développeurs et ceux qui veulent aider à tester les toutes dernières fonctionnalités, [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/FreshRSS/FreshRSS/issues).
+Cette application a été développée pour s’adapter principalement à des besoins personnels, et aucune garantie n'est fournie.
+Les demandes de fonctionnalités, rapports de bugs, et autres contributions sont les bienvenues. Privilégiez pour cela des [demandes sur GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 
-# Pré-requis
+# Prérequis
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi avec des temps de réponse < 1s (testé sur 150 flux, 22k articles, soit 32Mo de données partiellement compressées)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.2.1+ (PHP 5.3.7+ recommandé)
-	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur platformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
+	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
 * MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
-* Un navigateur Web récent tel Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
+* Un navigateur Web récent tel Firefox, Chrome, Opera, Safari. [Internet Explorer ne fonctionne plus, mais ce sera corrigé](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Fonctionne aussi sur mobile
 
 ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
@@ -63,7 +60,7 @@ C’est une bonne idée d’utiliser le même utilisateur que votre serveur Web
 Par exemple, pour exécuter le script toutes les heures :
 
 ```
-7 * * * * php /chemin/vers/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+7 * * * * php /votre-chemin/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 # Conseils
@@ -75,7 +72,7 @@ Par exemple, pour exécuter le script toutes les heures :
 # Sauvegarde
 * Il faut conserver vos fichiers `./data/config.php` ainsi que `./data/*_user.php` et éventuellement `./data/persona/`
 * Vous pouvez exporter votre liste de flux depuis FreshRSS au format OPML
-* Pour sauvegarder les articles eux-même, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
+* Pour sauvegarder les articles eux-mêmes, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
 
 ```bash
 mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
diff --git a/README.md b/README.md
index 089bbd780..830dcc01b 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 * [Version française](README.fr.md)
 
 # FreshRSS
-FreshRSS is a self-hosted RSS feed agregator like [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
+FreshRSS is a self-hosted RSS feed aggregator such as [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
 
-It is at the same time light-weight, easy to work with, powerful and customizable.
+It is at the same time lightweight, easy to work with, powerful and customizable.
 
 It is a multi-user application with an anonymous reading mode.
 
@@ -14,28 +14,25 @@ It is a multi-user application with an anonymous reading mode.
 ![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:
+**This application is under continuous development!** Please use the branch that suits your needs:
 
 * 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!
+* For developers and tech savvy persons willing to help testing the latest features, [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/FreshRSS/FreshRSS/issues).
+This application was developed to fulfil personal needs primarily, and comes with absolutely no warranty.
+Feature requests, bug reports, and other contributions are welcome. The best way is to [open issues on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 
 # Requirements
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi with response time under a second (tested with 150 feeds, 22k articles, or 32Mo of compressed data)
-* A web server: Apache2 (recommanded), nginx, lighttpd (not tested on others)
-* PHP 5.2.1+ (PHP 5.3.7+ recommanded)
+* A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
+* PHP 5.2.1+ (PHP 5.3.7+ recommended)
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
-	* 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) or SQLite 3.7.4+
-* A recent browser like Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
+	* Recommended 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+ (recommended) or SQLite 3.7.4+
+* A recent browser like Firefox, Chrome, Opera, Safari. [Internet Explorer currently not supported, but support will come back](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Works on mobile
 
 ![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
@@ -45,7 +42,7 @@ The best way is to open issues on GitHub
 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
-5. Every thing should be working :) If you encounter any problem, feel free to contact me.
+5. Everything should be working :) If you encounter any problem, feel free to contact me.
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
 # Access control
@@ -59,18 +56,18 @@ It is needed for the multi-user mode to limit access to FreshRSS. You can:
 # Automatic feed update
 * You can add a Cron job to launch the update script.
 Check the Cron documentation related to your distribution ([Debian/Ubuntu](https://help.ubuntu.com/community/CronHowto), [Red Hat/Fedora](https://fedoraproject.org/wiki/Administration_Guide_Draft/Cron), [Slackware](http://docs.slackware.com/fr:slackbook:process_control?#cron), [Gentoo](https://wiki.gentoo.org/wiki/Cron), [Arch Linux](https://wiki.archlinux.org/index.php/Cron)…).
-It’s a good idea to use the web server user .
+It’s a good idea to use the Web server user.
 For example, if you want to run the script every hour:
 
 ```
-7 * * * * php /chemin/vers/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+7 * * * * php /your-path/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 # Advices
 * For a better security, expose only the `./p/` folder on the web.
 	* 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.
+* If you encounter any problem, logs are accessible 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
-- 
cgit v1.2.3


From 005751d3fb43eefb57b52e8b8cbdf4da1a3578e8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 22:57:51 +0200
Subject: jQuery 2.1.4

http://blog.jquery.com/2015/04/28/jquery-1-11-3-and-2-1-4-released-ios-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 25714ed29..49990d6e1 100644
--- a/p/scripts/jquery.min.js
+++ b/p/scripts/jquery.min.js
@@ -1,4 +1,4 @@
-/*! 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});
+/*! jQuery v2.1.4 | (c) 2005, 2015 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.4",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="length"in a&&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=ha(),z=ha(),A=ha(),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-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=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)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){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 ga(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(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(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 ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(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 ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(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 pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.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",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(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(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);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))&&(ja(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(".#.+[+~]")}),ja(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))&&ja(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 la(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?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.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 ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.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},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.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=ga.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=ga.selectors={cacheLength:50,createPseudo:ia,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(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===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]||ga.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]&&ga.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(ca,da).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=ga.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()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(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:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(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:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).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:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(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]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.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?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(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 ta(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 ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(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 wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(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=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(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=[sa(ta(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 wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(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=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.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(ca,da),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(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(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}),ga}(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 aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ba=/<([\w:]+)/,ca=/<|&#?\w+;/,da=/<(?:script|style|link)/i,ea=/checked\s*(?:[^=]|=\s*.checked.)/i,fa=/^$|\/(?:java|ecma)script/i,ga=/^true\/(.*)/,ha=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ia={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,"",""]};ia.optgroup=ia.option,ia.tbody=ia.tfoot=ia.colgroup=ia.caption=ia.thead,ia.th=ia.td;function ja(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 ka(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function la(a){var b=ga.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function ma(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function na(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 oa(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 pa(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=oa(h),f=oa(a),d=0,e=f.length;e>d;d++)pa(f[d],g[d]);if(b)if(c)for(f=f||oa(a),g=g||oa(h),d=0,e=f.length;e>d;d++)na(f[d],g[d]);else na(a,h);return g=oa(h,"script"),g.length>0&&ma(g,!i&&oa(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(ca.test(e)){f=f||k.appendChild(b.createElement("div")),g=(ba.exec(e)||["",""])[1].toLowerCase(),h=ia[g]||ia._default,f.innerHTML=h[1]+e.replace(aa,"<$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=oa(k.appendChild(e),"script"),i&&ma(f),c)){j=0;while(e=f[j++])fa.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=ja(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=ja(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(oa(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&ma(oa(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(oa(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&&!da.test(a)&&!ia[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(aa,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(oa(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(oa(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&&ea.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(oa(c,"script"),ka),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,oa(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,la),j=0;g>j;j++)h=f[j],fa.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(ha,"")))}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 qa,ra={};function sa(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 ta(a){var b=l,c=ra[a];return c||(c=sa(a,b),"none"!==c&&c||(qa=(qa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qa[0].contentDocument,b.write(),b.close(),c=sa(a,b),qa.detach()),ra[a]=c),c}var ua=/^margin/,va=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wa=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xa(a,b,c){var d,e,f,g,h=a.style;return c=c||wa(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),va.test(g)&&ua.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 ya(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 za=/^(none|table(?!-c[ea]).+)/,Aa=new RegExp("^("+Q+")(.*)$","i"),Ba=new RegExp("^([+-])=("+Q+")","i"),Ca={position:"absolute",visibility:"hidden",display:"block"},Da={letterSpacing:"0",fontWeight:"400"},Ea=["Webkit","O","Moz","ms"];function Fa(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Ea.length;while(e--)if(b=Ea[e]+c,b in a)return b;return d}function Ga(a,b,c){var d=Aa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Ha(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 Ia(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wa(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xa(a,b,f),(0>e||null==e)&&(e=a.style[b]),va.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Ha(a,b,c||(g?"border":"content"),d,f)+"px"}function Ja(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",ta(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=xa(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]=Fa(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=Ba.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]=Fa(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xa(a,b,d)),"normal"===e&&b in Da&&(e=Da[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?za.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Ca,function(){return Ia(a,b,d)}):Ia(a,b,d):void 0},set:function(a,c,d){var e=d&&wa(a);return Ga(a,c,d?Ha(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=ya(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xa,[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}},ua.test(a)||(n.cssHooks[a+b].set=Ga)}),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=wa(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 Ja(this,!0)},hide:function(){return Ja(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 Ka(a,b,c,d,e){return new Ka.prototype.init(a,b,c,d,e)}n.Tween=Ka,Ka.prototype={constructor:Ka,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=Ka.propHooks[this.prop];return a&&a.get?a.get(this):Ka.propHooks._default.get(this)},run:function(a){var b,c=Ka.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ka.propHooks._default.set(this),this}},Ka.prototype.init.prototype=Ka.prototype,Ka.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}}},Ka.propHooks.scrollTop=Ka.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=Ka.prototype.init,n.fx.step={};var La,Ma,Na=/^(?:toggle|show|hide)$/,Oa=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pa=/queueHooks$/,Qa=[Va],Ra={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Oa.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Oa.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 Sa(){return setTimeout(function(){La=void 0}),La=n.now()}function Ta(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 Ua(a,b,c){for(var d,e=(Ra[b]||[]).concat(Ra["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Va(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")||ta(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],Na.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?ta(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=Ua(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 Wa(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 Xa(a,b,c){var d,e,f=0,g=Qa.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=La||Sa(),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:La||Sa(),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(Wa(k,j.opts.specialEasing);g>f;f++)if(d=Qa[f].call(j,a,k,j.opts))return d;return n.map(k,Ua,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(Xa,{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],Ra[c]=Ra[c]||[],Ra[c].unshift(b)},prefilter:function(a,b){b?Qa.unshift(a):Qa.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=Xa(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&&Pa.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(Ta(b,!0),a,d,e)}}),n.each({slideDown:Ta("show"),slideUp:Ta("hide"),slideToggle:Ta("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(La=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),La=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(){Ma||(Ma=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Ma),Ma=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 Ya,Za,$a=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)?Za:Ya)),
+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}}}}}),Za={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=$a[b]||n.find.attr;$a[b]=function(a,b,d){var e,f;return d||(f=$a[b],$a[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$a[b]=f),e}});var _a=/^(?: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")||_a.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 ab=/[\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(ab," "):" ")){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(ab," "):"")){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(ab," ").indexOf(b)>=0)return!0;return!1}});var bb=/\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(bb,""):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 cb=n.now(),db=/\?/;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 eb=/#.*$/,fb=/([?&])_=[^&]*/,gb=/^(.*?):[ \t]*([^\r\n]*)$/gm,hb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ib=/^(?:GET|HEAD)$/,jb=/^\/\//,kb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lb={},mb={},nb="*/".concat("*"),ob=a.location.href,pb=kb.exec(ob.toLowerCase())||[];function qb(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 rb(a,b,c,d){var e={},f=a===mb;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 sb(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 tb(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 ub(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:ob,type:"GET",isLocal:hb.test(pb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nb,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?sb(sb(a,n.ajaxSettings),b):sb(n.ajaxSettings,a)},ajaxPrefilter:qb(lb),ajaxTransport:qb(mb),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=gb.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||ob)+"").replace(eb,"").replace(jb,pb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kb.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pb[1]&&h[2]===pb[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pb[3]||("http:"===pb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rb(lb,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=!ib.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(db.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fb.test(d)?d.replace(fb,"$1_="+cb++):d+(db.test(d)?"&":"?")+"_="+cb++)),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]?", "+nb+"; 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=rb(mb,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=tb(k,v,f)),u=ub(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 vb=/%20/g,wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ab(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)Ab(c,a[c],b,e);return d.join("&").replace(vb,"+")},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")&&zb.test(this.nodeName)&&!yb.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(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bb=0,Cb={},Db={0:200,1223:204},Eb=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cb)Cb[a]()}),k.cors=!!Eb&&"withCredentials"in Eb,k.ajax=Eb=!!Eb,n.ajaxTransport(function(a){var b;return k.cors||Eb&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bb;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 Cb[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Db[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=Cb[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 Fb=[],Gb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fb.pop()||n.expando+"_"+cb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gb.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gb.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(Gb,"$1"+e):b.jsonp!==!1&&(b.url+=(db.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,Fb.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 Hb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hb)return Hb.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 Ib=a.document.documentElement;function Jb(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=Jb(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||Ib;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ib})}}),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=Jb(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]=ya(k.pixelPosition,function(a,c){return c?(c=xa(a,b),va.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 Kb=a.jQuery,Lb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lb),b&&a.jQuery===n&&(a.jQuery=Kb),n},typeof b===U&&(a.jQuery=a.$=n),n});
-- 
cgit v1.2.3


From 6985a73f1c2f9ca774d50f5b4aa3a5f4742e1faf Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Sat, 16 May 2015 23:37:28 +0200
Subject: Typo fix

---
 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 b02b9f0f2..013c3495d 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -10,7 +10,7 @@ return array(
 		'empty' => 'Empty',
 		'enable' => 'Enable',
 		'export' => 'Export',
-		'filter' => 'Filtrer',
+		'filter' => 'Filter',
 		'import' => 'Import',
 		'manage' => 'Manage',
 		'mark_read' => 'Mark as read',
-- 
cgit v1.2.3


From 84ea636d2d8c55e04d0c2d07688b66d7730b6c7c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 23:44:36 +0200
Subject: PubSubHubbub bug skip pull

Do not pull refresh feeds that are PubSubHubbub too often during cron
refresh.
And more debugging info during the test phase.
https://github.com/FreshRSS/FreshRSS/pull/831
---
 app/Controllers/feedController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index dfdf0dc16..5e845027f 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -300,8 +300,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$updated_feeds = 0;
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
+			$url = $feed->url();	//For detection of HTTP 301
+
 			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
-			if ((!$simplePiePush) && (!$id) && (!$force) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
+			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
+				$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
+				Minz_Log::debug($text);
+				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 				continue;	//When PubSubHubbub is used, do not pull refresh so often
 			}
 
@@ -310,7 +315,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
-			$url = $feed->url();	//For detection of HTTP 301
 			try {
 				if ($simplePiePush) {
 					$feed->loadEntries($simplePiePush);	//Used by PubSubHubbub
-- 
cgit v1.2.3


From 6d31c60976f2cf8ca8adab7cb64a3d67f1ac6a00 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Sun, 17 May 2015 01:18:49 +0200
Subject: Language fix

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

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index d2fcd3e82..155384afd 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:',
+		'token_help' => 'Allows access to RSS output of the default user without authentication:',
 		'type' => 'Authentication method',
 		'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	),
-- 
cgit v1.2.3


From 35cdb89eed82ec7458b85cc734d384bdada111a3 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Sun, 17 May 2015 01:30:35 +0200
Subject: Language fix + en_GB standardisation

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

diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 19af81e5b..c9189c0d0 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -2,7 +2,7 @@
 
 return array(
 	'admin' => array(
-		'optimization_complete' => 'Optimization complete',
+		'optimization_complete' => 'Optimisation complete',
 	),
 	'access' => array(
 		'denied' => 'You don’t have permission to access this page',
@@ -52,7 +52,7 @@ return array(
 		'zip_error' => 'An error occured during Zip import.',
 	),
 	'sub' => array(
-		'actualize' => 'Actualize',
+		'actualize' => 'Actualise',
 		'category' => array(
 			'created' => 'Category %s has been created.',
 			'deleted' => 'Category has been deleted.',
@@ -86,7 +86,7 @@ return array(
 		'purge_completed' => 'Purge completed (%d articles deleted)',
 	),
 	'update' => array(
-		'can_apply' => 'FreshRSS will be now updated to the <strong>version %s</strong>.',
+		'can_apply' => 'FreshRSS will now be 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!',
-- 
cgit v1.2.3


From af166f6c5344d727744e08d22f605cc57ec618f8 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Sun, 17 May 2015 01:33:43 +0200
Subject: Language fix

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

diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 2bc6bd38f..742c73313 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -3,11 +3,11 @@
 return array(
 	'action' => array(
 		'finish' => 'Complete installation',
-		'fix_errors_before' => 'Fix errors before skip to the next step.',
+		'fix_errors_before' => 'Please fix errors before before skipping to the next step.',
 		'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>',
+		'email_persona' => 'Login email 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)',
@@ -91,7 +91,7 @@ return array(
 	'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.',
+	'fix_errors_before' => 'Please fix errors before before skipping to the next step.',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'language' => array(
 		'_' => 'Language',
-- 
cgit v1.2.3


From cad42ea55f8f974899328bed74cf2b9d7fffe4a2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 17 May 2015 12:32:46 +0200
Subject: i18n: en-GB revert

https://github.com/FreshRSS/FreshRSS/commit/af166f6c5344d727744e08d22f605cc57ec618f8#commitcomment-11229341
---
 app/i18n/en/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 742c73313..d4137309a 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'finish' => 'Complete installation',
-		'fix_errors_before' => 'Please fix errors before before skipping to the next step.',
+		'fix_errors_before' => 'Please fix errors before skipping to the next step.',
 		'next_step' => 'Go to the next step',
 	),
 	'auth' => array(
@@ -91,7 +91,7 @@ return array(
 	'congratulations' => 'Congratulations!',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'delete_articles_after' => 'Remove articles after',
-	'fix_errors_before' => 'Please fix errors before before skipping to the next step.',
+	'fix_errors_before' => 'Please fix errors before skipping to the next step.',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'language' => array(
 		'_' => 'Language',
-- 
cgit v1.2.3


From 001c713f030d51b74a860e20014153c6b4d9661f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 17 May 2015 22:06:11 +0200
Subject: PubSubHubbub better gestion of errors

Do not assume that PubSubHubbub works until the first successul push
https://github.com/FreshRSS/FreshRSS/issues/312#issuecomment-102706500
---
 app/Controllers/feedController.php |  4 ++--
 app/Models/Feed.php                | 31 ++++++++++++++++++++++---------
 p/api/pshb.php                     |  7 +++++++
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 5e845027f..3d8a6deb7 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -305,7 +305,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
 			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
 				$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
-				Minz_Log::debug($text);
+				//Minz_Log::debug($text);
 				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 				continue;	//When PubSubHubbub is used, do not pull refresh so often
 			}
@@ -389,7 +389,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 							Minz_Log::warning($text);
 							$pubSubHubbubEnabled = false;
-							$feed->pubSubHubbubEnabled(false);	//To force the renewal of our lease
+							$feed->pubSubHubbubError(true);
 						}
 
 						if (!$entryDAO->hasTransaction()) {
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 7bc60dfc9..ed0a862c3 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -359,23 +359,33 @@ class FreshRSS_Feed extends Minz_Model {
 
 	//<PubSubHubbub>
 
-	function pubSubHubbubEnabled($keep = true) {
+	function pubSubHubbubEnabled() {
 		$url = $this->selfUrl ? $this->selfUrl : $this->url;
 		$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json';
 		if ($hubFile = @file_get_contents($hubFilename)) {
 			$hubJson = json_decode($hubFile, true);
-			if (!$keep) {
-				$hubJson['lease_end'] = time() - 60;
-				file_put_contents($hubFilename, json_encode($hubJson));
-				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t"
-					. 'Force expire lease for ' . $url . "\n", FILE_APPEND);
-			} elseif ($hubJson && (empty($hubJson['lease_end']) || $hubJson['lease_end'] > time())) {
+			if ($hubJson && empty($hubJson['error']) &&
+				(empty($hubJson['lease_end']) || $hubJson['lease_end'] > time())) {
 				return true;
 			}
 		}
 		return false;
 	}
 
+	function pubSubHubbubError($error = true) {
+		$url = $this->selfUrl ? $this->selfUrl : $this->url;
+		$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json';
+		$hubFile = @file_get_contents($hubFilename);
+		$hubJson = $hubFile ? json_decode($hubFile, true) : array();
+		if (!isset($hubJson['error']) || $hubJson['error'] !== (bool)$error) {
+			$hubJson['error'] = (bool)$error;
+			file_put_contents($hubFilename, json_encode($hubJson));
+			file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t"
+				. 'Set error to ' . ($error ? 1 : 0) . ' for ' . $url . "\n", FILE_APPEND);
+		}
+		return false;
+	}
+
 	function pubSubHubbubPrepare() {
 		$key = '';
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
@@ -389,17 +399,20 @@ class FreshRSS_Feed extends Minz_Model {
 					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					return false;
 				}
-				if (empty($hubJson['lease_end']) || ($hubJson['lease_end'] <= (time() + (3600 * 24)))) {	//TODO: Make a better policy
+				if ((!empty($hubJson['lease_end'])) && ($hubJson['lease_end'] < (time() + (3600 * 23)))) {	//TODO: Make a better policy
 					$text = 'PubSubHubbub lease ends at '
 						. date('c', empty($hubJson['lease_end']) ? time() : $hubJson['lease_end'])
 						. ' and needs renewal: ' . $this->url;
 					Minz_Log::warning($text);
 					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					$key = $hubJson['key'];	//To renew our lease
+				} elseif (((!empty($hubJson['error'])) || empty($hubJson['lease_end'])) &&
+					(empty($hubJson['lease_start']) || $hubJson['lease_start'] < time() - (3600 * 23))) {	//Do not renew too often
+					$key = $hubJson['key'];	//To renew our lease
 				}
 			} else {
 				@mkdir($path, 0777, true);
-				$key = sha1(FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
+				$key = sha1($path . FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
 				$hubJson = array(
 					'hub' => $this->hubUrl,
 					'key' => $key,
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 2f7f48cd8..4bb4694b3 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -60,6 +60,10 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
 	} else {
 		unset($hubJson['lease_end']);
 	}
+	$hubJson['lease_start'] = time();
+	if (!isset($hubJson['error'])) {
+		$hubJson['error'] = true;	//Do not assume that PubSubHubbub works until the first successul push
+	}
 	file_put_contents('./!hub.json', json_encode($hubJson));
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
@@ -120,6 +124,9 @@ if ($nb === 0) {
 	header('HTTP/1.1 410 Gone');
 	logMe('Error: Nobody is subscribed to this feed anymore after all!: ' . $self);
 	die('Nobody is subscribed to this feed anymore after all!');
+} elseif (!empty($hubJson['error'])) {
+	$hubJson['error'] = false;
+	file_put_contents('./!hub.json', json_encode($hubJson));
 }
 
 logMe('PubSubHubbub ' . $self . ' done: ' . $nb);
-- 
cgit v1.2.3


From 265f09f25726102249ff3819ae810f85dee2849f Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Mon, 18 May 2015 09:02:28 +0200
Subject: Language fix

---
 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 013c3495d..6e47e0921 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -150,7 +150,7 @@ return array(
 		'wallabag' => 'wallabag',
 	),
 	'short' => array(
-		'attention' => 'Attention!',
+		'attention' => 'Warning!',
 		'blank_to_disable' => 'Leave blank to disable',
 		'by_author' => 'By <em>%s</em>',
 		'by_default' => 'By default',
-- 
cgit v1.2.3


From 6263ecef2fde84aa317ccd4d0b784ac6c2ad2295 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Mon, 18 May 2015 09:06:37 +0200
Subject: Language fix

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

diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 683781696..42a06906d 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -5,9 +5,9 @@ return array(
 		'_' => 'Archiving',
 		'advanced' => 'Advanced',
 		'delete_after' => 'Remove articles after',
-		'help' => 'More options are available in the individual stream settings',
+		'help' => 'More options are available in the individual feed settings',
 		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
-		'optimize' => 'Optimize database',
+		'optimize' => 'Optimise database',
 		'optimize_help' => 'To do occasionally to reduce the size of the database',
 		'purge_now' => 'Purge now',
 		'title' => 'Archiving',
@@ -72,7 +72,7 @@ return array(
 	),
 	'profile' => array(
 		'_' => 'Profile management',
-		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'email_persona' => 'Login email 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',
-- 
cgit v1.2.3


From 7524811c963d4e90df60ef9b3ebdae62e4da3e60 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Mon, 18 May 2015 09:09:28 +0200
Subject: Language fix

---
 app/i18n/en/sub.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 2b62e4775..8fe150bb2 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -18,7 +18,7 @@ return array(
 			'password' => 'HTTP password',
 			'username' => 'HTTP username',
 		),
-		'css_help' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
+		'css_help' => 'Retrieves truncated RSS feeds (caution, 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.',
@@ -26,7 +26,7 @@ return array(
 		'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>.',
+		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',
 		'no_selected' => 'No feed selected.',
 		'number_entries' => '%d articles',
 		'stats' => 'Statistics',
-- 
cgit v1.2.3


From 65b41af94d904d7d62b242407d68843e3fea802e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 21 May 2015 19:42:03 +0200
Subject: Google Reader API: work-around for News+ bug

https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632
https://github.com/FreshRSS/FreshRSS/issues/443
---
 p/api/greader.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/p/api/greader.php b/p/api/greader.php
index 4554a3f9c..5a23af006 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -467,6 +467,9 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 	$entryDAO = FreshRSS_Factory::createEntryDao();
 	$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', new FreshRSS_Search(''), $start_time);
 
+	if (empty($ids)) {	//For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632
+		$ids[] = 0;
+	}
 	$itemRefs = array();
 	foreach ($ids as $id) {
 		$itemRefs[] = array(
-- 
cgit v1.2.3


From 10d98e0ce97d15882a06865b894136d3c0444d79 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 21 May 2015 19:46:32 +0200
Subject: Google Reader API: work-around for News+ bug

https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632
https://github.com/FreshRSS/FreshRSS/issues/443
---
 p/api/greader.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/p/api/greader.php b/p/api/greader.php
index 4554a3f9c..5a23af006 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -467,6 +467,9 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 	$entryDAO = FreshRSS_Factory::createEntryDao();
 	$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', new FreshRSS_Search(''), $start_time);
 
+	if (empty($ids)) {	//For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632
+		$ids[] = 0;
+	}
 	$itemRefs = array();
 	foreach ($ids as $id) {
 		$itemRefs[] = array(
-- 
cgit v1.2.3


From 27d2b88a19345dfc665dc086d3c2b2e4547e1b7f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 02:23:38 +0200
Subject: Minz getBaseUrl correction and RSS template bug

https://github.com/FreshRSS/FreshRSS/issues/848
Corrections in Minz (HTTP_HOST was not sanitized, getURI() was never
used and not working anyway with absolute base_url)
$this->url was not defined in rss.phtml
---
 app/Controllers/indexController.php |  1 +
 constants.php                       |  3 ++-
 lib/Minz/Request.php                | 46 +++++++++++--------------------------
 lib/Minz/Url.php                    | 10 +-------
 4 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index c1aaca53f..baaf99065 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -137,6 +137,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 
 		// No layout for RSS output.
+		$this->view->url = empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING'];
 		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
 		$this->view->_useLayout(false);
 		header('Content-Type: application/rss+xml; charset=utf-8');
diff --git a/constants.php b/constants.php
index b20bf0710..d32fdfa9b 100644
--- a/constants.php
+++ b/constants.php
@@ -11,7 +11,8 @@ define('PHP_COMPRESSION', false);
 define('FRESHRSS_PATH', dirname(__FILE__));
 
 	define('PUBLIC_PATH', FRESHRSS_PATH . '/p');
-		define('INDEX_PATH', PUBLIC_PATH . '/i');
+		define('PUBLIC_TO_INDEX_PATH', '/i');
+		define('INDEX_PATH', PUBLIC_PATH . PUBLIC_TO_INDEX_PATH);
 		define('PUBLIC_RELATIVE', '..');
 
 	define('DATA_PATH', FRESHRSS_PATH . '/data');
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 6db2e9c7a..b9eda82a5 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -84,45 +84,27 @@ class Minz_Request {
 		self::magicQuotesOff();
 	}
 
-	/**
-	 * Retourn le nom de domaine du site
-	 */
-	public static function getDomainName() {
-		return $_SERVER['HTTP_HOST'];
-	}
-
 	/**
 	 * Détermine la base de l'url
 	 * @return la base de l'url
 	 */
-	public static function getBaseUrl() {
+	public static function getBaseUrl($baseUrlSuffix = '') {
 		$conf = Minz_Configuration::get('system');
-		$defaultBaseUrl = $conf->base_url;
-		if (!empty($defaultBaseUrl)) {
-			return $defaultBaseUrl;
-		} elseif (isset($_SERVER['REQUEST_URI'])) {
-			return dirname($_SERVER['REQUEST_URI']) . '/';
-		} else {
-			return '/';
-		}
-	}
-
-	/**
-	 * Récupère l'URI de la requête
-	 * @return l'URI
-	 */
-	public static function getURI() {
-		if (isset($_SERVER['REQUEST_URI'])) {
-			$base_url = self::getBaseUrl();
-			$uri = $_SERVER['REQUEST_URI'];
-
-			$len_base_url = strlen($base_url);
-			$real_uri = substr($uri, $len_base_url);
+		$url = $conf->base_url;
+		if ($url == '' || !preg_match('%^https?://%i', $url)) {
+			$url = 'http';
+			$host = empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST'];
+			$port = empty($_SERVER['SERVER_PORT']) ? 80 : $_SERVER['SERVER_PORT'];
+			if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+				$url .= 's://' . $host . ($port == 443 ? '' : ':' . $port);
+			} else {
+				$url .= '://' . $host . ($port == 80 ? '' : ':' . $port);
+			}
+			$url .= isset($_SERVER['REQUEST_URI']) ? dirname($_SERVER['REQUEST_URI']) : '';
 		} else {
-			$real_uri = '';
+			$url = rtrim($url, '/\\') . $baseUrlSuffix;
 		}
-
-		return $real_uri;
+		return filter_var($url . '/', FILTER_SANITIZE_URL);
 	}
 
 	/**
diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index af555a277..a47d8f1a6 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -10,7 +10,6 @@ class Minz_Url {
 	 *                    $url['c'] = controller
 	 *                    $url['a'] = action
 	 *                    $url['params'] = tableau des paramètres supplémentaires
-	 *                    $url['protocol'] = protocole à utiliser (http par défaut)
 	 *             ou comme une chaîne de caractère
 	 * @param $encodage pour indiquer comment encoder les & (& ou &amp; pour html)
 	 * @return l'url formatée
@@ -25,14 +24,7 @@ class Minz_Url {
 		$url_string = '';
 
 		if ($absolute) {
-			if ($isArray && isset ($url['protocol'])) {
-				$protocol = $url['protocol'];
-			} elseif (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
-				$protocol = 'https:';
-			} else {
-				$protocol = 'http:';
-			}
-			$url_string = $protocol . '//' . Minz_Request::getDomainName () . Minz_Request::getBaseUrl ();
+			$url_string = Minz_Request::getBaseUrl(PUBLIC_TO_INDEX_PATH);
 		} else {
 			$url_string = $isArray ? '.' : PUBLIC_RELATIVE;
 		}
-- 
cgit v1.2.3


From 694dfa1f8b90d8f693ef39c7099c0e8f23c5c777 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 16:37:08 +0200
Subject: PubSubHubbub: remove white list

The tests so far are good. Ready to test more broadly.
https://github.com/FreshRSS/FreshRSS/pull/831
https://github.com/FreshRSS/FreshRSS/issues/312
---
 app/Controllers/feedController.php | 11 ++++-------
 app/Models/Feed.php                |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 3d8a6deb7..957a809cd 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -442,13 +442,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			$feed->faviconPrepare();
-			if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
-				Minz_Log::debug('PubSubHubbub match ' . $feed->url());
-				if ($feed->pubSubHubbubPrepare()) {
-					Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
-					if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
-						Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
-					}
+			if ($feed->pubSubHubbubPrepare()) {
+				Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
+				if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
+					Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
 				}
 			}
 			$feed->unlock();
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index ed0a862c3..bf7ed3967 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -388,7 +388,7 @@ class FreshRSS_Feed extends Minz_Model {
 
 	function pubSubHubbubPrepare() {
 		$key = '';
-		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
+		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl && @is_dir(PSHB_PATH)) {
 			$path = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl);
 			$hubFilename = $path . '/!hub.json';
 			if ($hubFile = @file_get_contents($hubFilename)) {
-- 
cgit v1.2.3


From 2b7ba45551c396ae0ea12664e5bf0d47826188fb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 17:33:14 +0200
Subject: Using Mardown format for changelog
 https://github.com/FreshRSS/FreshRSS/issues/124

---
 CHANGELOG    | 433 -----------------------------------------------------------
 CHANGELOG.md | 433 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 433 insertions(+), 433 deletions(-)
 delete mode 100644 CHANGELOG
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index fea4e8871..000000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,433 +0,0 @@
-# Changelog
-
-## 2015-xx-xx FreshRSS 1.1.1 (beta)
-
-* Features
-	* New option to detect and mark updated articles as unread.
-	* Support for internationalized domain name (IDN).
-* Misc.
-	* Improved logic for automatic deletion of old articles.
-	* Attempt to better handle encoded titles.
-
-
-## 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)
-
-* Feature
-	* 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)
-
-* 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)
-
-* 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)
-
-* UI
-	* New interface for statistics
-	* Fix filter buttons
-	* Number of articles divided by 2 in reading view
-	* Redesign of bigMarkAsRead
-* Features
-	* New automatic update system
-	* New reset auth system
-* Security
-	* "Mark as read" requires POST requests for several articles
-	* Test HTTP REFERER in install.php
-* Configuration
-	* New "Show all articles" / "Show only unread" / "Adjust viewing" option
-	* New notification timeout option
-* Misc.
-	* Improve coding style + comments
-	* Fix SQLite bug "ON DELETE CASCADE"
-	* Improve performance when importing articles
-
-
-## 2014-08-24 FreshRSS 0.7.4
-
-* UI
-	* Hide categories/feeds with unread articles when showing only unread articles
-	* Dynamic favicon showing the number of unread articles
-	* New theme: Screwdriver by Mister aiR
-* Statistics
-	* New page with article repartition
-	* Improvements
-* Security
-	* Basic protection against XSRF (Cross-Site Request Forgery) based on HTTP Referer (POST requests only)
-* API
-	* Compatible with lighttpd
-* Misc.
-	* Changed lazyload implementation
-	* Support of HTML5 notifications for new upcoming articles
-	* Add option to stay logged in
-* Bux fixes in export function, add/remove users, keyboard shortcuts, etc.
-
-
-## 2014-07-21 FreshRSS 0.7.3
-
-* New options
-	* Add system of user queries which are shortcuts to filter the view
-	* New TTL option to limit the frequency at which feeds are refreshed (by cron or manual refresh button).
-		It is still possible to manually refresh an individual feed at a higher frequency.
-* SQL
-	* Add support for SQLite (beta) in addition to MySQL
-* SimplePie
-	* Complies with HTTP "301 Moved Permanently" responses by automatically updating the URL of feeds that have changed address.
-* Themes
-	* Flat and Dark designs are based on same template file as Origine
-* Statistics
-	* Refactor code
-	* Add an idle feed page
-* Misc
-	* Several bug fixes
-	* Add confirmation option when marking all articles as read
-	* Fix some typo
-
-
-## 2014-06-13 FreshRSS 0.7.2
-
-* API compatible with Google Reader API level 2
-	* FreshRSS can now be used from e.g.:
-		* (Android) News+ https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader
-		* (Android) EasyRSS https://github.com/Alkarex/EasyRSS
-* Basic support for audio and video podcasts
-* Searching
-	* New search filters date: and pubdate: accepting ISO 8601 date intervals such as `date:2013-2014` or `pubdate:P1W`
-	* Possibility to combine search filters, e.g. `date:2014-05 intitle:FreshRSS intitle:Open great reader #Internet`
-* Change nav menu with more buttons instead of dropdown menus and add some filters
-* New system of import / export
-	* Support OPML, Json (like Google Reader) and Zip archives
-	* Can export and import articles (specific option for favorites)
-* Refactor "Origine" theme
-	* Some improvements
-	* Based on a template file (other themes will use it too)
-
-
-## 2014-02-19 FreshRSS 0.7.1
-
-* Mise à jour des flux plus rapide grâce à une meilleure utilisation du cache
-	* Utilisation d’une signature MD5 du contenu intéressant pour les flux n’implémentant pas les requêtes conditionnelles
-* Modification des raccourcis
-	* "s" partage directement si un seul moyen de partage
-	* Moyens de partage accessibles par "1", "2", "3", etc.
-	* Premier article : Home ; Dernier article : End
-	* Ajout du déplacement au sein des catégories / flux (via modificateurs shift et alt)
-* UI
-	* Séparation des descriptions des raccourcis par groupes
-	* Revue rapide de la page de connexion
-	* Amélioration de l'affichage des notifications sur mobile
-* Revue du système de rafraîchissement des flux
-	* Meilleure gestion de la file de flux à rafraîchir en JSON
-	* Rafraîchissement uniquement pour les flux non rafraîchis récemment
-	* Possibilité donnée aux anonymes de rafraîchir les flux
-* SimplePie
-	* Mise à jour de la lib
-	* Corrige fuite de mémoire
-	* Meilleure tolérance aux flux invalides
-* Corrections divers
-	* Ne déplie plus l'article lors du clic sur l'icône lien externe
-	* Ne boucle plus à la fin de la navigation dans les articles
-	* Suppression du champ category.color inutile
-	* Corrige bug redirection infinie (Persona)
-	* Amélioration vérification de la requête POST
-	* Ajout d'un verrou lorsqu'une action mark_read ou mark_favorite est en cours
-
-
-## 2014-01-29 FreshRSS 0.7
-
-* Nouveau mode multi-utilisateur
-	* L’utilisateur par défaut (administrateur) peut créer et supprimer d’autres utilisateurs
-	* Nécessite un contrôle d’accès, soit :
-		* par le nouveau mode de connexion par formulaire (nom d’utilisateur + mot de passe)
-			* relativement sûr même sans HTTPS (le mot de passe n’est pas transmis en clair)
-			* requiert JavaScript et PHP 5.3+
-		* par HTTP (par exemple sous Apache en créant un fichier ./p/i/.htaccess et .htpasswd)
-			* le nom d’utilisateur HTTP doit correspondre au nom d’utilisateur FreshRSS
-		* par Mozilla Persona, en renseignant l’adresse courriel des utilisateurs
-* Installateur supportant les mises à jour :
-	* Depuis une v0.6, placer application.ini et Configuration.array.php dans le nouveau répertoire “./data/”
-		(voir réorganisation ci-dessous)
-	* Pour les versions suivantes, juste garder le répertoire “./data/”
-* Rafraîchissement automatique du nombre d’articles non lus toutes les deux minutes (utilise le cache HTTP à bon escient)
-	* Permet aussi de conserver la session valide, surtout dans le cas de Persona
-* Nouvelle page de statistiques (nombres d’articles par jour / catégorie)
-* Importation OPML instantanée et plus tolérante
-* Nouvelle gestion des favicons avec téléchargement en parallèle
-* Nouvelles options
-	* Réorganisation des options
-	* Gestion des utilisateurs
-	* Améliorations partage vers Shaarli, Poche, Diaspora*, Facebook, Twitter, Google+, courriel
-		* Raccourci ‘s’ par défaut
-	* Permet la suppression de tous les articles d’un flux
-	* Option pour marquer les articles comme lus dès la réception
-	* Permet de configurer plus finement le nombre d’articles minimum à conserver par flux
-	* Permet de modifier la description et l’adresse d’un flux RSS ainsi que le site Web associé
-	* Nouveau raccourci pour ouvrir/fermer un article (‘c’ par défaut)
-	* Boutons pour effacer les logs et pour purger les vieux articles
-	* Nouveaux filtres d’affichage : seulement les articles favoris, et seulement les articles lus
-* SQL :
-	* Nouveau moteur de recherche, aussi accessible depuis la vue mobile
-		* Mots clefs de recherche “intitle:”, “inurl:”, “author:”
-	* Les articles sont triés selon la date de leur ajout dans FreshRSS plutôt que la date déclarée (souvent erronée)
-		* Permet de marquer tout comme lu sans affecter les nouveaux articles arrivés en cours de lecture
-		* Permet une pagination efficace
-	* Refactorisation
-		* Les tables sont préfixées avec le nom d’utilisateur afin de permettre le mode multi-utilisateurs
-		* Amélioration des performances
-		* Tolère un beaucoup plus grand nombre d’articles
-		* Compression des données côté MySQL plutôt que côté PHP
-		* Incompatible avec la version 0.6 (nécessite une mise à jour grâce à l’installateur) 
-	* Affichage de la taille de la base de données dans FreshRSS
-	* Correction problème de marquage de tous les favoris comme lus
-* HTML5 :
-	* Support des balises HTML5 audio, video, et éléments associés
-		* Utilisation de preload="none", et réécriture correcte des adresses, aussi en HTTPS
-	* Protection HTML5 des iframe (sandbox="allow-scripts allow-same-origin")
-	* Filtrage des object et embed
-	* Chargement différé HTML5 (postpone="") pour iframe et video
-	* Chargement différé JavaScript pour iframe
-* CSS :
-	* Nouveau thème sombre
-		* Chargement plus robuste des thèmes
-	* Meilleur support des longs titres d’articles sur des écrans étroits
-	* Meilleure accessibilité
-		* FreshRSS fonctionne aussi en mode dégradé sans images (alternatives Unicode) et/ou sans CSS
-	* Diverses améliorations
-* PHP :
-	* Encore plus tolérant pour les flux comportant des erreurs
-	* Mise à jour automatique de l’URL du flux (en base de données) lorsque SimplePie découvre qu’elle a changé
-	* Meilleure gestion des caractères spéciaux dans différents cas
-	* Compatibilité PHP 5.5+ avec OPcache
-	* Amélioration des performances
-	* Chargement automatique des classes
-	* Alternative dans le cas d’absence de librairie JSON
-	* Pour le développement, le cache HTTP peut être désactivé en créant un fichier “./data/no-cache.txt”
-* Réorganisation des fichiers et répertoires, en particulier :
-	* Tous les fichiers utilisateur sont dans “./data/” (y compris “cache”, “favicons”, et “log”)
-	* Déplacement de “./app/configuration/application.ini” vers “./data/config.php”
-		* Meilleure sécurité et compatibilité
-	* Déplacement de “./public/data/Configuration.array.php” vers “./data/*_user.php”
-	* Déplacement de “./public/” vers “./p/”
-		* Déplacement de “./public/index.php” vers “./p/i/index.php” (voir cookie ci-dessous)
-	* Déplacement de “./actualize_script.php” vers “./app/actualize_script.php” (pour une meilleure sécurité)
-		* Pensez à mettre à jour votre Cron !
-* Divers :
-	* Nouvelle politique de cookie de session (témoin de connexion)
-		* Utilise un nom poli “FreshRSS” (évite des problèmes avec certains filtres)
-		* Se limite au répertoire “./FreshRSS/p/i/” pour de meilleures performances HTTP
-			* Les images, CSS, scripts sont servis sans cookie
-		* Utilise “HttpOnly” pour plus de sécurité
-	* Nouvel “agent utilisateur” exposé lors du téléchargement des flux, par exemple :
-		* “FreshRSS/0.7 (Linux; http://freshrss.org) SimplePie/1.3.1”
-	* Script d’actualisation avec plus de messages
-		* Sur la sortie standard, ainsi que dans le log système (syslog)
-	* Affichage du numéro de version dans "À propos"
-
-
-## 2013-11-21 FreshRSS 0.6.1
-
-* Corrige bug chargement du JavaScript
-* Affiche un message d’erreur plus explicite si fichier de configuration inaccessible
-
-
-## 2013-11-17 FreshRSS 0.6
-
-* Nettoyage du code JavaScript + optimisations
-* Utilisation d’adresses relatives
-* Amélioration des performances coté client
-* Mise à jour automatique du nombre d’articles non lus
-* Corrections traductions
-* Mise en cache de FreshRSS
-* Amélioration des retours utilisateur lorsque la configuration n’est pas bonne
-* Actualisation des flux après une importation OPML
-* Meilleure prise en charge des flux RSS invalides
-* Amélioration de la vue globale
-* Possibilité de personnaliser les icônes de lecture
-* Suppression de champs lors de l’installation (base_url et sel)
-* Correction bugs divers
-
-
-## 2013-10-15 FreshRSS 0.5.1
-
-* Correction bug des catégories disparues
-* Correction traduction i18n/fr et i18n/en
-* Suppression de certains appels à la feuille de style fallback.css
-
-
-## 2013-10-12 FreshRSS 0.5.0
-
-* Possibilité d’interdire la lecture anonyme
-* Option pour garder l’historique d’un flux
-* Lors d’un clic sur “Marquer tous les articles comme lus”, FreshRSS peut désormais sauter à la prochaine catégorie / prochain flux avec des articles non lus.
-* Ajout d’un token pour accéder aux flux RSS générés par FreshRSS sans nécessiter de connexion
-* Possibilité de partager vers Facebook, Twitter et Google+
-* Possibilité de changer de thème
-* Le menu de navigation (article précédent / suivant / haut de page) a été ajouté à la vue non mobile
-* La police OpenSans est désormais appliquée
-* Amélioration de la page de configuration
-* Une meilleure sortie pour l’imprimante
-* Quelques retouches du design par défaut
-* Les vidéos ne dépassent plus du cadre de l’écran
-* Nouveau logo
-* Possibilité d’ajouter un préfixe aux tables lors de l’installation
-* Ajout d’un champ en base de données keep_history à la table feed
-* Si possible, création automatique de la base de données si elle n’existe pas lors de l’installation
-* L’utilisation d’UTF-8 est forcée
-* Le marquage automatique au défilement de la page a été amélioré
-* La vue globale a été énormément améliorée et est beaucoup plus utile
-* Amélioration des requêtes SQL
-* Amélioration du JavaScript
-* Correction bugs divers
-
-
-## 2013-07-02 FreshRSS 0.4.0
-
-* Correction bug et ajout notification lors de la phase d’installation
-* Affichage d’erreur si fichier OPML invalide
-* Les tags sont maintenant cliquables pour filtrer dessus
-* Amélioration vue mobile (boutons plus gros et ajout d’une barre de navigation)
-* Possibilité d’ajouter directement un flux dans une catégorie dès son ajout
-* Affichage des flux en erreur (injoignable par exemple) en rouge pour les différencier
-* Possibilité de changer les noms des flux
-* Ajout d’une option (désactivable donc) pour charger les images en lazyload permettant de ne pas charger toutes les images d’un coup
-* Le framework Minz est maintenant directement inclus dans l’archive (plus besoin de passer par ./build.sh)
-* Amélioration des performances pour la récupération des flux tronqués
-* Possibilité d’importer des flux sans catégorie lors de l’import OPML
-* Suppression de “l’API” (qui était de toute façon très basique) et de la fonctionnalité de “notes”
-* Amélioration de la recherche (garde en mémoire si l’on a sélectionné une catégorie) par exemple
-* Modification apparence des balises hr et pre
-* Meilleure vérification des champs de formulaire
-* Remise en place du mode “endless” (permettant de simplement charger les articles qui suivent plutôt que de charger une nouvelle page)
-* Ajout d’une page de visualisation des logs
-* Ajout d’une option pour optimiser la BDD (diminue sa taille)
-* Ajout des vues lecture et globale (assez basique)
-* Les vidéos YouTube ne débordent plus du cadre sur les petits écrans
-* Ajout d’une option pour marquer les articles comme lus lors du défilement (et suppression de celle au chargement de la page)
-
-
-## 2013-05-05 FreshRSS 0.3.0
-
-* Fallback pour les icônes SVG (utilisation de PNG à la place)
-* Fallback pour les propriétés CSS3 (utilisation de préfixes)
-* Affichage des tags associés aux articles
-* Internationalisation de l’application (gestion des langues anglaise et française)
-* Gestion des flux protégés par authentification HTTP
-* Mise en cache des favicons
-* Création d’un logo *temporaire*
-* Affichage des vidéos dans les articles
-* Gestion de la recherche et filtre par tags pleinement fonctionnels
-* Création d’un vrai script CRON permettant de mettre tous les flux à jour
-* Correction bugs divers
-
-
-## 2013-04-17 FreshRSS 0.2.0
-
-* Création d’un installateur
-* Actualisation des flux en Ajax
-* Partage par mail et Shaarli ajouté
-* Export par flux RSS
-* Possibilité de vider une catégorie
-* Possibilité de sélectionner les catégories en vue mobile
-* Les flux peuvent être sortis du flux principal (système de priorité)
-* Amélioration ajout / import / export des flux
-* Amélioration actualisation (meilleure gestion des erreurs)
-* Améliorations CSS
-* Changements dans la base de données
-* Màj de la librairie SimplePie
-* Flux sans auteurs gérés normalement
-* Correction bugs divers
-
-
-## 2013-04-08 FreshRSS 0.1.0
-
-* “Première” version
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..fea4e8871
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,433 @@
+# Changelog
+
+## 2015-xx-xx FreshRSS 1.1.1 (beta)
+
+* Features
+	* New option to detect and mark updated articles as unread.
+	* Support for internationalized domain name (IDN).
+* Misc.
+	* Improved logic for automatic deletion of old articles.
+	* Attempt to better handle encoded titles.
+
+
+## 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)
+
+* Feature
+	* 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)
+
+* 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)
+
+* 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)
+
+* UI
+	* New interface for statistics
+	* Fix filter buttons
+	* Number of articles divided by 2 in reading view
+	* Redesign of bigMarkAsRead
+* Features
+	* New automatic update system
+	* New reset auth system
+* Security
+	* "Mark as read" requires POST requests for several articles
+	* Test HTTP REFERER in install.php
+* Configuration
+	* New "Show all articles" / "Show only unread" / "Adjust viewing" option
+	* New notification timeout option
+* Misc.
+	* Improve coding style + comments
+	* Fix SQLite bug "ON DELETE CASCADE"
+	* Improve performance when importing articles
+
+
+## 2014-08-24 FreshRSS 0.7.4
+
+* UI
+	* Hide categories/feeds with unread articles when showing only unread articles
+	* Dynamic favicon showing the number of unread articles
+	* New theme: Screwdriver by Mister aiR
+* Statistics
+	* New page with article repartition
+	* Improvements
+* Security
+	* Basic protection against XSRF (Cross-Site Request Forgery) based on HTTP Referer (POST requests only)
+* API
+	* Compatible with lighttpd
+* Misc.
+	* Changed lazyload implementation
+	* Support of HTML5 notifications for new upcoming articles
+	* Add option to stay logged in
+* Bux fixes in export function, add/remove users, keyboard shortcuts, etc.
+
+
+## 2014-07-21 FreshRSS 0.7.3
+
+* New options
+	* Add system of user queries which are shortcuts to filter the view
+	* New TTL option to limit the frequency at which feeds are refreshed (by cron or manual refresh button).
+		It is still possible to manually refresh an individual feed at a higher frequency.
+* SQL
+	* Add support for SQLite (beta) in addition to MySQL
+* SimplePie
+	* Complies with HTTP "301 Moved Permanently" responses by automatically updating the URL of feeds that have changed address.
+* Themes
+	* Flat and Dark designs are based on same template file as Origine
+* Statistics
+	* Refactor code
+	* Add an idle feed page
+* Misc
+	* Several bug fixes
+	* Add confirmation option when marking all articles as read
+	* Fix some typo
+
+
+## 2014-06-13 FreshRSS 0.7.2
+
+* API compatible with Google Reader API level 2
+	* FreshRSS can now be used from e.g.:
+		* (Android) News+ https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader
+		* (Android) EasyRSS https://github.com/Alkarex/EasyRSS
+* Basic support for audio and video podcasts
+* Searching
+	* New search filters date: and pubdate: accepting ISO 8601 date intervals such as `date:2013-2014` or `pubdate:P1W`
+	* Possibility to combine search filters, e.g. `date:2014-05 intitle:FreshRSS intitle:Open great reader #Internet`
+* Change nav menu with more buttons instead of dropdown menus and add some filters
+* New system of import / export
+	* Support OPML, Json (like Google Reader) and Zip archives
+	* Can export and import articles (specific option for favorites)
+* Refactor "Origine" theme
+	* Some improvements
+	* Based on a template file (other themes will use it too)
+
+
+## 2014-02-19 FreshRSS 0.7.1
+
+* Mise à jour des flux plus rapide grâce à une meilleure utilisation du cache
+	* Utilisation d’une signature MD5 du contenu intéressant pour les flux n’implémentant pas les requêtes conditionnelles
+* Modification des raccourcis
+	* "s" partage directement si un seul moyen de partage
+	* Moyens de partage accessibles par "1", "2", "3", etc.
+	* Premier article : Home ; Dernier article : End
+	* Ajout du déplacement au sein des catégories / flux (via modificateurs shift et alt)
+* UI
+	* Séparation des descriptions des raccourcis par groupes
+	* Revue rapide de la page de connexion
+	* Amélioration de l'affichage des notifications sur mobile
+* Revue du système de rafraîchissement des flux
+	* Meilleure gestion de la file de flux à rafraîchir en JSON
+	* Rafraîchissement uniquement pour les flux non rafraîchis récemment
+	* Possibilité donnée aux anonymes de rafraîchir les flux
+* SimplePie
+	* Mise à jour de la lib
+	* Corrige fuite de mémoire
+	* Meilleure tolérance aux flux invalides
+* Corrections divers
+	* Ne déplie plus l'article lors du clic sur l'icône lien externe
+	* Ne boucle plus à la fin de la navigation dans les articles
+	* Suppression du champ category.color inutile
+	* Corrige bug redirection infinie (Persona)
+	* Amélioration vérification de la requête POST
+	* Ajout d'un verrou lorsqu'une action mark_read ou mark_favorite est en cours
+
+
+## 2014-01-29 FreshRSS 0.7
+
+* Nouveau mode multi-utilisateur
+	* L’utilisateur par défaut (administrateur) peut créer et supprimer d’autres utilisateurs
+	* Nécessite un contrôle d’accès, soit :
+		* par le nouveau mode de connexion par formulaire (nom d’utilisateur + mot de passe)
+			* relativement sûr même sans HTTPS (le mot de passe n’est pas transmis en clair)
+			* requiert JavaScript et PHP 5.3+
+		* par HTTP (par exemple sous Apache en créant un fichier ./p/i/.htaccess et .htpasswd)
+			* le nom d’utilisateur HTTP doit correspondre au nom d’utilisateur FreshRSS
+		* par Mozilla Persona, en renseignant l’adresse courriel des utilisateurs
+* Installateur supportant les mises à jour :
+	* Depuis une v0.6, placer application.ini et Configuration.array.php dans le nouveau répertoire “./data/”
+		(voir réorganisation ci-dessous)
+	* Pour les versions suivantes, juste garder le répertoire “./data/”
+* Rafraîchissement automatique du nombre d’articles non lus toutes les deux minutes (utilise le cache HTTP à bon escient)
+	* Permet aussi de conserver la session valide, surtout dans le cas de Persona
+* Nouvelle page de statistiques (nombres d’articles par jour / catégorie)
+* Importation OPML instantanée et plus tolérante
+* Nouvelle gestion des favicons avec téléchargement en parallèle
+* Nouvelles options
+	* Réorganisation des options
+	* Gestion des utilisateurs
+	* Améliorations partage vers Shaarli, Poche, Diaspora*, Facebook, Twitter, Google+, courriel
+		* Raccourci ‘s’ par défaut
+	* Permet la suppression de tous les articles d’un flux
+	* Option pour marquer les articles comme lus dès la réception
+	* Permet de configurer plus finement le nombre d’articles minimum à conserver par flux
+	* Permet de modifier la description et l’adresse d’un flux RSS ainsi que le site Web associé
+	* Nouveau raccourci pour ouvrir/fermer un article (‘c’ par défaut)
+	* Boutons pour effacer les logs et pour purger les vieux articles
+	* Nouveaux filtres d’affichage : seulement les articles favoris, et seulement les articles lus
+* SQL :
+	* Nouveau moteur de recherche, aussi accessible depuis la vue mobile
+		* Mots clefs de recherche “intitle:”, “inurl:”, “author:”
+	* Les articles sont triés selon la date de leur ajout dans FreshRSS plutôt que la date déclarée (souvent erronée)
+		* Permet de marquer tout comme lu sans affecter les nouveaux articles arrivés en cours de lecture
+		* Permet une pagination efficace
+	* Refactorisation
+		* Les tables sont préfixées avec le nom d’utilisateur afin de permettre le mode multi-utilisateurs
+		* Amélioration des performances
+		* Tolère un beaucoup plus grand nombre d’articles
+		* Compression des données côté MySQL plutôt que côté PHP
+		* Incompatible avec la version 0.6 (nécessite une mise à jour grâce à l’installateur) 
+	* Affichage de la taille de la base de données dans FreshRSS
+	* Correction problème de marquage de tous les favoris comme lus
+* HTML5 :
+	* Support des balises HTML5 audio, video, et éléments associés
+		* Utilisation de preload="none", et réécriture correcte des adresses, aussi en HTTPS
+	* Protection HTML5 des iframe (sandbox="allow-scripts allow-same-origin")
+	* Filtrage des object et embed
+	* Chargement différé HTML5 (postpone="") pour iframe et video
+	* Chargement différé JavaScript pour iframe
+* CSS :
+	* Nouveau thème sombre
+		* Chargement plus robuste des thèmes
+	* Meilleur support des longs titres d’articles sur des écrans étroits
+	* Meilleure accessibilité
+		* FreshRSS fonctionne aussi en mode dégradé sans images (alternatives Unicode) et/ou sans CSS
+	* Diverses améliorations
+* PHP :
+	* Encore plus tolérant pour les flux comportant des erreurs
+	* Mise à jour automatique de l’URL du flux (en base de données) lorsque SimplePie découvre qu’elle a changé
+	* Meilleure gestion des caractères spéciaux dans différents cas
+	* Compatibilité PHP 5.5+ avec OPcache
+	* Amélioration des performances
+	* Chargement automatique des classes
+	* Alternative dans le cas d’absence de librairie JSON
+	* Pour le développement, le cache HTTP peut être désactivé en créant un fichier “./data/no-cache.txt”
+* Réorganisation des fichiers et répertoires, en particulier :
+	* Tous les fichiers utilisateur sont dans “./data/” (y compris “cache”, “favicons”, et “log”)
+	* Déplacement de “./app/configuration/application.ini” vers “./data/config.php”
+		* Meilleure sécurité et compatibilité
+	* Déplacement de “./public/data/Configuration.array.php” vers “./data/*_user.php”
+	* Déplacement de “./public/” vers “./p/”
+		* Déplacement de “./public/index.php” vers “./p/i/index.php” (voir cookie ci-dessous)
+	* Déplacement de “./actualize_script.php” vers “./app/actualize_script.php” (pour une meilleure sécurité)
+		* Pensez à mettre à jour votre Cron !
+* Divers :
+	* Nouvelle politique de cookie de session (témoin de connexion)
+		* Utilise un nom poli “FreshRSS” (évite des problèmes avec certains filtres)
+		* Se limite au répertoire “./FreshRSS/p/i/” pour de meilleures performances HTTP
+			* Les images, CSS, scripts sont servis sans cookie
+		* Utilise “HttpOnly” pour plus de sécurité
+	* Nouvel “agent utilisateur” exposé lors du téléchargement des flux, par exemple :
+		* “FreshRSS/0.7 (Linux; http://freshrss.org) SimplePie/1.3.1”
+	* Script d’actualisation avec plus de messages
+		* Sur la sortie standard, ainsi que dans le log système (syslog)
+	* Affichage du numéro de version dans "À propos"
+
+
+## 2013-11-21 FreshRSS 0.6.1
+
+* Corrige bug chargement du JavaScript
+* Affiche un message d’erreur plus explicite si fichier de configuration inaccessible
+
+
+## 2013-11-17 FreshRSS 0.6
+
+* Nettoyage du code JavaScript + optimisations
+* Utilisation d’adresses relatives
+* Amélioration des performances coté client
+* Mise à jour automatique du nombre d’articles non lus
+* Corrections traductions
+* Mise en cache de FreshRSS
+* Amélioration des retours utilisateur lorsque la configuration n’est pas bonne
+* Actualisation des flux après une importation OPML
+* Meilleure prise en charge des flux RSS invalides
+* Amélioration de la vue globale
+* Possibilité de personnaliser les icônes de lecture
+* Suppression de champs lors de l’installation (base_url et sel)
+* Correction bugs divers
+
+
+## 2013-10-15 FreshRSS 0.5.1
+
+* Correction bug des catégories disparues
+* Correction traduction i18n/fr et i18n/en
+* Suppression de certains appels à la feuille de style fallback.css
+
+
+## 2013-10-12 FreshRSS 0.5.0
+
+* Possibilité d’interdire la lecture anonyme
+* Option pour garder l’historique d’un flux
+* Lors d’un clic sur “Marquer tous les articles comme lus”, FreshRSS peut désormais sauter à la prochaine catégorie / prochain flux avec des articles non lus.
+* Ajout d’un token pour accéder aux flux RSS générés par FreshRSS sans nécessiter de connexion
+* Possibilité de partager vers Facebook, Twitter et Google+
+* Possibilité de changer de thème
+* Le menu de navigation (article précédent / suivant / haut de page) a été ajouté à la vue non mobile
+* La police OpenSans est désormais appliquée
+* Amélioration de la page de configuration
+* Une meilleure sortie pour l’imprimante
+* Quelques retouches du design par défaut
+* Les vidéos ne dépassent plus du cadre de l’écran
+* Nouveau logo
+* Possibilité d’ajouter un préfixe aux tables lors de l’installation
+* Ajout d’un champ en base de données keep_history à la table feed
+* Si possible, création automatique de la base de données si elle n’existe pas lors de l’installation
+* L’utilisation d’UTF-8 est forcée
+* Le marquage automatique au défilement de la page a été amélioré
+* La vue globale a été énormément améliorée et est beaucoup plus utile
+* Amélioration des requêtes SQL
+* Amélioration du JavaScript
+* Correction bugs divers
+
+
+## 2013-07-02 FreshRSS 0.4.0
+
+* Correction bug et ajout notification lors de la phase d’installation
+* Affichage d’erreur si fichier OPML invalide
+* Les tags sont maintenant cliquables pour filtrer dessus
+* Amélioration vue mobile (boutons plus gros et ajout d’une barre de navigation)
+* Possibilité d’ajouter directement un flux dans une catégorie dès son ajout
+* Affichage des flux en erreur (injoignable par exemple) en rouge pour les différencier
+* Possibilité de changer les noms des flux
+* Ajout d’une option (désactivable donc) pour charger les images en lazyload permettant de ne pas charger toutes les images d’un coup
+* Le framework Minz est maintenant directement inclus dans l’archive (plus besoin de passer par ./build.sh)
+* Amélioration des performances pour la récupération des flux tronqués
+* Possibilité d’importer des flux sans catégorie lors de l’import OPML
+* Suppression de “l’API” (qui était de toute façon très basique) et de la fonctionnalité de “notes”
+* Amélioration de la recherche (garde en mémoire si l’on a sélectionné une catégorie) par exemple
+* Modification apparence des balises hr et pre
+* Meilleure vérification des champs de formulaire
+* Remise en place du mode “endless” (permettant de simplement charger les articles qui suivent plutôt que de charger une nouvelle page)
+* Ajout d’une page de visualisation des logs
+* Ajout d’une option pour optimiser la BDD (diminue sa taille)
+* Ajout des vues lecture et globale (assez basique)
+* Les vidéos YouTube ne débordent plus du cadre sur les petits écrans
+* Ajout d’une option pour marquer les articles comme lus lors du défilement (et suppression de celle au chargement de la page)
+
+
+## 2013-05-05 FreshRSS 0.3.0
+
+* Fallback pour les icônes SVG (utilisation de PNG à la place)
+* Fallback pour les propriétés CSS3 (utilisation de préfixes)
+* Affichage des tags associés aux articles
+* Internationalisation de l’application (gestion des langues anglaise et française)
+* Gestion des flux protégés par authentification HTTP
+* Mise en cache des favicons
+* Création d’un logo *temporaire*
+* Affichage des vidéos dans les articles
+* Gestion de la recherche et filtre par tags pleinement fonctionnels
+* Création d’un vrai script CRON permettant de mettre tous les flux à jour
+* Correction bugs divers
+
+
+## 2013-04-17 FreshRSS 0.2.0
+
+* Création d’un installateur
+* Actualisation des flux en Ajax
+* Partage par mail et Shaarli ajouté
+* Export par flux RSS
+* Possibilité de vider une catégorie
+* Possibilité de sélectionner les catégories en vue mobile
+* Les flux peuvent être sortis du flux principal (système de priorité)
+* Amélioration ajout / import / export des flux
+* Amélioration actualisation (meilleure gestion des erreurs)
+* Améliorations CSS
+* Changements dans la base de données
+* Màj de la librairie SimplePie
+* Flux sans auteurs gérés normalement
+* Correction bugs divers
+
+
+## 2013-04-08 FreshRSS 0.1.0
+
+* “Première” version
-- 
cgit v1.2.3


From ac051ff395dc4f92e812cf40c0c21c8c16355f49 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 17:49:27 +0200
Subject: More changelog for beta 1.1.1

https://github.com/FreshRSS/FreshRSS/issues/845
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fea4e8871..cb398bc14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@
 * Features
 	* New option to detect and mark updated articles as unread.
 	* Support for internationalized domain name (IDN).
+* API
+	* Work-around for News+ bug when there is no unread article on the server.
+* Bug fixing
+	* Corrected bug introduced in previous beta about handling of HTTP 301 (feed that have changed address) 
+	* Corrected bug in FreshRSS RSS feeds.
 * Misc.
 	* Improved logic for automatic deletion of old articles.
 	* Attempt to better handle encoded titles.
-- 
cgit v1.2.3


From 6cd5906a265994ca4c8cb00c817e94edb4c74788 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 17:56:48 +0200
Subject: Changelog typos

---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb398bc14..e6f295aa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 * API
 	* Work-around for News+ bug when there is no unread article on the server.
 * Bug fixing
-	* Corrected bug introduced in previous beta about handling of HTTP 301 (feed that have changed address) 
+	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address) 
 	* Corrected bug in FreshRSS RSS feeds.
 * Misc.
 	* Improved logic for automatic deletion of old articles.
@@ -73,7 +73,7 @@
 * Misc.
 	* Add option to remove articles after reading them
 	* Add comments
-	* Refactor i18n system to not load unnecessary strings
+	* Refactor i18n system to avoid loading unnecessary strings
 	* Fix security issue in Minz_Error::error() method
 	* Fix redirection after refreshing a given feed
 
@@ -96,7 +96,7 @@
 * I18n
 	* Introduce a new system for i18n keys (not finished yet)
 * Misc.
-	* Fix global view (didn't work anymore)
+	* Fix global view (did not work anymore)
 	* Add do_post_update for update system
 	* Introduce ```checkInstallAction``` to test if FreshRSS installation is ok
 
@@ -106,7 +106,7 @@
 * UI
 	* Add a space after tag icon
 * Statistics
-	* Add an average per day on the 30 day period graph
+	* 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
@@ -155,7 +155,7 @@
 	* Changed lazyload implementation
 	* Support of HTML5 notifications for new upcoming articles
 	* Add option to stay logged in
-* Bux fixes in export function, add/remove users, keyboard shortcuts, etc.
+* Bug fixes in export function, add/remove users, keyboard shortcuts, etc.
 
 
 ## 2014-07-21 FreshRSS 0.7.3
-- 
cgit v1.2.3


From 126969777af9de305d7f99bdcfd5d1b8b9285e44 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 18:31:45 +0200
Subject: Credits file in Markdown format + details

---
 CREDITS    | 42 ------------------------------------------
 CREDITS.md | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 CREDITS
 create mode 100644 CREDITS.md

diff --git a/CREDITS b/CREDITS
deleted file mode 100644
index c2c6642dc..000000000
--- a/CREDITS
+++ /dev/null
@@ -1,42 +0,0 @@
-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
-
-ealdraed
-https://github.com/ealdraed
-
-Luc Didry
-https://github.com/ldidry
-
-Marien Fressinaud
-dev@marienfressinaud.fr
-http://marienfressinaud.fr
-https://github.com/marienfressinaud
-
-Melvyn Laïly
-https://github.com/yaurthek
-
-Nicolas Elie
-https://github.com/nicolaselie
-
-plopoyop
-https://github.com/plopoyop
-
-tomgue
-https://github.com/tomgue
diff --git a/CREDITS.md b/CREDITS.md
new file mode 100644
index 000000000..c2c6642dc
--- /dev/null
+++ b/CREDITS.md
@@ -0,0 +1,42 @@
+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
+
+ealdraed
+https://github.com/ealdraed
+
+Luc Didry
+https://github.com/ldidry
+
+Marien Fressinaud
+dev@marienfressinaud.fr
+http://marienfressinaud.fr
+https://github.com/marienfressinaud
+
+Melvyn Laïly
+https://github.com/yaurthek
+
+Nicolas Elie
+https://github.com/nicolaselie
+
+plopoyop
+https://github.com/plopoyop
+
+tomgue
+https://github.com/tomgue
-- 
cgit v1.2.3


From 70384b3c996ca58b78a989fa31ff921753d3b3db Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 18:34:00 +0200
Subject: Details in Credits.md

---
 CREDITS.md | 49 +++++++++++++------------------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index c2c6642dc..4eadf90b9 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,42 +1,19 @@
-This is a credit file of people who have contributed to FreshRSS with, at least,
+This is a credit file of people who have [contributed to FreshRSS](https://github.com/FreshRSS/FreshRSS/graphs/contributors) 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.
+(too easy!). Its purpose is to show that 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
-
-ealdraed
-https://github.com/ealdraed
-
-Luc Didry
-https://github.com/ldidry
-
-Marien Fressinaud
-dev@marienfressinaud.fr
-http://marienfressinaud.fr
-https://github.com/marienfressinaud
-
-Melvyn Laïly
-https://github.com/yaurthek
-
-Nicolas Elie
-https://github.com/nicolaselie
-
-plopoyop
-https://github.com/plopoyop
-
-tomgue
-https://github.com/tomgue
+* [Alexandre Alapetite](https://github.com/Alkarex): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alkarex), [Web](http://alexandre.alapetite.fr/)
+* [Alexis Degrugillier](https://github.com/aledeg): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=aledeg)
+* [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin)
+* [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade)
+* [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
+* [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry)
+* [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/), [Email](mailto:dev@marienfressinaud.fr)
+* [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek)
+* [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
+* [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
+* [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
-- 
cgit v1.2.3


From 9d55ee5ae9e41fe460ff82b4d51bf1673fb1b836 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 May 2015 01:49:13 +0200
Subject: Bug EntryDAO filter

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

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index eae9683ad..f939a0fb3 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -511,7 +511,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$where .= 'AND e1.id >= ' . $date_min . '000000 ';
 		}
 		$search = '';
-		if ($filter !== null) {
+		if ($filter) {
 			if ($filter->getIntitle()) {
 				$search .= 'AND e1.title LIKE ? ';
 				$values[] = "%{$filter->getIntitle()}%";
-- 
cgit v1.2.3


From b7859f4bde819191d4886ec736351d1e5605c387 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 May 2015 02:00:14 +0200
Subject: Changelog: new confirmation in case on unsaved changes

https://github.com/FreshRSS/FreshRSS/issues/739
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6f295aa6..be445b538 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 	* Support for internationalized domain name (IDN).
 * API
 	* Work-around for News+ bug when there is no unread article on the server.
+* UI
+	* New confirmation message when leaving a configuration page without saving the changes.
 * Bug fixing
 	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address) 
 	* Corrected bug in FreshRSS RSS feeds.
-- 
cgit v1.2.3


From f79f2a7e986f40291865e54074ab62fcb9909bb4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 29 May 2015 23:30:37 +0200
Subject: Patch for confirmation in non-Firefox (Chrome)

https://github.com/FreshRSS/FreshRSS/issues/739
Use standards instead of Firefox-specific explicitOriginalTarget
---
 p/scripts/main.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index eaf6067f7..f64927c14 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1230,13 +1230,11 @@ function init_slider_observers() {
 }
 
 function init_configuration_alert() {
-	$(window).on('beforeunload', function(e){
-		if (e.originalEvent.explicitOriginalTarget.type === 'submit') {
-			// we don't want an alert when submitting the form with the submit button
-			return;
-		}
-		if ($(e.originalEvent.explicitOriginalTarget).attr('data-leave-validation') !== undefined) {
-			// we don't want an alert when submitting the form by pressing the enter key
+	$(window).on('submit', function(e) {
+		window.hasSubmit = true;
+	});
+	$(window).on('beforeunload', function(e) {
+		if (window.hasSubmit) {
 			return;
 		}
 		var fields = $("[data-leave-validation]");
-- 
cgit v1.2.3


From cdc82f76d9fa4dbdc32f6f1460d6c883bc83ca0c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 May 2015 18:27:49 +0200
Subject: Changelog beta 1.1.1

---
 CHANGELOG.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be445b538..b989b113e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
 
-## 2015-xx-xx FreshRSS 1.1.1 (beta)
+## 2015-05-31 FreshRSS 1.1.1 (beta)
 
 * Features
 	* New option to detect and mark updated articles as unread.
 	* Support for internationalized domain name (IDN).
+	* Improved logic for automatic deletion of old articles.
 * API
 	* Work-around for News+ bug when there is no unread article on the server.
 * UI
@@ -12,9 +13,10 @@
 * Bug fixing
 	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address) 
 	* Corrected bug in FreshRSS RSS feeds.
+* Security
+	* Sanitize HTTP request header `Host`.
 * Misc.
-	* Improved logic for automatic deletion of old articles.
-	* Attempt to better handle encoded titles.
+	* Attempt to better handle encoded article titles.
 
 
 ## 2015-01-31 FreshRSS 1.0.0 / 1.1.0 (beta)
-- 
cgit v1.2.3


From a5a24108ef923c47422f6b10db57863739a996cd Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 May 2015 19:25:20 +0200
Subject: Minz URL encoding bug

See also https://github.com/FreshRSS/FreshRSS/pull/849
---
 lib/Minz/Url.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index a47d8f1a6..879077d0f 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -18,7 +18,7 @@ class Minz_Url {
 		$isArray = is_array($url);
 
 		if ($isArray) {
-			$url = self::checkUrl ($url);
+			$url = self::checkUrl($url);
 		}
 
 		$url_string = '';
@@ -30,9 +30,9 @@ class Minz_Url {
 		}
 
 		if ($isArray) {
-			$url_string .= self::printUri ($url, $encodage);
+			$url_string .= self::printUri($url, $encodage);
 		} else {
-			$url_string .= $url;
+			$url_string = Minz_Helper::htmlspecialchars_utf8($url_string . $url);
 		}
 
 		return $url_string;
-- 
cgit v1.2.3


From 6e6746e090bfa11d1bdc1b39a0ecc144b8a5e9ff Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 May 2015 19:37:26 +0200
Subject: Version 1.1.1-dev

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index d32fdfa9b..dacd9dcdd 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.2-dev');
+define('FRESHRSS_VERSION', '1.1.1-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');
-- 
cgit v1.2.3


From 2f1419cf64cc3bfdbbeaa5bdd204925998c9f74a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 May 2015 19:45:31 +0200
Subject: Link to releases

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 830dcc01b..0d27e7d1b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,10 @@ It is a multi-user application with an anonymous reading mode.
 
 ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
-# Note on branches
+# Releases
+See the [list of releases](../../releases).
+
+## Note on branches
 **This application is under continuous development!** Please use the branch that suits your needs:
 
 * Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version.
@@ -23,6 +26,7 @@ It is a multi-user application with an anonymous reading mode.
 # Disclaimer
 This application was developed to fulfil personal needs primarily, and comes with absolutely no warranty.
 Feature requests, bug reports, and other contributions are welcome. The best way is to [open issues on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
+We are a friendly community.
 
 # Requirements
 * Light server running Linux or Windows
-- 
cgit v1.2.3


From 00e00849815f35ab3e3a1da2cbfa515f4bace392 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 May 2015 19:49:59 +0200
Subject: Link to releases

---
 README.fr.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index c8f573180..00b081155 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -13,16 +13,20 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an
 
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
-# Note sur les branches
+# Téléchargement
+Voir la [liste des versions](../../releases).
+
+## Note sur les branches
 **Ce logiciel est en développement permanent !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
 
 * 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 veulent aider à tester les toutes dernières fonctionnalités, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
 
-# Disclaimer
+# Avertissements
 Cette application a été développée pour s’adapter principalement à des besoins personnels, et aucune garantie n'est fournie.
 Les demandes de fonctionnalités, rapports de bugs, et autres contributions sont les bienvenues. Privilégiez pour cela des [demandes sur GitHub](https://github.com/FreshRSS/FreshRSS/issues).
+Nous sommes une communauté amicale.
 
 # Prérequis
 * Serveur modeste, par exemple sous Linux ou Windows
-- 
cgit v1.2.3


From 4b69cb3b5c6aa311efa64b41eee1dcbc44d467f0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 May 2015 20:47:48 +0200
Subject: Changelog now in MD format

---
 CHANGELOG | 423 --------------------------------------------------------------
 1 file changed, 423 deletions(-)
 delete mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index b389f184b..000000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,423 +0,0 @@
-# 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)
-
-* Feature
-	* 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)
-
-* 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)
-
-* 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)
-
-* UI
-	* New interface for statistics
-	* Fix filter buttons
-	* Number of articles divided by 2 in reading view
-	* Redesign of bigMarkAsRead
-* Features
-	* New automatic update system
-	* New reset auth system
-* Security
-	* "Mark as read" requires POST requests for several articles
-	* Test HTTP REFERER in install.php
-* Configuration
-	* New "Show all articles" / "Show only unread" / "Adjust viewing" option
-	* New notification timeout option
-* Misc.
-	* Improve coding style + comments
-	* Fix SQLite bug "ON DELETE CASCADE"
-	* Improve performance when importing articles
-
-
-## 2014-08-24 FreshRSS 0.7.4
-
-* UI
-	* Hide categories/feeds with unread articles when showing only unread articles
-	* Dynamic favicon showing the number of unread articles
-	* New theme: Screwdriver by Mister aiR
-* Statistics
-	* New page with article repartition
-	* Improvements
-* Security
-	* Basic protection against XSRF (Cross-Site Request Forgery) based on HTTP Referer (POST requests only)
-* API
-	* Compatible with lighttpd
-* Misc.
-	* Changed lazyload implementation
-	* Support of HTML5 notifications for new upcoming articles
-	* Add option to stay logged in
-* Bux fixes in export function, add/remove users, keyboard shortcuts, etc.
-
-
-## 2014-07-21 FreshRSS 0.7.3
-
-* New options
-	* Add system of user queries which are shortcuts to filter the view
-	* New TTL option to limit the frequency at which feeds are refreshed (by cron or manual refresh button).
-		It is still possible to manually refresh an individual feed at a higher frequency.
-* SQL
-	* Add support for SQLite (beta) in addition to MySQL
-* SimplePie
-	* Complies with HTTP "301 Moved Permanently" responses by automatically updating the URL of feeds that have changed address.
-* Themes
-	* Flat and Dark designs are based on same template file as Origine
-* Statistics
-	* Refactor code
-	* Add an idle feed page
-* Misc
-	* Several bug fixes
-	* Add confirmation option when marking all articles as read
-	* Fix some typo
-
-
-## 2014-06-13 FreshRSS 0.7.2
-
-* API compatible with Google Reader API level 2
-	* FreshRSS can now be used from e.g.:
-		* (Android) News+ https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader
-		* (Android) EasyRSS https://github.com/Alkarex/EasyRSS
-* Basic support for audio and video podcasts
-* Searching
-	* New search filters date: and pubdate: accepting ISO 8601 date intervals such as `date:2013-2014` or `pubdate:P1W`
-	* Possibility to combine search filters, e.g. `date:2014-05 intitle:FreshRSS intitle:Open great reader #Internet`
-* Change nav menu with more buttons instead of dropdown menus and add some filters
-* New system of import / export
-	* Support OPML, Json (like Google Reader) and Zip archives
-	* Can export and import articles (specific option for favorites)
-* Refactor "Origine" theme
-	* Some improvements
-	* Based on a template file (other themes will use it too)
-
-
-## 2014-02-19 FreshRSS 0.7.1
-
-* Mise à jour des flux plus rapide grâce à une meilleure utilisation du cache
-	* Utilisation d’une signature MD5 du contenu intéressant pour les flux n’implémentant pas les requêtes conditionnelles
-* Modification des raccourcis
-	* "s" partage directement si un seul moyen de partage
-	* Moyens de partage accessibles par "1", "2", "3", etc.
-	* Premier article : Home ; Dernier article : End
-	* Ajout du déplacement au sein des catégories / flux (via modificateurs shift et alt)
-* UI
-	* Séparation des descriptions des raccourcis par groupes
-	* Revue rapide de la page de connexion
-	* Amélioration de l'affichage des notifications sur mobile
-* Revue du système de rafraîchissement des flux
-	* Meilleure gestion de la file de flux à rafraîchir en JSON
-	* Rafraîchissement uniquement pour les flux non rafraîchis récemment
-	* Possibilité donnée aux anonymes de rafraîchir les flux
-* SimplePie
-	* Mise à jour de la lib
-	* Corrige fuite de mémoire
-	* Meilleure tolérance aux flux invalides
-* Corrections divers
-	* Ne déplie plus l'article lors du clic sur l'icône lien externe
-	* Ne boucle plus à la fin de la navigation dans les articles
-	* Suppression du champ category.color inutile
-	* Corrige bug redirection infinie (Persona)
-	* Amélioration vérification de la requête POST
-	* Ajout d'un verrou lorsqu'une action mark_read ou mark_favorite est en cours
-
-
-## 2014-01-29 FreshRSS 0.7
-
-* Nouveau mode multi-utilisateur
-	* L’utilisateur par défaut (administrateur) peut créer et supprimer d’autres utilisateurs
-	* Nécessite un contrôle d’accès, soit :
-		* par le nouveau mode de connexion par formulaire (nom d’utilisateur + mot de passe)
-			* relativement sûr même sans HTTPS (le mot de passe n’est pas transmis en clair)
-			* requiert JavaScript et PHP 5.3+
-		* par HTTP (par exemple sous Apache en créant un fichier ./p/i/.htaccess et .htpasswd)
-			* le nom d’utilisateur HTTP doit correspondre au nom d’utilisateur FreshRSS
-		* par Mozilla Persona, en renseignant l’adresse courriel des utilisateurs
-* Installateur supportant les mises à jour :
-	* Depuis une v0.6, placer application.ini et Configuration.array.php dans le nouveau répertoire “./data/”
-		(voir réorganisation ci-dessous)
-	* Pour les versions suivantes, juste garder le répertoire “./data/”
-* Rafraîchissement automatique du nombre d’articles non lus toutes les deux minutes (utilise le cache HTTP à bon escient)
-	* Permet aussi de conserver la session valide, surtout dans le cas de Persona
-* Nouvelle page de statistiques (nombres d’articles par jour / catégorie)
-* Importation OPML instantanée et plus tolérante
-* Nouvelle gestion des favicons avec téléchargement en parallèle
-* Nouvelles options
-	* Réorganisation des options
-	* Gestion des utilisateurs
-	* Améliorations partage vers Shaarli, Poche, Diaspora*, Facebook, Twitter, Google+, courriel
-		* Raccourci ‘s’ par défaut
-	* Permet la suppression de tous les articles d’un flux
-	* Option pour marquer les articles comme lus dès la réception
-	* Permet de configurer plus finement le nombre d’articles minimum à conserver par flux
-	* Permet de modifier la description et l’adresse d’un flux RSS ainsi que le site Web associé
-	* Nouveau raccourci pour ouvrir/fermer un article (‘c’ par défaut)
-	* Boutons pour effacer les logs et pour purger les vieux articles
-	* Nouveaux filtres d’affichage : seulement les articles favoris, et seulement les articles lus
-* SQL :
-	* Nouveau moteur de recherche, aussi accessible depuis la vue mobile
-		* Mots clefs de recherche “intitle:”, “inurl:”, “author:”
-	* Les articles sont triés selon la date de leur ajout dans FreshRSS plutôt que la date déclarée (souvent erronée)
-		* Permet de marquer tout comme lu sans affecter les nouveaux articles arrivés en cours de lecture
-		* Permet une pagination efficace
-	* Refactorisation
-		* Les tables sont préfixées avec le nom d’utilisateur afin de permettre le mode multi-utilisateurs
-		* Amélioration des performances
-		* Tolère un beaucoup plus grand nombre d’articles
-		* Compression des données côté MySQL plutôt que côté PHP
-		* Incompatible avec la version 0.6 (nécessite une mise à jour grâce à l’installateur) 
-	* Affichage de la taille de la base de données dans FreshRSS
-	* Correction problème de marquage de tous les favoris comme lus
-* HTML5 :
-	* Support des balises HTML5 audio, video, et éléments associés
-		* Utilisation de preload="none", et réécriture correcte des adresses, aussi en HTTPS
-	* Protection HTML5 des iframe (sandbox="allow-scripts allow-same-origin")
-	* Filtrage des object et embed
-	* Chargement différé HTML5 (postpone="") pour iframe et video
-	* Chargement différé JavaScript pour iframe
-* CSS :
-	* Nouveau thème sombre
-		* Chargement plus robuste des thèmes
-	* Meilleur support des longs titres d’articles sur des écrans étroits
-	* Meilleure accessibilité
-		* FreshRSS fonctionne aussi en mode dégradé sans images (alternatives Unicode) et/ou sans CSS
-	* Diverses améliorations
-* PHP :
-	* Encore plus tolérant pour les flux comportant des erreurs
-	* Mise à jour automatique de l’URL du flux (en base de données) lorsque SimplePie découvre qu’elle a changé
-	* Meilleure gestion des caractères spéciaux dans différents cas
-	* Compatibilité PHP 5.5+ avec OPcache
-	* Amélioration des performances
-	* Chargement automatique des classes
-	* Alternative dans le cas d’absence de librairie JSON
-	* Pour le développement, le cache HTTP peut être désactivé en créant un fichier “./data/no-cache.txt”
-* Réorganisation des fichiers et répertoires, en particulier :
-	* Tous les fichiers utilisateur sont dans “./data/” (y compris “cache”, “favicons”, et “log”)
-	* Déplacement de “./app/configuration/application.ini” vers “./data/config.php”
-		* Meilleure sécurité et compatibilité
-	* Déplacement de “./public/data/Configuration.array.php” vers “./data/*_user.php”
-	* Déplacement de “./public/” vers “./p/”
-		* Déplacement de “./public/index.php” vers “./p/i/index.php” (voir cookie ci-dessous)
-	* Déplacement de “./actualize_script.php” vers “./app/actualize_script.php” (pour une meilleure sécurité)
-		* Pensez à mettre à jour votre Cron !
-* Divers :
-	* Nouvelle politique de cookie de session (témoin de connexion)
-		* Utilise un nom poli “FreshRSS” (évite des problèmes avec certains filtres)
-		* Se limite au répertoire “./FreshRSS/p/i/” pour de meilleures performances HTTP
-			* Les images, CSS, scripts sont servis sans cookie
-		* Utilise “HttpOnly” pour plus de sécurité
-	* Nouvel “agent utilisateur” exposé lors du téléchargement des flux, par exemple :
-		* “FreshRSS/0.7 (Linux; http://freshrss.org) SimplePie/1.3.1”
-	* Script d’actualisation avec plus de messages
-		* Sur la sortie standard, ainsi que dans le log système (syslog)
-	* Affichage du numéro de version dans "À propos"
-
-
-## 2013-11-21 FreshRSS 0.6.1
-
-* Corrige bug chargement du JavaScript
-* Affiche un message d’erreur plus explicite si fichier de configuration inaccessible
-
-
-## 2013-11-17 FreshRSS 0.6
-
-* Nettoyage du code JavaScript + optimisations
-* Utilisation d’adresses relatives
-* Amélioration des performances coté client
-* Mise à jour automatique du nombre d’articles non lus
-* Corrections traductions
-* Mise en cache de FreshRSS
-* Amélioration des retours utilisateur lorsque la configuration n’est pas bonne
-* Actualisation des flux après une importation OPML
-* Meilleure prise en charge des flux RSS invalides
-* Amélioration de la vue globale
-* Possibilité de personnaliser les icônes de lecture
-* Suppression de champs lors de l’installation (base_url et sel)
-* Correction bugs divers
-
-
-## 2013-10-15 FreshRSS 0.5.1
-
-* Correction bug des catégories disparues
-* Correction traduction i18n/fr et i18n/en
-* Suppression de certains appels à la feuille de style fallback.css
-
-
-## 2013-10-12 FreshRSS 0.5.0
-
-* Possibilité d’interdire la lecture anonyme
-* Option pour garder l’historique d’un flux
-* Lors d’un clic sur “Marquer tous les articles comme lus”, FreshRSS peut désormais sauter à la prochaine catégorie / prochain flux avec des articles non lus.
-* Ajout d’un token pour accéder aux flux RSS générés par FreshRSS sans nécessiter de connexion
-* Possibilité de partager vers Facebook, Twitter et Google+
-* Possibilité de changer de thème
-* Le menu de navigation (article précédent / suivant / haut de page) a été ajouté à la vue non mobile
-* La police OpenSans est désormais appliquée
-* Amélioration de la page de configuration
-* Une meilleure sortie pour l’imprimante
-* Quelques retouches du design par défaut
-* Les vidéos ne dépassent plus du cadre de l’écran
-* Nouveau logo
-* Possibilité d’ajouter un préfixe aux tables lors de l’installation
-* Ajout d’un champ en base de données keep_history à la table feed
-* Si possible, création automatique de la base de données si elle n’existe pas lors de l’installation
-* L’utilisation d’UTF-8 est forcée
-* Le marquage automatique au défilement de la page a été amélioré
-* La vue globale a été énormément améliorée et est beaucoup plus utile
-* Amélioration des requêtes SQL
-* Amélioration du JavaScript
-* Correction bugs divers
-
-
-## 2013-07-02 FreshRSS 0.4.0
-
-* Correction bug et ajout notification lors de la phase d’installation
-* Affichage d’erreur si fichier OPML invalide
-* Les tags sont maintenant cliquables pour filtrer dessus
-* Amélioration vue mobile (boutons plus gros et ajout d’une barre de navigation)
-* Possibilité d’ajouter directement un flux dans une catégorie dès son ajout
-* Affichage des flux en erreur (injoignable par exemple) en rouge pour les différencier
-* Possibilité de changer les noms des flux
-* Ajout d’une option (désactivable donc) pour charger les images en lazyload permettant de ne pas charger toutes les images d’un coup
-* Le framework Minz est maintenant directement inclus dans l’archive (plus besoin de passer par ./build.sh)
-* Amélioration des performances pour la récupération des flux tronqués
-* Possibilité d’importer des flux sans catégorie lors de l’import OPML
-* Suppression de “l’API” (qui était de toute façon très basique) et de la fonctionnalité de “notes”
-* Amélioration de la recherche (garde en mémoire si l’on a sélectionné une catégorie) par exemple
-* Modification apparence des balises hr et pre
-* Meilleure vérification des champs de formulaire
-* Remise en place du mode “endless” (permettant de simplement charger les articles qui suivent plutôt que de charger une nouvelle page)
-* Ajout d’une page de visualisation des logs
-* Ajout d’une option pour optimiser la BDD (diminue sa taille)
-* Ajout des vues lecture et globale (assez basique)
-* Les vidéos YouTube ne débordent plus du cadre sur les petits écrans
-* Ajout d’une option pour marquer les articles comme lus lors du défilement (et suppression de celle au chargement de la page)
-
-
-## 2013-05-05 FreshRSS 0.3.0
-
-* Fallback pour les icônes SVG (utilisation de PNG à la place)
-* Fallback pour les propriétés CSS3 (utilisation de préfixes)
-* Affichage des tags associés aux articles
-* Internationalisation de l’application (gestion des langues anglaise et française)
-* Gestion des flux protégés par authentification HTTP
-* Mise en cache des favicons
-* Création d’un logo *temporaire*
-* Affichage des vidéos dans les articles
-* Gestion de la recherche et filtre par tags pleinement fonctionnels
-* Création d’un vrai script CRON permettant de mettre tous les flux à jour
-* Correction bugs divers
-
-
-## 2013-04-17 FreshRSS 0.2.0
-
-* Création d’un installateur
-* Actualisation des flux en Ajax
-* Partage par mail et Shaarli ajouté
-* Export par flux RSS
-* Possibilité de vider une catégorie
-* Possibilité de sélectionner les catégories en vue mobile
-* Les flux peuvent être sortis du flux principal (système de priorité)
-* Amélioration ajout / import / export des flux
-* Amélioration actualisation (meilleure gestion des erreurs)
-* Améliorations CSS
-* Changements dans la base de données
-* Màj de la librairie SimplePie
-* Flux sans auteurs gérés normalement
-* Correction bugs divers
-
-
-## 2013-04-08 FreshRSS 0.1.0
-
-* “Première” version
-- 
cgit v1.2.3


From af600b8ad3e03226a946d9fec80f06cb6ebd2f3d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 18:55:58 +0200
Subject: Read-me: info for git install/update

https://github.com/FreshRSS/FreshRSS/issues/861
https://github.com/FreshRSS/FreshRSS/issues/845
---
 README.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/README.md b/README.md
index 0d27e7d1b..50d2ee011 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,37 @@ We are a friendly community.
 5. Everything should be working :) If you encounter any problem, feel free to contact me.
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
+## Example of full installation on Linux Debian/Ubuntu
+```sh
+# If you use an Apache Web server (otherwise you need another Web server)
+sudo apt-get install apache2
+sudo a2enmod headers expires rewrite ssl
+# (Optional) If you want a MySQL database server
+sudo apt-get install mysql-server mysql-client php5-mysql
+# Main components (git is optional if you manually download the installation files)
+sudo apt-get install git php5 php5-curl php5-gd php5-intl php5-json php5-gmp php5-sqlite
+# Restart Web server
+sudo service apache2 restart
+# For FreshRSS itself
+cd /usr/share/
+sudo git clone https://github.com/FreshRSS/FreshRSS.git
+# Set the rights so that your Web browser can access the files
+cd FreshRSS
+sudo chown -R :www-data .
+sudo chmod -R g+w ./data/
+# Publish FreshRSS in your public HTML directory
+sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
+# Navigate to http://example.net/FreshRSS to complete the installation.
+# (If you do it from localhost, you may have to adjust the setting of your public address later)
+
+# Update to a newer version of FreshRSS
+cd /usr/share/FreshRSS
+sudo git reset --hard
+sudo git pull
+sudo chown -R :www-data .
+sudo chmod -R g+w ./data/
+```
+
 # Access control
 It is needed for the multi-user mode to limit access to FreshRSS. You can:
 * use form authentication (need JavaScript and PHP 5.3.7+, works with some PHP 5.3.3+)
-- 
cgit v1.2.3


From 20924a4705067145521538bb8254741a8387e2dc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 18:57:21 +0200
Subject: Readme white line

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 50d2ee011..e0996508c 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ sudo apt-get install mysql-server mysql-client php5-mysql
 sudo apt-get install git php5 php5-curl php5-gd php5-intl php5-json php5-gmp php5-sqlite
 # Restart Web server
 sudo service apache2 restart
+
 # For FreshRSS itself
 cd /usr/share/
 sudo git clone https://github.com/FreshRSS/FreshRSS.git
-- 
cgit v1.2.3


From 2afb4592264a1280b16b0cc86b1b14d5067056b3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 19:05:34 +0200
Subject: Read-me.fr: info for git install/update

https://github.com/FreshRSS/FreshRSS/issues/861
https://github.com/FreshRSS/FreshRSS/issues/845
---
 README.fr.md | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/README.fr.md b/README.fr.md
index 00b081155..99281d80a 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -42,13 +42,45 @@ Nous sommes une communauté amicale.
 ![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/FreshRSS/FreshRSS/archive/master.zip)
+1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](../releases)
 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
 5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à me contacter.
 6. Des paramètres de configuration avancée peuvent être accédés depuis [config.php](./data/config.default.php).
 
+## Exemple d’installation complète sur Linux Debian/Ubuntu
+```sh
+# Si vous utilisez le serveur Web Apache (sinon il faut un autre serveur Web)
+sudo apt-get install apache2
+sudo a2enmod headers expires rewrite ssl
+# (optionnel) Si vous voulez un serveur de base de données MySQL
+sudo apt-get install mysql-server mysql-client php5-mysql
+# Composants principaux (git est optionnel si vous déployez manuellement les fichiers d’installation)
+sudo apt-get install git php5 php5-curl php5-gd php5-intl php5-json php5-gmp php5-sqlite
+# Redémarrage du serveur Web
+sudo service apache2 restart
+
+# Pour FreshRSS lui-même
+cd /usr/share/
+sudo git clone https://github.com/FreshRSS/FreshRSS.git
+# Mettre les droits d’accès pour le serveur Web
+cd FreshRSS
+sudo chown -R :www-data .
+sudo chmod -R g+w ./data/
+# Publier FreshRSS dans votre répertoire HTML public
+sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
+# Naviguez vers http://example.net/FreshRSS pour terminer l’installation.
+# (Si vous le faite depuis localhost, vous pourrez avoir à ajuster le réglage de votre adresse publique)
+
+# Mettre à jour FreshRSS vers une nouvelle version
+cd /usr/share/FreshRSS
+sudo git reset --hard
+sudo git pull
+sudo chown -R :www-data .
+sudo chmod -R g+w ./data/
+```
+
 # Contrôle d’accès
 Il est requis pour le mode multi-utilisateur, et recommandé dans tous les cas, de limiter l’accès à votre FreshRSS. Au choix :
 * En utilisant l’identification par formulaire (requiert JavaScript, et PHP 5.3.7+ recommandé – fonctionne avec certaines versions de PHP 5.3.3+)
-- 
cgit v1.2.3


From 96ba71e618468f7d28a04c4ebc7c46dd912ccd75 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 20:22:27 +0200
Subject: MySQL create table bug

https://github.com/FreshRSS/FreshRSS/issues/845
And updated version comments to 1.1.1
---
 app/Models/EntryDAO.php        | 2 +-
 app/SQL/install.sql.mysql.php  | 8 ++++----
 app/SQL/install.sql.sqlite.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index f939a0fb3..bd575989d 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -92,7 +92,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				return $this->addEntry($valuesTmp);
 			} elseif ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
 				Minz_Log::error('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']. ' ' . $this->addEntryPrepared);
+					. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
 			}
 			return false;
 		}
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index 9c6af405d..c5787d25b 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -41,8 +41,8 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 	`content_bin` blob,	-- v0.7
 	`link` varchar(1023) CHARACTER SET latin1 NOT NULL,
 	`date` int(11),	-- Until year 2038
-	`lastSeen` INT(11) DEFAULT 0,	-- v1.2, Until year 2038
-	`hash` BINARY(16),	-- v1.2
+	`lastSeen` INT(11) DEFAULT 0,	-- v1.1.1, Until year 2038
+	`hash` BINARY(16),	-- v1.1.1
 	`is_read` boolean NOT NULL DEFAULT 0,
 	`is_favorite` boolean NOT NULL DEFAULT 0,
 	`id_feed` SMALLINT,	-- v0.7
@@ -51,8 +51,8 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 	FOREIGN KEY (`id_feed`) REFERENCES `%1$sfeed`(`id`) ON DELETE CASCADE ON UPDATE CASCADE,
 	UNIQUE KEY (`id_feed`,`guid`),	-- v0.7
 	INDEX (`is_favorite`),	-- v0.7
-	INDEX (`is_read`)	-- v0.7
-	INDEX entry_lastSeen_index (`lastSeen`)	-- v1.2
+	INDEX (`is_read`),	-- v0.7
+	INDEX `entry_lastSeen_index` (`lastSeen`)	-- v1.1.1
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
 ENGINE = INNODB;
 
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 77e8e094c..71bad7311 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -39,8 +39,8 @@ $SQL_CREATE_TABLES = array(
 	`content` text,
 	`link` varchar(1023) NOT NULL,
 	`date` int(11),	-- Until year 2038
-	`lastSeen` INT(11) DEFAULT 0,	-- v1.2, Until year 2038
-	`hash` BINARY(16),	-- v1.2
+	`lastSeen` INT(11) DEFAULT 0,	-- v1.1.1, Until year 2038
+	`hash` BINARY(16),	-- v1.1.1
 	`is_read` boolean NOT NULL DEFAULT 0,
 	`is_favorite` boolean NOT NULL DEFAULT 0,
 	`id_feed` SMALLINT,
@@ -52,7 +52,7 @@ $SQL_CREATE_TABLES = array(
 
 'CREATE INDEX IF NOT EXISTS entry_is_favorite_index ON `%1$sentry`(`is_favorite`);',
 'CREATE INDEX IF NOT EXISTS entry_is_read_index ON `%1$sentry`(`is_read`);',
-'CREATE INDEX IF NOT EXISTS entry_lastSeen_index ON `%1$sentry`(`lastSeen`);',	//v1.2
+'CREATE INDEX IF NOT EXISTS entry_lastSeen_index ON `%1$sentry`(`lastSeen`);',	//v1.1.1
 
 'INSERT OR IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");',
 );
-- 
cgit v1.2.3


From 0d32f694dd63b27bd8b46a6c3b5dec10a42b0e24 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 20:48:18 +0200
Subject: Minor comment 1.1.1

https://github.com/FreshRSS/FreshRSS/issues/845
---
 app/Models/EntryDAO.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index f939a0fb3..e5acc4a76 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -11,7 +11,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$hasTransaction = false;
 		try {
 			$stm = null;
-			if ($name === 'lastSeen') {	//v1.2
+			if ($name === 'lastSeen') {	//v1.1.1
 				if (!$this->bd->inTransaction()) {
 					$this->bd->beginTransaction();
 					$hasTransaction = true;
@@ -29,7 +29,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				if ($hasTransaction) {
 					$this->bd->rollBack();
 				}
-			} elseif ($name === 'hash') {	//v1.2
+			} elseif ($name === 'hash') {	//v1.1.1
 				$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16)');
 				return $stm && $stm->execute();
 			}
-- 
cgit v1.2.3


From 384a146883548ba0274f8cbee0c2e67dc053f70e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 20:48:18 +0200
Subject: Minor comment 1.1.1

https://github.com/FreshRSS/FreshRSS/issues/845
---
 app/Models/EntryDAO.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index bd575989d..9ddcfcfb3 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -11,7 +11,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$hasTransaction = false;
 		try {
 			$stm = null;
-			if ($name === 'lastSeen') {	//v1.2
+			if ($name === 'lastSeen') {	//v1.1.1
 				if (!$this->bd->inTransaction()) {
 					$this->bd->beginTransaction();
 					$hasTransaction = true;
@@ -29,7 +29,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				if ($hasTransaction) {
 					$this->bd->rollBack();
 				}
-			} elseif ($name === 'hash') {	//v1.2
+			} elseif ($name === 'hash') {	//v1.1.1
 				$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16)');
 				return $stm && $stm->execute();
 			}
-- 
cgit v1.2.3


From 12972ee54ab7a732f1ca2349ff2ce46e6b245404 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 1 Jun 2015 19:32:19 +0200
Subject: Start version 1.1.2-dev

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index d49d2f065..6e7796616 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.1.1-beta');
+define('FRESHRSS_VERSION', '1.1.2-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');
-- 
cgit v1.2.3


From 214a5cc9a4c2b821961bc21f22b4b08e34b5be68 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 3 Jun 2015 20:21:32 +0200
Subject: PHP 5.2 compatiblity

Namespaces are not needed so far.

https://github.com/FreshRSS/FreshRSS/commit/aacd1ffd4052b04c724c2783b3ee2845ca4ada35#commitcomment-11503581
---
 app/Exceptions/ContextException.php       | 2 +-
 app/Exceptions/DAOException.php           | 2 +-
 app/Exceptions/EntriesGetterException.php | 2 +-
 app/Exceptions/FeedException.php          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
index 8f05eccd6..00934cbfd 100644
--- a/app/Exceptions/ContextException.php
+++ b/app/Exceptions/ContextException.php
@@ -3,6 +3,6 @@
 /**
  * An exception raised when a context is invalid
  */
-class FreshRSS_Context_Exception extends \Exception {
+class FreshRSS_Context_Exception extends Exception {
 
 }
diff --git a/app/Exceptions/DAOException.php b/app/Exceptions/DAOException.php
index e48e521ab..14bee3403 100644
--- a/app/Exceptions/DAOException.php
+++ b/app/Exceptions/DAOException.php
@@ -1,5 +1,5 @@
 <?php
 
-class FreshRSS_DAO_Exception extends \Exception {
+class FreshRSS_DAO_Exception extends Exception {
 
 }
diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
index 8aace1840..3b76195ee 100644
--- a/app/Exceptions/EntriesGetterException.php
+++ b/app/Exceptions/EntriesGetterException.php
@@ -1,5 +1,5 @@
 <?php
 
-class FreshRSS_EntriesGetter_Exception extends \Exception {
+class FreshRSS_EntriesGetter_Exception extends Exception {
 
 }
diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
index 6c0cb3755..abfcbce79 100644
--- a/app/Exceptions/FeedException.php
+++ b/app/Exceptions/FeedException.php
@@ -1,5 +1,5 @@
 <?php
 
-class FreshRSS_Feed_Exception extends \Exception {
+class FreshRSS_Feed_Exception extends Exception {
 
 }
-- 
cgit v1.2.3


From 568ab2313d5a922e06d7f0c33b3e39dd152d43db Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 3 Jun 2015 22:07:25 +0200
Subject: PDO options for e.g. SSL

https://github.com/FreshRSS/FreshRSS/issues/868
---
 data/config.default.php |  3 +++
 lib/Minz/ModelPdo.php   | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/data/config.default.php b/data/config.default.php
index 80d331df7..7c179c8a0 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -99,6 +99,9 @@ return array(
 		# MySQL table prefix.
 		'prefix' => '',
 
+		'pdo_options' => array(
+		),
+
 	),
 
 	# List of enabled FreshRSS extensions.
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 3e8ec1f43..e82c1f30a 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -53,21 +53,19 @@ class Minz_ModelPdo {
 		$this->current_user = $currentUser;
 		self::$sharedCurrentUser = $currentUser;
 
+		$driver_options = is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
+
 		try {
 			$type = $db['type'];
 			if ($type === 'mysql') {
 				$string = 'mysql:host=' . $db['host']
 				        . ';dbname=' . $db['base']
 				        . ';charset=utf8';
-				$driver_options = array(
-					PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
-				);
+				$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8';
 				$this->prefix = $db['prefix'] . $currentUser . '_';
 			} elseif ($type === 'sqlite') {
 				$string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite');
-				$driver_options = array(
-					//PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-				);
+				//$driver_options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_EXCEPTION;
 				$this->prefix = '';
 			} else {
 				throw new Minz_PDOConnectionException(
-- 
cgit v1.2.3


From 9b512b82e2e65c6ca18199ed328de2645a7bc84e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 3 Jun 2015 22:17:40 +0200
Subject: PDO config isset

https://github.com/FreshRSS/FreshRSS/issues/868
---
 lib/Minz/ModelPdo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index e82c1f30a..25999f02b 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -53,7 +53,7 @@ class Minz_ModelPdo {
 		$this->current_user = $currentUser;
 		self::$sharedCurrentUser = $currentUser;
 
-		$driver_options = is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
+		$driver_options = isset($conf->db['pdo_options']) && is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
 
 		try {
 			$type = $db['type'];
-- 
cgit v1.2.3


From 92db9202980ce63ad6f437416efd50c07792e7e8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 5 Jun 2015 20:44:45 +0200
Subject: PDO option example

---
 app/install.php         | 3 ++-
 data/config.default.php | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/install.php b/app/install.php
index 3cdd59d11..313081c14 100644
--- a/app/install.php
+++ b/app/install.php
@@ -165,7 +165,7 @@ function saveStep3() {
 			$_SESSION['bd_user'] = $_POST['user'];
 			$_SESSION['bd_password'] = $_POST['pass'];
 			$_SESSION['bd_prefix'] = substr($_POST['prefix'], 0, 16);
-			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] .(empty($_SESSION['default_user']) ? '' :($_SESSION['default_user'] . '_'));
+			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] . (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_'));
 		}
 
 		//TODO: load `config.default.php` as default
@@ -183,6 +183,7 @@ function saveStep3() {
 				'password' => $_SESSION['bd_password'],
 				'base' => $_SESSION['bd_base'],
 				'prefix' => $_SESSION['bd_prefix'],
+				'pdo_options' => array(),
 			),
 		);
 
diff --git a/data/config.default.php b/data/config.default.php
index 7c179c8a0..97085df29 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -100,6 +100,9 @@ return array(
 		'prefix' => '',
 
 		'pdo_options' => array(
+			//PDO::MYSQL_ATTR_SSL_KEY	=> '/path/to/client-key.pem',
+			//PDO::MYSQL_ATTR_SSL_CERT	=> '/path/to/client-cert.pem',
+			//PDO::MYSQL_ATTR_SSL_CA	=> '/path/to/ca-cert.pem',
 		),
 
 	),
-- 
cgit v1.2.3


From 111c9f757274f547c9789ad127fde886bedc1925 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Jun 2015 14:18:49 +0200
Subject: Bug label

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

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 91b0b8189..db6d7951c 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -107,7 +107,7 @@
 		</div>
 		
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo _t('conf.display.notif_html5.timeout'); ?></label>
+			<label class="group-name" for="html5_notif_timeout"><?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::$user_conf->html5_notif_timeout; ?>" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->html5_notif_timeout; ?>"/> <?php echo _t('conf.display.notif_html5.seconds'); ?>
 			</div>
-- 
cgit v1.2.3


From fcc94c733afe4e745ca4b12a47942ae0419c4786 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 6 Jun 2015 09:09:39 -0400
Subject: Remove the auto-focus on install

The javascript code used was confusing on Chrome and Internet Explorer. So I removed it. It has no real value so I think it is better without it.

See #855
---
 app/install.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/install.php b/app/install.php
index 3cdd59d11..15206b6e3 100644
--- a/app/install.php
+++ b/app/install.php
@@ -636,7 +636,7 @@ function printStep2() {
 				toggles[i].addEventListener('mouseup', hide_password);
 			}
 
-			function auth_type_change(focus) {
+			function auth_type_change() {
 				var auth_value = document.getElementById('auth_type').value,
 				    password_input = document.getElementById('passwordPlain'),
 				    mail_input = document.getElementById('mail_login');
@@ -644,21 +644,15 @@ function printStep2() {
 				if (auth_value === 'form') {
 					password_input.required = true;
 					mail_input.required = false;
-					if (focus) {
-						password_input.focus();
-					}
 				} else if (auth_value === 'persona') {
 					password_input.required = false;
 					mail_input.required = true;
-					if (focus) {
-						mail_input.focus();
-					}
 				} else {
 					password_input.required = false;
 					mail_input.required = false;
 				}
 			}
-			auth_type_change(false);
+			auth_type_change();
 		</script>
 
 		<div class="form-group form-actions">
-- 
cgit v1.2.3


From da5033859ba990ef1f5f3dfbc1f5d7a2f4d4d6f8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Jun 2015 15:10:37 +0200
Subject: Force HTML content-type with charset

Force UTF-8 https://github.com/FreshRSS/FreshRSS/issues/870
---
 lib/Minz/View.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index ff5cce4a5..8c5230ab6 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -91,6 +91,7 @@ class Minz_View {
 	 * Construit le layout
 	 */
 	public function buildLayout () {
+		header('Content-Type: text/html; charset=UTF-8');
 		$this->includeFile(self::LAYOUT_PATH_NAME . self::LAYOUT_FILENAME);
 	}
 
-- 
cgit v1.2.3


From 4903f31f60c8c2a395d7b5496f662b32c13c58e7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Jun 2015 15:22:02 +0200
Subject: Increased max number of posts per page

https://github.com/FreshRSS/FreshRSS/issues/872
---
 app/views/configure/reading.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 1b7a101df..9c54b6bd5 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::$user_conf->posts_per_page; ?>" min="5" max="50" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>"/>
+				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>" min="5" max="500" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>"/>
 				<?php echo _i('help'); ?> <?php echo _t('conf.reading.number_divided_when_reader'); ?>
 			</div>
 		</div>
-- 
cgit v1.2.3


From ff9091e4a0373fc2b8331fe1672f784cec6cc666 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Jun 2015 15:22:02 +0200
Subject: Increased max number of posts per page

https://github.com/FreshRSS/FreshRSS/issues/872
---
 app/views/configure/reading.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 1b7a101df..9c54b6bd5 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::$user_conf->posts_per_page; ?>" min="5" max="50" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>"/>
+				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>" min="5" max="500" data-leave-validation="<?php echo FreshRSS_Context::$user_conf->posts_per_page; ?>"/>
 				<?php echo _i('help'); ?> <?php echo _t('conf.reading.number_divided_when_reader'); ?>
 			</div>
 		</div>
-- 
cgit v1.2.3


From f2f758e6bd0fe4f1b95377badefaf404c3160d62 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 6 Jun 2015 09:34:11 -0400
Subject: Add tab navigation on install

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

diff --git a/app/install.php b/app/install.php
index 3cdd59d11..417c76733 100644
--- a/app/install.php
+++ b/app/install.php
@@ -427,7 +427,7 @@ function printStep0() {
 		<div class="form-group">
 			<label class="group-name" for="language"><?php echo _t('install.language'); ?></label>
 			<div class="group-controls">
-				<select name="language" id="language">
+				<select name="language" id="language" tabindex="1" >
 				<?php foreach ($languages as $lang) { ?>
 				<option value="<?php echo $lang; ?>"<?php echo $actual == $lang ? ' selected="selected"' : ''; ?>>
 					<?php echo _t('gen.lang.' . $lang); ?>
@@ -439,10 +439,10 @@ function printStep0() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<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>
+				<button type="submit" class="btn btn-important" tabindex="2" ><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn" tabindex="3" ><?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('install.action.next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=1" tabindex="4" ><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -536,7 +536,7 @@ function printStep1() {
 	<?php } ?>
 
 	<?php if ($res['all'] == 'ok') { ?>
-	<a class="btn btn-important next-step" href="?step=2"><?php echo _t('install.action.next_step'); ?></a>
+	<a class="btn btn-important next-step" href="?step=2" tabindex="1" ><?php echo _t('install.action.next_step'); ?></a>
 	<?php } else { ?>
 	<p class="alert alert-error"><?php echo _t('install.action.fix_errors_before'); ?></p>
 	<?php } ?>
@@ -557,28 +557,28 @@ function printStep2() {
 		<div class="form-group">
 			<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('gen.freshrss'); ?>" />
+				<input type="text" id="title" name="title" value="<?php echo isset($_SESSION['title']) ? $_SESSION['title'] : _t('gen.freshrss'); ?>" tabindex="1" />
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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('gen.date.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'; ?>" tabindex="2" /> <?php echo _t('gen.date.month'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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() == '' ? 'alice' : 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(); ?>" tabindex="3" />
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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)">
+				<select id="auth_type" name="auth_type" required="required" onchange="auth_type_change(true)" tabindex="4">
 					<?php
 						function no_auth($auth_type) {
 							return !in_array($auth_type, array('form', 'persona', 'http_auth', 'none'));
@@ -597,7 +597,7 @@ function printStep2() {
 			<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"' : ''; ?> />
+					<input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" autocomplete="off" <?php echo $auth_type === 'form' ? ' required="required"' : ''; ?> tabindex="5" />
 					<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'); ?>
@@ -608,7 +608,7 @@ function printStep2() {
 		<div class="form-group">
 			<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"' : ''; ?> />
+				<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"' : ''; ?> tabindex="6"/>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
@@ -663,10 +663,10 @@ function printStep2() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<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>
+				<button type="submit" class="btn btn-important" tabindex="7" ><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn" tabindex="8" ><?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('install.action.next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=3" tabindex="9" ><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -687,7 +687,7 @@ function printStep3() {
 		<div class="form-group">
 			<label class="group-name" for="type"><?php echo _t('install.bdd.type'); ?></label>
 			<div class="group-controls">
-				<select name="type" id="type" onchange="mySqlShowHide()">
+				<select name="type" id="type" onchange="mySqlShowHide()" tabindex="1" >
 				<?php if (extension_loaded('pdo_mysql')) {?>
 				<option value="mysql"
 					<?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'mysql') ? 'selected="selected"' : ''; ?>>
@@ -708,35 +708,35 @@ function printStep3() {
 		<div class="form-group">
 			<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'; ?>" />
+				<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'; ?>" tabindex="2" />
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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'] : ''; ?>" />
+				<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'] : ''; ?>" tabindex="3" />
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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'] : ''; ?>" />
+				<input type="password" id="pass" name="pass" value="<?php echo isset($_SESSION['bd_password']) ? $_SESSION['bd_password'] : ''; ?>" tabindex="4" />
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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'] : ''; ?>" />
+				<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'] : ''; ?>" tabindex="5" />
 			</div>
 		</div>
 
 		<div class="form-group">
 			<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_'; ?>" />
+				<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_'; ?>" tabindex="6" />
 			</div>
 		</div>
 		</div>
@@ -756,10 +756,10 @@ function printStep3() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<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>
+				<button type="submit" class="btn btn-important" tabindex="7" ><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn" tabindex="8" ><?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('install.action.next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=4" tabindex="9" ><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -770,7 +770,7 @@ function printStep3() {
 function printStep4() {
 ?>
 	<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>
+	<a class="btn btn-important next-step" href="?step=5" tabindex="1"><?php echo _t('install.action.finish'); ?></a>
 <?php
 }
 
-- 
cgit v1.2.3


From 8a131b056ee3566c2b54466f650c26c143b7c369 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Jun 2015 16:22:33 +0200
Subject: Force autocomplete off

https://github.com/FreshRSS/FreshRSS/issues/880
Put a space in the user field instead of empty to avoid autocomplete.
Use feed ID in the username/password field name.
---
 app/Controllers/feedController.php         | 6 +++---
 app/Controllers/subscriptionController.php | 6 +++---
 app/views/feed/add.phtml                   | 2 +-
 app/views/helpers/feed/update.phtml        | 8 ++++----
 app/views/subscription/index.phtml         | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 957a809cd..b91f63b5b 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -98,10 +98,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			// HTTP information are useful if feed is protected behind a
 			// HTTP authentication
-			$user = Minz_Request::param('http_user');
-			$pass = Minz_Request::param('http_pass');
+			$user = trim(Minz_Request::param('http_user', ''));
+			$pass = Minz_Request::param('http_pass', '');
 			$http_auth = '';
-			if ($user != '' || $pass != '') {
+			if ($user != '' && $pass != '') {	//TODO: Sanitize
 				$http_auth = $user . ':' . $pass;
 			}
 
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 333565faf..03d3ee15e 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -77,11 +77,11 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(_t('sub.title.feed_management') . ' · ' . $this->view->feed->name() . ' · ');
 
 		if (Minz_Request::isPost()) {
-			$user = Minz_Request::param('http_user', '');
-			$pass = Minz_Request::param('http_pass', '');
+			$user = trim(Minz_Request::param('http_user_feed' . $id, ''));
+			$pass = Minz_Request::param('http_pass_feed' . $id, '');
 
 			$httpAuth = '';
-			if ($user != '' || $pass != '') {
+			if ($user != '' && $pass != '') {	//TODO: Sanitize
 				$httpAuth = $user . ':' . $pass;
 			}
 
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 4cdd3f390..35f6fbb12 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -67,7 +67,7 @@
 		<div class="form-group">
 			<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" />
+				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo empty($auth['username']) ? ' ' : $auth['username']; ?>" autocomplete="off" />
 			</div>
 
 			<label class="group-name" for="http_pass"><?php echo _t('sub.feed.auth.password'); ?></label>
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index b2cf9f93c..12f485ec3 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -144,15 +144,15 @@
 		<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('sub.feed.auth.username'); ?></label>
+			<label class="group-name" for="http_user_feed<?php echo $this->feed->id(); ?>"><?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" />
+				<input type="text" name="http_user_feed<?php echo $this->feed->id(); ?>" id="http_user_feed<?php echo $this->feed->id(); ?>" class="extend" value="<?php echo empty($auth['username']) ? ' ' : $auth['username']; ?>" autocomplete="off" />
 				<?php echo _i('help'); ?> <?php echo _t('sub.feed.auth.help'); ?>
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo _t('sub.feed.auth.password'); ?></label>
+			<label class="group-name" for="http_pass_feed<?php echo $this->feed->id(); ?>"><?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" />
+				<input type="password" name="http_pass_feed<?php echo $this->feed->id(); ?>" id="http_pass_feed<?php echo $this->feed->id(); ?>" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
 		</div>
 
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 331e8244e..2cfe3f33c 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -36,10 +36,10 @@
 
 					<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('sub.feed.auth.username'); ?>" />
+						<input type="text" name="http_user" id="http_user_feed" value=" " 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('sub.feed.auth.password'); ?>" />
+						<input type="password" name="http_pass" id="http_pass_feed" autocomplete="off" placeholder="<?php echo _t('sub.feed.auth.password'); ?>" />
 					</li>
 				</ul>
 			</div>
-- 
cgit v1.2.3


From 5cb3d017ab893f1e99df5cfd373e47df88f53960 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 29 Jun 2015 20:46:51 +0200
Subject: Orthographe validité
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index 0a1a03e41..e3631eb8b 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -35,7 +35,7 @@ return array(
 		'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',
+		'validator' => 'Vérifier la validité du flux',
 		'website' => 'URL du site',
 		'pubsubhubbub' => 'Notification instantanée par PubSubHubbub',
 	),
-- 
cgit v1.2.3


From 9f0b8ce70d84182676eab89e1c681e5d8bbf7539 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 3 Jul 2015 23:29:46 +0200
Subject: Add default feeds

https://github.com/FreshRSS/FreshRSS/issues/859
---
 app/SQL/install.sql.mysql.php  | 2 ++
 app/SQL/install.sql.sqlite.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index c5787d25b..0f4e04620 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -57,6 +57,8 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 ENGINE = INNODB;
 
 INSERT IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");
+INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);
+INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS @ GitHub", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);
 ');
 
 define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 71bad7311..87d5cf286 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -55,6 +55,8 @@ $SQL_CREATE_TABLES = array(
 'CREATE INDEX IF NOT EXISTS entry_lastSeen_index ON `%1$sentry`(`lastSeen`);',	//v1.1.1
 
 'INSERT OR IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");',
+'INSERT OR IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);',
+'INSERT OR IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS releases", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);',
 );
 
 define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
-- 
cgit v1.2.3


From 079150eee4eebce3549c3d7db84dd0180bdd11e7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 3 Jul 2015 23:47:18 +0200
Subject: Updated log visibility

In particular, ensure that ERROR is only used for errors that may affect
FreshRSS integrity, and ensure that feed errors are visible also in
production, i.e. visibility of WARNING
https://github.com/FreshRSS/FreshRSS/issues/885
https://github.com/FreshRSS/FreshRSS/issues/884
---
 app/Controllers/authController.php         | 2 +-
 app/Controllers/feedController.php         | 2 +-
 app/Controllers/importExportController.php | 6 +++---
 app/Controllers/updateController.php       | 2 +-
 app/Models/CategoryDAO.php                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 937c0759d..b55892475 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -253,7 +253,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				FreshRSS_Auth::giveAccess();
 				invalidateHttpCache();
 			} else {
-				Minz_Log::error($reason);
+				Minz_Log::warning($reason);
 
 				$res = array();
 				$res['status'] = 'failure';
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index b91f63b5b..488d066a9 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -322,7 +322,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					$feed->load(false);
 				}
 			} catch (FreshRSS_Feed_Exception $e) {
-				Minz_Log::notice($e->getMessage());
+				Minz_Log::warning($e->getMessage());
 				$feedDAO->updateLastUpdate($feed->id(), true);
 				$feed->unlock();
 				continue;
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 26b163e43..60e467255 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -47,7 +47,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$status_file = $file['error'];
 
 		if ($status_file !== 0) {
-			Minz_Log::error('File cannot be uploaded. Error code: ' . $status_file);
+			Minz_Log::warning('File cannot be uploaded. Error code: ' . $status_file);
 			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'),
 			                  array('c' => 'importExport', 'a' => 'index'));
 		}
@@ -69,7 +69,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_Log::warning('Zip archive cannot be imported. Error code: ' . $zip);
 				Minz_Request::bad(_t('feedback.import_export.zip_error'),
 				                  array('c' => 'importExport', 'a' => 'index'));
 			}
@@ -77,7 +77,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			while (($zipfile = zip_read($zip)) !== false) {
 				if (!is_resource($zipfile)) {
 					// zip_entry() can also return an error code!
-					Minz_Log::error('Zip file cannot be imported. Error code: ' . $zipfile);
+					Minz_Log::warning('Zip file cannot be imported. Error code: ' . $zipfile);
 				} else {
 					$type_zipfile = $this->guessFileType(zip_entry_name($zipfile));
 					if ($type_file !== 'unknown') {
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 4797a3486..84a33fe85 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -63,7 +63,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		curl_close($c);
 
 		if ($c_status !== 200) {
-			Minz_Log::error(
+			Minz_Log::warning(
 				'Error during update (HTTP code ' . $c_status . '): ' . $c_error
 			);
 
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 189a5f0e4..b5abac519 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -13,7 +13,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::error('SQL error addCategory: ' . $info[2]	);
+			Minz_Log::error('SQL error addCategory: ' . $info[2]);
 			return false;
 		}
 	}
-- 
cgit v1.2.3


From c1398afe8c8d220ace5fc4ccac02953adddf18c5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 4 Jul 2015 14:21:24 +0200
Subject: Full content img data-src

https://github.com/FreshRSS/FreshRSS/issues/877
Quick fix while waiting for a new library to retrieve articles
---
 lib/lib_rss.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 191a58f35..c51b4e6de 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -195,17 +195,27 @@ function sanitizeHTML($data, $base = '') {
 
 /* permet de récupérer le contenu d'un article pour un flux qui n'est pas complet */
 function get_content_by_parsing ($url, $path) {
-	require_once (LIB_PATH . '/lib_phpQuery.php');
+	require_once(LIB_PATH . '/lib_phpQuery.php');
 
 	Minz_Log::notice('FreshRSS GET ' . SimplePie_Misc::url_remove_credentials($url));
-	$html = file_get_contents ($url);
+	$html = file_get_contents($url);
 
 	if ($html) {
-		$doc = phpQuery::newDocument ($html);
-		$content = $doc->find ($path);
+		$doc = phpQuery::newDocument($html);
+		$content = $doc->find($path);
+
+		foreach (pq('img[data-src]') as $img) {
+			$imgP = pq($img);
+			$dataSrc = $imgP->attr('data-src');
+			if (strlen($dataSrc) > 4) {
+				$imgP->attr('src', $dataSrc);
+				$imgP->removeAttr('data-src');
+			}
+		}
+
 		return sanitizeHTML($content->__toString(), $url);
 	} else {
-		throw new Exception ();
+		throw new Exception();
 	}
 }
 
-- 
cgit v1.2.3


From 25dbd24d4c8a9ac240f21529543ed426735c133f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Jul 2015 14:11:32 +0200
Subject: Changelog beta 1.1.2

---
 CHANGELOG.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 605b4256c..99f8c36e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,20 @@
 # Changelog
 
-## 2015-xx-xx FreshRSS 1.1.2 (beta)
+## 2015-07-xx FreshRSS 1.1.2 (beta)
 
 * Features
-	* Support for PubSubHubbub for instant notifications from compatible Web sites.
+	* Support for PubSubHubbub for instant notifications from compatible Web sites. #312
+* Security
+	* Support for SSL connection to MySQL. #868
+	* Workaround for browsers that have disabled support for `<form autocomplete="off">`. #880
+* UI
+	* Force UTF-8 for responses. #870
+	* Increased pagination limit to 500 articles. #872
+	* Improved UI for installation. #855
+* Misc.
+	* Support for data-src for images of articles retrieved via the full-content module. #877
+	* Add a couple of default feeds for fresh installations. #886
+	* Changed some log visibilities. #885
 
 
 ## 2015-05-31 FreshRSS 1.1.1 (beta)
-- 
cgit v1.2.3


From bd391dc6f7468695490ac5c5732e66b42d9b2b8b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 5 Jul 2015 14:22:27 +0200
Subject: Changelog beta 1.1.2 with links

I was hoping that the #123 issue numbers would be automatically converted to links, but they were not.
---
 CHANGELOG.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99f8c36e1..0ebfd50ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,18 +3,19 @@
 ## 2015-07-xx FreshRSS 1.1.2 (beta)
 
 * Features
-	* Support for PubSubHubbub for instant notifications from compatible Web sites. #312
+	* Support for PubSubHubbub for instant notifications from compatible Web sites. [#312](https://github.com/FreshRSS/FreshRSS/issues/312)
 * Security
-	* Support for SSL connection to MySQL. #868
-	* Workaround for browsers that have disabled support for `<form autocomplete="off">`. #880
+	* Support for SSL connection to MySQL. [#868](https://github.com/FreshRSS/FreshRSS/issues/868)
+	* Workaround for browsers that have disabled support for `<form autocomplete="off">`. [#880](https://github.com/FreshRSS/FreshRSS/issues/880)
 * UI
-	* Force UTF-8 for responses. #870
-	* Increased pagination limit to 500 articles. #872
-	* Improved UI for installation. #855
+	* Force UTF-8 for responses. [#870](https://github.com/FreshRSS/FreshRSS/issues/870)
+	* Increased pagination limit to 500 articles. [#872](https://github.com/FreshRSS/FreshRSS/issues/872)
+	* Improved UI for installation. [#855](https://github.com/FreshRSS/FreshRSS/issues/855)
 * Misc.
-	* Support for data-src for images of articles retrieved via the full-content module. #877
-	* Add a couple of default feeds for fresh installations. #886
-	* Changed some log visibilities. #885
+	* Restore support for PHP 5.2. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68)
+	* Support for data-src for images of articles retrieved via the full-content module. [#877](https://github.com/FreshRSS/FreshRSS/issues/877)
+	* Add a couple of default feeds for fresh installations. [#886](https://github.com/FreshRSS/FreshRSS/issues/886)
+	* Changed some log visibilities. [#885](https://github.com/FreshRSS/FreshRSS/issues/885)
 
 
 ## 2015-05-31 FreshRSS 1.1.1 (beta)
-- 
cgit v1.2.3


From 6b7d94626656674b60d6f970bd4ada46383dde1e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 10 Jul 2015 21:40:28 +0200
Subject: Avoid hex2bin for PHP 5.3

https://github.com/FreshRSS/FreshRSS/issues/894
And use native hexadecimal function when available (MySQL) to avoid
having binary data in the SQL logs.
---
 app/Models/EntryDAO.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 9ddcfcfb3..f74055835 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -6,6 +6,10 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return parent::$sharedDbType !== 'sqlite';
 	}
 
+	public function hasNativeHex() {
+		return parent::$sharedDbType !== 'sqlite';
+	}
+
 	protected function addColumn($name) {
 		Minz_Log::debug('FreshRSS_EntryDAO::autoAddColumn: ' . $name);
 		$hasTransaction = false;
@@ -64,7 +68,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			     . ', link, date, lastSeen, hash, is_read, is_favorite, id_feed, tags) '
 			     . 'VALUES(?, ?, ?, ?, '
 			     . ($this->isCompressed() ? 'COMPRESS(?)' : '?')
-			     . ', ?, ?, ?, ?, ?, ?, ?, ?)';
+			     . ', ?, ?, ?, '
+			     . ($this->hasNativeHex() ? 'X?' : '?')
+			     . ', ?, ?, ?, ?)';
 			$this->addEntryPrepared = $this->bd->prepare($sql);
 		}
 
@@ -77,7 +83,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			substr($valuesTmp['link'], 0, 1023),
 			$valuesTmp['date'],
 			time(),
-			hex2bin($valuesTmp['hash']),	// X'09AF' hexadecimal literals do not work with SQLite/PDO
+			$this->hasNativeHex() ? $valuesTmp['hash'] : pack('H*', $valuesTmp['hash']),	// X'09AF' hexadecimal literals do not work with SQLite/PDO	//hex2bin() is PHP5.4+
 			$valuesTmp['is_read'] ? 1 : 0,
 			$valuesTmp['is_favorite'] ? 1 : 0,
 			$valuesTmp['id_feed'],
@@ -109,8 +115,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$sql = 'UPDATE `' . $this->prefix . 'entry` '
 			     . 'SET title=?, author=?, '
 			     . ($this->isCompressed() ? 'content_bin=COMPRESS(?)' : 'content=?')
-			     . ', link=?, date=?, lastSeen=?, hash=?, '
-			     . ($valuesTmp['is_read'] === null ? '' : 'is_read=?, ')
+			     . ', link=?, date=?, lastSeen=?, hash='
+			     . ($this->hasNativeHex() ? 'X?' : '?')
+			     . ', ' . ($valuesTmp['is_read'] === null ? '' : 'is_read=?, ')
 			     . 'tags=? '
 			     . 'WHERE id_feed=? AND guid=?';
 			$this->updateEntryPrepared = $this->bd->prepare($sql);
@@ -123,7 +130,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			substr($valuesTmp['link'], 0, 1023),
 			$valuesTmp['date'],
 			time(),
-			hex2bin($valuesTmp['hash']),
+			$this->hasNativeHex() ? $valuesTmp['hash'] : pack('H*', $valuesTmp['hash']),
 		);
 		if ($valuesTmp['is_read'] !== null) {
 			$values[] = $valuesTmp['is_read'] ? 1 : 0;
-- 
cgit v1.2.3


From 1cf466cd56157ef2933d1233cba87b9e49954f25 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 10 Jul 2015 23:15:48 +0200
Subject: Changelog compatibility PHP5.2

https://github.com/FreshRSS/FreshRSS/issues/894
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ebfd50ac..c2fa18a68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 	* Increased pagination limit to 500 articles. [#872](https://github.com/FreshRSS/FreshRSS/issues/872)
 	* Improved UI for installation. [#855](https://github.com/FreshRSS/FreshRSS/issues/855)
 * Misc.
-	* Restore support for PHP 5.2. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68)
+	* Restore support for PHP 5.2. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68) [#894](https://github.com/FreshRSS/FreshRSS/issues/894)
 	* Support for data-src for images of articles retrieved via the full-content module. [#877](https://github.com/FreshRSS/FreshRSS/issues/877)
 	* Add a couple of default feeds for fresh installations. [#886](https://github.com/FreshRSS/FreshRSS/issues/886)
 	* Changed some log visibilities. [#885](https://github.com/FreshRSS/FreshRSS/issues/885)
-- 
cgit v1.2.3


From 96b720b03269826ea0a6d58d8aea8ebf7ce7c1d9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 10 Jul 2015 23:36:52 +0200
Subject: Changelog with more precise version PHP 5.2.1

https://github.com/FreshRSS/FreshRSS/issues/894

https://github.com/marienfressinaud/FreshRSS/commit/0cabd1f50dd7d1cf0941a50139e6fbeed6825b4d
https://github.com/FreshRSS/FreshRSS/issues/789#issuecomment-73878076
---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2fa18a68..2f0bb48f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 	* Increased pagination limit to 500 articles. [#872](https://github.com/FreshRSS/FreshRSS/issues/872)
 	* Improved UI for installation. [#855](https://github.com/FreshRSS/FreshRSS/issues/855)
 * Misc.
-	* Restore support for PHP 5.2. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68) [#894](https://github.com/FreshRSS/FreshRSS/issues/894)
+	* Restore support for PHP 5.2.1+. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68) [#894](https://github.com/FreshRSS/FreshRSS/issues/894)
 	* Support for data-src for images of articles retrieved via the full-content module. [#877](https://github.com/FreshRSS/FreshRSS/issues/877)
 	* Add a couple of default feeds for fresh installations. [#886](https://github.com/FreshRSS/FreshRSS/issues/886)
 	* Changed some log visibilities. [#885](https://github.com/FreshRSS/FreshRSS/issues/885)
diff --git a/constants.php b/constants.php
index d5f0cc06b..2df014053 100644
--- a/constants.php
+++ b/constants.php
@@ -25,4 +25,4 @@ define('FRESHRSS_PATH', dirname(__FILE__));
 	define('APP_PATH', FRESHRSS_PATH . '/app');
 	define('EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions');
 
-define('TMP_PATH', sys_get_temp_dir());
+define('TMP_PATH', sys_get_temp_dir());	//Requires PHP 5.2.1+
-- 
cgit v1.2.3


From cb114a341b904799b73e8e7ff1ebeab39d3c21ab Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jul 2015 00:35:31 +0200
Subject: Merge some pull requests from upstream

silent Warning cast with PHP 5.3.3 (RHEL-6)
https://github.com/simplepie/simplepie/pull/258
Use rss:pubDate over atom:updated when determining the posting date
https://github.com/simplepie/simplepie/pull/288
Update Item.php: add support for media thumbnails
https://github.com/simplepie/simplepie/pull/340
Remove PHP Notices https://github.com/simplepie/simplepie/pull/353
And removed "FreshRSS" annotations for pull requests submitted upstream

Fixed a typo in Date.php (wrong number for September)
https://github.com/simplepie/simplepie/pull/374
Remove duplicate case https://github.com/simplepie/simplepie/pull/406
Added set_curl_options method to allow custom options
https://github.com/simplepie/simplepie/pull/407
Improved error message https://github.com/simplepie/simplepie/pull/412
---
 lib/SimplePie/SimplePie.php                      | 149 ++++++++++++-----------
 lib/SimplePie/SimplePie/Cache/File.php           |  12 +-
 lib/SimplePie/SimplePie/Decode/HTML/Entities.php |   1 -
 lib/SimplePie/SimplePie/File.php                 |  10 +-
 lib/SimplePie/SimplePie/Item.php                 |  42 +++++--
 lib/SimplePie/SimplePie/Locator.php              |   2 +-
 lib/SimplePie/SimplePie/Misc.php                 |   8 +-
 lib/SimplePie/SimplePie/Parse/Date.php           |   6 +-
 lib/SimplePie/SimplePie/Registry.php             |   4 +-
 lib/SimplePie/SimplePie/Sanitize.php             |   4 +-
 10 files changed, 133 insertions(+), 105 deletions(-)

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 54f4c5770..6c0962a9f 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -456,7 +456,7 @@ class SimplePie
 	 * @see SimplePie::subscribe_url()
 	 * @access private
 	 */
-	public $permanent_url = null;	//FreshRSS
+	public $permanent_url = null;
 
 	/**
 	 * @var object Instance of SimplePie_File to use as a feed
@@ -479,6 +479,13 @@ class SimplePie
 	 */
 	public $timeout = 10;
 
+	/**
+	 * @var array Custom curl options
+	 * @see SimplePie::set_curl_options()
+	 * @access private
+	 */
+	public $curl_options = array();
+
 	/**
 	 * @var bool Forces fsockopen() to be used for remote files instead
 	 * of cURL, even if a new enough version is installed
@@ -754,7 +761,7 @@ class SimplePie
 		else
 		{
 			$this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
-			$this->permanent_url = $this->feed_url;	//FreshRSS
+			$this->permanent_url = $this->feed_url;
 		}
 	}
 
@@ -769,7 +776,7 @@ class SimplePie
 		if ($file instanceof SimplePie_File)
 		{
 			$this->feed_url = $file->url;
-			$this->permanent_url = $this->feed_url;	//FreshRSS
+			$this->permanent_url = $this->feed_url;
 			$this->file =& $file;
 			return true;
 		}
@@ -807,6 +814,19 @@ class SimplePie
 	{
 		$this->timeout = (int) $timeout;
 	}
+    
+	/**
+	 * Set custom curl options
+	 *
+	 * This allows you to change default curl options
+	 *
+	 * @since 1.0 Beta 3
+	 * @param array $curl_options Curl options to add to default settings
+	 */
+	public function set_curl_options(array $curl_options = array())
+	{
+		$this->curl_options = $curl_options;
+	}
 
 	/**
 	 * Force SimplePie to use fsockopen() instead of cURL
@@ -1251,7 +1271,7 @@ class SimplePie
 		$this->enable_exceptions = $enable;
 	}
 
-	function cleanMd5($rss)	//FreshRSS
+	function cleanMd5($rss)
 	{
 		return md5(preg_replace(array('#<(lastBuildDate|pubDate|updated|feedDate|dc:date|slash:comments)>[^<]+</\\1>#', '#<!--.+?-->#s'), '', $rss));
 	}
@@ -1297,7 +1317,7 @@ class SimplePie
 		// Pass whatever was set with config options over to the sanitizer.
 		// Pass the classes in for legacy support; new classes should use the registry instead
 		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
-		$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen);
+		$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen, $this->curl_options);
 
 		if (!empty($this->multifeed_url))
 		{
@@ -1342,7 +1362,7 @@ class SimplePie
 			// Fetch the data via SimplePie_File into $this->raw_data
 			if (($fetched = $this->fetch_data($cache)) === true)
 			{
-				return $this->data['mtime'];	//FreshRSS
+				return $this->data['mtime'];
 			}
 			elseif ($fetched === false) {
 				return false;
@@ -1350,7 +1370,7 @@ class SimplePie
 
 			list($headers, $sniffed) = $fetched;
 
-			if (isset($this->data['md5']))	//FreshRSS
+			if (isset($this->data['md5']))
 			{
 				$md5 = $this->data['md5'];
 			}
@@ -1435,8 +1455,8 @@ class SimplePie
 						$this->data['headers'] = $headers;
 					}
 					$this->data['build'] = SIMPLEPIE_BUILD;
-					$this->data['mtime'] = time();	//FreshRSS
-					$this->data['md5'] = empty($md5) ? $this->cleanMd5($this->raw_data) : $md5;	//FreshRSS
+					$this->data['mtime'] = time();
+					$this->data['md5'] = empty($md5) ? $this->cleanMd5($this->raw_data) : $md5;
 
 					// Cache the file if caching is enabled
 					if ($cache && !$cache->save($this))
@@ -1451,7 +1471,7 @@ class SimplePie
 		if (isset($parser))
 		{
 			// We have an error, just set SimplePie_Misc::error to it and quit
-			$this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
+			$this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d, encoding %s, URL: %s', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column(), $encoding, $this->feed_url);
 		}
 		else
 		{
@@ -1477,7 +1497,7 @@ class SimplePie
 		{
 			// Load the Cache
 			$this->data = $cache->load();
-			if ($cache->mtime() + $this->cache_duration > time())	//FreshRSS
+			if ($cache->mtime() + $this->cache_duration > time())
 			{
 				$this->raw_data = false;
 				return true;	// If the cache is still valid, just return true
@@ -1514,71 +1534,58 @@ class SimplePie
 					}
 				}
 				// Check if the cache has been updated
-				else //if ($cache->mtime() + $this->cache_duration < time())	//FreshRSS removed
+				else
 				{
-					// If we have last-modified and/or etag set
-					//if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag']))	//FreshRSS removed
+					$headers = array(
+						'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+					);
+					if (isset($this->data['headers']['last-modified']))
 					{
-						$headers = array(
-							'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
-						);
-						if (isset($this->data['headers']['last-modified']))
-						{
-							$headers['if-modified-since'] = $this->data['headers']['last-modified'];
-						}
-						if (isset($this->data['headers']['etag']))
-						{
-							$headers['if-none-match'] = $this->data['headers']['etag'];
-						}
+						$headers['if-modified-since'] = $this->data['headers']['last-modified'];
+					}
+					if (isset($this->data['headers']['etag']))
+					{
+						$headers['if-none-match'] = $this->data['headers']['etag'];
+					}
 
-						$file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen));	//FreshRSS
+					$file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
 
-						if ($file->success)
+					if ($file->success)
+					{
+						if ($file->status_code === 304)
 						{
-							if ($file->status_code === 304)
-							{
-								$cache->touch();
-								return true;
-							}
+							$cache->touch();
+							return true;
 						}
-						else
+					}
+					else
+					{
+						$cache->touch();
+						$this->error = $file->error;
+						return !empty($this->data);
+					}
+
+					$md5 = $this->cleanMd5($file->body);
+					if ($this->data['md5'] === $md5) {
+						if ($this->syslog_enabled)
 						{
-							$cache->touch();	//FreshRSS
-							$this->error = $file->error;	//FreshRSS
-							return !empty($this->data);	//FreshRSS
-							//unset($file);	//FreshRSS removed
+							syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . SimplePie_Misc::url_remove_credentials($this->feed_url));
 						}
-					}
-					{	//FreshRSS
-						$md5 = $this->cleanMd5($file->body);
-						if ($this->data['md5'] === $md5) {
-							if ($this->syslog_enabled)
-							{
-								syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . SimplePie_Misc::url_remove_credentials($this->feed_url));
-							}
-							$cache->touch();
-							return true;	//Content unchanged even though server did not send a 304
-						} else {
-							if ($this->syslog_enabled)
-							{
-								syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . SimplePie_Misc::url_remove_credentials($this->feed_url));
-							}
-							$this->data['md5'] = $md5;
+						$cache->touch();
+						return true;	//Content unchanged even though server did not send a 304
+					} else {
+						if ($this->syslog_enabled)
+						{
+							syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . SimplePie_Misc::url_remove_credentials($this->feed_url));
 						}
+						$this->data['md5'] = $md5;
 					}
 				}
-				//// 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
+			}
+			// If the cache is empty
 			else
 			{
-				//$cache->unlink();	//FreshRSS removed
-				$cache->touch();	//FreshRSS
+				$cache->touch();	//To keep the date/time of the last tentative update
 				$this->data = array();
 			}
 		}
@@ -1594,7 +1601,7 @@ class SimplePie
 				$headers = array(
 					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
 				);
-				$file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen));
+				$file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
 			}
 		}
 		// If the file connection has an error, set SimplePie::error to that and quit
@@ -1611,15 +1618,15 @@ class SimplePie
 
 			if (!$locate->is_feed($file))
 			{
-				$copyStatusCode = $file->status_code;	//FreshRSS
-				$copyContentType = $file->headers['content-type'];	//FreshRSS
+				$copyStatusCode = $file->status_code;
+				$copyContentType = $file->headers['content-type'];
 				// 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`; the status code is `$copyStatusCode` and content-type is `$copyContentType`";	//FreshRSS
+						$this->error = "A feed could not be found at `$this->feed_url`; the status code is `$copyStatusCode` and content-type is `$copyContentType`";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}
@@ -1634,8 +1641,8 @@ class SimplePie
 				if ($cache)
 				{
 					$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
-					$this->data['mtime'] = time();	//FreshRSS
-					$this->data['md5'] = empty($md5) ? $this->cleanMd5($file->body) : $md5;	//FreshRSS
+					$this->data['mtime'] = time();
+					$this->data['md5'] = empty($md5) ? $this->cleanMd5($file->body) : $md5;
 					if (!$cache->save($this))
 					{
 						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
@@ -1648,7 +1655,7 @@ class SimplePie
 		}
 
 		$this->raw_data = $file->body;
-		$this->permanent_url = $file->permanent_url;	//FreshRSS
+		$this->permanent_url = $file->permanent_url;
 		$headers = $file->headers;
 		$sniffer = $this->registry->create('Content_Type_Sniffer', array(&$file));
 		$sniffed = $sniffer->get_type();
@@ -1852,7 +1859,7 @@ class SimplePie
 	 */
 	public function subscribe_url($permanent = false)
 	{
-		if ($permanent)	//FreshRSS
+		if ($permanent)
 		{
 			if ($this->permanent_url !== null)
 			{
diff --git a/lib/SimplePie/SimplePie/Cache/File.php b/lib/SimplePie/SimplePie/Cache/File.php
index cb4b528c4..72e75a4b6 100644
--- a/lib/SimplePie/SimplePie/Cache/File.php
+++ b/lib/SimplePie/SimplePie/Cache/File.php
@@ -136,11 +136,7 @@ class SimplePie_Cache_File implements SimplePie_Cache_Base
 	 */
 	public function mtime()
 	{
-		//if (file_exists($this->name))	//FreshRSS removed
-		{
-			return @filemtime($this->name);	//FreshRSS
-		}
-		//return false;	//FreshRSS removed
+		return @filemtime($this->name);
 	}
 
 	/**
@@ -150,11 +146,7 @@ class SimplePie_Cache_File implements SimplePie_Cache_Base
 	 */
 	public function touch()
 	{
-		//if (file_exists($this->name))	//FreshRSS removed
-		{
-			return @touch($this->name);	//FreshRSS
-		}
-		//return false;	//FreshRSS removed
+		return @touch($this->name);
 	}
 
 	/**
diff --git a/lib/SimplePie/SimplePie/Decode/HTML/Entities.php b/lib/SimplePie/SimplePie/Decode/HTML/Entities.php
index cde06c884..46b3a1dff 100644
--- a/lib/SimplePie/SimplePie/Decode/HTML/Entities.php
+++ b/lib/SimplePie/SimplePie/Decode/HTML/Entities.php
@@ -169,7 +169,6 @@ class SimplePie_Decode_HTML_Entities
 			case "\x09":
 			case "\x0A":
 			case "\x0B":
-			case "\x0B":
 			case "\x0C":
 			case "\x20":
 			case "\x3C":
diff --git a/lib/SimplePie/SimplePie/File.php b/lib/SimplePie/SimplePie/File.php
index 1f9e3d502..643648ddb 100644
--- a/lib/SimplePie/SimplePie/File.php
+++ b/lib/SimplePie/SimplePie/File.php
@@ -66,7 +66,7 @@ class SimplePie_File
 	var $method = SIMPLEPIE_FILE_SOURCE_NONE;
 	var $permanent_url;	//FreshRSS
 
-	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $syslog_enabled = SIMPLEPIE_SYSLOG)
+	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $curl_options = array(), $syslog_enabled = SIMPLEPIE_SYSLOG)
 	{
 		if (class_exists('idna_convert'))
 		{
@@ -75,7 +75,7 @@ class SimplePie_File
 			$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
 		}
 		$this->url = $url;
-		$this->permanent_url = $url;	//FreshRSS
+		$this->permanent_url = $url;
 		$this->useragent = $useragent;
 		if (preg_match('/^http(s)?:\/\//i', $url))
 		{
@@ -119,6 +119,10 @@ class SimplePie_File
 					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
 					curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
 				}
+				foreach ($curl_options as $curl_param => $curl_value)
+				{
+					curl_setopt($fp, $curl_param, $curl_value);
+				}
 
 				$this->headers = curl_exec($fp);
 				if (curl_errno($fp) === 23 || curl_errno($fp) === 61)
@@ -149,7 +153,7 @@ class SimplePie_File
 							$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
 							$previousStatusCode = $this->status_code;
 							$this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
-							$this->permanent_url = ($previousStatusCode == 301) ? $location : $url;	//FreshRSS
+							$this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
 							return;
 						}
 					}
diff --git a/lib/SimplePie/SimplePie/Item.php b/lib/SimplePie/SimplePie/Item.php
index 7bd96c15f..27e93456e 100644
--- a/lib/SimplePie/SimplePie/Item.php
+++ b/lib/SimplePie/SimplePie/Item.php
@@ -406,6 +406,30 @@ class SimplePie_Item
 			return null;
 		}
 	}
+	
+	/**
+	 * Get the media:thumbnail of the item
+	 *
+	 * Uses `<media:thumbnail>`
+	 *
+	 * 
+	 * @return array|null
+	 */
+	public function get_thumbnail()
+	{
+		if (!isset($this->data['thumbnail']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				$this->data['thumbnail'] = $return[0]['attribs'][''];
+			}
+			else
+			{
+				$this->data['thumbnail'] = null;
+			}
+		}
+		return $this->data['thumbnail'];
+	}	
 
 	/**
 	 * Get a category for the item
@@ -738,31 +762,31 @@ class SimplePie_Item
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
@@ -2733,7 +2757,9 @@ class SimplePie_Item
 						{
 							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
 							{
-								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+								if (isset($thumbnail['attribs']['']['url'])) {
+									$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+								}
 							}
 							if (is_array($thumbnails))
 							{
diff --git a/lib/SimplePie/SimplePie/Locator.php b/lib/SimplePie/SimplePie/Locator.php
index 4e5f7c1ca..ba4a843b0 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', 'application/x-rss+xml')))	//FreshRSS
+			if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml', 'application/x-rss+xml')))
 			{
 				return true;
 			}
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 956a284cb..9e7ac4fa8 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -79,8 +79,8 @@ class SimplePie_Misc
 
 	public static function absolutize_url($relative, $base)
 	{
-		if (substr($relative, 0, 2) === '//')	//FreshRSS: disable absolutize_url for "//www.example.net" which will pick HTTP or HTTPS automatically
-		{
+		if (substr($relative, 0, 2) === '//')
+		{//Allow protocol-relative URLs "//www.example.net" which will pick HTTP or HTTPS automatically
 			return $relative;
 		}
 		$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
@@ -128,7 +128,7 @@ class SimplePie_Misc
 						{
 							$attribs[$j][2] = $attribs[$j][1];
 						}
-						$return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]), 'UTF-8');	//FreshRSS
+						$return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]), 'UTF-8');
 					}
 				}
 			}
@@ -142,7 +142,7 @@ class SimplePie_Misc
 		foreach ($element['attribs'] as $key => $value)
 		{
 			$key = strtolower($key);
-			$full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';	//FreshRSS
+			$full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
 		}
 		if ($element['self_closing'])
 		{
diff --git a/lib/SimplePie/SimplePie/Parse/Date.php b/lib/SimplePie/SimplePie/Parse/Date.php
index ba7c0703e..50bb5cffa 100644
--- a/lib/SimplePie/SimplePie/Parse/Date.php
+++ b/lib/SimplePie/SimplePie/Parse/Date.php
@@ -173,7 +173,7 @@ class SimplePie_Parse_Date
 		'aug' => 8,
 		'august' => 8,
 		'sep' => 9,
-		'september' => 8,
+		'september' => 9,
 		'oct' => 10,
 		'october' => 10,
 		'nov' => 11,
@@ -331,8 +331,8 @@ class SimplePie_Parse_Date
 		'CCT' => 23400,
 		'CDT' => -18000,
 		'CEDT' => 7200,
-		'CEST' => 7200,	//FreshRSS
 		'CET' => 3600,
+		'CEST' => 7200,
 		'CGST' => -7200,
 		'CGT' => -10800,
 		'CHADT' => 49500,
@@ -721,7 +721,7 @@ class SimplePie_Parse_Date
 		{
 			$output .= substr($string, $position, $pos - $position);
 			$position = $pos + 1;
-			if ($string[$pos - 1] !== '\\')
+			if ($pos === 0 || $string[$pos - 1] !== '\\')
 			{
 				$depth++;
 				while ($depth && $position < $length)
diff --git a/lib/SimplePie/SimplePie/Registry.php b/lib/SimplePie/SimplePie/Registry.php
index bd9c1f535..dac55e34e 100755
--- a/lib/SimplePie/SimplePie/Registry.php
+++ b/lib/SimplePie/SimplePie/Registry.php
@@ -113,7 +113,7 @@ class SimplePie_Registry
 	 */
 	public function register($type, $class, $legacy = false)
 	{
-		if (!is_subclass_of($class, $this->default[$type]))
+		if (!@is_subclass_of($class, $this->default[$type]))
 		{
 			return false;
 		}
@@ -222,4 +222,4 @@ class SimplePie_Registry
 		$result = call_user_func_array(array($class, $method), $parameters);
 		return $result;
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index e7c9f925f..a6863ec03 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -249,7 +249,7 @@ class SimplePie_Sanitize
 		{
 			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
 			{
-				$data = htmlspecialchars_decode($data, ENT_QUOTES);	//FreshRSS 
+				$data = htmlspecialchars_decode($data, ENT_QUOTES);
 				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
@@ -280,7 +280,7 @@ class SimplePie_Sanitize
 				$document->loadHTML($data);
 				restore_error_handler();
 
-				$xpath = new DOMXPath($document);	//FreshRSS
+				$xpath = new DOMXPath($document);
 
 				// Strip comments
 				if ($this->strip_comments)
-- 
cgit v1.2.3


From fa432755cc9d0cc71be54d463bdfb7558d62c5f1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jul 2015 12:16:56 +0200
Subject: Implement cURL options

https://github.com/FreshRSS/FreshRSS/issues/897
Requires that https://github.com/FreshRSS/FreshRSS/pull/898 is merged
first.
---
 CHANGELOG.md                     |  2 ++
 data/config.default.php          | 19 +++++++++++++++++--
 lib/SimplePie/SimplePie/File.php |  1 -
 lib/lib_rss.php                  |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ebfd50ac..23feda577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,9 @@
 
 * Features
 	* Support for PubSubHubbub for instant notifications from compatible Web sites. [#312](https://github.com/FreshRSS/FreshRSS/issues/312)
+	* cURL options to use a proxy for retrieving feeds. [#897](https://github.com/FreshRSS/FreshRSS/issues/897) [#675](https://github.com/FreshRSS/FreshRSS/issues/675)
 * Security
+	* cURL options to verify or not SSL/TLS certificates (now enabled by default). [#897](https://github.com/FreshRSS/FreshRSS/issues/897) [#502](https://github.com/FreshRSS/FreshRSS/issues/502)
 	* Support for SSL connection to MySQL. [#868](https://github.com/FreshRSS/FreshRSS/issues/868)
 	* Workaround for browsers that have disabled support for `<form autocomplete="off">`. [#880](https://github.com/FreshRSS/FreshRSS/issues/880)
 * UI
diff --git a/data/config.default.php b/data/config.default.php
index 97085df29..6a8300872 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -1,7 +1,7 @@
 <?php
 
-# Do not modify this file, which is only a template.
-# See `config.php` after the install process is completed.
+# Do not modify this file, which defines default values,
+# but edit `config.php` instead, after the install process is completed.
 return array(
 
 	# Set to `development` to get additional error messages,
@@ -79,6 +79,21 @@ return array(
 
 	),
 
+	# Options used by cURL when making HTTP requests, e.g. when the SimplePie library retrieves feeds.
+	# http://php.net/manual/function.curl-setopt
+	'curl_options' => array(
+		# Options to disable SSL/TLS certificate check (e.g. for self-signed HTTPS)
+		//CURLOPT_SSL_VERIFYHOST => 0,
+		//CURLOPT_SSL_VERIFYPEER => false,
+
+		# Options to use a proxy for retrieving feeds.
+		//CURLOPT_PROXYTYPE = CURLPROXY_HTTP,
+		//CURLOPT_PROXYAUTH =  CURLAUTH_BASIC,
+		//CURLOPT_PROXY => '127.0.0.1',
+		//CURLOPT_PROXYPORT => 8080,
+		//CURLOPT_PROXYUSERPWD => 'user:password',
+	),
+
 	'db' => array(
 
 		# Type of database: `sqlite` or `mysql`.
diff --git a/lib/SimplePie/SimplePie/File.php b/lib/SimplePie/SimplePie/File.php
index 1f9e3d502..90dac790a 100644
--- a/lib/SimplePie/SimplePie/File.php
+++ b/lib/SimplePie/SimplePie/File.php
@@ -113,7 +113,6 @@ class SimplePie_File
 				curl_setopt($fp, CURLOPT_REFERER, $url);
 				curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
 				curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
-				curl_setopt($fp, CURLOPT_SSL_VERIFYPEER, false);	//FreshRSS
 				if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
 				{
 					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index c51b4e6de..0118e0f46 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -143,6 +143,7 @@ function customSimplePie() {
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration($limits['cache_duration']);
 	$simplePie->set_timeout($limits['timeout']);
+	$simplePie->set_curl_options($system_conf->curl_options);
 	$simplePie->strip_htmltags(array(
 		'base', 'blink', 'body', 'doctype', 'embed',
 		'font', 'form', 'frame', 'frameset', 'html',
-- 
cgit v1.2.3


From 26ed0e5c9571dfdaac22f147bda793cc25c9e661 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jul 2015 12:52:18 +0200
Subject: Syntax error for curl optiona array

https://github.com/FreshRSS/FreshRSS/issues/897
---
 data/config.default.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/config.default.php b/data/config.default.php
index 6a8300872..9a3ec87d7 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -87,10 +87,10 @@ return array(
 		//CURLOPT_SSL_VERIFYPEER => false,
 
 		# Options to use a proxy for retrieving feeds.
-		//CURLOPT_PROXYTYPE = CURLPROXY_HTTP,
-		//CURLOPT_PROXYAUTH =  CURLAUTH_BASIC,
+		//CURLOPT_PROXYTYPE => CURLPROXY_HTTP,
 		//CURLOPT_PROXY => '127.0.0.1',
 		//CURLOPT_PROXYPORT => 8080,
+		//CURLOPT_PROXYAUTH => CURLAUTH_BASIC,
 		//CURLOPT_PROXYUSERPWD => 'user:password',
 	),
 
-- 
cgit v1.2.3


From d9d9801e8da07b917aa89ce830dad2304f6ab6fc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jul 2015 15:54:43 +0200
Subject: Remove superfluous comment

sys_get_temp_dir() requires PHP 5.2.1+
---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index 2df014053..d5f0cc06b 100644
--- a/constants.php
+++ b/constants.php
@@ -25,4 +25,4 @@ define('FRESHRSS_PATH', dirname(__FILE__));
 	define('APP_PATH', FRESHRSS_PATH . '/app');
 	define('EXTENSIONS_PATH', FRESHRSS_PATH . '/extensions');
 
-define('TMP_PATH', sys_get_temp_dir());	//Requires PHP 5.2.1+
+define('TMP_PATH', sys_get_temp_dir());
-- 
cgit v1.2.3


From 241086fa672226cf799a82daad364fb82272da3b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 13 Jul 2015 23:11:05 +0200
Subject: Fix broken links for extension script/style files

Fix https://github.com/FreshRSS/FreshRSS/issues/862
---
 lib/Minz/Extension.php | 2 +-
 lib/Minz/Url.php       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index d7ee8fe81..78b8a2725 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -168,7 +168,7 @@ class Minz_Extension {
 		$url = '/ext.php?f=' . $file_name_url .
 		       '&amp;t=' . $type .
 		       '&amp;' . $mtime;
-		return Minz_Url::display($url);
+		return Minz_Url::display($url, 'php');
 	}
 
 	/**
diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index 879077d0f..a2809257d 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -31,8 +31,10 @@ class Minz_Url {
 
 		if ($isArray) {
 			$url_string .= self::printUri($url, $encodage);
-		} else {
+		} elseif ($encodage === 'html') {
 			$url_string = Minz_Helper::htmlspecialchars_utf8($url_string . $url);
+		} else {
+			$url_string .= $url;
 		}
 
 		return $url_string;
-- 
cgit v1.2.3


From c31a6bf5ef7babe1fd5440e406e5bda372aa0f08 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 14 Jul 2015 00:07:17 +0200
Subject: PHP7 changelog

https://github.com/FreshRSS/FreshRSS/issues/889
---
 CHANGELOG.md | 1 +
 README.fr.md | 2 +-
 README.md    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3612e263..b513024e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 	* Increased pagination limit to 500 articles. [#872](https://github.com/FreshRSS/FreshRSS/issues/872)
 	* Improved UI for installation. [#855](https://github.com/FreshRSS/FreshRSS/issues/855)
 * Misc.
+	* PHP 7 officially supported (~70% speed improvements on early tests). [#889](https://github.com/FreshRSS/FreshRSS/issues/889)
 	* Restore support for PHP 5.2.1+. [#214a5cc](https://github.com/Alkarex/FreshRSS/commit/214a5cc9a4c2b821961bc21f22b4b08e34b5be68) [#894](https://github.com/FreshRSS/FreshRSS/issues/894)
 	* Support for data-src for images of articles retrieved via the full-content module. [#877](https://github.com/FreshRSS/FreshRSS/issues/877)
 	* Add a couple of default feeds for fresh installations. [#886](https://github.com/FreshRSS/FreshRSS/issues/886)
diff --git a/README.fr.md b/README.fr.md
index de7dd1fb2..729dc9826 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -33,7 +33,7 @@ Nous sommes une communauté amicale.
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi avec des temps de réponse < 1s (testé sur 150 flux, 22k articles, soit 32Mo de données partiellement compressées)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
-* PHP 5.2.1+ (PHP 5.3.7+ recommandé)
+* PHP 5.2.1+ (PHP 5.3.7+ recommandé, et PHP 5.5+ pour les performances) (support bêta de PHP 7 avec encore meilleures performances)
 	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
 * MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
diff --git a/README.md b/README.md
index b73cd069e..a105dd4ca 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ We are a friendly community.
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi with response time under a second (tested with 150 feeds, 22k articles, or 32Mo of compressed data)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
-* PHP 5.2.1+ (PHP 5.3.7+ recommended)
+* PHP 5.2.1+ (PHP 5.3.7+ recommended, and PHP 5.5+ for performance) (beta support for PHP 7 with even higher performance)
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
 	* Recommended 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+ (recommended) or SQLite 3.7.4+
-- 
cgit v1.2.3


From b18f4979d886cc61009f9dc13a5e61843aabb35e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 16 Jul 2015 09:50:36 +0200
Subject: CHANGELOG for broken extension

See https://github.com/FreshRSS/FreshRSS/issues/862
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b513024e8..1b032376c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 	* Support for data-src for images of articles retrieved via the full-content module. [#877](https://github.com/FreshRSS/FreshRSS/issues/877)
 	* Add a couple of default feeds for fresh installations. [#886](https://github.com/FreshRSS/FreshRSS/issues/886)
 	* Changed some log visibilities. [#885](https://github.com/FreshRSS/FreshRSS/issues/885)
+	* Fix broken links for extension script / style files. [#862](https://github.com/FreshRSS/FreshRSS/issues/862)
 
 
 ## 2015-05-31 FreshRSS 1.1.1 (beta)
-- 
cgit v1.2.3


From 1f42a5d6db957434ef4cbed7758218a7ca13581d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 17 Jul 2015 17:27:45 +0200
Subject: Remove unnecessary hard-coded config information

See https://github.com/FreshRSS/FreshRSS/issues/890
---
 app/install.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/install.php b/app/install.php
index effe0e7ff..4c66932db 100644
--- a/app/install.php
+++ b/app/install.php
@@ -168,10 +168,7 @@ function saveStep3() {
 			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] . (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_'));
 		}
 
-		//TODO: load `config.default.php` as default
 		$config_array = array(
-			'environment' => 'production',
-			'simplepie_syslog_enabled' => true,
 			'salt' => $_SESSION['salt'],
 			'title' => $_SESSION['title'],
 			'default_user' => $_SESSION['default_user'],
-- 
cgit v1.2.3


From 815a943e01af416e997c7081e158c9a6922a897f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 17 Jul 2015 18:13:43 +0200
Subject: Use default user/system config in install

Change all hard-coded values by default user or system values.
We need to set db['host'] and db['prefix']

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

diff --git a/app/install.php b/app/install.php
index 4c66932db..745629aa7 100644
--- a/app/install.php
+++ b/app/install.php
@@ -9,6 +9,9 @@ session_name('FreshRSS');
 session_set_cookie_params(0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true);
 session_start();
 
+Minz_Configuration::register('system', DATA_PATH . '/config.default.php');
+Minz_Configuration::register('user', USERS_PATH . '/_/config.default.php');
+
 if (isset($_GET['step'])) {
 	define('STEP',(int)$_GET['step']);
 } else {
@@ -77,9 +80,10 @@ function saveLanguage() {
 }
 
 function saveStep2() {
+	$user_default_config = Minz_Configuration::get('user');
 	if (!empty($_POST)) {
 		$_SESSION['title'] = substr(trim(param('title', _t('gen.freshrss'))), 0, 25);
-		$_SESSION['old_entries'] = param('old_entries', 3);
+		$_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries);
 		$_SESSION['auth_type'] = param('auth_type', 'form');
 		$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16);
 		$_SESSION['mail_login'] = filter_var(param('mail_login', ''), FILTER_VALIDATE_EMAIL);
@@ -108,7 +112,7 @@ function saveStep2() {
 
 		$_SESSION['salt'] = sha1(uniqid(mt_rand(), true).implode('', stat(__FILE__)));
 		if ((!ctype_digit($_SESSION['old_entries'])) ||($_SESSION['old_entries'] < 1)) {
-			$_SESSION['old_entries'] = 3;
+			$_SESSION['old_entries'] = $user_default_config->old_entries;
 		}
 
 		$token = '';
@@ -118,7 +122,7 @@ function saveStep2() {
 
 		$config_array = array(
 			'language' => $_SESSION['language'],
-			'theme' => 'Origine',
+			'theme' => $user_default_config->theme,
 			'old_entries' => $_SESSION['old_entries'],
 			'mail_login' => $_SESSION['mail_login'],
 			'passwordHash' => $_SESSION['passwordHash'],
@@ -542,6 +546,7 @@ function printStep1() {
 }
 
 function printStep2() {
+	$user_default_config = Minz_Configuration::get('user');
 ?>
 	<?php $s2 = checkStep2(); if ($s2['all'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.conf.ok'); ?></p>
@@ -562,7 +567,7 @@ function printStep2() {
 		<div class="form-group">
 			<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'; ?>" tabindex="2" /> <?php echo _t('gen.date.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'] : $user_default_config->old_entries; ?>" tabindex="2" /> <?php echo _t('gen.date.month'); ?>
 			</div>
 		</div>
 
@@ -667,6 +672,7 @@ function printStep2() {
 }
 
 function printStep3() {
+	$system_default_config = Minz_Configuration::get('system');
 ?>
 	<?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.conf.ok'); ?></p>
@@ -700,7 +706,7 @@ function printStep3() {
 		<div class="form-group">
 			<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'; ?>" tabindex="2" />
+				<input type="text" id="host" name="host" pattern="[0-9A-Za-z_.-]{1,64}" value="<?php echo isset($_SESSION['bd_host']) ? $_SESSION['bd_host'] : $system_default_config->db['host']; ?>" tabindex="2" />
 			</div>
 		</div>
 
@@ -728,7 +734,7 @@ function printStep3() {
 		<div class="form-group">
 			<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_'; ?>" tabindex="6" />
+				<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'] :  $system_default_config->db['prefix']; ?>" tabindex="6" />
 			</div>
 		</div>
 		</div>
-- 
cgit v1.2.3


From d3a20cac129e63d57da27c16d5a11cc5db2a4db8 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 17 Jul 2015 18:16:00 +0200
Subject: Change default value for db['host'] and ['prefix']

See https://github.com/FreshRSS/FreshRSS/issues/890
---
 data/config.default.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/config.default.php b/data/config.default.php
index 9a3ec87d7..6013b13b8 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -100,7 +100,7 @@ return array(
 		'type' => 'sqlite',
 
 		# MySQL host.
-		'host' => '',
+		'host' => 'localhost',
 
 		# MySQL user.
 		'user' => '',
@@ -112,7 +112,7 @@ return array(
 		'base' => '',
 
 		# MySQL table prefix.
-		'prefix' => '',
+		'prefix' => 'freshrss_',
 
 		'pdo_options' => array(
 			//PDO::MYSQL_ATTR_SSL_KEY	=> '/path/to/client-key.pem',
-- 
cgit v1.2.3


From 2d22bf300a8dabcc77237f4bb56bf6532486fca2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 17 Jul 2015 23:43:43 +0200
Subject: dirname problem

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

diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index b9eda82a5..67fbae126 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -100,7 +100,10 @@ class Minz_Request {
 			} else {
 				$url .= '://' . $host . ($port == 80 ? '' : ':' . $port);
 			}
-			$url .= isset($_SERVER['REQUEST_URI']) ? dirname($_SERVER['REQUEST_URI']) : '';
+			if (isset($_SERVER['REQUEST_URI'])) {
+				$path = $_SERVER['REQUEST_URI'];
+				$url .= substr($path, -1) === '/' ? substr($path, 0, -1) : dirname($path);
+			}
 		} else {
 			$url = rtrim($url, '/\\') . $baseUrlSuffix;
 		}
-- 
cgit v1.2.3


From 75d85921b47f1d0fc92dc4d9b91618112967f081 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 11:40:33 +0200
Subject: CHANGELOG about loading default conf

See https://github.com/FreshRSS/FreshRSS/issues/890
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b032376c..94410c38d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 	* Add a couple of default feeds for fresh installations. [#886](https://github.com/FreshRSS/FreshRSS/issues/886)
 	* Changed some log visibilities. [#885](https://github.com/FreshRSS/FreshRSS/issues/885)
 	* Fix broken links for extension script / style files. [#862](https://github.com/FreshRSS/FreshRSS/issues/862)
+	* Load default configuration during installation to avoid hard-coded values. [#890](https://github.com/FreshRSS/FreshRSS/issues/890)
 
 
 ## 2015-05-31 FreshRSS 1.1.1 (beta)
-- 
cgit v1.2.3


From e954275c06d790c2d0c163a59bff1aa30a8bd17b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 15:13:23 +0200
Subject: First structure to skip steps during installation

See https://github.com/FreshRSS/FreshRSS/issues/909
---
 app/install.php | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/install.php b/app/install.php
index 745629aa7..6238f8a20 100644
--- a/app/install.php
+++ b/app/install.php
@@ -79,6 +79,31 @@ function saveLanguage() {
 	}
 }
 
+function saveStep1() {
+	if (isset($_POST['freshrss-keep-reinstall']) &&
+			$_POST['freshrss-keep-reinstall'] === '1') {
+		// We want to keep our previous installation of FreshRSS
+		// so we need to make next steps valid by setting $_SESSION vars
+		// with values from the previous installation
+
+		// TODO: set $_SESSION vars
+		$_SESSION['title'] = '';
+		$_SESSION['old_entries'] = '';
+		$_SESSION['mail_login'] = '';
+		$_SESSION['default_user'] =  '';
+
+		$_SESSION['bd_type'] = '';
+		$_SESSION['bd_host'] = '';
+		$_SESSION['bd_user'] = '';
+		$_SESSION['bd_password'] = '';
+		$_SESSION['bd_base'] = '';
+		$_SESSION['bd_prefix'] = '';
+		$_SESSION['bd_error'] = '';
+
+		header('Location: index.php?step=4');
+	}
+}
+
 function saveStep2() {
 	$user_default_config = Minz_Configuration::get('user');
 	if (!empty($_POST)) {
@@ -302,6 +327,10 @@ function checkStep1() {
 	);
 }
 
+function freshrss_already_installed() {
+	return false;
+}
+
 function checkStep2() {
 	$conf = !empty($_SESSION['title']) &&
 	        !empty($_SESSION['old_entries']) &&
@@ -537,7 +566,15 @@ function printStep1() {
 	<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') { ?>
+	<?php if (freshrss_already_installed() && $res['all'] == 'ok') { ?>
+	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('install.check.freshrss_alreadyy_installed'); ?></p>
+
+	<form action="index.php?step=1" method="post">
+		<input type="hidden" name="freshrss-keep-reinstall" value="1" />
+		<button type="submit" class="btn btn-important" tabindex="1" ><?php echo _t('install.action.keep_install'); ?></button>
+		<a class="btn btn-attention next-step" href="?step=2" tabindex="2" ><?php echo _t('install.action.reinstall'); ?></a>
+	</form>
+	<?php } elseif ($res['all'] == 'ok') { ?>
 	<a class="btn btn-important next-step" href="?step=2" tabindex="1" ><?php echo _t('install.action.next_step'); ?></a>
 	<?php } else { ?>
 	<p class="alert alert-error"><?php echo _t('install.action.fix_errors_before'); ?></p>
@@ -788,6 +825,7 @@ default:
 	saveLanguage();
 	break;
 case 1:
+	saveStep1();
 	break;
 case 2:
 	saveStep2();
-- 
cgit v1.2.3


From 3dd2d56867db8aea8049c4b398e6ca2e1814cf67 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 15:40:18 +0200
Subject: Load previous configuration during saveStep1()

See https://github.com/FreshRSS/FreshRSS/issues/909
---
 app/install.php | 47 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/install.php b/app/install.php
index 6238f8a20..75a211064 100644
--- a/app/install.php
+++ b/app/install.php
@@ -9,8 +9,8 @@ session_name('FreshRSS');
 session_set_cookie_params(0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true);
 session_start();
 
-Minz_Configuration::register('system', DATA_PATH . '/config.default.php');
-Minz_Configuration::register('user', USERS_PATH . '/_/config.default.php');
+Minz_Configuration::register('default_system', DATA_PATH . '/config.default.php');
+Minz_Configuration::register('default_user', USERS_PATH . '/_/config.default.php');
 
 if (isset($_GET['step'])) {
 	define('STEP',(int)$_GET['step']);
@@ -86,18 +86,31 @@ function saveStep1() {
 		// so we need to make next steps valid by setting $_SESSION vars
 		// with values from the previous installation
 
-		// TODO: set $_SESSION vars
-		$_SESSION['title'] = '';
-		$_SESSION['old_entries'] = '';
-		$_SESSION['mail_login'] = '';
-		$_SESSION['default_user'] =  '';
-
-		$_SESSION['bd_type'] = '';
-		$_SESSION['bd_host'] = '';
-		$_SESSION['bd_user'] = '';
-		$_SESSION['bd_password'] = '';
-		$_SESSION['bd_base'] = '';
-		$_SESSION['bd_prefix'] = '';
+		// First, we try to get previous configurations
+		Minz_Configuration::register('system',
+		                             DATA_PATH . '/config.php',
+		                             DATA_PATH . '/config.default.php');
+		$system_conf = Minz_Configuration::get('system');
+
+		$current_user = $system_conf->default_user;
+		Minz_Configuration::register('user',
+		                             USERS_PATH . '/' . $current_user . '/config.php',
+		                             USERS_PATH . '/_/config.default.php');
+		$user_conf = Minz_Configuration::get('user');
+
+		// Then, we set $_SESSION vars
+		$_SESSION['title'] = $system_conf->title;
+		$_SESSION['old_entries'] = $user_conf->old_entries;
+		$_SESSION['mail_login'] = $user_conf->mail_login;
+		$_SESSION['default_user'] = $current_user;
+
+		$db = $system_conf->db;
+		$_SESSION['bd_type'] = $db['type'];
+		$_SESSION['bd_host'] = $db['host'];
+		$_SESSION['bd_user'] = $db['user'];
+		$_SESSION['bd_password'] = $db['password'];
+		$_SESSION['bd_base'] = $db['base'];
+		$_SESSION['bd_prefix'] = $db['prefix'];
 		$_SESSION['bd_error'] = '';
 
 		header('Location: index.php?step=4');
@@ -105,7 +118,7 @@ function saveStep1() {
 }
 
 function saveStep2() {
-	$user_default_config = Minz_Configuration::get('user');
+	$user_default_config = Minz_Configuration::get('default_user');
 	if (!empty($_POST)) {
 		$_SESSION['title'] = substr(trim(param('title', _t('gen.freshrss'))), 0, 25);
 		$_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries);
@@ -583,7 +596,7 @@ function printStep1() {
 }
 
 function printStep2() {
-	$user_default_config = Minz_Configuration::get('user');
+	$user_default_config = Minz_Configuration::get('default_user');
 ?>
 	<?php $s2 = checkStep2(); if ($s2['all'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.conf.ok'); ?></p>
@@ -709,7 +722,7 @@ function printStep2() {
 }
 
 function printStep3() {
-	$system_default_config = Minz_Configuration::get('system');
+	$system_default_config = Minz_Configuration::get('default_system');
 ?>
 	<?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.conf.ok'); ?></p>
-- 
cgit v1.2.3


From 7925a5125b6a095cde4b2c92846dac384d66d20e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 15:59:33 +0200
Subject: Detect previous FreshRSS installation

See https://github.com/FreshRSS/FreshRSS/issues/909
---
 app/install.php | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/install.php b/app/install.php
index 75a211064..3312208c0 100644
--- a/app/install.php
+++ b/app/install.php
@@ -9,6 +9,7 @@ session_name('FreshRSS');
 session_set_cookie_params(0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true);
 session_start();
 
+// TODO: use join_path() instead
 Minz_Configuration::register('default_system', DATA_PATH . '/config.default.php');
 Minz_Configuration::register('default_user', USERS_PATH . '/_/config.default.php');
 
@@ -80,6 +81,7 @@ function saveLanguage() {
 }
 
 function saveStep1() {
+	// TODO: rename reinstall in install
 	if (isset($_POST['freshrss-keep-reinstall']) &&
 			$_POST['freshrss-keep-reinstall'] === '1') {
 		// We want to keep our previous installation of FreshRSS
@@ -87,6 +89,7 @@ function saveStep1() {
 		// with values from the previous installation
 
 		// First, we try to get previous configurations
+		// TODO: use join_path() instead
 		Minz_Configuration::register('system',
 		                             DATA_PATH . '/config.php',
 		                             DATA_PATH . '/config.default.php');
@@ -100,9 +103,11 @@ function saveStep1() {
 
 		// Then, we set $_SESSION vars
 		$_SESSION['title'] = $system_conf->title;
+		$_SESSION['auth_type'] = $system_conf->auth_type;
 		$_SESSION['old_entries'] = $user_conf->old_entries;
 		$_SESSION['mail_login'] = $user_conf->mail_login;
 		$_SESSION['default_user'] = $current_user;
+		$_SESSION['passwordHash'] = $user_conf->passwordHash;
 
 		$db = $system_conf->db;
 		$_SESSION['bd_type'] = $db['type'];
@@ -341,7 +346,30 @@ function checkStep1() {
 }
 
 function freshrss_already_installed() {
-	return false;
+	$conf_path = join_path(DATA_PATH, 'config.php');
+	if (!file_exists($conf_path)) {
+		return false;
+	}
+
+	// A configuration file already exists, we try to load it.
+	$system_conf = null;
+	try {
+		Minz_Configuration::register('system', $conf_path);
+		$system_conf = Minz_Configuration::get('system');
+	} catch (Minz_FileNotExistException $e) {
+		return false;
+	}
+
+	// ok, the global conf exists... but what about default user conf?
+	$current_user = $system_conf->default_user;
+	try {
+		Minz_Configuration::register('user', join_path(USERS_PATH, $current_user, 'config.php'));
+	} catch (Minz_FileNotExistException $e) {
+		return false;
+	}
+
+	// ok, ok, default user exists too!
+	return true;
 }
 
 function checkStep2() {
-- 
cgit v1.2.3


From 118e0ddd0a3dcd7e08d695567c6caa2d79d4b606 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 16:12:21 +0200
Subject: Remove TODO (join_path and reinstall)

See https://github.com/FreshRSS/FreshRSS/issues/909
---
 app/install.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/install.php b/app/install.php
index 3312208c0..208bef0e9 100644
--- a/app/install.php
+++ b/app/install.php
@@ -9,9 +9,8 @@ session_name('FreshRSS');
 session_set_cookie_params(0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true);
 session_start();
 
-// TODO: use join_path() instead
-Minz_Configuration::register('default_system', DATA_PATH . '/config.default.php');
-Minz_Configuration::register('default_user', USERS_PATH . '/_/config.default.php');
+Minz_Configuration::register('default_system', join_path(DATA_PATH, 'config.default.php'));
+Minz_Configuration::register('default_user', join_path(USERS_PATH, '_', 'config.default.php'));
 
 if (isset($_GET['step'])) {
 	define('STEP',(int)$_GET['step']);
@@ -81,24 +80,22 @@ function saveLanguage() {
 }
 
 function saveStep1() {
-	// TODO: rename reinstall in install
-	if (isset($_POST['freshrss-keep-reinstall']) &&
-			$_POST['freshrss-keep-reinstall'] === '1') {
+	if (isset($_POST['freshrss-keep-install']) &&
+			$_POST['freshrss-keep-install'] === '1') {
 		// We want to keep our previous installation of FreshRSS
 		// so we need to make next steps valid by setting $_SESSION vars
 		// with values from the previous installation
 
 		// First, we try to get previous configurations
-		// TODO: use join_path() instead
 		Minz_Configuration::register('system',
-		                             DATA_PATH . '/config.php',
-		                             DATA_PATH . '/config.default.php');
+		                             join_path(DATA_PATH, 'config.php'),
+		                             join_path(DATA_PATH, 'config.default.php'));
 		$system_conf = Minz_Configuration::get('system');
 
 		$current_user = $system_conf->default_user;
 		Minz_Configuration::register('user',
-		                             USERS_PATH . '/' . $current_user . '/config.php',
-		                             USERS_PATH . '/_/config.default.php');
+		                             join_path(USERS_PATH, $current_user, 'config.php'),
+		                             join_path(USERS_PATH, '_', 'config.default.php'));
 		$user_conf = Minz_Configuration::get('user');
 
 		// Then, we set $_SESSION vars
@@ -611,7 +608,7 @@ function printStep1() {
 	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('install.check.freshrss_alreadyy_installed'); ?></p>
 
 	<form action="index.php?step=1" method="post">
-		<input type="hidden" name="freshrss-keep-reinstall" value="1" />
+		<input type="hidden" name="freshrss-keep-install" value="1" />
 		<button type="submit" class="btn btn-important" tabindex="1" ><?php echo _t('install.action.keep_install'); ?></button>
 		<a class="btn btn-attention next-step" href="?step=2" tabindex="2" ><?php echo _t('install.action.reinstall'); ?></a>
 	</form>
-- 
cgit v1.2.3


From 2c8b4f5a502cb387f5eccfcc38aa7434bd75637a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 16:27:10 +0200
Subject: Add translations

TODO: german and czech translations

See https://github.com/FreshRSS/FreshRSS/issues/909
---
 app/i18n/cz/install.php | 3 +++
 app/i18n/de/install.php | 3 +++
 app/i18n/en/install.php | 3 +++
 app/i18n/fr/install.php | 3 +++
 app/install.php         | 2 +-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index 53257c84f..5f84d1cac 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -4,7 +4,9 @@ return array(
 	'action' => array(
 		'finish' => 'Dokončit instalaci',
 		'fix_errors_before' => 'Chyby prosím před přechodem na další krok opravte.',
+		'keep_install' => 'Keep previous installation',  // TODO: translate
 		'next_step' => 'Přejít na další krok',
+		'reinstall' => 'Reinstall FreshRSS',  // TODO: translate
 	),
 	'auth' => array(
 		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -31,6 +33,7 @@ return array(
 	),
 	'check' => array(
 		'_' => 'Kontrola',
+		'already_installed' => 'We have detected that FreshRSS is already installed!',  // TODO: translate
 		'cache' => array(
 			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/cache</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
 			'ok' => 'Oprávnění adresáře cache jsou v pořádku.',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index a5899bb52..6d937a638 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -4,7 +4,9 @@ return array(
 	'action' => array(
 		'finish' => 'Installation fertigstellen',
 		'fix_errors_before' => 'Bitte Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
+		'keep_install' => 'Keep previous installation',  // TODO: translate
 		'next_step' => 'Zum nächsten Schritt springen',
+		'reinstall' => 'Reinstall FreshRSS',  // TODO: translate
 	),
 	'auth' => array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -31,6 +33,7 @@ return array(
 	),
 	'check' => array(
 		'_' => 'Überprüfungen',
+		'already_installed' => 'We have detected that FreshRSS is already installed!',  // TODO: translate
 		'cache' => array(
 			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/cache</em> sind in Ordnung.',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index d4137309a..80488ca4a 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -4,7 +4,9 @@ return array(
 	'action' => array(
 		'finish' => 'Complete installation',
 		'fix_errors_before' => 'Please fix errors before skipping to the next step.',
+		'keep_install' => 'Keep previous installation',
 		'next_step' => 'Go to the next step',
+		'reinstall' => 'Reinstall FreshRSS',
 	),
 	'auth' => array(
 		'email_persona' => 'Login email address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -31,6 +33,7 @@ return array(
 	),
 	'check' => array(
 		'_' => 'Checks',
+		'already_installed' => 'We have detected that FreshRSS is already installed!',
 		'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.',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 245a20c56..6eca90458 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -4,7 +4,9 @@ return array(
 	'action' => array(
 		'finish' => 'Terminer l’installation',
 		'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
+		'keep_install' => 'Garder l’ancienne configuration',
 		'next_step' => 'Passer à l’étape suivante',
+		'reinstall' => 'Réinstaller FreshRSS',
 	),
 	'auth' => array(
 		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -31,6 +33,7 @@ return array(
 	),
 	'check' => array(
 		'_' => 'Vérifications',
+		'already_installed' => 'FreshRSS semble avoir déjà été installé !',
 		'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.',
diff --git a/app/install.php b/app/install.php
index 208bef0e9..61d2f5df9 100644
--- a/app/install.php
+++ b/app/install.php
@@ -605,7 +605,7 @@ function printStep1() {
 	<?php } ?>
 
 	<?php if (freshrss_already_installed() && $res['all'] == 'ok') { ?>
-	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('install.check.freshrss_alreadyy_installed'); ?></p>
+	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('install.check.already_installed'); ?></p>
 
 	<form action="index.php?step=1" method="post">
 		<input type="hidden" name="freshrss-keep-install" value="1" />
-- 
cgit v1.2.3


From 5d9b5f07feee3e388e747e5791cd91d1b98f55ef Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 17:10:18 +0200
Subject: Ask confirmation before reinstallation

See https://github.com/FreshRSS/FreshRSS/issues/909
---
 app/install.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/install.php b/app/install.php
index 61d2f5df9..ebd785f65 100644
--- a/app/install.php
+++ b/app/install.php
@@ -609,9 +609,31 @@ function printStep1() {
 
 	<form action="index.php?step=1" method="post">
 		<input type="hidden" name="freshrss-keep-install" value="1" />
-		<button type="submit" class="btn btn-important" tabindex="1" ><?php echo _t('install.action.keep_install'); ?></button>
-		<a class="btn btn-attention next-step" href="?step=2" tabindex="2" ><?php echo _t('install.action.reinstall'); ?></a>
+		<button type="submit" class="btn btn-important next-step" tabindex="1" ><?php echo _t('install.action.keep_install'); ?></button>
+		<a class="btn btn-attention next-step confirm" data-str-confirm="<?php echo _t('install.js.confirm_reinstall'); ?>" href="?step=2" tabindex="2" ><?php echo _t('install.action.reinstall'); ?></a>
 	</form>
+
+	<script>
+		function ask_confirmation(e) {
+			var str_confirmation = this.getAttribute('data-str-confirm');
+			if (!str_confirmation) {
+				str_confirmation = "<?php echo _t('gen.js.confirm_action'); ?>";
+			}
+
+			if (!confirm(str_confirmation)) {
+				e.preventDefault();
+			}
+		}
+
+		function init_confirm() {
+			confirms = document.getElementsByClassName('confirm');
+			for (var i = 0 ; i < confirms.length ; i++) {
+				confirms[i].addEventListener('click', ask_confirmation);
+			}
+		}
+
+		init_confirm();
+	</script>
 	<?php } elseif ($res['all'] == 'ok') { ?>
 	<a class="btn btn-important next-step" href="?step=2" tabindex="1" ><?php echo _t('install.action.next_step'); ?></a>
 	<?php } else { ?>
-- 
cgit v1.2.3


From 3c35cdd7b7e8353d10cd299e19a23e528ad51280 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Jul 2015 19:07:33 +0200
Subject: Add translations for confirmation (installation)

See https://github.com/FreshRSS/FreshRSS/issues/909
---
 app/i18n/cz/install.php | 3 +++
 app/i18n/de/install.php | 3 +++
 app/i18n/en/install.php | 3 +++
 app/i18n/fr/install.php | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index 5f84d1cac..cca717513 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -96,6 +96,9 @@ return array(
 	'delete_articles_after' => 'Smazat články starší než',
 	'fix_errors_before' => 'Chyby prosím před přechodem na další krok opravte.',
 	'javascript_is_better' => 'Práce s FreshRSS je příjemnější se zapnutým JavaScriptem',
+	'js' => array(
+		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',  // TODO: translate
+	),
 	'language' => array(
 		'_' => 'Jazyk',
 		'choose' => 'Vyberte jazyk FreshRSS',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 6d937a638..222c65b32 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -96,6 +96,9 @@ return array(
 	'delete_articles_after' => 'Entferne Artikel nach',
 	'fix_errors_before' => 'Bitte den Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
 	'javascript_is_better' => 'FreshRSS ist ansprechender mit aktiviertem JavaScript',
+	'js' => array(
+		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',  // TODO: translate
+	),
 	'language' => array(
 		'_' => 'Sprache',
 		'choose' => 'Wählen Sie eine Sprache für FreshRSS',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 80488ca4a..b94fbc299 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -96,6 +96,9 @@ return array(
 	'delete_articles_after' => 'Remove articles after',
 	'fix_errors_before' => 'Please fix errors before skipping to the next step.',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
+	'js' => array(
+		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',
+	),
 	'language' => array(
 		'_' => 'Language',
 		'choose' => 'Choose a language for FreshRSS',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 6eca90458..0401e1bbd 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -96,6 +96,9 @@ return array(
 	'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é',
+	'js' => array(
+		'confirm_reinstall' => 'Réinstaller FreshRSS vous fera perdre la configuration précédente. Êtes-vous sûr de vouloir continuer ?',
+	),
 	'language' => array(
 		'_' => 'Langue',
 		'choose' => 'Choisissez la langue pour FreshRSS',
-- 
cgit v1.2.3


From fa76e863c5622609b944542b0255c30f2f67c97e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 21 Jul 2015 14:26:15 +0200
Subject: Fix link for step 4 (install)

Fix https://github.com/FreshRSS/FreshRSS/issues/912
---
 app/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/install.php b/app/install.php
index ebd785f65..d5455f17d 100644
--- a/app/install.php
+++ b/app/install.php
@@ -925,7 +925,7 @@ case 5:
 		<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>
+		<li class="item<?php echo STEP == 4 ? ' active' : ''; ?>"><a href="?step=4"><?php echo _t('install.this_is_the_end'); ?></a></li>
 	</ul>
 
 	<div class="post">
-- 
cgit v1.2.3


From ac8bd3d2512dd1bfca43d71ea10202ba9e6a82a6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 21 Jul 2015 15:31:23 +0200
Subject: Add a max_registrations limit

- Allow user to create accounts (not implemented)
- Admin only can set this limit

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 24 ++++++++++++++++++++++++
 app/Models/ConfigurationSetter.php |  3 +++
 app/views/user/manage.phtml        | 19 +++++++++++++++++++
 data/config.default.php            |  4 ++++
 4 files changed, 50 insertions(+)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index ed01b83c5..1c7745753 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -211,4 +211,28 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
+
+	/**
+	 * This action updates the max number of registrations.
+	 *
+	 * Request parameter is:
+	 *   - max-registrations (int >= 0)
+	 */
+	public function setRegistrationAction() {
+		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
+			$limits = FreshRSS_Context::$system_conf->limits;
+			$limits['max_registrations'] = Minz_Request::param('max-registrations', 1);
+			FreshRSS_Context::$system_conf->limits = $limits;
+			FreshRSS_Context::$system_conf->save();
+
+			invalidateHttpCache();
+
+			Minz_Session::_param('notification', array(
+				'type' => 'good',
+				'content' => _t('feedback.user.set_registration')
+			));
+		}
+
+		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
+	}
 }
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 4bd29ecb0..236bf5b0b 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -352,6 +352,9 @@ class FreshRSS_ConfigurationSetter {
 				'min' => 0,
 				'max' => $max_small_int,
 			),
+			'max_registrations' => array(
+				'min' => 0,
+			),
 		);
 
 		foreach ($values as $key => $value) {
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index fe1b6618b..a7cbf0795 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -3,6 +3,25 @@
 <div class="post">
 	<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', 'setRegistration'); ?>">
+		<legend><?php echo _t('admin.user.registration.allow'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="max-registrations"><?php echo _t('admin.user.registration.number'); ?></label>
+			<div class="group-controls">
+				<input type="number" id="max-registrations" name="max-registrations" value="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>" min="0" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>"/>
+				<?php echo _i('help'); ?> <?php echo _t('admin.user.registration.help'); ?>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<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('user', 'create'); ?>">
 		<legend><?php echo _t('admin.user.create'); ?></legend>
 
diff --git a/data/config.default.php b/data/config.default.php
index 6013b13b8..5db933ff8 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -77,6 +77,10 @@ return array(
 		# Max number of categories for a user.
 		'max_categories' => 16384,
 
+		# Max number of accounts that anonymous users can create
+		#   0 for an unlimited number of accounts
+		#   1 is to not allow user registrations (1 is corresponding to the admin account)
+		'max_registrations' => 1,
 	),
 
 	# Options used by cURL when making HTTP requests, e.g. when the SimplePie library retrieves feeds.
-- 
cgit v1.2.3


From 37f06799589d9bb92ecfa6368197daf187251ab4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 21 Jul 2015 16:03:46 +0200
Subject: First draft for registration form

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php |  6 ++++++
 app/views/auth/formLogin.phtml     |  2 ++
 app/views/auth/register.phtml      | 31 +++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 app/views/auth/register.phtml

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index b55892475..1c8ad2193 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -346,4 +346,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			}
 		}
 	}
+
+	/**
+	 * This action gives possibility to a user to create an account.
+	 */
+	public function registerAction() {
+	}
 }
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 979e17349..75537ee26 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -1,6 +1,8 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
+	<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
 			<label for="username"><?php echo _t('gen.auth.username'); ?></label>
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
new file mode 100644
index 000000000..f67ecc4d9
--- /dev/null
+++ b/app/views/auth/register.phtml
@@ -0,0 +1,31 @@
+<div class="prompt">
+    <h1><?php echo _t('gen.auth.register'); ?></h1>
+
+    <form method="post" action="<?php echo _url('user', 'create'); ?>">
+        <div>
+            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'); ?></label>
+            <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}" />
+        </div>
+
+        <div>
+            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+            <div class="stick">
+                <input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" required="required" autocomplete="off" pattern=".{7,}" />
+                <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>
+
+        <div>
+            <label class="group-name" for="new_user_email"><?php echo _t('gen.auth.email'); ?></label>
+            <input type="email" id="new_user_email" name="new_user_email" class="extend" required="required" autocomplete="off" />
+        </div>
+
+        <div>
+            <button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
+            <a class="btn" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.cancel'); ?></a>
+        </div>
+    </form>
+
+    <p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
+</div>
-- 
cgit v1.2.3


From 9fca5c70f33291cacc04e7bdfa01a12c6df3f97c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 12:20:00 +0200
Subject: Add some comments

---
 app/Controllers/userController.php | 19 +++++++++++++++++++
 app/views/auth/register.phtml      |  7 +++++++
 2 files changed, 26 insertions(+)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 1c7745753..c198d1328 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -103,6 +103,17 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		$this->view->size_user = $entryDAO->size();
 	}
 
+	/**
+	 * This action creates a new user.
+	 *
+	 * Request parameters are:
+	 *   - new_user_language
+	 *   - new_user_name
+	 *   - new_user_passwordPlain
+	 *   - new_user_email
+	 *
+	 * @todo clean up this method. Idea: write a method to init a user with basic information.
+	 */
 	public function createAction() {
 		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
 			$db = FreshRSS_Context::$system_conf->db;
@@ -178,6 +189,14 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
 
+	/**
+	 * This action delete an existing user.
+	 *
+	 * Request parameter is:
+	 *   - username
+	 *
+	 * @todo clean up this method. Idea: create a User->clean() method.
+	 */
 	public function deleteAction() {
 		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
 			$db = FreshRSS_Context::$system_conf->db;
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index f67ecc4d9..31ab89d26 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -1,3 +1,10 @@
+<?php
+    /* TODO list
+     *   - Show help for username and password formats
+     *   - Don't show this page if there is no more free account slots
+     *   - Fix i18n
+    */
+?>
 <div class="prompt">
     <h1><?php echo _t('gen.auth.register'); ?></h1>
 
-- 
cgit v1.2.3


From 02c3546440f961018adc1e2c8e97c16f2aca18fc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 13:52:03 +0200
Subject: Registration action is handled and create a user

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 20 +++++++++++++++++---
 app/views/auth/register.phtml      |  7 +++++++
 lib/lib_rss.php                    | 16 ++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index c198d1328..46f4f434d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -12,9 +12,14 @@ class FreshRSS_user_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 clean up the access condition.
 	 */
 	public function firstAction() {
-		if (!FreshRSS_Auth::hasAccess()) {
+		if (!FreshRSS_Auth::hasAccess() && !(
+				Minz_Request::actionName() === 'create' &&
+				!max_registrations_reached()
+		)) {
 			Minz_Error::error(403);
 		}
 	}
@@ -111,11 +116,16 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 *   - new_user_name
 	 *   - new_user_passwordPlain
 	 *   - new_user_email
+	 *   - r (i.e. a redirection url, optional)
 	 *
 	 * @todo clean up this method. Idea: write a method to init a user with basic information.
+	 * @todo handle r redirection in Minz_Request::forward directly?
 	 */
 	public function createAction() {
-		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
+		if (Minz_Request::isPost() && (
+				FreshRSS_Auth::hasAccess('admin') ||
+				!max_registrations_reached()
+		)) {
 			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
@@ -186,7 +196,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 		}
 
-		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
+		$redirect_url = urldecode(Minz_Request::param('r', false, true));
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'user', 'a' => 'manage');
+		}
+		Minz_Request::forward($redirect_url, true);
 	}
 
 	/**
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index 31ab89d26..96c91f411 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -29,6 +29,13 @@
         </div>
 
         <div>
+            <?php
+                $redirect_url = urlencode(Minz_Url::display(
+                    array('c' => 'index', 'a' => 'index'),
+                    'php', true
+                ));
+            ?>
+            <input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
             <button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
             <a class="btn" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.cancel'); ?></a>
         </div>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 0118e0f46..c99e2c7e8 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -266,6 +266,22 @@ function listUsers() {
 }
 
 
+/**
+ * Return if the maximum number of registrations has been reached.
+ *
+ * Note a max_regstrations of 0 means there is no limit.
+ *
+ * @return true if number of users >= max registrations, false else.
+ */
+function max_registrations_reached() {
+	$system_conf = Minz_Configuration::get('system');
+	$limit_registrations = $system_conf->limits['max_registrations'];
+	$number_accounts = count(listUsers());
+
+	return $limit_registrations > 0 && $number_accounts >= $limit_registrations;
+}
+
+
 /**
  * Register and return the configuration for a given user.
  *
-- 
cgit v1.2.3


From f560c44a003ca69644f8e7262dca2f8f7e6932d5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 14:00:08 +0200
Subject: Hide registration form if max registration reached

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 3 +++
 app/views/auth/formLogin.phtml     | 4 +++-
 app/views/auth/personaLogin.phtml  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 1c8ad2193..223282afb 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -351,5 +351,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	 * This action gives possibility to a user to create an account.
 	 */
 	public function registerAction() {
+		if (max_registrations_reached()) {
+			Minz_Error::error(403);
+		}
 	}
 }
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 75537ee26..3a6053065 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -1,7 +1,9 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
-	<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php if (!max_registrations_reached()) { ?>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php } ?>
 
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
index 545ed2eac..91349a67e 100644
--- a/app/views/auth/personaLogin.phtml
+++ b/app/views/auth/personaLogin.phtml
@@ -2,6 +2,10 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
+	<?php if (!max_registrations_reached()) { ?>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php } ?>
+
 	<p>
 		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
 			<?php echo _i('login'); ?> <?php echo _t('gen.auth.login_persona'); ?>
-- 
cgit v1.2.3


From 8754347a586ff595553bf00f8e70f96706760956 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 14:02:38 +0200
Subject: Show the number of accounts in admin

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/views/user/manage.phtml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index a7cbf0795..61b296528 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -14,6 +14,12 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<?php echo _t('admin.user.number', count(listUsers())); ?>
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
-- 
cgit v1.2.3


From 3a929138b000a45f57b3a6c62d5cfa72b842538c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 14:22:26 +0200
Subject: Give possibility to delete its own account

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 17 ++++++++++++++---
 app/views/user/profile.phtml       | 22 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 46f4f434d..cebfcd5ec 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -212,11 +212,15 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 * @todo clean up this method. Idea: create a User->clean() method.
 	 */
 	public function deleteAction() {
-		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
+		$username = Minz_Request::param('username');
+
+		if (Minz_Request::isPost() && (
+				FreshRSS_Auth::hasAccess('admin') ||
+				Minz_Session::param('currentUser', '_') === $username
+		)) {
 			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
-			$username = Minz_Request::param('username');
 			$ok = ctype_alnum($username);
 			$user_data = join_path(DATA_PATH, 'users', $username);
 
@@ -234,6 +238,9 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				//TODO: delete Persona file
 			}
 			invalidateHttpCache();
+			if (Minz_Session::param('currentUser', '_') === $username) {
+				FreshRSS_Auth::removeAccess();
+			}
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
@@ -242,7 +249,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 		}
 
-		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
+		$redirect_url = urldecode(Minz_Request::param('r', false, true));
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'user', 'a' => 'manage');
+		}
+		Minz_Request::forward($redirect_url, true);
 	}
 
 	/**
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index c44202edd..11097e546 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -57,4 +57,26 @@
 			</div>
 		</div>
 	</form>
+
+	<?php if (!FreshRSS_Auth::hasAccess('admin')) { ?>
+	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+		<legend><?php echo _t('conf.profile.delete'); ?></legend>
+
+		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('conf.profile.delete.warn'); ?></p>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<?php
+					$redirect_url = urlencode(Minz_Url::display(
+						array('c' => 'index', 'a' => 'index'),
+						'php', true
+					));
+				?>
+				<input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
+				<input type="hidden" name="username" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('gen.action.remove'); ?></button>
+			</div>
+		</div>
+	</form>
+	<?php } ?>
 </div>
-- 
cgit v1.2.3


From de2e221aca0639c45cfe30f049ec71a493b17a5c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 22:04:33 +0200
Subject: Fix translations

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/i18n/cz/admin.php             | 7 +++++++
 app/i18n/cz/conf.php              | 4 ++++
 app/i18n/cz/gen.php               | 5 +++++
 app/i18n/de/admin.php             | 7 +++++++
 app/i18n/de/conf.php              | 4 ++++
 app/i18n/de/gen.php               | 5 +++++
 app/i18n/en/admin.php             | 7 +++++++
 app/i18n/en/conf.php              | 4 ++++
 app/i18n/en/gen.php               | 5 +++++
 app/i18n/fr/admin.php             | 7 +++++++
 app/i18n/fr/conf.php              | 4 ++++
 app/i18n/fr/gen.php               | 5 +++++
 app/views/auth/formLogin.phtml    | 2 +-
 app/views/auth/personaLogin.phtml | 2 +-
 app/views/auth/register.phtml     | 4 +---
 app/views/user/manage.phtml       | 5 ++++-
 16 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index b9ef707cf..bfa67573e 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -160,8 +160,15 @@ return array(
 		'create' => 'Vytvořit nového uživatele',
 		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Jazyk',
+		'number' => 'There is %d account created yet',  // TODO: translate
+		'numbers' => 'There are %d accounts created yet',  // TODO: translate
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
+		'registration' => array(
+			'allow' => 'Allow account creation',  // TODO: translate
+			'help' => '0 means that there is no account limit',  // TODO: translate
+			'number' => 'Max number of accounts',  // TODO: translate
+		),
 		'title' => 'Správa uživatelů',
 		'user_list' => 'Seznam uživatelů',
 		'username' => 'Přihlašovací jméno',
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 9518df66d..859eeac89 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -72,6 +72,10 @@ return array(
 	),
 	'profile' => array(
 		'_' => 'Správa profilu',
+		'delete' => array(
+			'_' => 'Account deletion',  // TODO: translate
+			'warn' => 'Your account and all the related data will be deleted.',  // TODO: translate
+		),
 		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Password API<br /><small>(tzn. pro mobilní aplikace)</small>',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 7c333a9c8..13e0db261 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -21,12 +21,17 @@ return array(
 		'truncate' => 'Smazat všechny články',
 	),
 	'auth' => array(
+		'email' => 'Email',
 		'keep_logged_in' => 'Zapamatovat přihlášení <small>(1 měsíc)</small>',
 		'login' => 'Login',
 		'login_persona' => 'Přihlášení pomocí Persona',
 		'login_persona_problem' => 'Problém s připojením k Persona?',
 		'logout' => 'Odhlášení',
 		'password' => 'Heslo',
+		'registration' => array(
+			'_' => 'New account',  // TODO: translate
+			'ask' => 'Create an account?',  // TODO: translate
+		),
 		'reset' => 'Reset přihlášení',
 		'username' => 'Uživatel',
 		'username_admin' => 'Název administrátorského účtu',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index c0cbf6787..667f7af8d 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -160,8 +160,15 @@ return array(
 		'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',
+		'number' => 'There is %d account created yet',  // TODO: translate
+		'numbers' => 'There are %d accounts created yet',  // TODO: translate
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
 		'password_format' => 'mindestens 7 Zeichen',
+		'registration' => array(
+			'allow' => 'Allow account creation',  // TODO: translate
+			'help' => '0 means that there is no account limit',  // TODO: translate
+			'number' => 'Max number of accounts',  // TODO: translate
+		),
 		'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 4a0a77ddd..5313ec3fd 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -72,6 +72,10 @@ return array(
 	),
 	'profile' => array(
 		'_' => 'Profil-Verwaltung',
+		'delete' => array(
+			'_' => 'Account deletion',  // TODO: translate
+			'warn' => 'Your account and all the related data will be deleted.',  // TODO: translate
+		),
 		'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>',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index f24a52c2e..9682a4a21 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -21,12 +21,17 @@ return array(
 		'truncate' => 'Alle Artikel löschen',
 	),
 	'auth' => array(
+		'email' => 'E-Mail-Adresse',
 		'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',
+		'registration' => array(
+			'_' => 'New account',  // TODO: translate
+			'ask' => 'Create an account?',  // TODO: translate
+		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => 'Nutzername',
 		'username_admin' => 'Administrator-Nutzername',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 155384afd..aeea61631 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -160,8 +160,15 @@ return array(
 		'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',
+		'number' => 'There is %d account created yet',
+		'numbers' => 'There are %d accounts created yet',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',
+		'registration' => array(
+			'allow' => 'Allow account creation',
+			'help' => '0 means that there is no account limit',
+			'number' => 'Max number of accounts',
+		),
 		'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 42a06906d..69162932f 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -72,6 +72,10 @@ return array(
 	),
 	'profile' => array(
 		'_' => 'Profile management',
+		'delete' => array(
+			'_' => 'Account deletion',
+			'warn' => 'Your account and all the related data will be deleted.',
+		),
 		'email_persona' => 'Login email 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>',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 6e47e0921..ac55a1a3b 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -21,12 +21,17 @@ return array(
 		'truncate' => 'Delete all articles',
 	),
 	'auth' => array(
+		'email' => 'Email address',
 		'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',
+		'registration' => array(
+			'_' => 'New account',
+			'ask' => 'Create an account?',
+		),
 		'reset' => 'Authentication reset',
 		'username' => 'Username',
 		'username_admin' => 'Administrator username',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index b740bd0d2..01e0cb3c7 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -160,8 +160,15 @@ return array(
 		'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',
+		'number' => '%d compte a déjà été créé',
+		'numbers' => '%d comptes ont déjà été créés',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 		'password_format' => '7 caractères minimum',
+		'registration' => array(
+			'allow' => 'Autoriser la création de comptes',
+			'help' => 'Un chiffre de 0 signifie que l’on peut créer un nombre infini de comptes',
+			'number' => 'Nombre max de comptes',
+		),
 		'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 87f9be290..6193b7a01 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -72,6 +72,10 @@ return array(
 	),
 	'profile' => array(
 		'_' => 'Gestion du profil',
+		'delete' => array(
+			'_' => 'Suppression du compte',
+			'warn' => 'Le compte et toutes les données associées vont être supprimées.',
+		),
 		'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>',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index c81e57bf7..3336b6a03 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -21,12 +21,17 @@ return array(
 		'truncate' => 'Supprimer tous les articles',
 	),
 	'auth' => array(
+		'email' => 'Adresse courriel',
 		'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',
+		'registration' => array(
+			'_' => 'Nouveau compte',
+			'ask' => 'Créer un compte ?',
+		),
 		'reset' => 'Réinitialisation de l’authentification',
 		'username' => 'Nom d’utilisateur',
 		'username_admin' => 'Nom d’utilisateur administrateur',
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 3a6053065..b0083944f 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -2,7 +2,7 @@
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
 	<?php if (!max_registrations_reached()) { ?>
-		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.registration.ask'); ?></a>
 	<?php } ?>
 
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
index 91349a67e..c6d738bf6 100644
--- a/app/views/auth/personaLogin.phtml
+++ b/app/views/auth/personaLogin.phtml
@@ -3,7 +3,7 @@
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
 	<?php if (!max_registrations_reached()) { ?>
-		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.registration.ask'); ?></a>
 	<?php } ?>
 
 	<p>
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index 96c91f411..ada654b15 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -1,12 +1,10 @@
 <?php
     /* TODO list
      *   - Show help for username and password formats
-     *   - Don't show this page if there is no more free account slots
-     *   - Fix i18n
     */
 ?>
 <div class="prompt">
-    <h1><?php echo _t('gen.auth.register'); ?></h1>
+    <h1><?php echo _t('gen.auth.registration'); ?></h1>
 
     <form method="post" action="<?php echo _url('user', 'create'); ?>">
         <div>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 61b296528..3d3bc3ddf 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -16,7 +16,10 @@
 
 		<div class="form-group">
 			<div class="group-controls">
-				<?php echo _t('admin.user.number', count(listUsers())); ?>
+				<?php
+					$number = count(listUsers());
+					echo _t($number > 1 ? 'admin.user.numbers' : 'admin.user.number', $number);
+				?>
 			</div>
 		</div>
 
-- 
cgit v1.2.3


From 669c41114f60a5a31253bed766f52e1840e00599 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 22:28:21 +0200
Subject: Show indications for username and password formats

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/i18n/cz/gen.php           | 12 +++++++++---
 app/i18n/de/gen.php           | 12 +++++++++---
 app/i18n/en/gen.php           | 12 +++++++++---
 app/i18n/fr/gen.php           | 12 +++++++++---
 app/views/auth/register.phtml |  9 ++-------
 app/views/auth/reset.phtml    |  2 +-
 6 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 13e0db261..a89bf6b49 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Přihlášení pomocí Persona',
 		'login_persona_problem' => 'Problém s připojením k Persona?',
 		'logout' => 'Odhlášení',
-		'password' => 'Heslo',
+		'password' =>  array(
+			'_' => 'Heslo',
+			'format' => '<small>Alespoň 7 znaků</small>',
+		),
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
 		),
 		'reset' => 'Reset přihlášení',
-		'username' => 'Uživatel',
-		'username_admin' => 'Název administrátorského účtu',
+		'username' => array(
+			'_' => 'Uživatel',
+			'admin' => 'Název administrátorského účtu',
+			'format' => '<small>maximálně 16 alfanumerických znaků</small>',
+		),
 		'will_reset' => 'Přihlašovací systém bude vyresetován: místo sytému Persona bude použito přihlášení formulářem.',
 	),
 	'date' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 9682a4a21..d6fcfe1e4 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Anmelden mit Persona',
 		'login_persona_problem' => 'Verbindungsproblem mit Persona?',
 		'logout' => 'Abmelden',
-		'password' => 'Passwort',
+		'password' => array(
+			'_' => 'Passwort',
+			'format' => '<small>mindestens 7 Zeichen</small>',
+		),
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
-		'username' => 'Nutzername',
-		'username_admin' => 'Administrator-Nutzername',
+		'username' => array(
+			'_' => 'Nutzername',
+			'admin' => 'Administrator-Nutzername',
+			'format' => '<small>maximal 16 alphanumerische Zeichen</small>',
+		),
 		'will_reset' => 'Authentifikationssystem wird zurückgesetzt: ein Formular wird anstelle von Persona benutzt.',
 	),
 	'date' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index ac55a1a3b..063322cbf 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Login with Persona',
 		'login_persona_problem' => 'Connection problem with Persona?',
 		'logout' => 'Logout',
-		'password' => 'Password',
+		'password' => array(
+			'_' => 'Password',
+			'format' => '<small>At least 7 characters</small>',
+		),
 		'registration' => array(
 			'_' => 'New account',
 			'ask' => 'Create an account?',
 		),
 		'reset' => 'Authentication reset',
-		'username' => 'Username',
-		'username_admin' => 'Administrator username',
+		'username' => array(
+			'_' => 'Username',
+			'admin' => 'Administrator username',
+			'format' => '<small>maximum 16 alphanumeric characters</small>',
+		),
 		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	),
 	'date' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 3336b6a03..5abc7a27b 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Connexion avec Persona',
 		'login_persona_problem' => 'Problème de connexion à Persona ?',
 		'logout' => 'Déconnexion',
-		'password' => 'Mot de passe',
+		'password' => array(
+			'_' => 'Mot de passe',
+			'format' => '<small>7 caractères minimum</small>',
+		),
 		'registration' => array(
 			'_' => 'Nouveau compte',
 			'ask' => 'Créer un compte ?',
 		),
 		'reset' => 'Réinitialisation de l’authentification',
-		'username' => 'Nom d’utilisateur',
-		'username_admin' => 'Nom d’utilisateur administrateur',
+		'username' => array(
+			'_' => 'Nom d’utilisateur',
+			'admin' => 'Nom d’utilisateur administrateur',
+			'format' => '<small>16 caractères alphanumériques maximum</small>',
+		),
 		'will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
 	),
 	'date' => array(
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index ada654b15..306679601 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -1,19 +1,14 @@
-<?php
-    /* TODO list
-     *   - Show help for username and password formats
-    */
-?>
 <div class="prompt">
     <h1><?php echo _t('gen.auth.registration'); ?></h1>
 
     <form method="post" action="<?php echo _url('user', 'create'); ?>">
         <div>
-            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'); ?></label>
+            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'), '<br />', _i('help'), ' ', _t('gen.auth.username.format'); ?></label>
             <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}" />
         </div>
 
         <div>
-            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'), '<br />', _i('help'), ' ', _t('gen.auth.password.format'); ?></label>
             <div class="stick">
                 <input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" required="required" autocomplete="off" pattern=".{7,}" />
                 <a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
diff --git a/app/views/auth/reset.phtml b/app/views/auth/reset.phtml
index 6e9816ad3..9c820c7c8 100644
--- a/app/views/auth/reset.phtml
+++ b/app/views/auth/reset.phtml
@@ -16,7 +16,7 @@
 		</p>
 
 		<div>
-			<label for="username"><?php echo _t('gen.auth.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>
-- 
cgit v1.2.3


From 8751c344f384e19dd2fd2f0b5607ecc2aac58541 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 22:58:00 +0200
Subject: Ask password to user before deleting its account

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 37 +++++++++++++++++++++++++++----------
 app/views/user/profile.phtml       | 21 +++++++++++++++------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index cebfcd5ec..428cd145d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -30,13 +30,17 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	public function profileAction() {
 		Minz_View::prependTitle(_t('conf.profile.title') . ' · ');
 
+		Minz_View::appendScript(Minz_Url::display(
+			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
+		));
+
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
-			$passwordPlain = Minz_Request::param('passwordPlain', '', true);
+			$passwordPlain = Minz_Request::param('newPasswordPlain', '', true);
 			if ($passwordPlain != '') {
-				Minz_Request::_param('passwordPlain');	//Discard plain-text password ASAP
-				$_POST['passwordPlain'] = '';
+				Minz_Request::_param('newPasswordPlain');	//Discard plain-text password ASAP
+				$_POST['newPasswordPlain'] = '';
 				if (!function_exists('password_hash')) {
 					include_once(LIB_PATH . '/password_compat.php');
 				}
@@ -213,10 +217,16 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 */
 	public function deleteAction() {
 		$username = Minz_Request::param('username');
+		$redirect_url = urldecode(Minz_Request::param('r', false, true));
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'user', 'a' => 'manage');
+		}
+
+		$self_deletion = Minz_Session::param('currentUser', '_') === $username;
 
 		if (Minz_Request::isPost() && (
 				FreshRSS_Auth::hasAccess('admin') ||
-				Minz_Session::param('currentUser', '_') === $username
+				$self_deletion
 		)) {
 			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
@@ -228,6 +238,16 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$default_user = FreshRSS_Context::$system_conf->default_user;
 				$ok &= (strcasecmp($username, $default_user) !== 0);	//It is forbidden to delete the default user
 			}
+			if ($ok && $self_deletion) {
+				// We check the password if it's a self-destruction
+				$nonce = Minz_Session::param('nonce');
+				$challenge = Minz_Request::param('challenge', '');
+
+				$ok &= FreshRSS_FormAuth::checkCredentials(
+					$username, FreshRSS_Context::$user_conf->passwordHash,
+					$nonce, $challenge
+				);
+			}
 			if ($ok) {
 				$ok &= is_dir($user_data);
 			}
@@ -237,10 +257,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$ok &= recursive_unlink($user_data);
 				//TODO: delete Persona file
 			}
-			invalidateHttpCache();
-			if (Minz_Session::param('currentUser', '_') === $username) {
+			if ($ok && $self_deletion) {
 				FreshRSS_Auth::removeAccess();
+				$redirect_url = array('c' => 'index', 'a' => 'index');
 			}
+			invalidateHttpCache();
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
@@ -249,10 +270,6 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 		}
 
-		$redirect_url = urldecode(Minz_Request::param('r', false, true));
-		if (!$redirect_url) {
-			$redirect_url = array('c' => 'user', 'a' => 'manage');
-		}
 		Minz_Request::forward($redirect_url, true);
 	}
 
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 11097e546..7ae2c7ede 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -18,11 +18,11 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo _t('conf.profile.password_form'); ?></label>
+			<label class="group-name" for="newPasswordPlain"><?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" data-toggle="passwordPlain"><?php echo _i('key'); ?></a>
+					<input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
+					<a class="btn toggle-password" data-toggle="newPasswordPlain"><?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>
@@ -59,21 +59,30 @@
 	</form>
 
 	<?php if (!FreshRSS_Auth::hasAccess('admin')) { ?>
-	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+	<form id="crypto-form" method="post" action="<?php echo _url('user', 'delete'); ?>">
 		<legend><?php echo _t('conf.profile.delete'); ?></legend>
 
 		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('conf.profile.delete.warn'); ?></p>
 
+		<div class="form-group">
+			<label class="group-name" for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+			<div class="group-controls">
+					<input type="password" id="passwordPlain" required="required" />
+					<input type="hidden" id="challenge" name="challenge" /><br />
+					<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<?php
 					$redirect_url = urlencode(Minz_Url::display(
-						array('c' => 'index', 'a' => 'index'),
+						array('c' => 'user', 'a' => 'profile'),
 						'php', true
 					));
 				?>
 				<input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
-				<input type="hidden" name="username" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
+				<input type="hidden" name="username" id="username" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
 				<button type="submit" class="btn btn-attention confirm"><?php echo _t('gen.action.remove'); ?></button>
 			</div>
 		</div>
-- 
cgit v1.2.3


From f0a1b26584787e173c8c9cd1a5fea27bb3044f1c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 23:06:46 +0200
Subject: Add title to the account creation page

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 2 ++
 app/i18n/cz/gen.php                | 1 +
 app/i18n/de/gen.php                | 1 +
 app/i18n/en/gen.php                | 1 +
 app/i18n/fr/gen.php                | 1 +
 5 files changed, 6 insertions(+)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 223282afb..aff184263 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -354,5 +354,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (max_registrations_reached()) {
 			Minz_Error::error(403);
 		}
+
+		Minz_View::prependTitle(_t('gen.auth.registration.title') . ' · ');
 	}
 }
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index a89bf6b49..53127998f 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Reset přihlášení',
 		'username' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index d6fcfe1e4..f8f4823a6 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 063322cbf..1feb8d6ac 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',
 			'ask' => 'Create an account?',
+			'title' => 'Account creation',
 		),
 		'reset' => 'Authentication reset',
 		'username' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 5abc7a27b..67d278be4 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'Nouveau compte',
 			'ask' => 'Créer un compte ?',
+			'title' => 'Création de compte',
 		),
 		'reset' => 'Réinitialisation de l’authentification',
 		'username' => array(
-- 
cgit v1.2.3


From d6e632fc09ff391da39a42853f0eae87ef4a20f4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 23:22:50 +0200
Subject: Fix a bug in ConfigurationSetter

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

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 236bf5b0b..d7378d4d8 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -364,8 +364,8 @@ class FreshRSS_ConfigurationSetter {
 
 			$limits = $limits_keys[$key];
 			if (
-				(!isset($limits['min']) || $value > $limits['min']) &&
-				(!isset($limits['max']) || $value < $limits['max'])
+				(!isset($limits['min']) || $value >= $limits['min']) &&
+				(!isset($limits['max']) || $value <= $limits['max'])
 			) {
 				$data['limits'][$key] = $value;
 			}
-- 
cgit v1.2.3


From 1ad36c420e774d6f66b6a7ecf5b37ed1103ea464 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 23:27:22 +0200
Subject: Fix translations for feedback

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/i18n/cz/feedback.php | 1 +
 app/i18n/de/feedback.php | 1 +
 app/i18n/en/feedback.php | 1 +
 app/i18n/fr/feedback.php | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index b75a4a15a..cf2ee518c 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -102,6 +102,7 @@ return array(
 			'_' => 'Uživatel %s byl smazán',
 			'error' => 'Uživatele %s nelze smazat',
 		),
+		'set_registration' => 'The maximum amount of accounts has been updated.',  // TODO: translate
 	),
 	'profile' => array(
 		'error' => 'Váš profil nelze změnit',
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index 4c15aadc3..61a7d9d61 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -102,6 +102,7 @@ return array(
 			'_' => 'Der Benutzer %s ist gelöscht worden',
 			'error' => 'Der Benutzer %s kann nicht gelöscht werden',
 		),
+		'set_registration' => 'The maximum amount of accounts has been updated.',  // TODO: translate
 	),
 	'profile' => array(
 		'error' => 'Ihr Profil kann nicht geändert werden',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index c9189c0d0..c9f73dc1d 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -102,6 +102,7 @@ return array(
 			'_' => 'User %s has been deleted',
 			'error' => 'User %s cannot be deleted',
 		),
+		'set_registration' => 'The maximum amount of accounts has been updated.',
 	),
 	'profile' => array(
 		'error' => 'Your profile cannot be modified',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index e2364a251..99c193d28 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -102,6 +102,7 @@ return array(
 			'_' => 'L’utilisateur %s a été supprimé.',
 			'error' => 'L’utilisateur %s ne peut pas être supprimé.',
 		),
+		'set_registration' => 'Le nombre maximal de comptes a été mis à jour.',
 	),
 	'profile' => array(
 		'error' => 'Votre profil n’a pas pu être mis à jour',
-- 
cgit v1.2.3


From 6db09411968ff0eac722efde79628b501b8dbe5e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 10:05:32 +0200
Subject: Fix unexpected behaviour in getBaseUrl

- getBaseUrl() returns info from configuration only and always append
  the suffix
- add a guessBaseUrl() to extract base_url from $_SERVER info
- fix Url::display() to take this change in consideration

Fix https://github.com/FreshRSS/FreshRSS/issues/906
Use https://github.com/FreshRSS/FreshRSS/pull/910
---
 lib/Minz/Request.php | 48 ++++++++++++++++++++++++++++--------------------
 lib/Minz/Url.php     |  3 +++
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 67fbae126..059b4359c 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -85,29 +85,37 @@ class Minz_Request {
 	}
 
 	/**
-	 * Détermine la base de l'url
-	 * @return la base de l'url
+	 * Try to guess the base URL from $_SERVER information
+	 *
+	 * @return the base url (e.g. http://example.com/)
 	 */
-	public static function getBaseUrl($baseUrlSuffix = '') {
-		$conf = Minz_Configuration::get('system');
-		$url = $conf->base_url;
-		if ($url == '' || !preg_match('%^https?://%i', $url)) {
-			$url = 'http';
-			$host = empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST'];
-			$port = empty($_SERVER['SERVER_PORT']) ? 80 : $_SERVER['SERVER_PORT'];
-			if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
-				$url .= 's://' . $host . ($port == 443 ? '' : ':' . $port);
-			} else {
-				$url .= '://' . $host . ($port == 80 ? '' : ':' . $port);
-			}
-			if (isset($_SERVER['REQUEST_URI'])) {
-				$path = $_SERVER['REQUEST_URI'];
-				$url .= substr($path, -1) === '/' ? substr($path, 0, -1) : dirname($path);
-			}
+	public static function guessBaseUrl() {
+		$url = 'http';
+		$host = empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST'];
+		$port = empty($_SERVER['SERVER_PORT']) ? 80 : $_SERVER['SERVER_PORT'];
+		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+			$url .= 's://' . $host . ($port == 443 ? '' : ':' . $port);
 		} else {
-			$url = rtrim($url, '/\\') . $baseUrlSuffix;
+			$url .= '://' . $host . ($port == 80 ? '' : ':' . $port);
+		}
+		if (isset($_SERVER['REQUEST_URI'])) {
+			$path = $_SERVER['REQUEST_URI'];
+			$url .= substr($path, -1) === '/' ? substr($path, 0, -1) : dirname($path);
 		}
-		return filter_var($url . '/', FILTER_SANITIZE_URL);
+
+		return $url;
+	}
+
+	/**
+	 * Return the base_url from configuration and add a suffix if given.
+	 *
+	 * @param $base_url_suffix a string to add at base_url (default: empty string)
+	 * @return the base_url with a suffix.
+	 */
+	public static function getBaseUrl($base_url_suffix = '') {
+		$conf = Minz_Configuration::get('system');
+		$url = rtrim($conf->base_url, '/\\') . $base_url_suffix;
+		return filter_var($url, FILTER_SANITIZE_URL);
 	}
 
 	/**
diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index a2809257d..4279b045b 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -25,6 +25,9 @@ class Minz_Url {
 
 		if ($absolute) {
 			$url_string = Minz_Request::getBaseUrl(PUBLIC_TO_INDEX_PATH);
+			if ($url_string === PUBLIC_TO_INDEX_PATH) {
+				$url_string = Minz_Request::guessBaseUrl();
+			}
 		} else {
 			$url_string = $isArray ? '.' : PUBLIC_RELATIVE;
 		}
-- 
cgit v1.2.3


From 7f08c4fcd7a2113f4a0eeaea54b254ec11f0116d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 10:12:20 +0200
Subject: CHANGELOG for getBaseUrl() and guessBaseUrl()

See https://github.com/FreshRSS/FreshRSS/issues/906
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94410c38d..66920b4c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 	* Changed some log visibilities. [#885](https://github.com/FreshRSS/FreshRSS/issues/885)
 	* Fix broken links for extension script / style files. [#862](https://github.com/FreshRSS/FreshRSS/issues/862)
 	* Load default configuration during installation to avoid hard-coded values. [#890](https://github.com/FreshRSS/FreshRSS/issues/890)
+	* Fix non-consistent behaviour in Minz_Request::getBaseUrl() and introduce Minz_Request::guessBaseUrl(). [#906](https://github.com/FreshRSS/FreshRSS/issues/906)
 
 
 ## 2015-05-31 FreshRSS 1.1.1 (beta)
-- 
cgit v1.2.3


From 27666d6fc8ccc56f53c58cce01c1030648d23f48 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 10:16:34 +0200
Subject: CHANGELOG for account creation

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94410c38d..ebc5a169b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Features
 	* Support for PubSubHubbub for instant notifications from compatible Web sites. [#312](https://github.com/FreshRSS/FreshRSS/issues/312)
 	* cURL options to use a proxy for retrieving feeds. [#897](https://github.com/FreshRSS/FreshRSS/issues/897) [#675](https://github.com/FreshRSS/FreshRSS/issues/675)
+	* Allow anonymous users to create an account. [#679](https://github.com/FreshRSS/FreshRSS/issues/679)
 * Security
 	* cURL options to verify or not SSL/TLS certificates (now enabled by default). [#897](https://github.com/FreshRSS/FreshRSS/issues/897) [#502](https://github.com/FreshRSS/FreshRSS/issues/502)
 	* Support for SSL connection to MySQL. [#868](https://github.com/FreshRSS/FreshRSS/issues/868)
-- 
cgit v1.2.3


From 1e65fd687e030a24773e88a2e7fb173e8439a99a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 11:38:56 +0200
Subject: Use filter_var in guessBaseUrl

See https://github.com/FreshRSS/FreshRSS/issues/906
See https://github.com/FreshRSS/FreshRSS/pull/915/files#r35304704
---
 lib/Minz/Request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 059b4359c..bf01bc26f 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -103,7 +103,7 @@ class Minz_Request {
 			$url .= substr($path, -1) === '/' ? substr($path, 0, -1) : dirname($path);
 		}
 
-		return $url;
+		return filter_var($url, FILTER_SANITIZE_URL);
 	}
 
 	/**
-- 
cgit v1.2.3


From eaccc1eba4bf7a00a6cce26de9e4da22067fe86b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 12:24:24 +0200
Subject: Generate base_url during installation

See https://github.com/FreshRSS/FreshRSS/issues/865
---
 app/install.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/install.php b/app/install.php
index d5455f17d..3930a3d41 100644
--- a/app/install.php
+++ b/app/install.php
@@ -212,8 +212,11 @@ function saveStep3() {
 			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] . (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_'));
 		}
 
+		// We use dirname to remove the /i part
+		$base_url = dirname(Minz_Request::guessBaseUrl());
 		$config_array = array(
 			'salt' => $_SESSION['salt'],
+			'base_url' => $base_url,
 			'title' => $_SESSION['title'],
 			'default_user' => $_SESSION['default_user'],
 			'auth_type' => $_SESSION['auth_type'],
-- 
cgit v1.2.3


From 339e32424fa60fc0c99a4c10890abef139444f6d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 12:38:22 +0200
Subject: Add a simple test to detect if server is public

If the server is not accessible by an external server, pubsubhubbub should be
disable.

See https://github.com/FreshRSS/FreshRSS/issues/865
---
 app/install.php |  1 +
 lib/lib_rss.php | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/install.php b/app/install.php
index 3930a3d41..65138a683 100644
--- a/app/install.php
+++ b/app/install.php
@@ -229,6 +229,7 @@ function saveStep3() {
 				'prefix' => $_SESSION['bd_prefix'],
 				'pdo_options' => array(),
 			),
+			'enable_pubsubhubbub' => server_is_public($base_url),
 		);
 
 		@unlink(join_path(DATA_PATH, 'config.php'));	//To avoid access-rights problems
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index c99e2c7e8..2a23fca45 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -83,6 +83,33 @@ function checkUrl($url) {
 	}
 }
 
+
+/**
+ * Test if a given server address is publicly accessible.
+ *
+ * Note: for the moment it tests only if address is corresponding to a
+ * localhost address.
+ *
+ * @param $address the address to test, can be an IP or a URL.
+ * @return true if server is accessible, false else.
+ * @todo improve test with a more valid technique (e.g. test with an external server?)
+ */
+function server_is_public($address) {
+	$host = parse_url($address, PHP_URL_HOST);
+
+	$is_public = !in_array($host, array(
+		'127.0.0.1',
+		'localhost',
+		'localhost.localdomain',
+		'[::1]',
+		'localhost6',
+		'localhost6.localdomain6',
+	));
+
+	return $is_public;
+}
+
+
 function format_number($n, $precision = 0) {
 	// number_format does not seem to be Unicode-compatible
 	return str_replace(' ', ' ',  //Espace fine insécable
-- 
cgit v1.2.3


From baa36f158b59c9229e3f1a5a0edb6f1bb3a54198 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 13:54:34 +0200
Subject: Add pubsubhubbub_enabled to default configuration

Rename enable_pubsubhubbub into pubsubhubbub_enabled

See https://github.com/FreshRSS/FreshRSS/issues/865
---
 app/install.php         | 2 +-
 data/config.default.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/install.php b/app/install.php
index 65138a683..5a774d7c1 100644
--- a/app/install.php
+++ b/app/install.php
@@ -229,7 +229,7 @@ function saveStep3() {
 				'prefix' => $_SESSION['bd_prefix'],
 				'pdo_options' => array(),
 			),
-			'enable_pubsubhubbub' => server_is_public($base_url),
+			'pubsubhubbub_enabled' => server_is_public($base_url),
 		);
 
 		@unlink(join_path(DATA_PATH, 'config.php'));	//To avoid access-rights problems
diff --git a/data/config.default.php b/data/config.default.php
index 5db933ff8..a7a29b12c 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -57,6 +57,10 @@ return array(
 	#	SimplePie, which is retrieving RSS feeds via HTTP requests.
 	'simplepie_syslog_enabled' => true,
 
+	# Enable or not support of PubSubHubbub.
+	# /!\ It should NOT be enabled if base_url is not reachable by an external server.
+	'pubsubhubbub_enabled' => false,
+
 	'limits' => array(
 
 		# Duration in seconds of the SimplePie cache,
-- 
cgit v1.2.3


From f4472fc918c1fa1d1cfb2adae6c38a9a261e8c9b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 13:59:40 +0200
Subject: Do not use PubSubHubbub if disabled

See https://github.com/FreshRSS/FreshRSS/issues/865
---
 app/Controllers/feedController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 488d066a9..ec3dce777 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -295,14 +295,17 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		// Calculate date of oldest entries we accept in DB.
 		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
-		$pshbMinAge = time() - (3600 * 24);	//TODO: Make a configuration.
+
+		// PubSubHubbub support
+		$pubsubhubbubEnabledGeneral = FreshRSS_Context::$system_conf->pubsubhubbub_enabled;
+		$pshbMinAge = time() - (3600 * 24);  //TODO: Make a configuration.
 
 		$updated_feeds = 0;
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			$url = $feed->url();	//For detection of HTTP 301
 
-			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
+			$pubSubHubbubEnabled = $pubsubhubbubEnabledGeneral && $feed->pubSubHubbubEnabled();
 			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
 				$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
 				//Minz_Log::debug($text);
@@ -442,7 +445,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			$feed->faviconPrepare();
-			if ($feed->pubSubHubbubPrepare()) {
+			if ($pubsubhubbubEnabledGeneral && $feed->pubSubHubbubPrepare()) {
 				Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
 				if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
 					Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
-- 
cgit v1.2.3


From c1a44a8761778da81bde608f6d20f5decdd8b9b6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 27 Jul 2015 14:46:41 +0200
Subject: Load configuration by recursion

- Remove Minz_Configuration::$data_default
- Default values are loaded first in $data
- $data values are replaced by values from config file

Fix https://github.com/FreshRSS/FreshRSS/issues/923
---
 lib/Minz/Configuration.php | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index ab5bb4fc2..1db8e2daf 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -84,11 +84,6 @@ class Minz_Configuration {
 	 */
 	private $data = array();
 
-	/**
-	 * The default values, an empty array by default.
-	 */
-	private $data_default = array();
-
 	/**
 	 * An object which help to set good values in configuration.
 	 */
@@ -119,21 +114,22 @@ class Minz_Configuration {
 	                             $configuration_setter = null) {
 		$this->namespace = $namespace;
 		$this->config_filename = $config_filename;
+		$this->default_filename = $default_filename;
+		$this->_configurationSetter($configuration_setter);
+
+		if (!is_null($this->default_filename)) {
+			$this->data = self::load($this->default_filename);
+		}
 
 		try {
-			$this->data = self::load($this->config_filename);
+			$this->data = array_replace_recursive(
+				$this->data, self::load($this->config_filename)
+			);
 		} catch (Minz_FileNotExistException $e) {
-			if (is_null($default_filename)) {
+			if (is_null($this->default_filename)) {
 				throw $e;
 			}
 		}
-
-		$this->default_filename = $default_filename;
-		if (!is_null($this->default_filename)) {
-			$this->data_default = self::load($this->default_filename);
-		}
-
-		$this->_configurationSetter($configuration_setter);
 	}
 
 	/**
@@ -160,8 +156,6 @@ class Minz_Configuration {
 			return $this->data[$key];
 		} elseif (!is_null($default)) {
 			return $default;
-		} elseif (isset($this->data_default[$key])) {
-			return $this->data_default[$key];
 		} else {
 			Minz_Log::warning($key . ' does not exist in configuration');
 			return null;
-- 
cgit v1.2.3


From 9817743cd7fbe10e361873a0a5d6cb591c720c23 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 27 Jul 2015 14:52:13 +0200
Subject: Cast $limits values in int (config)

Fix https://github.com/FreshRSS/FreshRSS/issues/925
---
 app/Models/ConfigurationSetter.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index d7378d4d8..992a3a387 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -362,6 +362,7 @@ class FreshRSS_ConfigurationSetter {
 				continue;
 			}
 
+			$value = intval($value);
 			$limits = $limits_keys[$key];
 			if (
 				(!isset($limits['min']) || $value >= $limits['min']) &&
-- 
cgit v1.2.3


From 6dbe33c51e83bbfc1e18c5bdf764411799502a99 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Jul 2015 07:59:05 +0200
Subject: Don't hide errors in configuration

Fix https://github.com/FreshRSS/FreshRSS/issues/920
---
 lib/Minz/Configuration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 1db8e2daf..d695d4a53 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -39,7 +39,7 @@ class Minz_Configuration {
 			throw new Minz_FileNotExistException($filename);
 		}
 
-		$data = @include($filename);
+		$data = include($filename);
 		if (is_array($data)) {
 			return $data;
 		} else {
-- 
cgit v1.2.3


From a58bd1aa38c0bf2a5dcca5d2bb62d19a835546ec Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Jul 2015 08:25:26 +0200
Subject: Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a9d0b73..74f4afc9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 	* Fix broken links for extension script / style files. [#862](https://github.com/FreshRSS/FreshRSS/issues/862)
 	* Load default configuration during installation to avoid hard-coded values. [#890](https://github.com/FreshRSS/FreshRSS/issues/890)
 	* Fix non-consistent behaviour in Minz_Request::getBaseUrl() and introduce Minz_Request::guessBaseUrl(). [#906](https://github.com/FreshRSS/FreshRSS/issues/906)
+	* Don't hide errors in configuration. [#920](https://github.com/FreshRSS/FreshRSS/issues/920)
 
 
 ## 2015-05-31 FreshRSS 1.1.1 (beta)
-- 
cgit v1.2.3


From 8a1e7be3ff1cb2bb792a444e00fc08b2aa7fb95d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Jul 2015 08:31:37 +0200
Subject: Update CHANGELOG

Add the last forgotten changes

- https://github.com/FreshRSS/FreshRSS/issues/865
- https://github.com/FreshRSS/FreshRSS/issues/923
- https://github.com/FreshRSS/FreshRSS/issues/925
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a9d0b73..c8356758a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2015-07-xx FreshRSS 1.1.2 (beta)
+## 2015-07-30 FreshRSS 1.1.2-beta
 
 * Features
 	* Support for PubSubHubbub for instant notifications from compatible Web sites. [#312](https://github.com/FreshRSS/FreshRSS/issues/312)
@@ -23,6 +23,9 @@
 	* Fix broken links for extension script / style files. [#862](https://github.com/FreshRSS/FreshRSS/issues/862)
 	* Load default configuration during installation to avoid hard-coded values. [#890](https://github.com/FreshRSS/FreshRSS/issues/890)
 	* Fix non-consistent behaviour in Minz_Request::getBaseUrl() and introduce Minz_Request::guessBaseUrl(). [#906](https://github.com/FreshRSS/FreshRSS/issues/906)
+	* Generate `base_url` during the installation and add a `pubsubhubbub_enabled` configuration key. [#865](https://github.com/FreshRSS/FreshRSS/issues/865)
+	* Load configuration by recursion to overwrite array values. [#923](https://github.com/FreshRSS/FreshRSS/issues/923)
+	* Cast `$limits` configuration values in integer. [#925](https://github.com/FreshRSS/FreshRSS/issues/925)
 
 
 ## 2015-05-31 FreshRSS 1.1.1 (beta)
-- 
cgit v1.2.3


From d1c1a6358072eb3ce8bd55c9f9e813aa8a7c4b5b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 29 Jul 2015 22:43:50 +0200
Subject: Add translations for German and Czech

Fix https://github.com/FreshRSS/FreshRSS/issues/930
---
 app/i18n/cz/admin.php    | 10 +++++-----
 app/i18n/cz/conf.php     |  4 ++--
 app/i18n/cz/feedback.php |  2 +-
 app/i18n/cz/gen.php      |  6 +++---
 app/i18n/cz/install.php  |  8 ++++----
 app/i18n/de/admin.php    | 10 +++++-----
 app/i18n/de/conf.php     |  4 ++--
 app/i18n/de/feedback.php |  2 +-
 app/i18n/de/gen.php      |  6 +++---
 app/i18n/de/install.php  |  8 ++++----
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index bfa67573e..4ca56cc37 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -160,14 +160,14 @@ return array(
 		'create' => 'Vytvořit nového uživatele',
 		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Jazyk',
-		'number' => 'There is %d account created yet',  // TODO: translate
-		'numbers' => 'There are %d accounts created yet',  // TODO: translate
+		'number' => 'Zatím je vytvořen %d účet',
+		'numbers' => 'Zatím je vytvořeno %d účtů',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
 		'registration' => array(
-			'allow' => 'Allow account creation',  // TODO: translate
-			'help' => '0 means that there is no account limit',  // TODO: translate
-			'number' => 'Max number of accounts',  // TODO: translate
+			'allow' => 'Povolit vytváření účtů',
+			'help' => '0 znamená žádná omezení účtu',
+			'number' => 'Maximální počet účtů',
 		),
 		'title' => 'Správa uživatelů',
 		'user_list' => 'Seznam uživatelů',
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 859eeac89..823ab1ea3 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -73,8 +73,8 @@ return array(
 	'profile' => array(
 		'_' => 'Správa profilu',
 		'delete' => array(
-			'_' => 'Account deletion',  // TODO: translate
-			'warn' => 'Your account and all the related data will be deleted.',  // TODO: translate
+			'_' => 'Smazání účtu',
+			'warn' => 'Váš účet bude smazán spolu se všemi souvisejícími daty',
 		),
 		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Password API<br /><small>(tzn. pro mobilní aplikace)</small>',
diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index cf2ee518c..5ba64b938 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -102,7 +102,7 @@ return array(
 			'_' => 'Uživatel %s byl smazán',
 			'error' => 'Uživatele %s nelze smazat',
 		),
-		'set_registration' => 'The maximum amount of accounts has been updated.',  // TODO: translate
+		'set_registration' => 'Maximální počet účtů byl změněn',
 	),
 	'profile' => array(
 		'error' => 'Váš profil nelze změnit',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 53127998f..138def772 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -32,9 +32,9 @@ return array(
 			'format' => '<small>Alespoň 7 znaků</small>',
 		),
 		'registration' => array(
-			'_' => 'New account',  // TODO: translate
-			'ask' => 'Create an account?',  // TODO: translate
-			'title' => 'Account creation',  // TODO: translate
+			'_' => 'Nový účet',
+			'ask' => 'Vytvořit účet?',
+			'title' => 'Vytvoření účtu',
 		),
 		'reset' => 'Reset přihlášení',
 		'username' => array(
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index cca717513..a8bc62909 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -4,9 +4,9 @@ return array(
 	'action' => array(
 		'finish' => 'Dokončit instalaci',
 		'fix_errors_before' => 'Chyby prosím před přechodem na další krok opravte.',
-		'keep_install' => 'Keep previous installation',  // TODO: translate
+		'keep_install' => 'Zachovat předchozí instalaci',
 		'next_step' => 'Přejít na další krok',
-		'reinstall' => 'Reinstall FreshRSS',  // TODO: translate
+		'reinstall' => 'Reinstalovat FreshRSS',
 	),
 	'auth' => array(
 		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -33,7 +33,7 @@ return array(
 	),
 	'check' => array(
 		'_' => 'Kontrola',
-		'already_installed' => 'We have detected that FreshRSS is already installed!',  // TODO: translate
+		'already_installed' => 'Zjistili jsme, že FreshRSS je již nainstalován!',
 		'cache' => array(
 			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/cache</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
 			'ok' => 'Oprávnění adresáře cache jsou v pořádku.',
@@ -97,7 +97,7 @@ return array(
 	'fix_errors_before' => 'Chyby prosím před přechodem na další krok opravte.',
 	'javascript_is_better' => 'Práce s FreshRSS je příjemnější se zapnutým JavaScriptem',
 	'js' => array(
-		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',  // TODO: translate
+		'confirm_reinstall' => 'Reinstalací FreshRSS ztratíte předchozí konfiguraci. Opravdu chcete pokračovat?',
 	),
 	'language' => array(
 		'_' => 'Jazyk',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 667f7af8d..68dcc2ebf 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -160,14 +160,14 @@ return array(
 		'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',
-		'number' => 'There is %d account created yet',  // TODO: translate
-		'numbers' => 'There are %d accounts created yet',  // TODO: translate
+		'number' => 'Es wurde bis jetzt %d Account erstellt',
+		'numbers' => 'Es wurden bis jetzt %d Accounts erstellt',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
 		'password_format' => 'mindestens 7 Zeichen',
 		'registration' => array(
-			'allow' => 'Allow account creation',  // TODO: translate
-			'help' => '0 means that there is no account limit',  // TODO: translate
-			'number' => 'Max number of accounts',  // TODO: translate
+			'allow' => 'Erlaube die Accounterstellung',
+			'help' => '0 meint, dass es kein Account Limit gibt',
+			'number' => 'Maximale Anzahl von Accounts',
 		),
 		'title' => 'Benutzer verwalten',
 		'user_list' => 'Liste der Benutzer',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 5313ec3fd..c1a762f12 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -73,8 +73,8 @@ return array(
 	'profile' => array(
 		'_' => 'Profil-Verwaltung',
 		'delete' => array(
-			'_' => 'Account deletion',  // TODO: translate
-			'warn' => 'Your account and all the related data will be deleted.',  // TODO: translate
+			'_' => 'Accountlöschung',
+			'warn' => 'Dein Account und alle damit bezogenen Daten werden gelöscht.',
 		),
 		'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>',
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index 61a7d9d61..e92dacfe9 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -102,7 +102,7 @@ return array(
 			'_' => 'Der Benutzer %s ist gelöscht worden',
 			'error' => 'Der Benutzer %s kann nicht gelöscht werden',
 		),
-		'set_registration' => 'The maximum amount of accounts has been updated.',  // TODO: translate
+		'set_registration' => 'Die maximale Anzahl von Accounts wurde aktualisiert.',
 	),
 	'profile' => array(
 		'error' => 'Ihr Profil kann nicht geändert werden',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index f8f4823a6..de2d846c5 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -32,9 +32,9 @@ return array(
 			'format' => '<small>mindestens 7 Zeichen</small>',
 		),
 		'registration' => array(
-			'_' => 'New account',  // TODO: translate
-			'ask' => 'Create an account?',  // TODO: translate
-			'title' => 'Account creation',  // TODO: translate
+			'_' => 'Neuer Account',
+			'ask' => 'Erstelle einen Account?',
+			'title' => 'Accounterstellung',
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => array(
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 222c65b32..286272e71 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -4,9 +4,9 @@ return array(
 	'action' => array(
 		'finish' => 'Installation fertigstellen',
 		'fix_errors_before' => 'Bitte Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
-		'keep_install' => 'Keep previous installation',  // TODO: translate
+		'keep_install' => 'Vorherige Installation beibehalten (Daten)',
 		'next_step' => 'Zum nächsten Schritt springen',
-		'reinstall' => 'Reinstall FreshRSS',  // TODO: translate
+		'reinstall' => 'Neuinstallation von FreshRSS',
 	),
 	'auth' => array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -33,7 +33,7 @@ return array(
 	),
 	'check' => array(
 		'_' => 'Überprüfungen',
-		'already_installed' => 'We have detected that FreshRSS is already installed!',  // TODO: translate
+		'already_installed' => 'Wir haben festgestellt, dass FreshRSS bereits installiert wurde!',
 		'cache' => array(
 			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/cache</em> sind in Ordnung.',
@@ -97,7 +97,7 @@ return array(
 	'fix_errors_before' => 'Bitte den Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
 	'javascript_is_better' => 'FreshRSS ist ansprechender mit aktiviertem JavaScript',
 	'js' => array(
-		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',  // TODO: translate
+		'confirm_reinstall' => 'Du wirst deine vorherige Konfiguration (Daten) verlieren FreshRSS. Bist du sicher, dass du fortfahren willst?',
 	),
 	'language' => array(
 		'_' => 'Sprache',
-- 
cgit v1.2.3


From f148e3938cc8daaaef1c71853594fbe142a1329e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Jul 2015 16:04:49 +0200
Subject: Version 1.1.2-beta

- Support of PubSubHubbub
- Allow anonymous users to create accounts
- Support proxy configuration
- Improvements during installation

More information in the CHANGELOG
Fix https://github.com/FreshRSS/FreshRSS/issues/919
---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index d5f0cc06b..c7cc73a5b 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.1.2-dev');
+define('FRESHRSS_VERSION', '1.1.2-beta');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
-- 
cgit v1.2.3


From e5972938b5e327f9d234ea5df8d03e885274657d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 30 Jul 2015 16:20:04 +0200
Subject: Prepare next version 1.1.3-beta

---
 CHANGELOG.md  | 5 +++++
 constants.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f50b88060..c89b52790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2015-08-31 FreshRSS 1.1.3-beta
+
+Nothing for the moment.
+
+
 ## 2015-07-30 FreshRSS 1.1.2-beta
 
 * Features
diff --git a/constants.php b/constants.php
index d5f0cc06b..dbc594fc3 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.1.2-dev');
+define('FRESHRSS_VERSION', '1.1.3-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');
-- 
cgit v1.2.3


From f7190c34e1a1ea36bbc81a7dea8dcb7a39cea7cf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Thu, 30 Jul 2015 23:42:28 +0200
Subject: Minz session cookie path bug

https://github.com/FreshRSS/FreshRSS/issues/924#issuecomment-126499403
---
 lib/Minz/Session.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 058685ada..14a093bf7 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -65,10 +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 keep only the path.
-		$cookie_dir = empty($_SERVER['SCRIPT_NAME']) ? '' : $_SERVER['SCRIPT_NAME'];
-		$cookie_dir = dirname($cookie_dir);
-		session_set_cookie_params($l, $cookie_dir, '', false, true);
+			// Get the script_name (e.g. /p/i/index.php) and keep only the path.
+			$cookie_dir = dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI']));
+			session_set_cookie_params($l, $cookie_dir, '', false, false);
 	}
 
 
-- 
cgit v1.2.3


From 59daed3d4eca6bf6260a8dc422c54f470895ac63 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 31 Jul 2015 00:12:55 +0200
Subject: Minz slight change in session cookie path

https://github.com/FreshRSS/FreshRSS/issues/924#issuecomment-126499403
---
 lib/Minz/Session.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 14a093bf7..705aae2ec 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -66,7 +66,10 @@ class Minz_Session {
 	 */
 	public static function keepCookie($l) {
 			// Get the script_name (e.g. /p/i/index.php) and keep only the path.
-			$cookie_dir = dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI']));
+			$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
+			if (substr($cookie_dir, -1) !== '/') {
+				$cookie_dir = dirname($cookie_dir) . '/';
+			}
 			session_set_cookie_params($l, $cookie_dir, '', false, false);
 	}
 
-- 
cgit v1.2.3


From 760ec5f223c4a18c8e8c8f3ecdf6b7140aa70611 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 31 Jul 2015 00:17:32 +0200
Subject: Whitespace

---
 lib/Minz/Session.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 705aae2ec..de671f173 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -65,12 +65,12 @@ 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 keep only the path.
-			$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
-			if (substr($cookie_dir, -1) !== '/') {
-				$cookie_dir = dirname($cookie_dir) . '/';
-			}
-			session_set_cookie_params($l, $cookie_dir, '', false, false);
+		// Get the script_name (e.g. /p/i/index.php) and keep only the path.
+		$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
+		if (substr($cookie_dir, -1) !== '/') {
+			$cookie_dir = dirname($cookie_dir) . '/';
+		}
+		session_set_cookie_params($l, $cookie_dir, '', false, false);
 	}
 
 
-- 
cgit v1.2.3


From 189e790f32d4e389cf1dc6da669a579717fff436 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 31 Jul 2015 11:26:57 +0200
Subject: Minz cookie session httpOnly

https://github.com/FreshRSS/FreshRSS/issues/924
https://github.com/FreshRSS/FreshRSS/pull/936/files#r35948311
---
 lib/Minz/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index de671f173..057e7746a 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -70,7 +70,7 @@ class Minz_Session {
 		if (substr($cookie_dir, -1) !== '/') {
 			$cookie_dir = dirname($cookie_dir) . '/';
 		}
-		session_set_cookie_params($l, $cookie_dir, '', false, false);
+		session_set_cookie_params($l, $cookie_dir, '', false, true);
 	}
 
 
-- 
cgit v1.2.3


From 9e43937f8c7f51c1bcd4e8009c6d1233868d5479 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Tue, 4 Aug 2015 12:36:00 +0200
Subject: PubSubHubbub prevent subscribing too often in case of error

https://github.com/FreshRSS/FreshRSS/issues/939
---
 app/Models/Feed.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index bf7ed3967..23491ee8d 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -475,7 +475,14 @@ class FreshRSS_Feed extends Minz_Model {
 				file_put_contents($hubFilename, json_encode($hubJson));
 			}
 
-			return substr($info['http_code'], 0, 1) == '2';
+			if (substr($info['http_code'], 0, 1) == '2') {
+				return true;
+			} else {
+				$hubJson['lease_start'] = time();	//Prevent trying again too soon
+				$hubJson['error'] = true;
+				file_put_contents($hubFilename, json_encode($hubJson));
+				return false;
+			}
 		}
 		return false;
 	}
-- 
cgit v1.2.3


From 390f2ce5f09b41f91f6328eb9370eb7d68839eff Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 18 Aug 2015 19:58:09 +0200
Subject: i18n: Dutch

https://github.com/FreshRSS/FreshRSS/issues/949
https://github.com/Wanabo/FreshRSS-Dutch-translation
---
 app/i18n/nl/admin.php    | 177 +++++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/nl/conf.php     | 170 +++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/nl/feedback.php | 110 +++++++++++++++++++++++++++++
 app/i18n/nl/gen.php      | 166 ++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/nl/index.php    |  61 ++++++++++++++++
 app/i18n/nl/install.php  | 107 ++++++++++++++++++++++++++++
 app/i18n/nl/sub.php      |  62 +++++++++++++++++
 7 files changed, 853 insertions(+)
 create mode 100644 app/i18n/nl/admin.php
 create mode 100644 app/i18n/nl/conf.php
 create mode 100644 app/i18n/nl/feedback.php
 create mode 100644 app/i18n/nl/gen.php
 create mode 100644 app/i18n/nl/index.php
 create mode 100644 app/i18n/nl/install.php
 create mode 100644 app/i18n/nl/sub.php

diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
new file mode 100644
index 000000000..5c6a14fda
--- /dev/null
+++ b/app/i18n/nl/admin.php
@@ -0,0 +1,177 @@
+<?php
+/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Sta bezoekers toe om artikelen te lezen van de standaard gebruiker (%s)',
+		'allow_anonymous_refresh' => 'Sta bezoekers toe om de artikelen te vernieuwen',
+		'api_enabled' => 'Sta <abbr>API</abbr> toegang toe <small>(nodig voor mobiele apps)</small>',
+		'form' => 'Web formulier (traditioneel, benodigd JavaScript)',
+		'http' => 'HTTP (voor geavanceerde gebruikers met HTTPS)',
+		'none' => 'Geen (gevaarlijk)',
+		'persona' => 'Mozilla Persona (modern, benodigd JavaScript)',
+		'title' => 'Authenticatie',
+		'title_reset' => 'Authenticatie terugzetten',
+		'token' => 'Authenticatie teken',
+		'token_help' => 'Sta toegang toe tot de RSS uitvoer van de standaard gebruiker zonder authenticatie:',
+		'type' => 'Authenticatie methode',
+		'unsafe_autologin' => 'Sta onveilige automatische log in toe met het volgende formaat: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Controleer de permissies van de <em>./data/cache</em> map. HTTP server moet rechten hebben om hierin te schrijven',
+			'ok' => 'Permissies van de cache map zijn goed.',
+		),
+		'categories' => array(
+			'nok' => 'Categorie tabel is slecht geconfigureerd.',
+			'ok' => 'Categorie tabel is ok.',
+		),
+		'connection' => array(
+			'nok' => 'Verbinding met de database kan niet worden gemaakt.',
+			'ok' => 'Verbinding met de database is ok.',
+		),
+		'ctype' => array(
+			'nok' => 'U mist de benodigde bibliotheek voor character type checking (php-ctype).',
+			'ok' => 'U hebt de benodigde bibliotheek voor character type checking (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'U mist de cURL (php5-curl package).',
+			'ok' => 'U hebt de cURL uitbreiding.',
+		),
+		'data' => array(
+			'nok' => 'Controleer de permissies op de <em>./data</em> map. HTTP server moet rechten hebben om hierin te schrijven',
+			'ok' => 'Permissies op de data map zijn goed.',
+		),
+		'database' => 'Database installatie',
+		'dom' => array(
+			'nok' => 'U mist de benodigde bibliotheek voor het bladeren van DOM (php-xml package).',
+			'ok' => 'U hebt de benodigde bibliotheek voor het bladeren van DOM.',
+		),
+		'entries' => array(
+			'nok' => 'Invoer tabel is slecht geconfigureerd.',
+			'ok' => 'Invoer tabel is ok.',
+		),
+		'favicons' => array(
+			'nok' => 'Controleer de permissies op de <em>./data/favicons</em> map. HTTP server moet rechten hebben om hierin te schrijven',
+			'ok' => 'Permissies op de favicons map zijn goed.',
+		),
+		'feeds' => array(
+			'nok' => 'Feed tabel is slecht geconfigureerd.',
+			'ok' => 'Feed tabel is ok.',
+		),
+		'files' => 'Bestanden installatie',
+		'json' => array(
+			'nok' => 'U mist JSON (php5-json package).',
+			'ok' => 'U hebt JSON uitbreiding.',
+		),
+		'minz' => array(
+			'nok' => 'U mist Minz framework.',
+			'ok' => 'U hebt Minz framework.',
+		),
+		'pcre' => array(
+			'nok' => 'U mist de benodigde bibliotheek voor regular expressions (php-pcre).',
+			'ok' => 'U hebt de benodigde bibliotheek voor regular expressions (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'U mist PDO of een van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
+			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Controleer de permissies op de <em>./data/persona</em> map. HTTP server moet rechten hebben om hierin te schrijven',
+			'ok' => 'Permissies op de Mozilla Persona map zijn goed.',
+		),
+		'php' => array(
+			'_' => 'PHP installatie',
+			'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
+			'ok' => 'Uw PHP versie is %s, welke compatibel is met FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'Er zijn één of meer ontbrekende tabellen in de database.',
+			'ok' => 'Alle tabellen zijn aanwezig in de database.',
+		),
+		'title' => 'Installatie controle',
+		'tokens' => array(
+			'nok' => 'Controleer de permissies op de <em>./data/tokens</em> map. HTTP server moet rechten hebben om hierin te schrijven',
+			'ok' => 'Permissies op de tokens map zijn goed.',
+		),
+		'users' => array(
+			'nok' => 'Controleer de permissies op de <em>./data/users</em> map. HTTP server moet rechten hebben om hierin te schrijven',
+			'ok' => 'Permissies op de users map zijn goed.',
+		),
+		'zip' => array(
+			'nok' => 'U mist ZIP uitbreiding (php5-zip package).',
+			'ok' => 'U hebt ZIP uitbreiding.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Uitgeschakeld',
+		'empty_list' => 'Er zijn geïnstalleerde uitbreidingen',
+		'enabled' => 'Ingeschakeld',
+		'no_configure_view' => 'Deze uitbreiding kan niet worden geconfigureerd.',
+		'system' => array(
+			'_' => 'Systeem uitbreidingen',
+			'no_rights' => 'Systeem uitbreidingen (U hebt hier geen rechten op)',
+		),
+		'title' => 'Uitbreidingen',
+		'user' => 'Gebruikers uitbreidingen',
+	),
+	'stats' => array(
+		'_' => 'Statistieken',
+		'all_feeds' => 'Alle feeds',
+		'category' => 'Categorie',
+		'entry_count' => 'Invoer aantallen',
+		'entry_per_category' => 'Aantallen per categorie',
+		'entry_per_day' => 'Aantallen per day (laatste 30 dagen)',
+		'entry_per_day_of_week' => 'Per dag of week (gemiddeld: %.2f berichten)',
+		'entry_per_hour' => 'Per uur (gemiddeld: %.2f berichten)',
+		'entry_per_month' => 'Per maand (gemiddeld: %.2f berichten)',
+		'entry_repartition' => 'Invoer verdeling',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds per categorie',
+		'idle' => 'Gepauzeerde feeds',
+		'main' => 'Hoofd statistieken',
+		'main_stream' => 'Overzicht',
+		'menu' => array(
+			'idle' => 'Gepauzeerde feeds',
+			'main' => 'Hoofd statistieken',
+			'repartition' => 'Artikelen verdeling',
+		),
+		'no_idle' => 'Er is geen gepauzeerde feed!',
+		'number_entries' => '%d artikelen',
+		'percent_of_total' => '%% van totaal',
+		'repartition' => 'Artikelen verdeling',
+		'status_favorites' => 'Favorieten',
+		'status_read' => 'Gelezen',
+		'status_total' => 'Totaal',
+		'status_unread' => 'Ongelezen',
+		'title' => 'Statistieken',
+		'top_feed' => 'Top tien feeds',
+	),
+	'update' => array(
+		'_' => 'Versie controle',
+		'apply' => 'Toepassen',
+		'check' => 'Controleer op nieuwe versies',
+		'current_version' => 'Uw huidige versie van FreshRSS is %s.',
+		'last' => 'Laatste controle: %s',
+		'none' => 'Geen nieuwe versie om toe te passen',
+		'title' => 'Vernieuw systeem',
+	),
+	'user' => array(
+		'articles_and_size' => '%s artikelen (%s)',
+		'create' => 'Creëer  nieuwe gebruiker',
+		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Taal',
+		'number' => 'Er is %d accounts gemaakt',
+		'numbers' => 'Er zijn %d accounts gemaakt',
+		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
+		'password_format' => 'Ten minste 7 tekens',
+		'registration' => array(
+			'allow' => 'Sta het maken van nieuwe accounts toe',
+			'help' => '0 betekent dat er geen account limiet is',
+			'number' => 'Max aantal van accounts',
+		),
+		'title' => 'Beheer gebruikers',
+		'user_list' => 'Lijst van gebruikers ',
+		'username' => 'Gebruikers naam',
+		'users' => 'Gebruikers',
+	),
+);
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
new file mode 100644
index 000000000..16ad336a9
--- /dev/null
+++ b/app/i18n/nl/conf.php
@@ -0,0 +1,170 @@
+<?php
+/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+return array(
+	'archiving' => array(
+		'_' => 'Archivering',
+		'advanced' => 'Geavanceerd',
+		'delete_after' => 'Verwijder artikelen na',
+		'help' => 'Meer opties zijn beschikbaar in de persoonlijke stroom instellingen',
+		'keep_history_by_feed' => 'Minimum aantal te behouden artikelen in de feed',
+		'optimize' => 'Optimaliseer database',
+		'optimize_help' => 'Doe dit zo af en toe om de omvang van de database te verkleinen',
+		'purge_now' => 'Schoon nu op',
+		'title' => 'Archivering',
+		'ttl' => 'Vernieuw niet automatisch meer dan',
+	),
+	'display' => array(
+		'_' => 'Opmaak',
+		'icon' => array(
+			'bottom_line' => 'Onderaan',
+			'entry' => 'Artikel pictogrammen',
+			'publication_date' => 'Publicatie datum',
+			'related_tags' => 'Gerelateerde labels',
+			'sharing' => 'Delen',
+			'top_line' => 'Bovenaan',
+		),
+		'language' => 'Taal',
+		'notif_html5' => array(
+			'seconds' => 'seconden (0 betekent geen stop)',
+			'timeout' => 'HTML5 notificatie stop',
+		),
+		'theme' => 'Thema',
+		'title' => 'Opmaak',
+		'width' => array(
+			'content' => 'Content width',
+			'large' => 'Breed',
+			'medium' => 'Normaal',
+			'no_limit' => 'Geen limiet',
+			'thin' => 'Smal',
+		),
+	),
+	'query' => array(
+		'_' => 'Gebruikers queries (informatie aanvragen)',
+		'deprecated' => 'Deze query (informatie aanvraag) is niet langer geldig. De bedoelde categorie of feed is al verwijderd.',
+		'filter' => 'Filter toegepast:',
+		'get_all' => 'Toon alle artikelen',
+		'get_category' => 'Toon "%s" categorie',
+		'get_favorite' => 'Toon favoriete artikelen',
+		'get_feed' => 'Toon "%s" feed',
+		'no_filter' => 'Geen filter',
+		'none' => 'U hebt nog geen gebruikers query aangemaakt..',
+		'number' => 'Query n°%d',
+		'order_asc' => 'Toon oudste artikelen eerst',
+		'order_desc' => 'Toon nieuwste artikelen eerst',
+		'search' => 'Zoek naar "%s"',
+		'state_0' => 'Toon alle artikelen',
+		'state_1' => 'Toon gelezen artikelen',
+		'state_2' => 'Toon ongelezen artikelen',
+		'state_3' => 'Toon alle artikelen',
+		'state_4' => 'Toon favoriete artikelen',
+		'state_5' => 'Toon gelezen favoriete artikelen',
+		'state_6' => 'Toon ongelezen favoriete artikelen',
+		'state_7' => 'Toon favoriete artikelen',
+		'state_8' => 'Toon niet favoriete artikelen',
+		'state_9' => 'Toon gelezen niet favoriete artikelen',
+		'state_10' => 'Toon ongelezen niet favoriete artikelen',
+		'state_11' => 'Toon niet favoriete artikelen',
+		'state_12' => 'Toon alle artikelen',
+		'state_13' => 'Toon gelezen artikelen',
+		'state_14' => 'Toon ongelezen artikelen',
+		'state_15' => 'Toon alle artikelen',
+		'title' => 'Gebruikers queries',
+	),
+	'profile' => array(
+		'_' => 'Profiel beheer',
+		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Wachtwoord API<br /><small>(e.g., voor mobiele apps)</small>',
+		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
+		'password_format' => 'Ten minste 7 tekens',
+		'title' => 'Profiel',
+	),
+	'reading' => array(
+		'_' => 'Lezen',
+		'after_onread' => 'Na “markeer alles als gelezen”,',
+		'articles_per_page' => 'Aantal artikelen per pagina',
+		'auto_load_more' => 'Laad volgende artikel onderaan de pagina',
+		'auto_remove_article' => 'Verberg artikel na lezen',
+		'confirm_enabled' => 'Toon een bevestigings dialoog op “markeer alles als gelezen” acties',
+		'display_articles_unfolded' => 'Toon artikelen uitgeklapt als standaard',
+		'display_categories_unfolded' => 'Toon categoriën ingeklapt als standaard',
+		'hide_read_feeds' => 'Verberg categoriën en feeds zonder ongelezen artikelen (werkt niet met “Toon alle artikelen” configuratie)',
+		'img_with_lazyload' => 'Gebruik "lazy load" methode om afbeeldingen te laden',
+		'jump_next' => 'Ga naar volgende ongelezen (feed of categorie)',
+		'mark_updated_article_unread' => 'Markeer vernieuwd artikel als ongelezen',
+		'number_divided_when_reader' => 'Gedeeld door 2 in de lees modus.',
+		'read' => array(
+			'article_open_on_website' => 'Als het artikel is geopend op de originele website',
+			'article_viewed' => 'Als het artikel is bekeken',
+			'scroll' => 'Tijdens scrollen',
+			'upon_reception' => 'Tijdens ontvangst van het artikel',
+			'when' => 'Markeer artikel als gelezen…',
+		),
+		'show' => array(
+			'_' => 	'Artikelen om te tonen',
+			'adaptive' => 'Pas weergave aan',
+			'all_articles' => 'Bekijk alle artikelen',
+			'unread' => 'Bekijk alleen ongelezen',
+		),
+		'sort' => array(
+			'_' => 'Sorteer volgorde',
+			'newer_first' => 'Nieuwste eerst',
+			'older_first' => 'Oudste eerst',
+		),
+		'sticky_post' => 'Koppel artikel aan de bovenkant als het geopend wordt',
+		'title' => 'Lees modus',
+		'view' => array(
+			'default' => 'Standaard weergave',
+			'global' => 'Globale weergave',
+			'normal' => 'Normale weergave',
+			'reader' => 'Lees weergave',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Delen',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Meer informatie',
+		'print' => 'Afdrukken',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Gedeelde naam om weer te geven',
+		'share_url' => 'Deel URL voor gebruik',
+		'title' => 'Delen',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Shortcuts',
+		'article_action' => 'Artikel acties',
+		'auto_share' => 'Delen',
+		'auto_share_help' => 'Als er slechts één deel methode i, dan wordt deze gebruikt. Anders zijn ze toegankelijk met hun nummer.',
+		'close_dropdown' => 'Sluit menu',
+		'collapse_article' => 'Inklappen',
+		'first_article' => 'Spring naar eerste artikel',
+		'focus_search' => 'Toegang zoek venster',
+		'help' => 'Toon documentatie',
+		'javascript' => 'JavaScript moet geactiveerd zijn om verwijzingen te gebruiken',
+		'last_article' => 'Spring naar laatste artikel',
+		'load_more' => 'Laad meer artikelen',
+		'mark_read' => 'Markeer als gelezen',
+		'mark_favorite' => 'Markeer als favoriet',
+		'navigation' => 'Navigatie',
+		'navigation_help' => 'Met de "Shift" toets, kunt u navigatie verwijzingen voor feeds gebruiken.<br/>Met de "Alt" toets, kunt u navigatie verwijzingen voor categoriën gebruiken.',
+		'next_article' => 'Spring naar volgende artikel',
+		'other_action' => 'Andere acties',
+		'previous_article' => 'Spring naar vorige artikel',
+		'see_on_website' => 'Bekijk op originale website',
+		'shift_for_all_read' => '+ <code>shift</code> om alle artikelen als gelezen te markeren',
+		'title' => 'Verwijzingen',
+		'user_filter' => 'Toegang gebruikers filters',
+		'user_filter_help' => 'Als er slechts één gebruikers filter s, dan wordt deze gebruikt. Anders zijn ze toegankelijk met hun nummer.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s artikelen (%s)',
+		'current' => 'Huidige gebruiker',
+		'is_admin' => 'is administrateur',
+		'users' => 'Gebruikers',
+	),
+);
diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php
new file mode 100644
index 000000000..2bc5cb665
--- /dev/null
+++ b/app/i18n/nl/feedback.php
@@ -0,0 +1,110 @@
+<?php
+/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimalisatie compleet',
+	),
+	'access' => array(
+		'denied' => 'U hebt geen rechten om deze pagina te bekijken.',
+		'not_found' => 'Deze pagina bestaat niet',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Een probleem is opgetreden tijdens de controle van de systeem configuratie. Probeer het later nog eens.',
+			'set' => 'Formulier is nu uw standaard authenticatie systeem.',
+		),
+		'login' => array(
+			'invalid' => 'Log in is ongeldig',
+			'success' => 'U bent ingelogd',
+		),
+		'logout' => array(
+			'success' => 'U bent uitgelogd',
+		),
+		'no_password_set' => 'Administrateur wachtwoord is niet ingesteld. Deze mogelijkheid is niet beschikbaar.',
+		'not_persona' => 'Alleen Persona systeem kan worden gereset.',
+	),
+	'conf' => array(
+		'error' => 'Er is een fout opgetreden tijdens het opslaan van de configuratie',
+		'query_created' => 'Query "%s" is gemaakt.',
+		'shortcuts_updated' => 'Verwijzingen zijn vernieuwd',
+		'updated' => 'Configuratie is vernieuwd',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s is al ingeschakeld',
+		'disable' => array(
+			'ko' => '%s kan niet worden uitgeschakeld. <a href="%s">Controleer FressRSS log bestanden</a> voor details.',
+			'ok' => '%s is nu uitgeschakeld',
+		),
+		'enable' => array(
+			'ko' => '%s kan niet worden ingeschakeld. <a href="%s">Controleer FressRSS log bestanden</a> voor details.',
+			'ok' => '%s is nn ingeschakeld',
+		),
+		'no_access' => 'U hebt geen toegang voor %s',
+		'not_enabled' => '%s is nog niet ingeschakeld',
+		'not_found' => '%s bestaat niet',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Zip uitbreiding is niet aanwezig op uw server. Exporteer a.u.b. uw bestanden één voor één.',
+		'feeds_imported' => 'Uw feeds zijn geimporteerd en worden nu vernieuwd',
+		'feeds_imported_with_errors' => 'Uw feeds zijn geimporteerd maar er zijn enige fouten opgetreden',
+		'file_cannot_be_uploaded' => 'Bestand kan niet worden verzonden!',
+		'no_zip_extension' => 'Zip uitbreiding is niet aanwezig op uw server.',
+		'zip_error' => 'Er is een fout opgetreden tijdens het imporeren van het Zip bestand.',
+	),
+	'sub' => array(
+		'actualize' => 'Actualiseren',
+		'category' => array(
+			'created' => 'Categorie %s is gemaakt.',
+			'deleted' => 'Categorie is verwijderd.',
+			'emptied' => 'Categorie is leeg gemaakt',
+			'error' => 'Categorie kan niet worden vernieuwd',
+			'name_exists' => 'Categorie naam bestaat al.',
+			'no_id' => 'U moet de id specificeren of de categorie.',
+			'no_name' => 'Categorie naam mag niet leeg zijn.',
+			'not_delete_default' => 'U kunt de standaard categorie niet verwijderen!',
+			'not_exist' => 'De categorie bestaat niet!',
+			'over_max' => 'U hebt het maximale aantal categoriën bereikt (%d)',
+			'updated' => 'Categorie is vernieuwd.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> is vernieuwd',
+			'actualizeds' => 'RSS feeds zijn vernieuwd',
+			'added' => 'RSS feed <em>%s</em> is toegevoegd',
+			'already_subscribed' => 'U bent al geabonneerd op <em>%s</em>',
+			'deleted' => 'Feed is verwijderd',
+			'error' => 'Feed kan niet worden vernieuwd',
+			'internal_problem' => 'De RSS feed kon niet worden toegevoegd. <a href="%s">Controleer FressRSS log bestanden</a> voor details.',
+			'invalid_url' => 'URL <em>%s</em> is ongeldig',
+			'marked_read' => 'Feeds zijn gemarkeerd als gelezen',
+			'n_actualized' => '%d feeds zijn vernieuwd',
+			'n_entries_deleted' => '%d artikelen zijn verwijderd',
+			'no_refresh' => 'Er is geen feed om te vernieuwen…',
+			'not_added' => '<em>%s</em> kon niet worden toegevoegd',
+			'over_max' => 'U hebt het maximale aantal feeds bereikt(%d)',
+			'updated' => 'Feed is vernieuwd',
+		),
+		'purge_completed' => 'Opschonen klaar (%d artikelen verwijderd)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS word nu vernieud naar <strong>versie %s</strong>.',
+		'error' => 'Het vernieuwingsproces kwam een fout tegen: %s',
+		'file_is_nok' => 'Controleer permissies op <em>%s</em> map. HTTP server moet rechten hebben om er in te schrijven',
+		'finished' => 'Vernieuwing compleet!',
+		'none' => 'Geen vernieuwing om toe te passen',
+		'server_not_found' => 'Vernieuwings server kan niet worden gevonden. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'Gebruiker %s is aangemaakt',
+			'error' => 'Gebruiker %s kan niet worden aangemaakt',
+		),
+		'deleted' => array(
+			'_' => 'Gebruiker %s is verwijderd',
+			'error' => 'Gebruiker %s kan niet worden verwijderd',
+		),
+	),
+	'profile' => array(
+		'error' => 'Uw profiel kan niet worden aangepast',
+		'updated' => 'Uw profiel is aangepast',
+	),
+);
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
new file mode 100644
index 000000000..9d7a868dd
--- /dev/null
+++ b/app/i18n/nl/gen.php
@@ -0,0 +1,166 @@
+<?php
+/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+return array(
+	'action' => array(
+		'actualize' => 'Actualiseren',
+		'back_to_rss_feeds' => '← Ga terug naar je RSS feeds',
+		'cancel' => 'Annuleren',
+		'create' => 'Opslaan',
+		'disable' => 'Uitzetten',
+		'empty' => 'Leeg',
+		'enable' => 'Aanzetten',
+		'export' => 'Exporteren',
+		'filter' => 'Filteren',
+		'import' => 'Importeren',
+		'manage' => 'Beheren',
+		'mark_read' => 'Markeer als gelezen',
+		'mark_favorite' => 'Markeer als favoriet',
+		'remove' => 'Verwijder',
+		'see_website' => 'Bekijk website',
+		'submit' => 'Opslaan',
+		'truncate' => 'Verwijder alle artikelen',
+	),
+	'auth' => array(
+		'keep_logged_in' => 'Ingelogd blijven voor <small>(1 maand)</small>',
+		'login' => 'Log in',
+		'login_persona' => 'Login met Persona',
+		'login_persona_problem' => 'Connectiviteits problemen met Persona?',
+		'logout' => 'Log uit',
+		'password' => 'Wachtwoord',
+		'reset' => 'Authenticatie reset',
+		'username' => 'Gebruikersnaam',
+		'username_admin' => 'Administrator gebruikersnaam',
+		'will_reset' => 'Het authenticatie system zal worden gereset: een formulier zal worden gebruikt in plaats van Persona.',
+	),
+	'date' => array(
+		'Apr' => '\\A\\p\\r\\i\\l',
+		'Aug' => '\\A\\u\\g\\u\\s\\t\\u\\s',
+		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\i',
+		'Jan' => '\\J\\a\\n\\u\\a\\r\\i',
+		'Jul' => '\\J\\u\\l\\i',
+		'Jun' => '\\J\\u\\n\\i',
+		'Mar' => '\\M\\a\\a\\r\\t',
+		'May' => '\\M\\e\\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' => 'Apr',
+		'aug' => 'aug',
+		'august' => 'Aug',
+		'before_yesterday' => 'Ouder',
+		'dec' => 'dec',
+		'december' => 'Dec',
+		'feb' => 'feb',
+		'february' => 'Feb',
+//		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+		'format_date' => 'j %s Y', // European date format
+//		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'format_date_hour' => 'j %s Y \\o\\m H\\:i', // European date format
+		'fri' => 'Vr',
+		'jan' => 'jan',
+		'january' => 'Jan',
+		'jul' => 'jul',
+		'july' => 'Jul',
+		'jun' => 'jun',
+		'june' => 'Jun',
+		'last_3_month' => 'Laatste drie maanden',
+		'last_6_month' => 'Laatste zes maanden',
+		'last_month' => 'Vorige maand',
+		'last_week' => 'Vorige week',
+		'last_year' => 'Vorig jaar',
+		'mar' => 'mar',
+		'march' => 'Mar',
+		'may' => 'Mei',
+		'mon' => 'Ma',
+		'month' => 'maanden',
+		'nov' => 'nov',
+		'november' => 'Nov',
+		'oct' => 'okt',
+		'october' => 'Okt',
+		'sat' => 'Za',
+		'sep' => 'sep',
+		'september' => 'Sep',
+		'sun' => 'Zo',
+		'thu' => 'Do',
+		'today' => 'Vandaag',
+		'tue' => 'Di',
+		'wed' => 'Wo',
+		'yesterday' => 'Gisteren',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'Over FreshRSS',
+	),
+	'js' => array(
+		'category_empty' => 'Lege categorie',
+		'confirm_action' => 'Weet u zeker dat u dit wilt doen? Het kan niet ongedaan worden gemaakt!',
+		'confirm_action_feed_cat' => 'Weet u zeker dat u dit wilt doen? U verliest alle gereleteerde favorieten en gebruikers informatie. Het kan niet ongedaan worden gemaakt!',
+		'feedback' => array(
+			'body_new_articles' => 'Er zijn \\d nieuwe artikelen om te lezen op FreshRSS.',
+			'request_failed' => 'Een opdracht is mislukt, mogelijk door Internet verbindings problemen.',
+			'title_new_articles' => 'FreshRSS: nieuwe artikelen!',
+		),
+		'new_article' => 'Er zijn nieuwe artikelen beschikbaar, klik om de pagina te vernieuwen.',
+		'should_be_activated' => 'JavaScript moet aan staan',
+	),
+	'lang' => array(
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'nl' => 'Nederlands',
+	),
+	'menu' => array(
+		'about' => 'Over',
+		'admin' => 'Administratie',
+		'archiving' => 'Archiveren',
+		'authentication' => 'Authenticatie',
+		'check_install' => 'Installatie controle',
+		'configuration' => 'Configuratie',
+		'display' => 'Opmaak',
+		'extensions' => 'Uitbreidingen',
+		'logs' => 'Log boeken',
+		'queries' => 'Gebruikers informatie',
+		'reading' => 'Lezen',
+		'search' => 'Zoek woorden of #labels',
+		'sharing' => 'Delen',
+		'shortcuts' => 'Snelle toegang',
+		'stats' => 'Statistieken',
+		'update' => 'Versie controle',
+		'user_management' => 'Beheer gebruikers',
+		'user_profile' => 'Profiel',
+	),
+	'pagination' => array(
+		'first' => 'Eerste',
+		'last' => 'Laatste',
+		'load_more' => 'Laad meer artikelen',
+		'mark_all_read' => 'Markeer alle als gelezen',
+		'next' => 'Volgende',
+		'nothing_to_load' => 'Er zijn geen artikelen meer',
+		'previous' => 'Vorige',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Attentie!',
+		'blank_to_disable' => 'Laat leeg om uit te zetten',
+		'by_author' => 'Door <em>%s</em>',
+		'by_default' => 'Door standaard',
+		'damn' => 'Potverdorie!',
+		'default_category' => 'Niet ingedeeld',
+		'no' => 'Nee',
+		'ok' => 'Ok!',
+		'or' => 'of',
+		'yes' => 'Ja',
+	),
+);
diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php
new file mode 100644
index 000000000..df6a064e4
--- /dev/null
+++ b/app/i18n/nl/index.php
@@ -0,0 +1,61 @@
+<?php
+/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+return array(
+	'about' => array(
+		'_' => 'Over',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Rapporteer fouten',
+		'credits' => 'Waarderingen',
+		'credits_content' => 'Sommige ontwerp elementen komen van <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> alhoewel FreshRSS dit raamwerk niet gebruikt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Pictogrammen</a> komen van het <a href="https://www.gnome.org/">GNOME project</a>. <em>De Open Sans</em> font police is gemaakt door <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons zijn verzameld met de <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is gebaseerd op <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, een PHP raamwerk. Nederlandse vertaling door Wanabo, <a href="http://www.nieuwskop.be" title="NieuwsKop">NieuwsKop.be</a>. Link naar de Nederlandse vertaling, <a href="https://github.com/Wanabo/FreshRSS-Dutch-translation/tree/master">FreshRSS-Dutch-translation</a>.',
+		'freshrss_description' => 'FreshRSS is een RSS feed aggregator om zelf te hosten zoals <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> of <a href="http://projet.idleman.fr/leed/">Leed</a>. Het gebruikt weinig systeembronnen en is makkelijk te administreren terwijl het een krachtig en makkelijk te configureren programma is.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">op Github</a>',
+		'license' => 'License',
+		'project_website' => 'Project website',
+		'title' => 'Over',
+		'version' => 'Versie',
+		'website' => 'Website',
+	),
+	'feed' => array(
+		'add' => 'U kunt wat feeds toevoegen.',
+		'empty' => 'Er is geen artikel om te laten zien.',
+		'rss_of' => 'RSS feed van %s',
+		'title' => 'Overzicht RSS feeds',
+		'title_global' => 'Globale weergave',
+		'title_fav' => 'Uw favorieten',
+	),
+	'log' => array(
+		'_' => 'Log bestanden',
+		'clear' => 'Leeg de log bestanden',
+		'empty' => 'Log bestand is leeg',
+		'title' => 'Log bestanden',
+	),
+	'menu' => array(
+		'about' => 'Over FreshRSS',
+		'add_query' => 'Voeg een query toe',
+		'before_one_day' => 'Ouder als een dag',
+		'before_one_week' => 'Ouder als een week',
+		'favorites' => 'Favorieten (%s)',
+		'global_view' => 'Globale weergave',
+		'main_stream' => 'Overzicht',
+		'mark_all_read' => 'Markeer alles als gelezen',
+		'mark_cat_read' => 'Markeer categorie als gelezen',
+		'mark_feed_read' => 'Markeer feed als gelezen',
+		'newer_first' => 'Nieuwste eerst',
+		'non-starred' => 'Laat alles zien behalve favorieten',
+		'normal_view' => 'Normale weergave',
+		'older_first' => 'Oudste eerst',
+		'queries' => 'Gebruikers queries',
+		'read' => 'Laat alleen gelezen zien',
+		'reader_view' => 'Lees modus',
+		'rss_view' => 'RSS feed',
+		'search_short' => 'Zoeken',
+		'starred' => 'Laat alleen favorieten zien',
+		'stats' => 'Statistieken',
+		'subscription' => 'Abonnementen beheer',
+		'unread' => 'Laat alleen ongelezen zien',
+	),
+	'share' => 'Delen',
+	'tag' => array(
+		'related' => 'Verwante labels',
+	),
+);
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
new file mode 100644
index 000000000..c00966caa
--- /dev/null
+++ b/app/i18n/nl/install.php
@@ -0,0 +1,107 @@
+<?php
+/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+return array(
+	'action' => array(
+		'finish' => 'Completeer installatie',
+		'fix_errors_before' => 'Repareer de fouten alvorens naar de volgende stap te gaan.',
+		'next_step' => 'Ga naar de volgende stap',
+	),
+	'auth' => array(
+		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Web formulier (traditioneel, benodigd JavaScript)',
+		'http' => 'HTTP (voor geavanceerde gebruikers met HTTPS)',
+		'none' => 'Geen (gevaarlijk)',
+		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
+		'password_format' => 'Tenminste 7 tekens',
+		'persona' => 'Mozilla Persona (modern, benodigd JavaScript)',
+		'type' => 'Authenticatie methode',
+	),
+	'bdd' => array(
+		'_' => 'Database',
+		'conf' => array(
+			'_' => 'Database configuratie',
+			'ko' => 'Controleer uw database informatie.',
+			'ok' => 'Database configuratie is opgeslagen.',
+		),
+		'host' => 'Host',
+		'prefix' => 'Tabel voorvoegsel',
+		'password' => 'HTTP wachtwoord',
+		'type' => 'Type database',
+		'username' => 'HTTP gebruikersnaam',
+	),
+	'check' => array(
+		'_' => 'Controles',
+		'cache' => array(
+			'nok' => 'Controleer permissies van de <em>./data/cache</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+			'ok' => 'Permissies van de cache map zijn goed.',
+		),
+		'ctype' => array(
+			'nok' => 'U mist een benodigde bibliotheek voor character type checking (php-ctype).',
+			'ok' => 'U hebt de benodigde bibliotheek voor character type checking (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'U mist cURL (php5-curl package).',
+			'ok' => 'U hebt de cURL uitbreiding.',
+		),
+		'data' => array(
+			'nok' => 'Controleer permissies van de <em>./data</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+			'ok' => 'Permissies van de data map zijn goed.',
+		),
+		'dom' => array(
+			'nok' => 'U mist een benodigde bibliotheek om te bladeren in de DOM (php-xml package).',
+			'ok' => 'U hebt de benodigde bibliotheek om te bladeren in de DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Controleer permissies van de <em>./data/favicons</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+			'ok' => 'Permissies van de favicons map zijn goed.',
+		),
+		'http_referer' => array(
+			'nok' => 'Controleer a.u.b. dat u niet uw HTTP REFERER wijzigd.',
+			'ok' => 'Uw HTTP REFERER is bekend en komt overeen met uw server.',
+		),
+		'minz' => array(
+			'nok' => 'U mist het Minz framework.',
+			'ok' => 'U hebt het Minz framework.',
+		),
+		'pcre' => array(
+			'nok' => 'U mist een benodigde bibliotheek voor regular expressions (php-pcre).',
+			'ok' => 'U hebt de benodigde bibliotheek voor regular expressions (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'U mist PDO of één van de ondersteunde (pdo_mysql, pdo_sqlite).',
+			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Controleer permissies van de <em>./data/persona</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+			'ok' => 'Permissies van de Mozilla Persona map zijn goed.',
+		),
+		'php' => array(
+			'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
+			'ok' => 'Uw PHP versie is %s, welke compatibel is met FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Controleer permissies van de <em>./data/users</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+			'ok' => 'Permissies van de users map zijn goed.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Algemene configuratie',
+		'ok' => 'Algemene configuratie is opgeslagen.',
+	),
+	'congratulations' => 'Gefeliciteerd!',
+	'default_user' => 'Gebruikersnaam van de standaard gebruiker <small>(maximaal 16 alphanumerieke tekens)</small>',
+	'delete_articles_after' => 'Verwijder artikelen na',
+	'fix_errors_before' => 'Repareer fouten alvorens U naar de volgende stap gaat.',
+	'javascript_is_better' => 'FreshRSS werkt beter JavaScript ingeschakeld',
+	'language' => array(
+		'_' => 'Taal',
+		'choose' => 'Kies een taal voor FreshRSS',
+		'defined' => 'Taal is bepaald.',
+	),
+	'not_deleted' => 'Er ging iets fout! U moet het bestand <em>%s</em> handmatig verwijderen.',
+	'ok' => 'De installatie procedure is geslaagd.',
+	'step' => 'stap %d',
+	'steps' => 'Stappen',
+	'title' => 'Installatie · FreshRSS',
+	'this_is_the_end' => 'Dit is het einde',
+);
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
new file mode 100644
index 000000000..159a58b27
--- /dev/null
+++ b/app/i18n/nl/sub.php
@@ -0,0 +1,62 @@
+<?php
+/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+return array(
+	'category' => array(
+		'_' => 'Categorie',
+		'add' => 'Voeg categorie toe',
+		'empty' => 'Lege categorie',
+		'new' => 'Nieuwe categorie',
+	),
+	'feed' => array(
+		'add' => 'Voeg een RSS feed toe',
+		'advanced' => 'Geavanceerd',
+		'archiving' => 'Archiveren',
+		'auth' => array(
+			'configuration' => 'Log in',
+			'help' => 'Verbinding toestaan toegang te krijgen tot HTTP beveiligde RSS feeds',
+			'http' => 'HTTP Authenticatie',
+			'password' => 'HTTP wachtwoord',
+			'username' => 'HTTP gebruikers naam',
+		),
+		'css_help' => 'Haalt verstoorde RSS feeds op (attentie, heeft meer tijd nodig!)',
+		'css_path' => 'Artikelen CSS pad op originele website',
+		'description' => 'Omschrijving',
+		'empty' => 'Deze feed is leeg. Controleer of deze nog actueel is.',
+		'error' => 'Deze feed heeft problemen. Verifieer a.u.b het doeladres en actualiseer het.',
+		'in_main_stream' => 'Zichtbaar in het overzicht',
+		'informations' => 'Informatie',
+		'keep_history' => 'Minimum aantal artikelen om te houden',
+		'moved_category_deleted' => 'Als u een categorie verwijderd, worden de feeds automatisch geclassificeerd onder <em>%s</em>.',
+		'no_selected' => 'Geen feed geselecteerd.',
+		'number_entries' => '%d artikelen',
+		'pubsubhubbub' => 'Directe notificaties met PubSubHubbub',
+		'stats' => 'Statistieken',
+		'think_to_add' => 'Voeg wat feeds toe.',
+		'title' => 'Titel',
+		'title_add' => 'Voeg een RSS feed toe',
+		'ttl' => 'Vernieuw automatisch niet vaker dan',
+		'url' => 'Feed URL',
+		'validator' => 'Controleer de geldigheid van de feed',
+		'website' => 'Website URL',
+	),
+	'import_export' => array(
+		'export' => 'Exporteer',
+		'export_opml' => 'Exporteer lijst van feeds (OPML)',
+		'export_starred' => 'Exporteer je fovorieten',
+		'feed_list' => 'Lijst van %s artikelen',
+		'file_to_import' => 'Bestand om te importeren<br />(OPML, Json of Zip)',
+		'file_to_import_no_zip' => 'Bestand om te importeren<br />(OPML of Json)',
+		'import' => 'Importeer',
+		'starred_list' => 'Lijst van favoriete artikelen',
+		'title' => 'Importeren / exporteren',
+	),
+	'menu' => array(
+		'bookmark' => 'Abonneer (FreshRSS bladwijzer)',
+		'import_export' => 'Importeer / exporteer',
+		'subscription_management' => 'Abonnementen beheer',
+	),
+	'title' => array(
+		'_' => 'Abonnementen beheer',
+		'feed_management' => 'RSS feed beheer',
+	),
+);
-- 
cgit v1.2.3


From c75863ff0f5a464cabe0bbcc79526a1362235427 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 21 Aug 2015 11:49:46 +0200
Subject: UI: Add feed ID in article container

https://github.com/FreshRSS/FreshRSS/issues/953
---
 app/views/index/normal.phtml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index f71abf158..91ebcebd3 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -56,7 +56,11 @@ if (!empty($this->entries)) {
 			?></div><?php
 			$display_others = false;
 		}
-	?><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<?php echo !$this->entry->isRead() ? ' not_read' : '';
+		?><?php echo $this->entry->isFavorite() ? ' favorite' : '';
+		?>" id="flux_<?php echo $this->entry->id();
+		?>" data-feed="<?php echo $this->feed->id();
+		?>"><?php
 
 			$this->renderHelper('index/normal/entry_header');
 
-- 
cgit v1.2.3


From 501e3312101893b147767c9f3a36c947869d6580 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 21 Aug 2015 13:35:46 +0200
Subject: Reference other languages

https://github.com/FreshRSS/FreshRSS/issues/949
https://github.com/FreshRSS/FreshRSS/pull/950
---
 app/i18n/cz/gen.php | 3 ++-
 app/i18n/de/gen.php | 1 +
 app/i18n/en/gen.php | 1 +
 app/i18n/fr/gen.php | 1 +
 app/i18n/nl/gen.php | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 53127998f..2094d6a60 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -116,10 +116,11 @@ return array(
 		'should_be_activated' => 'JavaScript musí být povolen',
 	),
 	'lang' => array(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-		'cz' => 'Čeština',
+		'nl' => 'Nederlands',
 	),
 	'menu' => array(
 		'about' => 'O aplikaci',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index f8f4823a6..fd9ee3f62 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'nl' => 'Nederlands',
 	),
 	'menu' => array(
 		'about' => 'Über',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 1feb8d6ac..484911444 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'nl' => 'Nederlands',
 	),
 	'menu' => array(
 		'about' => 'About',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 67d278be4..2a2fffe3e 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'nl' => 'Nederlands',
 	),
 	'menu' => array(
 		'about' => 'À propos',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 9d7a868dd..8680bef11 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -106,6 +106,7 @@ return array(
 		'should_be_activated' => 'JavaScript moet aan staan',
 	),
 	'lang' => array(
+		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-- 
cgit v1.2.3


From b3ae9407aca2223000c4f3a5b56648382de8ef48 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 21 Aug 2015 16:26:33 +0200
Subject: i18n nl: content width

https://github.com/FreshRSS/FreshRSS/pull/950#issuecomment-133429503
---
 app/i18n/nl/conf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index 16ad336a9..effc9dce2 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -31,7 +31,7 @@ return array(
 		'theme' => 'Thema',
 		'title' => 'Opmaak',
 		'width' => array(
-			'content' => 'Content width',
+			'content' => 'Inhoud breedte',
 			'large' => 'Breed',
 			'medium' => 'Normaal',
 			'no_limit' => 'Geen limiet',
-- 
cgit v1.2.3


From b33004c38145d4f4c0d2532e3832743b8ad5ba27 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 21 Aug 2015 18:07:18 +0200
Subject: i18n nl: update

Merge changes from https://github.com/Wanabo/FreshRSS-Dutch-translation
https://github.com/FreshRSS/FreshRSS/issues/949
---
 app/i18n/nl/conf.php     |  4 ++++
 app/i18n/nl/feedback.php |  1 +
 app/i18n/nl/gen.php      | 27 +++++++++++++++++++--------
 app/i18n/nl/install.php  |  6 ++++++
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index effc9dce2..9b0aff793 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -72,6 +72,10 @@ return array(
 	),
 	'profile' => array(
 		'_' => 'Profiel beheer',
+		'delete' => array(
+			'_' => 'Account verwijderen',
+			'warn' => 'Uw account en alle gerelateerde gegvens worden verwijderd.',
+		),
 		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Wachtwoord API<br /><small>(e.g., voor mobiele apps)</small>',
 		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php
index 2bc5cb665..54d84f7d6 100644
--- a/app/i18n/nl/feedback.php
+++ b/app/i18n/nl/feedback.php
@@ -102,6 +102,7 @@ return array(
 			'_' => 'Gebruiker %s is verwijderd',
 			'error' => 'Gebruiker %s kan niet worden verwijderd',
 		),
+		'set_registration' => 'Het maximale aantal accounts is vernieuwd.',
 	),
 	'profile' => array(
 		'error' => 'Uw profiel kan niet worden aangepast',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 8680bef11..ed57669a1 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -21,15 +21,27 @@ return array(
 		'truncate' => 'Verwijder alle artikelen',
 	),
 	'auth' => array(
+		'email' => 'Email adres',
 		'keep_logged_in' => 'Ingelogd blijven voor <small>(1 maand)</small>',
 		'login' => 'Log in',
 		'login_persona' => 'Login met Persona',
-		'login_persona_problem' => 'Connectiviteits problemen met Persona?',
+		'login_persona_problem' => 'Connectiviteits problemen met Persona',
 		'logout' => 'Log uit',
-		'password' => 'Wachtwoord',
+		'password' => array(
+			'_' => 'Wachtwoord',
+			'format' => '<small>Ten minste 7 tekens</small>',
+		),
+		'registration' => array(
+			'_' => 'Nieuw account',
+			'ask' => 'Maak een account?',
+			'title' => 'Account maken',
+		),
 		'reset' => 'Authenticatie reset',
-		'username' => 'Gebruikersnaam',
-		'username_admin' => 'Administrator gebruikersnaam',
+		'username' => array(
+			'_' => 'Gebruikersnaam',
+			'admin' => 'Administrator gebruikersnaam',
+			'format' => '<small>maximaal 16 alphanumerieke tekens</small>',
+		),
 		'will_reset' => 'Het authenticatie system zal worden gereset: een formulier zal worden gebruikt in plaats van Persona.',
 	),
 	'date' => array(
@@ -54,10 +66,8 @@ return array(
 		'december' => 'Dec',
 		'feb' => 'feb',
 		'february' => 'Feb',
-//		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
-		'format_date' => 'j %s Y', // European date format
-//		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
-		'format_date_hour' => 'j %s Y \\o\\m H\\:i', // European date format
+		'format_date' => 'j %s Y', //<-- European date format // 'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+		'format_date_hour' => 'j %s Y \\o\\m H\\:i', //<-- European date format // 'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
 		'fri' => 'Vr',
 		'jan' => 'jan',
 		'january' => 'Jan',
@@ -160,6 +170,7 @@ return array(
 		'damn' => 'Potverdorie!',
 		'default_category' => 'Niet ingedeeld',
 		'no' => 'Nee',
+		'not_applicable' => 'Niet aanwezig',
 		'ok' => 'Ok!',
 		'or' => 'of',
 		'yes' => 'Ja',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index c00966caa..e788261ea 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -4,7 +4,9 @@ return array(
 	'action' => array(
 		'finish' => 'Completeer installatie',
 		'fix_errors_before' => 'Repareer de fouten alvorens naar de volgende stap te gaan.',
+		'keep_install' => 'Behoud de vorige installatie',
 		'next_step' => 'Ga naar de volgende stap',
+		'reinstall' => 'Installeer FreshRSS opnieuw',
 	),
 	'auth' => array(
 		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
@@ -31,6 +33,7 @@ return array(
 	),
 	'check' => array(
 		'_' => 'Controles',
+		'already_installed' => 'We hebben geconstateerd dat FreshRSS al is geïnstallerd!',
 		'cache' => array(
 			'nok' => 'Controleer permissies van de <em>./data/cache</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
 			'ok' => 'Permissies van de cache map zijn goed.',
@@ -93,6 +96,9 @@ return array(
 	'delete_articles_after' => 'Verwijder artikelen na',
 	'fix_errors_before' => 'Repareer fouten alvorens U naar de volgende stap gaat.',
 	'javascript_is_better' => 'FreshRSS werkt beter JavaScript ingeschakeld',
+	'js' => array(
+		'confirm_reinstall' => 'U verliest uw vorige configuratie door FreshRSS opnieuw te installeren. Weet u zeker dat u verder wilt gaan?',
+	),
 	'language' => array(
 		'_' => 'Taal',
 		'choose' => 'Kies een taal voor FreshRSS',
-- 
cgit v1.2.3


From 269c6b88c4486a0ae1a92df65578ee6ab6f0bbca Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 22 Aug 2015 09:33:58 -0400
Subject: Add a system configuration page

It allows to modify system configuration from the interface. At the moment, only limits are modifiable. The user limit was removed from the user page and added here along with categories and feeds limits.
---
 app/Controllers/configureController.php | 33 +++++++++++++++++++++++
 app/Controllers/userController.php      | 24 -----------------
 app/i18n/cz/admin.php                   | 14 ++++++----
 app/i18n/cz/feedback.php                |  1 -
 app/i18n/cz/gen.php                     |  1 +
 app/i18n/de/admin.php                   | 14 ++++++----
 app/i18n/de/feedback.php                |  1 -
 app/i18n/de/gen.php                     |  1 +
 app/i18n/en/admin.php                   | 14 ++++++----
 app/i18n/en/feedback.php                |  1 -
 app/i18n/en/gen.php                     |  1 +
 app/i18n/fr/admin.php                   | 14 ++++++----
 app/i18n/fr/feedback.php                |  1 -
 app/i18n/fr/gen.php                     |  1 +
 app/layout/aside_configure.phtml        |  3 +++
 app/layout/header.phtml                 |  1 +
 app/views/configure/system.phtml        | 47 +++++++++++++++++++++++++++++++++
 app/views/user/manage.phtml             | 28 --------------------
 18 files changed, 124 insertions(+), 76 deletions(-)
 create mode 100644 app/views/configure/system.phtml

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 248a3edcc..7a4d0ecd7 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -293,4 +293,37 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		Minz_Request::good(_t('feedback.conf.query_created', $query['name']),
 		                   array('c' => 'configure', 'a' => 'queries'));
 	}
+
+	/**
+	 * This action handles the system configuration page.
+	 *
+	 * It displays the system configuration page.
+	 * If this action is reach through a POST request, it stores all new
+	 * configuration values then sends a notification to the user.
+	 *
+	 * The options available on the page are:
+	 *   - user limit (default: 1)
+	 *   - user category limit (default: 16384)
+	 *   - user feed limit (default: 16384)
+	 */
+	public function systemAction() {
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+		if (Minz_Request::isPost()) {
+			$limits = FreshRSS_Context::$system_conf->limits;
+			$limits['max_registrations'] = Minz_Request::param('max-registrations', 1);
+			$limits['max_feeds'] = Minz_Request::param('max-feeds', 16384);
+			$limits['max_categories'] = Minz_Request::param('max-categories', 16384);
+			FreshRSS_Context::$system_conf->limits = $limits;
+			FreshRSS_Context::$system_conf->save();
+
+			invalidateHttpCache();
+
+			Minz_Session::_param('notification', array(
+				'type' => 'good',
+				'content' => _t('feedback.conf.updated')
+			));
+		}
+	}
 }
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 428cd145d..1c7d621f1 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -272,28 +272,4 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 		Minz_Request::forward($redirect_url, true);
 	}
-
-	/**
-	 * This action updates the max number of registrations.
-	 *
-	 * Request parameter is:
-	 *   - max-registrations (int >= 0)
-	 */
-	public function setRegistrationAction() {
-		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
-			$limits = FreshRSS_Context::$system_conf->limits;
-			$limits['max_registrations'] = Minz_Request::param('max-registrations', 1);
-			FreshRSS_Context::$system_conf->limits = $limits;
-			FreshRSS_Context::$system_conf->save();
-
-			invalidateHttpCache();
-
-			Minz_Session::_param('notification', array(
-				'type' => 'good',
-				'content' => _t('feedback.user.set_registration')
-			));
-		}
-
-		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
-	}
 }
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 4ca56cc37..92c300709 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -146,6 +146,15 @@ return array(
 		'title' => 'Statistika',
 		'top_feed' => 'Top ten kanálů',
 	),
+	'system' => array(
+		'_' => 'System configuration',
+		'max-categories' => 'Categories per user limit',
+		'max-feeds' => 'Feeds per user limit',
+		'registration' => array(
+			'help' => '0 znamená žádná omezení účtu',
+			'number' => 'Maximální počet účtů',
+		),
+	),
 	'update' => array(
 		'_' => 'Aktualizace systému',
 		'apply' => 'Použít',
@@ -164,11 +173,6 @@ return array(
 		'numbers' => 'Zatím je vytvořeno %d účtů',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
-		'registration' => array(
-			'allow' => 'Povolit vytváření účtů',
-			'help' => '0 znamená žádná omezení účtu',
-			'number' => 'Maximální počet účtů',
-		),
 		'title' => 'Správa uživatelů',
 		'user_list' => 'Seznam uživatelů',
 		'username' => 'Přihlašovací jméno',
diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index 5ba64b938..b75a4a15a 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -102,7 +102,6 @@ return array(
 			'_' => 'Uživatel %s byl smazán',
 			'error' => 'Uživatele %s nelze smazat',
 		),
-		'set_registration' => 'Maximální počet účtů byl změněn',
 	),
 	'profile' => array(
 		'error' => 'Váš profil nelze změnit',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 138def772..436e4f0c2 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -137,6 +137,7 @@ return array(
 		'sharing' => 'Sdílení',
 		'shortcuts' => 'Zkratky',
 		'stats' => 'Statistika',
+		'system' => 'System configuration',
 		'update' => 'Aktualizace',
 		'user_management' => 'Správa uživatelů',
 		'user_profile' => 'Profil',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 68dcc2ebf..365f065af 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -146,6 +146,15 @@ return array(
 		'title' => 'Statistiken',
 		'top_feed' => 'Top 10-Feeds',
 	),
+	'system' => array(
+		'_' => 'System configuration',
+		'max-categories' => 'Categories per user limit',
+		'max-feeds' => 'Feeds per user limit',
+		'registration' => array(
+			'help' => '0 meint, dass es kein Account Limit gibt',
+			'number' => 'Maximale Anzahl von Accounts',
+		),
+	),
 	'update' => array(
 		'_' => 'System aktualisieren',
 		'apply' => 'Anwenden',
@@ -164,11 +173,6 @@ return array(
 		'numbers' => 'Es wurden bis jetzt %d Accounts erstellt',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
 		'password_format' => 'mindestens 7 Zeichen',
-		'registration' => array(
-			'allow' => 'Erlaube die Accounterstellung',
-			'help' => '0 meint, dass es kein Account Limit gibt',
-			'number' => 'Maximale Anzahl von Accounts',
-		),
 		'title' => 'Benutzer verwalten',
 		'user_list' => 'Liste der Benutzer',
 		'username' => 'Nutzername',
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index e92dacfe9..4c15aadc3 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -102,7 +102,6 @@ return array(
 			'_' => 'Der Benutzer %s ist gelöscht worden',
 			'error' => 'Der Benutzer %s kann nicht gelöscht werden',
 		),
-		'set_registration' => 'Die maximale Anzahl von Accounts wurde aktualisiert.',
 	),
 	'profile' => array(
 		'error' => 'Ihr Profil kann nicht geändert werden',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index de2d846c5..f3450abc0 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -137,6 +137,7 @@ return array(
 		'sharing' => 'Teilen',
 		'shortcuts' => 'Tastaturkürzel',
 		'stats' => 'Statistiken',
+		'system' => 'System configuration',
 		'update' => 'Aktualisieren',
 		'user_management' => 'Benutzer verwalten',
 		'user_profile' => 'Profil',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index aeea61631..ad9038203 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -146,6 +146,15 @@ return array(
 		'title' => 'Statistics',
 		'top_feed' => 'Top ten feeds',
 	),
+	'system' => array(
+		'_' => 'System configuration',
+		'max-categories' => 'Categories per user limit',
+		'max-feeds' => 'Feeds per user limit',
+		'registration' => array(
+			'help' => '0 means that there is no account limit',
+			'number' => 'Max number of accounts',
+		),
+	),
 	'update' => array(
 		'_' => 'Update system',
 		'apply' => 'Apply',
@@ -164,11 +173,6 @@ return array(
 		'numbers' => 'There are %d accounts created yet',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',
-		'registration' => array(
-			'allow' => 'Allow account creation',
-			'help' => '0 means that there is no account limit',
-			'number' => 'Max number of accounts',
-		),
 		'title' => 'Manage users',
 		'user_list' => 'List of users',
 		'username' => 'Username',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index c9f73dc1d..c9189c0d0 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -102,7 +102,6 @@ return array(
 			'_' => 'User %s has been deleted',
 			'error' => 'User %s cannot be deleted',
 		),
-		'set_registration' => 'The maximum amount of accounts has been updated.',
 	),
 	'profile' => array(
 		'error' => 'Your profile cannot be modified',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 1feb8d6ac..9aef45768 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -137,6 +137,7 @@ return array(
 		'sharing' => 'Sharing',
 		'shortcuts' => 'Shortcuts',
 		'stats' => 'Statistics',
+		'system' => 'System configuration',
 		'update' => 'Update',
 		'user_management' => 'Manage users',
 		'user_profile' => 'Profile',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 01e0cb3c7..44e013c2f 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -146,6 +146,15 @@ return array(
 		'title' => 'Statistiques',
 		'top_feed' => 'Les dix plus gros flux',
 	),
+	'system' => array(
+		'_' => 'Configuration du système',
+		'max-categories' => 'Limite de catégories par utilisateur',
+		'max-feeds' => 'Limite de flux par utilisateur',
+		'registration' => array(
+			'help' => 'Un chiffre de 0 signifie que l’on peut créer un nombre infini de comptes',
+			'number' => 'Nombre max de comptes',
+		),
+	),
 	'update' => array(
 		'_' => 'Système de mise à jour',
 		'apply' => 'Appliquer la mise à jour',
@@ -164,11 +173,6 @@ return array(
 		'numbers' => '%d comptes ont déjà été créés',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 		'password_format' => '7 caractères minimum',
-		'registration' => array(
-			'allow' => 'Autoriser la création de comptes',
-			'help' => 'Un chiffre de 0 signifie que l’on peut créer un nombre infini de comptes',
-			'number' => 'Nombre max de comptes',
-		),
 		'title' => 'Gestion des utilisateurs',
 		'user_list' => 'Liste des utilisateurs',
 		'username' => 'Nom d’utilisateur',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index 99c193d28..e2364a251 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -102,7 +102,6 @@ return array(
 			'_' => 'L’utilisateur %s a été supprimé.',
 			'error' => 'L’utilisateur %s ne peut pas être supprimé.',
 		),
-		'set_registration' => 'Le nombre maximal de comptes a été mis à jour.',
 	),
 	'profile' => array(
 		'error' => 'Votre profil n’a pas pu être mis à jour',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 67d278be4..9df5b6f05 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -137,6 +137,7 @@ return array(
 		'sharing' => 'Partage',
 		'shortcuts' => 'Raccourcis',
 		'stats' => 'Statistiques',
+		'system' => 'Configuration du système',
 		'update' => 'Mise à jour',
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 7567a8206..d956ec21f 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -27,6 +27,9 @@
 	</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::actionName() === 'system' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('configure', 'system')?>"><?php echo _t('gen.menu.system'); ?></a>
+	</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.user_management'); ?></a>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 41a63a565..238c664b0 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -67,6 +67,7 @@ if (FreshRSS_Auth::accessNeedsAction()) {
 				<?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('configure', 'system'); ?>"><?php echo _t('gen.menu.system'); ?></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>
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
new file mode 100644
index 000000000..cbedc511b
--- /dev/null
+++ b/app/views/configure/system.phtml
@@ -0,0 +1,47 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<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', 'system'); ?>">
+		<legend><?php echo _t('admin.system'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="max-registrations"><?php echo _t('admin.system.registration.number'); ?></label>
+			<div class="group-controls">
+				<input type="number" id="max-registrations" name="max-registrations" value="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>" min="0" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>"/>
+				<?php echo _i('help'); ?> <?php echo _t('admin.system.registration.help'); ?>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<?php
+					$number = count(listUsers());
+					echo _t($number > 1 ? 'admin.user.numbers' : 'admin.user.number', $number);
+				?>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="max-feeds"><?php echo _t('admin.system.max-feeds'); ?></label>
+			<div class="group-controls">
+			    <input type="number" id="max-feeds" name="max-feeds" value="<?php echo FreshRSS_Context::$system_conf->limits['max_feeds']; ?>" min="1" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_feeds']; ?>"/>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="max-categories"><?php echo _t('admin.system.max-categories'); ?></label>
+			<div class="group-controls">
+			    <input type="number" id="max-categories" name="max-categories" value="<?php echo FreshRSS_Context::$system_conf->limits['max_categories']; ?>" min="1" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_categories']; ?>"/>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<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>
+</div>
\ No newline at end of file
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 3d3bc3ddf..fe1b6618b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -3,34 +3,6 @@
 <div class="post">
 	<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', 'setRegistration'); ?>">
-		<legend><?php echo _t('admin.user.registration.allow'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="max-registrations"><?php echo _t('admin.user.registration.number'); ?></label>
-			<div class="group-controls">
-				<input type="number" id="max-registrations" name="max-registrations" value="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>" min="0" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>"/>
-				<?php echo _i('help'); ?> <?php echo _t('admin.user.registration.help'); ?>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<div class="group-controls">
-				<?php
-					$number = count(listUsers());
-					echo _t($number > 1 ? 'admin.user.numbers' : 'admin.user.number', $number);
-				?>
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<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('user', 'create'); ?>">
 		<legend><?php echo _t('admin.user.create'); ?></legend>
 
-- 
cgit v1.2.3


From 428e3f5c96c91e3e1b249215a3d7c0d299324642 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 24 Aug 2015 18:26:20 -0400
Subject: Add new line to comply with coding style

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

diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
index cbedc511b..9c9813729 100644
--- a/app/views/configure/system.phtml
+++ b/app/views/configure/system.phtml
@@ -44,4 +44,4 @@
 			</div>
 		</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3


From fac236a04151af2b65b39fdd8f5169ef5abbf16e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 24 Aug 2015 18:30:25 -0400
Subject: Add todo comments for translation

---
 app/i18n/cz/admin.php | 6 +++---
 app/i18n/cz/gen.php   | 2 +-
 app/i18n/de/admin.php | 6 +++---
 app/i18n/de/gen.php   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 92c300709..6c9156335 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -147,9 +147,9 @@ return array(
 		'top_feed' => 'Top ten kanálů',
 	),
 	'system' => array(
-		'_' => 'System configuration',
-		'max-categories' => 'Categories per user limit',
-		'max-feeds' => 'Feeds per user limit',
+		'_' => 'System configuration', // @todo translate
+		'max-categories' => 'Categories per user limit', // @todo translate
+		'max-feeds' => 'Feeds per user limit', // @todo translate
 		'registration' => array(
 			'help' => '0 znamená žádná omezení účtu',
 			'number' => 'Maximální počet účtů',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 436e4f0c2..0883cb669 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -137,7 +137,7 @@ return array(
 		'sharing' => 'Sdílení',
 		'shortcuts' => 'Zkratky',
 		'stats' => 'Statistika',
-		'system' => 'System configuration',
+		'system' => 'System configuration',// @todo translate
 		'update' => 'Aktualizace',
 		'user_management' => 'Správa uživatelů',
 		'user_profile' => 'Profil',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 365f065af..26d0bcd36 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -147,9 +147,9 @@ return array(
 		'top_feed' => 'Top 10-Feeds',
 	),
 	'system' => array(
-		'_' => 'System configuration',
-		'max-categories' => 'Categories per user limit',
-		'max-feeds' => 'Feeds per user limit',
+		'_' => 'System configuration', // @todo translate
+		'max-categories' => 'Categories per user limit', // @todo translate
+		'max-feeds' => 'Feeds per user limit', // @todo translate
 		'registration' => array(
 			'help' => '0 meint, dass es kein Account Limit gibt',
 			'number' => 'Maximale Anzahl von Accounts',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index f3450abc0..1f06e156f 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -137,7 +137,7 @@ return array(
 		'sharing' => 'Teilen',
 		'shortcuts' => 'Tastaturkürzel',
 		'stats' => 'Statistiken',
-		'system' => 'System configuration',
+		'system' => 'System configuration',// @todo translate
 		'update' => 'Aktualisieren',
 		'user_management' => 'Benutzer verwalten',
 		'user_profile' => 'Profil',
-- 
cgit v1.2.3


From d396dd71524694766bde852834be15f477ceaf3e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 24 Aug 2015 18:41:57 -0400
Subject: Add instance name in system configuration page

---
 app/Controllers/configureController.php | 1 +
 app/i18n/cz/admin.php                   | 1 +
 app/i18n/de/admin.php                   | 1 +
 app/i18n/en/admin.php                   | 1 +
 app/i18n/fr/admin.php                   | 1 +
 app/views/configure/system.phtml        | 7 +++++++
 6 files changed, 12 insertions(+)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 7a4d0ecd7..0dc7ceab2 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -316,6 +316,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$limits['max_feeds'] = Minz_Request::param('max-feeds', 16384);
 			$limits['max_categories'] = Minz_Request::param('max-categories', 16384);
 			FreshRSS_Context::$system_conf->limits = $limits;
+			FreshRSS_Context::$system_conf->title = Minz_Request::param('instance-name', 'FreshRSS');
 			FreshRSS_Context::$system_conf->save();
 
 			invalidateHttpCache();
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 6c9156335..e1fa5d141 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration', // @todo translate
+		'instance-name' => 'Instance name', // @todo translate
 		'max-categories' => 'Categories per user limit', // @todo translate
 		'max-feeds' => 'Feeds per user limit', // @todo translate
 		'registration' => array(
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 26d0bcd36..395b51acf 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration', // @todo translate
+		'instance-name' => 'Instance name', // @todo translate
 		'max-categories' => 'Categories per user limit', // @todo translate
 		'max-feeds' => 'Feeds per user limit', // @todo translate
 		'registration' => array(
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index ad9038203..6edb38cf0 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration',
+		'instance-name' => 'Instance name',
 		'max-categories' => 'Categories per user limit',
 		'max-feeds' => 'Feeds per user limit',
 		'registration' => array(
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 44e013c2f..e73622577 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'Configuration du système',
+		'instance-name' => 'Nom de l’instance',
 		'max-categories' => 'Limite de catégories par utilisateur',
 		'max-feeds' => 'Limite de flux par utilisateur',
 		'registration' => array(
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
index 9c9813729..9406c34d6 100644
--- a/app/views/configure/system.phtml
+++ b/app/views/configure/system.phtml
@@ -6,6 +6,13 @@
 	<form method="post" action="<?php echo _url('configure', 'system'); ?>">
 		<legend><?php echo _t('admin.system'); ?></legend>
 
+		<div class="form-group">
+			<label class="group-name" for="instance-name"><?php echo _t('admin.system.instance-name'); ?></label>
+			<div class="group-controls">
+			    <input type="text" id="max-feeds" name="instance-name" value="<?php echo FreshRSS_Context::$system_conf->title; ?>" min="1" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->title; ?>"/>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<label class="group-name" for="max-registrations"><?php echo _t('admin.system.registration.number'); ?></label>
 			<div class="group-controls">
-- 
cgit v1.2.3


From 6066238ca8d2e5304b8df19412e1b248b6904120 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 29 Aug 2015 12:00:01 +0200
Subject: Some changes for 1.1.3-beta

https://github.com/FreshRSS/FreshRSS/pull/958
https://github.com/FreshRSS/FreshRSS/issues/892
https://github.com/FreshRSS/FreshRSS/issues/680
https://github.com/FreshRSS/FreshRSS/issues/858
https://github.com/FreshRSS/FreshRSS/issues/953
https://github.com/FreshRSS/FreshRSS/pull/954
https://github.com/FreshRSS/FreshRSS/issues/949
https://github.com/FreshRSS/FreshRSS/issues/924
https://github.com/FreshRSS/FreshRSS/pull/936
---
 CHANGELOG.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c89b52790..da5428e8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
 # Changelog
 
-## 2015-08-31 FreshRSS 1.1.3-beta
+## 2015-xx-xx FreshRSS 1.1.3-beta
 
-Nothing for the moment.
+* UI
+	* Configuration page for global settings such as limits [#958](https://github.com/FreshRSS/FreshRSS/pull/958)
+	* Add feed ID in articles to ease styling [#953](https://github.com/FreshRSS/FreshRSS/issues/953)
+* I18n
+	* Dutch [#949](https://github.com/FreshRSS/FreshRSS/issues/949)
+# Bug fixing
+	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
 
 
 ## 2015-07-30 FreshRSS 1.1.2-beta
-- 
cgit v1.2.3


From 855fe6bc036eaaab5dd924480b68d4792d93a67a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 29 Aug 2015 12:45:32 +0200
Subject: Changelog syntax bug

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da5428e8f..b28f93f41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 	* Add feed ID in articles to ease styling [#953](https://github.com/FreshRSS/FreshRSS/issues/953)
 * I18n
 	* Dutch [#949](https://github.com/FreshRSS/FreshRSS/issues/949)
-# Bug fixing
+* Bug fixing
 	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
 
 
-- 
cgit v1.2.3


From 757b879261cd23b56d20de98a63e13a8cae32621 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 30 Aug 2015 18:55:14 +0200
Subject: CHANGELOG: Better error handling for PubSubHubbub

https://github.com/FreshRSS/FreshRSS/issues/939
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b28f93f41..5390d8801 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 	* Dutch [#949](https://github.com/FreshRSS/FreshRSS/issues/949)
 * Bug fixing
 	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
+	* Better error handling for PubSubHubbub [#939](https://github.com/FreshRSS/FreshRSS/issues/939)
 
 
 ## 2015-07-30 FreshRSS 1.1.2-beta
-- 
cgit v1.2.3


From 9fcdaf99e24a23724c2b95b29b85b8112b6263fb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Sep 2015 20:52:37 +0200
Subject: Error encoding tag link

https://github.com/FreshRSS/FreshRSS/issues/970
---
 app/views/helpers/index/normal/entry_bottom.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 20b4b332c..66c9d0e74 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -71,7 +71,7 @@
 			<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>
-- 
cgit v1.2.3


From d073331d2496d427dad972b9e024f247015e50ce Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Sep 2015 21:31:24 +0200
Subject: Tag link double encoding problem

https://github.com/FreshRSS/FreshRSS/issues/970
Tags coming from the database are already HTML-encoded.
---
 app/views/helpers/index/normal/entry_bottom.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 66c9d0e74..3af7436c3 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -71,7 +71,7 @@
 			<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', '#' . htmlspecialchars_decode($tag)); ?>"><?php echo $tag; ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
-- 
cgit v1.2.3


From 4cd5608651aaa7e262926a85a4b7ecbdeca6e730 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Sep 2015 21:39:13 +0200
Subject: Changelog Fix tag search link from articles

https://github.com/FreshRSS/FreshRSS/issues/970
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5390d8801..5780942fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Bug fixing
 	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
 	* Better error handling for PubSubHubbub [#939](https://github.com/FreshRSS/FreshRSS/issues/939)
+	* Fix tag search link from articles [#970](https://github.com/FreshRSS/FreshRSS/issues/970)
 
 
 ## 2015-07-30 FreshRSS 1.1.2-beta
-- 
cgit v1.2.3


From 5a2bc9261ca5104022ce64e00d0384791b0443d1 Mon Sep 17 00:00:00 2001
From: Marcus Rohrmoser <github@mro.name>
Date: Thu, 10 Sep 2015 09:52:24 +0200
Subject: fixed misleading i18n wording bug.

---
 app/i18n/de/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 286272e71..9bada0869 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -27,9 +27,9 @@ return array(
 		),
 		'host' => 'Host',
 		'prefix' => 'Tabellen-Präfix',
-		'password' => 'HTTP-Password',
+		'password' => 'SQL-Password',
 		'type' => 'Datenbank-Typ',
-		'username' => 'HTTP-Nutzername',
+		'username' => 'SQL-Nutzername',
 	),
 	'check' => array(
 		'_' => 'Überprüfungen',
-- 
cgit v1.2.3


From 271d43b5692de4d56f05d38ca802b7807c8743cf Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 11 Sep 2015 18:45:25 -0400
Subject: Fix feed and category side effect

Before, when deleting a feed or a category, the user queries were deleted as well. No matter if they were related or not.
Now, they are deleted only if they are related.

I this this fix is not the best way to handle that. I think it would be better if we could find a way to create a UserQuery object from the array.
The same applies when displaying the user queries in the interface.

See #980
---
 app/Models/ConfigurationSetter.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 992a3a387..5c8a1ce29 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -119,6 +119,8 @@ class FreshRSS_ConfigurationSetter {
 		foreach ($values as $value) {
 			if ($value instanceof FreshRSS_UserQuery) {
 				$data['queries'][] = $value->toArray();
+			} elseif (is_array($value)) {
+				$data['queries'][] = $value;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 96d88718318dcf8054e79472829e49ec12db2b30 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 12 Sep 2015 18:06:14 +0200
Subject: Fix CHANGELOG.md

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5780942fe..be2813d30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2015-xx-xx FreshRSS 1.1.3-beta
+## 2015-09-12 FreshRSS 1.1.3-beta
 
 * UI
 	* Configuration page for global settings such as limits [#958](https://github.com/FreshRSS/FreshRSS/pull/958)
@@ -11,6 +11,7 @@
 	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
 	* Better error handling for PubSubHubbub [#939](https://github.com/FreshRSS/FreshRSS/issues/939)
 	* Fix tag search link from articles [#970](https://github.com/FreshRSS/FreshRSS/issues/970)
+	* Fix all quieries deleted when deleting a feed or category [#982](https://github.com/FreshRSS/FreshRSS/pull/982)
 
 
 ## 2015-07-30 FreshRSS 1.1.2-beta
@@ -53,7 +54,7 @@
 * UI
 	* New confirmation message when leaving a configuration page without saving the changes.
 * Bug fixing
-	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address) 
+	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address)
 	* Corrected bug in FreshRSS RSS feeds.
 * Security
 	* Sanitize HTTP request header `Host`.
@@ -317,7 +318,7 @@
 		* Amélioration des performances
 		* Tolère un beaucoup plus grand nombre d’articles
 		* Compression des données côté MySQL plutôt que côté PHP
-		* Incompatible avec la version 0.6 (nécessite une mise à jour grâce à l’installateur) 
+		* Incompatible avec la version 0.6 (nécessite une mise à jour grâce à l’installateur)
 	* Affichage de la taille de la base de données dans FreshRSS
 	* Correction problème de marquage de tous les favoris comme lus
 * HTML5 :
-- 
cgit v1.2.3


From 0204e8ff08ba9ae103c46d08484cf30aedfb9148 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 12 Sep 2015 18:10:55 +0200
Subject: Fix CREDITS file

---
 CREDITS.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CREDITS.md b/CREDITS.md
index 4eadf90b9..148eac021 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -12,8 +12,12 @@ People are sorted by name so please keep this order.
 * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade)
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
 * [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry)
-* [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/), [Email](mailto:dev@marienfressinaud.fr)
+* [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/)
 * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek)
 * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
 * [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
+* [Tets42](https://github.com/Tets42):
+[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
+* [thomasE1993](https://github.com/thomasE1993):
+[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=thomasE1993)
 * [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
-- 
cgit v1.2.3


From 7378b0c7237c8ba2b8bd313e584a20fc14b37477 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 12 Sep 2015 19:08:38 +0200
Subject: Prepare version 1.1.4-dev

---
 CHANGELOG.md  | 3 +++
 constants.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be2813d30..273372192 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2015-xx-xx FreshRSS 1.1.4-beta
+
+
 ## 2015-09-12 FreshRSS 1.1.3-beta
 
 * UI
diff --git a/constants.php b/constants.php
index dbc594fc3..0035c259b 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.1.3-dev');
+define('FRESHRSS_VERSION', '1.1.4-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');
-- 
cgit v1.2.3


From 84824f8599ef8b7613c7c6829221aa8b88aa3846 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 12 Sep 2015 18:58:08 -0400
Subject: Add a visual alert on categories

When a category has one or more feeds with errors, a visual warning is displayed before the name of the category.
---
 app/Models/Category.php          | 7 +++++++
 app/layout/aside_feed.phtml      | 2 +-
 p/themes/base-theme/template.css | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Models/Category.php b/app/Models/Category.php
index 37cb44dc3..9a44a2d09 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -6,6 +6,7 @@ class FreshRSS_Category extends Minz_Model {
 	private $nbFeed = -1;
 	private $nbNotRead = -1;
 	private $feeds = null;
+	private $hasFeedsWithError = false;
 
 	public function __construct($name = '', $feeds = null) {
 		$this->_name($name);
@@ -16,6 +17,7 @@ class FreshRSS_Category extends Minz_Model {
 			foreach ($feeds as $feed) {
 				$this->nbFeed++;
 				$this->nbNotRead += $feed->nbNotRead();
+				$this->hasFeedsWithError |= $feed->inError();
 			}
 		}
 	}
@@ -51,12 +53,17 @@ class FreshRSS_Category extends Minz_Model {
 			foreach ($this->feeds as $feed) {
 				$this->nbFeed++;
 				$this->nbNotRead += $feed->nbNotRead();
+				$this->hasFeedsWithError |= $feed->inError();
 			}
 		}
 
 		return $this->feeds;
 	}
 
+	public function hasFeedsWithError() {
+		return $this->hasFeedsWithError;
+	}
+
 	public function _id($value) {
 		$this->id = $value;
 	}
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index a6d22f878..307db6af8 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -45,7 +45,7 @@
 		<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>
+				<a class="title<?php echo $cat->hasFeedsWithError() ? ' error' : ''; ?>" 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' : ''; ?>">
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index a299a5ddf..918d05942 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -776,6 +776,9 @@ input:checked + .slide-container .properties {
 .category .title:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
+.category .title.error::before {
+	content: "⚠";
+}
 .feed .item-title:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
-- 
cgit v1.2.3


From ef18adb8dcf0d43fb0b726860e32f2ec2f70542d Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 12 Sep 2015 19:54:12 -0400
Subject: Replace CSS pseudo-element syntax

Before, in the CSS files, :after and :before were in use. But those are not pseudo-classes in CSS3.
They are pseudo-elements. The syntax should use ::before and ::after instead.

See http://www.w3.org/TR/css3-selectors/#gen-content
---
 p/themes/BlueLagoon/BlueLagoon.css   | 12 ++++++------
 p/themes/BlueLagoon/template.css     | 10 +++++-----
 p/themes/Dark/dark.css               | 12 ++++++------
 p/themes/Flat/flat.css               | 14 +++++++-------
 p/themes/Origine/origine.css         | 12 ++++++------
 p/themes/Pafat/pafat.css             | 12 ++++++------
 p/themes/Screwdriver/screwdriver.css | 12 ++++++------
 p/themes/base-theme/base.css         | 12 ++++++------
 p/themes/base-theme/template.css     | 10 +++++-----
 9 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index ffb80ddb2..e1b93dac9 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -349,7 +349,7 @@ a.btn {
 	text-align: left;
 	background: #222;
 }
-.dropdown-menu:after {
+.dropdown-menu::after {
 	content: "";
 	position: absolute;
 	top: -6px;
@@ -384,7 +384,7 @@ a.btn {
 	background: -webkit-linear-gradient(top,  #0090FF 0%, #0062BE 100%);
 	color: #fff;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
@@ -626,7 +626,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"])::after {
 	position: absolute;
 	right: 3px;
 	padding: 1px 5px;
@@ -646,7 +646,7 @@ a.btn {
 .feed.item.error > a {
 	color: #BD362F;
 }
-.aside_feed .tree-folder-items .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu::after {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
@@ -988,7 +988,7 @@ opacity: 1;
 	color: #222;
 	font-weight: bold;
 }
-.box.category .title:not([data-unread="0"]):after {
+.box.category .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 5px; right: 10px;
 	border: 0;
@@ -1018,7 +1018,7 @@ opacity: 1;
 .aside.aside_feed .nav-form .dropdown .dropdown-menu {
 	right: -20px;
 }
-.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+.aside.aside_feed .nav-form .dropdown .dropdown-menu::after {
 	right: 33px;
 }
 
diff --git a/p/themes/BlueLagoon/template.css b/p/themes/BlueLagoon/template.css
index bf421e322..8c1a4ed21 100644
--- a/p/themes/BlueLagoon/template.css
+++ b/p/themes/BlueLagoon/template.css
@@ -92,7 +92,7 @@ input.extend:focus {
 /*=== COMPONENTS */
 /*===============*/
 /*=== Forms */
-.form-group:after {
+.form-group::after {
 	content: "";
 	display: block;
 	clear: both;
@@ -184,7 +184,7 @@ a.btn {
 .dropdown-menu > .item > span {
 	display: block;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	content: '✓';
 }
 .dropdown-menu .input {
@@ -315,7 +315,7 @@ a.btn {
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
-.category .btn:not([data-unread="0"]):after {
+.category .btn:not([data-unread="0"])::after {
 	content: attr(data-unread);
 }
 
@@ -334,7 +334,7 @@ a.btn {
 	text-overflow: ellipsis;
 	vertical-align: middle;
 }
-.categories .feeds .feed:not([data-unread="0"]):before {
+.categories .feeds .feed:not([data-unread="0"])::before {
 	content: "(" attr(data-unread) ") ";
 }
 .categories .feeds .dropdown-menu {
@@ -688,7 +688,7 @@ a.btn {
 	.flux_content .content a {
 		color: #000;
 	}
-	.flux_content .content a:after {
+	.flux_content .content a::after {
 		content: " [" attr(href) "] ";
 		font-style: italic;
 	}
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index cd2f85ebf..65ee0a049 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -312,7 +312,7 @@ a.btn {
 	border: 1px solid #888;
 	border-radius: 5px;
 }
-.dropdown-menu:after {
+.dropdown-menu::after {
 	content: "";
 	position: absolute;
 	top: -6px;
@@ -347,7 +347,7 @@ a.btn {
 	background: #26303F;
 	color: #888;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
@@ -551,7 +551,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"])::after {
 	position: absolute;
 	right: 0;
 	margin: 10px 0;
@@ -584,7 +584,7 @@ a.btn {
 .feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu::after {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
@@ -858,7 +858,7 @@ a.btn {
 	color: #fff;
 	font-weight: bold;
 }
-.box.category .title:not([data-unread="0"]):after {
+.box.category .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 5px; right: 10px;
 	border: 0;
@@ -894,7 +894,7 @@ a.btn {
 .aside.aside_feed .nav-form .dropdown .dropdown-menu {
 	right: -20px;
 }
-.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+.aside.aside_feed .nav-form .dropdown .dropdown-menu::after {
 	right: 33px;
 }
 
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 42b73bae2..1e5cdf8ff 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -102,7 +102,7 @@ form th {
 	border: 1px solid transparent;
 	border-radius: 3px;
 }
-.form-group:after {
+.form-group::after {
 	content: "";
 	display: block;
 	clear: both;
@@ -312,7 +312,7 @@ a.btn {
 	border: 1px solid #95a5a6;
 	border-radius: 3px;
 }
-.dropdown-menu:after {
+.dropdown-menu::after {
 	content: "";
 	position: absolute;
 	top: -6px;
@@ -347,7 +347,7 @@ a.btn {
 	background: #2980b9;
 	color: #fff;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
@@ -557,7 +557,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"])::after {
 	position: absolute;
 	right: 0;
 	margin: 10px 0;
@@ -588,7 +588,7 @@ a.btn {
 .feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu::after {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
@@ -864,7 +864,7 @@ a.btn {
 	font-weight: bold;
 	color: #fff;
 }
-.box.category .title:not([data-unread="0"]):after {
+.box.category .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 5px; right: 10px;
 	border: 0;
@@ -887,7 +887,7 @@ a.btn {
 .aside.aside_feed .nav-form .dropdown .dropdown-menu {
 	right: -20px;
 }
-.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+.aside.aside_feed .nav-form .dropdown .dropdown-menu::after {
 	right: 33px;
 }
 
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 18df4468a..ee08b33bb 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -336,7 +336,7 @@ a.btn {
 	font-size: 0.8rem;
 	text-align: left;
 }
-.dropdown-menu:after {
+.dropdown-menu::after {
 	content: "";
 	position: absolute;
 	top: -6px;
@@ -373,7 +373,7 @@ a.btn {
 	background: #0062BE;
 	color: #fff;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
@@ -591,7 +591,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .category .title:not([data-unread="0"]):after {
+.aside_feed .category .title:not([data-unread="0"])::after {
 	position: absolute;
 	right: 0;
 	margin: 10px 0;
@@ -622,7 +622,7 @@ a.btn {
 .feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu::after {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
@@ -908,7 +908,7 @@ a.btn {
 	color: #fff;
 	font-weight: bold;
 }
-.box.category .title:not([data-unread="0"]):after {
+.box.category .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 5px; right: 10px;
 	border: 0;
@@ -932,7 +932,7 @@ a.btn {
 .aside.aside_feed .nav-form .dropdown .dropdown-menu {
 	right: -20px;
 }
-.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+.aside.aside_feed .nav-form .dropdown .dropdown-menu::after {
 	right: 33px;
 }
 
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 61e5c8f63..374471ebc 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -319,7 +319,7 @@ a.btn {
 	font-size: 0.8rem;
 	text-align: left;
 }
-.dropdown-menu:after {
+.dropdown-menu::after {
 	content: "";
 	position: absolute;
 	top: -6px;
@@ -362,7 +362,7 @@ a.btn {
 	background: #eee;
 	color: #666;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
@@ -590,7 +590,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 0.25rem; right: 3px;
 	padding: 0px 5px;
@@ -633,7 +633,7 @@ a.btn {
 .feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu::after {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
@@ -918,7 +918,7 @@ a.btn {
 	font-weight: bold;
 	color: #fff;
 }
-.box.category .title:not([data-unread="0"]):after {
+.box.category .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 5px; right: 10px;
 	border: 0;
@@ -943,7 +943,7 @@ a.btn {
 .aside.aside_feed .nav-form .dropdown .dropdown-menu {
 	right: -20px;
 }
-.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+.aside.aside_feed .nav-form .dropdown .dropdown-menu::after {
 	right: 33px;
 }
 
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index a43d1801c..8754b0b2f 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -349,7 +349,7 @@ a.btn {
 	text-align: left;
 	background: #222;
 }
-.dropdown-menu:after {
+.dropdown-menu::after {
 	content: "";
 	position: absolute;
 	top: -6px;
@@ -385,7 +385,7 @@ a.btn {
 	background: #171717;
 	color: #fff;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
@@ -621,7 +621,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"])::after {
 	position: absolute;
 	right: 3px;
 	padding: 1px 5px;
@@ -641,7 +641,7 @@ a.btn {
 .feed.item.error > a {
 	color: #BD362F;
 }
-.aside_feed .tree-folder-items .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu::after {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
@@ -986,7 +986,7 @@ opacity: 1;
 	color: #222;
 	font-weight: bold;
 }
-.box.category .title:not([data-unread="0"]):after {
+.box.category .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 5px; right: 10px;
 	border: 0;
@@ -1016,7 +1016,7 @@ opacity: 1;
 .aside.aside_feed .nav-form .dropdown .dropdown-menu {
 	right: -20px;
 }
-.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+.aside.aside_feed .nav-form .dropdown .dropdown-menu::after {
 	right: 33px;
 }
 
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index f874d554c..6c788371d 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -231,7 +231,7 @@ a.btn {
 	font-size: 0.8rem;
 	text-align: left;
 }
-.dropdown-menu:after {
+.dropdown-menu::after {
 	content: "";
 	position: absolute;
 	top: -6px;
@@ -262,7 +262,7 @@ a.btn {
 }
 .dropdown-menu > .item:hover {
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
@@ -431,7 +431,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > .title:not([data-unread="0"])::after {
 	position: absolute;
 	right: 0;
 	margin: 10px 0;
@@ -456,7 +456,7 @@ a.btn {
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 }
-.aside_feed .tree-folder-items .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu::after {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
@@ -675,7 +675,7 @@ a.btn {
 .box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
 }
-.box.category .title:not([data-unread="0"]):after {
+.box.category .title:not([data-unread="0"])::after {
 	position: absolute;
 	top: 5px; right: 10px;
 	border: 0;
@@ -698,7 +698,7 @@ a.btn {
 .aside.aside_feed .nav-form .dropdown .dropdown-menu {
 	right: -20px;
 }
-.aside.aside_feed .nav-form .dropdown .dropdown-menu:after {
+.aside.aside_feed .nav-form .dropdown .dropdown-menu::after {
 	right: 33px;
 }
 
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index a299a5ddf..92d4917f5 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -111,7 +111,7 @@ td.numeric {
 /*=== COMPONENTS */
 /*===============*/
 /*=== Forms */
-.form-group:after {
+.form-group::after {
 	content: "";
 	display: block;
 	clear: both;
@@ -206,7 +206,7 @@ a.btn {
 	display: block;
 	min-width: 200px;
 }
-.dropdown-menu > .item[aria-checked="true"] > a:before {
+.dropdown-menu > .item[aria-checked="true"] > a::before {
 	content: '✓';
 }
 .dropdown-menu .input {
@@ -773,10 +773,10 @@ input:checked + .slide-container .properties {
 
 /*=== DIVERS */
 /*===========*/
-.category .title:not([data-unread="0"]):after {
+.category .title:not([data-unread="0"])::after {
 	content: attr(data-unread);
 }
-.feed .item-title:not([data-unread="0"]):before {
+.feed .item-title:not([data-unread="0"])::before {
 	content: "(" attr(data-unread) ") ";
 }
 .feed .item-title:not([data-unread="0"]) {
@@ -889,7 +889,7 @@ input:checked + .slide-container .properties {
 	.flux_content .content a {
 		color: #000;
 	}
-	.flux_content .content a:after {
+	.flux_content .content a::after {
 		content: " [" attr(href) "] ";
 		font-style: italic;
 	}
-- 
cgit v1.2.3


From 468015dad6a76700f1e3e304c497e08e6636d1a2 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 14 Oct 2015 01:11:31 -0400
Subject: Add Movim share

See #992
---
 app/i18n/cz/gen.php | 1 +
 app/i18n/de/gen.php | 1 +
 app/i18n/en/gen.php | 1 +
 app/i18n/fr/gen.php | 1 +
 app/i18n/nl/gen.php | 1 +
 data/shares.php     | 6 ++++++
 6 files changed, 11 insertions(+)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index d3e93c0a1..cbcc1f8fa 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -158,6 +158,7 @@ return array(
 		'email' => 'Email',
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
+		'movim' => 'Movim',
 		'print' => 'Tisk',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 38beb5016..d2d8e78e6 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -158,6 +158,7 @@ return array(
 		'email' => 'E-Mail',
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
+		'movim' => 'Movim',
 		'print' => 'Drucken',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index b71af91f1..1ae9c60a2 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -158,6 +158,7 @@ return array(
 		'email' => 'Email',
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
+		'movim' => 'Movim',
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index f09c73ca1..b2d36c9d6 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -158,6 +158,7 @@ return array(
 		'email' => 'Courriel',
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
+		'movim' => 'Movim',
 		'print' => 'Imprimer',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index ed57669a1..10b665791 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -157,6 +157,7 @@ return array(
 		'email' => 'Email',
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
+		'movim' => 'Movim',
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
diff --git a/data/shares.php b/data/shares.php
index 6e0e9ea0c..b3df54188 100644
--- a/data/shares.php
+++ b/data/shares.php
@@ -44,6 +44,12 @@ return array(
 		'help' => 'https://diasporafoundation.org/',
 		'form' => 'advanced',
 	),
+	'movim' => array(
+		'url' => '~URL~/index.php/share?url=~LINK~',
+		'transform' => array('rawurlencode'),
+		'help' => 'https://github.com/edhelas/movim',
+		'form' => 'advanced',
+	),
 	'twitter' => array(
 		'url' => 'https://twitter.com/share?url=~LINK~&amp;text=~TITLE~',
 		'transform' => array('rawurlencode'),
-- 
cgit v1.2.3


From e17b8d9dab99ede03098a7765fdbc61198a2f168 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 14 Oct 2015 21:22:16 -0400
Subject: fix share options to comply with latest format

---
 data/shares.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/shares.php b/data/shares.php
index b3df54188..ed060074e 100644
--- a/data/shares.php
+++ b/data/shares.php
@@ -45,8 +45,8 @@ return array(
 		'form' => 'advanced',
 	),
 	'movim' => array(
-		'url' => '~URL~/index.php/share?url=~LINK~',
-		'transform' => array('rawurlencode'),
+		'url' => '~URL~/index.php/share/~LINK~',
+		'transform' => array('rawurlencode', 'urlencode'),
 		'help' => 'https://github.com/edhelas/movim',
 		'form' => 'advanced',
 	),
-- 
cgit v1.2.3


From 45d13d33985d95a989b053cce6da0e62074426bf Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:08:25 +0200
Subject: Create admin.php

---
 app/i18n/it/admin.php | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 app/i18n/it/admin.php

diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
new file mode 100644
index 000000000..cb9a55c0b
--- /dev/null
+++ b/app/i18n/it/admin.php
@@ -0,0 +1,182 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Consenti la lettura agli utenti anonimi degli articoli dell utente predefinito (%s)',
+		'allow_anonymous_refresh' => 'Consenti agli utenti anonimi di aggiornare gli articoli',
+		'api_enabled' => 'Consenti le <abbr>API</abbr> di accesso <small>(richiesto per le app mobili)</small>',
+		'form' => 'Web form (tradizionale, richiede JavaScript)',
+		'http' => 'HTTP (per gli utenti avanzati con HTTPS)',
+		'none' => 'Nessuno (pericoloso)',
+		'persona' => 'Mozilla Persona (moderno, richiede JavaScript)',
+		'title' => 'Autenticazione',
+		'title_reset' => 'Reset autenticazione',
+		'token' => 'Token di autenticazione',
+		'token_help' => 'Consenti accesso agli RSS dell utente predefinito senza autenticazione:',
+		'type' => 'Metodo di autenticazione',
+		'unsafe_autologin' => 'Consenti accesso automatico non sicuro usando il formato: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/cache</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella della cache sono corretti.',
+		),
+		'categories' => array(
+			'nok' => 'La tabella delle categorie ha una configurazione errata.',
+			'ok' => 'Tabella delle categorie OK.',
+		),
+		'connection' => array(
+			'nok' => 'La connessione al database non può essere stabilita.',
+			'ok' => 'Connessione al database OK',
+		),
+		'ctype' => array(
+			'nok' => 'Manca una libreria richiesta per il controllo dei caratteri (php-ctype).',
+			'ok' => 'Libreria richiesta per il controllo dei caratteri presente (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Manca il supporto per cURL (pacchetto php5-curl).',
+			'ok' => 'Estensione cURL presente.',
+		),
+		'data' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella data sono corretti.',
+		),
+		'database' => 'Installazione database',
+		'dom' => array(
+			'nok' => 'Manca una libreria richiesta per leggere DOM (pacchetto php-xml).',
+			'ok' => 'Libreria richiesta per leggere DOM presente.',
+		),
+		'entries' => array(
+			'nok' => 'La tabella Entry ha una configurazione errata.',
+			'ok' => 'Tabella Entry OK.',
+		),
+		'favicons' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/favicons</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella favicons sono corretti.',
+		),
+		'feeds' => array(
+			'nok' => 'La tabella Feed ha una configurazione errata.',
+			'ok' => 'Tabella Feed OK.',
+		),
+		'files' => 'Installazione files',
+		'json' => array(
+			'nok' => 'Manca il supoorto a JSON (pacchetto php5-json).',
+			'ok' => 'Estensione JSON presente.',
+		),
+		'minz' => array(
+			'nok' => 'Manca il framework Minz.',
+			'ok' => 'Framework Minz presente.',
+		),
+		'pcre' => array(
+			'nok' => 'Manca una libreria richiesta per le regular expressions (php-pcre).',
+			'ok' => 'Libreria richiesta per le regular expressions presente (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite).',
+			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/persona</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella Mozilla Persona sono corretti.',
+		),
+		'php' => array(
+			'_' => 'Installazione PHP',
+			'nok' => 'Versione PHP %s FreshRSS richiede almeno la versione %s.',
+			'ok' => 'Versione PHP %s, compatibile con FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'Rilevate tabelle mancanti nel database.',
+			'ok' => 'Tutte le tabelle sono presenti nel database.',
+		),
+		'title' => 'Verifica installazione',
+		'tokens' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/tokens</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella tokens sono corretti.',
+		),
+		'users' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/users</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella users sono corretti.',
+		),
+		'zip' => array(
+			'nok' => 'Manca estensione ZIP (pacchetto php5-zip).',
+			'ok' => 'Estensione ZIP presente.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Disabilitata',
+		'empty_list' => 'Non ci sono estensioni installate',
+		'enabled' => 'Abilitata',
+		'no_configure_view' => 'Questa estensioni non può essere configurata.',
+		'system' => array(
+			'_' => 'Estensioni di sistema',
+			'no_rights' => 'Estensione di sistema (non hai i permessi su questo tipo)',
+		),
+		'title' => 'Estensioni',
+		'user' => 'Estensioni utente',
+	),
+	'stats' => array(
+		'_' => 'Statistiche',
+		'all_feeds' => 'Tutti i feeds',
+		'category' => 'Categoria',
+		'entry_count' => 'Articoli',
+		'entry_per_category' => 'Articoli per categoria',
+		'entry_per_day' => 'Articoli per giorno (ultimi 30 giorni)',
+		'entry_per_day_of_week' => 'Per giorno della settimana (media: %.2f articoli)',
+		'entry_per_hour' => 'Per ora (media: %.2f articoli)',
+		'entry_per_month' => 'Per mese (media: %.2f articoli)',
+		'entry_repartition' => 'Ripartizione contenuti',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds per categoria',
+		'idle' => 'Feeds non aggiornati',
+		'main' => 'Statistiche principali',
+		'main_stream' => 'Flusso principale',
+		'menu' => array(
+			'idle' => 'Feeds non aggiornati',
+			'main' => 'Statistiche principali',
+			'repartition' => 'Ripartizione articoli',
+		),
+		'no_idle' => 'Non ci sono feed non aggiornati',
+		'number_entries' => '%d articoli',
+		'percent_of_total' => '%% del totale',
+		'repartition' => 'Ripartizione articoli',
+		'status_favorites' => 'Preferiti',
+		'status_read' => 'Letti',
+		'status_total' => 'Totale',
+		'status_unread' => 'Non letti',
+		'title' => 'Statistiche',
+		'top_feed' => 'I migliori 10 feeds',
+	),
+	'system' => array(
+		'_' => 'Configurazione di sistema',
+		'instance-name' => 'Nome istanza',
+		'max-categories' => 'Limite categorie per utente',
+		'max-feeds' => 'Limite feeds per utente',
+		'registration' => array(
+			'help' => '0 significa che non esiste limite sui profili',
+			'number' => 'Numero massimo di profili',
+		),
+	),
+	'update' => array(
+		'_' => 'Aggiornamento sistema',
+		'apply' => 'Applica',
+		'check' => 'Controlla la presenza di nuovi aggiornamenti',
+		'current_version' => 'FreshRSS versione %s.',
+		'last' => 'Ultima verifica: %s',
+		'none' => 'Nessun aggiornamento da applicare',
+		'title' => 'Aggiorna sistema',
+	),
+	'user' => array(
+		'articles_and_size' => '%s articoli (%s)',
+		'create' => 'Crea nuovo utente',
+		'email_persona' => 'Indirizzo mail<br /><small>(Login <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Lingua',
+		'number' => ' %d profilo utente creato',
+		'numbers' => 'Sono presenti %d profili utente',
+		'password_form' => 'Password<br /><small>(per il login classico)</small>',
+		'password_format' => 'Almeno 7 caratteri',
+		'title' => 'Gestione utenti',
+		'user_list' => 'Lista utenti',
+		'username' => 'Nome utente',
+		'users' => 'Utenti',
+	),
+);
-- 
cgit v1.2.3


From 9fa74af0dad6334bd650d420aaf8ead6b68ddef6 Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:10:14 +0200
Subject: Create conf.php

---
 app/i18n/it/conf.php | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 app/i18n/it/conf.php

diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
new file mode 100644
index 000000000..b757b3210
--- /dev/null
+++ b/app/i18n/it/conf.php
@@ -0,0 +1,174 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archiviazione',
+		'advanced' => 'Avanzate',
+		'delete_after' => 'Rimuovi articoli dopo',
+		'help' => 'Altre opzioni sono disponibili nelle impostazioni dei singoli feed',
+		'keep_history_by_feed' => 'Numero minimo di articoli da mantenere per feed',
+		'optimize' => 'Ottimizza database',
+		'optimize_help' => 'Da fare occasionalmente per ridurre le dimensioni del database',
+		'purge_now' => 'Cancella ora',
+		'title' => 'Archiviazione',
+		'ttl' => 'Non effettuare aggiornamenti per più di',
+	),
+	'display' => array(
+		'_' => 'Visualizzazione',
+		'icon' => array(
+			'bottom_line' => 'Barra in fondo',
+			'entry' => 'Icone degli articoli',
+			'publication_date' => 'Data di pubblicazione',
+			'related_tags' => 'Tags correlati',
+			'sharing' => 'Condivisione',
+			'top_line' => 'Barra in alto',
+		),
+		'language' => 'Lingua',
+		'notif_html5' => array(
+			'seconds' => 'secondi (0 significa nessun timeout)',
+			'timeout' => 'Notifica timeout HTML5',
+		),
+		'theme' => 'Tema',
+		'title' => 'Visualizzazione',
+		'width' => array(
+			'content' => 'Larghezza contenuto',
+			'large' => 'Largo',
+			'medium' => 'Medio',
+			'no_limit' => 'Nessun limite',
+			'thin' => 'Stretto',
+		),
+	),
+	'query' => array(
+		'_' => 'Ricerche personali',
+		'deprecated' => 'Questa query non è più valida. La categoria o il feed di riferimento non stati cancellati.',
+		'filter' => 'Filtro applicato:',
+		'get_all' => 'Mostra tutti gli articoli',
+		'get_category' => 'Mostra la categoria "%s" ',
+		'get_favorite' => 'Mostra articoli preferiti',
+		'get_feed' => 'Mostra feed "%s" ',
+		'no_filter' => 'Nessun filtro',
+		'none' => 'Non hai creato nessuna ricerca personale.',
+		'number' => 'Ricerca n°%d',
+		'order_asc' => 'Mostra prima gli articoli più vecchi',
+		'order_desc' => 'Mostra prima gli articoli più nuovi',
+		'search' => 'Cerca per "%s"',
+		'state_0' => 'Mostra tutti gli articoli',
+		'state_1' => 'Mostra gli articoli letti',
+		'state_2' => 'Mostra gli articoli non letti',
+		'state_3' => 'Mostra tutti gli articoli',
+		'state_4' => 'Mostra gli articoli preferiti',
+		'state_5' => 'Mostra gli articoli preferiti letti',
+		'state_6' => 'Mostra gli articoli preferiti non letti',
+		'state_7' => 'Mostra gli articoli preferiti',
+		'state_8' => 'Non mostrare gli articoli preferiti',
+		'state_9' => 'Mostra gli articoli letti non preferiti',
+		'state_10' => 'Mostra gli articoli non letti e non preferiti',
+		'state_11' => 'Non mostrare gli articoli preferiti',
+		'state_12' => 'Mostra tutti gli articoli',
+		'state_13' => 'Mostra gli articoli letti',
+		'state_14' => 'Mostra gli articoli non letti',
+		'state_15' => 'Mostra tutti gli articoli',
+		'title' => 'Ricerche personali',
+	),
+	'profile' => array(
+		'_' => 'Gestione profili',
+		'delete' => array(
+			'_' => 'Cancellazione account',
+			'warn' => 'Il tuo account e tutti i dati associati saranno cancellati.',
+		),
+		'email_persona' => 'Indirizzo email<br /><small>(Login <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Password API<br /><small>(e.g., per applicazioni mobili)</small>',
+		'password_form' => 'Password<br /><small>(per il login classico)</small>',
+		'password_format' => 'Almeno 7 caratteri',
+		'title' => 'Profilo',
+	),
+	'reading' => array(
+		'_' => 'Lettura',
+		'after_onread' => 'Dopo “segna tutto come letto”,',
+		'articles_per_page' => 'Numero di articoli per pagina',
+		'auto_load_more' => 'Carica articoli successivi a fondo pagina',
+		'auto_remove_article' => 'Nascondi articoli dopo la lettura',
+		'mark_updated_article_unread' => 'Segna articoli aggiornati come non letti',
+		'confirm_enabled' => 'Mostra una conferma per “segna tutto come letto”',
+		'display_articles_unfolded' => 'Mostra articoli aperti di predefinito',
+		'display_categories_unfolded' => 'Mostra categorie aperte di predefinito',
+		'hide_read_feeds' => 'Nascondi categorie e feeds con articoli già letti (non funziona se “Mostra tutti gli articoli” è selezionato)',
+		'img_with_lazyload' => 'Usa la modalità "caricamento ritardato" per le immagini',
+		'jump_next' => 'Salta al successivo feed o categoria non letto',
+		'number_divided_when_reader' => 'Diviso 2 nella modalità di lettura.',
+		'read' => array(
+			'article_open_on_website' => 'Quando un articolo è aperto nel suo sito di origine',
+			'article_viewed' => 'Quando un articolo viene letto',
+			'scroll' => 'Scorrendo la pagina',
+			'upon_reception' => 'Alla ricezione del contenuto',
+			'when' => 'Segna articoli come letti…',
+		),
+		'show' => array(
+			'_' => 	'Articoli da visualizzare',
+			'adaptive' => 'Adatta visualizzazione',
+			'all_articles' => 'Mostra tutti gli articoli',
+			'unread' => 'Mostra solo non letti',
+		),
+		'sort' => array(
+			'_' => 'Ordinamento',
+			'newer_first' => 'Prima i più recenti',
+			'older_first' => 'Prima i più vecchi',
+		),
+		'sticky_post' => 'Blocca il contenuto a inizio pagina quando aperto',
+		'title' => 'Lettura',
+		'view' => array(
+			'default' => 'Visualizzazione predefinita',
+			'global' => 'Vista globale per categorie',
+			'normal' => 'Vista elenco',
+			'reader' => 'Modalità di lettura',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Condivisione',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Ulteriori informazioni',
+		'print' => 'Stampa',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Nome condivisione',
+		'share_url' => 'URL condivisione',
+		'title' => 'Condividi',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Comandi tastiera',
+		'article_action' => 'Azioni sugli articoli',
+		'auto_share' => 'Condividi',
+		'auto_share_help' => 'Se è presente un solo servizio di condivisione verrà usato quello, altrimenti usare anche il numero associato.',
+		'close_dropdown' => 'Chiudi menù',
+		'collapse_article' => 'Collassa articoli',
+		'first_article' => 'Salta al primo articolo',
+		'focus_search' => 'Modulo di ricerca',
+		'help' => 'Mostra documentazione',
+		'javascript' => 'JavaScript deve essere abilitato per poter usare i comandi da tastiera',
+		'last_article' => 'Salta all ultimo articolo',
+		'load_more' => 'Carica altri articoli',
+		'mark_read' => 'Segna come letto',
+		'mark_favorite' => 'Segna come preferito',
+		'navigation' => 'Navigazione',
+		'navigation_help' => 'Con il tasto "Shift" i comandi di navigazione verranno applicati ai feeds.<br/>Con il tasto "Alt" i comandi di navigazione verranno applicati alle categorie.',
+		'next_article' => 'Salta al contenuto successivo',
+		'other_action' => 'Altre azioni',
+		'previous_article' => 'Salta al contenuto precedente',
+		'see_on_website' => 'Vai al sito fonte',
+		'shift_for_all_read' => '+ <code>shift</code> per segnare tutti gli articoli come letti',
+		'title' => 'Comandi da tastiera',
+		'user_filter' => 'Accedi alle ricerche personali',
+		'user_filter_help' => 'Se è presente una sola ricerca personale verrà usata quella, altrimenti usare anche il numero associato.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s articoli (%s)',
+		'current' => 'Utente connesso',
+		'is_admin' => 'è amministratore',
+		'users' => 'Utenti',
+	),
+);
-- 
cgit v1.2.3


From a22bca1aaa1c7989e16d55b8dc4ad2c8f932a72a Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:11:08 +0200
Subject: Create admin.php

---
 app/i18n/it/admin.php | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 app/i18n/it/admin.php

diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
new file mode 100644
index 000000000..cb9a55c0b
--- /dev/null
+++ b/app/i18n/it/admin.php
@@ -0,0 +1,182 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Consenti la lettura agli utenti anonimi degli articoli dell utente predefinito (%s)',
+		'allow_anonymous_refresh' => 'Consenti agli utenti anonimi di aggiornare gli articoli',
+		'api_enabled' => 'Consenti le <abbr>API</abbr> di accesso <small>(richiesto per le app mobili)</small>',
+		'form' => 'Web form (tradizionale, richiede JavaScript)',
+		'http' => 'HTTP (per gli utenti avanzati con HTTPS)',
+		'none' => 'Nessuno (pericoloso)',
+		'persona' => 'Mozilla Persona (moderno, richiede JavaScript)',
+		'title' => 'Autenticazione',
+		'title_reset' => 'Reset autenticazione',
+		'token' => 'Token di autenticazione',
+		'token_help' => 'Consenti accesso agli RSS dell utente predefinito senza autenticazione:',
+		'type' => 'Metodo di autenticazione',
+		'unsafe_autologin' => 'Consenti accesso automatico non sicuro usando il formato: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/cache</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella della cache sono corretti.',
+		),
+		'categories' => array(
+			'nok' => 'La tabella delle categorie ha una configurazione errata.',
+			'ok' => 'Tabella delle categorie OK.',
+		),
+		'connection' => array(
+			'nok' => 'La connessione al database non può essere stabilita.',
+			'ok' => 'Connessione al database OK',
+		),
+		'ctype' => array(
+			'nok' => 'Manca una libreria richiesta per il controllo dei caratteri (php-ctype).',
+			'ok' => 'Libreria richiesta per il controllo dei caratteri presente (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Manca il supporto per cURL (pacchetto php5-curl).',
+			'ok' => 'Estensione cURL presente.',
+		),
+		'data' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella data sono corretti.',
+		),
+		'database' => 'Installazione database',
+		'dom' => array(
+			'nok' => 'Manca una libreria richiesta per leggere DOM (pacchetto php-xml).',
+			'ok' => 'Libreria richiesta per leggere DOM presente.',
+		),
+		'entries' => array(
+			'nok' => 'La tabella Entry ha una configurazione errata.',
+			'ok' => 'Tabella Entry OK.',
+		),
+		'favicons' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/favicons</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella favicons sono corretti.',
+		),
+		'feeds' => array(
+			'nok' => 'La tabella Feed ha una configurazione errata.',
+			'ok' => 'Tabella Feed OK.',
+		),
+		'files' => 'Installazione files',
+		'json' => array(
+			'nok' => 'Manca il supoorto a JSON (pacchetto php5-json).',
+			'ok' => 'Estensione JSON presente.',
+		),
+		'minz' => array(
+			'nok' => 'Manca il framework Minz.',
+			'ok' => 'Framework Minz presente.',
+		),
+		'pcre' => array(
+			'nok' => 'Manca una libreria richiesta per le regular expressions (php-pcre).',
+			'ok' => 'Libreria richiesta per le regular expressions presente (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite).',
+			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/persona</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella Mozilla Persona sono corretti.',
+		),
+		'php' => array(
+			'_' => 'Installazione PHP',
+			'nok' => 'Versione PHP %s FreshRSS richiede almeno la versione %s.',
+			'ok' => 'Versione PHP %s, compatibile con FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'Rilevate tabelle mancanti nel database.',
+			'ok' => 'Tutte le tabelle sono presenti nel database.',
+		),
+		'title' => 'Verifica installazione',
+		'tokens' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/tokens</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella tokens sono corretti.',
+		),
+		'users' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/users</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella users sono corretti.',
+		),
+		'zip' => array(
+			'nok' => 'Manca estensione ZIP (pacchetto php5-zip).',
+			'ok' => 'Estensione ZIP presente.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Disabilitata',
+		'empty_list' => 'Non ci sono estensioni installate',
+		'enabled' => 'Abilitata',
+		'no_configure_view' => 'Questa estensioni non può essere configurata.',
+		'system' => array(
+			'_' => 'Estensioni di sistema',
+			'no_rights' => 'Estensione di sistema (non hai i permessi su questo tipo)',
+		),
+		'title' => 'Estensioni',
+		'user' => 'Estensioni utente',
+	),
+	'stats' => array(
+		'_' => 'Statistiche',
+		'all_feeds' => 'Tutti i feeds',
+		'category' => 'Categoria',
+		'entry_count' => 'Articoli',
+		'entry_per_category' => 'Articoli per categoria',
+		'entry_per_day' => 'Articoli per giorno (ultimi 30 giorni)',
+		'entry_per_day_of_week' => 'Per giorno della settimana (media: %.2f articoli)',
+		'entry_per_hour' => 'Per ora (media: %.2f articoli)',
+		'entry_per_month' => 'Per mese (media: %.2f articoli)',
+		'entry_repartition' => 'Ripartizione contenuti',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds per categoria',
+		'idle' => 'Feeds non aggiornati',
+		'main' => 'Statistiche principali',
+		'main_stream' => 'Flusso principale',
+		'menu' => array(
+			'idle' => 'Feeds non aggiornati',
+			'main' => 'Statistiche principali',
+			'repartition' => 'Ripartizione articoli',
+		),
+		'no_idle' => 'Non ci sono feed non aggiornati',
+		'number_entries' => '%d articoli',
+		'percent_of_total' => '%% del totale',
+		'repartition' => 'Ripartizione articoli',
+		'status_favorites' => 'Preferiti',
+		'status_read' => 'Letti',
+		'status_total' => 'Totale',
+		'status_unread' => 'Non letti',
+		'title' => 'Statistiche',
+		'top_feed' => 'I migliori 10 feeds',
+	),
+	'system' => array(
+		'_' => 'Configurazione di sistema',
+		'instance-name' => 'Nome istanza',
+		'max-categories' => 'Limite categorie per utente',
+		'max-feeds' => 'Limite feeds per utente',
+		'registration' => array(
+			'help' => '0 significa che non esiste limite sui profili',
+			'number' => 'Numero massimo di profili',
+		),
+	),
+	'update' => array(
+		'_' => 'Aggiornamento sistema',
+		'apply' => 'Applica',
+		'check' => 'Controlla la presenza di nuovi aggiornamenti',
+		'current_version' => 'FreshRSS versione %s.',
+		'last' => 'Ultima verifica: %s',
+		'none' => 'Nessun aggiornamento da applicare',
+		'title' => 'Aggiorna sistema',
+	),
+	'user' => array(
+		'articles_and_size' => '%s articoli (%s)',
+		'create' => 'Crea nuovo utente',
+		'email_persona' => 'Indirizzo mail<br /><small>(Login <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Lingua',
+		'number' => ' %d profilo utente creato',
+		'numbers' => 'Sono presenti %d profili utente',
+		'password_form' => 'Password<br /><small>(per il login classico)</small>',
+		'password_format' => 'Almeno 7 caratteri',
+		'title' => 'Gestione utenti',
+		'user_list' => 'Lista utenti',
+		'username' => 'Nome utente',
+		'users' => 'Utenti',
+	),
+);
-- 
cgit v1.2.3


From fb085db9e333cad910e8be56cdb274d988245477 Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:11:26 +0200
Subject: Create install.php

---
 app/i18n/it/install.php | 114 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 app/i18n/it/install.php

diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
new file mode 100644
index 000000000..3ad22c5e9
--- /dev/null
+++ b/app/i18n/it/install.php
@@ -0,0 +1,114 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Installazione completata',
+		'fix_errors_before' => 'Per favore correggi gli errori prima di passare al passaggio successivo.',
+		'keep_install' => 'Mantieni installazione precedente',
+		'next_step' => 'Vai al prossimo passaggio',
+		'reinstall' => 'Reinstalla FreshRSS',
+	),
+	'auth' => array(
+		'email_persona' => 'Indirizzo mail<br /><small>(per <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Web form (tradizionale, richiede JavaScript)',
+		'http' => 'HTTP (per gli utenti avanzati con HTTPS)',
+		'none' => 'Nessuno (pericoloso)',
+		'password_form' => 'Password<br /><small>(per il login tramite Web-form tradizionale)</small>',
+		'password_format' => 'Almeno 7 caratteri',
+		'persona' => 'Mozilla Persona (moderno, richiede JavaScript)',
+		'type' => 'Metodo di autenticazione',
+	),
+	'bdd' => array(
+		'_' => 'Database',
+		'conf' => array(
+			'_' => 'Configurazione database',
+			'ko' => 'Verifica le informazioni del database.',
+			'ok' => 'Le configurazioni del database sono state salvate.',
+		),
+		'host' => 'Host',
+		'prefix' => 'Prefisso tabella',
+		'password' => 'HTTP password',
+		'type' => 'Tipo di database',
+		'username' => 'HTTP username',
+	),
+	'check' => array(
+		'_' => 'Controlli',
+		'already_installed' => 'FreshRSS risulta già installato!',
+		'cache' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/cache</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella della cache sono corretti.',
+		),
+		'ctype' => array(
+			'nok' => 'Manca una libreria richiesta per il controllo dei caratteri (php-ctype).',
+			'ok' => 'Libreria richiesta per il controllo dei caratteri presente (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Manca il supporto per cURL (pacchetto php5-curl).',
+			'ok' => 'Estensione cURL presente.',
+		),
+		'data' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella data sono corretti.',
+		),
+		'dom' => array(
+			'nok' => 'Manca una libreria richiesta per leggere DOM (pacchetto php-xml).',
+			'ok' => 'Libreria richiesta per leggere DOM presente.',
+		),
+		'favicons' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/favicons</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella favicons sono corretti.',
+		),
+		'http_referer' => array(
+			'nok' => 'Per favore verifica che non stai alterando il tuo HTTP REFERER.',
+			'ok' => 'Il tuo HTTP REFERER riconosciuto corrisponde al tuo server.',
+		),
+		'minz' => array(
+			'nok' => 'Manca il framework Minz.',
+			'ok' => 'Framework Minz presente.',
+		),
+		'pcre' => array(
+			'nok' => 'Manca una libreria richiesta per le regular expressions (php-pcre).',
+			'ok' => 'Libreria richiesta per le regular expressions presente (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite).',
+			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/persona</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella Mozilla Persona sono corretti.',
+		),
+		'php' => array(
+			'_' => 'Installazione PHP',
+			'nok' => 'Versione di PHP %s FreshRSS richiede almeno la versione %s.',
+			'ok' => 'Versione di PHP %s, compatibile con FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Verifica i permessi sulla cartella <em>./data/users</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+			'ok' => 'I permessi sulla cartella users sono corretti.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Configurazioni generali',
+		'ok' => 'Configurazioni generali salvate.',
+	),
+	'congratulations' => 'Congratulazione!',
+	'default_user' => 'Username utente predefinito <small>(massimo 16 caratteri alfanumerici)</small>',
+	'delete_articles_after' => 'Rimuovi articoli dopo',
+	'fix_errors_before' => 'Per favore correggi gli errori prima di passare al passaggio successivo.',
+	'javascript_is_better' => 'FreshRSS funziona meglio con JavaScript abilitato',
+	'js' => array(
+		'confirm_reinstall' => 'Reinstallando FreshRSS perderai la configurazione precedente. Sei sicuro di voler procedere?',
+	),
+	'language' => array(
+		'_' => 'Lingua',
+		'choose' => 'Seleziona la lingua per FreshRSS',
+		'defined' => 'Lingua impostata.',
+	),
+	'not_deleted' => 'Qualcosa non ha funzionato; devi cancellare il file <em>%s</em> manualmente.',
+	'ok' => 'Processo di installazione terminato con successo.',
+	'step' => 'Passaggio %d',
+	'steps' => 'Passaggi',
+	'title' => 'Installazione · FreshRSS',
+	'this_is_the_end' => 'Fine',
+);
-- 
cgit v1.2.3


From 07b252ad4380bad10614660264773608a5378fb6 Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:11:50 +0200
Subject: Create feedback.php

---
 app/i18n/it/feedback.php | 110 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 app/i18n/it/feedback.php

diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php
new file mode 100644
index 000000000..caf1cd2b4
--- /dev/null
+++ b/app/i18n/it/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Ottimizzazione completata',
+	),
+	'access' => array(
+		'denied' => 'Non hai i permessi per accedere a questa pagina',
+		'not_found' => 'Pagina non disponibile',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Si è verificato un problema alla configurazione del sistema di autenticazione. Per favore riprova più tardi.',
+			'set' => 'Sistema di autenticazione tramite Form impostato come predefinito.',
+		),
+		'login' => array(
+			'invalid' => 'Autenticazione non valida',
+			'success' => 'Autenticazione effettuata',
+		),
+		'logout' => array(
+			'success' => 'Disconnessione effettuata',
+		),
+		'no_password_set' => 'Password di amministrazione non impostata. Opzione non disponibile.',
+		'not_persona' => 'Solo il sistema Mozilla Persona può essere resettato.',
+	),
+	'conf' => array(
+		'error' => 'Si è verificato un errore durante il salvataggio della configurazione',
+		'query_created' => 'Ricerca "%s" creata.',
+		'shortcuts_updated' => 'Collegamenti tastiera aggiornati',
+		'updated' => 'Configurazione aggiornata',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s è già abilitata',
+		'disable' => array(
+			'ko' => '%s non può essere disabilitata. <a href="%s">Verifica i logs</a> per dettagli.',
+			'ok' => '%s è disabilitata',
+		),
+		'enable' => array(
+			'ko' => '%s non può essere abilitata. <a href="%s">Verifica i logs</a> per dettagli.',
+			'ok' => '%s è ora abilitata',
+		),
+		'no_access' => 'Accesso negato a %s',
+		'not_enabled' => '%s non abilitato',
+		'not_found' => '%s non disponibile',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Estensione Zip non presente sul server. Per favore esporta i files singolarmente.',
+		'feeds_imported' => 'I tuoi feed sono stati importati e saranno aggiornati',
+		'feeds_imported_with_errors' => 'I tuoi feeds sono stati importati ma si sono verificati alcuni errori',
+		'file_cannot_be_uploaded' => 'Il file non può essere caricato!',
+		'no_zip_extension' => 'Estensione Zip non presente sul server.',
+		'zip_error' => 'Si è verificato un errore importando il file Zip',
+	),
+	'sub' => array(
+		'actualize' => 'Aggiorna',
+		'category' => array(
+			'created' => 'Categoria %s creata.',
+			'deleted' => 'Categoria cancellata',
+			'emptied' => 'Categoria svuotata',
+			'error' => 'Categoria non aggiornata',
+			'name_exists' => 'Categoria già esistente.',
+			'no_id' => 'Categoria senza ID.',
+			'no_name' => 'Il nome della categoria non può essere lasciato vuoto.',
+			'not_delete_default' => 'Non puoi cancellare la categoria predefinita!',
+			'not_exist' => 'La categoria non esite!',
+			'over_max' => 'Hai raggiunto il numero limite di categorie (%d)',
+			'updated' => 'Categoria aggiornata.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> aggiornato',
+			'actualizeds' => 'RSS feeds aggiornati',
+			'added' => 'RSS feed <em>%s</em> aggiunti',
+			'already_subscribed' => 'Hai già sottoscritto <em>%s</em>',
+			'deleted' => 'Feed cancellato',
+			'error' => 'Feed non aggiornato',
+			'internal_problem' => 'RSS feed non aggiunto. <a href="%s">Verifica i logs</a> per dettagli.',
+			'invalid_url' => 'URL <em>%s</em> non valido',
+			'marked_read' => 'Feeds segnati come letti',
+			'n_actualized' => '%d feeds aggiornati',
+			'n_entries_deleted' => '%d articoli cancellati',
+			'no_refresh' => 'Nessun aggiornamento disponibile…',
+			'not_added' => '<em>%s</em> non può essere aggiunto',
+			'over_max' => 'Hai raggiunto il numero limite di feed (%d)',
+			'updated' => 'Feed aggiornato',
+		),
+		'purge_completed' => 'Svecchiamento completato (%d articoli cancellati)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS verrà aggiornato alla <strong>versione %s</strong>.',
+		'error' => 'Il processo di aggiornamento ha riscontrato il seguente errore: %s',
+		'file_is_nok' => 'Verifica i permessi della cartella <em>%s</em>. Il server HTTP deve avere i permessi per la scrittura ',
+		'finished' => 'Aggiornamento completato con successo!',
+		'none' => 'Nessun aggiornamento disponibile',
+		'server_not_found' => 'Server per aggiornamento non disponibile. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'Utente %s creato',
+			'error' => 'Errore nella creazione utente %s ',
+		),
+		'deleted' => array(
+			'_' => 'Utente %s cancellato',
+			'error' => 'Utente %s non cancellato',
+		),
+	),
+	'profile' => array(
+		'error' => 'Il tuo profilo non può essere modificato',
+		'updated' => 'Il tuo profilo è stato modificato',
+	),
+);
-- 
cgit v1.2.3


From 78a7586e205cae03e5468561d3a4a1b0012557dd Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:12:14 +0200
Subject: Create gen.php

---
 app/i18n/it/gen.php | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 app/i18n/it/gen.php

diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
new file mode 100644
index 000000000..eb545b8cf
--- /dev/null
+++ b/app/i18n/it/gen.php
@@ -0,0 +1,180 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Aggiorna',
+		'back_to_rss_feeds' => '← Indietro',
+		'cancel' => 'Annulla',
+		'create' => 'Crea',
+		'disable' => 'Disabilita',
+		'empty' => 'Vuoto',
+		'enable' => 'Abilita',
+		'export' => 'Esporta',
+		'filter' => 'Filtra',
+		'import' => 'Importa',
+		'manage' => 'Gestisci',
+		'mark_read' => 'Segna come letto',
+		'mark_favorite' => 'Segna come preferito',
+		'remove' => 'Rimuovi',
+		'see_website' => 'Vai al sito',
+		'submit' => 'Conferma',
+		'truncate' => 'Cancella tutti gli articoli',
+	),
+	'auth' => array(
+		'email' => 'Indirizzo email',
+		'keep_logged_in' => 'Ricorda i dati <small>(1 mese)</small>',
+		'login' => 'Accedi',
+		'login_persona' => 'Accedi con Mozilla Persona',
+		'login_persona_problem' => 'Problemi di connessione con Mozilla Persona?',
+		'logout' => 'Esci',
+		'password' => array(
+			'_' => 'Password',
+			'format' => '<small>almeno 7 caratteri</small>',
+		),
+		'registration' => array(
+			'_' => 'Nuovo profilo',
+			'ask' => 'Vuoi creare un nuovo profilo?',
+			'title' => 'Creazione profilo',
+		),
+		'reset' => 'Reset autenticazione',
+		'username' => array(
+			'_' => 'Username',
+			'admin' => 'Username amministratore',
+			'format' => '<small>massimo 16 caratteri alfanumerici</small>',
+		),
+		'will_reset' => 'Il sistema di autenticazione verrà resettato: un form verrà usato per Mozilla Persona.',
+	),
+	'date' => array(
+		'Apr' => '\\A\\p\\r\\i\\l\\e',
+		'Aug' => '\\A\\g\\o\\s\\t\\o',
+		'Dec' => '\\D\\i\\c\\e\\m\\b\\r\\e',
+		'Feb' => '\\F\\e\\b\\b\\r\\a\\i\\o',
+		'Jan' => '\\G\\e\\n\\u\\a\\i\\o',
+		'Jul' => '\\L\\u\\g\\l\\i\\o',
+		'Jun' => '\\G\\i\\u\\g\\n\\o',
+		'Mar' => '\\M\\a\\r\\z\\o',
+		'May' => '\\M\\a\\g\\g\\i\\o',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\r\\e',
+		'Oct' => '\\O\\t\\t\\o\\b\\r\\e',
+		'Sep' => '\\S\\e\\t\\t\\e\\m\\b\\r\\e',
+		'apr' => 'apr',
+		'april' => 'Apr',
+		'aug' => 'aug',
+		'august' => 'Aug',
+		'before_yesterday' => 'Meno recenti',
+		'dec' => 'dec',
+		'december' => 'Dec',
+		'feb' => 'feb',
+		'february' => 'Feb',
+		'format_date' => 'j\\ %s Y',
+		'format_date_hour' => 'j\\ %s Y \\o\\r\\e H\\:i',
+		'fri' => 'Fri',
+		'jan' => 'jan',
+		'january' => 'Jan',
+		'jul' => 'jul',
+		'july' => 'Jul',
+		'jun' => 'jun',
+		'june' => 'Jun',
+		'last_3_month' => 'Ultimi 3 mesi',
+		'last_6_month' => 'Ultimi 6 mesi',
+		'last_month' => 'Ultimo mese',
+		'last_week' => 'Ultima settimana',
+		'last_year' => 'Ultimo anno',
+		'mar' => 'mar',
+		'march' => 'Mar',
+		'may' => 'May',
+		'mon' => 'Mon',
+		'month' => 'mesi',
+		'nov' => 'nov',
+		'november' => 'Nov',
+		'oct' => 'oct',
+		'october' => 'Oct',
+		'sat' => 'Sat',
+		'sep' => 'sep',
+		'september' => 'Sep',
+		'sun' => 'Sun',
+		'thu' => 'Thu',
+		'today' => 'Oggi',
+		'tue' => 'Tue',
+		'wed' => 'Wed',
+		'yesterday' => 'Ieri',
+	),
+	'freshrss' => array(
+		'_' => 'Feed RSS Reader',
+		'about' => 'Informazioni',
+	),
+	'js' => array(
+		'category_empty' => 'Categoria vuota',
+		'confirm_action' => 'Sei sicuro di voler continuare?',
+		'confirm_action_feed_cat' => 'Sei sicuro di voler continuare? Verranno persi i preferiti e le ricerche utente correlate!',
+		'feedback' => array(
+			'body_new_articles' => 'Ci sono \\d nuovi articoli da leggere.',
+			'request_failed' => 'Richiesta fallita, probabilmente a causa di problemi di connessione',
+			'title_new_articles' => 'Feed RSS Reader: nuovi articoli!',
+		),
+		'new_article' => 'Sono disponibili nuovi articoli, clicca qui per caricarli.',
+		'should_be_activated' => 'JavaScript deve essere abilitato',
+	),
+	'lang' => array(
+		'cz' => 'Čeština',
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'it' => 'Italiano',
+		'nl' => 'Nederlands',
+	),
+	'menu' => array(
+		'about' => 'Informazioni',
+		'admin' => 'Amministrazione',
+		'archiving' => 'Archiviazione',
+		'authentication' => 'Autenticazione',
+		'check_install' => 'Installazione',
+		'configuration' => 'Configurazione',
+		'display' => 'Visualizzazione',
+		'extensions' => 'Estensioni',
+		'logs' => 'Logs',
+		'queries' => 'Ricerche personali',
+		'reading' => 'Lettura',
+		'search' => 'Ricerca parole o #tags',
+		'sharing' => 'Condivisione',
+		'shortcuts' => 'Comandi tastiera',
+		'stats' => 'Statistiche',
+		'system' => 'Configurazione sistema',
+		'update' => 'Aggiornamento',
+		'user_management' => 'Gestione utenti',
+		'user_profile' => 'Profilo',
+	),
+	'pagination' => array(
+		'first' => 'Prima',
+		'last' => 'Ultima',
+		'load_more' => 'Carica altri articoli',
+		'mark_all_read' => 'Segna tutto come letto',
+		'next' => 'Successiva',
+		'nothing_to_load' => 'Non ci sono altri articoli',
+		'previous' => 'Precedente',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Stampa',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Attenzione!',
+		'blank_to_disable' => 'Lascia vuoto per disabilitare',
+		'by_author' => 'di <em>%s</em>',
+		'by_default' => 'predefinito',
+		'damn' => 'Ops!',
+		'default_category' => 'Senza categoria',
+		'no' => 'No',
+		'not_applicable' => 'Non disponibile',
+		'ok' => 'OK!',
+		'or' => 'o',
+		'yes' => 'Si',
+	),
+);
-- 
cgit v1.2.3


From 30fe1a152175ad01c8748fb767f42f1eda117b33 Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:12:33 +0200
Subject: Create index.php

---
 app/i18n/it/index.php | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 app/i18n/it/index.php

diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php
new file mode 100644
index 000000000..584b044b1
--- /dev/null
+++ b/app/i18n/it/index.php
@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'Informazioni',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Bugs',
+		'credits' => 'Crediti',
+		'credits_content' => 'Alcuni elementi di design provengono da <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> sebbene FreshRSS non usi questo framework. Le <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icone</a> provengono dal progetto <a href="https://www.gnome.org/">GNOME</a>. Il carattere <em>Open Sans</em> è stato creato da <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Le Favicons vengono estratte con le API <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS è basato su <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
+		'freshrss_description' => 'FreshRSS è un aggregatore di feeds RSS da installare sul proprio host come <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="http://projet.idleman.fr/leed/">Leed</a>. Leggero e facile da mantenere pur essendo molto configurabile e potente.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">su Github</a>',
+		'license' => 'Licenza',
+		'project_website' => 'Sito del progetto',
+		'title' => 'Informazioni',
+		'version' => 'Versione',
+		'website' => 'Sito',
+	),
+	'feed' => array(
+		'add' => 'Aggiungi un Feed RSS',
+		'empty' => 'Non ci sono articoli da mostrare.',
+		'rss_of' => 'RSS feed di %s',
+		'title' => 'RSS feeds',
+		'title_global' => 'Vista globale per categorie',
+		'title_fav' => 'Preferiti',
+	),
+	'log' => array(
+		'_' => 'Logs',
+		'clear' => 'Svuota logs',
+		'empty' => 'File di log vuoto',
+		'title' => 'Logs',
+	),
+	'menu' => array(
+		'about' => 'Informazioni',
+		'add_query' => 'Aggiungi ricerca',
+		'before_one_day' => 'Giorno precedente',
+		'before_one_week' => 'Settimana precedente',
+		'favorites' => 'Preferiti (%s)',
+		'global_view' => 'Vista globale per categorie',
+		'main_stream' => 'Flusso principale',
+		'mark_all_read' => 'Segna tutto come letto',
+		'mark_cat_read' => 'Segna la categoria come letta',
+		'mark_feed_read' => 'Segna il feed come letto',
+		'newer_first' => 'Mostra prima i recenti',
+		'non-starred' => 'Escludi preferiti',
+		'normal_view' => 'Vista elenco',
+		'older_first' => 'Ordina per meno recenti',
+		'queries' => 'Chiavi di ricerca',
+		'read' => 'Mostra solo letti',
+		'reader_view' => 'Modalità di lettura',
+		'rss_view' => 'RSS feed',
+		'search_short' => 'Cerca',
+		'starred' => 'Mostra solo preferiti',
+		'stats' => 'Statistiche',
+		'subscription' => 'Gestione sottoscrizioni',
+		'unread' => 'Mostra solo non letti',
+	),
+	'share' => 'Condividi',
+	'tag' => array(
+		'related' => 'Tags correlati',
+	),
+);
-- 
cgit v1.2.3


From 64953e6b5cb8ec287bcb9f28882bdb2d338bfebd Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:12:51 +0200
Subject: Create sub.php

---
 app/i18n/it/sub.php | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 app/i18n/it/sub.php

diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
new file mode 100644
index 000000000..dfcee2ce3
--- /dev/null
+++ b/app/i18n/it/sub.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Categoria',
+		'add' => 'Aggiungi una categoria',
+		'empty' => 'Categoria vuota',
+		'new' => 'Nuova categoria',
+	),
+	'feed' => array(
+		'add' => 'Aggiungi un Feed RSS',
+		'advanced' => 'Avanzate',
+		'archiving' => 'Archiviazione',
+		'auth' => array(
+			'configuration' => 'Autenticazione',
+			'help' => 'Accesso per feeds protetti',
+			'http' => 'Autenticazione HTTP',
+			'password' => 'HTTP password',
+			'username' => 'HTTP username',
+		),
+		'css_help' => 'In caso di RSS feeds troncati (attenzione, richiede molto tempo!)',
+		'css_path' => 'Percorso del foglio di stile CSS del sito di origine',
+		'description' => 'Descrizione',
+		'empty' => 'Questo feed non contiene articoli. Per favore verifica il sito direttamente.',
+		'error' => 'Questo feed ha generato un errore. Per favore verifica se ancora disponibile.',
+		'in_main_stream' => 'Mostra in homepage',
+		'informations' => 'Informazioni',
+		'keep_history' => 'Numero minimo di articoli da mantenere',
+		'moved_category_deleted' => 'Cancellando una categoria i feed al suo interno verranno classificati automaticamente come <em>%s</em>.',
+		'no_selected' => 'Nessun feed selezionato.',
+		'number_entries' => '%d articoli',
+		'stats' => 'Statistiche',
+		'think_to_add' => 'Aggiungi feed.',
+		'title' => 'Titolo',
+		'title_add' => 'Aggiungi RSS feed',
+		'ttl' => 'Non aggiornare automaticamente piu di',
+		'url' => 'Feed URL',
+		'validator' => 'Controlla la validita del feed ',
+		'website' => 'URL del sito',
+		'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub',
+	),
+	'import_export' => array(
+		'export' => 'Esporta',
+		'export_opml' => 'Esporta tutta la lista dei feed (OPML)',
+		'export_starred' => 'Esporta i tuoi preferiti',
+		'feed_list' => 'Elenco di %s articoli',
+		'file_to_import' => 'File da importare<br />(OPML, Json o Zip)',
+		'file_to_import_no_zip' => 'File da importare<br />(OPML o Json)',
+		'import' => 'Importa',
+		'starred_list' => 'Elenco articoli preferiti',
+		'title' => 'Importa / esporta',
+	),
+	'menu' => array(
+		'bookmark' => 'Bookmark (trascina nei preferiti)',
+		'import_export' => 'Importa / esporta',
+		'subscription_management' => 'Gestione sottoscrizioni',
+	),
+	'title' => array(
+		'_' => 'Gestione sottoscrizioni',
+		'feed_management' => 'Gestione RSS feeds',
+	),
+);
-- 
cgit v1.2.3


From 7be1dde4e09676b87493e0124d43c82a2de3bc7f Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:36:17 +0200
Subject: Update gen.php

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

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index d3e93c0a1..f549eaaea 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'it' => 'Italian',		
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
-- 
cgit v1.2.3


From 0a0ae09d02db2da8cf83e848feea999e9148a9fc Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:36:37 +0200
Subject: Update gen.php

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

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 38beb5016..50eaed1c5 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'it' => 'Italian',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
-- 
cgit v1.2.3


From 89965d656c2f56fb6adc9d7440eae6b9ca04b7d9 Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:37:02 +0200
Subject: Update gen.php

---
 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 b71af91f1..785ab0279 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'it' => 'Italian',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
-- 
cgit v1.2.3


From b4f80f96119fd8c3e8ab8f70c2ad55224bad2a59 Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:37:21 +0200
Subject: Update gen.php

---
 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 f09c73ca1..2a83a14dd 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'it' => 'Italian',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
-- 
cgit v1.2.3


From fe21c0bb5cc544cb89d207b50e17e44907a14133 Mon Sep 17 00:00:00 2001
From: Marco <mrcnet@gmail.com>
Date: Sat, 24 Oct 2015 15:37:38 +0200
Subject: Update gen.php

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

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index ed57669a1..f33438702 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -120,6 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
+		'it' => 'Italian',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
-- 
cgit v1.2.3


From f4a0bb25e20552fae109689cfab13e2c09c3f48a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Oct 2015 21:48:29 +0200
Subject: i18n: Italiano

https://github.com/FreshRSS/FreshRSS/issues/1003
---
 app/i18n/cz/gen.php | 2 +-
 app/i18n/de/gen.php | 2 +-
 app/i18n/en/gen.php | 2 +-
 app/i18n/fr/gen.php | 2 +-
 app/i18n/nl/gen.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 6b89cf627..ffc138abb 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -120,7 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-		'it' => 'Italian',		
+		'it' => 'Italiano',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 6e5dc7c3f..842383498 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -120,7 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-		'it' => 'Italian',
+		'it' => 'Italiano',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index c9a7e2d4e..d23b12f95 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -120,7 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-		'it' => 'Italian',
+		'it' => 'Italiano',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index fc16c74ab..2f16f09b9 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -120,7 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-		'it' => 'Italian',
+		'it' => 'Italiano',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index f61cb638b..b8467f92f 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -120,7 +120,7 @@ return array(
 		'de' => 'Deutsch',
 		'en' => 'English',
 		'fr' => 'Français',
-		'it' => 'Italian',
+		'it' => 'Italiano',
 		'nl' => 'Nederlands',
 	),
 	'menu' => array(
-- 
cgit v1.2.3


From 0202fd19ed310fc5ae6e098348ea02b4d43b82d7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Oct 2015 21:58:32 +0200
Subject: Changelog 1.1.4

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 273372192..d97dae52f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## 2015-xx-xx FreshRSS 1.1.4-beta
 
+* Features
+	* Share with Movim [#992](https://github.com/FreshRSS/FreshRSS/issues/992)
+* UI
+	* Visual alert on categories containing feeds in error [#984](https://github.com/FreshRSS/FreshRSS/pull/984)
+* I18n
+	* Italian [#1003](https://github.com/FreshRSS/FreshRSS/issues/1003)
+
 
 ## 2015-09-12 FreshRSS 1.1.3-beta
 
-- 
cgit v1.2.3


From 481c2a671913cdd6099a1b6ee4d5491dff16c0bf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Oct 2015 22:25:48 +0200
Subject: Clean logs

Reduced login of API and PubSubHubbub (both are quite stable now).
When clearing logs as admin, also clear API and PubSubHubbub logs.
https://github.com/FreshRSS/FreshRSS/issues/988
---
 app/Controllers/feedController.php |  4 ++--
 app/Models/LogDAO.php              |  5 +++++
 p/api/greader.php                  | 38 +++++++++++++++++++-------------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ec3dce777..4ec661115 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -307,9 +307,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			$pubSubHubbubEnabled = $pubsubhubbubEnabledGeneral && $feed->pubSubHubbubEnabled();
 			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
-				$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
+				//$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
 				//Minz_Log::debug($text);
-				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
+				//file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 				continue;	//When PubSubHubbub is used, do not pull refresh so often
 			}
 
diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
index 4c56e3150..ab258cd58 100644
--- a/app/Models/LogDAO.php
+++ b/app/Models/LogDAO.php
@@ -21,5 +21,10 @@ class FreshRSS_LogDAO {
 
 	public static function truncate() {
 		file_put_contents(join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt'), '');
+		if (FreshRSS_Auth::hasAccess('admin')) {
+			file_put_contents(join_path(DATA_PATH, 'users', '_', 'log.txt'), '');
+			file_put_contents(join_path(DATA_PATH, 'users', '_', 'log_api.txt'), '');
+			file_put_contents(join_path(DATA_PATH, 'users', '_', 'log_pshb.txt'), '');
+		}
 	}
 }
diff --git a/p/api/greader.php b/p/api/greader.php
index 5a23af006..b9942f0bc 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(join_path(USERS_PATH, '_', 'log_api.txt'), $text, FILE_APPEND);
+	file_put_contents(join_path(USERS_PATH, '_', 'log_api.txt'), date('c') . "\t" . $text . "\n", FILE_APPEND);
 }
 
 function debugInfo() {
@@ -96,7 +96,7 @@ function debugInfo() {
 }
 
 function badRequest() {
-	logMe("badRequest()\n");
+	logMe("badRequest()");
 	logMe(debugInfo());
 	header('HTTP/1.1 400 Bad Request');
 	header('Content-Type: text/plain; charset=UTF-8');
@@ -104,7 +104,7 @@ function badRequest() {
 }
 
 function unauthorized() {
-	logMe("unauthorized()\n");
+	logMe("unauthorized()");
 	logMe(debugInfo());
 	header('HTTP/1.1 401 Unauthorized');
 	header('Content-Type: text/plain; charset=UTF-8');
@@ -113,7 +113,7 @@ function unauthorized() {
 }
 
 function notImplemented() {
-	logMe("notImplemented()\n");
+	logMe("notImplemented()");
 	logMe(debugInfo());
 	header('HTTP/1.1 501 Not Implemented');
 	header('Content-Type: text/plain; charset=UTF-8');
@@ -121,14 +121,14 @@ function notImplemented() {
 }
 
 function serviceUnavailable() {
-	logMe("serviceUnavailable()\n");
+	logMe("serviceUnavailable()");
 	header('HTTP/1.1 503 Service Unavailable');
 	header('Content-Type: text/plain; charset=UTF-8');
 	die('Service Unavailable!');
 }
 
 function checkCompatibility() {
-	logMe("checkCompatibility()\n");
+	logMe("checkCompatibility()");
 	header('Content-Type: text/plain; charset=UTF-8');
 	if (PHP_INT_SIZE < 8 && !function_exists('gmp_init')) {
 		die('FAIL 64-bit or GMP extension!');
@@ -159,7 +159,7 @@ function authorizationToUser() {
 				if ($headerAuthX[1] === sha1($system_conf->salt . $user . $conf->apiPasswordHash)) {
 					return $user;
 				} else {
-					logMe('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1] . "\n");
+					logMe('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1]);
 					Minz_Log::warning('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1]);
 					unauthorized();
 				}
@@ -172,7 +172,7 @@ function authorizationToUser() {
 }
 
 function clientLogin($email, $pass) {	//http://web.archive.org/web/20130604091042/http://undoc.in/clientLogin.html
-	logMe('clientLogin(' . $email . ")\n");
+	//logMe('clientLogin(' . $email . ")");
 	if (ctype_alnum($email)) {
 		if (!function_exists('password_verify')) {
 			include_once(LIB_PATH . '/password_compat.php');
@@ -205,7 +205,7 @@ 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', '_');
-	logMe('token('. $user . ")\n");	//TODO: Implement real token that expires
+	//logMe('token('. $user . ")");	//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
 	echo $token, "\n";
@@ -215,7 +215,7 @@ function token($conf) {
 function checkToken($conf, $token) {
 //http://code.google.com/p/google-reader-api/wiki/ActionToken
 	$user = Minz_Session::param('currentUser', '_');
-	logMe('checkToken(' . $token . ")\n");
+	//logMe('checkToken(' . $token . ")");
 	$system_conf = Minz_Configuration::get('system');
 	if ($token === str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
 		return true;
@@ -224,7 +224,7 @@ function checkToken($conf, $token) {
 }
 
 function tagList() {
-	logMe("tagList()\n");
+	//logMe("tagList()");
 	header('Content-Type: application/json; charset=UTF-8');
 
 	$pdo = new MyPDO();
@@ -249,7 +249,7 @@ function tagList() {
 }
 
 function subscriptionList() {
-	logMe("subscriptionList()\n");
+	//logMe("subscriptionList()");
 	header('Content-Type: application/json; charset=UTF-8');
 
 	$pdo = new MyPDO();
@@ -283,7 +283,7 @@ function subscriptionList() {
 }
 
 function unreadCount() {	//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#unread-count
-	logMe("unreadCount()\n");
+	//logMe("unreadCount()");
 	header('Content-Type: application/json; charset=UTF-8');
 
 	$totalUnreads = 0;
@@ -330,7 +330,7 @@ function unreadCount() {	//http://blog.martindoms.com/2009/10/16/using-the-googl
 function streamContents($path, $include_target, $start_time, $count, $order, $exclude_target, $continuation) {
 //http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI
 //http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed
-	logMe("streamContents($path, $include_target, $start_time, $count, $order, $exclude_target, $continuation)\n");
+	//logMe("streamContents($path, $include_target, $start_time, $count, $order, $exclude_target, $continuation)");
 	header('Content-Type: application/json; charset=UTF-8');
 
 	$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -436,7 +436,7 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 //http://code.google.com/p/google-reader-api/wiki/ApiStreamItemsIds
 //http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI
 //http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed
-	logMe("streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude_target)\n");
+	//logMe("streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude_target)");
 
 	$type = 'A';
 	$id = '';
@@ -484,7 +484,7 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 }
 
 function editTag($e_ids, $a, $r) {
-	logMe("editTag()\n");
+	//logMe("editTag()");
 
 	foreach ($e_ids as $i => $e_id) {
 		$e_ids[$i] = hex2dec(basename($e_id));	//Strip prefix 'tag:google.com,2005:reader/item/'
@@ -520,7 +520,7 @@ function editTag($e_ids, $a, $r) {
 }
 
 function markAllAsRead($streamId, $olderThanId) {
-	logMe("markAllAsRead($streamId, $olderThanId)\n");
+	//logMe("markAllAsRead($streamId, $olderThanId)");
 	$entryDAO = FreshRSS_Factory::createEntryDao();
 	if (strpos($streamId, 'feed/') === 0) {
 		$f_id = basename($streamId);
@@ -538,7 +538,7 @@ function markAllAsRead($streamId, $olderThanId) {
 	exit();
 }
 
-logMe('----------------------------------------------------------------'."\n");
+//logMe('----------------------------------------------------------------');
 //logMe(debugInfo());
 
 $pathInfo = empty($_SERVER['PATH_INFO']) ? '/Error' : urldecode($_SERVER['PATH_INFO']);
@@ -560,7 +560,7 @@ if ($user !== '') {
 	$conf = get_user_configuration($user);
 }
 
-logMe('User => ' . $user . "\n");
+//logMe('User => ' . $user);
 
 Minz_Session::_param('currentUser', $user);
 
-- 
cgit v1.2.3


From 02a3cb4652d4c87ec3202d39f6cd8a240a1a7373 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Oct 2015 23:47:13 +0200
Subject: Config allow robots

https://github.com/FreshRSS/FreshRSS/issues/938
---
 app/Models/Context.php  | 13 +++++++++++--
 app/layout/layout.phtml |  4 ++++
 data/config.default.php |  3 +++
 index.html              |  2 +-
 p/index.html            |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/Models/Context.php b/app/Models/Context.php
index dbdbfaa69..d8dd81e88 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -10,6 +10,7 @@ class FreshRSS_Context {
 	public static $categories = array();
 
 	public static $name = '';
+	public static $description = '';
 
 	public static $total_unread = 0;
 	public static $total_starred = array(
@@ -93,6 +94,13 @@ class FreshRSS_Context {
 		}
 	}
 
+	/**
+	 * Return true iif the current requests target a feed and not a category or all articles.
+	 */
+	public static function isFeed() {
+		return self::$current_get['feed'] != false;
+	}
+
 	/**
 	 * Return true if $get parameter correspond to the $current_get attribute.
 	 */
@@ -146,8 +154,8 @@ 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);
+			// We try to find the corresponding feed. When allowing robots, always retrieve the full feed including description
+			$feed = FreshRSS_Context::$system_conf->allow_robots ? null : FreshRSS_CategoryDAO::findFeed(self::$categories, $id);
 			if ($feed === null) {
 				$feedDAO = FreshRSS_Factory::createFeedDao();
 				$feed = $feedDAO->searchById($id);
@@ -160,6 +168,7 @@ class FreshRSS_Context {
 			self::$current_get['feed'] = $id;
 			self::$current_get['category'] = $feed->category();
 			self::$name = $feed->name();
+			self::$description = $feed->description();
 			self::$get_unread = $feed->nbNotRead();
 			break;
 		case 'c':
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 083ffd4b3..d7e9d115b 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -36,7 +36,11 @@
 		<meta name="apple-mobile-web-app-status-bar-style" content="black" />
 		<meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
+<?php if (FreshRSS_Context::$system_conf->allow_robots) { ?>
+		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_NOQUOTES, 'UTF-8'); ?>" />
+<?php } else { ?>
 		<meta name="robots" content="noindex,nofollow" />
+<?php } ?>
 	</head>
 	<body class="<?php echo Minz_Request::param('output', 'normal'); ?>">
 <?php $this->partial('header'); ?>
diff --git a/data/config.default.php b/data/config.default.php
index a7a29b12c..8eccee8a5 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -61,6 +61,9 @@ return array(
 	# /!\ It should NOT be enabled if base_url is not reachable by an external server.
 	'pubsubhubbub_enabled' => false,
 
+	# Allow or not Web robots (e.g. search engines) in HTML headers.
+	'allow_robots' => false,
+
 	'limits' => array(
 
 		# Duration in seconds of the SimplePie cache,
diff --git a/index.html b/index.html
index 6ac025960..5414211a1 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 <meta charset="UTF-8" />
 <meta http-equiv="Refresh" content="0; url=p/" />
 <title>Redirection</title>
-<meta name="robots" content="noindex,nofollow" />
+<meta name="robots" content="noindex" />
 </head>
 
 <body>
diff --git a/p/index.html b/p/index.html
index 260f437bd..ef5cb87ce 100644
--- a/p/index.html
+++ b/p/index.html
@@ -8,7 +8,7 @@
 <link rel="shortcut icon" type="image/x-icon" sizes="16x16 64x64" href="favicon.ico" />
 <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="themes/icons/favicon-256.png" />
 <meta name="msapplication-TileColor" content="#FFF" />
-<meta name="robots" content="noindex,nofollow" />
+<meta name="robots" content="noindex" />
 <style>
 body {
 	font-family: sans-serif;
-- 
cgit v1.2.3


From 22da265736e0cfd84d42668622d3f5d05a8a03cf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Oct 2015 00:20:05 +0200
Subject: Remove "title" field when installing

https://github.com/FreshRSS/FreshRSS/issues/858
---
 app/install.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/install.php b/app/install.php
index 5a774d7c1..9c878c95a 100644
--- a/app/install.php
+++ b/app/install.php
@@ -122,7 +122,6 @@ function saveStep1() {
 function saveStep2() {
 	$user_default_config = Minz_Configuration::get('default_user');
 	if (!empty($_POST)) {
-		$_SESSION['title'] = substr(trim(param('title', _t('gen.freshrss'))), 0, 25);
 		$_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries);
 		$_SESSION['auth_type'] = param('auth_type', 'form');
 		$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16);
@@ -658,13 +657,6 @@ function printStep2() {
 	<form action="index.php?step=2" method="post">
 		<legend><?php echo _t('install.conf'); ?></legend>
 
-		<div class="form-group">
-			<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('gen.freshrss'); ?>" tabindex="1" />
-			</div>
-		</div>
-
 		<div class="form-group">
 			<label class="group-name" for="old_entries"><?php echo _t('install.delete_articles_after'); ?></label>
 			<div class="group-controls">
-- 
cgit v1.2.3


From 30de13cd47a38f17608bfe0fe73d85979ec35fc2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Oct 2015 01:27:15 +0200
Subject: Use HTTP_X_FORWARDED_

https://github.com/FreshRSS/FreshRSS/issues/975
---
 lib/Minz/Request.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index bf01bc26f..1c8efaf7b 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -91,9 +91,30 @@ class Minz_Request {
 	 */
 	public static function guessBaseUrl() {
 		$url = 'http';
-		$host = empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST'];
-		$port = empty($_SERVER['SERVER_PORT']) ? 80 : $_SERVER['SERVER_PORT'];
-		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+
+		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+			$https = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https';
+		} else {
+			$https = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+		}
+
+		if (!empty($_SERVER['HTTP_HOST'])) {
+			$host = $_SERVER['HTTP_HOST'];
+		} elseif (!empty($_SERVER['SERVER_NAME'])) {
+			$host = $_SERVER['SERVER_NAME'];
+		} else {
+			$host = 'localhost';
+		}
+		
+		if (!empty($_SERVER['HTTP_X_FORWARDED_PORT'])) {
+			$port = intval($_SERVER['HTTP_X_FORWARDED_PORT']);
+		} elseif (!empty($_SERVER['SERVER_PORT'])) {
+			$port = intval($_SERVER['SERVER_PORT']);
+		} else {
+			$port = $https ? 443 : 80;
+		}
+
+		if ($https) {
 			$url .= 's://' . $host . ($port == 443 ? '' : ':' . $port);
 		} else {
 			$url .= '://' . $host . ($port == 80 ? '' : ':' . $port);
-- 
cgit v1.2.3


From 5d7fc35e89d9e9954544399f49d1c46209ef19f9 Mon Sep 17 00:00:00 2001
From: Alwaysin <adrien@demma.fr>
Date: Sun, 25 Oct 2015 11:10:50 +0100
Subject: More viewable visual alert for categories with problematic feeds

---
 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 92972b2c4..17a43d3ed 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -777,7 +777,8 @@ input:checked + .slide-container .properties {
 	content: attr(data-unread);
 }
 .category .title.error::before {
-	content: "⚠";
+	content: "⚠ ";
+	color: #bd362f;
 }
 .feed .item-title:not([data-unread="0"])::before {
 	content: "(" attr(data-unread) ") ";
-- 
cgit v1.2.3


From 7bb28c3f2b77b109451e2514e83fa99789fee35e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Oct 2015 13:24:48 +0100
Subject: HTTP 403 for invalid login

https://github.com/FreshRSS/FreshRSS/issues/1015
And does not leak if user exists or not
---
 app/Controllers/authController.php       | 9 +++------
 app/Controllers/javascriptController.php | 8 ++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index aff184263..bccce5a59 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -123,8 +123,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 
 			$conf = get_user_configuration($username);
 			if (is_null($conf)) {
-				Minz_Request::bad(_t('feedback.auth.login.invalid'),
-				                  array('c' => 'auth', 'a' => 'login'));
+				Minz_Error::error(403, array(_t('feedback.auth.login.invalid')), false);
 			}
 
 			$ok = FreshRSS_FormAuth::checkCredentials(
@@ -151,8 +150,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				                  ' user=' . $username .
 				                  ', nonce=' . $nonce .
 				                  ', c=' . $challenge);
-				Minz_Request::bad(_t('feedback.auth.login.invalid'),
-				                  array('c' => 'auth', 'a' => 'login'));
+				Minz_Error::error(403, array(_t('feedback.auth.login.invalid')), false);
 			}
 		} elseif (FreshRSS_Context::$system_conf->unsafe_autologin_enabled) {
 			$username = Minz_Request::param('u', '');
@@ -184,8 +182,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				                   array('c' => 'index', 'a' => 'index'));
 			} else {
 				Minz_Log::warning('Unsafe password mismatch for user ' . $username);
-				Minz_Request::bad(_t('feedback.auth.login.invalid'),
-				                  array('c' => 'auth', 'a' => 'login'));
+				Minz_Error::error(403, array(_t('feedback.auth.login.invalid')), false);
 			}
 		}
 	}
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 421cf6f72..f8746240c 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -43,7 +43,11 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 		} else {
 			Minz_Log::notice('Nonce failure due to invalid username!');
 		}
-		$this->view->nonce = '';	//Failure
-		$this->view->salt1 = '';
+		//Failure: Return random data.
+		$this->view->salt1 = sprintf('$2a$%02d$', FreshRSS_user_Controller::BCRYPT_COST);
+		for ($i = 22; $i > 0; $i--) {
+			$this->view->salt1 .= './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'[rand(0, 63)];
+		}
+		$this->view->nonce = sha1(rand());
 	}
 }
-- 
cgit v1.2.3


From 2d06b472cdf72175c42269a12cb2470ceda1c084 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Oct 2015 19:26:35 +0100
Subject: Iff expanded to "true if ..., false otherwise"

https://github.com/FreshRSS/FreshRSS/pull/1011
https://github.com/FreshRSS/FreshRSS/issues/938
---
 app/Models/Context.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Context.php b/app/Models/Context.php
index d8dd81e88..2a58bd4ba 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -95,7 +95,7 @@ class FreshRSS_Context {
 	}
 
 	/**
-	 * Return true iif the current requests target a feed and not a category or all articles.
+	 * Return true if the current request targets a feed (and not a category or all articles), false otherwise.
 	 */
 	public static function isFeed() {
 		return self::$current_get['feed'] != false;
-- 
cgit v1.2.3


From ad1f0cb96b3eefdeac5031e59c8810fc9427b6e2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Oct 2015 19:31:41 +0100
Subject: Return after 403

https://github.com/FreshRSS/FreshRSS/pull/1016
https://github.com/FreshRSS/FreshRSS/issues/1015
---
 app/Controllers/authController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index bccce5a59..f58b008de 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -124,6 +124,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			$conf = get_user_configuration($username);
 			if (is_null($conf)) {
 				Minz_Error::error(403, array(_t('feedback.auth.login.invalid')), false);
+				return;
 			}
 
 			$ok = FreshRSS_FormAuth::checkCredentials(
-- 
cgit v1.2.3


From c992b683a8467de60136e4d4b1860f06a746c6b1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 26 Oct 2015 17:38:32 +0100
Subject: PHP 5.2 compatibility

https://github.com/FreshRSS/FreshRSS/pull/1016
https://github.com/FreshRSS/FreshRSS/issues/1015
It is first PHP 5.5 that added support for accessing characters within
string literals using []...
---
 app/Controllers/javascriptController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index f8746240c..e3ae3669e 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -45,8 +45,9 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 		}
 		//Failure: Return random data.
 		$this->view->salt1 = sprintf('$2a$%02d$', FreshRSS_user_Controller::BCRYPT_COST);
+		$alphabet = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 		for ($i = 22; $i > 0; $i--) {
-			$this->view->salt1 .= './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'[rand(0, 63)];
+			$this->view->salt1 .= $alphabet[rand(0, 63)];
 		}
 		$this->view->nonce = sha1(rand());
 	}
-- 
cgit v1.2.3


From 0a1b6282654a15455d972bf38150120c17c4ef79 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 27 Oct 2015 22:11:19 +0100
Subject: ENT_COMPAT

https://github.com/FreshRSS/FreshRSS/pull
https://github.com/FreshRSS/FreshRSS/issues/938
---
 app/layout/layout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index d7e9d115b..000a6c0d2 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -37,7 +37,7 @@
 		<meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
 <?php if (FreshRSS_Context::$system_conf->allow_robots) { ?>
-		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_NOQUOTES, 'UTF-8'); ?>" />
+		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8'); ?>" />
 <?php } else { ?>
 		<meta name="robots" content="noindex,nofollow" />
 <?php } ?>
-- 
cgit v1.2.3


From a74eac88d8ccd38ff700e12cc42410e4780349a0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 31 Oct 2015 12:02:47 +0100
Subject: Changelog more 1.1.4-beta

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d97dae52f..14b6a18ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 * Features
 	* Share with Movim [#992](https://github.com/FreshRSS/FreshRSS/issues/992)
+	* New option to allow robots / search engines [#938](https://github.com/FreshRSS/FreshRSS/issues/938)
+* Security
+	* Invalid logins now return HTTP 403, to be easier to catch (e.g. fail2ban) [#1015](https://github.com/FreshRSS/FreshRSS/issues/1015)
 * UI
 	* Visual alert on categories containing feeds in error [#984](https://github.com/FreshRSS/FreshRSS/pull/984)
 * I18n
-- 
cgit v1.2.3


From bb0556543d3d5d54832ea6d81372587b88062a5b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 2 Nov 2015 20:20:40 +0100
Subject: Move auto-update server URL in configuration

Fix https://github.com/FreshRSS/FreshRSS/issues/1019
---
 app/Controllers/updateController.php | 5 +++--
 constants.php                        | 1 -
 data/config.default.php              | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 84a33fe85..64c984b04 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -53,7 +53,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			return;
 		}
 
-		$c = curl_init(FRESHRSS_UPDATE_WEBSITE);
+		$auto_update_url = FreshRSS_Context::$system_conf->auto_update_url . '?v=' . FRESHRSS_VERSION;
+		$c = curl_init($auto_update_url);
 		curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($c, CURLOPT_SSL_VERIFYPEER, true);
 		curl_setopt($c, CURLOPT_SSL_VERIFYHOST, 2);
@@ -70,7 +71,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			$this->view->message = array(
 				'status' => 'bad',
 				'title' => _t('gen.short.damn'),
-				'body' => _t('feedback.update.server_not_found', FRESHRSS_UPDATE_WEBSITE)
+				'body' => _t('feedback.update.server_not_found', $auto_update_url)
 			);
 			return;
 		}
diff --git a/constants.php b/constants.php
index 0035c259b..1c50d4a83 100644
--- a/constants.php
+++ b/constants.php
@@ -1,7 +1,6 @@
 <?php
 define('FRESHRSS_VERSION', '1.1.4-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');
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
diff --git a/data/config.default.php b/data/config.default.php
index 8eccee8a5..174592a21 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -18,6 +18,9 @@ return array(
 	# https://freshrss.example.net/
 	'base_url' => '',
 
+	# Specify address of the FreshRSS auto-update server.
+	'auto_update_url' => 'https://update.freshrss.org',
+
 	# Natural language of the user interface, e.g. `en`, `fr`.
 	'language' => 'en',
 
-- 
cgit v1.2.3


From 697817eebf754c2a05c7b4c88df1f13dbd0179da Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 2 Nov 2015 21:11:31 +0100
Subject: Make auto-update server URL alterable

See https://github.com/FreshRSS/FreshRSS/issues/1019
---
 CHANGELOG.md                            |  2 ++
 app/Controllers/configureController.php |  1 +
 app/Models/ConfigurationSetter.php      |  8 ++++++++
 app/i18n/cz/admin.php                   |  1 +
 app/i18n/de/admin.php                   |  1 +
 app/i18n/en/admin.php                   |  1 +
 app/i18n/fr/admin.php                   |  1 +
 app/i18n/it/admin.php                   |  1 +
 app/i18n/nl/admin.php                   | 11 +++++++++++
 app/i18n/nl/gen.php                     |  1 +
 app/views/configure/system.phtml        |  9 ++++++++-
 11 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14b6a18ce..828884546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 	* Visual alert on categories containing feeds in error [#984](https://github.com/FreshRSS/FreshRSS/pull/984)
 * I18n
 	* Italian [#1003](https://github.com/FreshRSS/FreshRSS/issues/1003)
+* Misc.
+    * Make auto-update server URL alterable [#1019](https://github.com/FreshRSS/FreshRSS/issues/1019)
 
 
 ## 2015-09-12 FreshRSS 1.1.3-beta
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 0dc7ceab2..d0f0bd68b 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -317,6 +317,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$limits['max_categories'] = Minz_Request::param('max-categories', 16384);
 			FreshRSS_Context::$system_conf->limits = $limits;
 			FreshRSS_Context::$system_conf->title = Minz_Request::param('instance-name', 'FreshRSS');
+			FreshRSS_Context::$system_conf->auto_update_url = Minz_Request::param('auto-update-url', false);
 			FreshRSS_Context::$system_conf->save();
 
 			invalidateHttpCache();
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 5c8a1ce29..250c14c39 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -378,4 +378,12 @@ class FreshRSS_ConfigurationSetter {
 	private function _unsafe_autologin_enabled(&$data, $value) {
 		$data['unsafe_autologin_enabled'] = $this->handleBool($value);
 	}
+
+	private function _auto_update_url(&$data, $value) {
+		if (!$value) {
+			return;
+		}
+
+		$data['auto_update_url'] = $value;
+	}
 }
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index e1fa5d141..342ac7ccd 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration', // @todo translate
+		'auto-update-url' => 'Auto-update server URL', // @todo translate
 		'instance-name' => 'Instance name', // @todo translate
 		'max-categories' => 'Categories per user limit', // @todo translate
 		'max-feeds' => 'Feeds per user limit', // @todo translate
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 395b51acf..6e6cc0956 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration', // @todo translate
+		'auto-update-url' => 'Auto-update server URL', // @todo translate
 		'instance-name' => 'Instance name', // @todo translate
 		'max-categories' => 'Categories per user limit', // @todo translate
 		'max-feeds' => 'Feeds per user limit', // @todo translate
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 6edb38cf0..a58771edf 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration',
+		'auto-update-url' => 'Auto-update server URL',
 		'instance-name' => 'Instance name',
 		'max-categories' => 'Categories per user limit',
 		'max-feeds' => 'Feeds per user limit',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index e73622577..f4f267306 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'Configuration du système',
+		'auto-update-url' => 'URL du service de mise à jour',
 		'instance-name' => 'Nom de l’instance',
 		'max-categories' => 'Limite de catégories par utilisateur',
 		'max-feeds' => 'Limite de flux par utilisateur',
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index cb9a55c0b..94b2d6762 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'Configurazione di sistema',
+		'auto-update-url' => 'Auto-update server URL', // @todo translate
 		'instance-name' => 'Nome istanza',
 		'max-categories' => 'Limite categorie per utente',
 		'max-feeds' => 'Limite feeds per utente',
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index 5c6a14fda..c3a3062b9 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -146,6 +146,17 @@ return array(
 		'title' => 'Statistieken',
 		'top_feed' => 'Top tien feeds',
 	),
+	'system' => array(
+		'_' => 'System configuration', // @todo translate
+		'auto-update-url' => 'Auto-update server URL', // @todo translate
+		'instance-name' => 'Instance name', // @todo translate
+		'max-categories' => 'Categories per user limit', // @todo translate
+		'max-feeds' => 'Feeds per user limit', // @todo translate
+		'registration' => array(
+			'help' => '0 means that there is no account limit', // @todo translate
+			'number' => 'Max number of accounts', // @todo translate
+		),
+	),
 	'update' => array(
 		'_' => 'Versie controle',
 		'apply' => 'Toepassen',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index b8467f92f..574f0386b 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -139,6 +139,7 @@ return array(
 		'sharing' => 'Delen',
 		'shortcuts' => 'Snelle toegang',
 		'stats' => 'Statistieken',
+		'system' => 'System configuration', // @todo translate
 		'update' => 'Versie controle',
 		'user_management' => 'Beheer gebruikers',
 		'user_profile' => 'Profiel',
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
index 9406c34d6..4af669eb0 100644
--- a/app/views/configure/system.phtml
+++ b/app/views/configure/system.phtml
@@ -9,7 +9,14 @@
 		<div class="form-group">
 			<label class="group-name" for="instance-name"><?php echo _t('admin.system.instance-name'); ?></label>
 			<div class="group-controls">
-			    <input type="text" id="max-feeds" name="instance-name" value="<?php echo FreshRSS_Context::$system_conf->title; ?>" min="1" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->title; ?>"/>
+			    <input type="text" class="extend" id="instance-name" name="instance-name" value="<?php echo FreshRSS_Context::$system_conf->title; ?>" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->title; ?>"/>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="auto-update-url"><?php echo _t('admin.system.auto-update-url'); ?></label>
+			<div class="group-controls">
+			    <input type="text" class="extend" id="auto-update-url" name="auto-update-url" value="<?php echo FreshRSS_Context::$system_conf->auto_update_url; ?>" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->auto_update_url; ?>"/>
 			</div>
 		</div>
 
-- 
cgit v1.2.3


From 1b4b1b94a641ca6f6e4a15189bbf37fdc1e63463 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 2 Nov 2015 22:27:57 +0100
Subject: Remove title from requirements on title page

Fix https://github.com/FreshRSS/FreshRSS/issues/1025
---
 app/install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/install.php b/app/install.php
index 9c878c95a..83526b60c 100644
--- a/app/install.php
+++ b/app/install.php
@@ -122,6 +122,8 @@ function saveStep1() {
 function saveStep2() {
 	$user_default_config = Minz_Configuration::get('default_user');
 	if (!empty($_POST)) {
+		$system_default_config = Minz_Configuration::get('default_system');
+		$_SESSION['title'] = $system_default_config->title;
 		$_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries);
 		$_SESSION['auth_type'] = param('auth_type', 'form');
 		$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16);
@@ -137,8 +139,7 @@ function saveStep2() {
 			$_SESSION['passwordHash'] = $passwordHash;
 		}
 
-		if (empty($_SESSION['title']) ||
-		    empty($_SESSION['old_entries']) ||
+		if (empty($_SESSION['old_entries']) ||
 		    empty($_SESSION['auth_type']) ||
 		    empty($_SESSION['default_user'])) {
 			return false;
@@ -373,8 +374,7 @@ function freshrss_already_installed() {
 }
 
 function checkStep2() {
-	$conf = !empty($_SESSION['title']) &&
-	        !empty($_SESSION['old_entries']) &&
+	$conf = !empty($_SESSION['old_entries']) &&
 	        isset($_SESSION['mail_login']) &&
 	        !empty($_SESSION['default_user']);
 
-- 
cgit v1.2.3


From bfae186e3668af8155b77abb5c4b3dc5f151e14c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Oct 2015 01:27:15 +0200
Subject: Use HTTP_X_FORWARDED_

https://github.com/FreshRSS/FreshRSS/issues/975
---
 lib/Minz/Request.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index bf01bc26f..effb9943c 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -91,9 +91,30 @@ class Minz_Request {
 	 */
 	public static function guessBaseUrl() {
 		$url = 'http';
-		$host = empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST'];
-		$port = empty($_SERVER['SERVER_PORT']) ? 80 : $_SERVER['SERVER_PORT'];
-		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+
+		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+			$https = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https';
+		} else {
+			$https = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+		}
+
+		if (!empty($_SERVER['HTTP_HOST'])) {
+			$host = $_SERVER['HTTP_HOST'];
+		} elseif (!empty($_SERVER['SERVER_NAME'])) {
+			$host = $_SERVER['SERVER_NAME'];
+		} else {
+			$host = 'localhost';
+		}
+
+		if (!empty($_SERVER['HTTP_X_FORWARDED_PORT'])) {
+			$port = intval($_SERVER['HTTP_X_FORWARDED_PORT']);
+		} elseif (!empty($_SERVER['SERVER_PORT'])) {
+			$port = intval($_SERVER['SERVER_PORT']);
+		} else {
+			$port = $https ? 443 : 80;
+		}
+
+		if ($https) {
 			$url .= 's://' . $host . ($port == 443 ? '' : ':' . $port);
 		} else {
 			$url .= '://' . $host . ($port == 80 ? '' : ':' . $port);
-- 
cgit v1.2.3


From 2520368db459cda1745431a887d5218b316113df Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 3 Nov 2015 20:39:48 +0100
Subject: Update CHANGELOG

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 828884546..167c5a29e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2015-xx-xx FreshRSS 1.1.4-beta
+## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta
 
 * Features
 	* Share with Movim [#992](https://github.com/FreshRSS/FreshRSS/issues/992)
@@ -8,10 +8,12 @@
 * Security
 	* Invalid logins now return HTTP 403, to be easier to catch (e.g. fail2ban) [#1015](https://github.com/FreshRSS/FreshRSS/issues/1015)
 * UI
+    * Remove "title" field during installation [#858](https://github.com/FreshRSS/FreshRSS/issues/858)
 	* Visual alert on categories containing feeds in error [#984](https://github.com/FreshRSS/FreshRSS/pull/984)
 * I18n
 	* Italian [#1003](https://github.com/FreshRSS/FreshRSS/issues/1003)
 * Misc.
+    * Support reverse proxy [#975](https://github.com/FreshRSS/FreshRSS/issues/975)
     * Make auto-update server URL alterable [#1019](https://github.com/FreshRSS/FreshRSS/issues/1019)
 
 
-- 
cgit v1.2.3


From 4525e547faa8781e37f86125110f28248eb67fd3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 3 Nov 2015 20:46:57 +0100
Subject: Update CREDITS.md

---
 CREDITS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CREDITS.md b/CREDITS.md
index 148eac021..b21e8be85 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -12,6 +12,8 @@ People are sorted by name so please keep this order.
 * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade)
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
 * [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry)
+* [Marcus Rohrmoser](https://github.com/mro):
+[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=mro)
 * [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/)
 * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek)
 * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
-- 
cgit v1.2.3


From 919c9c83013ea310f01c309f00dea3f8afa9033e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 4 Nov 2015 20:18:31 +0100
Subject: Version 1.3.0-beta

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index 1c50d4a83..40108f92d 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.1.4-dev');
+define('FRESHRSS_VERSION', '1.3.0-beta');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From ca6ca218dca17c3806191f72fa2b3fe02acc1692 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 4 Nov 2015 20:26:47 +0100
Subject: Version 1.2.0

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index 1c50d4a83..aa259f6c3 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.1.4-dev');
+define('FRESHRSS_VERSION', '1.2.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 9d55313b92811bad7b4d0cc8bc87c3dcd8fafb2c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 4 Nov 2015 21:44:08 +0100
Subject: Start 1.3.1-dev version

---
 CHANGELOG.md  | 4 ++++
 constants.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167c5a29e..2c2d7f4cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2015-xx-xx FreshRSS 1.3.1-beta
+
+* Nothing for the moment.
+
 ## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta
 
 * Features
diff --git a/constants.php b/constants.php
index 1c50d4a83..a501d0df5 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.1.4-dev');
+define('FRESHRSS_VERSION', '1.3.1-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From a90f6ad8407d5bfda66b7299124cf82f54153736 Mon Sep 17 00:00:00 2001
From: Jaussoin Timothée <edhelas@movim.eu>
Date: Thu, 5 Nov 2015 19:49:08 +0100
Subject: Update the Movim share URL

I've changed the Movim urls recently, just fixing FreshRSS to make it work again with Movim
---
 data/shares.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/shares.php b/data/shares.php
index ed060074e..55ef08ec4 100644
--- a/data/shares.php
+++ b/data/shares.php
@@ -45,7 +45,7 @@ return array(
 		'form' => 'advanced',
 	),
 	'movim' => array(
-		'url' => '~URL~/index.php/share/~LINK~',
+		'url' => '~URL~/?share/~LINK~',
 		'transform' => array('rawurlencode', 'urlencode'),
 		'help' => 'https://github.com/edhelas/movim',
 		'form' => 'advanced',
-- 
cgit v1.2.3


From d6e6dd6b280e1a9c68e922d14a77510404959b76 Mon Sep 17 00:00:00 2001
From: ASM <cpp.create@gmail.com>
Date: Wed, 4 Nov 2015 20:13:30 +0300
Subject: Translated 1/3 of

---
 app/i18n/ru/admin.php    | 183 +++++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/ru/conf.php     | 174 ++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/ru/feedback.php | 110 ++++++++++++++++++++++++++++
 app/i18n/ru/gen.php      | 181 ++++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/ru/index.php    |  61 ++++++++++++++++
 app/i18n/ru/install.php  | 113 +++++++++++++++++++++++++++++
 app/i18n/ru/sub.php      |  62 ++++++++++++++++
 7 files changed, 884 insertions(+)
 create mode 100644 app/i18n/ru/admin.php
 create mode 100644 app/i18n/ru/conf.php
 create mode 100644 app/i18n/ru/feedback.php
 create mode 100644 app/i18n/ru/gen.php
 create mode 100644 app/i18n/ru/index.php
 create mode 100644 app/i18n/ru/install.php
 create mode 100644 app/i18n/ru/sub.php

diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
new file mode 100644
index 000000000..6c3e21031
--- /dev/null
+++ b/app/i18n/ru/admin.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Разрешить анонимное чтение статей для пользователя по умолчанию (%s)',
+		'allow_anonymous_refresh' => 'Разрешить анонимное обновление статей',
+		'api_enabled' => 'Включить доступ к <abbr>API</abbr> <small>(необходимо для мобильных приложений)</small>',
+		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
+		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
+		'none' => 'Без аутентификации (небезопасный)',
+		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
+		'title' => 'Аутентификации',
+		'title_reset' => 'Сброс аутентицикации',
+		'token' => 'Токен аутентификации',
+		'token_help' => 'Разрешает доступ к RSS ленте пользователя по умолчанию без аутентификации:',
+		'type' => 'Метод аутентификации',
+		'unsafe_autologin' => 'Разрешить небезопасный автоматический вход с использованием следующего формата: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em>. Сервер HTTP должен иметь права на запись в эту папку',
+			'ok' => 'Права на <em>./data/cache</em> в порядке.',
+		),
+		'categories' => array(
+			'nok' => 'Таблица категорий настроена неправильно.',
+			'ok' => 'Таблица категорий настроена правильно.',
+		),
+		'connection' => array(
+			'nok' => 'Подключение к базе данных не может быть установлено.',
+			'ok' => 'Подключение к базе данных в порядке.',
+		),
+		'ctype' => array(
+			'nok' => 'У вас не установлена библиотека для проверки типов символов (php-ctype).',
+			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
+			'ok' => 'У вас установлено расширение cURL.',
+		),
+		'data' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на <em>./data/</em> в порядке.',
+		),
+		'database' => 'Установка базы данных',
+		'dom' => array(
+			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
+			'ok' => 'У вас не установлена библиотека для просмотра 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.',
+		),
+		'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.',
+		),
+		'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.',
+		),
+		'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.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Disabled',
+		'empty_list' => 'There is no installed extension',
+		'enabled' => 'Enabled',
+		'no_configure_view' => 'This extension cannot be configured.',
+		'system' => array(
+			'_' => 'System extensions',
+			'no_rights' => 'System extension (you have no rights on it)',
+		),
+		'title' => 'Extensions',
+		'user' => 'User extensions',
+	),
+	'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_entries' => '%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',
+	),
+	'system' => array(
+		'_' => 'System configuration',
+		'auto-update-url' => 'Auto-update server URL',
+		'instance-name' => 'Instance name',
+		'max-categories' => 'Categories per user limit',
+		'max-feeds' => 'Feeds per user limit',
+		'registration' => array(
+			'help' => '0 means that there is no account limit',
+			'number' => 'Max number of accounts',
+		),
+	),
+	'update' => 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',
+	),
+	'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',
+		'number' => 'There is %d account created yet',
+		'numbers' => 'There are %d accounts created yet',
+		'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',
+		'users' => 'Users',
+	),
+);
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
new file mode 100644
index 000000000..69162932f
--- /dev/null
+++ b/app/i18n/ru/conf.php
@@ -0,0 +1,174 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archiving',
+		'advanced' => 'Advanced',
+		'delete_after' => 'Remove articles after',
+		'help' => 'More options are available in the individual feed settings',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'optimize' => 'Optimise 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',
+		'delete' => array(
+			'_' => 'Account deletion',
+			'warn' => 'Your account and all the related data will be deleted.',
+		),
+		'email_persona' => 'Login email 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(
+		'_' => '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',
+		'mark_updated_article_unread' => 'Mark updated articles as unread',
+		'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/ru/feedback.php b/app/i18n/ru/feedback.php
new file mode 100644
index 000000000..c9189c0d0
--- /dev/null
+++ b/app/i18n/ru/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimisation 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.',
+			'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.',
+	),
+	'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',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s is already 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',
+	),
+	'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.',
+	),
+	'sub' => array(
+		'actualize' => 'Actualise',
+		'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(
+			'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' => '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)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS will now be 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!',
+		'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/ru/gen.php b/app/i18n/ru/gen.php
new file mode 100644
index 000000000..d23b12f95
--- /dev/null
+++ b/app/i18n/ru/gen.php
@@ -0,0 +1,181 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Actualize',
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',
+		'cancel' => 'Cancel',
+		'create' => 'Create',
+		'disable' => 'Disable',
+		'empty' => 'Empty',
+		'enable' => 'Enable',
+		'export' => 'Export',
+		'filter' => 'Filter',
+		'import' => 'Import',
+		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'remove' => 'Remove',
+		'see_website' => 'See website',
+		'submit' => 'Submit',
+		'truncate' => 'Delete all articles',
+	),
+	'auth' => array(
+		'email' => 'Email address',
+		'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' => array(
+			'_' => 'Password',
+			'format' => '<small>At least 7 characters</small>',
+		),
+		'registration' => array(
+			'_' => 'New account',
+			'ask' => 'Create an account?',
+			'title' => 'Account creation',
+		),
+		'reset' => 'Authentication reset',
+		'username' => array(
+			'_' => 'Username',
+			'admin' => 'Administrator username',
+			'format' => '<small>maximum 16 alphanumeric characters</small>',
+		),
+		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+	),
+	'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',
+		'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',
+		'month' => 'months',
+		'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',
+	),
+	'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!',
+		'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 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.',
+		'should_be_activated' => 'JavaScript must be enabled',
+	),
+	'lang' => array(
+		'cz' => 'Čeština',
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'it' => 'Italiano',
+		'nl' => 'Nederlands',
+	),
+	'menu' => array(
+		'about' => 'About',
+		'admin' => 'Administration',
+		'archiving' => 'Archiving',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'configuration' => 'Configuration',
+		'display' => 'Display',
+		'extensions' => 'Extensions',
+		'logs' => 'Logs',
+		'queries' => 'User queries',
+		'reading' => 'Reading',
+		'search' => 'Search words or #tags',
+		'sharing' => 'Sharing',
+		'shortcuts' => 'Shortcuts',
+		'stats' => 'Statistics',
+		'system' => 'System configuration',
+		'update' => 'Update',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'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',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'movim' => 'Movim',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Warning!',
+		'blank_to_disable' => 'Leave blank to disable',
+		'by_author' => 'By <em>%s</em>',
+		'by_default' => 'By default',
+		'damn' => 'Damn!',
+		'default_category' => 'Uncategorized',
+		'no' => 'No',
+		'not_applicable' => 'Not available',
+		'ok' => 'Ok!',
+		'or' => 'or',
+		'yes' => 'Yes',
+	),
+);
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
new file mode 100644
index 000000000..80fa3d950
--- /dev/null
+++ b/app/i18n/ru/index.php
@@ -0,0 +1,61 @@
+<?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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'license' => 'License',
+		'project_website' => 'Project website',
+		'title' => 'About',
+		'version' => 'Version',
+		'website' => 'Website',
+	),
+	'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(
+		'_' => 'Logs',
+		'clear' => 'Clear the logs',
+		'empty' => 'Log file is empty',
+		'title' => 'Logs',
+	),
+	'menu' => array(
+		'about' => 'About FreshRSS',
+		'add_query' => 'Add a query',
+		'before_one_day' => 'Before one day',
+		'before_one_week' => 'Before one week',
+		'favorites' => 'Favourites (%s)',
+		'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',
+		'older_first' => 'Oldest first',
+		'queries' => 'User queries',
+		'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 unread',
+	),
+	'share' => 'Share',
+	'tag' => array(
+		'related' => 'Related tags',
+	),
+);
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
new file mode 100644
index 000000000..b94fbc299
--- /dev/null
+++ b/app/i18n/ru/install.php
@@ -0,0 +1,113 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Complete installation',
+		'fix_errors_before' => 'Please fix errors before skipping to the next step.',
+		'keep_install' => 'Keep previous installation',
+		'next_step' => 'Go to the next step',
+		'reinstall' => 'Reinstall FreshRSS',
+	),
+	'auth' => array(
+		'email_persona' => 'Login email 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>',
+		'password_format' => 'At least 7 characters',
+		'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',
+		'already_installed' => 'We have detected that FreshRSS is already installed!',
+		'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.',
+		),
+		'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.',
+		),
+		'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',
+		'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' => 'Please fix errors before skipping to the next step.',
+	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
+	'js' => array(
+		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',
+	),
+	'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/ru/sub.php b/app/i18n/ru/sub.php
new file mode 100644
index 000000000..aaaa02827
--- /dev/null
+++ b/app/i18n/ru/sub.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Category',
+		'add' => 'Add a category',
+		'empty' => 'Empty category',
+		'new' => 'New category',
+	),
+	'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 (caution, 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, its 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',
+		'url' => 'Feed URL',
+		'validator' => 'Check the validity of the feed',
+		'website' => 'Website URL',
+		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
+	),
+	'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',
+		'subscription_management' => 'Subscriptions management',
+	),
+	'title' => array(
+		'_' => 'Subscriptions management',
+		'feed_management' => 'RSS feeds management',
+	),
+);
-- 
cgit v1.2.3


From e442b0dfbee5f764deff87dc147ed45f6f73d74f Mon Sep 17 00:00:00 2001
From: ASM <cpp.create@gmail.com>
Date: Sat, 21 Nov 2015 02:22:44 +0300
Subject: Fixing #1029. Admin page done in full

---
 app/i18n/ru/admin.php | 180 +++++++++++++++++++++++++-------------------------
 1 file changed, 90 insertions(+), 90 deletions(-)

diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index 6c3e21031..dfea5b3cb 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -44,58 +44,58 @@ return array(
 		'database' => 'Установка базы данных',
 		'dom' => array(
 			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
-			'ok' => 'У вас не установлена библиотека для просмотра DOM.',
+			'ok' => 'У вас установлена библиотека для просмотра DOM.',
 		),
 		'entries' => array(
-			'nok' => 'Entry table is bad configured.',
-			'ok' => 'Entry table is ok.',
+			'nok' => 'Таблица статей (entry) неправильно настроена.',
+			'ok' => 'Таблица статей (entry) настроена правильно.',
 		),
 		'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.',
+			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку значков в порядке.',
 		),
 		'feeds' => array(
-			'nok' => 'Feed table is bad configured.',
-			'ok' => 'Feed table is ok.',
+			'nok' => 'Таблица подписок (feed) неправильно настроена.',
+			'ok' => 'Таблица подписок (feed) настроена правильно.',
 		),
-		'files' => 'File installation',
+		'files' => 'Установка файлов',
 		'json' => array(
-			'nok' => 'You lack JSON (php5-json package).',
-			'ok' => 'You have JSON extension.',
+			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
+			'ok' => 'У вас установлена библиотека для работы с JSON.',
 		),
 		'minz' => array(
-			'nok' => 'You lack the Minz framework.',
-			'ok' => 'You have the Minz framework.',
+			'nok' => 'У вас не установлен фрейворк Minz.',
+			'ok' => 'У вас установлен фрейворк Minz.',
 		),
 		'pcre' => array(
-			'nok' => 'You lack a required library for regular expressions (php-pcre).',
-			'ok' => 'You have the required library for regular expressions (PCRE).',
+			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
+			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (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).',
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (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.',
+			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку Mozilla Persona в порядке.',
 		),
 		'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.',
+			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
+			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
 		),
 		'tables' => array(
-			'nok' => 'There is one or more lacking tables in the database.',
-			'ok' => 'Tables are existing in the database.',
+			'nok' => 'В базе данных отсуствует одна или больше таблица.',
+			'ok' => 'Все таблицы есть в базе данных.',
 		),
-		'title' => 'Installation checking',
+		'title' => 'Проверка установки и настройки',
 		'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.',
+			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку tokens  в порядке.',
 		),
 		'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.',
+			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку users  в порядке.',
 		),
 		'zip' => array(
 			'nok' => 'You lack ZIP extension (php5-zip package).',
@@ -103,81 +103,81 @@ return array(
 		),
 	),
 	'extensions' => array(
-		'disabled' => 'Disabled',
-		'empty_list' => 'There is no installed extension',
-		'enabled' => 'Enabled',
-		'no_configure_view' => 'This extension cannot be configured.',
+		'disabled' => 'Отключены',
+		'empty_list' => 'Расширения не установлены',
+		'enabled' => 'Включены',
+		'no_configure_view' => 'Это расширение нельзя настроить.',
 		'system' => array(
-			'_' => 'System extensions',
-			'no_rights' => 'System extension (you have no rights on it)',
+			'_' => 'Системные расширения',
+			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
 		),
-		'title' => 'Extensions',
-		'user' => 'User extensions',
+		'title' => 'Расширения',
+		'user' => 'Расширения пользователя',
 	),
 	'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',
+		'_' => 'Статистика',
+		'all_feeds' => 'Все подписки',
+		'category' => 'Категория',
+		'entry_count' => 'Количество статей',
+		'entry_per_category' => 'Статей в категории',
+		'entry_per_day' => 'Статей за день (за последние 30 дней)',
+		'entry_per_day_of_week' => 'За неделю (в среднем - %.2f сообщений)',
+		'entry_per_hour' => 'За час (в среднем - %.2f сообщений)',
+		'entry_per_month' => 'За месяц (в среднем - %.2f сообщений)',
+		'entry_repartition' => 'Перерасределение статей',
+		'feed' => 'Подписка',
+		'feed_per_category' => 'Подписок в категории',
+		'idle' => 'Неактивные подписки',
+		'main' => 'Основная статистика',
+		'main_stream' => 'Основной поток',
 		'menu' => array(
-			'idle' => 'Idle feeds',
-			'main' => 'Main statistics',
-			'repartition' => 'Articles repartition',
-		),
-		'no_idle' => 'There is no idle feed!',
-		'number_entries' => '%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',
+			'idle' => 'Неактивные подписки',
+			'main' => 'Основная статистика',
+			'repartition' => 'Перерасределение статей',
+		),
+		'no_idle' => 'Нет неактивных подписок!',
+		'number_entries' => 'статей: %d',
+		'percent_of_total' => '%% от всего',
+		'repartition' => 'Перераспределение статей',
+		'status_favorites' => 'Избранное',
+		'status_read' => 'Читать',
+		'status_total' => 'Всего',
+		'status_unread' => 'Не прочитано',
+		'title' => 'Статистика',
+		'top_feed' => '10 лучших подписок',
 	),
 	'system' => array(
-		'_' => 'System configuration',
-		'auto-update-url' => 'Auto-update server URL',
-		'instance-name' => 'Instance name',
-		'max-categories' => 'Categories per user limit',
-		'max-feeds' => 'Feeds per user limit',
+		'_' => 'Системные настройки',
+		'auto-update-url' => 'Адрес сервера для автоматического обновления',
+		'instance-name' => 'Название этого сервера',
+		'max-categories' => 'Количество категорий на пользователя',
+		'max-feeds' => 'Количество статей на пользователя',
 		'registration' => array(
-			'help' => '0 means that there is no account limit',
-			'number' => 'Max number of accounts',
+			'help' => '0 означает неограниченное количество пользователей',
+			'number' => 'Максимальное количество пользователей',
 		),
 	),
 	'update' => 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',
+		'_' => 'Обновление системы',
+		'apply' => 'Применить',
+		'check' => 'Проверить обновления',
+		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
+		'last' => 'Последняя проверка: %s',
+		'none' => 'Нечего обновлять',
+		'title' => 'Обновить систему',
 	),
 	'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',
-		'number' => 'There is %d account created yet',
-		'numbers' => 'There are %d accounts created yet',
-		'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',
-		'users' => 'Users',
+		'articles_and_size' => '%s статей (%s)',
+		'create' => 'Создать нового пользователя',
+		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Язык',
+		'number' => 'На данный момент создан %d аккаунт',
+		'numbers' => 'На данный момент аккаунтов создано:  %d',
+		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
+		'password_format' => 'Минимум 7 символов',
+		'title' => 'Управление пользователями',
+		'user_list' => 'Список пользователей',
+		'username' => 'Имя пользователя',
+		'users' => 'Пользователи',
 	),
 );
-- 
cgit v1.2.3


From 9534ea0e6b54cd899ac4432f1ae8f14258613ae6 Mon Sep 17 00:00:00 2001
From: Purexo <contact@purexo.eu>
Date: Mon, 23 Nov 2015 08:30:00 +0100
Subject: Update greader.php

streamContents can know exclude target unread item
---
 p/api/greader.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/p/api/greader.php b/p/api/greader.php
index b9942f0bc..3fa367299 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -361,6 +361,9 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex
 		case 'user/-/state/com.google/read':
 			$state = FreshRSS_Entry::STATE_NOT_READ;
 			break;
+		case 'user/-/state/com.google/unread':
+			$state = FreshRSS_Entry::STATE_READ;
+			break;
 		default:
 			$state = FreshRSS_Entry::STATE_ALL;
 			break;
-- 
cgit v1.2.3


From 7184ad7b2f0d8f65faa6600f015605662b3705f1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 23 Dec 2015 10:41:14 +0100
Subject: i18n English

https://github.com/FreshRSS/FreshRSS/issues/1043#issuecomment-165984276
---
 app/i18n/en/conf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 69162932f..38e9197e9 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -77,7 +77,7 @@ return array(
 			'warn' => 'Your account and all the related data will be deleted.',
 		),
 		'email_persona' => 'Login email 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_api' => 'API password<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',
-- 
cgit v1.2.3


From 9637e018bf0bdd17ecfabe825cb12ea9a67d7553 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 23 Dec 2015 10:41:14 +0100
Subject: i18n English

https://github.com/FreshRSS/FreshRSS/issues/1043#issuecomment-165984276
---
 app/i18n/en/conf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 69162932f..38e9197e9 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -77,7 +77,7 @@ return array(
 			'warn' => 'Your account and all the related data will be deleted.',
 		),
 		'email_persona' => 'Login email 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_api' => 'API password<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',
-- 
cgit v1.2.3


From e664138bd2906942b793d85d4eaa6f8c01459509 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 9 Jan 2016 14:21:59 +0100
Subject: Update jQuery from 2.1.4 to 2.2

http://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/
---
 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 49990d6e1..06ac26315 100644
--- a/p/scripts/jquery.min.js
+++ b/p/scripts/jquery.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v2.1.4 | (c) 2005, 2015 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.4",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="length"in a&&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=ha(),z=ha(),A=ha(),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-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=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)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){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 ga(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(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(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 ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(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 ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(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 pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.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",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(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(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);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))&&(ja(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(".#.+[+~]")}),ja(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))&&ja(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 la(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?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.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 ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.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},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.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=ga.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=ga.selectors={cacheLength:50,createPseudo:ia,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(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===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]||ga.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]&&ga.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(ca,da).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=ga.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()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(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:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(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:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).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:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(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]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.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?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(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 ta(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 ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(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 wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(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=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(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=[sa(ta(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 wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(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=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.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(ca,da),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(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(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}),ga}(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 aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ba=/<([\w:]+)/,ca=/<|&#?\w+;/,da=/<(?:script|style|link)/i,ea=/checked\s*(?:[^=]|=\s*.checked.)/i,fa=/^$|\/(?:java|ecma)script/i,ga=/^true\/(.*)/,ha=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ia={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,"",""]};ia.optgroup=ia.option,ia.tbody=ia.tfoot=ia.colgroup=ia.caption=ia.thead,ia.th=ia.td;function ja(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 ka(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function la(a){var b=ga.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function ma(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function na(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 oa(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 pa(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=oa(h),f=oa(a),d=0,e=f.length;e>d;d++)pa(f[d],g[d]);if(b)if(c)for(f=f||oa(a),g=g||oa(h),d=0,e=f.length;e>d;d++)na(f[d],g[d]);else na(a,h);return g=oa(h,"script"),g.length>0&&ma(g,!i&&oa(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(ca.test(e)){f=f||k.appendChild(b.createElement("div")),g=(ba.exec(e)||["",""])[1].toLowerCase(),h=ia[g]||ia._default,f.innerHTML=h[1]+e.replace(aa,"<$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=oa(k.appendChild(e),"script"),i&&ma(f),c)){j=0;while(e=f[j++])fa.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=ja(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=ja(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(oa(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&ma(oa(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(oa(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&&!da.test(a)&&!ia[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(aa,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(oa(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(oa(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&&ea.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(oa(c,"script"),ka),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,oa(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,la),j=0;g>j;j++)h=f[j],fa.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(ha,"")))}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 qa,ra={};function sa(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 ta(a){var b=l,c=ra[a];return c||(c=sa(a,b),"none"!==c&&c||(qa=(qa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qa[0].contentDocument,b.write(),b.close(),c=sa(a,b),qa.detach()),ra[a]=c),c}var ua=/^margin/,va=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wa=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xa(a,b,c){var d,e,f,g,h=a.style;return c=c||wa(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),va.test(g)&&ua.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 ya(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 za=/^(none|table(?!-c[ea]).+)/,Aa=new RegExp("^("+Q+")(.*)$","i"),Ba=new RegExp("^([+-])=("+Q+")","i"),Ca={position:"absolute",visibility:"hidden",display:"block"},Da={letterSpacing:"0",fontWeight:"400"},Ea=["Webkit","O","Moz","ms"];function Fa(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Ea.length;while(e--)if(b=Ea[e]+c,b in a)return b;return d}function Ga(a,b,c){var d=Aa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Ha(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 Ia(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wa(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xa(a,b,f),(0>e||null==e)&&(e=a.style[b]),va.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Ha(a,b,c||(g?"border":"content"),d,f)+"px"}function Ja(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",ta(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=xa(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]=Fa(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=Ba.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]=Fa(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xa(a,b,d)),"normal"===e&&b in Da&&(e=Da[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?za.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Ca,function(){return Ia(a,b,d)}):Ia(a,b,d):void 0},set:function(a,c,d){var e=d&&wa(a);return Ga(a,c,d?Ha(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=ya(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xa,[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}},ua.test(a)||(n.cssHooks[a+b].set=Ga)}),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=wa(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 Ja(this,!0)},hide:function(){return Ja(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 Ka(a,b,c,d,e){return new Ka.prototype.init(a,b,c,d,e)}n.Tween=Ka,Ka.prototype={constructor:Ka,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=Ka.propHooks[this.prop];return a&&a.get?a.get(this):Ka.propHooks._default.get(this)},run:function(a){var b,c=Ka.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ka.propHooks._default.set(this),this}},Ka.prototype.init.prototype=Ka.prototype,Ka.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}}},Ka.propHooks.scrollTop=Ka.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=Ka.prototype.init,n.fx.step={};var La,Ma,Na=/^(?:toggle|show|hide)$/,Oa=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pa=/queueHooks$/,Qa=[Va],Ra={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Oa.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Oa.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 Sa(){return setTimeout(function(){La=void 0}),La=n.now()}function Ta(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 Ua(a,b,c){for(var d,e=(Ra[b]||[]).concat(Ra["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Va(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")||ta(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],Na.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?ta(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=Ua(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 Wa(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 Xa(a,b,c){var d,e,f=0,g=Qa.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=La||Sa(),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:La||Sa(),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(Wa(k,j.opts.specialEasing);g>f;f++)if(d=Qa[f].call(j,a,k,j.opts))return d;return n.map(k,Ua,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(Xa,{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],Ra[c]=Ra[c]||[],Ra[c].unshift(b)},prefilter:function(a,b){b?Qa.unshift(a):Qa.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=Xa(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&&Pa.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(Ta(b,!0),a,d,e)}}),n.each({slideDown:Ta("show"),slideUp:Ta("hide"),slideToggle:Ta("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(La=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),La=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(){Ma||(Ma=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Ma),Ma=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 Ya,Za,$a=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)?Za:Ya)),
-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}}}}}),Za={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=$a[b]||n.find.attr;$a[b]=function(a,b,d){var e,f;return d||(f=$a[b],$a[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$a[b]=f),e}});var _a=/^(?: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")||_a.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 ab=/[\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(ab," "):" ")){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(ab," "):"")){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(ab," ").indexOf(b)>=0)return!0;return!1}});var bb=/\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(bb,""):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 cb=n.now(),db=/\?/;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 eb=/#.*$/,fb=/([?&])_=[^&]*/,gb=/^(.*?):[ \t]*([^\r\n]*)$/gm,hb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ib=/^(?:GET|HEAD)$/,jb=/^\/\//,kb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lb={},mb={},nb="*/".concat("*"),ob=a.location.href,pb=kb.exec(ob.toLowerCase())||[];function qb(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 rb(a,b,c,d){var e={},f=a===mb;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 sb(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 tb(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 ub(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:ob,type:"GET",isLocal:hb.test(pb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nb,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?sb(sb(a,n.ajaxSettings),b):sb(n.ajaxSettings,a)},ajaxPrefilter:qb(lb),ajaxTransport:qb(mb),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=gb.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||ob)+"").replace(eb,"").replace(jb,pb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kb.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pb[1]&&h[2]===pb[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pb[3]||("http:"===pb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rb(lb,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=!ib.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(db.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fb.test(d)?d.replace(fb,"$1_="+cb++):d+(db.test(d)?"&":"?")+"_="+cb++)),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]?", "+nb+"; 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=rb(mb,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=tb(k,v,f)),u=ub(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 vb=/%20/g,wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ab(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)Ab(c,a[c],b,e);return d.join("&").replace(vb,"+")},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")&&zb.test(this.nodeName)&&!yb.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(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bb=0,Cb={},Db={0:200,1223:204},Eb=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cb)Cb[a]()}),k.cors=!!Eb&&"withCredentials"in Eb,k.ajax=Eb=!!Eb,n.ajaxTransport(function(a){var b;return k.cors||Eb&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bb;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 Cb[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Db[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=Cb[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 Fb=[],Gb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fb.pop()||n.expando+"_"+cb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gb.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gb.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(Gb,"$1"+e):b.jsonp!==!1&&(b.url+=(db.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,Fb.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 Hb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hb)return Hb.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 Ib=a.document.documentElement;function Jb(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=Jb(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||Ib;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ib})}}),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=Jb(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]=ya(k.pixelPosition,function(a,c){return c?(c=xa(a,b),va.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 Kb=a.jQuery,Lb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lb),b&&a.jQuery===n&&(a.jQuery=Kb),n},typeof b===U&&(a.jQuery=a.$=n),n});
+/*! jQuery v2.2.0 | (c) jQuery Foundation | 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=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.0",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 e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.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()},push:g,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){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!k.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?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.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){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[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):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.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,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"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=ga(),z=ga(),A=ga(),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="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),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")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=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)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){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 fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(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 la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(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 oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.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]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);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"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' 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(".#.+[+~]")}),ia(function(a){var b=n.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=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.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===n||a.ownerDocument===v&&t(v,a)?-1:b===n||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,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!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 fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.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},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.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=fa.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=fa.selectors={cacheLength:50,createPseudo:ha,match:W,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(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===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]||fa.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]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.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(ba,ca).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=fa.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(P," ")+" ").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,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(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:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(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:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).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 Y.test(a.nodeName)},input:function(a){return X.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:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(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]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.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=R.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[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?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(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,k=[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(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(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 ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(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 va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(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=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(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=[ra(sa(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 va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.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(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.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(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(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}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=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},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(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(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==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(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};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=w.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.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.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.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(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 u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(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&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},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().progress(c.notify).done(c.resolve).fail(c.reject):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=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;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||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=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)K(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},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][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=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c}catch(e){}O.set(a,b,c);
+}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.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=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.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 N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.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=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={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,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return this;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.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"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.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)),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=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.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)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.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.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!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&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(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)>-1: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 detail 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,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&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)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},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?ga:ha):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={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&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}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,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=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.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])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(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 ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(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 K(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&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),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),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c.opener||(c=a),c.getComputedStyle(b)},Da=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},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),!l.pixelMarginRight()&&Ba.test(g)&&Aa.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 Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(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+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ca(b),i="border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Fa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Ba.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+Oa(b,c,e||(i?"border":"content"),f,h)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.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=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,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]=Ma(h)||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=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.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]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[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+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(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 Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.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},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.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?N.get(a,"olddisplay")||za(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],Ua.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?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(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 $a(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 _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),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:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),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.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,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(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.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(V).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=_a(this,n.extend({},a),f);(e||N.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=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.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=N.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(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("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(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=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(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(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(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);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)}}),ab={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=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(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){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.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 eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(void 0===a||"boolean"===c)&&(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\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(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){return n.trim(a.value)}},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)&&(l.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(n.valHooks.option.get(d),f)>-1)&&(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)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var hb=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!hb.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,hb.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}}),n.fn.extend({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}}),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)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var ib=a.location,jb=n.now(),kb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return(!c||c.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+b),c};var lb=/#.*$/,mb=/([?&])_=[^&]*/,nb=/^(.*?):[ \t]*([^\r\n]*)$/gm,ob=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,pb=/^(?:GET|HEAD)$/,qb=/^\/\//,rb={},sb={},tb="*/".concat("*"),ub=d.createElement("a");ub.href=ib.href;function vb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];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 wb(a,b,c,d){var e={},f=a===sb;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 xb(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 yb(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 zb(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:ib.href,type:"GET",isLocal:ob.test(ib.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":tb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},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?xb(xb(a,n.ajaxSettings),b):xb(n.ajaxSettings,a)},ajaxPrefilter:vb(rb),ajaxTransport:vb(sb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=nb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||ib.href)+"").replace(lb,"").replace(qb,ib.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=ub.protocol+"//"+ub.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),wb(rb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!pb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(kb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=mb.test(f)?f.replace(mb,"$1_="+jb++):f+(kb.test(f)?"&":"?")+"_="+jb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+tb+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=wb(sb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=yb(m,x,d)),u=zb(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,(b||!y)&&(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},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(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&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 n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(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!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Ab=/%20/g,Bb=/\[\]$/,Cb=/\r?\n/g,Db=/^(?:submit|button|image|reset|file)$/i,Eb=/^(?:input|select|textarea|keygen)/i;function Fb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Bb.test(a)?d(a,e):Fb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Fb(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)Fb(c,a[c],b,e);return d.join("&").replace(Ab,"+")},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")&&Eb.test(this.nodeName)&&!Db.test(a)&&(this.checked||!X.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(Cb,"\r\n")}}):{name:b.name,value:c.replace(Cb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Gb={0:200,1223:204},Hb=n.ajaxSettings.xhr();l.cors=!!Hb&&"withCredentials"in Hb,l.ajax=Hb=!!Hb,n.ajaxTransport(function(b){var c,d;return l.cors||Hb&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Gb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},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(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Ib=[],Jb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Ib.pop()||n.expando+"_"+jb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Jb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Jb.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(Jb,"$1"+e):b.jsonp!==!1&&(b.url+=(kb.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(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Ib.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),l.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||(l.createHTMLDocument?d.implementation.createHTMLDocument(""):d);var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Kb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Kb)return Kb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(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||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,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};function Lb(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,n.extend({},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)?(e=d.getBoundingClientRect(),c=Lb(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)-a.scrollTop(),d.left+=n.css(a[0],"borderLeftWidth",!0)-a.scrollLeft()),{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;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Lb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.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 K(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.extend({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)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Mb=a.jQuery,Nb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Nb),b&&a.jQuery===n&&(a.jQuery=Mb),n},b||(a.jQuery=a.$=n),n});
-- 
cgit v1.2.3


From 9b842f9909807fb615e5fb52149903272d9ae101 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Tue, 19 Jan 2016 19:46:40 +0100
Subject: Update shares.php

---
 data/shares.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/shares.php b/data/shares.php
index 55ef08ec4..264c8fed7 100644
--- a/data/shares.php
+++ b/data/shares.php
@@ -75,4 +75,9 @@ return array(
 		'transform' => array(),
 		'form' => 'simple',
 	),
+	'jdh' => array(
+                'url' => 'https://www.journalduhacker.net/stories/new?url=~LINK~&title=~TITLE~',
+                'transform' => array('rawurlencode'),
+                'form' => 'simple',
+        ),
 );
-- 
cgit v1.2.3


From d4a2f6e313f08167ab39f500024593c3e2b4aa5c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Jan 2016 10:18:45 +0100
Subject: Compatibility PHP 5.2 with array_replace_recursive

https://github.com/FreshRSS/FreshRSS/issues/1055
https://github.com/FreshRSS/FreshRSS/pull/926
https://github.com/FreshRSS/FreshRSS/issues/923
---
 lib/lib_rss.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 2a23fca45..4852f7217 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -15,6 +15,35 @@ if (!function_exists('json_encode')) {
 	}
 }
 
+if (!function_exists('array_replace_recursive')) {
+	function array_replace_recursive($array, $array1) {	//http://php.net/manual/function.array-replace-recursive.php#92574
+		function recurse($array, $array1) {
+			foreach ($array1 as $key => $value) {
+				if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
+					$array[$key] = array();	//create new key in $array, if it is empty or not an array
+				}
+				if (is_array($value)) {
+					$value = recurse($array[$key], $value);	// overwrite the value in the base array
+				}
+				$array[$key] = $value;
+			}
+			return $array;
+		}
+		// handle the arguments, merge one by one
+		$args = func_get_args();
+		$array = $args[0];
+		if (!is_array($array)) {
+			return $array;
+		}
+		for ($i = 1; $i < count($args); $i++) {
+			if (is_array($args[$i])) {
+				$array = recurse($array, $args[$i]);
+			}
+		}
+		return $array;
+	}
+}
+
 /**
  * Build a directory path by concatenating a list of directory names.
  *
-- 
cgit v1.2.3


From 0915772fe6735f6051c6b56a3b3e59dd3c44833b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Jan 2016 11:06:20 +0100
Subject: PubSubHubbub unsubscribe request

https://github.com/FreshRSS/FreshRSS/issues/1058
---
 app/Models/Feed.php | 9 ++++-----
 p/api/pshb.php      | 9 +++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 23491ee8d..986cc5015 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -451,6 +451,10 @@ class FreshRSS_Feed extends Minz_Model {
 				Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url);
 				return false;
 			}
+			if (!$state) {	//unsubscribe
+				$hubJson['lease_end'] = time() - 60;
+				file_put_contents($hubFilename, json_encode($hubJson));
+			}
 			$ch = curl_init();
 			curl_setopt_array($ch, array(
 				CURLOPT_URL => $this->hubUrl,
@@ -470,11 +474,6 @@ class FreshRSS_Feed extends Minz_Model {
 				'PubSubHubbub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $this->selfUrl .
 				' with callback ' . $callbackUrl . ': ' . $info['http_code'] . ' ' . $response . "\n", FILE_APPEND);
 
-			if (!$state) {	//unsubscribe
-				$hubJson['lease_end'] = time() - 60;
-				file_put_contents($hubFilename, json_encode($hubJson));
-			}
-
 			if (substr($info['http_code'], 0, 1) == '2') {
 				return true;
 			} else {
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 4bb4694b3..7de4cc1a2 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -68,6 +68,15 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
 
+if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'unsubscribe') {
+	if (empty($hubJson['lease_end']) || $hubJson['lease_end'] < time()) {
+		exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
+	} else {
+		header('HTTP/1.1 422 Unprocessable Entity');
+		die('We did not ask to unsubscribe!');
+	}
+}
+
 if ($ORIGINAL_INPUT == '') {
 	header('HTTP/1.1 422 Unprocessable Entity');
 	die('Missing XML payload!');
-- 
cgit v1.2.3


From 362dbad0b8ff0a29241f4e29556910dfaf7d66e5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Jan 2016 13:18:48 +0100
Subject: Several position problems, in particular in the global view

Multiple small bugs in global and reader views.
Related to these old issues:
https://github.com/FreshRSS/FreshRSS/issues/634
https://github.com/FreshRSS/FreshRSS/issues/275
---
 app/layout/layout.phtml                 |  4 ++--
 app/views/helpers/javascript_vars.phtml |  7 +++----
 p/scripts/main.js                       | 30 +++++++++++-------------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 000a6c0d2..1d3afbf71 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -5,10 +5,10 @@
 		<meta name="viewport" content="initial-scale=1.0" />
 		<?php echo self::headTitle(); ?>
 		<?php echo self::headStyle(); ?>
-		<?php echo self::headScript(); ?>
 		<script>//<![CDATA[
 <?php $this->renderHelper('javascript_vars'); ?>
 		//]]></script>
+		<?php echo self::headScript(); ?>
 <?php
 	$url_base = Minz_Request::currentRequest();
 	if (FreshRSS_Context::$next_id !== '') {
@@ -42,7 +42,7 @@
 		<meta name="robots" content="noindex,nofollow" />
 <?php } ?>
 	</head>
-	<body class="<?php echo Minz_Request::param('output', 'normal'); ?>">
+	<body class="<?php echo Minz_Request::actionName(); ?>">
 <?php $this->partial('header'); ?>
 
 <div id="global">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index adf0783f3..36d6e693d 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -4,8 +4,7 @@
 $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::$user_conf->display_posts ||
-               Minz_Request::param('output') === 'reader');
+$hide_posts = !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader');
 $s = FreshRSS_Context::$user_conf->shortcuts;
 
 $url_login = Minz_Url::display(array(
@@ -19,7 +18,7 @@ $url_logout = Minz_Url::display(array(
 
 echo 'var context={',
 	'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',',
-	'hide_posts:', $hide_posts ? 'false' : 'true', ',',
+	'hide_posts:', $hide_posts ? 'true' : 'false', ',',
 	'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', ',',
@@ -31,7 +30,7 @@ echo 'var context={',
 	'html5_notif_timeout:', FreshRSS_Context::$user_conf->html5_notif_timeout, ',',
 	'auth_type:"', FreshRSS_Context::$system_conf->auth_type, '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
-	'current_view:"', Minz_Request::param('output', 'normal'), '"',
+	'current_view:"', Minz_Request::actionName(), '"',
 "},\n";
 
 echo 'shortcuts={',
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f64927c14..45a028a7d 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -246,18 +246,18 @@ function toggleContent(new_active, old_active) {
 
 	var box_to_move = "html,body",
 		relative_move = false;
-	if (context['current_view'] == 'global') {
+	if (context['current_view'] === 'global') {
 		box_to_move = "#panel";
 		relative_move = true;
 	}
 
 	if (context['sticky_post']) {
 		var prev_article = new_active.prevAll('.flux'),
-			new_pos = new_active.position().top,
+			new_pos = new_active.offset().top,
 			old_scroll = $(box_to_move).scrollTop();
 
-		if (prev_article.length > 0 && new_pos - prev_article.position().top <= 150) {
-			new_pos = prev_article.position().top;
+		if (prev_article.length > 0 && new_pos - prev_article.offset().top <= 150) {
+			new_pos = prev_article.offset().top;
 		}
 
 		if (context['hide_posts']) {
@@ -451,11 +451,8 @@ function auto_share(key) {
 	}
 }
 
-function inMarkViewport(flux, box_to_follow, relative_follow) {
-	var top = flux.position().top;
-	if (relative_follow) {
-		top += box_to_follow.scrollTop();
-	}
+function inMarkViewport(flux, box_to_follow) {
+	var top = flux.offset().top;
 	var height = flux.height(),
 		begin = top + 3 * height / 4,
 		bot = Math.min(begin + 75, top + height),
@@ -466,17 +463,15 @@ function inMarkViewport(flux, box_to_follow, relative_follow) {
 }
 
 function init_posts() {
-	var box_to_follow = $(window),
-		relative_follow = false;
-	if (context['current_view'] == 'global') {
+	var box_to_follow = $(window);
+	if (context['current_view'] === 'global') {
 		box_to_follow = $("#panel");
-		relative_follow = true;
 	}
 
 	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)) {
+				if ($(this).children(".flux_content").is(':visible') && inMarkViewport($(this), box_to_follow)) {
 					mark_read($(this), true);
 				}
 			});
@@ -490,10 +485,7 @@ function init_posts() {
 				return;
 			}
 			var boxBot = box_to_follow.scrollTop() + box_to_follow.height(),
-				load_more_top = load_more.position().top;
-			if (relative_follow) {
-				load_more_top += box_to_follow.scrollTop();
-			}
+				load_more_top = load_more.offset().top;
 			if (boxBot >= load_more_top) {
 				load_more_posts();
 			}
@@ -765,7 +757,7 @@ function init_nav_entries() {
 	$nav_entries.find('.up').click(function () {
 		var active_item = $(".flux.current"),
 			windowTop = $(window).scrollTop(),
-			item_top = active_item.position().top;
+			item_top = active_item.offset().top;
 
 		if (windowTop > item_top) {
 			$("html,body").scrollTop(item_top);
-- 
cgit v1.2.3


From 159ea0aecf2f3738da4fdf70e7e0aaffade60dcc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Jan 2016 13:28:29 +0100
Subject: Readme jQuery 2.2

---
 CHANGELOG.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c2d7f4cf..d089cb86e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Changelog
 
-## 2015-xx-xx FreshRSS 1.3.1-beta
+## 2016-xx-xx FreshRSS 1.3.1-beta
+
+* UI
+	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
+	* Updated to jQuery 2.2 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
 
-* Nothing for the moment.
 
 ## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta
 
@@ -12,13 +15,13 @@
 * Security
 	* Invalid logins now return HTTP 403, to be easier to catch (e.g. fail2ban) [#1015](https://github.com/FreshRSS/FreshRSS/issues/1015)
 * UI
-    * Remove "title" field during installation [#858](https://github.com/FreshRSS/FreshRSS/issues/858)
+	* Remove "title" field during installation [#858](https://github.com/FreshRSS/FreshRSS/issues/858)
 	* Visual alert on categories containing feeds in error [#984](https://github.com/FreshRSS/FreshRSS/pull/984)
 * I18n
 	* Italian [#1003](https://github.com/FreshRSS/FreshRSS/issues/1003)
 * Misc.
-    * Support reverse proxy [#975](https://github.com/FreshRSS/FreshRSS/issues/975)
-    * Make auto-update server URL alterable [#1019](https://github.com/FreshRSS/FreshRSS/issues/1019)
+	* Support reverse proxy [#975](https://github.com/FreshRSS/FreshRSS/issues/975)
+	* Make auto-update server URL alterable [#1019](https://github.com/FreshRSS/FreshRSS/issues/1019)
 
 
 ## 2015-09-12 FreshRSS 1.1.3-beta
-- 
cgit v1.2.3


From b596d569f3048d3539d1a372eea269462a7a5f82 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:20:52 +0100
Subject: Translation for Journal du hacker

---
 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 2f16f09b9..1e738e949 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Attention !',
-- 
cgit v1.2.3


From a51604bcbce5f2703915ab51e0d7c1d4440f132e Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:22:18 +0100
Subject: Translation for Journal du hacker

---
 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 d23b12f95..3d66938d1 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Warning!',
-- 
cgit v1.2.3


From 8890f6ca7738666c5745837f4dad73f5e2877ce7 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:23:58 +0100
Subject: Translation for Journal du hacker

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

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 842383498..4953610ba 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Achtung!',
-- 
cgit v1.2.3


From ea7891898684e3deabe084d6cfa3f74438cdd975 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:25:55 +0100
Subject: Translation for Journal du hacker

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

diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index eb545b8cf..1ac6b04a1 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -163,6 +163,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Attenzione!',
-- 
cgit v1.2.3


From 3185498bad149b33e67f863ef406eee6e8b0114f Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:26:47 +0100
Subject: Translation for Journal du hacker

---
 app/i18n/nl/gen.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 574f0386b..21d1fba22 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -163,7 +163,8 @@ return array(
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag',                
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Attentie!',
-- 
cgit v1.2.3


From 21c2ce397ed2b8b2681abff8ca8e9a3b4cf22027 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:28:15 +0100
Subject: Translation for Journal du hacker

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

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index ffc138abb..4d34a8173 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Upozornění!',
-- 
cgit v1.2.3


From 21630599b59830fa88f0e3988e88347cdfa3b5ea Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:35:33 +0100
Subject: Translation for Journal du hacker

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

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index ffc138abb..4d34a8173 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Upozornění!',
-- 
cgit v1.2.3


From af942739137cd1c95c052157c1f44ea6d605f4c3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 25 Jan 2016 21:05:35 +0100
Subject: More PHP 5.2 install compatibility

https://github.com/FreshRSS/FreshRSS/issues/1055
---
 app/install.php |  6 +++---
 lib/lib_rss.php | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/install.php b/app/install.php
index 83526b60c..7ac1c4cec 100644
--- a/app/install.php
+++ b/app/install.php
@@ -130,7 +130,7 @@ function saveStep2() {
 		$_SESSION['mail_login'] = filter_var(param('mail_login', ''), FILTER_VALIDATE_EMAIL);
 
 		$password_plain = param('passwordPlain', false);
-		if ($password_plain !== false) {
+		if ($password_plain !== false && cryptAvailable()) {
 			if (!function_exists('password_hash')) {
 				include_once(LIB_PATH . '/password_compat.php');
 			}
@@ -681,10 +681,10 @@ 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('install.auth.form'); ?></option>
+					<option value="form"<?php echo $auth_type === 'form' || (no_auth($auth_type) && cryptAvailable()) ? ' 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>
+					<option value="none"<?php echo $auth_type === 'none' || (no_auth($auth_type) && !cryptAvailable()) ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
 				</select>
 			</div>
 		</div>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 4852f7217..457fada3d 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -16,19 +16,19 @@ if (!function_exists('json_encode')) {
 }
 
 if (!function_exists('array_replace_recursive')) {
-	function array_replace_recursive($array, $array1) {	//http://php.net/manual/function.array-replace-recursive.php#92574
-		function recurse($array, $array1) {
-			foreach ($array1 as $key => $value) {
-				if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
-					$array[$key] = array();	//create new key in $array, if it is empty or not an array
-				}
-				if (is_array($value)) {
-					$value = recurse($array[$key], $value);	// overwrite the value in the base array
-				}
-				$array[$key] = $value;
+	function arr_recurse($array, $array1) {
+		foreach ($array1 as $key => $value) {
+			if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
+				$array[$key] = array();	//create new key in $array, if it is empty or not an array
 			}
-			return $array;
+			if (is_array($value)) {
+				$value = arr_recurse($array[$key], $value);	// overwrite the value in the base array
+			}
+			$array[$key] = $value;
 		}
+		return $array;
+	}
+	function array_replace_recursive($array, $array1) {	//http://php.net/manual/function.array-replace-recursive.php#92574
 		// handle the arguments, merge one by one
 		$args = func_get_args();
 		$array = $args[0];
@@ -37,7 +37,7 @@ if (!function_exists('array_replace_recursive')) {
 		}
 		for ($i = 1; $i < count($args); $i++) {
 			if (is_array($args[$i])) {
-				$array = recurse($array, $args[$i]);
+				$array = arr_recurse($array, $args[$i]);
 			}
 		}
 		return $array;
-- 
cgit v1.2.3


From dfd0b9e9355c1e44e72b95583dd5e730f0ad5230 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 26 Jan 2016 19:34:23 +0100
Subject: Note about PHP 5.2

https://github.com/FreshRSS/FreshRSS/issues/1055
---
 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 457fada3d..b0189c162 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -15,7 +15,7 @@ if (!function_exists('json_encode')) {
 	}
 }
 
-if (!function_exists('array_replace_recursive')) {
+if (!function_exists('array_replace_recursive')) {	//PHP 5.2
 	function arr_recurse($array, $array1) {
 		foreach ($array1 as $key => $value) {
 			if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
-- 
cgit v1.2.3


From f62ab5fe5bb15a846a653e291f42828df090426e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 26 Jan 2016 22:00:18 +0100
Subject: Offset in global view

https://github.com/FreshRSS/FreshRSS/pull/1050#issuecomment-175166593
---
 p/scripts/main.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 45a028a7d..968c945c8 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -244,20 +244,19 @@ function toggleContent(new_active, old_active) {
 		new_active.toggleClass('active');
 	}
 
-	var box_to_move = "html,body",
-		relative_move = false;
-	if (context['current_view'] === 'global') {
-		box_to_move = "#panel";
-		relative_move = true;
-	}
+	var relative_move = context['current_view'] === 'global',
+		box_to_move = $(relative_move ? "#panel" : "html,body");
 
 	if (context['sticky_post']) {
 		var prev_article = new_active.prevAll('.flux'),
 			new_pos = new_active.offset().top,
-			old_scroll = $(box_to_move).scrollTop();
+			old_scroll = box_to_move.scrollTop();
 
 		if (prev_article.length > 0 && new_pos - prev_article.offset().top <= 150) {
 			new_pos = prev_article.offset().top;
+			if (relative_move) {
+				new_pos -= box_to_move.offset().top;
+			}
 		}
 
 		if (context['hide_posts']) {
@@ -267,7 +266,7 @@ function toggleContent(new_active, old_active) {
 
 			if (old_active[0] !== new_active[0]) {
 				new_active.children(".flux_content").first().each(function () {
-					$(box_to_move).scrollTop(new_pos).scrollTop();
+					box_to_move.scrollTop(new_pos).scrollTop();
 				});
 			}
 		} else {
@@ -275,7 +274,7 @@ function toggleContent(new_active, old_active) {
 				new_pos += old_scroll;
 			}
 
-			$(box_to_move).scrollTop(new_pos).scrollTop();
+			box_to_move.scrollTop(new_pos).scrollTop();
 		}
 	}
 
-- 
cgit v1.2.3


From 62b1a484e83ec0ead9a7d33b01c2349ffa9657cb Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:24:09 +0200
Subject: Create admin.php

---
 app/i18n/tr/admin.php | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 app/i18n/tr/admin.php

diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
new file mode 100644
index 000000000..3a6f8118e
--- /dev/null
+++ b/app/i18n/tr/admin.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Öntanımlı kullanıcının makalelerinin anonim okunmasına izin ver (%s)',
+		'allow_anonymous_refresh' => 'Anonim makale yenilemesine izin ver',
+		'api_enabled' => '<abbr>API</abbr> erişimine izin ver <small>(mobil uygulamalar için gerekli)</small>',
+		'form' => 'Web formu (geleneksel, JavaScript gerektirir)',
+		'http' => 'HTTP (ileri kullanıcılar için, HTTPS)',
+		'none' => 'Hiçbiri (tehlikeli)',
+		'persona' => 'Mozilla Persona (modern, JavaScript gerektirir)',
+		'title' => 'Kimlik doğrulama',
+		'title_reset' => 'Kimlik doğrulama sıfırla',
+		'token' => 'Kimlik doğrulama işareti',
+		'token_help' => 'Kimlik doğrulama olmaksızın öntanımlı kullanıcının RSS çıktısına erişime izin ver:',
+		'type' => 'Kimlik doğrulama yöntemi',
+		'unsafe_autologin' => 'Güvensiz otomatik girişe izin ver: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => '<em>./data/cache</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Önbellek klasörü yetkileri sorunsuz.',
+		),
+		'categories' => array(
+			'nok' => 'Kategori tablosu kötü yapılandırılmış.',
+			'ok' => 'Kategori tablosu sorunsuz.',
+		),
+		'connection' => array(
+			'nok' => 'Veritabanı ile bağlantı kurulamıyor.',
+			'ok' => 'Veritabanı ile bağlantı sorunsuz.',
+		),
+		'ctype' => array(
+			'nok' => 'Karakter yazım kontrolü için kütüphane eksik (php-ctype).',
+			'ok' => 'Karakter yazım kontrolü için kütüphane sorunsuz (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'cURL eksik (php5-curl package).',
+			'ok' => 'cURL eklentisi sorunsuz.',
+		),
+		'data' => array(
+			'nok' => '<em>./data</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Veri klasörü yetkileri sorunsuz.',
+		),
+		'database' => 'Veritabanı kurulumu',
+		'dom' => array(
+			'nok' => 'DOM kütüpbanesi eksik (php-xml package).',
+			'ok' => 'DOM kütüphanesi sorunsuz.',
+		),
+		'entries' => array(
+			'nok' => 'Giriş tablosu kötü yapılandırılmış.',
+			'ok' => 'Giriş tablosu sorunsuz.',
+		),
+		'favicons' => array(
+			'nok' => '<em>./data/favicons</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Site ikonu klasörü yetkileri sorunsuz.',
+		),
+		'feeds' => array(
+			'nok' => 'Akış tablosu kötü yapılandırılmış.',
+			'ok' => 'Akış tablosu sorunsuz.',
+		),
+		'files' => 'Dosya kurulumu',
+		'json' => array(
+			'nok' => 'JSON eklentisi eksik (php5-json package).',
+			'ok' => 'JSON eklentisi sorunsuz.',
+		),
+		'minz' => array(
+			'nok' => 'Minz framework eksik.',
+			'ok' => 'Minz framework sorunsuz.',
+		),
+		'pcre' => array(
+			'nok' => 'Düzenli ifadeler kütüphanesi eksik (php-pcre).',
+			'ok' => 'Düzenli ifadeler kütüphanesi sorunsuz (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
+			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => '<em>./data/persona</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Mozilla Persona klasörü yetkileri sorunsuz.',
+		),
+		'php' => array(
+			'_' => 'PHP kurulumu',
+			'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
+			'ok' => 'PHP versiyonunuz %s, FreshRSS ile tam uyumlu.',
+		),
+		'tables' => array(
+			'nok' => 'Veritabanında bir veya daha fazla tablo eksik.',
+			'ok' => 'Veritabanı tabloları sorunsuz.',
+		),
+		'title' => 'Kurulum kontrolü',
+		'tokens' => array(
+			'nok' => '<em>./data/tokens</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'İşaretler klasörü yetkileri sorunsuz..',
+		),
+		'users' => array(
+			'nok' => '<em>./data/users</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
+		),
+		'zip' => array(
+			'nok' => 'ZIP eklentisi eksik (php5-zip package).',
+			'ok' => 'ZIP eklentisi sorunsuz.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Pasif',
+		'empty_list' => 'Yüklenmiş eklenti bulunmamaktadır',
+		'enabled' => 'Aktif',
+		'no_configure_view' => 'Bu eklenti yapılandırılamaz.',
+		'system' => array(
+			'_' => 'Sistem eklentileri',
+			'no_rights' => 'Sistem eklentileri (düzenleme hakkınız yok)',
+		),
+		'title' => 'Eklentiler',
+		'user' => 'Kullanıcı eklentileri',
+	),
+	'stats' => array(
+		'_' => 'İstatistikler',
+		'all_feeds' => 'Tüm akış',
+		'category' => 'Kategori',
+		'entry_count' => 'Makale sayısı',
+		'entry_per_category' => 'Kategori başı makale sayısı',
+		'entry_per_day' => 'Günlük makale sayısı (last 30 days)',
+		'entry_per_day_of_week' => 'Haftanın günü (ortalama: %.2f makale)',
+		'entry_per_hour' => 'Saatlik (ortalama: %.2f makale)',
+		'entry_per_month' => 'Aylık (average: %.2f makale)',
+		'entry_repartition' => 'Giriş dağılımı',
+		'feed' => 'Akış',
+		'feed_per_category' => 'Kategoriye göre akışlar',
+		'idle' => 'Boştaki akışlar',
+		'main' => 'Ana istatistikler',
+		'main_stream' => 'Ana akış',
+		'menu' => array(
+			'idle' => 'Boştaki akışlar',
+			'main' => 'Ana istatistikler',
+			'repartition' => 'Makale dağılımı',
+		),
+		'no_idle' => 'Boşta akış yok!',
+		'number_entries' => '%d makale',
+		'percent_of_total' => '%% toplamın yüzdesi',
+		'repartition' => 'Makale dağılımı',
+		'status_favorites' => 'Favoriler',
+		'status_read' => 'Okunmuş',
+		'status_total' => 'Toplam',
+		'status_unread' => 'Okunmamış',
+		'title' => 'İstatistikler',
+		'top_feed' => 'İlk 10 akış',
+	),
+	'system' => array(
+		'_' => 'Sistem yapılandırması',
+		'auto-update-url' => 'Otomatik güncelleme sunucu URL',
+		'instance-name' => 'Örnek isim',
+		'max-categories' => 'Kullanıcı başına kategori limiti',
+		'max-feeds' => 'Kullanıcı başına akış limiti',
+		'registration' => array(
+			'help' => '0 sınır yok anlamındadır',
+			'number' => 'En fazla hesap sayısı',
+		),
+	),
+	'update' => array(
+		'_' => 'Sistem güncelleme',
+		'apply' => 'Uygula',
+		'check' => 'Güncelleme kontrolü',
+		'current_version' => 'Mevcut FreshRSS sürümünüz %s.',
+		'last' => 'Son kontrol: %s',
+		'none' => 'Yeni güncelleme yok',
+		'title' => 'Sistem güncelleme',
+	),
+	'user' => array(
+		'articles_and_size' => '%s makale (%s)',
+		'create' => 'Yeni kullanıcı oluştur',
+		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
+		'language' => 'Dil',
+		'number' => 'Oluşturulmuş %d hesap var',
+		'numbers' => 'Oluşturulmuş %d hesap var',
+		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
+		'password_format' => 'En az 7 karakter',
+		'title' => 'Kullanıcıları yönet',
+		'user_list' => 'Kullanıcı listesi',
+		'username' => 'Kullanıcı adı',
+		'users' => 'Kullanıcılar',
+	),
+);
-- 
cgit v1.2.3


From e9363910a0c3ee276c07c3d08c665e2de9aab1d7 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:28:07 +0200
Subject: Create conf.php

---
 app/i18n/tr/conf.php | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 app/i18n/tr/conf.php

diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
new file mode 100644
index 000000000..d9e275b21
--- /dev/null
+++ b/app/i18n/tr/conf.php
@@ -0,0 +1,174 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Arşiv',
+		'advanced' => 'Gelişmiş',
+		'delete_after' => 'Makelelerin tutulacağı süre',
+		'help' => 'Akış ayarlarında daha çok ayar bulabilirsiniz',
+		'keep_history_by_feed' => 'Akışta en az tutulacak makale sayısı',
+		'optimize' => 'Veritabanı optimize et',
+		'optimize_help' => 'Bu işlem bazen veritabanı boyutunu düşürmeye yardımcı olur',
+		'purge_now' => 'Şimdi temizle',
+		'title' => 'Arşiv',
+		'ttl' => 'Şu süreden sık otomatik yenileme yapma',
+	),
+	'display' => array(
+		'_' => 'Görünüm',
+		'icon' => array(
+			'bottom_line' => 'Alt çizgi',
+			'entry' => 'Makale ikonları',
+			'publication_date' => 'Yayınlama Tarihi',
+			'related_tags' => 'İlgili etiketler',
+			'sharing' => 'Paylaşım',
+			'top_line' => 'Üst çizgi',
+		),
+		'language' => 'Dil',
+		'notif_html5' => array(
+			'seconds' => 'saniye (0 zaman aşımı yok demektir)',
+			'timeout' => 'HTML5 bildirim zaman aşımı',
+		),
+		'theme' => 'Tema',
+		'title' => 'Görünüm',
+		'width' => array(
+			'content' => 'İçerik genişliği',
+			'large' => 'Geniş',
+			'medium' => 'Orta',
+			'no_limit' => 'Sınırsız',
+			'thin' => 'Zayıf',
+		),
+	),
+	'query' => array(
+		'_' => 'Kullanıcı sorguları',
+		'deprecated' => 'Bu sorgu artık geçerli değil. İlgili akış veya kategori silinmiş.',
+		'filter' => 'Filtre uygulandı:',
+		'get_all' => 'Tüm makaleleri göster',
+		'get_category' => '"%s" kategorisini göster',
+		'get_favorite' => 'Favori makaleleri göster',
+		'get_feed' => '"%s" akışını göster',
+		'no_filter' => 'Filtre yok',
+		'none' => 'Henüz hiç kullanıcı sorgusu oluşturmadınız.',
+		'number' => 'Sorgu n°%d',
+		'order_asc' => 'Önce eski makaleleri göster',
+		'order_desc' => 'Önce yeni makaleleri göster',
+		'search' => '"%s" için arama',
+		'state_0' => 'Tüm makaleleri göster',
+		'state_1' => 'Okunmuş makaleleri göster',
+		'state_2' => 'Okunmamış makaleleri göster',
+		'state_3' => 'Tüm makaleleri göster',
+		'state_4' => 'Favori makaleleri göster',
+		'state_5' => 'Okunmuş favori makaleleri göster',
+		'state_6' => 'Okunmamış favori makaleleri göster',
+		'state_7' => 'Favori makaleleri göster',
+		'state_8' => 'Favori olmayan makaleleri göster',
+		'state_9' => 'Favori olmayan okunmuş makaleleri göster',
+		'state_10' => 'Favori olmayan okunmamış makaleleri göster',
+		'state_11' => 'Favori olmayan makaleleri göster',
+		'state_12' => 'Tüm makaleleri göster',
+		'state_13' => 'Okunmuş makaleleri göster',
+		'state_14' => 'Okunmamış makaleleri göster',
+		'state_15' => 'Tüm makaleleri göster',
+		'title' => 'Kullanıcı sorguları',
+	),
+	'profile' => array(
+		'_' => 'Profil yönetimi',
+		'delete' => array(
+			'_' => 'Hesap silme',
+			'warn' => 'Hesabınız ve tüm verileriniz silinecek.',
+		),
+		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
+		'password_api' => 'API Şifresi<br /><small>(ör. mobil uygulamalar için)</small>',
+		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
+		'password_format' => 'En az 7 karakter',
+		'title' => 'Profil',
+	),
+	'reading' => array(
+		'_' => 'Okuma',
+		'after_onread' => '"Hepsini okundu say" dedinten sonra,',
+		'articles_per_page' => 'Sayfa başına makale sayısı',
+		'auto_load_more' => 'Sayfa sonunda yeni makaleleri yükle',
+		'auto_remove_article' => 'Okuduktan sonra makaleleri gizle',
+		'mark_updated_article_unread' => 'Güncellenen makaleleri okundu olarak işaretle',
+		'confirm_enabled' => '"Hepsini okundu say" eylemi için onay iste',
+		'display_articles_unfolded' => 'Show articles unfolded by default',
+		'display_categories_unfolded' => 'Show categories folded by default',
+		'hide_read_feeds' => 'Okunmamış makalesi olmayan kategori veya akışı gizle ("Tüm makaleleri göster" komutunda çalışmaz)',
+		'img_with_lazyload' => 'Resimleri yüklemek için "tembel modu" kullan',
+		'jump_next' => 'Bir sonraki benzer okunmamışa geç (akış veya kategori)',
+		'number_divided_when_reader' => 'Okuma modunda ikiye bölünecek.',
+		'read' => array(
+			'article_open_on_website' => 'orijinal makale sitesi açıldığında',
+			'article_viewed' => 'makale görüntülendiğinde',
+			'scroll' => 'kaydırma yapılırken',
+			'upon_reception' => 'makale üzerinde gelince',
+			'when' => 'Makaleyi okundu olarak işaretle…',
+		),
+		'show' => array(
+			'_' => 	'Gösterilecek makaleler',
+			'adaptive' => 'Ayarlanmış gösterim',
+			'all_articles' => 'Tüm makaleleri göster',
+			'unread' => 'Sadece okunmamış makaleleri göster',
+		),
+		'sort' => array(
+			'_' => 'Sıralama',
+			'newer_first' => 'Önce yeniler',
+			'older_first' => 'Önce eskiler',
+		),
+		'sticky_post' => 'Makale açıldığında yukarı getir',
+		'title' => 'Okuma',
+		'view' => array(
+			'default' => 'Öntanımlı görünüm',
+			'global' => 'Global görünüm',
+			'normal' => 'Normal görünüm',
+			'reader' => 'Okuma görünümü',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Paylaşım',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Daha fazla bilgi',
+		'print' => 'Yazdır',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Paylaşım ismi',
+		'share_url' => 'Paylaşım URL si',
+		'title' => 'Paylaşım',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Kısayollar',
+		'article_action' => 'Makale eylemleri',
+		'auto_share' => 'Paylaş',
+		'auto_share_help' => 'Sadece 1 paylaşım modu varsa bu kullanılır. Yoksa kendi paylaşım numaraları ile kullanılır.',
+		'close_dropdown' => 'Menüleri kapat',
+		'collapse_article' => 'Kapat',
+		'first_article' => 'İlk makaleyi atla',
+		'focus_search' => 'Arama kutusuna eriş',
+		'help' => 'Dokümantasyonu göster',
+		'javascript' => 'Kısayolları kullanabilmek için JavaScript aktif olmalıdır',
+		'last_article' => 'Son makaleyi atla',
+		'load_more' => 'Daha fazla makale yükle',
+		'mark_read' => 'Okundu olarak işaretle',
+		'mark_favorite' => 'Favori olarak işaretle',
+		'navigation' => 'Genel eylemler',
+		'navigation_help' => '"Shift" tuşu ile kısayollar akışlar için geçerli olur.<br/>"Alt" tuşu ile kısayollar kategoriler için geçerli olur.',
+		'next_article' => 'Sonraki makaleye geç',
+		'other_action' => 'Diğer eylemler',
+		'previous_article' => 'Önceki makaleye geç',
+		'see_on_website' => 'Orijinal sitede göster',
+		'shift_for_all_read' => '+ <code>shift</code> tuşu ile tüm makaleler okundu olarak işaretlenir',
+		'title' => 'Kısayollar',
+		'user_filter' => 'Kullanıcı filtrelerine eriş',
+		'user_filter_help' => 'Eğer tek filtre varsa o kullanılır. Yoksa filtrelerin kendi numaralarıyla kullanılır.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s makale (%s)',
+		'current' => 'Mevcut kullanıcı',
+		'is_admin' => 'yöneticidir',
+		'users' => 'Kullanıcılar',
+	),
+);
-- 
cgit v1.2.3


From 2d3c4970f2edb170891c36dab78fec6f9341313c Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:28:36 +0200
Subject: Create feedback.php

---
 app/i18n/tr/feedback.php | 110 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 app/i18n/tr/feedback.php

diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php
new file mode 100644
index 000000000..0572c6da1
--- /dev/null
+++ b/app/i18n/tr/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimizasyon tamamlandı',
+	),
+	'access' => array(
+		'denied' => 'Bu sayfaya erişim yetkiniz yok',
+		'not_found' => 'Varolmayan bir sayfa arıyorsunuz',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Sistem yapılandırma kimlik doğrulaması sırasında hata oldu. Lütfen daha sonra tekrar deneyin.',
+			'set' => 'Kimlik doğrulama sistemi tamamnaldı.',
+		),
+		'login' => array(
+			'invalid' => 'Giriş geçersiz',
+			'success' => 'Bağlantı kuruldu',
+		),
+		'logout' => array(
+			'success' => 'Bağlantı koptu',
+		),
+		'no_password_set' => 'Yönetici şifresi ayarlanmadı. Bu özellik kullanıma uygun değil.',
+		'not_persona' => 'Sadece Persona sistem sıfırlanabilir.',
+	),
+	'conf' => array(
+		'error' => 'Yapılandırma ayarları kaydedilirken hata oluştu',
+		'query_created' => 'Sorgu "%s" oluşturuldu.',
+		'shortcuts_updated' => 'Kısayollar yenilendi',
+		'updated' => 'Yapılandırm ayarları yenilendi',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s zaten aktif',
+		'disable' => array(
+			'ko' => '%s gösterilemiyor. Detaylar için <a href="%s">FressRSS log kayıtlarını</a> kontrol edin.',
+			'ok' => '%s pasif',
+		),
+		'enable' => array(
+			'ko' => '%s aktifleştirilemiyor. Detaylar için <a href="%s">FressRSS log kayıtlarını</a> kontrol edin.',
+			'ok' => '%s aktif',
+		),
+		'no_access' => '%s de yetkiniz yok',
+		'not_enabled' => '%s henüz aktif değil',
+		'not_found' => '%s bulunmamaktadır',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Zip eklentisi mevcut sunucunuzda yer almıyor. Lütfen başka dosya formatında dışarı aktarmayı deneyin.',
+		'feeds_imported' => 'Akışlarınız içe aktarıldı ve şimdi güncellenecek',
+		'feeds_imported_with_errors' => 'Akışlarınız içeri aktarıldı ama bazı hatalar meydana geldi',
+		'file_cannot_be_uploaded' => 'Dosya yüklenemedi!',
+		'no_zip_extension' => 'Zip eklentisi mevcut sunucunuzda yer almıyor.',
+		'zip_error' => 'Zip içe aktarımı sırasında hata meydana geldi.',
+	),
+	'sub' => array(
+		'actualize' => 'Güncelleme',
+		'category' => array(
+			'created' => 'Kategori %s oluşturuldu.',
+			'deleted' => 'Kategori silindi.',
+			'emptied' => 'Kategori boşaltıldı',
+			'error' => 'Kategori güncellenemedi',
+			'name_exists' => 'Kategori ismi zaten bulunmakta.',
+			'no_id' => 'Kategori id sinden emin olmalısınız.',
+			'no_name' => 'Kategori ismi boş olamaz.',
+			'not_delete_default' => 'Öntanımlı kategoriyi silemezsiniz!',
+			'not_exist' => 'Kategori bulunmamakta!',
+			'over_max' => 'Kategori limitini aştınız (%d)',
+			'updated' => 'Karegori güncellendi.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> güncellendi',
+			'actualizeds' => 'RSS akışları güncellendi',
+			'added' => '<em>%s</em> RSS akışı eklendi',
+			'already_subscribed' => '<em>%s</em> için zaten aboneliğiniz bulunmakta',
+			'deleted' => 'Akış silindi',
+			'error' => 'Akış güncellenemiyor',
+			'internal_problem' => 'RSS akışı eklenemiyor. Detaylar için <a href="%s">FressRSS log kayıtlarını</a> kontrol edin.',
+			'invalid_url' => 'URL <em>%s</em> geçersiz',
+			'marked_read' => 'Akışlar okundu olarak işaretlendi',
+			'n_actualized' => '%d akışları güncellendi',
+			'n_entries_deleted' => '%d makaleleri silindi',
+			'no_refresh' => 'Yenilenecek akış yok…',
+			'not_added' => '<em>%s</em> eklenemedi',
+			'over_max' => 'Akış limitini aştınız (%d)',
+			'updated' => 'Akış güncellendi',
+		),
+		'purge_completed' => 'Temizleme tamamlandı (%d makale silindi)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS <strong>%s versiyonuna</strong> güncellenecek.',
+		'error' => 'Güncelleme işlemi sırasında hata: %s',
+		'file_is_nok' => '<em>%s</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+		'finished' => 'Güncelleme tamamlandı!',
+		'none' => 'Güncelleme yok',
+		'server_not_found' => 'Güncelleme sunucusu bulunamadı. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => '%s kullanıcısı oluşturuldu',
+			'error' => '%s kullanıcısı oluşturulamadı',
+		),
+		'deleted' => array(
+			'_' => '%s kullanıcısı silindi',
+			'error' => '%s kullanıcısı silinemedi',
+		),
+	),
+	'profile' => array(
+		'error' => 'Profiliniz düzenlenemedi',
+		'updated' => 'Profiliniz düzenlendi',
+	),
+);
-- 
cgit v1.2.3


From 0e84a859e6ee66a42ba7aab811ef46e4044d5544 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:28:59 +0200
Subject: Create gen.php

---
 app/i18n/tr/gen.php | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 app/i18n/tr/gen.php

diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
new file mode 100644
index 000000000..7284f132b
--- /dev/null
+++ b/app/i18n/tr/gen.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Yenile',
+		'back_to_rss_feeds' => '← RSS akışlarınız için geri gidin',
+		'cancel' => 'İptal',
+		'create' => 'Oluştur',
+		'disable' => 'Pasif',
+		'empty' => 'Boş',
+		'enable' => 'Aktif',
+		'export' => 'Dışa Aktar',
+		'filter' => 'Filtrele',
+		'import' => 'İçe Aktar',
+		'manage' => 'Yönet',
+		'mark_read' => 'Okundu olarak işaretle',
+		'mark_favorite' => 'Favoriye ekle',
+		'remove' => 'Sil',
+		'see_website' => 'Siteyi gör',
+		'submit' => 'Onayla',
+		'truncate' => 'Tüm makaleleri sil',
+	),
+	'auth' => array(
+		'email' => 'Email adresleri',
+		'keep_logged_in' => '<small>(1 ay)</small> oturumu açık tut',
+		'login' => 'Giriş',
+		'login_persona' => 'Persona ile giriş yap',
+		'login_persona_problem' => 'Persona ile bağlantı sorununuz mu var ?',
+		'logout' => 'Çıkış',
+		'password' => array(
+			'_' => 'Şifre',
+			'format' => '<small>En az 7 karakter</small>',
+		),
+		'registration' => array(
+			'_' => 'Yeni hesap',
+			'ask' => 'Yeni bir hesap oluştur',
+			'title' => 'Hesap oluşturma',
+		),
+		'reset' => 'Kimlik doğrulama sıfırla',
+		'username' => array(
+			'_' => 'Kullancı adı',
+			'admin' => 'Yönetici kullanıcı adı',
+			'format' => '<small>en fazla 16 alfanümerik karakter</small>',
+		),
+		'will_reset' => 'Kimlik doğrulama sistemi sıfırlanacak: Persone yerine bir form kullanılacak.',
+	),
+	'date' => array(
+		'Apr' => '\\N\\i\\s\\a\\n',
+		'Aug' => '\\A\\ğ\\u\\s\\t\\o\\s',
+		'Dec' => '\\A\\r\\a\\l\\ı\\k',
+		'Feb' => '\\Ş\\u\\b\\a\\t',
+		'Jan' => '\\O\\c\\a\\k',
+		'Jul' => '\\T\\e\\m\\m\\u\\z',
+		'Jun' => '\\H\\a\\z\\i\\r\\a\\n',
+		'Mar' => '\\M\\a\\r\\t',
+		'May' => '\\M\\a\\y\\ı\\s',
+		'Nov' => '\\K\\a\\s\\ı\\m',
+		'Oct' => '\\E\\k\\i\\m',
+		'Sep' => '\\E\\y\\l\\ü\\l',
+		'apr' => 'nis',
+		'april' => 'Nis',
+		'aug' => 'ağu',
+		'august' => 'Ağu',
+		'before_yesterday' => 'Dünden önceki gün',
+		'dec' => 'ara',
+		'december' => 'Ara',
+		'feb' => 'şub',
+		'february' => 'Şub',
+		'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' => 'Cum',
+		'jan' => 'oca',
+		'january' => 'Oca',
+		'jul' => 'tem',
+		'july' => 'Tem',
+		'jun' => 'haz',
+		'june' => 'Haz',
+		'last_3_month' => 'Son 3 ay',
+		'last_6_month' => 'Son 6 ay',
+		'last_month' => 'Geçen ay',
+		'last_week' => 'Geçen hafta',
+		'last_year' => 'Geçen yıl',
+		'mar' => 'mar',
+		'march' => 'Mar',
+		'may' => 'May',
+		'mon' => 'Pzt',
+		'month' => 'ay',
+		'nov' => 'kas',
+		'november' => 'Kas',
+		'oct' => 'ekm',
+		'october' => 'Ekm',
+		'sat' => 'Cts',
+		'sep' => 'eyl',
+		'september' => 'Eyl',
+		'sun' => 'Pzr',
+		'thu' => 'Per',
+		'today' => 'Bugün',
+		'tue' => 'Sal',
+		'wed' => 'Çar',
+		'yesterday' => 'Dün',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'FreshRSS hakkında',
+	),
+	'js' => array(
+		'category_empty' => 'Boş kategori',
+		'confirm_action' => 'Bunu yapmak istediğinize emin misiniz ? Daha sonra iptal edilemez!',
+		'confirm_action_feed_cat' => 'Bunu yapmak istediğinize emin misiniz ? Favorileriniz ve sorgularınız silinecek. Daha sonra iptal edilemez!',
+		'feedback' => array(
+			'body_new_articles' => 'FreshRSS de okunmaz üzere \\d yeni makale var.',
+			'request_failed' => 'Hata. İnternet bağlantınızı kontrol edin.',
+			'title_new_articles' => 'FreshRSS: yeni makaleler!',
+		),
+		'new_article' => 'Yeni makaleler mevcut. Sayfayı yenilemek için tıklayın.',
+		'should_be_activated' => 'JavaScript aktif olmalıdır.',
+	),
+	'lang' => array(
+		'cz' => 'Čeština',
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'it' => 'Italiano',
+		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
+	),
+	'menu' => array(
+		'about' => 'Hakkında',
+		'admin' => 'Yönetim',
+		'archiving' => 'Arşiv',
+		'authentication' => 'Kimlik doğrulama',
+		'check_install' => 'Kurulum kontrolü',
+		'configuration' => 'Yapılandırma',
+		'display' => 'Görünüm',
+		'extensions' => 'Eklentiler',
+		'logs' => 'Log kayıtları',
+		'queries' => 'Kullanıcı sorguları',
+		'reading' => 'Okuma',
+		'search' => 'Kelime veya #etiket ara',
+		'sharing' => 'Paylaşım',
+		'shortcuts' => 'Kısayollar',
+		'stats' => 'İstatistikler',
+		'system' => 'Sistem yapılandırması',
+		'update' => 'Güncelleme',
+		'user_management' => 'Kullanıcıları yönet',
+		'user_profile' => 'Profil',
+	),
+	'pagination' => array(
+		'first' => 'İlk',
+		'last' => 'Son',
+		'load_more' => 'Daha fazla makale yükle',
+		'mark_all_read' => 'Tümünü okundu say',
+		'next' => 'Sonraki',
+		'nothing_to_load' => 'Başka makale yok',
+		'previous' => 'Önceki',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'movim' => 'Movim',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
+	),
+	'short' => array(
+		'attention' => 'Tehlike!',
+		'blank_to_disable' => 'Devredışı bırakmak için boş bırakın',
+		'by_author' => '<em>%s</em> tarafından',
+		'by_default' => 'Öntanımlı',
+		'damn' => 'Hay aksi!',
+		'default_category' => 'Kategorisiz',
+		'no' => 'Hayır',
+		'not_applicable' => 'Uygun değil',
+		'ok' => 'Tamam!',
+		'or' => 'ya da',
+		'yes' => 'Evet',
+	),
+);
-- 
cgit v1.2.3


From 59a69d521da4f01f62f802cbfda7df8e01a4b2c0 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:29:26 +0200
Subject: Create index.php

---
 app/i18n/tr/index.php | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 app/i18n/tr/index.php

diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php
new file mode 100644
index 000000000..9912203c8
--- /dev/null
+++ b/app/i18n/tr/index.php
@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'Hakkında',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Hata raporu',
+		'credits' => 'Tanıtım',
+		'credits_content' => 'Bu frameworkü kullanmamasına rağmen FreshRSS bazı tasarım ögelerini <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> dan almıştır. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">İkonlar</a> <a href="https://www.gnome.org/">GNOME projesinden</a> alınmıştır. <em>Open Sans</em> yazı tipi <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a> tarafından oluşturulmuştur. Site ikonları <a href="https://getfavicon.appspot.com/">getFavicon API</a> ile oluşturuldu. FreshRSS bir PHP framework olan <a href="https://github.com/marienfressinaud/MINZ">Minz</a> i temel alır.',
+		'freshrss_description' => 'FreshRSS <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> veya <a href="http://projet.idleman.fr/leed/">Leed</a> gibi kendi hostunuzda çalışan bir RSS akış toplayıcısıdır. Güçlü ve yapılandırılabilir araçlarıyla basit ve kullanımı kolay bir uygulamadır.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github sayfası</a>',
+		'license' => 'Lisans',
+		'project_website' => 'Proje sayfası',
+		'title' => 'Hakkında',
+		'version' => 'Versiyon',
+		'website' => 'Website',
+	),
+	'feed' => array(
+		'add' => 'Akış ekleyebilirsin.',
+		'empty' => 'Gösterilecek makale yok.',
+		'rss_of' => 'RSS feed of %s',
+		'title' => 'RSS akışlarınız',
+		'title_global' => 'Global görünüm',
+		'title_fav' => 'Favorilerin',
+	),
+	'log' => array(
+		'_' => 'Log Kayıtları',
+		'clear' => 'Log kayıt dosyasını temizle',
+		'empty' => 'Log kayır dosyası boş',
+		'title' => 'Log Kayıtları',
+	),
+	'menu' => array(
+		'about' => 'FreshRSS hakkında',
+		'add_query' => 'Sorgu ekle',
+		'before_one_day' => 'Bir gün önce',
+		'before_one_week' => 'Bir hafta önce',
+		'favorites' => 'Favoriler (%s)',
+		'global_view' => 'Global görünüm',
+		'main_stream' => 'Ana akış',
+		'mark_all_read' => 'Hepsini okundu olarak işaretle',
+		'mark_cat_read' => 'Kategoriyi okundu olarak işaretle',
+		'mark_feed_read' => 'Akışı okundu olarak işaretle',
+		'newer_first' => 'Önce yeniler',
+		'non-starred' => 'Favori dışındakileri göster',
+		'normal_view' => 'Normal görünüm',
+		'older_first' => 'Önce eskiler',
+		'queries' => 'Kullanıcı sorguları',
+		'read' => 'Okunmuşları göster',
+		'reader_view' => 'Okuma görünümü',
+		'rss_view' => 'RSS akışı',
+		'search_short' => 'Ara',
+		'starred' => 'Favorileri göster',
+		'stats' => 'İstatistikler',
+		'subscription' => 'Abonelik yönetimi',
+		'unread' => 'Okunmamışları göster',
+	),
+	'share' => 'Share',
+	'tag' => array(
+		'related' => 'İlgili etiketler',
+	),
+);
-- 
cgit v1.2.3


From c03ceb107eea4ca90e931bf1018e7315ab2049c3 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:29:48 +0200
Subject: Create install.php

---
 app/i18n/tr/install.php | 113 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 app/i18n/tr/install.php

diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
new file mode 100644
index 000000000..96c16931a
--- /dev/null
+++ b/app/i18n/tr/install.php
@@ -0,0 +1,113 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Kurulumu tamamla',
+		'fix_errors_before' => 'Lütfen sonraki adıma geçmek için hataları düzeltin.',
+		'keep_install' => 'Önceki kuruluma devam et',
+		'next_step' => 'Sonraki adım',
+		'reinstall' => 'FreshRSS i yeniden yükle',
+	),
+	'auth' => array(
+		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
+		'form' => 'Web formu (geleneksel, JavaScript gerektirir)',
+		'http' => 'HTTP (ileri kullanıcılar için, HTTPS)',
+		'none' => 'Hiçbiri (tehlikeli)',
+		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
+		'password_format' => 'En az 7 karakter',
+		'persona' => 'Mozilla Persona (modern, JavaScript gerektirir)',
+		'type' => 'Kimlik doğrulama yöntemi',
+	),
+	'bdd' => array(
+		'_' => 'Veritabanı',
+		'conf' => array(
+			'_' => 'Veritabanı yapılandırılması',
+			'ko' => 'Veritabanı bilginizi doğrulayın.',
+			'ok' => 'Veritabanı yapılandırılması kayıt edildi.',
+		),
+		'host' => 'Sunucu',
+		'prefix' => 'Tablo ön eki',
+		'password' => 'HTTP şifre',
+		'type' => 'Veritabanı türü',
+		'username' => 'HTTP kullanıcı adı',
+	),
+	'check' => array(
+		'_' => 'Kontroller',
+		'already_installed' => 'FreshRSS zaten yüklü!',
+		'cache' => array(
+			'nok' => '<em>./data/cache</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Önbellek klasörü yetkileri sorunsuz.',
+		),
+		'ctype' => array(
+			'nok' => 'Karakter yazım kontrolü için kütüphane eksik (php-ctype).',
+			'ok' => 'Karakter yazım kontrolü için kütüphane sorunsuz (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'cURL eksik (php5-curl package).',
+			'ok' => 'cURL eklentisi sorunsuz.',
+		),
+		'data' => array(
+			'nok' => '<em>./data</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Veri klasörü yetkileri sorunsuz.',
+		),
+		'dom' => array(
+			'nok' => 'DOM kütüpbanesi eksik (php-xml package).',
+			'ok' => 'DOM kütüphanesi sorunsuz.',
+		),
+		'favicons' => array(
+			'nok' => '<em>./data/favicons</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Site ikonu klasörü yetkileri sorunsuz.',
+		),
+		'http_referer' => array(
+			'nok' => 'Lütfen HTTP REFERER değiştirmediğinize emin olun.',
+			'ok' => 'HTTP REFERER ve sunucunuz arası iletişim sorunsuz.',
+		),
+		'minz' => array(
+			'nok' => 'Minz framework eksik.',
+			'ok' => 'Minz framework sorunsuz.',
+		),
+		'pcre' => array(
+			'nok' => 'Düzenli ifadeler kütüphanesi eksik (php-pcre).',
+			'ok' => 'Düzenli ifadeler kütüphanesi sorunsuz (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
+			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => '<em>./data/persona</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Mozilla Persona klasörü yetkileri sorunsuz.',
+		),
+		'php' => array(
+			'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
+			'ok' => 'PHP versiyonunuz %s, FreshRSS ile tam uyumlu.',
+		),
+		'users' => array(
+			'nok' => '<em>./data/users</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Genel yapılandırma',
+		'ok' => 'Genel yapılandırma ayarları kayıt edildi.',
+	),
+	'congratulations' => 'Tebrikler!',
+	'default_user' => 'Öntanımlı kullanıcı adı <small>(en fazla 16 alfanümerik karakter)</small>',
+	'delete_articles_after' => 'Makaleleri şu süre sonunda sil',
+	'fix_errors_before' => 'Lütfen sonraki adıma geçmek için hataları düzeltin.',
+	'javascript_is_better' => 'FreshRSS JavaScript ile daha işlevseldir',
+	'js' => array(
+		'confirm_reinstall' => 'FressRSS i yeniden kurarak önceki yapılandırma ayarlarınızı kaybedeceksiniz. Devam etmek istiyor musunuz ?',
+	),
+	'language' => array(
+		'_' => 'Dil',
+		'choose' => 'FreshRSS için bir dil seçin',
+		'defined' => 'Dil belirlendi.',
+	),
+	'not_deleted' => 'Hata meydana geldi; <em>%s</em> dosyasını elle silmelisiniz.',
+	'ok' => 'Kurulum başarıyla tamamlandı.',
+	'step' => 'adım %d',
+	'steps' => 'Adımlar',
+	'title' => 'Kurulum · FreshRSS',
+	'this_is_the_end' => 'Son Adım',
+);
-- 
cgit v1.2.3


From d1fae5145b122f0871f434e5007584fa6cb48dca Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:30:05 +0200
Subject: Create sub.php

---
 app/i18n/tr/sub.php | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 app/i18n/tr/sub.php

diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
new file mode 100644
index 000000000..5ab367ebb
--- /dev/null
+++ b/app/i18n/tr/sub.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Kategori',
+		'add' => 'Kategori ekle',
+		'empty' => 'Boş kategori',
+		'new' => 'Yeni kategori',
+	),
+	'feed' => array(
+		'add' => 'RSS akışı ekle',
+		'advanced' => 'Gelişmiş',
+		'archiving' => 'Arşiv',
+		'auth' => array(
+			'configuration' => 'Giriş',
+			'help' => 'HTTP korumalı RSS akışlarına bağlantı izni sağlar',
+			'http' => 'HTTP Kimlik Doğrulama',
+			'password' => 'HTTP şifre',
+			'username' => 'HTTP kullanıcı adı',
+		),
+		'css_help' => 'Dikkat, daha çok zaman gerekir!',
+		'css_path' => 'Makaleleri kendi CSS görünümü ile göster',
+		'description' => 'Tanım',
+		'empty' => 'Bu akış boş. Lütfen akışın aktif olduğuna emin olun.',
+		'error' => 'Bu akışda bir hatayla karşılaşıldı. Lütfen akışın sürekli ulaşılabilir olduğuna emin olun.',
+		'in_main_stream' => 'Ana akışda göster',
+		'informations' => 'Bilgi',
+		'keep_history' => 'En az tutulacak makale sayısı',
+		'moved_category_deleted' => 'Bir kategoriyi silerseniz, içerisindeki akışlar <em>%s</em> içerisine yerleşir.',
+		'no_selected' => 'Hiçbir akış seçilmedi.',
+		'number_entries' => '%d makale',
+		'stats' => 'İstatistikler',
+		'think_to_add' => 'Akış ekleyebilirsiniz.',
+		'title' => 'Başlık',
+		'title_add' => 'RSS akışı ekle',
+		'ttl' => 'Şu kadar süreden fazla otomatik yenileme yapma',
+		'url' => 'Akış URL',
+		'validator' => 'Akış geçerliliğini kontrol edin',
+		'website' => 'Site URL',
+		'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim',
+	),
+	'import_export' => array(
+		'export' => 'Dışa aktar',
+		'export_opml' => 'Akış listesini dışarı aktar (OPML)',
+		'export_starred' => 'Favorileri dışarı aktar',
+		'feed_list' => '%s makalenin listesi',
+		'file_to_import' => 'Dosyadan içe aktar<br />(OPML, Json or Zip)',
+		'file_to_import_no_zip' => 'Dosyadan içe aktar<br />(OPML or Json)',
+		'import' => 'İçe aktar',
+		'starred_list' => 'Favori makaleleirn listesi',
+		'title' => 'İçe / dışa aktar',
+	),
+	'menu' => array(
+		'bookmark' => 'Abonelik (FreshRSS yer imleri)',
+		'import_export' => 'İçe / dışa aktar',
+		'subscription_management' => 'Abonelik yönetimi',
+	),
+	'title' => array(
+		'_' => 'Abonelik yönetimi',
+		'feed_management' => 'RSS  akış yönetimi',
+	),
+);
-- 
cgit v1.2.3


From b4238fa165460e8683cc9b251690247dda57b026 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:34:17 +0200
Subject: Update gen.php

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

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 21d1fba22..bc4fd9201 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Over',
-- 
cgit v1.2.3


From 837d77b52547c987092905f99511bcce0dcf0d5f Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:35:31 +0200
Subject: Adding Turkish language

---
 app/i18n/nl/gen.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index bc4fd9201..21d1fba22 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -122,7 +122,6 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
-		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Over',
-- 
cgit v1.2.3


From 27f54f44fe0f84964702925b7b1612dcdf8a6997 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:33 +0200
Subject: Adding Turkish language

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

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 21d1fba22..bc4fd9201 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Over',
-- 
cgit v1.2.3


From 89037e5fec5029826b73e5413e0f1cb6856f3808 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:38 +0200
Subject: Adding Turkish language

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

diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 1ac6b04a1..bd311aa12 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Informazioni',
-- 
cgit v1.2.3


From eeb7fd99090d530f3fe0af39436c714c7a3914b3 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:42 +0200
Subject: Adding Turkish language

---
 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 1e738e949..f8e4ac7ee 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'À propos',
-- 
cgit v1.2.3


From ff510a1282cd014f846c09fa7f84e62112dbc432 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:47 +0200
Subject: Adding Turkish language

---
 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 3d66938d1..f71684688 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'About',
-- 
cgit v1.2.3


From 2a7b2ef39a442162329c32578e76d6905c1c91da Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:51 +0200
Subject: Adding Turkish language

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

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 4953610ba..fb09e8598 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Über',
-- 
cgit v1.2.3


From 1cdfaed8020cfa5413b606f71ee178da7a74953d Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:55 +0200
Subject: Adding Turkish language

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

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 4d34a8173..ca90cff0c 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'O aplikaci',
-- 
cgit v1.2.3


From ad54c6624c3adddc345688f97c80b19dfc523ded Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 16 Feb 2016 19:16:53 +0100
Subject: Changelog Turkish language

By https://github.com/hckweb
https://github.com/FreshRSS/FreshRSS/issues/1073
https://github.com/FreshRSS/FreshRSS/pull/1074
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d089cb86e..7f96839eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * UI
 	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
 	* Updated to jQuery 2.2 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
+* I18n
+	* Turkish [#1073](https://github.com/FreshRSS/FreshRSS/issues/1073)
 
 
 ## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta
-- 
cgit v1.2.3


From e4a459a6edc40b64cba7845b52f3e90666b2818a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 16 Feb 2016 23:53:39 +0100
Subject: CSP no inline javascript draft

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php                        | 62 +++++++++++++++++++++++++++++
 app/layout/layout.phtml                 |  6 +--
 app/views/helpers/javascript_vars.phtml | 70 ---------------------------------
 lib/Minz/Session.php                    | 15 ++++---
 p/scripts/main.js                       | 13 +++++-
 p/scripts/persona.js                    |  2 +-
 6 files changed, 87 insertions(+), 81 deletions(-)
 delete mode 100644 app/views/helpers/javascript_vars.phtml

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 044de9cd4..e0e82457c 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -110,6 +110,68 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
+	private static function setJavascriptCookie() {
+		$mark = FreshRSS_Context::$user_conf->mark_when;
+		$mail = Minz_Session::param('mail', false);
+		$s = FreshRSS_Context::$user_conf->shortcuts;
+		$json = json_encode(array(
+			'context' => array(
+				'auto_remove_article' => !!FreshRSS_Context::isAutoRemoveAvailable(),
+				'hide_posts' => !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader'),
+				'display_order' => Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order),
+				'auto_mark_article' => !!$mark['article'],
+				'auto_mark_site' => !!$mark['site'],
+				'auto_mark_scroll' => !!$mark['scroll'],
+				'auto_load_more' => !!FreshRSS_Context::$user_conf->auto_load_more,
+				'auto_actualize_feeds' => !!Minz_Session::param('actualize_feeds', false),
+				'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
+				'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
+				'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
+				'auth_type' => FreshRSS_Context::$system_conf->auth_type,
+				'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
+				'current_view' => Minz_Request::actionName(),
+			),
+			'shortcuts' => array(
+				'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'],
+			),
+			'url' => array(
+				'index' => _url('index', 'index'),
+				'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
+				'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
+				'help' => FRESHRSS_WIKI,
+			),
+			'i18n' => array(
+				'confirmation_default' => _t('gen.js.confirm_action'),
+				'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'),
+			),
+			'icons' => array(
+				'close' => _i('close'),
+			),
+		), JSON_UNESCAPED_UNICODE);
+		setrawcookie('FreshRSS-vars', rawurlencode($json), 0, Minz_Session::getCookieDir());
+	}
+
+	public static function preLayout() {
+		header("Content-Security-Policy: default-src 'self'; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
+		self::setJavascriptCookie();
+	}
+
 	private function loadNotifications() {
 		$notif = Minz_Session::param('notification');
 		if ($notif) {
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 1d3afbf71..7d718efbd 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,3 +1,6 @@
+<?php
+	FreshRSS::preLayout();
+?>
 <!DOCTYPE html>
 <html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>">
 	<head>
@@ -5,9 +8,6 @@
 		<meta name="viewport" content="initial-scale=1.0" />
 		<?php echo self::headTitle(); ?>
 		<?php echo self::headStyle(); ?>
-		<script>//<![CDATA[
-<?php $this->renderHelper('javascript_vars'); ?>
-		//]]></script>
 		<?php echo self::headScript(); ?>
 <?php
 	$url_base = Minz_Request::currentRequest();
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
deleted file mode 100644
index 36d6e693d..000000000
--- a/app/views/helpers/javascript_vars.phtml
+++ /dev/null
@@ -1,70 +0,0 @@
-"use strict";
-<?php
-
-$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::$user_conf->display_posts || Minz_Request::actionName() === 'reader');
-$s = FreshRSS_Context::$user_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={',
-	'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',',
-	'hide_posts:', $hide_posts ? 'true' : 'false', ',',
-	'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::$user_conf->auto_load_more ? 'true' : 'false', ',',
-	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
-	'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:"', FreshRSS_Context::$system_conf->auth_type, '",',
-	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
-	'current_view:"', Minz_Request::actionName(), '"',
-"},\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'], '"',
-"},\n";
-
-echo 'url={',
-	'index:"', _url('index', 'index'), '",',
-	'login:"', $url_login, '",',
-	'logout:"', $url_logout, '",',
-	'help:"', FRESHRSS_WIKI, '"',
-"},\n";
-
-echo 'i18n={',
-	'confirmation_default:"', _t('gen.js.confirm_action'), '",',
-	'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";
-
-echo 'icons={',
-	'close:\'', _i('close'), '\'',
-"}\n";
\ No newline at end of file
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 057e7746a..940cd27d9 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -59,18 +59,21 @@ class Minz_Session {
 		}
 	}
 
+	public static function getCookieDir() {
+		// Get the script_name (e.g. /p/i/index.php) and keep only the path.
+		$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
+		if (substr($cookie_dir, -1) !== '/') {
+			$cookie_dir = dirname($cookie_dir) . '/';
+		}
+		return $cookie_dir;
+	}
 
 	/**
 	 * Spécifie la durée de vie des cookies
 	 * @param $l la durée de vie
 	 */
 	public static function keepCookie($l) {
-		// Get the script_name (e.g. /p/i/index.php) and keep only the path.
-		$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
-		if (substr($cookie_dir, -1) !== '/') {
-			$cookie_dir = dirname($cookie_dir) . '/';
-		}
-		session_set_cookie_params($l, $cookie_dir, '', false, true);
+		session_set_cookie_params($l, self::getCookieDir(), '', false, true);
 	}
 
 
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 968c945c8..32a2ca913 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1245,8 +1245,19 @@ function init_configuration_alert() {
 	});
 }
 
+function parseJavaScriptCookie() {
+	var json = JSON.parse(decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"))) || {};
+	document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
+	window.context = json.context;
+	window.shortcuts = json.shortcuts;
+	window.url = json.url;
+	window.i18n = json.i18n;
+	window.icons = json.icons;
+}
+
 function init_all() {
-	if (!(window.$ && window.context)) {
+	parseJavaScriptCookie();
+	if (!window.$) {
 		if (window.console) {
 			console.log('FreshRSS waiting for JS…');
 		}
diff --git a/p/scripts/persona.js b/p/scripts/persona.js
index 36aeeaf56..63ab43795 100644
--- a/p/scripts/persona.js
+++ b/p/scripts/persona.js
@@ -1,7 +1,7 @@
 "use strict";
 
 function init_persona() {
-	if (!(navigator.id && window.$)) {
+	if (!(navigator.id && window.$ && window.url)) {
 		if (window.console) {
 			console.log('FreshRSS (Persona) waiting for JS…');
 		}
-- 
cgit v1.2.3


From 86e113ba80c395b60fc016228b11dd56636a85d7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 17 Feb 2016 00:19:49 +0100
Subject: Filter-out img srcset for the time being

https://github.com/FreshRSS/FreshRSS/issues/1077
---
 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 b0189c162..e7e59fe65 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -209,7 +209,7 @@ function customSimplePie() {
 	$simplePie->strip_attributes(array_merge($simplePie->strip_attributes, array(
 		'autoplay', 'onload', 'onunload', 'onclick', 'ondblclick', 'onmousedown', 'onmouseup',
 		'onmouseover', 'onmousemove', 'onmouseout', 'onfocus', 'onblur',
-		'onkeypress', 'onkeydown', 'onkeyup', 'onselect', 'onchange', 'seamless')));
+		'onkeypress', 'onkeydown', 'onkeyup', 'onselect', 'onchange', 'seamless', 'srcset')));
 	$simplePie->add_attributes(array(
 		'img' => array('lazyload' => '', 'postpone' => ''),	//http://www.w3.org/TR/resource-priorities/
 		'audio' => array('lazyload' => '', 'postpone' => '', 'preload' => 'none'),
-- 
cgit v1.2.3


From 8cdf44c87b7490ebc4cbdf4f2c50dd2a3bdd520d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 17 Feb 2016 01:17:56 +0100
Subject: CSP allow iframes

E.g. for YouTube videos, etc.
https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index e0e82457c..8eb862aeb 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -168,7 +168,7 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	public static function preLayout() {
-		header("Content-Security-Policy: default-src 'self'; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
+		header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
 		self::setJavascriptCookie();
 	}
 
-- 
cgit v1.2.3


From 41622ec698049d618685bd3dc9a9122463ed0705 Mon Sep 17 00:00:00 2001
From: ASM <cpp.create@gmail.com>
Date: Wed, 17 Feb 2016 22:14:36 +0300
Subject: Bumping #1029, translated install.php

---
 app/i18n/ru/admin.php            | 183 ---------------------------------------
 app/i18n/ru/conf.php             | 174 -------------------------------------
 app/i18n/ru/feedback.php         | 110 -----------------------
 app/i18n/ru/gen.php              | 181 --------------------------------------
 app/i18n/ru/index.php            |  61 -------------
 app/i18n/ru/install.php          | 113 ------------------------
 app/i18n/ru/sub.php              |  62 -------------
 app/i18n/ru_RU.utf8/admin.php    | 183 +++++++++++++++++++++++++++++++++++++++
 app/i18n/ru_RU.utf8/conf.php     | 174 +++++++++++++++++++++++++++++++++++++
 app/i18n/ru_RU.utf8/feedback.php | 110 +++++++++++++++++++++++
 app/i18n/ru_RU.utf8/gen.php      | 181 ++++++++++++++++++++++++++++++++++++++
 app/i18n/ru_RU.utf8/index.php    |  61 +++++++++++++
 app/i18n/ru_RU.utf8/install.php  | 113 ++++++++++++++++++++++++
 app/i18n/ru_RU.utf8/sub.php      |  62 +++++++++++++
 14 files changed, 884 insertions(+), 884 deletions(-)
 delete mode 100644 app/i18n/ru/admin.php
 delete mode 100644 app/i18n/ru/conf.php
 delete mode 100644 app/i18n/ru/feedback.php
 delete mode 100644 app/i18n/ru/gen.php
 delete mode 100644 app/i18n/ru/index.php
 delete mode 100644 app/i18n/ru/install.php
 delete mode 100644 app/i18n/ru/sub.php
 create mode 100644 app/i18n/ru_RU.utf8/admin.php
 create mode 100644 app/i18n/ru_RU.utf8/conf.php
 create mode 100644 app/i18n/ru_RU.utf8/feedback.php
 create mode 100644 app/i18n/ru_RU.utf8/gen.php
 create mode 100644 app/i18n/ru_RU.utf8/index.php
 create mode 100644 app/i18n/ru_RU.utf8/install.php
 create mode 100644 app/i18n/ru_RU.utf8/sub.php

diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
deleted file mode 100644
index dfea5b3cb..000000000
--- a/app/i18n/ru/admin.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-return array(
-	'auth' => array(
-		'allow_anonymous' => 'Разрешить анонимное чтение статей для пользователя по умолчанию (%s)',
-		'allow_anonymous_refresh' => 'Разрешить анонимное обновление статей',
-		'api_enabled' => 'Включить доступ к <abbr>API</abbr> <small>(необходимо для мобильных приложений)</small>',
-		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
-		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
-		'none' => 'Без аутентификации (небезопасный)',
-		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
-		'title' => 'Аутентификации',
-		'title_reset' => 'Сброс аутентицикации',
-		'token' => 'Токен аутентификации',
-		'token_help' => 'Разрешает доступ к RSS ленте пользователя по умолчанию без аутентификации:',
-		'type' => 'Метод аутентификации',
-		'unsafe_autologin' => 'Разрешить небезопасный автоматический вход с использованием следующего формата: ',
-	),
-	'check_install' => array(
-		'cache' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em>. Сервер HTTP должен иметь права на запись в эту папку',
-			'ok' => 'Права на <em>./data/cache</em> в порядке.',
-		),
-		'categories' => array(
-			'nok' => 'Таблица категорий настроена неправильно.',
-			'ok' => 'Таблица категорий настроена правильно.',
-		),
-		'connection' => array(
-			'nok' => 'Подключение к базе данных не может быть установлено.',
-			'ok' => 'Подключение к базе данных в порядке.',
-		),
-		'ctype' => array(
-			'nok' => 'У вас не установлена библиотека для проверки типов символов (php-ctype).',
-			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
-		),
-		'curl' => array(
-			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
-			'ok' => 'У вас установлено расширение cURL.',
-		),
-		'data' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на <em>./data/</em> в порядке.',
-		),
-		'database' => 'Установка базы данных',
-		'dom' => array(
-			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
-			'ok' => 'У вас установлена библиотека для просмотра DOM.',
-		),
-		'entries' => array(
-			'nok' => 'Таблица статей (entry) неправильно настроена.',
-			'ok' => 'Таблица статей (entry) настроена правильно.',
-		),
-		'favicons' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку значков в порядке.',
-		),
-		'feeds' => array(
-			'nok' => 'Таблица подписок (feed) неправильно настроена.',
-			'ok' => 'Таблица подписок (feed) настроена правильно.',
-		),
-		'files' => 'Установка файлов',
-		'json' => array(
-			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
-			'ok' => 'У вас установлена библиотека для работы с JSON.',
-		),
-		'minz' => array(
-			'nok' => 'У вас не установлен фрейворк Minz.',
-			'ok' => 'У вас установлен фрейворк Minz.',
-		),
-		'pcre' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
-			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
-		),
-		'pdo' => array(
-			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
-			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
-		),
-		'persona' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку Mozilla Persona в порядке.',
-		),
-		'php' => array(
-			'_' => 'PHP installation',
-			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
-			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
-		),
-		'tables' => array(
-			'nok' => 'В базе данных отсуствует одна или больше таблица.',
-			'ok' => 'Все таблицы есть в базе данных.',
-		),
-		'title' => 'Проверка установки и настройки',
-		'tokens' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку tokens  в порядке.',
-		),
-		'users' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку users  в порядке.',
-		),
-		'zip' => array(
-			'nok' => 'You lack ZIP extension (php5-zip package).',
-			'ok' => 'You have ZIP extension.',
-		),
-	),
-	'extensions' => array(
-		'disabled' => 'Отключены',
-		'empty_list' => 'Расширения не установлены',
-		'enabled' => 'Включены',
-		'no_configure_view' => 'Это расширение нельзя настроить.',
-		'system' => array(
-			'_' => 'Системные расширения',
-			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
-		),
-		'title' => 'Расширения',
-		'user' => 'Расширения пользователя',
-	),
-	'stats' => array(
-		'_' => 'Статистика',
-		'all_feeds' => 'Все подписки',
-		'category' => 'Категория',
-		'entry_count' => 'Количество статей',
-		'entry_per_category' => 'Статей в категории',
-		'entry_per_day' => 'Статей за день (за последние 30 дней)',
-		'entry_per_day_of_week' => 'За неделю (в среднем - %.2f сообщений)',
-		'entry_per_hour' => 'За час (в среднем - %.2f сообщений)',
-		'entry_per_month' => 'За месяц (в среднем - %.2f сообщений)',
-		'entry_repartition' => 'Перерасределение статей',
-		'feed' => 'Подписка',
-		'feed_per_category' => 'Подписок в категории',
-		'idle' => 'Неактивные подписки',
-		'main' => 'Основная статистика',
-		'main_stream' => 'Основной поток',
-		'menu' => array(
-			'idle' => 'Неактивные подписки',
-			'main' => 'Основная статистика',
-			'repartition' => 'Перерасределение статей',
-		),
-		'no_idle' => 'Нет неактивных подписок!',
-		'number_entries' => 'статей: %d',
-		'percent_of_total' => '%% от всего',
-		'repartition' => 'Перераспределение статей',
-		'status_favorites' => 'Избранное',
-		'status_read' => 'Читать',
-		'status_total' => 'Всего',
-		'status_unread' => 'Не прочитано',
-		'title' => 'Статистика',
-		'top_feed' => '10 лучших подписок',
-	),
-	'system' => array(
-		'_' => 'Системные настройки',
-		'auto-update-url' => 'Адрес сервера для автоматического обновления',
-		'instance-name' => 'Название этого сервера',
-		'max-categories' => 'Количество категорий на пользователя',
-		'max-feeds' => 'Количество статей на пользователя',
-		'registration' => array(
-			'help' => '0 означает неограниченное количество пользователей',
-			'number' => 'Максимальное количество пользователей',
-		),
-	),
-	'update' => array(
-		'_' => 'Обновление системы',
-		'apply' => 'Применить',
-		'check' => 'Проверить обновления',
-		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
-		'last' => 'Последняя проверка: %s',
-		'none' => 'Нечего обновлять',
-		'title' => 'Обновить систему',
-	),
-	'user' => array(
-		'articles_and_size' => '%s статей (%s)',
-		'create' => 'Создать нового пользователя',
-		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-		'language' => 'Язык',
-		'number' => 'На данный момент создан %d аккаунт',
-		'numbers' => 'На данный момент аккаунтов создано:  %d',
-		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
-		'password_format' => 'Минимум 7 символов',
-		'title' => 'Управление пользователями',
-		'user_list' => 'Список пользователей',
-		'username' => 'Имя пользователя',
-		'users' => 'Пользователи',
-	),
-);
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
deleted file mode 100644
index 69162932f..000000000
--- a/app/i18n/ru/conf.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-return array(
-	'archiving' => array(
-		'_' => 'Archiving',
-		'advanced' => 'Advanced',
-		'delete_after' => 'Remove articles after',
-		'help' => 'More options are available in the individual feed settings',
-		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
-		'optimize' => 'Optimise 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',
-		'delete' => array(
-			'_' => 'Account deletion',
-			'warn' => 'Your account and all the related data will be deleted.',
-		),
-		'email_persona' => 'Login email 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(
-		'_' => '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',
-		'mark_updated_article_unread' => 'Mark updated articles as unread',
-		'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/ru/feedback.php b/app/i18n/ru/feedback.php
deleted file mode 100644
index c9189c0d0..000000000
--- a/app/i18n/ru/feedback.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimisation 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.',
-			'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.',
-	),
-	'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',
-	),
-	'extensions' => array(
-		'already_enabled' => '%s is already 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',
-	),
-	'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.',
-	),
-	'sub' => array(
-		'actualize' => 'Actualise',
-		'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(
-			'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' => '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)',
-	),
-	'update' => array(
-		'can_apply' => 'FreshRSS will now be 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!',
-		'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/ru/gen.php b/app/i18n/ru/gen.php
deleted file mode 100644
index d23b12f95..000000000
--- a/app/i18n/ru/gen.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-return array(
-	'action' => array(
-		'actualize' => 'Actualize',
-		'back_to_rss_feeds' => '← Go back to your RSS feeds',
-		'cancel' => 'Cancel',
-		'create' => 'Create',
-		'disable' => 'Disable',
-		'empty' => 'Empty',
-		'enable' => 'Enable',
-		'export' => 'Export',
-		'filter' => 'Filter',
-		'import' => 'Import',
-		'manage' => 'Manage',
-		'mark_read' => 'Mark as read',
-		'mark_favorite' => 'Mark as favourite',
-		'remove' => 'Remove',
-		'see_website' => 'See website',
-		'submit' => 'Submit',
-		'truncate' => 'Delete all articles',
-	),
-	'auth' => array(
-		'email' => 'Email address',
-		'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' => array(
-			'_' => 'Password',
-			'format' => '<small>At least 7 characters</small>',
-		),
-		'registration' => array(
-			'_' => 'New account',
-			'ask' => 'Create an account?',
-			'title' => 'Account creation',
-		),
-		'reset' => 'Authentication reset',
-		'username' => array(
-			'_' => 'Username',
-			'admin' => 'Administrator username',
-			'format' => '<small>maximum 16 alphanumeric characters</small>',
-		),
-		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
-	),
-	'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',
-		'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',
-		'month' => 'months',
-		'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',
-	),
-	'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!',
-		'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 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.',
-		'should_be_activated' => 'JavaScript must be enabled',
-	),
-	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'fr' => 'Français',
-		'it' => 'Italiano',
-		'nl' => 'Nederlands',
-	),
-	'menu' => array(
-		'about' => 'About',
-		'admin' => 'Administration',
-		'archiving' => 'Archiving',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'configuration' => 'Configuration',
-		'display' => 'Display',
-		'extensions' => 'Extensions',
-		'logs' => 'Logs',
-		'queries' => 'User queries',
-		'reading' => 'Reading',
-		'search' => 'Search words or #tags',
-		'sharing' => 'Sharing',
-		'shortcuts' => 'Shortcuts',
-		'stats' => 'Statistics',
-		'system' => 'System configuration',
-		'update' => 'Update',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
-	'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',
-	),
-	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'g+' => 'Google+',
-		'movim' => 'Movim',
-		'print' => 'Print',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
-	),
-	'short' => array(
-		'attention' => 'Warning!',
-		'blank_to_disable' => 'Leave blank to disable',
-		'by_author' => 'By <em>%s</em>',
-		'by_default' => 'By default',
-		'damn' => 'Damn!',
-		'default_category' => 'Uncategorized',
-		'no' => 'No',
-		'not_applicable' => 'Not available',
-		'ok' => 'Ok!',
-		'or' => 'or',
-		'yes' => 'Yes',
-	),
-);
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
deleted file mode 100644
index 80fa3d950..000000000
--- a/app/i18n/ru/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
-		'license' => 'License',
-		'project_website' => 'Project website',
-		'title' => 'About',
-		'version' => 'Version',
-		'website' => 'Website',
-	),
-	'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(
-		'_' => 'Logs',
-		'clear' => 'Clear the logs',
-		'empty' => 'Log file is empty',
-		'title' => 'Logs',
-	),
-	'menu' => array(
-		'about' => 'About FreshRSS',
-		'add_query' => 'Add a query',
-		'before_one_day' => 'Before one day',
-		'before_one_week' => 'Before one week',
-		'favorites' => 'Favourites (%s)',
-		'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',
-		'older_first' => 'Oldest first',
-		'queries' => 'User queries',
-		'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 unread',
-	),
-	'share' => 'Share',
-	'tag' => array(
-		'related' => 'Related tags',
-	),
-);
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
deleted file mode 100644
index b94fbc299..000000000
--- a/app/i18n/ru/install.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-return array(
-	'action' => array(
-		'finish' => 'Complete installation',
-		'fix_errors_before' => 'Please fix errors before skipping to the next step.',
-		'keep_install' => 'Keep previous installation',
-		'next_step' => 'Go to the next step',
-		'reinstall' => 'Reinstall FreshRSS',
-	),
-	'auth' => array(
-		'email_persona' => 'Login email 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>',
-		'password_format' => 'At least 7 characters',
-		'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',
-		'already_installed' => 'We have detected that FreshRSS is already installed!',
-		'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.',
-		),
-		'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.',
-		),
-		'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',
-		'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' => 'Please fix errors before skipping to the next step.',
-	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
-	'js' => array(
-		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',
-	),
-	'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/ru/sub.php b/app/i18n/ru/sub.php
deleted file mode 100644
index aaaa02827..000000000
--- a/app/i18n/ru/sub.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-return array(
-	'category' => array(
-		'_' => 'Category',
-		'add' => 'Add a category',
-		'empty' => 'Empty category',
-		'new' => 'New category',
-	),
-	'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 (caution, 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, its 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',
-		'url' => 'Feed URL',
-		'validator' => 'Check the validity of the feed',
-		'website' => 'Website URL',
-		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
-	),
-	'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',
-		'subscription_management' => 'Subscriptions management',
-	),
-	'title' => array(
-		'_' => 'Subscriptions management',
-		'feed_management' => 'RSS feeds management',
-	),
-);
diff --git a/app/i18n/ru_RU.utf8/admin.php b/app/i18n/ru_RU.utf8/admin.php
new file mode 100644
index 000000000..dfea5b3cb
--- /dev/null
+++ b/app/i18n/ru_RU.utf8/admin.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Разрешить анонимное чтение статей для пользователя по умолчанию (%s)',
+		'allow_anonymous_refresh' => 'Разрешить анонимное обновление статей',
+		'api_enabled' => 'Включить доступ к <abbr>API</abbr> <small>(необходимо для мобильных приложений)</small>',
+		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
+		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
+		'none' => 'Без аутентификации (небезопасный)',
+		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
+		'title' => 'Аутентификации',
+		'title_reset' => 'Сброс аутентицикации',
+		'token' => 'Токен аутентификации',
+		'token_help' => 'Разрешает доступ к RSS ленте пользователя по умолчанию без аутентификации:',
+		'type' => 'Метод аутентификации',
+		'unsafe_autologin' => 'Разрешить небезопасный автоматический вход с использованием следующего формата: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em>. Сервер HTTP должен иметь права на запись в эту папку',
+			'ok' => 'Права на <em>./data/cache</em> в порядке.',
+		),
+		'categories' => array(
+			'nok' => 'Таблица категорий настроена неправильно.',
+			'ok' => 'Таблица категорий настроена правильно.',
+		),
+		'connection' => array(
+			'nok' => 'Подключение к базе данных не может быть установлено.',
+			'ok' => 'Подключение к базе данных в порядке.',
+		),
+		'ctype' => array(
+			'nok' => 'У вас не установлена библиотека для проверки типов символов (php-ctype).',
+			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
+			'ok' => 'У вас установлено расширение cURL.',
+		),
+		'data' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на <em>./data/</em> в порядке.',
+		),
+		'database' => 'Установка базы данных',
+		'dom' => array(
+			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
+			'ok' => 'У вас установлена библиотека для просмотра DOM.',
+		),
+		'entries' => array(
+			'nok' => 'Таблица статей (entry) неправильно настроена.',
+			'ok' => 'Таблица статей (entry) настроена правильно.',
+		),
+		'favicons' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку значков в порядке.',
+		),
+		'feeds' => array(
+			'nok' => 'Таблица подписок (feed) неправильно настроена.',
+			'ok' => 'Таблица подписок (feed) настроена правильно.',
+		),
+		'files' => 'Установка файлов',
+		'json' => array(
+			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
+			'ok' => 'У вас установлена библиотека для работы с JSON.',
+		),
+		'minz' => array(
+			'nok' => 'У вас не установлен фрейворк Minz.',
+			'ok' => 'У вас установлен фрейворк Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
+			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку Mozilla Persona в порядке.',
+		),
+		'php' => array(
+			'_' => 'PHP installation',
+			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
+			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'В базе данных отсуствует одна или больше таблица.',
+			'ok' => 'Все таблицы есть в базе данных.',
+		),
+		'title' => 'Проверка установки и настройки',
+		'tokens' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку tokens  в порядке.',
+		),
+		'users' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку users  в порядке.',
+		),
+		'zip' => array(
+			'nok' => 'You lack ZIP extension (php5-zip package).',
+			'ok' => 'You have ZIP extension.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Отключены',
+		'empty_list' => 'Расширения не установлены',
+		'enabled' => 'Включены',
+		'no_configure_view' => 'Это расширение нельзя настроить.',
+		'system' => array(
+			'_' => 'Системные расширения',
+			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
+		),
+		'title' => 'Расширения',
+		'user' => 'Расширения пользователя',
+	),
+	'stats' => array(
+		'_' => 'Статистика',
+		'all_feeds' => 'Все подписки',
+		'category' => 'Категория',
+		'entry_count' => 'Количество статей',
+		'entry_per_category' => 'Статей в категории',
+		'entry_per_day' => 'Статей за день (за последние 30 дней)',
+		'entry_per_day_of_week' => 'За неделю (в среднем - %.2f сообщений)',
+		'entry_per_hour' => 'За час (в среднем - %.2f сообщений)',
+		'entry_per_month' => 'За месяц (в среднем - %.2f сообщений)',
+		'entry_repartition' => 'Перерасределение статей',
+		'feed' => 'Подписка',
+		'feed_per_category' => 'Подписок в категории',
+		'idle' => 'Неактивные подписки',
+		'main' => 'Основная статистика',
+		'main_stream' => 'Основной поток',
+		'menu' => array(
+			'idle' => 'Неактивные подписки',
+			'main' => 'Основная статистика',
+			'repartition' => 'Перерасределение статей',
+		),
+		'no_idle' => 'Нет неактивных подписок!',
+		'number_entries' => 'статей: %d',
+		'percent_of_total' => '%% от всего',
+		'repartition' => 'Перераспределение статей',
+		'status_favorites' => 'Избранное',
+		'status_read' => 'Читать',
+		'status_total' => 'Всего',
+		'status_unread' => 'Не прочитано',
+		'title' => 'Статистика',
+		'top_feed' => '10 лучших подписок',
+	),
+	'system' => array(
+		'_' => 'Системные настройки',
+		'auto-update-url' => 'Адрес сервера для автоматического обновления',
+		'instance-name' => 'Название этого сервера',
+		'max-categories' => 'Количество категорий на пользователя',
+		'max-feeds' => 'Количество статей на пользователя',
+		'registration' => array(
+			'help' => '0 означает неограниченное количество пользователей',
+			'number' => 'Максимальное количество пользователей',
+		),
+	),
+	'update' => array(
+		'_' => 'Обновление системы',
+		'apply' => 'Применить',
+		'check' => 'Проверить обновления',
+		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
+		'last' => 'Последняя проверка: %s',
+		'none' => 'Нечего обновлять',
+		'title' => 'Обновить систему',
+	),
+	'user' => array(
+		'articles_and_size' => '%s статей (%s)',
+		'create' => 'Создать нового пользователя',
+		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Язык',
+		'number' => 'На данный момент создан %d аккаунт',
+		'numbers' => 'На данный момент аккаунтов создано:  %d',
+		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
+		'password_format' => 'Минимум 7 символов',
+		'title' => 'Управление пользователями',
+		'user_list' => 'Список пользователей',
+		'username' => 'Имя пользователя',
+		'users' => 'Пользователи',
+	),
+);
diff --git a/app/i18n/ru_RU.utf8/conf.php b/app/i18n/ru_RU.utf8/conf.php
new file mode 100644
index 000000000..e502e9a43
--- /dev/null
+++ b/app/i18n/ru_RU.utf8/conf.php
@@ -0,0 +1,174 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Архивация',
+		'advanced' => 'Продвинутые настройки',
+		'delete_after' => 'Удалять статьи после',
+		'help' => 'Каждую подписку можно настроить более гибко',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'optimize' => 'Оптимизировать базу данных',
+		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'purge_now' => 'Очистить сейчас',
+		'title' => 'Архивация',
+		'ttl' => 'Не обновлять чаще чем',
+	),
+	'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' => 'Язык',
+		'notif_html5' => array(
+			'seconds' => 'seconds (0 means no timeout)',
+			'timeout' => 'HTML5 notification timeout',
+		),
+		'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',
+		'delete' => array(
+			'_' => 'Account deletion',
+			'warn' => 'Your account and all the related data will be deleted.',
+		),
+		'email_persona' => 'Login email 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(
+		'_' => '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',
+		'mark_updated_article_unread' => 'Mark updated articles as unread',
+		'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/ru_RU.utf8/feedback.php b/app/i18n/ru_RU.utf8/feedback.php
new file mode 100644
index 000000000..c9189c0d0
--- /dev/null
+++ b/app/i18n/ru_RU.utf8/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimisation 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.',
+			'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.',
+	),
+	'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',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s is already 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',
+	),
+	'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.',
+	),
+	'sub' => array(
+		'actualize' => 'Actualise',
+		'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(
+			'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' => '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)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS will now be 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!',
+		'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/ru_RU.utf8/gen.php b/app/i18n/ru_RU.utf8/gen.php
new file mode 100644
index 000000000..d23b12f95
--- /dev/null
+++ b/app/i18n/ru_RU.utf8/gen.php
@@ -0,0 +1,181 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Actualize',
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',
+		'cancel' => 'Cancel',
+		'create' => 'Create',
+		'disable' => 'Disable',
+		'empty' => 'Empty',
+		'enable' => 'Enable',
+		'export' => 'Export',
+		'filter' => 'Filter',
+		'import' => 'Import',
+		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'remove' => 'Remove',
+		'see_website' => 'See website',
+		'submit' => 'Submit',
+		'truncate' => 'Delete all articles',
+	),
+	'auth' => array(
+		'email' => 'Email address',
+		'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' => array(
+			'_' => 'Password',
+			'format' => '<small>At least 7 characters</small>',
+		),
+		'registration' => array(
+			'_' => 'New account',
+			'ask' => 'Create an account?',
+			'title' => 'Account creation',
+		),
+		'reset' => 'Authentication reset',
+		'username' => array(
+			'_' => 'Username',
+			'admin' => 'Administrator username',
+			'format' => '<small>maximum 16 alphanumeric characters</small>',
+		),
+		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+	),
+	'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',
+		'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',
+		'month' => 'months',
+		'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',
+	),
+	'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!',
+		'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 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.',
+		'should_be_activated' => 'JavaScript must be enabled',
+	),
+	'lang' => array(
+		'cz' => 'Čeština',
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'it' => 'Italiano',
+		'nl' => 'Nederlands',
+	),
+	'menu' => array(
+		'about' => 'About',
+		'admin' => 'Administration',
+		'archiving' => 'Archiving',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'configuration' => 'Configuration',
+		'display' => 'Display',
+		'extensions' => 'Extensions',
+		'logs' => 'Logs',
+		'queries' => 'User queries',
+		'reading' => 'Reading',
+		'search' => 'Search words or #tags',
+		'sharing' => 'Sharing',
+		'shortcuts' => 'Shortcuts',
+		'stats' => 'Statistics',
+		'system' => 'System configuration',
+		'update' => 'Update',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'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',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'movim' => 'Movim',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Warning!',
+		'blank_to_disable' => 'Leave blank to disable',
+		'by_author' => 'By <em>%s</em>',
+		'by_default' => 'By default',
+		'damn' => 'Damn!',
+		'default_category' => 'Uncategorized',
+		'no' => 'No',
+		'not_applicable' => 'Not available',
+		'ok' => 'Ok!',
+		'or' => 'or',
+		'yes' => 'Yes',
+	),
+);
diff --git a/app/i18n/ru_RU.utf8/index.php b/app/i18n/ru_RU.utf8/index.php
new file mode 100644
index 000000000..80fa3d950
--- /dev/null
+++ b/app/i18n/ru_RU.utf8/index.php
@@ -0,0 +1,61 @@
+<?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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'license' => 'License',
+		'project_website' => 'Project website',
+		'title' => 'About',
+		'version' => 'Version',
+		'website' => 'Website',
+	),
+	'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(
+		'_' => 'Logs',
+		'clear' => 'Clear the logs',
+		'empty' => 'Log file is empty',
+		'title' => 'Logs',
+	),
+	'menu' => array(
+		'about' => 'About FreshRSS',
+		'add_query' => 'Add a query',
+		'before_one_day' => 'Before one day',
+		'before_one_week' => 'Before one week',
+		'favorites' => 'Favourites (%s)',
+		'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',
+		'older_first' => 'Oldest first',
+		'queries' => 'User queries',
+		'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 unread',
+	),
+	'share' => 'Share',
+	'tag' => array(
+		'related' => 'Related tags',
+	),
+);
diff --git a/app/i18n/ru_RU.utf8/install.php b/app/i18n/ru_RU.utf8/install.php
new file mode 100644
index 000000000..c838b2eba
--- /dev/null
+++ b/app/i18n/ru_RU.utf8/install.php
@@ -0,0 +1,113 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Завершить установку',
+		'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу.',
+		'keep_install' => 'Сохранить предыдущую установку',
+		'next_step' => 'Перейти к следующему этапу',
+		'reinstall' => 'Переустановить FreshRSS',
+	),
+	'auth' => array(
+		'email_persona' => 'Почта (логин) для <br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Вэб-форма (традиционный, необходим JavaScript)',
+		'http' => 'HTTP (для продвинутых пользователей с HTTPS)',
+		'none' => 'Никакого (опасно)',
+		'password_form' => 'Пароль<br /><small>(для метода аутентификации на Вэб-формах)</small>',
+		'password_format' => 'Как минимум 7 букв',
+		'persona' => 'Mozilla Persona (современный, необходим JavaScript)',
+		'type' => 'Метод аутентификации',
+	),
+	'bdd' => array(
+		'_' => 'База данных',
+		'conf' => array(
+			'_' => 'Конфигурация базы данныхDatabase configuration',
+			'ko' => 'Проверьте конфигурацию базы данных.',
+			'ok' => 'Конфигурация базы данных сохранена.',
+		),
+		'host' => 'Хост',
+		'prefix' => 'Префикс таблицы',
+		'password' => 'Пароль HTTP',
+		'type' => 'Тип базы данных',
+		'username' => 'Имя пользователя HTTP',
+	),
+	'check' => array(
+		'_' => 'Проверки',
+		'already_installed' => 'Обнаружена предыдущая установка FreshRSS!',
+		'cache' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку кэша в порядке.',
+		),
+		'ctype' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для проверки типов символов (php-ctype).',
+			'ok' => 'У вас установлена необходимая библиотека для проверки типов символов (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'У вас нет расширения cURL (пакет php5-curl).',
+			'ok' => 'У вас установлено расширение cURL.',
+		),
+		'data' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на <em>./data/</em> в порядке.',
+		),
+		'dom' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для просмотра DOM (пакет php-xml).',
+			'ok' => 'У вас установлена необходимая библиотека для просмотра DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку значков в порядке.',
+		),
+		'http_referer' => array(
+			'nok' => 'Убедитесь, что вы не изменяете ваш HTTP REFERER.',
+			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
+		),
+		'minz' => array(
+			'nok' => 'У вас не установлен фрейворк Minz.',
+			'ok' => 'У вас установлен фрейворк Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
+			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку Mozilla Persona в порядке.',
+		),
+		'php' => array(
+			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
+			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку users  в порядке.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Общие настройки',
+		'ok' => 'Общие настройки были сохранены.',
+	),
+	'congratulations' => 'Поздравляем!',
+	'default_user' => 'Имя пользователя по умолчанию <small>(максимум 16 латинских букв и/или цифр)</small>',
+	'delete_articles_after' => 'Удалять статьи после',
+	'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу..',
+	'javascript_is_better' => 'FreshRSS принесёт больше удовольствия, если включить JavaScript',
+	'js' => array(
+		'confirm_reinstall' => 'Переустанавливая FreshRSS, вы потеряете предыдущую конфигурацию. Вы хотите продолжить?',
+	),
+	'language' => array(
+		'_' => 'Язык',
+		'choose' => 'Выберите язык для FreshRSS',
+		'defined' => 'Язык выбран.',
+	),
+	'not_deleted' => 'Что-то пошло не так; удалите файл <em>%s</em> вручную.',
+	'ok' => 'Установка успешна.',
+	'step' => '%d этап',
+	'steps' => 'Этапы',
+	'title' => 'Установка · FreshRSS',
+	'this_is_the_end' => 'Это конец',
+);
diff --git a/app/i18n/ru_RU.utf8/sub.php b/app/i18n/ru_RU.utf8/sub.php
new file mode 100644
index 000000000..aaaa02827
--- /dev/null
+++ b/app/i18n/ru_RU.utf8/sub.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Category',
+		'add' => 'Add a category',
+		'empty' => 'Empty category',
+		'new' => 'New category',
+	),
+	'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 (caution, 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, its 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',
+		'url' => 'Feed URL',
+		'validator' => 'Check the validity of the feed',
+		'website' => 'Website URL',
+		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
+	),
+	'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',
+		'subscription_management' => 'Subscriptions management',
+	),
+	'title' => array(
+		'_' => 'Subscriptions management',
+		'feed_management' => 'RSS feeds management',
+	),
+);
-- 
cgit v1.2.3


From 5a80127140f78d13f762facb4017e5ada965eca6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 00:36:30 +0100
Subject: Filter out img sizes

https://github.com/FreshRSS/FreshRSS/issues/1077
https://github.com/FreshRSS/FreshRSS/issues/1081
---
 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 e7e59fe65..7d92b6fd7 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -209,7 +209,7 @@ function customSimplePie() {
 	$simplePie->strip_attributes(array_merge($simplePie->strip_attributes, array(
 		'autoplay', 'onload', 'onunload', 'onclick', 'ondblclick', 'onmousedown', 'onmouseup',
 		'onmouseover', 'onmousemove', 'onmouseout', 'onfocus', 'onblur',
-		'onkeypress', 'onkeydown', 'onkeyup', 'onselect', 'onchange', 'seamless', 'srcset')));
+		'onkeypress', 'onkeydown', 'onkeyup', 'onselect', 'onchange', 'seamless', 'sizes', 'srcset')));
 	$simplePie->add_attributes(array(
 		'img' => array('lazyload' => '', 'postpone' => ''),	//http://www.w3.org/TR/resource-priorities/
 		'audio' => array('lazyload' => '', 'postpone' => '', 'preload' => 'none'),
-- 
cgit v1.2.3


From cc1390fe9454166ee5d638aa01948f791ad7c4fe Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 00:58:51 +0100
Subject: JavaScript popup number bug

A backslash caused problem.
https://github.com/FreshRSS/FreshRSS/issues/1075
https://github.com/FreshRSS/FreshRSS/pull/1078
---
 app/i18n/cz/gen.php | 2 +-
 app/i18n/de/gen.php | 2 +-
 app/i18n/en/gen.php | 2 +-
 app/i18n/fr/gen.php | 2 +-
 app/i18n/it/gen.php | 2 +-
 app/i18n/nl/gen.php | 2 +-
 app/i18n/tr/gen.php | 2 +-
 p/scripts/main.js   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index ca90cff0c..c30310bf3 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Jste si jist, že chcete provést tuto akci? Změny nelze vrátit zpět!',
 		'confirm_action_feed_cat' => 'Jste si jist, že chcete provést tuto akci? Přijdete o související oblíbené položky a uživatelské dotazy. Změny nelze vrátit zpět!',
 		'feedback' => array(
-			'body_new_articles' => 'Je \\d nových článků k přečtení v FreshRSS.',
+			'body_new_articles' => 'Je %d nových článků k přečtení v FreshRSS.',
 			'request_failed' => 'Požadavek selhal, což může být způsobeno problémy s připojení k internetu.',
 			'title_new_articles' => 'FreshRSS: nové články!',
 		),
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index fb09e8598..47bdee4ee 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Diese Aktion 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.',
+			'body_new_articles' => 'Es gibt %d neue Artikel zum Lesen auf FreshRSS.',
 			'request_failed' => 'Eine Anfrage ist fehlgeschlagen, dies könnte durch Probleme mit der Internetverbindung verursacht worden sein.',
 			'title_new_articles' => 'FreshRSS: neue Artikel!',
 		),
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index f71684688..3af7850b8 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -108,7 +108,7 @@ 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(
-			'body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+			'body_new_articles' => 'There are %d new articles to read on FreshRSS.',
 			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
 			'title_new_articles' => 'FreshRSS: new articles!',
 		),
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index f8e4ac7ee..4cda84c8d 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -108,7 +108,7 @@ 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(
-			'body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+			'body_new_articles' => 'Il y a %d nouveaux articles à lire sur FreshRSS.',
 			'request_failed' => 'Une requête a échoué, cela peut être dû à des problèmes de connexion à Internet.',
 			'title_new_articles' => 'FreshRSS : nouveaux articles !',
 		),
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index bd311aa12..8598ec8a7 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sei sicuro di voler continuare?',
 		'confirm_action_feed_cat' => 'Sei sicuro di voler continuare? Verranno persi i preferiti e le ricerche utente correlate!',
 		'feedback' => array(
-			'body_new_articles' => 'Ci sono \\d nuovi articoli da leggere.',
+			'body_new_articles' => 'Ci sono %d nuovi articoli da leggere.',
 			'request_failed' => 'Richiesta fallita, probabilmente a causa di problemi di connessione',
 			'title_new_articles' => 'Feed RSS Reader: nuovi articoli!',
 		),
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index bc4fd9201..56f8424d1 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Weet u zeker dat u dit wilt doen? Het kan niet ongedaan worden gemaakt!',
 		'confirm_action_feed_cat' => 'Weet u zeker dat u dit wilt doen? U verliest alle gereleteerde favorieten en gebruikers informatie. Het kan niet ongedaan worden gemaakt!',
 		'feedback' => array(
-			'body_new_articles' => 'Er zijn \\d nieuwe artikelen om te lezen op FreshRSS.',
+			'body_new_articles' => 'Er zijn %d nieuwe artikelen om te lezen op FreshRSS.',
 			'request_failed' => 'Een opdracht is mislukt, mogelijk door Internet verbindings problemen.',
 			'title_new_articles' => 'FreshRSS: nieuwe artikelen!',
 		),
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 7284f132b..65a20ed7a 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Bunu yapmak istediğinize emin misiniz ? Daha sonra iptal edilemez!',
 		'confirm_action_feed_cat' => 'Bunu yapmak istediğinize emin misiniz ? Favorileriniz ve sorgularınız silinecek. Daha sonra iptal edilemez!',
 		'feedback' => array(
-			'body_new_articles' => 'FreshRSS de okunmaz üzere \\d yeni makale var.',
+			'body_new_articles' => 'FreshRSS de okunmaz üzere %d yeni makale var.',
 			'request_failed' => 'Hata. İnternet bağlantınızı kontrol edin.',
 			'title_new_articles' => 'FreshRSS: yeni makaleler!',
 		),
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 32a2ca913..b7522df6a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -863,7 +863,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"
 	});
 
-- 
cgit v1.2.3


From e3105f2135552701a4986873491a964b4e44c82e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 01:46:27 +0100
Subject: JavaScript popup number bug (percent escaping)

https://github.com/FreshRSS/FreshRSS/pull/1078

https://github.com/Alkarex/FreshRSS/commit/cc1390fe9454166ee5d638aa01948f791ad7c4fe
---
 app/i18n/cz/gen.php | 2 +-
 app/i18n/de/gen.php | 2 +-
 app/i18n/en/gen.php | 2 +-
 app/i18n/fr/gen.php | 2 +-
 app/i18n/it/gen.php | 2 +-
 app/i18n/nl/gen.php | 2 +-
 app/i18n/tr/gen.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index c30310bf3..78ec80f68 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Jste si jist, že chcete provést tuto akci? Změny nelze vrátit zpět!',
 		'confirm_action_feed_cat' => 'Jste si jist, že chcete provést tuto akci? Přijdete o související oblíbené položky a uživatelské dotazy. Změny nelze vrátit zpět!',
 		'feedback' => array(
-			'body_new_articles' => 'Je %d nových článků k přečtení v FreshRSS.',
+			'body_new_articles' => 'Je %%d nových článků k přečtení v FreshRSS.',
 			'request_failed' => 'Požadavek selhal, což může být způsobeno problémy s připojení k internetu.',
 			'title_new_articles' => 'FreshRSS: nové články!',
 		),
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 47bdee4ee..bd0ba08cc 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Diese Aktion 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.',
+			'body_new_articles' => 'Es gibt %%d neue Artikel zum Lesen auf FreshRSS.',
 			'request_failed' => 'Eine Anfrage ist fehlgeschlagen, dies könnte durch Probleme mit der Internetverbindung verursacht worden sein.',
 			'title_new_articles' => 'FreshRSS: neue Artikel!',
 		),
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 3af7850b8..6fb33a4db 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -108,7 +108,7 @@ 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(
-			'body_new_articles' => 'There are %d new articles to read on FreshRSS.',
+			'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',
 			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
 			'title_new_articles' => 'FreshRSS: new articles!',
 		),
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 4cda84c8d..6b7056f92 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -108,7 +108,7 @@ 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(
-			'body_new_articles' => 'Il y a %d nouveaux articles à lire sur FreshRSS.',
+			'body_new_articles' => 'Il y a %%d nouveaux articles à lire sur FreshRSS.',
 			'request_failed' => 'Une requête a échoué, cela peut être dû à des problèmes de connexion à Internet.',
 			'title_new_articles' => 'FreshRSS : nouveaux articles !',
 		),
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 8598ec8a7..2efbef167 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sei sicuro di voler continuare?',
 		'confirm_action_feed_cat' => 'Sei sicuro di voler continuare? Verranno persi i preferiti e le ricerche utente correlate!',
 		'feedback' => array(
-			'body_new_articles' => 'Ci sono %d nuovi articoli da leggere.',
+			'body_new_articles' => 'Ci sono %%d nuovi articoli da leggere.',
 			'request_failed' => 'Richiesta fallita, probabilmente a causa di problemi di connessione',
 			'title_new_articles' => 'Feed RSS Reader: nuovi articoli!',
 		),
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 56f8424d1..bc2137c22 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Weet u zeker dat u dit wilt doen? Het kan niet ongedaan worden gemaakt!',
 		'confirm_action_feed_cat' => 'Weet u zeker dat u dit wilt doen? U verliest alle gereleteerde favorieten en gebruikers informatie. Het kan niet ongedaan worden gemaakt!',
 		'feedback' => array(
-			'body_new_articles' => 'Er zijn %d nieuwe artikelen om te lezen op FreshRSS.',
+			'body_new_articles' => 'Er zijn %%d nieuwe artikelen om te lezen op FreshRSS.',
 			'request_failed' => 'Een opdracht is mislukt, mogelijk door Internet verbindings problemen.',
 			'title_new_articles' => 'FreshRSS: nieuwe artikelen!',
 		),
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 65a20ed7a..f987a8e6c 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Bunu yapmak istediğinize emin misiniz ? Daha sonra iptal edilemez!',
 		'confirm_action_feed_cat' => 'Bunu yapmak istediğinize emin misiniz ? Favorileriniz ve sorgularınız silinecek. Daha sonra iptal edilemez!',
 		'feedback' => array(
-			'body_new_articles' => 'FreshRSS de okunmaz üzere %d yeni makale var.',
+			'body_new_articles' => 'FreshRSS de okunmaz üzere %%d yeni makale var.',
 			'request_failed' => 'Hata. İnternet bağlantınızı kontrol edin.',
 			'title_new_articles' => 'FreshRSS: yeni makaleler!',
 		),
-- 
cgit v1.2.3


From 64ec0708a1404e1f39a5fdc0131c89b2e4038bee Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 02:51:27 +0100
Subject: More work for CSP, in particular install

Install needs testing.
https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/install.php      | 92 +++++-----------------------------------------------
 p/scripts/install.js | 76 +++++++++++++++++++++++++++++++++++++++++++
 p/scripts/main.js    |  7 ++--
 3 files changed, 89 insertions(+), 86 deletions(-)
 create mode 100644 p/scripts/install.js

diff --git a/app/install.php b/app/install.php
index 7ac1c4cec..03f6e2199 100644
--- a/app/install.php
+++ b/app/install.php
@@ -616,27 +616,6 @@ function printStep1() {
 		<a class="btn btn-attention next-step confirm" data-str-confirm="<?php echo _t('install.js.confirm_reinstall'); ?>" href="?step=2" tabindex="2" ><?php echo _t('install.action.reinstall'); ?></a>
 	</form>
 
-	<script>
-		function ask_confirmation(e) {
-			var str_confirmation = this.getAttribute('data-str-confirm');
-			if (!str_confirmation) {
-				str_confirmation = "<?php echo _t('gen.js.confirm_action'); ?>";
-			}
-
-			if (!confirm(str_confirmation)) {
-				e.preventDefault();
-			}
-		}
-
-		function init_confirm() {
-			confirms = document.getElementsByClassName('confirm');
-			for (var i = 0 ; i < confirms.length ; i++) {
-				confirms[i].addEventListener('click', ask_confirmation);
-			}
-		}
-
-		init_confirm();
-	</script>
 	<?php } elseif ($res['all'] == 'ok') { ?>
 	<a class="btn btn-important next-step" href="?step=2" tabindex="1" ><?php echo _t('install.action.next_step'); ?></a>
 	<?php } else { ?>
@@ -674,7 +653,7 @@ function printStep2() {
 		<div class="form-group">
 			<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)" tabindex="4">
+				<select id="auth_type" name="auth_type" required="required" tabindex="4">
 					<?php
 						function no_auth($auth_type) {
 							return !in_array($auth_type, array('form', 'persona', 'http_auth', 'none'));
@@ -709,48 +688,6 @@ function printStep2() {
 			</div>
 		</div>
 
-		<script>
-			function show_password() {
-				var button = this;
-				var passwordField = document.getElementById(button.getAttribute('data-toggle'));
-				passwordField.setAttribute('type', 'text');
-				button.className += ' active';
-
-				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('mousedown', show_password);
-				toggles[i].addEventListener('mouseup', hide_password);
-			}
-
-			function auth_type_change() {
-				var auth_value = document.getElementById('auth_type').value,
-				    password_input = document.getElementById('passwordPlain'),
-				    mail_input = document.getElementById('mail_login');
-
-				if (auth_value === 'form') {
-					password_input.required = true;
-					mail_input.required = false;
-				} else if (auth_value === 'persona') {
-					password_input.required = false;
-					mail_input.required = true;
-				} else {
-					password_input.required = false;
-					mail_input.required = false;
-				}
-			}
-			auth_type_change();
-		</script>
-
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important" tabindex="7" ><?php echo _t('gen.action.submit'); ?></button>
@@ -778,7 +715,7 @@ function printStep3() {
 		<div class="form-group">
 			<label class="group-name" for="type"><?php echo _t('install.bdd.type'); ?></label>
 			<div class="group-controls">
-				<select name="type" id="type" onchange="mySqlShowHide()" tabindex="1" >
+				<select name="type" id="type" tabindex="1">
 				<?php if (extension_loaded('pdo_mysql')) {?>
 				<option value="mysql"
 					<?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'mysql') ? 'selected="selected"' : ''; ?>>
@@ -831,19 +768,6 @@ function printStep3() {
 			</div>
 		</div>
 		</div>
-		<script>
-			function mySqlShowHide() {
-				document.getElementById('mysql').style.display = document.getElementById('type').value === 'mysql' ? 'block' : 'none';
-				if (document.getElementById('type').value !== 'mysql') {
-					document.getElementById('host').value = '';
-					document.getElementById('user').value = '';
-					document.getElementById('pass').value = '';
-					document.getElementById('base').value = '';
-					document.getElementById('prefix').value = '';
-				}
-			}
-			mySqlShowHide();
-		</script>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
@@ -897,13 +821,15 @@ case 5:
 }
 ?>
 <!DOCTYPE html>
-<html lang="fr">
+<html>
 	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="initial-scale=1.0">
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="initial-scale=1.0" />
 		<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" />
+		<link rel="stylesheet" href="../themes/base-theme/template.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/base-theme/template.css'); ?>" />
+		<link rel="stylesheet" href="../themes/Origine/origine.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/Origine/origine.css'); ?>" />
+		<script src="../scripts/install.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/install.js'); ?>"></script>
+		<meta name="robots" content="noindex,nofollow" />
 	</head>
 	<body>
 
diff --git a/p/scripts/install.js b/p/scripts/install.js
new file mode 100644
index 000000000..52d8bf8e0
--- /dev/null
+++ b/p/scripts/install.js
@@ -0,0 +1,76 @@
+"use strict";
+
+function show_password() {
+	var button = this;
+	var passwordField = document.getElementById(button.getAttribute('data-toggle'));
+	passwordField.setAttribute('type', 'text');
+	button.className += ' active';
+	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;
+}
+var toggles = document.getElementsByClassName('toggle-password');
+for (var i = 0 ; i < toggles.length ; i++) {
+	toggles[i].addEventListener('mousedown', show_password);
+	toggles[i].addEventListener('mouseup', hide_password);
+}
+
+function auth_type_change() {
+	var auth_type = document.getElementById('auth_type');
+	if (auth_type) {
+		var auth_value = auth_type.value,
+			password_input = document.getElementById('passwordPlain'),
+			mail_input = document.getElementById('mail_login');
+
+		if (auth_value === 'form') {
+			password_input.required = true;
+			mail_input.required = false;
+		} else if (auth_value === 'persona') {
+			password_input.required = false;
+			mail_input.required = true;
+		} else {
+			password_input.required = false;
+			mail_input.required = false;
+		}
+	}
+}
+var auth_type = document.getElementById('auth_type');
+if (auth_type) {
+	auth_type_change();
+	auth_type_change.addEventListener('change', auth_type_change);
+}
+
+function mySqlShowHide() {
+	var mysql = document.getElementById('mysql');
+	if (mysql) {
+		mysql.style.display = document.getElementById('type').value === 'mysql' ? 'block' : 'none';
+		if (document.getElementById('type').value !== 'mysql') {
+			document.getElementById('host').value = '';
+			document.getElementById('user').value = '';
+			document.getElementById('pass').value = '';
+			document.getElementById('base').value = '';
+			document.getElementById('prefix').value = '';
+		}
+	}
+}
+var bd_type = document.getElementById('type');
+if (bd_type) {
+	mySqlShowHide();
+	bd_type.addEventListener('change', mySqlShowHide);
+}
+
+function ask_confirmation(e) {
+	var str_confirmation = this.getAttribute('data-str-confirm');
+	if (!confirm(str_confirmation)) {
+		e.preventDefault();
+	}
+}
+var confirms = document.getElementsByClassName('confirm');
+for (var i = 0 ; i < confirms.length ; i++) {
+	confirms[i].addEventListener('click', ask_confirmation);
+}
diff --git a/p/scripts/main.js b/p/scripts/main.js
index b7522df6a..31b07721a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -871,7 +871,7 @@ function notifs_html5_show(nb) {
 		window.location.reload();
 	}
 
-	if (context['html5_notif_timeout'] !== 0){
+	if (context['html5_notif_timeout'] !== 0) {
 		setTimeout(function() {
 			notification.close();
 		}, context['html5_notif_timeout'] * 1000);
@@ -1246,8 +1246,9 @@ function init_configuration_alert() {
 }
 
 function parseJavaScriptCookie() {
-	var json = JSON.parse(decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"))) || {};
+	var vars = decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"));
 	document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
+	var json = JSON.parse(vars);
 	window.context = json.context;
 	window.shortcuts = json.shortcuts;
 	window.url = json.url;
@@ -1256,7 +1257,6 @@ function parseJavaScriptCookie() {
 }
 
 function init_all() {
-	parseJavaScriptCookie();
 	if (!window.$) {
 		if (window.console) {
 			console.log('FreshRSS waiting for JS…');
@@ -1264,6 +1264,7 @@ function init_all() {
 		window.setTimeout(init_all, 50);
 		return;
 	}
+	parseJavaScriptCookie();
 	init_notifications();
 	init_confirm_action();
 	$stream = $('#stream');
-- 
cgit v1.2.3


From e3dc7d46e15d97f8bd008acf3489d5e6c22b8daa Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 14:23:24 +0100
Subject: CSP: Use inline JSON instead of one-time cookie

Simpler, lighter
https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php                        | 58 ---------------------------------
 app/layout/layout.phtml                 |  3 ++
 app/views/helpers/javascript_vars.phtml | 54 ++++++++++++++++++++++++++++++
 p/scripts/main.js                       | 10 +++---
 4 files changed, 62 insertions(+), 63 deletions(-)
 create mode 100644 app/views/helpers/javascript_vars.phtml

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 8eb862aeb..a6ed2a306 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -110,66 +110,8 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
-	private static function setJavascriptCookie() {
-		$mark = FreshRSS_Context::$user_conf->mark_when;
-		$mail = Minz_Session::param('mail', false);
-		$s = FreshRSS_Context::$user_conf->shortcuts;
-		$json = json_encode(array(
-			'context' => array(
-				'auto_remove_article' => !!FreshRSS_Context::isAutoRemoveAvailable(),
-				'hide_posts' => !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader'),
-				'display_order' => Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order),
-				'auto_mark_article' => !!$mark['article'],
-				'auto_mark_site' => !!$mark['site'],
-				'auto_mark_scroll' => !!$mark['scroll'],
-				'auto_load_more' => !!FreshRSS_Context::$user_conf->auto_load_more,
-				'auto_actualize_feeds' => !!Minz_Session::param('actualize_feeds', false),
-				'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
-				'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
-				'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
-				'auth_type' => FreshRSS_Context::$system_conf->auth_type,
-				'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
-				'current_view' => Minz_Request::actionName(),
-			),
-			'shortcuts' => array(
-				'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'],
-			),
-			'url' => array(
-				'index' => _url('index', 'index'),
-				'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
-				'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
-				'help' => FRESHRSS_WIKI,
-			),
-			'i18n' => array(
-				'confirmation_default' => _t('gen.js.confirm_action'),
-				'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'),
-			),
-			'icons' => array(
-				'close' => _i('close'),
-			),
-		), JSON_UNESCAPED_UNICODE);
-		setrawcookie('FreshRSS-vars', rawurlencode($json), 0, Minz_Session::getCookieDir());
-	}
-
 	public static function preLayout() {
 		header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
-		self::setJavascriptCookie();
 	}
 
 	private function loadNotifications() {
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 7d718efbd..99a3717bc 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -8,6 +8,9 @@
 		<meta name="viewport" content="initial-scale=1.0" />
 		<?php echo self::headTitle(); ?>
 		<?php echo self::headStyle(); ?>
+		<script id="jsonVars" type="application/json">
+<?php $this->renderHelper('javascript_vars'); ?>
+		</script>
 		<?php echo self::headScript(); ?>
 <?php
 	$url_base = Minz_Request::currentRequest();
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
new file mode 100644
index 000000000..6178cacf2
--- /dev/null
+++ b/app/views/helpers/javascript_vars.phtml
@@ -0,0 +1,54 @@
+<?php
+$mark = FreshRSS_Context::$user_conf->mark_when;
+$mail = Minz_Session::param('mail', false);
+$s = FreshRSS_Context::$user_conf->shortcuts;
+echo htmlspecialchars(json_encode(array(
+	'context' => array(
+		'auto_remove_article' => !!FreshRSS_Context::isAutoRemoveAvailable(),
+		'hide_posts' => !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader'),
+		'display_order' => Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order),
+		'auto_mark_article' => !!$mark['article'],
+		'auto_mark_site' => !!$mark['site'],
+		'auto_mark_scroll' => !!$mark['scroll'],
+		'auto_load_more' => !!FreshRSS_Context::$user_conf->auto_load_more,
+		'auto_actualize_feeds' => !!Minz_Session::param('actualize_feeds', false),
+		'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
+		'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
+		'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
+		'auth_type' => FreshRSS_Context::$system_conf->auth_type,
+		'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
+		'current_view' => Minz_Request::actionName(),
+	),
+	'shortcuts' => array(
+		'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'],
+	),
+	'url' => array(
+		'index' => _url('index', 'index'),
+		'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
+		'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
+		'help' => FRESHRSS_WIKI,
+	),
+	'i18n' => array(
+		'confirmation_default' => _t('gen.js.confirm_action'),
+		'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'),
+	),
+	'icons' => array(
+		'close' => _i('close'),
+	),
+), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES);
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 31b07721a..f07cdafd7 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1245,10 +1245,10 @@ function init_configuration_alert() {
 	});
 }
 
-function parseJavaScriptCookie() {
-	var vars = decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"));
-	document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
-	var json = JSON.parse(vars);
+function parseJsonVars() {
+	var jsonVars = document.getElementById('jsonVars'),
+		json = JSON.parse(jsonVars.innerHTML);
+	jsonVars.outerHTML = '';
 	window.context = json.context;
 	window.shortcuts = json.shortcuts;
 	window.url = json.url;
@@ -1264,7 +1264,7 @@ function init_all() {
 		window.setTimeout(init_all, 50);
 		return;
 	}
-	parseJavaScriptCookie();
+	parseJsonVars();
 	init_notifications();
 	init_confirm_action();
 	$stream = $('#stream');
-- 
cgit v1.2.3


From 264d05297c72e87b114a8e930db7eae7affe5690 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 17:26:37 +0100
Subject: CSP for statistics

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/Models/StatsDAO.php           |  20 ++++----
 app/Models/StatsDAOSQLite.php     |   4 +-
 app/views/stats/index.phtml       |  64 ++++-------------------
 app/views/stats/repartition.phtml | 103 ++++++++------------------------------
 p/scripts/repartition.js          |  72 ++++++++++++++++++++++++++
 p/scripts/stats.js                |  56 +++++++++++++++++++++
 6 files changed, 169 insertions(+), 150 deletions(-)
 create mode 100644 p/scripts/repartition.js
 create mode 100644 p/scripts/stats.js

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 80caccc49..5ca333396 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -55,9 +55,9 @@ SQL;
 
 	/**
 	 * Calculates entry count per day on a 30 days period.
-	 * Returns the result as a JSON string.
+	 * Returns the result as a JSON object.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateEntryCount() {
 		$count = $this->initEntryCountArray();
@@ -257,9 +257,9 @@ SQL;
 
 	/**
 	 * Calculates feed count per category.
-	 * Returns the result as a JSON string.
+	 * Returns the result as a JSON object.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateFeedByCategory() {
 		$sql = <<<SQL
@@ -282,7 +282,7 @@ SQL;
 	 * Calculates entry count per category.
 	 * Returns the result as a JSON string.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateEntryByCategory() {
 		$sql = <<<SQL
@@ -357,7 +357,7 @@ SQL;
 			$serie[] = array($key, $value);
 		}
 
-		return json_encode($serie);
+		return $serie;
 	}
 
 	protected function convertToPieSerie($data) {
@@ -368,7 +368,7 @@ SQL;
 			$serie[] = $value;
 		}
 
-		return json_encode($serie);
+		return $serie;
 	}
 
 	/**
@@ -411,17 +411,17 @@ SQL;
 	}
 
 	/**
-	 * Translates array content and encode it as JSON
+	 * Translates array content
 	 *
 	 * @param array $data
-	 * @return string
+	 * @return JSON object
 	 */
 	private function convertToTranslatedJson($data = array()) {
 		$translated = array_map(function($a) {
 			return _t('gen.date.' . $a);
 		}, $data);
 
-		return json_encode($translated);
+		return $translated;
 	}
 
 }
diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php
index bb2336532..9bfe8b20a 100644
--- a/app/Models/StatsDAOSQLite.php
+++ b/app/Models/StatsDAOSQLite.php
@@ -4,9 +4,9 @@ class FreshRSS_StatsDAOSQLite extends FreshRSS_StatsDAO {
 
 	/**
 	 * Calculates entry count per day on a 30 days period.
-	 * Returns the result as a JSON string.
+	 * Returns the result as a JSON object.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateEntryCount() {
 		$count = $this->initEntryCountArray();
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 18bcd4d99..c11b88999 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -82,58 +82,12 @@
 	</div>
 </div>
 
-<script>
-"use strict";
-function initStats() {
-	if (!window.Flotr) {
-		if (window.console) {
-			console.log('FreshRSS waiting for Flotr…');
-		}
-		window.setTimeout(initStats, 50);
-		return;
-	}
-	// Entry per day
-	var avg = [];
-	for (var i = -31; i <= 0; i++) {
-		avg.push([i, <?php echo $this->average?>]);
-	}
-	Flotr.draw(document.getElementById('statsEntryPerDay'),
-		[{
-			data: <?php echo $this->count ?>,
-			bars: {horizontal: false, show: true}
-		},{
-			data: avg,
-			lines: {show: true},
-			label: "<?php echo $this->average?>"
-		}],
-		{
-			grid: {verticalLines: false},
-			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);}}
-		});
-	// Feed per category
-	Flotr.draw(document.getElementById('statsFeedPerCategory'),
-		<?php echo $this->feedByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
-		});
-	// Entry per category
-	Flotr.draw(document.getElementById('statsEntryPerCategory'),
-		<?php echo $this->entryByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
-		});
-}
-initStats();
-</script>
+<script id="jsonStats" type="application/json"><?php
+echo htmlspecialchars(json_encode(array(
+	'average' => $this->average,
+	'dataCount' => $this->count,
+	'feedByCategory' => $this->feedByCategory,
+	'entryByCategory' => $this->entryByCategory,
+), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES);
+?></script>
+<script src="../scripts/stats.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/stats.js'); ?>"></script>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index b20d9bbd0..980b26a3d 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -30,20 +30,20 @@
 	<?php }?>
 
 	<div class="stat">
-	    <table>
+		<table>
 		<tr>
-		    <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>
+			<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>
-		    <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>
+			<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>
+		</table>
 	</div>
 
 	<div class="stat">
@@ -62,76 +62,13 @@
 	</div>
 </div>
 
-<script>
-"use strict";
-function initStats() {
-	if (!window.Flotr) {
-		if (window.console) {
-			console.log('FreshRSS waiting for Flotr…');
-		}
-		window.setTimeout(initStats, 50);
-		return;
-	}
-	// Entry per hour
-	Flotr.draw(document.getElementById('statsEntryPerHour'),
-		[{
-			data: <?php echo $this->repartitionHour ?>,
-			bars: {horizontal: false, show: true}
-		}],
-		{
-			grid: {verticalLines: false},
-			xaxis: {noTicks: 23,
-				tickFormatter: function(x) {
-					var x = parseInt(x);
-					return x + 1;
-				},
-				min: -0.9,
-				max: 23.9,
-				tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-	// Entry per day of week
-	Flotr.draw(document.getElementById('statsEntryPerDayOfWeek'),
-		[{
-			data: <?php echo $this->repartitionDayOfWeek ?>,
-			bars: {horizontal: false, show: true}
-		}],
-		{
-			grid: {verticalLines: false},
-			xaxis: {noTicks: 6,
-				tickFormatter: function(x) {
-					var x = parseInt(x),
-					    days = <?php echo $this->days?>;
-					return days[x];
-				},
-				min: -0.9,
-				max: 6.9,
-				tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-	// Entry per month
-	Flotr.draw(document.getElementById('statsEntryPerMonth'),
-		[{
-			data: <?php echo $this->repartitionMonth ?>,
-			bars: {horizontal: false, show: true}
-		}],
-		{
-			grid: {verticalLines: false},
-			xaxis: {noTicks: 12,
-				tickFormatter: function(x) {
-					var x = parseInt(x),
-					    months = <?php echo $this->months?>;
-					return months[(x - 1)];
-				},
-				min: 0.1,
-				max: 12.9,
-				tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-
-}
-initStats();
-</script>
+<script id="jsonRepartition" type="application/json"><?php
+echo htmlspecialchars(json_encode(array(
+	'repartitionHour' => $this->repartitionHour,
+	'repartitionDayOfWeek' => $this->repartitionDayOfWeek,
+	'days' => $this->days,
+	'repartitionMonth' => $this->repartitionMonth,
+	'months' => $this->months,
+), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES);
+?></script>
+<script src="../scripts/repartition.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/repartition.js'); ?>"></script>
diff --git a/p/scripts/repartition.js b/p/scripts/repartition.js
new file mode 100644
index 000000000..a391de2f2
--- /dev/null
+++ b/p/scripts/repartition.js
@@ -0,0 +1,72 @@
+"use strict";
+function initStats() {
+	if (!window.Flotr) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Flotr…');
+		}
+		window.setTimeout(initStats, 50);
+		return;
+	}
+	var jsonRepartition = document.getElementById('jsonRepartition'),
+		stats = JSON.parse(jsonRepartition.innerHTML);
+	jsonRepartition.outerHTML = '';
+	// Entry per hour
+	Flotr.draw(document.getElementById('statsEntryPerHour'),
+		[{
+			data: stats.repartitionHour,
+			bars: {horizontal: false, show: true}
+		}],
+		{
+			grid: {verticalLines: false},
+			xaxis: {noTicks: 23,
+				tickFormatter: function(x) {
+					var x = parseInt(x);
+					return x + 1;
+				},
+				min: -0.9,
+				max: 23.9,
+				tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+	// Entry per day of week
+	Flotr.draw(document.getElementById('statsEntryPerDayOfWeek'),
+		[{
+			data: stats.repartitionDayOfWeek,
+			bars: {horizontal: false, show: true}
+		}],
+		{
+			grid: {verticalLines: false},
+			xaxis: {noTicks: 6,
+				tickFormatter: function(x) {
+					var x = parseInt(x);
+					return stats.days[x];
+				},
+				min: -0.9,
+				max: 6.9,
+				tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+	// Entry per month
+	Flotr.draw(document.getElementById('statsEntryPerMonth'),
+		[{
+			data: stats.repartitionMonth,
+			bars: {horizontal: false, show: true}
+		}],
+		{
+			grid: {verticalLines: false},
+			xaxis: {noTicks: 12,
+				tickFormatter: function(x) {
+					var x = parseInt(x);
+					return stats.months[(x - 1)];
+				},
+				min: 0.1,
+				max: 12.9,
+				tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+
+}
+initStats();
diff --git a/p/scripts/stats.js b/p/scripts/stats.js
new file mode 100644
index 000000000..2e8ab6e27
--- /dev/null
+++ b/p/scripts/stats.js
@@ -0,0 +1,56 @@
+"use strict";
+function initStats() {
+	if (!window.Flotr) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Flotr…');
+		}
+		window.setTimeout(initStats, 50);
+		return;
+	}
+	var jsonStats = document.getElementById('jsonStats'),
+		stats = JSON.parse(jsonStats.innerHTML);
+	jsonStats.outerHTML = '';
+	// Entry per day
+	var avg = [];
+	for (var i = -31; i <= 0; i++) {
+		avg.push([i, stats.average]);
+	}
+	Flotr.draw(document.getElementById('statsEntryPerDay'),
+		[{
+			data: stats.dataCount,
+			bars: {horizontal: false, show: true}
+		},{
+			data: avg,
+			lines: {show: true},
+			label: stats.average,
+		}],
+		{
+			grid: {verticalLines: false},
+			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);}}
+		});
+	// Feed per category
+	Flotr.draw(document.getElementById('statsFeedPerCategory'),
+		stats.feedByCategory,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
+		});
+	// Entry per category
+	Flotr.draw(document.getElementById('statsEntryPerCategory'),
+		stats.entryByCategory,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
+		});
+}
+initStats();
-- 
cgit v1.2.3


From b4864149889a749042d344625d4ffbdbd3f8a3cc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 18:06:32 +0100
Subject: CSP for bookmarklet (subscription)

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/layout/aside_subscription.phtml | 2 +-
 p/scripts/main.js                   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index 8a54e2dc2..fa10d63e8 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -10,7 +10,7 @@
 	</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');})();">
+		<a class="bookmarkClick" 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('sub.menu.bookmark'); ?>
 		</a>
 	</li>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f07cdafd7..cfde5fd4e 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1245,6 +1245,12 @@ function init_configuration_alert() {
 	});
 }
 
+function init_subscription() {
+	$('body').on('click', '.bookmarkClick', function (e) {
+		return false;
+	});
+}
+
 function parseJsonVars() {
 	var jsonVars = document.getElementById('jsonVars'),
 		json = JSON.parse(jsonVars.innerHTML);
@@ -1281,6 +1287,7 @@ function init_all() {
 		init_notifs_html5();
 		window.setInterval(refreshUnreads, 120000);
 	} else {
+		init_subscription();
 		init_crypto_form();
 		init_share_observers();
 		init_remove_observers();
-- 
cgit v1.2.3


From cb913a3a76daf357ad36ca39c26b4aaf800211d2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 19:15:23 +0100
Subject: CSP for statistics and forms

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 CHANGELOG.md                       |  2 ++
 app/FreshRSS.php                   |  6 +++++-
 app/layout/aside_feed.phtml        |  2 +-
 app/layout/nav_menu.phtml          |  2 +-
 app/views/extension/index.phtml    |  2 +-
 app/views/feed/add.phtml           |  2 +-
 app/views/helpers/pagination.phtml |  2 +-
 app/views/stats/idle.phtml         |  2 +-
 app/views/stats/index.phtml        | 10 +++++-----
 app/views/stats/repartition.phtml  | 10 +++++-----
 app/views/subscription/index.phtml |  4 ++--
 p/scripts/main.js                  |  6 +++---
 p/themes/base-theme/template.css   |  8 ++++++++
 13 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f96839eb..7fc872040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2016-xx-xx FreshRSS 1.3.1-beta
 
+* Security
+	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
 * UI
 	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
 	* Updated to jQuery 2.2 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index a6ed2a306..62ea18d96 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -111,7 +111,11 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	public static function preLayout() {
-		header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
+		if (Minz_Request::controllerName() === 'stats') {
+			header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
+		} else {
+			header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+		}
 	}
 
 	private function loadNotifications() {
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 307db6af8..4e1903a7a 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -19,7 +19,7 @@
 	<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>
+	<form id="mark-read-aside" method="post" aria-hidden="true"></form>
 
 	<ul class="tree">
 		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 3a755b560..0f303beb8 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -79,7 +79,7 @@
 		);
 	?>
 
-	<form id="mark-read-menu" method="post" style="display: none"></form>
+	<form id="mark-read-menu" method="post" aria-hidden="true"></form>
 
 	<div class="stick" id="nav_menu_read_all">
 		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index f2d05028f..4b0d5ebeb 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -5,7 +5,7 @@
 
 	<h1><?php echo _t('admin.extensions.title'); ?></h1>
 
-	<form id="form-extension" method="post" style="display: none"></form>
+	<form id="form-extension" method="post" aria-hidden="true"></form>
 	<?php if (!empty($this->extension_list['system'])) { ?>
 	<h2><?php echo _t('admin.extensions.system'); ?></h2>
 	<?php
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 35f6fbb12..fd6d41b1d 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -56,7 +56,7 @@
 					<option value="nc"><?php echo _t('sub.category.new'); ?></option>
 				</select>
 
-				<span style="display: none;">
+				<span aria-hidden="true">
 					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('sub.category.new'); ?>" />
 				</span>
 			</div>
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index b20201c4b..7eca8c525 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -14,7 +14,7 @@
 	);
 ?>
 
-<form id="mark-read-pagination" method="post" style="display: none"></form>
+<form id="mark-read-pagination" method="post" aria-hidden="true"></form>
 
 <ul class="pagination">
 	<li class="item pager-next">
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 22117792d..11b7df8c4 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -18,7 +18,7 @@
 		<div class="stat">
 			<h2><?php echo _t('gen.date.' . $period); ?></h2>
 
-			<form id="form-delete" method="post" style="display: none"></form>
+			<form id="form-delete" method="post" aria-hidden="true"></form>
 
 			<?php foreach ($feeds as $feed) { ?>
 			<ul class="horizontal-list">
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index c11b88999..0a2fbdb10 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -66,18 +66,18 @@
 
 	<div class="stat">
 		<h2><?php echo _t('admin.stats.entry_per_day'); ?></h2>
-		<div id="statsEntryPerDay" style="height: 300px"></div>
+		<div id="statsEntryPerDay" class="statGraph"></div>
 	</div>
 
 	<div class="stat half">
 		<h2><?php echo _t('admin.stats.feed_per_category'); ?></h2>
-		<div id="statsFeedPerCategory" style="height: 300px"></div>
+		<div id="statsFeedPerCategory" class="statGraph"></div>
 		<div id="statsFeedPerCategoryLegend"></div>
-	</div><!--
+	</div>
 
-	--><div class="stat half">
+	<div class="stat half">
 		<h2><?php echo _t('admin.stats.entry_per_category'); ?></h2>
-		<div id="statsEntryPerCategory" style="height: 300px"></div>
+		<div id="statsEntryPerCategory" class="statGraph"></div>
 		<div id="statsEntryPerCategoryLegend"></div>
 	</div>
 </div>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 980b26a3d..ffb2c361e 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -48,17 +48,17 @@
 
 	<div class="stat">
 		<h2><?php echo _t('admin.stats.entry_per_hour', $this->averageHour); ?></h2>
-		<div id="statsEntryPerHour" style="height: 300px"></div>
+		<div id="statsEntryPerHour" class="statGraph"></div>
 	</div>
 
 	<div class="stat half">
 		<h2><?php echo _t('admin.stats.entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
-		<div id="statsEntryPerDayOfWeek" style="height: 300px"></div>
-	</div><!--
+		<div id="statsEntryPerDayOfWeek" class="statGraph"></div>
+	</div>
 
-	--><div class="stat half">
+	<div class="stat half">
 		<h2><?php echo _t('admin.stats.entry_per_month', $this->averageMonth); ?></h2>
-		<div id="statsEntryPerMonth" style="height: 300px"></div>
+		<div id="statsEntryPerMonth" class="statGraph"></div>
 	</div>
 </div>
 
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 2cfe3f33c..07cebf817 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -28,7 +28,7 @@
 						</select>
 					</li>
 
-					<li class="input" style="display:none">
+					<li class="input" aria-hidden="true">
 						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('sub.category.new'); ?>" />
 					</li>
 
@@ -62,7 +62,7 @@
 		</ul>
 	</div>
 
-	<form id="controller-category" method="post" style="display: none;"></form>
+	<form id="controller-category" method="post" aria-hidden="true"></form>
 
 	<?php
 		foreach ($this->categories as $cat) {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index cfde5fd4e..d62a6aff8 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -899,7 +899,7 @@ function refreshUnreads() {
 
 			if ((incUnreadsFeed(null, feed_id, nbUnreads - feed_unreads) || isAll) &&	//Update of current view?
 				(nbUnreads - feed_unreads > 0)) {
-				$('#new-article').show();
+				$('#new-article').attr('aria-hidden', 'false').show();
 				new_articles = true;
 			};
 		});
@@ -1122,10 +1122,10 @@ function init_feed_observers() {
 	$('select[id="category"]').on('change', function() {
 		var detail = $('#new_category_name').parent();
 		if ($(this).val() === 'nc') {
-			detail.show();
+			detail.attr('aria-hidden', 'false').show();
 			detail.find('input').focus();
 		} else {
-			detail.hide();
+			detail.attr('aria-hidden', 'true').hide();
 		}
 	});
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 17a43d3ed..8a12423be 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -110,6 +110,11 @@ td.numeric {
 
 /*=== COMPONENTS */
 /*===============*/
+
+[aria-hidden="true"] {
+	display: none;
+}
+
 /*=== Forms */
 .form-group::after {
 	content: "";
@@ -620,6 +625,9 @@ br + br + br {
 .stat > table {
 	width: 100%;
 }
+.statGraph {
+	height: 300px;
+}
 
 /*=== GLOBAL VIEW */
 /*================*/
-- 
cgit v1.2.3


From 38c2d671e3480b8e9fb38491797e44fdea317006 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 21:25:23 +0100
Subject: CSP different policies per controller

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php | 14 ++++++++++----
 app/install.php  |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 62ea18d96..bfbd7a6eb 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -111,10 +111,16 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	public static function preLayout() {
-		if (Minz_Request::controllerName() === 'stats') {
-			header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
-		} else {
-			header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+		switch (Minz_Request::controllerName()) {
+			case 'index':
+				header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+				break;
+			case 'stats':
+				header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
+				break;
+			default:
+				header("Content-Security-Policy: default-src 'self'");
+				break;
 		}
 	}
 
diff --git a/app/install.php b/app/install.php
index 03f6e2199..a4a888af2 100644
--- a/app/install.php
+++ b/app/install.php
@@ -2,6 +2,7 @@
 if (function_exists('opcache_reset')) {
 	opcache_reset();
 }
+header("Content-Security-Policy: default-src 'self'");
 
 define('BCRYPT_COST', 9);
 
-- 
cgit v1.2.3


From 83e58d375962f7bc1f30e34e2895836ddc8e80d1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 22:19:07 +0100
Subject: Experiment with forcing HTTPS for selected embed providers

YouTube, DailyMotion, Tumblr
https://github.com/FreshRSS/FreshRSS/issues/1083
---
 lib/SimplePie/SimplePie/Misc.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 9e7ac4fa8..1abfb3368 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -77,6 +77,15 @@ class SimplePie_Misc
 		return $time;
 	}
 
+	/**
+	 * Force HTTPS for selected Web sites
+	 * FreshRSS
+	 */
+	public static https_url($url)
+	{
+		return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', '//$1', $url);
+	}
+
 	public static function absolutize_url($relative, $base)
 	{
 		if (substr($relative, 0, 2) === '//')
@@ -88,7 +97,7 @@ class SimplePie_Misc
 		{
 			return false;
 		}
-		return $iri->get_uri();
+		return https_url($iri->get_uri());
 	}
 
 	/**
-- 
cgit v1.2.3


From bd0facbb739b7a6f90a6ff2bf7cc434bbda1cc95 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 22:42:30 +0100
Subject: HTTPS SimplePie experiment

Syntax bug
https://github.com/FreshRSS/FreshRSS/issues/1083
---
 lib/SimplePie/SimplePie/Misc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 1abfb3368..4df529f59 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -97,7 +97,7 @@ class SimplePie_Misc
 		{
 			return false;
 		}
-		return https_url($iri->get_uri());
+		return SimplePie_Misc::https_url($iri->get_uri());
 	}
 
 	/**
-- 
cgit v1.2.3


From 4a9a7404bcbcc15765ae5876dfb845a34917cba4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 22:45:54 +0100
Subject: Syntax error

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

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 4df529f59..98565608f 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -81,7 +81,7 @@ class SimplePie_Misc
 	 * Force HTTPS for selected Web sites
 	 * FreshRSS
 	 */
-	public static https_url($url)
+	public static function https_url($url)
 	{
 		return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', '//$1', $url);
 	}
-- 
cgit v1.2.3


From 74ef8d9b1514600b4e18c0bd2f8fdbb6d9f3826c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 22 Feb 2016 08:51:02 +0100
Subject: SimplePie force HTTPS, another approach

https://github.com/FreshRSS/FreshRSS/issues/1083
---
 lib/SimplePie/SimplePie/Misc.php     | 2 +-
 lib/SimplePie/SimplePie/Sanitize.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 98565608f..b13c70f4c 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -97,7 +97,7 @@ class SimplePie_Misc
 		{
 			return false;
 		}
-		return SimplePie_Misc::https_url($iri->get_uri());
+		return $iri->get_uri();
 	}
 
 	/**
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index a6863ec03..fc916a259 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -451,7 +451,8 @@ class SimplePie_Sanitize
 					if ($element->hasAttribute($attribute))
 					{
 						$value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
-						if ($value !== false)
+						$value = SimplePie_Misc::https_url($value);	//FreshRSS
+						if ($value)
 						{
 							$element->setAttribute($attribute, $value);
 						}
-- 
cgit v1.2.3


From 0f870e800bc8a9315d572c01f2423b6c124f495f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 22 Feb 2016 20:18:11 +0100
Subject: Avoid prototol-relative URLs

Protocol-relative URLs do not seem to work well with API / mobile apps
---
 lib/SimplePie/SimplePie/Misc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 98565608f..1505f775f 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -83,14 +83,14 @@ class SimplePie_Misc
 	 */
 	public static function https_url($url)
 	{
-		return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', '//$1', $url);
+		return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', 'https://$1', $url);
 	}
 
 	public static function absolutize_url($relative, $base)
 	{
 		if (substr($relative, 0, 2) === '//')
-		{//Allow protocol-relative URLs "//www.example.net" which will pick HTTP or HTTPS automatically
-			return $relative;
+		{//Protocol-relative URLs "//www.example.net"
+			return 'https:' . $relative;
 		}
 		$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
 		if ($iri === false)
-- 
cgit v1.2.3


From 05ba5bc569060edf88c7b2e284736dcca68249aa Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 22 Feb 2016 21:10:35 +0100
Subject: Do not log article updates

It seems to work well, and there are too many such updates.
BTW, we should have a verbose/insane log level.
---
 app/Controllers/feedController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 4ec661115..7294fe8f4 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -359,8 +359,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							//This entry already exists and is unchanged. TODO: Remove the test with the zero'ed hash in FreshRSS v1.3
 							$oldGuids[] = $entry->guid();
 						} else {	//This entry already exists but has been updated
-							Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
-								', old hash ' . $existingHash . ', new hash ' . $entry->hash());
+							//Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
+								//', old hash ' . $existingHash . ', new hash ' . $entry->hash());
 							//TODO: Make an updated/is_read policy by feed, in addition to the global one.
 							$entry->_isRead(FreshRSS_Context::$user_conf->mark_updated_article_unread ? false : null);	//Change is_read according to policy.
 							if (!$entryDAO->hasTransaction()) {
-- 
cgit v1.2.3


From 501d1c5a2ea051061cda7431e80b9f49d3cb51f9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 23 Feb 2016 21:47:10 +0100
Subject: jQuery 2.2.1

Fix bug on .position() used by FreshRSS
http://blog.jquery.com/2016/02/22/jquery-1-12-1-and-2-2-1-released/
---
 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 06ac26315..349030de9 100644
--- a/p/scripts/jquery.min.js
+++ b/p/scripts/jquery.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v2.2.0 | (c) jQuery Foundation | 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=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.0",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 e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.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()},push:g,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){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!k.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?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.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){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[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):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.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,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"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=ga(),z=ga(),A=ga(),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="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),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")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=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)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){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 fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(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 la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(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 oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.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]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);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"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' 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(".#.+[+~]")}),ia(function(a){var b=n.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=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.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===n||a.ownerDocument===v&&t(v,a)?-1:b===n||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,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!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 fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.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},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.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=fa.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=fa.selectors={cacheLength:50,createPseudo:ha,match:W,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(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===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]||fa.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]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.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(ba,ca).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=fa.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(P," ")+" ").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,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(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:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(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:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).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 Y.test(a.nodeName)},input:function(a){return X.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:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(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]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.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=R.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[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?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(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,k=[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(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(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 ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(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 va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(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=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(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=[ra(sa(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 va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.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(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.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(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(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}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=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},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(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(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==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(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};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=w.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.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.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.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(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 u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(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&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},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().progress(c.notify).done(c.resolve).fail(c.reject):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=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;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||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=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)K(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},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][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=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c}catch(e){}O.set(a,b,c);
-}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.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=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.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 N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.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=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={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,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return this;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.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"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.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)),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=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.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)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.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.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!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&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(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)>-1: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 detail 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,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&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)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},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?ga:ha):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={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&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}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,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=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.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])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(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 ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(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 K(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&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),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),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c.opener||(c=a),c.getComputedStyle(b)},Da=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},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),!l.pixelMarginRight()&&Ba.test(g)&&Aa.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 Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(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+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ca(b),i="border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Fa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Ba.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+Oa(b,c,e||(i?"border":"content"),f,h)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.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=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,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]=Ma(h)||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=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.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]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[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+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(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 Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.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},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.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?N.get(a,"olddisplay")||za(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],Ua.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?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(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 $a(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 _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),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:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),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.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,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(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.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(V).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=_a(this,n.extend({},a),f);(e||N.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=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.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=N.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(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("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(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=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(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(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(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);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)}}),ab={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=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(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){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.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 eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(void 0===a||"boolean"===c)&&(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\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(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){return n.trim(a.value)}},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)&&(l.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(n.valHooks.option.get(d),f)>-1)&&(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)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var hb=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!hb.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,hb.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}}),n.fn.extend({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}}),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)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var ib=a.location,jb=n.now(),kb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return(!c||c.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+b),c};var lb=/#.*$/,mb=/([?&])_=[^&]*/,nb=/^(.*?):[ \t]*([^\r\n]*)$/gm,ob=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,pb=/^(?:GET|HEAD)$/,qb=/^\/\//,rb={},sb={},tb="*/".concat("*"),ub=d.createElement("a");ub.href=ib.href;function vb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];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 wb(a,b,c,d){var e={},f=a===sb;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 xb(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 yb(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 zb(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:ib.href,type:"GET",isLocal:ob.test(ib.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":tb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},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?xb(xb(a,n.ajaxSettings),b):xb(n.ajaxSettings,a)},ajaxPrefilter:vb(rb),ajaxTransport:vb(sb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=nb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||ib.href)+"").replace(lb,"").replace(qb,ib.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=ub.protocol+"//"+ub.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),wb(rb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!pb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(kb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=mb.test(f)?f.replace(mb,"$1_="+jb++):f+(kb.test(f)?"&":"?")+"_="+jb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+tb+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=wb(sb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=yb(m,x,d)),u=zb(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,(b||!y)&&(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},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(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&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 n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(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!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Ab=/%20/g,Bb=/\[\]$/,Cb=/\r?\n/g,Db=/^(?:submit|button|image|reset|file)$/i,Eb=/^(?:input|select|textarea|keygen)/i;function Fb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Bb.test(a)?d(a,e):Fb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Fb(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)Fb(c,a[c],b,e);return d.join("&").replace(Ab,"+")},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")&&Eb.test(this.nodeName)&&!Db.test(a)&&(this.checked||!X.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(Cb,"\r\n")}}):{name:b.name,value:c.replace(Cb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Gb={0:200,1223:204},Hb=n.ajaxSettings.xhr();l.cors=!!Hb&&"withCredentials"in Hb,l.ajax=Hb=!!Hb,n.ajaxTransport(function(b){var c,d;return l.cors||Hb&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Gb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},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(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Ib=[],Jb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Ib.pop()||n.expando+"_"+jb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Jb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Jb.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(Jb,"$1"+e):b.jsonp!==!1&&(b.url+=(kb.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(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Ib.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),l.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||(l.createHTMLDocument?d.implementation.createHTMLDocument(""):d);var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Kb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Kb)return Kb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(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||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,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};function Lb(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,n.extend({},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)?(e=d.getBoundingClientRect(),c=Lb(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)-a.scrollTop(),d.left+=n.css(a[0],"borderLeftWidth",!0)-a.scrollLeft()),{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;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Lb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.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 K(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.extend({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)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Mb=a.jQuery,Nb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Nb),b&&a.jQuery===n&&(a.jQuery=Mb),n},b||(a.jQuery=a.$=n),n});
+/*! jQuery v2.2.1 | (c) jQuery Foundation | 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=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.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 e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.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()},push:g,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){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!k.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?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.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){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[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):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.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,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"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=ga(),z=ga(),A=ga(),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="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),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")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=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)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){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 fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(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 la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(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 oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.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]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);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"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' 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(".#.+[+~]")}),ia(function(a){var b=n.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=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.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===n||a.ownerDocument===v&&t(v,a)?-1:b===n||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,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!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 fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.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},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.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=fa.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=fa.selectors={cacheLength:50,createPseudo:ha,match:W,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(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===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]||fa.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]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.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(ba,ca).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=fa.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(P," ")+" ").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,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(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:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(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:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).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 Y.test(a.nodeName)},input:function(a){return X.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:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(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]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.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=R.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[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?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(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,k=[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(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(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 ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(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 va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(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=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(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=[ra(sa(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 va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.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(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.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(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(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}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=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},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(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(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==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(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};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=w.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.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.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.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(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 u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(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&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},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().progress(c.notify).done(c.resolve).fail(c.reject):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=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;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||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=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)K(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},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][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=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c}catch(e){}O.set(a,b,c);
+}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.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=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.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 N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.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=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={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,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.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"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.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)),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=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.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)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.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.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!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&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(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)>-1: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 detail 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,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&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)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},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?ga:ha):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={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&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}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,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=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(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 qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.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])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(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 ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(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 K(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&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),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),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Da=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},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Ba.test(g)&&Aa.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 Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(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+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ca(b),i="border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Fa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Ba.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+Oa(b,c,e||(i?"border":"content"),f,h)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.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=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,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]=Ma(h)||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=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.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]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[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+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(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 Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.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},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.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?N.get(a,"olddisplay")||za(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],Ua.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?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(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 $a(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 _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),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:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),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.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,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(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.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(V).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=_a(this,n.extend({},a),f);(e||N.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=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.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=N.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(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("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(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=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(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(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(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);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)}}),ab={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=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(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){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.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 eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(void 0===a||"boolean"===c)&&(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\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(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){return n.trim(a.value)}},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)&&(l.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(n.valHooks.option.get(d),f)>-1)&&(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)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var hb=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!hb.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,hb.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}}),n.fn.extend({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}}),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)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var ib=a.location,jb=n.now(),kb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return(!c||c.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+b),c};var lb=/#.*$/,mb=/([?&])_=[^&]*/,nb=/^(.*?):[ \t]*([^\r\n]*)$/gm,ob=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,pb=/^(?:GET|HEAD)$/,qb=/^\/\//,rb={},sb={},tb="*/".concat("*"),ub=d.createElement("a");ub.href=ib.href;function vb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];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 wb(a,b,c,d){var e={},f=a===sb;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 xb(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 yb(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 zb(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:ib.href,type:"GET",isLocal:ob.test(ib.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":tb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},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?xb(xb(a,n.ajaxSettings),b):xb(n.ajaxSettings,a)},ajaxPrefilter:vb(rb),ajaxTransport:vb(sb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=nb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||ib.href)+"").replace(lb,"").replace(qb,ib.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=ub.protocol+"//"+ub.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),wb(rb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!pb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(kb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=mb.test(f)?f.replace(mb,"$1_="+jb++):f+(kb.test(f)?"&":"?")+"_="+jb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+tb+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=wb(sb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=yb(m,x,d)),u=zb(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,(b||!y)&&(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},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(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&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 n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(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!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Ab=/%20/g,Bb=/\[\]$/,Cb=/\r?\n/g,Db=/^(?:submit|button|image|reset|file)$/i,Eb=/^(?:input|select|textarea|keygen)/i;function Fb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Bb.test(a)?d(a,e):Fb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Fb(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)Fb(c,a[c],b,e);return d.join("&").replace(Ab,"+")},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")&&Eb.test(this.nodeName)&&!Db.test(a)&&(this.checked||!X.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(Cb,"\r\n")}}):{name:b.name,value:c.replace(Cb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Gb={0:200,1223:204},Hb=n.ajaxSettings.xhr();l.cors=!!Hb&&"withCredentials"in Hb,l.ajax=Hb=!!Hb,n.ajaxTransport(function(b){var c,d;return l.cors||Hb&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Gb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},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(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Ib=[],Jb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Ib.pop()||n.expando+"_"+jb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Jb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Jb.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(Jb,"$1"+e):b.jsonp!==!1&&(b.url+=(kb.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(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Ib.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),l.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||(l.createHTMLDocument?d.implementation.createHTMLDocument(""):d);var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Kb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Kb)return Kb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(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||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,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};function Lb(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,n.extend({},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)?(e=d.getBoundingClientRect(),c=Lb(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;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Lb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.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 K(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.extend({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)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Mb=a.jQuery,Nb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Nb),b&&a.jQuery===n&&(a.jQuery=Mb),n},b||(a.jQuery=a.$=n),n});
-- 
cgit v1.2.3


From 9d4a4457587d04030118447847a5c99d9095b937 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 24 Feb 2016 21:08:24 +0100
Subject: Work in progress HTTPS

---
 data/force-https.txt             | 3 +++
 lib/SimplePie/SimplePie/Misc.php | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 data/force-https.txt

diff --git a/data/force-https.txt b/data/force-https.txt
new file mode 100644
index 000000000..3da802d01
--- /dev/null
+++ b/data/force-https.txt
@@ -0,0 +1,3 @@
+dailymotion.com
+tumblr.com
+youtube.com
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 4c9f8cff6..b9d74f894 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -83,7 +83,13 @@ class SimplePie_Misc
 	 */
 	public static function https_url($url)
 	{
-		return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', 'https://$1', $url);
+		if (strtolower(substr($url, 0, 7)) === 'http://')
+		{
+			$domain = parse_url($url, PHP_URL_HOST);
+			return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', 'https://$1', $url);
+			return substr_replace($url, 's', 4, 0);	//Add the 's' to HTTPS
+		}
+		return $url;
 	}
 
 	public static function absolutize_url($relative, $base)
-- 
cgit v1.2.3


From 9adbd2ba9bfe885a4ccf4ec6ad99929e89cf6fb6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 24 Feb 2016 21:16:21 +0100
Subject: json_decode fallback debug

https://github.com/FreshRSS/FreshRSS/issues/1092
---
 lib/lib_rss.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 7d92b6fd7..e74b26e3f 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -1,16 +1,16 @@
 <?php
 if (!function_exists('json_decode')) {
 	require_once('JSON.php');
-	function json_decode($var) {
-		$JSON = new Services_JSON;
-		return (array)($JSON->decode($var));
+	function json_decode($var, $assoc) {
+		$JSON = new Services_JSON($assoc ? SERVICES_JSON_LOOSE_TYPE : 0);
+		return $JSON->decode($var, $assoc);
 	}
 }
 
 if (!function_exists('json_encode')) {
 	require_once('JSON.php');
 	function json_encode($var) {
-		$JSON = new Services_JSON;
+		$JSON = new Services_JSON();
 		return $JSON->encodeUnsafe($var);
 	}
 }
-- 
cgit v1.2.3


From bd47d14a536fee657a3ba2f7cfba9921567356b2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 24 Feb 2016 21:20:37 +0100
Subject: json_decode fallback bug 2

---
 lib/lib_rss.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index e74b26e3f..a09960de0 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -1,9 +1,9 @@
 <?php
 if (!function_exists('json_decode')) {
 	require_once('JSON.php');
-	function json_decode($var, $assoc) {
+	function json_decode($var, $assoc = false) {
 		$JSON = new Services_JSON($assoc ? SERVICES_JSON_LOOSE_TYPE : 0);
-		return $JSON->decode($var, $assoc);
+		return $JSON->decode($var);
 	}
 }
 
-- 
cgit v1.2.3


From b501fd6514253d3f7e14e2f09421a614641d3e7f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 27 Feb 2016 14:53:03 +0100
Subject: PHP7 share bug

https://github.com/FreshRSS/FreshRSS/issues/1072
---
 app/Models/Share.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Models/Share.php b/app/Models/Share.php
index 2a05f2ee9..1c8a7e767 100644
--- a/app/Models/Share.php
+++ b/app/Models/Share.php
@@ -119,11 +119,9 @@ class FreshRSS_Share {
 		);
 
 		foreach ($options as $key => $value) {
-			if (!isset($available_options[$key])) {
-				continue;
+			if (isset($available_options[$key])) {
+				$this->{$available_options[$key]} = $value;
 			}
-
-			$this->$available_options[$key] = $value;
 		}
 	}
 
-- 
cgit v1.2.3


From c9d3d78340e062b9e2fe19c8c55b8bdc75392e63 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 27 Feb 2016 17:51:13 +0100
Subject: CSP manually refreshing feeds

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/Controllers/javascriptController.php |  2 +-
 app/views/javascript/actualize.phtml     | 69 ++++++--------------------------
 p/scripts/main.js                        | 44 +++++++++++++++++---
 3 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index e3ae3669e..00a7b5c38 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -6,7 +6,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 	}
 
 	public function actualizeAction() {
-		header('Content-Type: text/javascript; charset=UTF-8');
+		header('Content-Type: application/json; charset=UTF-8');
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
 	}
diff --git a/app/views/javascript/actualize.phtml b/app/views/javascript/actualize.phtml
index 454228909..3baabf748 100644
--- a/app/views/javascript/actualize.phtml
+++ b/app/views/javascript/actualize.phtml
@@ -1,56 +1,13 @@
-"use strict";
-var feeds = [<?php foreach ($this->feeds as $feed) { ?>{<?php
-	?>url: "<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'actualize', 'params' => array('id' => $feed->id(), 'ajax' => '1')), 'php'); ?>",<?php
-	?>title: "<?php echo $feed->name(); ?>"<?php
-?>},<?php } ?>],
-	feed_processed = 0,
-	feed_count = feeds.length;
-
-function initProgressBar(init) {
-	if (init) {
-		$("body").after("\<div id=\"actualizeProgress\" class=\"notification good\">\
-			<?php echo _t('feedback.sub.actualize'); ?><br /><span class=\"title\">/</span><br />\
-			<span class=\"progress\">0 / " + feed_count + "</span>\
-		</div>");
-	} else {
-		window.location.reload();
-	}
-}
-function updateProgressBar(i, title_feed) {
-	$("#actualizeProgress .progress").html(i + " / " + feed_count);
-	$("#actualizeProgress .title").html(title_feed);
-}
-
-function updateFeeds() {
-	if (feed_count === 0) {
-		openNotification("<?php echo _t('feedback.sub.feed.no_refresh'); ?>", "good");
-		ajax_loading = false;
-		return;
-	}
-	initProgressBar(true);
-
-	for (var i = 0; i < 10; i++) {
-		updateFeed();
-	}
-}
-
-function updateFeed() {
-	var feed = feeds.pop();
-	if (feed == undefined) {
-		return;
-	}
-
-	$.ajax({
-		type: 'POST',
-		url: feed['url'],
-	}).complete(function (data) {
-		feed_processed++;
-		updateProgressBar(feed_processed, feed['title']);
-
-		if (feed_processed === feed_count) {
-			initProgressBar(false);
-		} else {
-			updateFeed();
-		}
-	});
-}
+<?php
+$feeds = array();
+foreach ($this->feeds as $feed) {
+	$feeds[] = array(
+		'url' => Minz_Url::display(array('c' => 'feed', 'a' => 'actualize', 'params' => array('id' => $feed->id(), 'ajax' => '1')), 'php'),
+		'title' => $feed->name(),
+	);
+}
+echo json_encode(array(
+	'feeds' => $feeds,
+	'feedback_no_refresh' => _t('feedback.sub.feed.no_refresh'),
+	'feedback_actualize' => _t('feedback.sub.actualize'),
+));
diff --git a/p/scripts/main.js b/p/scripts/main.js
index d62a6aff8..51c8f4cbf 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -767,6 +767,31 @@ function init_nav_entries() {
 	});
 }
 
+// <actualize>
+var feed_processed = 0;
+
+function updateFeed(feeds, feeds_count) {
+	var feed = feeds.pop();
+	if (feed == undefined) {
+		return;
+	}
+
+	$.ajax({
+		type: 'POST',
+		url: feed['url'],
+	}).complete(function (data) {
+		feed_processed++;
+		$("#actualizeProgress .progress").html(feed_processed + " / " + feeds_count);
+		$("#actualizeProgress .title").html(feed['title']);
+
+		if (feed_processed === feeds_count) {
+			window.location.reload();
+		} else {
+			updateFeed(feeds, feeds_count);
+		}
+	});
+}
+
 function init_actualize() {
 	var auto = false;
 
@@ -777,14 +802,23 @@ function init_actualize() {
 
 		ajax_loading = true;
 
-		$.getScript('./?c=javascript&a=actualize').done(function () {
-			if (auto && feed_count < 1) {
+		$.getJSON('./?c=javascript&a=actualize').done(function (data) {
+			if (auto && data.feeds.length < 1) {
 				auto = false;
 				ajax_loading = false;
 				return false;
 			}
-
-			updateFeeds();
+			if (data.feeds.length === 0) {
+				openNotification(data.feedback_no_refresh, "good");
+				ajax_loading = false;
+				return;
+			}
+			//Progress bar
+			var feeds_count = data.feeds.length;
+			$('body').after('<div id="actualizeProgress" class="notification good">' + data.feedback_actualize + '<br /><span class="title">/</span><br /><span class="progress">0 / ' + feeds_count + '</span></div>');
+			for (var i = 10; i > 0; i--) {
+				updateFeed(data.feeds, feeds_count);
+			}
 		});
 
 		return false;
@@ -795,7 +829,7 @@ function init_actualize() {
 		$("#actualize").click();
 	}
 }
-
+// </actualize>
 
 // <notification>
 var notification = null,
-- 
cgit v1.2.3


From ffe38c930b864ccd8034445e21297c996fdc258e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 27 Feb 2016 22:40:03 +0100
Subject: JS formatting

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

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 51c8f4cbf..f1b82900e 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -815,7 +815,9 @@ function init_actualize() {
 			}
 			//Progress bar
 			var feeds_count = data.feeds.length;
-			$('body').after('<div id="actualizeProgress" class="notification good">' + data.feedback_actualize + '<br /><span class="title">/</span><br /><span class="progress">0 / ' + feeds_count + '</span></div>');
+			$('body').after('<div id="actualizeProgress" class="notification good">' + data.feedback_actualize +
+				'<br /><span class="title">/</span><br /><span class="progress">0 / ' + feeds_count +
+				'</span></div>');
 			for (var i = 10; i > 0; i--) {
 				updateFeed(data.feeds, feeds_count);
 			}
-- 
cgit v1.2.3


From 995cf58d249c6a2ddfd042cc5b509914295c882f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2016 00:08:57 +0100
Subject: CSP bug in install script

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/install.php      | 2 +-
 p/scripts/install.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/install.php b/app/install.php
index a4a888af2..80e85354d 100644
--- a/app/install.php
+++ b/app/install.php
@@ -829,7 +829,6 @@ case 5:
 		<title><?php echo _t('install.title'); ?></title>
 		<link rel="stylesheet" href="../themes/base-theme/template.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/base-theme/template.css'); ?>" />
 		<link rel="stylesheet" href="../themes/Origine/origine.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/Origine/origine.css'); ?>" />
-		<script src="../scripts/install.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/install.js'); ?>"></script>
 		<meta name="robots" content="noindex,nofollow" />
 	</head>
 	<body>
@@ -877,5 +876,6 @@ case 5:
 		?>
 	</div>
 </div>
+	<script src="../scripts/install.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/install.js'); ?>"></script>
 	</body>
 </html>
diff --git a/p/scripts/install.js b/p/scripts/install.js
index 52d8bf8e0..9a49e6031 100644
--- a/p/scripts/install.js
+++ b/p/scripts/install.js
@@ -42,7 +42,7 @@ function auth_type_change() {
 var auth_type = document.getElementById('auth_type');
 if (auth_type) {
 	auth_type_change();
-	auth_type_change.addEventListener('change', auth_type_change);
+	auth_type.addEventListener('change', auth_type_change);
 }
 
 function mySqlShowHide() {
-- 
cgit v1.2.3


From be3b2e3327df2bdc831d477ab7517132dae6c4e6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2016 12:36:55 +0100
Subject: Readme 1.3.1-beta

---
 CHANGELOG.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fc872040..7efb05aae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,26 @@
 # Changelog
 
-## 2016-xx-xx FreshRSS 1.3.1-beta
+## 2016-03-xx FreshRSS 1.3.1-beta
 
 * Security
 	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
+* Features
+	* Add sharing with "Journal du Hacker" [#1056](https://github.com/FreshRSS/FreshRSS/pull/1056)
 * UI
-	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
-	* Updated to jQuery 2.2 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
+	* Updated to jQuery 2.2.1 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050), [#1091](https://github.com/FreshRSS/FreshRSS/pull/1091)
 * I18n
 	* Turkish [#1073](https://github.com/FreshRSS/FreshRSS/issues/1073)
+* Bug fixing
+	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
+	* Fixed sharing bug with PHP7 [#1072](https://github.com/FreshRSS/FreshRSS/issues/1072)
+	* Fixed fall-back when php-json is not installed [#1092](https://github.com/FreshRSS/FreshRSS/issues/1092)
+* API
+	* Possibility to show only read items [#1035](https://github.com/FreshRSS/FreshRSS/pull/1035)
+* Misc.
+	* Filters `<img />` attributes `srcset` and `sizes` [#1077](https://github.com/FreshRSS/FreshRSS/issues/1077), [#1086](https://github.com/FreshRSS/FreshRSS/pull/1086)
+	* Implement PubSubHubbub unsubscribe responses [#1058](https://github.com/FreshRSS/FreshRSS/issues/1058)
+	* Restored some compatibility with PHP 5.2 [#1055](https://github.com/FreshRSS/FreshRSS/issues/1055)
+	* Updated the sharing with Movim [#1030](https://github.com/FreshRSS/FreshRSS/pull/1030)
 
 
 ## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta
-- 
cgit v1.2.3


From 6a5451116d96f67b73b72a52f2b6f59e25a39f06 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2016 13:40:15 +0100
Subject: Readme: Referer, DOM / XML

Add note about Referer https://github.com/FreshRSS/FreshRSS/issues/565
Add note about DOM / XML extensions
https://github.com/FreshRSS/FreshRSS/issues/1094
---
 README.fr.md | 8 +++++---
 README.md    | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 729dc9826..794b1a9e1 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -31,14 +31,16 @@ Nous sommes une communauté amicale.
 
 # Prérequis
 * Serveur modeste, par exemple sous Linux ou Windows
-	* Fonctionne même sur un Raspberry Pi avec des temps de réponse < 1s (testé sur 150 flux, 22k articles, soit 32Mo de données partiellement compressées)
+	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.2.1+ (PHP 5.3.7+ recommandé, et PHP 5.5+ pour les performances) (support bêta de PHP 7 avec encore meilleures performances)
 	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
-	* Recommandés : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
+	* Recommandés : [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
+	* Inclus par défaut : [DOM](http://php.net/dom), [XML](http://php.net/xml)…
 * MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
 * Un navigateur Web récent tel Firefox, Chrome, Opera, Safari. [Internet Explorer ne fonctionne plus, mais ce sera corrigé](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Fonctionne aussi sur mobile
+* L’entête HTTP `Referer` ne doit pas être désactivé pour pouvoir utiliser le formulaire de connexion
 
 ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
 
@@ -58,7 +60,7 @@ sudo a2enmod headers expires rewrite ssl
 # (optionnel) Si vous voulez un serveur de base de données MySQL
 sudo apt-get install mysql-server mysql-client php5-mysql
 # Composants principaux (git est optionnel si vous déployez manuellement les fichiers d’installation)
-sudo apt-get install git php5 php5-curl php5-gd php5-intl php5-json php5-gmp php5-sqlite
+sudo apt-get install git php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
 # Redémarrage du serveur Web
 sudo service apache2 restart
 
diff --git a/README.md b/README.md
index a105dd4ca..728204a38 100644
--- a/README.md
+++ b/README.md
@@ -31,14 +31,16 @@ We are a friendly community.
 
 # Requirements
 * Light server running Linux or Windows
-	* It even works on Raspberry Pi with response time under a second (tested with 150 feeds, 22k articles, or 32Mo of compressed data)
+	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
 * PHP 5.2.1+ (PHP 5.3.7+ recommended, and PHP 5.5+ for performance) (beta support for PHP 7 with even higher performance)
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
-	* Recommended extensions: [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
+	* Recommended extensions: [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
+	* Enabled by default: [DOM](http://php.net/dom), [XML](http://php.net/xml)…
 * MySQL 5.0.3+ (recommended) or SQLite 3.7.4+
 * A recent browser like Firefox, Chrome, Opera, Safari. [Internet Explorer currently not supported, but support will come back](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Works on mobile
+* The browser HTTP `Referer` header must not be disabled when using the form login method
 
 ![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
 
@@ -58,7 +60,7 @@ sudo a2enmod headers expires rewrite ssl
 # (Optional) If you want a MySQL database server
 sudo apt-get install mysql-server mysql-client php5-mysql
 # Main components (git is optional if you manually download the installation files)
-sudo apt-get install git php5 php5-curl php5-gd php5-intl php5-json php5-gmp php5-sqlite
+sudo apt-get install git php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
 # Restart Web server
 sudo service apache2 restart
 
-- 
cgit v1.2.3


From 6b19872b1a95113aa491626a64d4c3ff02e2ee00 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2016 14:07:21 +0100
Subject: Install check XML / JSON

https://github.com/FreshRSS/FreshRSS/issues/1094
https://github.com/FreshRSS/FreshRSS/issues/1092
---
 app/i18n/cz/install.php | 10 +++++++++-
 app/i18n/de/install.php | 10 +++++++++-
 app/i18n/en/install.php | 10 +++++++++-
 app/i18n/fr/install.php | 10 +++++++++-
 app/i18n/it/install.php | 10 +++++++++-
 app/i18n/nl/install.php | 10 +++++++++-
 app/i18n/tr/install.php | 10 +++++++++-
 app/install.php         | 18 +++++++++++++++++-
 8 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index a8bc62909..969b69271 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Oprávnění adresáře data jsou v pořádku.',
 		),
 		'dom' => array(
-			'nok' => 'Nemáte požadovanou knihovnu pro procházení DOM (balíček php-xml).',
+			'nok' => 'Nemáte požadovanou knihovnu pro procházení DOM.',
 			'ok' => 'Máte požadovanou knihovnu pro procházení DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Zkontrolujte prosím že neměníte HTTP REFERER.',
 			'ok' => 'Váš HTTP REFERER je znám a odpovídá Vašemu serveru.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
 			'ok' => 'Máte framework Minz.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/users</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
 			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Obecná nastavení',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 9bada0869..2da744cfb 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Die 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).',
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern.',
 			'ok' => 'Sie haben die benötigte Bibliothek um DOM zu durchstöbern.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Bitte stellen Sie sicher, dass Sie Ihren HTTP REFERER nicht abändern.',
 			'ok' => 'Ihr HTTP REFERER ist bekannt und entspricht Ihrem Server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Ihnen fehlt das Minz-Framework.',
 			'ok' => 'Sie haben das Minz-Framework.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/users</em>. Der HTTP-Server muss Schreibrechte besitzen.',
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Allgemeine Konfiguration',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index b94fbc299..4b5bbc62e 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Permissions on data directory are good.',
 		),
 		'dom' => array(
-			'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+			'nok' => 'You lack a required library to browse the DOM.',
 			'ok' => 'You have the required library to browse the DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Please check that you are not altering your HTTP REFERER.',
 			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'You lack the Minz framework.',
 			'ok' => 'You have the Minz framework.',
@@ -86,6 +90,10 @@ return 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.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'General configuration',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 0401e1bbd..91dfbbb09 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -51,7 +51,7 @@ return array(
 			'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).',
+			'nok' => 'Il manque une librairie pour parcourir le DOM.',
 			'ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ 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.',
 		),
+		'json' => array(
+			'nok' => 'Il manque une librairie recommandée pour JSON.',
+			'ok' => 'Vouz disposez de la librairie recommandée pour JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Vous ne disposez pas de la librairie Minz.',
 			'ok' => 'Vous disposez du framework Minz',
@@ -86,6 +90,10 @@ return 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.',
 		),
+		'xml' => array(
+			'nok' => 'Il manque une librairie requise pour XML.',
+			'ok' => 'Vouz disposez de la librairie requise pour XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Configuration générale',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index 3ad22c5e9..8f5300bd5 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'I permessi sulla cartella data sono corretti.',
 		),
 		'dom' => array(
-			'nok' => 'Manca una libreria richiesta per leggere DOM (pacchetto php-xml).',
+			'nok' => 'Manca una libreria richiesta per leggere DOM.',
 			'ok' => 'Libreria richiesta per leggere DOM presente.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Per favore verifica che non stai alterando il tuo HTTP REFERER.',
 			'ok' => 'Il tuo HTTP REFERER riconosciuto corrisponde al tuo server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Manca il framework Minz.',
 			'ok' => 'Framework Minz presente.',
@@ -87,6 +91,10 @@ return array(
 			'nok' => 'Verifica i permessi sulla cartella <em>./data/users</em>. Il server HTTP deve avere i permessi per scriverci dentro',
 			'ok' => 'I permessi sulla cartella users sono corretti.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Configurazioni generali',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index e788261ea..3c44f7581 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Permissies van de data map zijn goed.',
 		),
 		'dom' => array(
-			'nok' => 'U mist een benodigde bibliotheek om te bladeren in de DOM (php-xml package).',
+			'nok' => 'U mist een benodigde bibliotheek om te bladeren in de DOM.',
 			'ok' => 'U hebt de benodigde bibliotheek om te bladeren in de DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Controleer a.u.b. dat u niet uw HTTP REFERER wijzigd.',
 			'ok' => 'Uw HTTP REFERER is bekend en komt overeen met uw server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'U mist het Minz framework.',
 			'ok' => 'U hebt het Minz framework.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Controleer permissies van de <em>./data/users</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
 			'ok' => 'Permissies van de users map zijn goed.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Algemene configuratie',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 96c16931a..d4c7c4cd5 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Veri klasörü yetkileri sorunsuz.',
 		),
 		'dom' => array(
-			'nok' => 'DOM kütüpbanesi eksik (php-xml package).',
+			'nok' => 'DOM kütüpbanesi eksik.',
 			'ok' => 'DOM kütüphanesi sorunsuz.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Lütfen HTTP REFERER değiştirmediğinize emin olun.',
 			'ok' => 'HTTP REFERER ve sunucunuz arası iletişim sorunsuz.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Minz framework eksik.',
 			'ok' => 'Minz framework sorunsuz.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => '<em>./data/users</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
 			'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Genel yapılandırma',
diff --git a/app/install.php b/app/install.php
index 80e85354d..b47effc84 100644
--- a/app/install.php
+++ b/app/install.php
@@ -318,6 +318,8 @@ function checkStep1() {
 	$pcre = extension_loaded('pcre');
 	$ctype = extension_loaded('ctype');
 	$dom = class_exists('DOMDocument');
+	$xml = function_exists('xml_parser_create');
+	$json = function_exists('json_encode');
 	$data = DATA_PATH && is_writable(DATA_PATH);
 	$cache = CACHE_PATH && is_writable(CACHE_PATH);
 	$users = USERS_PATH && is_writable(USERS_PATH);
@@ -335,13 +337,15 @@ function checkStep1() {
 		'pcre' => $pcre ? 'ok' : 'ko',
 		'ctype' => $ctype ? 'ok' : 'ko',
 		'dom' => $dom ? 'ok' : 'ko',
+		'xml' => $xml ? 'ok' : 'ko',
+		'json' => $json ? 'ok' : 'ko',
 		'data' => $data ? 'ok' : 'ko',
 		'cache' => $cache ? '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 &&
+		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
 		         $data && $cache && $users && $favicons && $persona && $http_referer ?
 		         'ok' : 'ko'
 	);
@@ -554,6 +558,12 @@ function printStep1() {
 	<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['json'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.json.ok'); ?></p>
+	<?php } else { ?>
+	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.json.nok'); ?></p>
+	<?php } ?>
+
 	<?php if ($res['pcre'] == 'ok') { ?>
 	<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 { ?>
@@ -572,6 +582,12 @@ function printStep1() {
 	<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['xml'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.xml.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.xml.nok'); ?></p>
+	<?php } ?>
+
 	<?php if ($res['data'] == 'ok') { ?>
 	<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 { ?>
-- 
cgit v1.2.3


From 9711f02db75006d622d75142d46c3c8d714c957f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2016 21:34:54 +0100
Subject: SimplePie Force HTTPS custom list domains

Load from data/force-https.default.txt and data/force-https.txt
Efficient tree structure to search the domains
https://github.com/FreshRSS/FreshRSS/pull/1087
---
 data/.gitignore                      |  1 +
 data/force-https.default.txt         |  4 ++
 data/force-https.txt                 |  3 --
 lib/SimplePie/SimplePie.php          | 14 ++++++
 lib/SimplePie/SimplePie/Misc.php     | 15 -------
 lib/SimplePie/SimplePie/Sanitize.php | 85 +++++++++++++++++++++++++++++++++++-
 lib/lib_rss.php                      | 10 +++++
 7 files changed, 113 insertions(+), 19 deletions(-)
 create mode 100644 data/force-https.default.txt
 delete mode 100644 data/force-https.txt

diff --git a/data/.gitignore b/data/.gitignore
index 20364e266..c2ed350a6 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -7,3 +7,4 @@ no-cache.txt
 *.lock.txt
 last_update.txt
 update.php
+force-https.txt
diff --git a/data/force-https.default.txt b/data/force-https.default.txt
new file mode 100644
index 000000000..a1bddd549
--- /dev/null
+++ b/data/force-https.default.txt
@@ -0,0 +1,4 @@
+dailymotion.com
+feedburner.com
+tumblr.com
+youtube.com
diff --git a/data/force-https.txt b/data/force-https.txt
deleted file mode 100644
index 3da802d01..000000000
--- a/data/force-https.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-dailymotion.com
-tumblr.com
-youtube.com
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 6c0962a9f..61bad4e9d 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1123,6 +1123,7 @@ class SimplePie
 			$this->strip_attributes(false);
 			$this->add_attributes(false);
 			$this->set_image_handler(false);
+			$this->set_https_domains(array());
 		}
 	}
 
@@ -1233,6 +1234,19 @@ class SimplePie
 		$this->sanitize->set_url_replacements($element_attribute);
 	}
 
+	/**
+	 * Set the list of domains for which force HTTPS.
+	 * @see SimplePie_Misc::https_url()
+	 * FreshRSS
+	 */
+	public function set_https_domains($domains = array())
+	{
+		if (is_array($domains))
+		{
+			$this->sanitize->set_https_domains($domains);
+		}
+	}
+
 	/**
 	 * Set the handler to enable the display of cached images.
 	 *
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index b9d74f894..2d154cbcb 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -77,21 +77,6 @@ class SimplePie_Misc
 		return $time;
 	}
 
-	/**
-	 * Force HTTPS for selected Web sites
-	 * FreshRSS
-	 */
-	public static function https_url($url)
-	{
-		if (strtolower(substr($url, 0, 7)) === 'http://')
-		{
-			$domain = parse_url($url, PHP_URL_HOST);
-			return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', 'https://$1', $url);
-			return substr_replace($url, 's', 4, 0);	//Add the 's' to HTTPS
-		}
-		return $url;
-	}
-
 	public static function absolutize_url($relative, $base)
 	{
 		if (substr($relative, 0, 2) === '//')
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index fc916a259..b37aeec3d 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -73,6 +73,14 @@ class SimplePie_Sanitize
 	var $force_fsockopen = false;
 	var $replace_url_attributes = null;
 
+	/**
+	 * List of domains for which force HTTPS.
+	 * @see SimplePie_Misc::https_url()
+	 * Array is tree split at DNS levels. Example array('biz' => true, 'com' => array('example' => true), 'example' => array('test') => array('www' => true));
+	 * FreshRSS
+	 */
+	var $https_domains = array('com' => array('youtube' => true));
+
 	public function __construct()
 	{
 		// Set defaults
@@ -242,6 +250,81 @@ class SimplePie_Sanitize
 		$this->replace_url_attributes = (array) $element_attribute;
 	}
 
+	/**
+	 * Set the list of domains for which force HTTPS.
+	 * @see SimplePie_Misc::https_url()
+	 * Example array('biz', 'example.com', 'example.org', 'www.example.net');
+	 * FreshRSS
+	 */
+	public function set_https_domains($domains)
+	{
+		$this->https_domains = array();
+		foreach ($domains as $domain)
+		{
+			$domain = trim($domain, ". \t\n\r\0\x0B");
+			$segments = array_reverse(explode('.', $domain));
+			if (count($segments) > 0)
+			{
+				$node =& $this->https_domains;
+				foreach ($segments as $segment)
+				{//Build a tree
+					if ($node === true)
+					{
+						break;
+					}
+					if (!isset($node[$segment]))
+					{
+						$node[$segment] = array();
+					}
+					$node =& $node[$segment];
+				}
+				$node = true;
+			}
+		}
+	}
+
+	/**
+	 * Check if the domain is in the list of forced HTTPS
+	 * FreshRSS
+	 */
+	protected function is_https_domain($domain)
+	{
+		$domain = trim($domain, '. ');
+		$segments = array_reverse(explode('.', $domain));
+		if (count($segments) > 0)
+		{
+			$node =& $this->https_domains;
+			foreach ($segments as $segment)
+			{//Explore the tree
+				if ($node === true)
+				{
+					return true;
+				}
+				if (isset($node[$segment]))
+				{
+					$node =& $node[$segment];
+				}
+				else
+				{
+					break;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Force HTTPS for selected Web sites
+	 * FreshRSS
+	 */
+	protected function https_url($url)
+	{
+		return (strtolower(substr($url, 0, 7)) === 'http://') &&
+			$this->is_https_domain(parse_url($url, PHP_URL_HOST)) ?
+			substr_replace($url, 's', 4, 0) :	//Add the 's' to HTTPS
+			$url;
+	}
+
 	public function sanitize($data, $type, $base = '')
 	{
 		$data = trim($data);
@@ -451,7 +534,7 @@ class SimplePie_Sanitize
 					if ($element->hasAttribute($attribute))
 					{
 						$value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
-						$value = SimplePie_Misc::https_url($value);	//FreshRSS
+						$value = $this->https_url($value);	//FreshRSS
 						if ($value)
 						{
 							$element->setAttribute($attribute, $value);
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index b0189c162..5092982aa 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -238,6 +238,16 @@ function customSimplePie() {
 			'src',
 		),
 	));
+	$https_domains = array();
+	$force = @file(DATA_PATH . '/force-https.default.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+	if (is_array($force)) {
+		$https_domains = array_merge($https_domains, $force);
+	}
+	$force = @file(DATA_PATH . '/force-https.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+	if (is_array($force)) {
+		$https_domains = array_merge($https_domains, $force);
+	}
+	$simplePie->set_https_domains($https_domains);
 	return $simplePie;
 }
 
-- 
cgit v1.2.3


From d344da59fdd2f818f53c6b4aab4ded4a9336851c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 29 Feb 2016 17:09:44 +0100
Subject: HTTPS search tree: simplify code

https://github.com/FreshRSS/FreshRSS/issues/1083
---
 data/force-https.default.txt         |  2 ++
 lib/SimplePie/SimplePie/Sanitize.php | 58 ++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/data/force-https.default.txt b/data/force-https.default.txt
index a1bddd549..668a7c0e8 100644
--- a/data/force-https.default.txt
+++ b/data/force-https.default.txt
@@ -1,4 +1,6 @@
 dailymotion.com
 feedburner.com
+gstatic.com
 tumblr.com
+wordpress.com
 youtube.com
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index b37aeec3d..f656909a0 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -263,23 +263,20 @@ class SimplePie_Sanitize
 		{
 			$domain = trim($domain, ". \t\n\r\0\x0B");
 			$segments = array_reverse(explode('.', $domain));
-			if (count($segments) > 0)
-			{
-				$node =& $this->https_domains;
-				foreach ($segments as $segment)
-				{//Build a tree
-					if ($node === true)
-					{
-						break;
-					}
-					if (!isset($node[$segment]))
-					{
-						$node[$segment] = array();
-					}
-					$node =& $node[$segment];
+			$node =& $this->https_domains;
+			foreach ($segments as $segment)
+			{//Build a tree
+				if ($node === true)
+				{
+					break;
+				}
+				if (!isset($node[$segment]))
+				{
+					$node[$segment] = array();
 				}
-				$node = true;
+				$node =& $node[$segment];
 			}
+			$node = true;
 		}
 	}
 
@@ -291,23 +288,20 @@ class SimplePie_Sanitize
 	{
 		$domain = trim($domain, '. ');
 		$segments = array_reverse(explode('.', $domain));
-		if (count($segments) > 0)
-		{
-			$node =& $this->https_domains;
-			foreach ($segments as $segment)
-			{//Explore the tree
-				if ($node === true)
-				{
-					return true;
-				}
-				if (isset($node[$segment]))
-				{
-					$node =& $node[$segment];
-				}
-				else
-				{
-					break;
-				}
+		$node =& $this->https_domains;
+		foreach ($segments as $segment)
+		{//Explore the tree
+			if ($node === true)
+			{
+				return true;
+			}
+			if (isset($node[$segment]))
+			{
+				$node =& $node[$segment];
+			}
+			else
+			{
+				break;
 			}
 		}
 		return false;
-- 
cgit v1.2.3


From 685c0ad2f8a4f6e854240d3a11415bcd62157ca4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 29 Feb 2016 17:20:23 +0100
Subject: SimplePie HTTPS updated comments

https://github.com/FreshRSS/FreshRSS/issues/1083
---
 lib/SimplePie/SimplePie.php          | 2 +-
 lib/SimplePie/SimplePie/Sanitize.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 61bad4e9d..a84f6dab3 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1236,7 +1236,7 @@ class SimplePie
 
 	/**
 	 * Set the list of domains for which force HTTPS.
-	 * @see SimplePie_Misc::https_url()
+	 * @see SimplePie_Sanitize::set_https_domains()
 	 * FreshRSS
 	 */
 	public function set_https_domains($domains = array())
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index f656909a0..09294344e 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -75,11 +75,12 @@ class SimplePie_Sanitize
 
 	/**
 	 * List of domains for which force HTTPS.
-	 * @see SimplePie_Misc::https_url()
-	 * Array is tree split at DNS levels. Example array('biz' => true, 'com' => array('example' => true), 'example' => array('test') => array('www' => true));
+	 * @see SimplePie_Sanitize::set_https_domains()
+	 * Array is tree split at DNS levels. Example:
+	 * array('biz' => true, 'com' => array('example' => true), 'net' => array('example') => array('www' => true))
 	 * FreshRSS
 	 */
-	var $https_domains = array('com' => array('youtube' => true));
+	var $https_domains = array('com' => array('dailymotion' => true, 'youtube' => true));
 
 	public function __construct()
 	{
-- 
cgit v1.2.3


From eee3a90a5077ee894836c81a98b78263a8c8976f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 29 Feb 2016 18:41:58 +0100
Subject: Readme force HTTPS

https://github.com/FreshRSS/FreshRSS/issues/1083
---
 CHANGELOG.md                 | 4 +++-
 data/force-https.default.txt | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7efb05aae..096c930d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,9 @@
 * Security
 	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
 * Features
-	* Add sharing with "Journal du Hacker" [#1056](https://github.com/FreshRSS/FreshRSS/pull/1056)
+	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
+		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
+	* Add sharing with “Journal du Hacker” [#1056](https://github.com/FreshRSS/FreshRSS/pull/1056)
 * UI
 	* Updated to jQuery 2.2.1 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050), [#1091](https://github.com/FreshRSS/FreshRSS/pull/1091)
 * I18n
diff --git a/data/force-https.default.txt b/data/force-https.default.txt
index 668a7c0e8..044620098 100644
--- a/data/force-https.default.txt
+++ b/data/force-https.default.txt
@@ -1,5 +1,6 @@
 dailymotion.com
 feedburner.com
+gravatar.com
 gstatic.com
 tumblr.com
 wordpress.com
-- 
cgit v1.2.3


From 0eef625b6d3e18d6545485d33f55865a4d6d1e3b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 29 Feb 2016 20:38:21 +0100
Subject: SimplePie force HTTPS for enclosures

https://github.com/FreshRSS/FreshRSS/issues/1083
https://github.com/FreshRSS/FreshRSS/pull/1087
---
 lib/SimplePie/SimplePie/Item.php     | 1 +
 lib/SimplePie/SimplePie/Sanitize.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Item.php b/lib/SimplePie/SimplePie/Item.php
index 27e93456e..19ba7c8f4 100644
--- a/lib/SimplePie/SimplePie/Item.php
+++ b/lib/SimplePie/SimplePie/Item.php
@@ -2877,6 +2877,7 @@ class SimplePie_Item
 					$width = null;
 
 					$url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0]));
+					$url = $this->feed->sanitize->https_url($url);	//FreshRSS
 					if (isset($enclosure[0]['attribs']['']['type']))
 					{
 						$type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index 09294344e..021d38539 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -312,7 +312,7 @@ class SimplePie_Sanitize
 	 * Force HTTPS for selected Web sites
 	 * FreshRSS
 	 */
-	protected function https_url($url)
+	public function https_url($url)
 	{
 		return (strtolower(substr($url, 0, 7)) === 'http://') &&
 			$this->is_https_domain(parse_url($url, PHP_URL_HOST)) ?
-- 
cgit v1.2.3


From c1de11f17d9103d33ddfb5cbb1d2ef35762cc57c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Mar 2016 19:14:26 +0100
Subject: SimplePie force HTTPS bug with sub-domains

https://github.com/FreshRSS/FreshRSS/issues/1083
---
 lib/SimplePie/SimplePie/Sanitize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index 021d38539..6f61fedb4 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -305,7 +305,7 @@ class SimplePie_Sanitize
 				break;
 			}
 		}
-		return false;
+		return $node === true;
 	}
 
 	/**
-- 
cgit v1.2.3


From 9e2e5fd594bb7c03aa3d7290b93930593accb03c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Mar 2016 19:48:52 +0100
Subject: SimplePie force HTTPS simplifie code

https://github.com/FreshRSS/FreshRSS/issues/1083
https://github.com/FreshRSS/FreshRSS/pull/1087
---
 lib/SimplePie/SimplePie/Sanitize.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index 6f61fedb4..bdc601100 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -292,10 +292,6 @@ class SimplePie_Sanitize
 		$node =& $this->https_domains;
 		foreach ($segments as $segment)
 		{//Explore the tree
-			if ($node === true)
-			{
-				return true;
-			}
 			if (isset($node[$segment]))
 			{
 				$node =& $node[$segment];
-- 
cgit v1.2.3


From cbac2afd23daaeeb3b5d6c81fdcd5c28619f5b1d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Mar 2016 21:56:19 +0100
Subject: CSP compatibility with Firefox older than 45

https://github.com/FreshRSS/FreshRSS/pull/1075
https://github.com/FreshRSS/FreshRSS/pull/1078
https://developer.mozilla.org/en-US/Firefox/Releases/45#Security
https://bugzilla.mozilla.org/show_bug.cgi?id=1045891
---
 CHANGELOG.md     | 2 +-
 app/FreshRSS.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 096c930d1..43823b536 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 2016-03-xx FreshRSS 1.3.1-beta
 
 * Security
-	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
+	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
 * Features
 	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
 		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index bfbd7a6eb..d6f4f4062 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -113,7 +113,7 @@ class FreshRSS extends Minz_FrontController {
 	public static function preLayout() {
 		switch (Minz_Request::controllerName()) {
 			case 'index':
-				header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+				header("Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *");
 				break;
 			case 'stats':
 				header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
-- 
cgit v1.2.3


From 6cd59b25f44853e7f5bbd931b33a4ecbd3e91159 Mon Sep 17 00:00:00 2001
From: ealdraed <ealdraed@users.noreply.github.com>
Date: Fri, 4 Mar 2016 12:38:16 +0100
Subject: Translate four strings for XML and JSON

---
 app/i18n/de/install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 2da744cfb..d16496818 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'Ihr HTTP REFERER ist bekannt und entspricht Ihrem Server.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'Ihnen fehlt eine empfohlene Bibliothek um JSON zu parsen.',
+			'ok' => 'Sie haben eine empfohlene Bibliothek um JSON zu parsen.',
 		),
 		'minz' => array(
 			'nok' => 'Ihnen fehlt das Minz-Framework.',
@@ -91,8 +91,8 @@ return array(
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'Ihnen fehlt die benötigte Bibliothek um XML zu parsen.',
+			'ok' => 'Sie haben die benötigte Bibliothek um XML zu parsen.',
 		),
 	),
 	'conf' => array(
-- 
cgit v1.2.3


From 2740dd0401f254d2836a65fed4085a5f0b38c29b Mon Sep 17 00:00:00 2001
From: Wanabo <Wanabo@users.noreply.github.com>
Date: Sun, 6 Mar 2016 11:52:35 +0100
Subject: Added files via upload

Added missing loader.gif
`.loading { background: url("loader.gif") center center no-repeat; font-size: 0; }`
---
 p/themes/base-theme/loader.gif | Bin 0 -> 4167 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 p/themes/base-theme/loader.gif

diff --git a/p/themes/base-theme/loader.gif b/p/themes/base-theme/loader.gif
new file mode 100644
index 000000000..5ff26f0e3
Binary files /dev/null and b/p/themes/base-theme/loader.gif differ
-- 
cgit v1.2.3


From f059e4c5ce461a171b5754491b66c24ecc7490f8 Mon Sep 17 00:00:00 2001
From: Wanabo <Wanabo@users.noreply.github.com>
Date: Sun, 6 Mar 2016 12:01:46 +0100
Subject: Added files via upload

Updated language files for v1.3.1-dev
---
 app/i18n/nl/admin.php   | 18 +++++++++---------
 app/i18n/nl/gen.php     |  2 +-
 app/i18n/nl/install.php |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index c3a3062b9..bd7d63b6a 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -120,7 +120,7 @@ return array(
 		'category' => 'Categorie',
 		'entry_count' => 'Invoer aantallen',
 		'entry_per_category' => 'Aantallen per categorie',
-		'entry_per_day' => 'Aantallen per day (laatste 30 dagen)',
+		'entry_per_day' => 'Aantallen per dag (laatste 30 dagen)',
 		'entry_per_day_of_week' => 'Per dag of week (gemiddeld: %.2f berichten)',
 		'entry_per_hour' => 'Per uur (gemiddeld: %.2f berichten)',
 		'entry_per_month' => 'Per maand (gemiddeld: %.2f berichten)',
@@ -147,14 +147,14 @@ return array(
 		'top_feed' => 'Top tien feeds',
 	),
 	'system' => array(
-		'_' => 'System configuration', // @todo translate
-		'auto-update-url' => 'Auto-update server URL', // @todo translate
-		'instance-name' => 'Instance name', // @todo translate
-		'max-categories' => 'Categories per user limit', // @todo translate
-		'max-feeds' => 'Feeds per user limit', // @todo translate
+		'_' => 'Systeem configuratie',
+		'auto-update-url' => 'Automatische update server URL',
+		'instance-name' => 'Voorbeeld naam',
+		'max-categories' => 'Categoriën limiet per gebruiker',
+		'max-feeds' => 'Feed limiet per gebruiker',
 		'registration' => array(
-			'help' => '0 means that there is no account limit', // @todo translate
-			'number' => 'Max number of accounts', // @todo translate
+			'help' => '0 betekent geen account limiet',
+			'number' => 'Maximum aantal accounts',
 		),
 	),
 	'update' => array(
@@ -178,7 +178,7 @@ return array(
 		'registration' => array(
 			'allow' => 'Sta het maken van nieuwe accounts toe',
 			'help' => '0 betekent dat er geen account limiet is',
-			'number' => 'Max aantal van accounts',
+			'number' => 'Max aantal accounts',
 		),
 		'title' => 'Beheer gebruikers',
 		'user_list' => 'Lijst van gebruikers ',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index bc2137c22..1cafaf82a 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -140,7 +140,7 @@ return array(
 		'sharing' => 'Delen',
 		'shortcuts' => 'Snelle toegang',
 		'stats' => 'Statistieken',
-		'system' => 'System configuration', // @todo translate
+		'system' => 'Systeem configuratie',
 		'update' => 'Versie controle',
 		'user_management' => 'Beheer gebruikers',
 		'user_profile' => 'Profiel',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index 3c44f7581..d16dda4ca 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'Uw HTTP REFERER is bekend en komt overeen met uw server.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'U mist een benodigede bibliotheek om JSON te gebruiken.',
+			'ok' => 'U hebt de benodigde bibliotheek om JSON te gebruiken.',
 		),
 		'minz' => array(
 			'nok' => 'U mist het Minz framework.',
@@ -91,8 +91,8 @@ return array(
 			'ok' => 'Permissies van de users map zijn goed.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'U mist de benodigde bibliotheek om XML te gebruiken.',
+			'ok' => 'U hebt de benodigde bibliotheek om XML te gebruiken.',
 		),
 	),
 	'conf' => array(
-- 
cgit v1.2.3


From 5f04462e554e4604c04c2c9ca2fe97df6f6f6376 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 6 Mar 2016 12:51:39 +0100
Subject: Fix redirection while deleting a feed

Before, when deleting a feed from the statistics idle page, there was an error in the redirection process.
Now, the redirection works properly and redirects to the idle page.
---
 app/views/stats/idle.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 11b7df8c4..ba88b679f 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -6,10 +6,10 @@
 	<h1><?php echo _t('admin.stats.idle'); ?></h1>
 
 	<?php
-		$current_url = urlencode(Minz_Url::display(
+		$current_url = Minz_Url::display(
 			array('c' => 'stats', 'a' => 'idle'),
 			'php', true
-		));
+		);
 		$nothing = true;
 		foreach ($this->idleFeeds as $period => $feeds) {
 			if (!empty($feeds)) {
-- 
cgit v1.2.3


From e265c943190ad490c6da414b1e243ade14797652 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 6 Mar 2016 14:26:20 +0100
Subject: Fix url ending

---
 lib/Minz/Url.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index 4279b045b..382437e9a 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -27,6 +27,8 @@ class Minz_Url {
 			$url_string = Minz_Request::getBaseUrl(PUBLIC_TO_INDEX_PATH);
 			if ($url_string === PUBLIC_TO_INDEX_PATH) {
 				$url_string = Minz_Request::guessBaseUrl();
+			} else {
+				$url_string .= '/';
 			}
 		} else {
 			$url_string = $isArray ? '.' : PUBLIC_RELATIVE;
-- 
cgit v1.2.3


From bb0319c1c7823471a4a2474712d8301e07a5f44e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 14:50:43 +0100
Subject: i18n-cz JSON XML

https://github.com/FreshRSS/FreshRSS/pull/1097#commitcomment-16382595
https://github.com/FreshRSS/FreshRSS/issues/1094
---
 app/i18n/cz/install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index 969b69271..bc3e01992 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'Váš HTTP REFERER je znám a odpovídá Vašemu serveru.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'Pro parsování JSON chybí doporučená knihovna.',
+			'ok' => 'Máte doporučenou knihovnu pro parsování JSON.',
 		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
@@ -91,8 +91,8 @@ return array(
 			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'Pro parsování XML chybí požadovaná knihovna.',
+			'ok' => 'Máte požadovanou knihovnu pro parsování XML.',
 		),
 	),
 	'conf' => array(
-- 
cgit v1.2.3


From 7f91dbf16dca9f824b7bbbd42ef34f39ac7c22a9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 15:32:58 +0100
Subject: SQLite: Articles from old FreshRSS are marked as unread on update

Bug fixed https://github.com/FreshRSS/FreshRSS/issues/1049
---
 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 7294fe8f4..b559d3c22 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -355,7 +355,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					$entry_date = $entry->date(true);
 					if (isset($existingHashForGuids[$entry->guid()])) {
 						$existingHash = $existingHashForGuids[$entry->guid()];
-						if (strcasecmp($existingHash, $entry->hash()) === 0 || $existingHash === '00000000000000000000000000000000') {
+						if (strcasecmp($existingHash, $entry->hash()) === 0 || trim($existingHash, '0') == '') {
 							//This entry already exists and is unchanged. TODO: Remove the test with the zero'ed hash in FreshRSS v1.3
 							$oldGuids[] = $entry->guid();
 						} else {	//This entry already exists but has been updated
-- 
cgit v1.2.3


From 9d1f35d4b859a44964e52a377e8718113e160862 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 17:04:21 +0100
Subject: OPML bug import not using title

Fix https://github.com/FreshRSS/FreshRSS/issues/1048
---
 lib/lib_opml.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/lib_opml.php b/lib/lib_opml.php
index 02ae5f55c..66b854313 100644
--- a/lib/lib_opml.php
+++ b/lib/lib_opml.php
@@ -105,6 +105,10 @@ function libopml_parse_outline($outline_xml, $strict = true) {
 		);
 	}
 
+	if (empty($outline['text']) && isset($outline['title'])) {
+		$outline['text'] = $outline['title'];
+	}
+
 	foreach ($outline_xml->children() as $key => $value) {
 		// An outline may contain any number of outline children
 		if ($key === 'outline') {
-- 
cgit v1.2.3


From 1aa6321376321bb2a41c61771178d18cc2c2190d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 18:04:28 +0100
Subject: Changelog 1.3.1-beta

https://github.com/FreshRSS/FreshRSS/issues/1113
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43823b536..ae6c91946 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@
 * I18n
 	* Turkish [#1073](https://github.com/FreshRSS/FreshRSS/issues/1073)
 * Bug fixing
+	* Fixed OPML import title bug [#1048](https://github.com/FreshRSS/FreshRSS/issues/1048)
+	* Fixed upgrade bug with SQLite when articles where marked as unread [#1049](https://github.com/FreshRSS/FreshRSS/issues/1049)
+	* Fixed error when deleting feeds from statistics page [#1047](https://github.com/FreshRSS/FreshRSS/issues/1047)
 	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
 	* Fixed sharing bug with PHP7 [#1072](https://github.com/FreshRSS/FreshRSS/issues/1072)
 	* Fixed fall-back when php-json is not installed [#1092](https://github.com/FreshRSS/FreshRSS/issues/1092)
@@ -22,6 +25,7 @@
 	* Filters `<img />` attributes `srcset` and `sizes` [#1077](https://github.com/FreshRSS/FreshRSS/issues/1077), [#1086](https://github.com/FreshRSS/FreshRSS/pull/1086)
 	* Implement PubSubHubbub unsubscribe responses [#1058](https://github.com/FreshRSS/FreshRSS/issues/1058)
 	* Restored some compatibility with PHP 5.2 [#1055](https://github.com/FreshRSS/FreshRSS/issues/1055)
+	* Check for extension php-xml during install [#1094](https://github.com/FreshRSS/FreshRSS/issues/1094)
 	* Updated the sharing with Movim [#1030](https://github.com/FreshRSS/FreshRSS/pull/1030)
 
 
-- 
cgit v1.2.3


From c424c8acef45cc32187526d94e4d0bb06092de69 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 18:08:32 +0100
Subject: Changelog typo

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae6c91946..6be1a4b6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
 	* Turkish [#1073](https://github.com/FreshRSS/FreshRSS/issues/1073)
 * Bug fixing
 	* Fixed OPML import title bug [#1048](https://github.com/FreshRSS/FreshRSS/issues/1048)
-	* Fixed upgrade bug with SQLite when articles where marked as unread [#1049](https://github.com/FreshRSS/FreshRSS/issues/1049)
+	* Fixed upgrade bug with SQLite when articles were marked as unread [#1049](https://github.com/FreshRSS/FreshRSS/issues/1049)
 	* Fixed error when deleting feeds from statistics page [#1047](https://github.com/FreshRSS/FreshRSS/issues/1047)
 	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
 	* Fixed sharing bug with PHP7 [#1072](https://github.com/FreshRSS/FreshRSS/issues/1072)
-- 
cgit v1.2.3


From c4ebc5c4a9e403d854b85b4138ffc3f6957689cc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 18:20:14 +0100
Subject: CSP for SVG

And moved .htaccess rules in the folder there are used
https://github.com/FreshRSS/FreshRSS/issues/1114
---
 p/.htaccess         | 13 +------------
 p/themes/.htaccess  | 21 +++++++++++++++++++++
 p/themes/index.html | 13 +++++++++++++
 3 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 p/themes/.htaccess
 create mode 100644 p/themes/index.html

diff --git a/p/.htaccess b/p/.htaccess
index 2b1e27a88..4321c82d7 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -6,13 +6,8 @@ FileETag	None
 AddDefaultCharset	UTF-8
 
 <IfModule mod_mime.c>
-	AddType application/json .map
-	AddType application/font-woff .woff
-
-	AddCharset	UTF-8	.css
 	AddCharset	UTF-8	.html
 	AddCharset	UTF-8	.js
-	AddCharset	UTF-8	.svg
 </IfModule>
 
 <IfModule mod_deflate.c>
@@ -21,15 +16,9 @@ AddDefaultCharset	UTF-8
 
 <IfModule mod_expires.c>
 	ExpiresActive	on
-	ExpiresByType	application/font-woff	"access plus 1 month"
 	ExpiresByType	application/javascript	"access plus 1 month"
-	ExpiresByType	application/json	"access plus 1 month"
 	ExpiresByType	application/xhtml+xml	"access plus 1 month"
-	ExpiresByType	image/gif	"access plus 1 month"
-	ExpiresByType	image/png	"access plus 1 month"
-	ExpiresByType	image/svg+xml	"access plus 1 month"
 	ExpiresByType	image/x-icon	"access plus 1 month"
-	ExpiresByType	text/css	"access plus 1 month"
 	ExpiresByType	text/html	"access plus 1 month"
 	ExpiresByType	text/javascript	"access plus 1 month"
 	<FilesMatch "\.php$">
@@ -38,7 +27,7 @@ AddDefaultCharset	UTF-8
 </IfModule>
 
 <IfModule mod_headers.c>
-	<FilesMatch "\.(css|html|js|ico|gif|png|woff)$">
+	<FilesMatch "\.(css|gif|html|ico|js|png|svg|woff)$">
 		Header	merge Cache-Control "public"
 	</FilesMatch>
 </IfModule>
diff --git a/p/themes/.htaccess b/p/themes/.htaccess
new file mode 100644
index 000000000..bde718537
--- /dev/null
+++ b/p/themes/.htaccess
@@ -0,0 +1,21 @@
+<IfModule mod_mime.c>
+	AddType application/font-woff .woff
+
+	AddCharset	UTF-8	.css
+	AddCharset	UTF-8	.svg
+</IfModule>
+
+<IfModule mod_expires.c>
+	ExpiresActive	on
+	ExpiresByType	application/font-woff	"access plus 1 month"
+	ExpiresByType	image/gif	"access plus 1 month"
+	ExpiresByType	image/png	"access plus 1 month"
+	ExpiresByType	image/svg+xml	"access plus 1 month"
+	ExpiresByType	text/css	"access plus 1 month"
+</IfModule>
+
+<IfModule mod_headers.c>
+	<FilesMatch "\.svg$">
+		Header	set Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline'"
+	</FilesMatch>
+</IfModule>
diff --git a/p/themes/index.html b/p/themes/index.html
new file mode 100644
index 000000000..85faaa37e
--- /dev/null
+++ b/p/themes/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+<head>
+<meta charset="UTF-8" />
+<meta http-equiv="Refresh" content="0; url=/" />
+<title>Redirection</title>
+<meta name="robots" content="noindex" />
+</head>
+
+<body>
+<p><a href="/">Redirection</a></p>
+</body>
+</html>
-- 
cgit v1.2.3


From 44be16d4fbc78c14f8ea17160585ed1bec0c8722 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 18:28:04 +0100
Subject: X-Content-Type-Options: nosniff

https://github.com/FreshRSS/FreshRSS/issues/1114
---
 app/FreshRSS.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index d6f4f4062..bafa970da 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -122,6 +122,7 @@ class FreshRSS extends Minz_FrontController {
 				header("Content-Security-Policy: default-src 'self'");
 				break;
 		}
+		header("X-Content-Type-Options: nosniff");
 	}
 
 	private function loadNotifications() {
-- 
cgit v1.2.3


From 7f764ca6824420813db2e71a3344360620d2e5ca Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 18:41:03 +0100
Subject: Changelog nosniff

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6be1a4b6a..74cb9d250 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 ## 2016-03-xx FreshRSS 1.3.1-beta
 
 * Security
-	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
+	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/issues/1075), [#1114](https://github.com/FreshRSS/FreshRSS/issues/1114)
+	* Added `X-Content-Type-Options: nosniff` [#1116](https://github.com/FreshRSS/FreshRSS/pull/1116)
 * Features
 	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
 		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
-- 
cgit v1.2.3


From ba9f4461d8935bb9de256a5bedf0c89d3d317c7f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 19:00:04 +0100
Subject: Secure cookie HTTPS

---
 CHANGELOG.md         |  1 +
 lib/Minz/Request.php | 17 ++++++++++++-----
 lib/Minz/Session.php |  6 +++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74cb9d250..7298c4523 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Security
 	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/issues/1075), [#1114](https://github.com/FreshRSS/FreshRSS/issues/1114)
 	* Added `X-Content-Type-Options: nosniff` [#1116](https://github.com/FreshRSS/FreshRSS/pull/1116)
+	* Cookie with `Secure` tag when used over HTTPS []()
 * Features
 	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
 		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index effb9943c..81457df9e 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -84,6 +84,17 @@ class Minz_Request {
 		self::magicQuotesOff();
 	}
 
+	/**
+	 * Return true if the request is over HTTPS, false otherwise (HTTP)
+	 */
+	public static function isHttps() {
+		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+			return strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https';
+		} else {
+			return isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+		}
+	}
+
 	/**
 	 * Try to guess the base URL from $_SERVER information
 	 *
@@ -92,11 +103,7 @@ class Minz_Request {
 	public static function guessBaseUrl() {
 		$url = 'http';
 
-		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-			$https = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https';
-		} else {
-			$https = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
-		}
+		$https = self::isHttps();
 
 		if (!empty($_SERVER['HTTP_HOST'])) {
 			$host = $_SERVER['HTTP_HOST'];
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 940cd27d9..c94f2b646 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -73,7 +73,7 @@ class Minz_Session {
 	 * @param $l la durée de vie
 	 */
 	public static function keepCookie($l) {
-		session_set_cookie_params($l, self::getCookieDir(), '', false, true);
+		session_set_cookie_params($l, self::getCookieDir(), '', Minz_Request::isHttps(), true);
 	}
 
 
@@ -86,11 +86,11 @@ class Minz_Session {
 	}
 
 	public static function deleteLongTermCookie($name) {
-		setcookie($name, '', 1, '', '', false, true);
+		setcookie($name, '', 1, '', '', Minz_Request::isHttps(), true);
 	}
 
 	public static function setLongTermCookie($name, $value, $expire) {
-		setcookie($name, $value, $expire, '', '', false, true);
+		setcookie($name, $value, $expire, '', '', Minz_Request::isHttps(), true);
 	}
 
 	public static function getLongTermCookie($name) {
-- 
cgit v1.2.3


From cd4153912f3c91dcb5d68ea886855e9014684ea0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 19:01:43 +0100
Subject: Changelog secure cookie HTTPS

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7298c4523..a316a1c15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 * Security
 	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/issues/1075), [#1114](https://github.com/FreshRSS/FreshRSS/issues/1114)
 	* Added `X-Content-Type-Options: nosniff` [#1116](https://github.com/FreshRSS/FreshRSS/pull/1116)
-	* Cookie with `Secure` tag when used over HTTPS []()
+	* Cookie with `Secure` tag when used over HTTPS [#1117](https://github.com/FreshRSS/FreshRSS/pull/1117)
 * Features
 	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
 		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
-- 
cgit v1.2.3


From 7db99b838223649fe3aec973516b8d32d58ca5dd Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 19:30:24 +0100
Subject: API limit INPUT to 1MB

---
 p/api/greader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 3fa367299..62782ce1a 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -23,7 +23,7 @@ Server-side API compatible with Google Reader API layer 2
 require('../../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 
-$ORIGINAL_INPUT = file_get_contents('php://input');
+$ORIGINAL_INPUT = file_get_contents('php://input', false, null, -1, 1048576);
 
 if (PHP_INT_SIZE < 8) {	//32-bit
 	function dec2hex($dec) {
-- 
cgit v1.2.3


From c9ebbe9657b9b202817b9e0b387a584340e4e20b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 19:32:58 +0100
Subject: Changelog API

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a316a1c15..233d9bdba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/issues/1075), [#1114](https://github.com/FreshRSS/FreshRSS/issues/1114)
 	* Added `X-Content-Type-Options: nosniff` [#1116](https://github.com/FreshRSS/FreshRSS/pull/1116)
 	* Cookie with `Secure` tag when used over HTTPS [#1117](https://github.com/FreshRSS/FreshRSS/pull/1117)
+	* Limit API post input to 1MB [#1118](https://github.com/FreshRSS/FreshRSS/pull/1118)
 * Features
 	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
 		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
-- 
cgit v1.2.3


From f64d7384a7df16c7fef7418038fc7f891bebb588 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 11 Mar 2016 22:35:21 +0100
Subject: Prepare release 1.3.1-beta

https://github.com/FreshRSS/FreshRSS/issues/1113
---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 233d9bdba..5e80b43ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-03-xx FreshRSS 1.3.1-beta
+## 2016-03-11 FreshRSS 1.3.1-beta
 
 * Security
 	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/issues/1075), [#1114](https://github.com/FreshRSS/FreshRSS/issues/1114)
diff --git a/constants.php b/constants.php
index a501d0df5..a279534e3 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.3.1-dev');
+define('FRESHRSS_VERSION', '1.3.1-beta');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 2f2a3853312df7ecd8700368ffb29b057ec79755 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 12 Mar 2016 12:23:04 +0100
Subject: Start 1.3.2-dev version

---
 CHANGELOG.md  | 5 +++++
 constants.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e80b43ed..112d487b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2016-XX-YY FreshRSS 1.3.2-beta
+
+Nothing for the moment
+
+
 ## 2016-03-11 FreshRSS 1.3.1-beta
 
 * Security
diff --git a/constants.php b/constants.php
index a279534e3..2cf0f5bf4 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.3.1-beta');
+define('FRESHRSS_VERSION', '1.3.2-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From a41163ac46824fb23a17a5a1013239c2f356dbde Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 17 Mar 2016 21:09:34 +0100
Subject: CSP compatibility for home page

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 p/index.html   | 18 +-----------------
 p/themes/p.css | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 p/themes/p.css

diff --git a/p/index.html b/p/index.html
index ef5cb87ce..3f4284eb5 100644
--- a/p/index.html
+++ b/p/index.html
@@ -5,27 +5,11 @@
 <meta name="viewport" content="initial-scale=1.0" />
 <meta http-equiv="Refresh" content="0; url=i/" />
 <title>FreshRSS</title>
+<link rel="stylesheet" href="themes/p.css" />
 <link rel="shortcut icon" type="image/x-icon" sizes="16x16 64x64" href="favicon.ico" />
 <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="themes/icons/favicon-256.png" />
 <meta name="msapplication-TileColor" content="#FFF" />
 <meta name="robots" content="noindex" />
-<style>
-body {
-	font-family: sans-serif;
-	text-align: center;
-}
-h1 {
-	font-size: xx-large;
-	text-shadow: 1px -1px 0 #CCCCCC;
-}
-h1 a {
-	color: #0062BE;
-	text-decoration: none;
-}
-img {
-	border: 0;
-}
-</style>
 </head>
 
 <body>
diff --git a/p/themes/p.css b/p/themes/p.css
new file mode 100644
index 000000000..171b2078b
--- /dev/null
+++ b/p/themes/p.css
@@ -0,0 +1,17 @@
+@charset "UTF-8";
+
+body {
+	font-family: sans-serif;
+	text-align: center;
+}
+h1 {
+	font-size: xx-large;
+	text-shadow: 1px -1px 0 #CCCCCC;
+}
+h1 a {
+	color: #0062BE;
+	text-decoration: none;
+}
+img {
+	border: 0;
+}
-- 
cgit v1.2.3


From 06189cb6661edf75079037f90cf82276ab5f5648 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 10 Apr 2016 11:52:16 +0200
Subject: API support for REDIRECT HTTP headers

https://github.com/FreshRSS/FreshRSS/issues/1127
---
 p/api/greader.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/p/api/greader.php b/p/api/greader.php
index 62782ce1a..894c2e960 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -46,6 +46,8 @@ function headerVariable($headerName, $varName) {
 	$upName = 'HTTP_' . strtoupper($headerName);
 	if (isset($_SERVER[$upName])) {
 		$header = $_SERVER[$upName];
+	} elseif (isset($_SERVER['REDIRECT_' . $upName])) {
+		$header = $_SERVER['REDIRECT_' . $upName];
 	} elseif (function_exists('getallheaders')) {
 		$ALL_HEADERS = getallheaders();
 		if (isset($ALL_HEADERS[$headerName])) {
@@ -134,6 +136,7 @@ function checkCompatibility() {
 		die('FAIL 64-bit or GMP extension!');
 	}
 	if ((!array_key_exists('HTTP_AUTHORIZATION', $_SERVER)) &&	//Apache mod_rewrite trick should be fine
+		(!array_key_exists('REDIRECT_HTTP_AUTHORIZATION', $_SERVER)) &&	//Apache mod_rewrite with FCGI
 		(empty($_SERVER['SERVER_SOFTWARE']) || (stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') === false)) &&	//nginx should be fine
 		(empty($_SERVER['SERVER_SOFTWARE']) || (stripos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') === false)) &&	//lighttpd should be fine
 		((!function_exists('getallheaders')) || (stripos(php_sapi_name(), 'cgi') !== false))) {	//Main problem is Apache/CGI mode
-- 
cgit v1.2.3


From 89cc2aa3d0d2d3faeaf4b7d4ada11e3cd904bea3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 22 Apr 2016 13:55:24 +0200
Subject: MySQL compatibility only_full_group_by

Fix MySQL error, which appeared in MySQL 5.7:

ERROR 1055 (42000): Expression #1 of SELECT list is not in GROUP BY
clause and contains nonaggregated column 'freshrss.c.id' which is not
functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
---
 app/Models/CategoryDAO.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index b5abac519..fc431553e 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -103,7 +103,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 			     . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.website, f.priority, f.error, f.cache_nbEntries, f.cache_nbUnreads ')
 			     . 'FROM `' . $this->prefix . 'category` c '
 			     . 'LEFT OUTER JOIN `' . $this->prefix . 'feed` f ON f.category=c.id '
-			     . 'GROUP BY f.id '
+			     . 'GROUP BY f.id, c_id '
 			     . 'ORDER BY c.name, f.name';
 			$stm = $this->bd->prepare($sql);
 			$stm->execute();
-- 
cgit v1.2.3


From b042d3a7728037db90a9306c61091be0a8ac42c4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 Apr 2016 19:10:32 +0200
Subject: HTTP2 optimization

Fast flush HTTP headers, push promise CSS.
Requires PHP 5.3+ due to anonymous function.
Do not load syles, scripts, and notifications for Ajax requests.
https://github.com/FreshRSS/FreshRSS/issues/1089
---
 README.fr.md                        |  2 +-
 README.md                           |  2 +-
 app/Controllers/indexController.php | 64 +++++++++++++++++++------------------
 app/FreshRSS.php                    | 37 ++++++++++-----------
 app/Models/Themes.php               |  4 ---
 app/layout/layout.phtml             | 40 ++++++++++++-----------
 lib/Minz/Request.php                |  5 ++-
 lib/Minz/Url.php                    | 12 ++++---
 lib/lib_rss.php                     |  4 +++
 9 files changed, 89 insertions(+), 81 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 794b1a9e1..a173f0a75 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -33,7 +33,7 @@ Nous sommes une communauté amicale.
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
-* PHP 5.2.1+ (PHP 5.3.7+ recommandé, et PHP 5.5+ pour les performances) (support bêta de PHP 7 avec encore meilleures performances)
+* PHP 5.3+ (PHP 5.3.7+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
 	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Inclus par défaut : [DOM](http://php.net/dom), [XML](http://php.net/xml)…
diff --git a/README.md b/README.md
index 728204a38..4d3bb5c4c 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ We are a friendly community.
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
-* PHP 5.2.1+ (PHP 5.3.7+ recommended, and PHP 5.5+ for performance) (beta support for PHP 7 with even higher performance)
+* PHP 5.3+ (PHP 5.3.7+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
 	* Recommended extensions: [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Enabled by default: [DOM](http://php.net/dom), [XML](http://php.net/xml)…
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index baaf99065..7e626720e 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -32,42 +32,44 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Error::error(404);
 		}
 
-		try {
-			$entries = $this->listEntriesByContext();
-
-			$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();
-			}
+		$this->view->callbackBeforeContent = function() {
+			try {
+				$entries = $this->listEntriesByContext();
+
+				$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;
+				$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());
-			Minz_Error::error(404);
-		}
+				$this->view->entries = $entries;
+			} catch (FreshRSS_EntriesGetter_Exception $e) {
+				Minz_Log::notice($e->getMessage());
+				Minz_Error::error(404);
+			}
 
-		$this->view->categories = FreshRSS_Context::$categories;
+			$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;
-		}
-		Minz_View::prependTitle($title . ' · ');
+			$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;
+			}
+			Minz_View::prependTitle($title . ' · ');
+		};
 	}
 
 	/**
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index bafa970da..562d8e2cd 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -34,7 +34,7 @@ class FreshRSS extends Minz_FrontController {
 
 		// Auth has to be initialized before using currentUser session parameter
 		// because it's this part which create this parameter.
-		$this->initAuth();
+		self::initAuth();
 
 		// Then, register the user configuration and use the configuration setter
 		// created above.
@@ -46,10 +46,7 @@ class FreshRSS extends Minz_FrontController {
 
 		// Finish to initialize the other FreshRSS / Minz components.
 		FreshRSS_Context::init();
-		$this->initI18n();
-		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
-		$this->loadStylesAndScripts();
-		$this->loadNotifications();
+		self::initI18n();
 		// Enable extensions for the current (logged) user.
 		if (FreshRSS_Auth::hasAccess()) {
 			$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
@@ -57,7 +54,7 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
-	private function initAuth() {
+	private static function initAuth() {
 		FreshRSS_Auth::init();
 		if (Minz_Request::isPost() && !is_referer_from_same_domain()) {
 			// Basic protection against XSRF attacks
@@ -74,12 +71,12 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
-	private function initI18n() {
+	private static function initI18n() {
 		Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
 		Minz_Translate::init(FreshRSS_Context::$user_conf->language);
 	}
 
-	private function loadStylesAndScripts() {
+	private static function loadStylesAndScripts() {
 		$theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme);
 		if ($theme) {
 			foreach($theme['files'] as $file) {
@@ -91,9 +88,9 @@ class FreshRSS extends Minz_FrontController {
 					$filename = $file;
 				}
 				$filetime = @filemtime(PUBLIC_PATH . '/themes/' . $theme_id . '/' . $filename);
-				Minz_View::appendStyle(Minz_Url::display(
-					'/themes/' . $theme_id . '/' . $filename . '?' . $filetime
-				));
+				$url = '/themes/' . $theme_id . '/' . $filename . '?' . $filetime;
+				header('Link: <' . Minz_Url::display($url, '', 'root') . '>;rel=preload', false);	//HTTP2
+				Minz_View::appendStyle(Minz_Url::display($url));
 			}
 		}
 
@@ -110,6 +107,14 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
+	private static function loadNotifications() {
+		$notif = Minz_Session::param('notification');
+		if ($notif) {
+			Minz_View::_param('notification', $notif);
+			Minz_Session::_param('notification');
+		}
+	}
+
 	public static function preLayout() {
 		switch (Minz_Request::controllerName()) {
 			case 'index':
@@ -123,13 +128,9 @@ class FreshRSS extends Minz_FrontController {
 				break;
 		}
 		header("X-Content-Type-Options: nosniff");
-	}
 
-	private function loadNotifications() {
-		$notif = Minz_Session::param('notification');
-		if ($notif) {
-			Minz_View::_param('notification', $notif);
-			Minz_Session::_param('notification');
-		}
+		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
+		self::loadStylesAndScripts();
+		self::loadNotifications();
 	}
 }
diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index e3b260261..5a6ec0a05 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -116,7 +116,3 @@ class FreshRSS_Themes extends Minz_Model {
 			'<img class="icon" src="' . Minz_Url::display($url) . '" alt="' . $alts[$name] . '" />';
 	}
 }
-
-function _i($icon, $url_only = false) {
-	return FreshRSS_Themes::icon($icon, $url_only);
-}
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 99a3717bc..6906fa05f 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,17 +1,32 @@
-<?php
-	FreshRSS::preLayout();
-?>
+<?php FreshRSS::preLayout(); ?>
 <!DOCTYPE html>
 <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" />
-		<?php echo self::headTitle(); ?>
 		<?php echo self::headStyle(); ?>
 		<script id="jsonVars" type="application/json">
 <?php $this->renderHelper('javascript_vars'); ?>
 		</script>
 		<?php echo self::headScript(); ?>
+		<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'); ?>" />
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>">
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>">
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>">
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>">
+		<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 FreshRSS_Context::$system_conf->title; ?>">
+		<meta name="msapplication-TileColor" content="#FFF" />
+<?php
+	flush();
+	if (isset($this->callbackBeforeContent)) {
+		call_user_func($this->callbackBeforeContent);
+	}
+?>
+		<?php echo self::headTitle(); ?>
 <?php
 	$url_base = Minz_Request::currentRequest();
 	if (FreshRSS_Context::$next_id !== '') {
@@ -20,26 +35,13 @@
 		$url_next['params']['ajax'] = 1;
 ?>
 		<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->rss_title)) {
+	} 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($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); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>">
-		<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 FreshRSS_Context::$system_conf->title; ?>">
-		<meta name="msapplication-TileColor" content="#FFF" />
-<?php if (FreshRSS_Context::$system_conf->allow_robots) { ?>
+<?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
 		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8'); ?>" />
 <?php } else { ?>
 		<meta name="robots" content="noindex,nofollow" />
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 81457df9e..f80b707d6 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -137,12 +137,11 @@ class Minz_Request {
 	/**
 	 * Return the base_url from configuration and add a suffix if given.
 	 *
-	 * @param $base_url_suffix a string to add at base_url (default: empty string)
 	 * @return the base_url with a suffix.
 	 */
-	public static function getBaseUrl($base_url_suffix = '') {
+	public static function getBaseUrl() {
 		$conf = Minz_Configuration::get('system');
-		$url = rtrim($conf->base_url, '/\\') . $base_url_suffix;
+		$url = rtrim($conf->base_url, '/\\');
 		return filter_var($url, FILTER_SANITIZE_URL);
 	}
 
diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index 382437e9a..c7c67123e 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -24,11 +24,15 @@ class Minz_Url {
 		$url_string = '';
 
 		if ($absolute) {
-			$url_string = Minz_Request::getBaseUrl(PUBLIC_TO_INDEX_PATH);
-			if ($url_string === PUBLIC_TO_INDEX_PATH) {
+			$url_string = Minz_Request::getBaseUrl();
+			if ($url_string == '') {
 				$url_string = Minz_Request::guessBaseUrl();
-			} else {
-				$url_string .= '/';
+			}
+			if ($isArray) {
+				$url_string .= PUBLIC_TO_INDEX_PATH;
+			}
+			if ($absolute === 'root') {
+				$url_string = parse_url($url_string, PHP_URL_PATH);
 			}
 		} else {
 			$url_string = $isArray ? '.' : PUBLIC_RELATIVE;
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 135115ea5..f89baf9b1 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -548,3 +548,7 @@ function base64url_encode($data) {
 function base64url_decode($data) {
 	return base64_decode(strtr($data, '-_', '+/'));
 }
+
+function _i($icon, $url_only = false) {
+	return FreshRSS_Themes::icon($icon, $url_only);
+}
-- 
cgit v1.2.3


From f3696784ea0acd15a11a4ca193abe623fd77dc33 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 Apr 2016 21:35:09 +0200
Subject: Favicon array bug

Case problem and isset check
---
 lib/Favicon/DataAccess.php | 3 ++-
 lib/Favicon/Favicon.php    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Favicon/DataAccess.php b/lib/Favicon/DataAccess.php
index 2bfdf640e..17f26b333 100644
--- a/lib/Favicon/DataAccess.php
+++ b/lib/Favicon/DataAccess.php
@@ -15,7 +15,8 @@ class DataAccess {
 	
 	public function retrieveHeader($url) {
 	    $this->set_context();
-		return @get_headers($url, TRUE);
+		$headers = @get_headers($url, 1);
+		return array_change_key_case($headers);
 	}
 	
     public function saveCache($file, $data) {
diff --git a/lib/Favicon/Favicon.php b/lib/Favicon/Favicon.php
index 7ea6ccf16..1912050d6 100644
--- a/lib/Favicon/Favicon.php
+++ b/lib/Favicon/Favicon.php
@@ -99,7 +99,7 @@ class Favicon
             switch ($status) {
                 case '301':
                 case '302':
-                    $url = $headers['Location'];
+                    $url = isset($headers['location']) ? $headers['location'] : '';
                     break;
                 default:
                     $loop = FALSE;
-- 
cgit v1.2.3


From 624824673592dbc21300f9a26c27781f54429de5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 Apr 2016 21:48:37 +0200
Subject: Adjust caching for favicon with errors

---
 p/f.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/p/f.php b/p/f.php
index c904e1fcb..0f23921e3 100644
--- a/p/f.php
+++ b/p/f.php
@@ -44,14 +44,13 @@ function download_favicon($website, $dest) {
 }
 
 
-function show_default_favicon() {
+function show_default_favicon($cacheSeconds = 3600) {
 	global $default_favicon;
 
-	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)) {
+	if (!httpConditional($default_mtime, $cacheSeconds, 2)) {
 		readfile($default_favicon);
 	}
 }
@@ -68,10 +67,11 @@ $ico = $favicons_dir . $id . '.ico';
 $ico_mtime = @filemtime($ico);
 $txt_mtime = @filemtime($txt);
 
+header('Content-Type: image/x-icon');
 
 if ($ico_mtime == false || $txt_mtime > $ico_mtime) {
 	if ($txt_mtime == false) {
-		show_default_favicon();
+		show_default_favicon(1800);
 		return;
 	}
 
@@ -79,12 +79,11 @@ if ($ico_mtime == false || $txt_mtime > $ico_mtime) {
 	$url = file_get_contents($txt);
 	if (!download_favicon($url, $ico)) {
 		// Download failed, show the default favicon
-		show_default_favicon();
+		show_default_favicon(86400);
 		return;
 	}
 }
 
-header('Content-Type: image/x-icon');
 header('Content-Disposition: inline; filename="' . $id . '.ico"');
 
 if (!httpConditional($ico_mtime, 2592000, 2)) {
-- 
cgit v1.2.3


From 6b787c7408ecad4271c19e7c92edbad3f8df4330 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 Apr 2016 23:07:12 +0200
Subject: Error message when accessing entry by GET

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

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 1d9989f40..bff1073ef 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -46,6 +46,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		if ($id === false) {
 			// id is false? It MUST be a POST request!
 			if (!Minz_Request::isPost()) {
+				Minz_Request::bad(_t('feedback.access.not_found'), array('c' => 'index', 'a' => 'index'));
 				return;
 			}
 
-- 
cgit v1.2.3


From 805ec6392c660641926f6a637b3c123dae528bc4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 Apr 2016 23:12:08 +0200
Subject: Revert; Notifications needed also for non-layout requests

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

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 562d8e2cd..dd62c1919 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -47,6 +47,7 @@ class FreshRSS extends Minz_FrontController {
 		// Finish to initialize the other FreshRSS / Minz components.
 		FreshRSS_Context::init();
 		self::initI18n();
+		self::loadNotifications();
 		// Enable extensions for the current (logged) user.
 		if (FreshRSS_Auth::hasAccess()) {
 			$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
@@ -131,6 +132,5 @@ class FreshRSS extends Minz_FrontController {
 
 		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
 		self::loadStylesAndScripts();
-		self::loadNotifications();
 	}
 }
-- 
cgit v1.2.3


From 91593cecd218413960c4f05f814aaa38d4a0c4ce Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Apr 2016 14:50:31 +0200
Subject: But when adding feeds with passwords

https://github.com/FreshRSS/FreshRSS/issues/1131
---
 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 b559d3c22..6a8aa01cf 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -114,6 +114,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('feedback.sub.feed.invalid_url', $url), $url_redirect);
 			}
 
+			$feed->_httpAuth($http_auth);
+
 			try {
 				$feed->load(true);
 			} catch (FreshRSS_Feed_Exception $e) {
@@ -140,7 +142,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			$feed->_category($cat);
-			$feed->_httpAuth($http_auth);
 
 			// Call the extension hook
 			$name = $feed->name();
-- 
cgit v1.2.3


From 6466fc87ece4c1fc6ee8ea5ea4d751d7ae266a2e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 29 Apr 2016 18:24:46 +0200
Subject: Load styles for two JSON cases

---
 app/FreshRSS.php               | 2 +-
 app/views/entry/bookmark.phtml | 1 +
 app/views/entry/read.phtml     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index dd62c1919..4933892bc 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -77,7 +77,7 @@ class FreshRSS extends Minz_FrontController {
 		Minz_Translate::init(FreshRSS_Context::$user_conf->language);
 	}
 
-	private static function loadStylesAndScripts() {
+	public static function loadStylesAndScripts() {
 		$theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme);
 		if ($theme) {
 			foreach($theme['files'] as $file) {
diff --git a/app/views/entry/bookmark.phtml b/app/views/entry/bookmark.phtml
index c346d2c4c..6b5a4ed03 100755
--- a/app/views/entry/bookmark.phtml
+++ b/app/views/entry/bookmark.phtml
@@ -13,4 +13,5 @@ $url = Minz_Url::display(array(
 	'params' => Minz_Request::params(),
 ));
 
+FreshRSS::loadStylesAndScripts();
 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 fabdec9e0..7d0e3de82 100755
--- a/app/views/entry/read.phtml
+++ b/app/views/entry/read.phtml
@@ -13,4 +13,5 @@ $url = Minz_Url::display(array(
 	'params' => Minz_Request::params(),
 ));
 
+FreshRSS::loadStylesAndScripts();
 echo json_encode(array('url' => str_ireplace('&amp;', '&', $url), 'icon' => _i(Minz_Request::param('is_read') ? 'unread' : 'read')));
-- 
cgit v1.2.3


From 8ae96d000a56021cadb0265fe127563a414687ca Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 Apr 2016 23:53:23 +0200
Subject: SimplePie trim

https://github.com/FreshRSS/FreshRSS/issues/1142
---
 lib/SimplePie/SimplePie.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index a84f6dab3..8af55c9fd 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1668,6 +1668,7 @@ class SimplePie
 			$locate = null;
 		}
 
+		$file->body = trim($file->body);
 		$this->raw_data = $file->body;
 		$this->permanent_url = $file->permanent_url;
 		$headers = $file->headers;
-- 
cgit v1.2.3


From ef70782b381231b96d9bc11b44fca9d900ce65be Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 1 May 2016 10:18:55 +0200
Subject: Change default feed timeout

https://github.com/FreshRSS/FreshRSS/issues/1141
---
 data/config.default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/config.default.php b/data/config.default.php
index 174592a21..cae15330f 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -75,7 +75,7 @@ return array(
 		'cache_duration' => 800,
 
 		# SimplePie HTTP request timeout in seconds.
-		'timeout' => 10,
+		'timeout' => 15,
 
 		# If a user has not used FreshRSS for more than x seconds,
 		#	then its feeds are not refreshed anymore.
-- 
cgit v1.2.3


From c5524224454b6828e099e5d44383b0d2f316ceb8 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Sun, 1 May 2016 13:19:54 +0200
Subject: Fix validator link

---
 app/views/helpers/feed/update.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 12f485ec3..72084d8fa 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -48,7 +48,7 @@
 					<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('sub.feed.validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo rawurlencode(htmlspecialchars_decode($this->feed->url(), ENT_QUOTES)); ?>"><?php echo _t('sub.feed.validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-- 
cgit v1.2.3


From 138bbedac6a21b74b289c0b7f9d396f9e4f0f6b2 Mon Sep 17 00:00:00 2001
From: Amaury Carrade <amaury@carrade.eu>
Date: Tue, 3 May 2016 14:42:16 +0200
Subject: Added a share for Wallabag v2

The new version of Wallabag (2) was rewrote completly, and the sharer changed.
This keeps the old Wallabag v1 sharer, for people still using it, and adds a new one for Wallabag v2.
The old sharer for wallabag v1 is renamed to 'wallabag v1' (instead of 'wallabag').
---
 app/i18n/de/gen.php | 3 ++-
 app/i18n/en/gen.php | 3 ++-
 app/i18n/fr/gen.php | 3 ++-
 app/i18n/it/gen.php | 3 ++-
 app/i18n/nl/gen.php | 3 ++-
 app/i18n/tr/gen.php | 3 ++-
 data/shares.php     | 9 +++++++++
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index bd0ba08cc..9b460d08d 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -164,7 +164,8 @@ return array(
 		'print' => 'Drucken',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 6fb33a4db..685a7d1a9 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -164,7 +164,8 @@ return array(
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 6b7056f92..f6695d887 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -164,7 +164,8 @@ return array(
 		'print' => 'Imprimer',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 2efbef167..b3b4bd78e 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -163,7 +163,8 @@ return array(
 		'print' => 'Stampa',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 1cafaf82a..7bd8bbb09 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -164,7 +164,8 @@ return array(
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',                
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',             
 		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index f987a8e6c..092c19752 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -164,7 +164,8 @@ return array(
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
diff --git a/data/shares.php b/data/shares.php
index 264c8fed7..1295a26ac 100644
--- a/data/shares.php
+++ b/data/shares.php
@@ -38,6 +38,15 @@ return array(
 		'help' => 'http://www.wallabag.org/',
 		'form' => 'advanced',
 	),
+	'wallabagv2' => array(
+		'url' => '~URL~/bookmarklet?url=~LINK~',
+		'transform' => array(
+			'link' => array('rawurlencode'),
+			'title' => array(),
+		),
+		'help' => 'http://www.wallabag.org/',
+		'form' => 'advanced',
+	),
 	'diaspora' => array(
 		'url' => '~URL~/bookmarklet?url=~LINK~&amp;title=~TITLE~',
 		'transform' => array('rawurlencode'),
-- 
cgit v1.2.3


From fe2a61fb159fd90319ada3c558030316758d66ae Mon Sep 17 00:00:00 2001
From: j8r <jul.reich43@protonmail.ch>
Date: Tue, 3 May 2016 19:39:46 +0200
Subject: Add DPlatform as an installation way

---
 README.fr.md | 3 +++
 README.md    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.fr.md b/README.fr.md
index a173f0a75..130271eeb 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -52,6 +52,9 @@ Nous sommes une communauté amicale.
 5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à me contacter.
 6. Des paramètres de configuration avancée peuvent être accédés depuis [config.php](./data/config.default.php).
 
+## Installation automatisée
+[![DP deploy](https://raw.githubusercontent.com/j8r/DPlatform/gh-pages/img/deploy.png)](https://j8r.github.io/DPlatform/)
+
 ## Exemple d’installation complète sur Linux Debian/Ubuntu
 ```sh
 # Si vous utilisez le serveur Web Apache (sinon il faut un autre serveur Web)
diff --git a/README.md b/README.md
index 4d3bb5c4c..e2f5d2f1a 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,9 @@ We are a friendly community.
 5. Everything should be working :) If you encounter any problem, feel free to contact me.
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
+## Automated install
+[![DP deploy](https://raw.githubusercontent.com/j8r/DPlatform/gh-pages/img/deploy.png)](https://j8r.github.io/DPlatform/)
+
 ## Example of full installation on Linux Debian/Ubuntu
 ```sh
 # If you use an Apache Web server (otherwise you need another Web server)
-- 
cgit v1.2.3


From 6fe1422854018cf18430e7a9f42a2b7dd0f1a18c Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Thu, 12 May 2016 10:57:24 +0300
Subject: Update install.php

'json' tr translate
---
 app/i18n/tr/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index d4c7c4cd5..85134845b 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'HTTP REFERER ve sunucunuz arası iletişim sorunsuz.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'Tavsiye edilen JSON çözümleme kütüphanesi eksik.',
+			'ok' => 'Tavsiye edilen JSON çözümleme kütüphanesi sorunsuz.',
 		),
 		'minz' => array(
 			'nok' => 'Minz framework eksik.',
-- 
cgit v1.2.3


From 4843dc5a1d8b15df1e42006e0fc5b553c088285b Mon Sep 17 00:00:00 2001
From: JulR <jul.reich43@protonmail.ch>
Date: Sun, 22 May 2016 02:25:39 +0100
Subject: Update DPlatform to the new URL

---
 README.fr.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 130271eeb..c28cd3069 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -53,7 +53,7 @@ Nous sommes une communauté amicale.
 6. Des paramètres de configuration avancée peuvent être accédés depuis [config.php](./data/config.default.php).
 
 ## Installation automatisée
-[![DP deploy](https://raw.githubusercontent.com/j8r/DPlatform/gh-pages/img/deploy.png)](https://j8r.github.io/DPlatform/)
+[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/gh-pages/img/deploy.png)](https://dfabric.github.io/DPlatform-ShellCore)
 
 ## Exemple d’installation complète sur Linux Debian/Ubuntu
 ```sh
diff --git a/README.md b/README.md
index e2f5d2f1a..db06b4315 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ We are a friendly community.
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
 ## Automated install
-[![DP deploy](https://raw.githubusercontent.com/j8r/DPlatform/gh-pages/img/deploy.png)](https://j8r.github.io/DPlatform/)
+[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/gh-pages/img/deploy.png)](https://dfabric.github.io/DPlatform-ShellCore)
 
 ## Example of full installation on Linux Debian/Ubuntu
 ```sh
-- 
cgit v1.2.3


From b5b7233f92cb1a67964f40bd53f94c45614e4e10 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 11:52:29 +0200
Subject: i18n remove RU UTF-8 suffix

https://github.com/FreshRSS/FreshRSS/pull/1085
---
 app/i18n/ru_RU.utf8/admin.php    | 183 ---------------------------------------
 app/i18n/ru_RU.utf8/conf.php     | 174 -------------------------------------
 app/i18n/ru_RU.utf8/feedback.php | 110 -----------------------
 app/i18n/ru_RU.utf8/gen.php      | 181 --------------------------------------
 app/i18n/ru_RU.utf8/index.php    |  61 -------------
 app/i18n/ru_RU.utf8/install.php  | 113 ------------------------
 app/i18n/ru_RU.utf8/sub.php      |  62 -------------
 app/i18n/ru_RU/admin.php         | 183 +++++++++++++++++++++++++++++++++++++++
 app/i18n/ru_RU/conf.php          | 174 +++++++++++++++++++++++++++++++++++++
 app/i18n/ru_RU/feedback.php      | 110 +++++++++++++++++++++++
 app/i18n/ru_RU/gen.php           | 181 ++++++++++++++++++++++++++++++++++++++
 app/i18n/ru_RU/index.php         |  61 +++++++++++++
 app/i18n/ru_RU/install.php       | 113 ++++++++++++++++++++++++
 app/i18n/ru_RU/sub.php           |  62 +++++++++++++
 14 files changed, 884 insertions(+), 884 deletions(-)
 delete mode 100644 app/i18n/ru_RU.utf8/admin.php
 delete mode 100644 app/i18n/ru_RU.utf8/conf.php
 delete mode 100644 app/i18n/ru_RU.utf8/feedback.php
 delete mode 100644 app/i18n/ru_RU.utf8/gen.php
 delete mode 100644 app/i18n/ru_RU.utf8/index.php
 delete mode 100644 app/i18n/ru_RU.utf8/install.php
 delete mode 100644 app/i18n/ru_RU.utf8/sub.php
 create mode 100644 app/i18n/ru_RU/admin.php
 create mode 100644 app/i18n/ru_RU/conf.php
 create mode 100644 app/i18n/ru_RU/feedback.php
 create mode 100644 app/i18n/ru_RU/gen.php
 create mode 100644 app/i18n/ru_RU/index.php
 create mode 100644 app/i18n/ru_RU/install.php
 create mode 100644 app/i18n/ru_RU/sub.php

diff --git a/app/i18n/ru_RU.utf8/admin.php b/app/i18n/ru_RU.utf8/admin.php
deleted file mode 100644
index dfea5b3cb..000000000
--- a/app/i18n/ru_RU.utf8/admin.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-return array(
-	'auth' => array(
-		'allow_anonymous' => 'Разрешить анонимное чтение статей для пользователя по умолчанию (%s)',
-		'allow_anonymous_refresh' => 'Разрешить анонимное обновление статей',
-		'api_enabled' => 'Включить доступ к <abbr>API</abbr> <small>(необходимо для мобильных приложений)</small>',
-		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
-		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
-		'none' => 'Без аутентификации (небезопасный)',
-		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
-		'title' => 'Аутентификации',
-		'title_reset' => 'Сброс аутентицикации',
-		'token' => 'Токен аутентификации',
-		'token_help' => 'Разрешает доступ к RSS ленте пользователя по умолчанию без аутентификации:',
-		'type' => 'Метод аутентификации',
-		'unsafe_autologin' => 'Разрешить небезопасный автоматический вход с использованием следующего формата: ',
-	),
-	'check_install' => array(
-		'cache' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em>. Сервер HTTP должен иметь права на запись в эту папку',
-			'ok' => 'Права на <em>./data/cache</em> в порядке.',
-		),
-		'categories' => array(
-			'nok' => 'Таблица категорий настроена неправильно.',
-			'ok' => 'Таблица категорий настроена правильно.',
-		),
-		'connection' => array(
-			'nok' => 'Подключение к базе данных не может быть установлено.',
-			'ok' => 'Подключение к базе данных в порядке.',
-		),
-		'ctype' => array(
-			'nok' => 'У вас не установлена библиотека для проверки типов символов (php-ctype).',
-			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
-		),
-		'curl' => array(
-			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
-			'ok' => 'У вас установлено расширение cURL.',
-		),
-		'data' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на <em>./data/</em> в порядке.',
-		),
-		'database' => 'Установка базы данных',
-		'dom' => array(
-			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
-			'ok' => 'У вас установлена библиотека для просмотра DOM.',
-		),
-		'entries' => array(
-			'nok' => 'Таблица статей (entry) неправильно настроена.',
-			'ok' => 'Таблица статей (entry) настроена правильно.',
-		),
-		'favicons' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку значков в порядке.',
-		),
-		'feeds' => array(
-			'nok' => 'Таблица подписок (feed) неправильно настроена.',
-			'ok' => 'Таблица подписок (feed) настроена правильно.',
-		),
-		'files' => 'Установка файлов',
-		'json' => array(
-			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
-			'ok' => 'У вас установлена библиотека для работы с JSON.',
-		),
-		'minz' => array(
-			'nok' => 'У вас не установлен фрейворк Minz.',
-			'ok' => 'У вас установлен фрейворк Minz.',
-		),
-		'pcre' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
-			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
-		),
-		'pdo' => array(
-			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
-			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
-		),
-		'persona' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку Mozilla Persona в порядке.',
-		),
-		'php' => array(
-			'_' => 'PHP installation',
-			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
-			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
-		),
-		'tables' => array(
-			'nok' => 'В базе данных отсуствует одна или больше таблица.',
-			'ok' => 'Все таблицы есть в базе данных.',
-		),
-		'title' => 'Проверка установки и настройки',
-		'tokens' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку tokens  в порядке.',
-		),
-		'users' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку users  в порядке.',
-		),
-		'zip' => array(
-			'nok' => 'You lack ZIP extension (php5-zip package).',
-			'ok' => 'You have ZIP extension.',
-		),
-	),
-	'extensions' => array(
-		'disabled' => 'Отключены',
-		'empty_list' => 'Расширения не установлены',
-		'enabled' => 'Включены',
-		'no_configure_view' => 'Это расширение нельзя настроить.',
-		'system' => array(
-			'_' => 'Системные расширения',
-			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
-		),
-		'title' => 'Расширения',
-		'user' => 'Расширения пользователя',
-	),
-	'stats' => array(
-		'_' => 'Статистика',
-		'all_feeds' => 'Все подписки',
-		'category' => 'Категория',
-		'entry_count' => 'Количество статей',
-		'entry_per_category' => 'Статей в категории',
-		'entry_per_day' => 'Статей за день (за последние 30 дней)',
-		'entry_per_day_of_week' => 'За неделю (в среднем - %.2f сообщений)',
-		'entry_per_hour' => 'За час (в среднем - %.2f сообщений)',
-		'entry_per_month' => 'За месяц (в среднем - %.2f сообщений)',
-		'entry_repartition' => 'Перерасределение статей',
-		'feed' => 'Подписка',
-		'feed_per_category' => 'Подписок в категории',
-		'idle' => 'Неактивные подписки',
-		'main' => 'Основная статистика',
-		'main_stream' => 'Основной поток',
-		'menu' => array(
-			'idle' => 'Неактивные подписки',
-			'main' => 'Основная статистика',
-			'repartition' => 'Перерасределение статей',
-		),
-		'no_idle' => 'Нет неактивных подписок!',
-		'number_entries' => 'статей: %d',
-		'percent_of_total' => '%% от всего',
-		'repartition' => 'Перераспределение статей',
-		'status_favorites' => 'Избранное',
-		'status_read' => 'Читать',
-		'status_total' => 'Всего',
-		'status_unread' => 'Не прочитано',
-		'title' => 'Статистика',
-		'top_feed' => '10 лучших подписок',
-	),
-	'system' => array(
-		'_' => 'Системные настройки',
-		'auto-update-url' => 'Адрес сервера для автоматического обновления',
-		'instance-name' => 'Название этого сервера',
-		'max-categories' => 'Количество категорий на пользователя',
-		'max-feeds' => 'Количество статей на пользователя',
-		'registration' => array(
-			'help' => '0 означает неограниченное количество пользователей',
-			'number' => 'Максимальное количество пользователей',
-		),
-	),
-	'update' => array(
-		'_' => 'Обновление системы',
-		'apply' => 'Применить',
-		'check' => 'Проверить обновления',
-		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
-		'last' => 'Последняя проверка: %s',
-		'none' => 'Нечего обновлять',
-		'title' => 'Обновить систему',
-	),
-	'user' => array(
-		'articles_and_size' => '%s статей (%s)',
-		'create' => 'Создать нового пользователя',
-		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-		'language' => 'Язык',
-		'number' => 'На данный момент создан %d аккаунт',
-		'numbers' => 'На данный момент аккаунтов создано:  %d',
-		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
-		'password_format' => 'Минимум 7 символов',
-		'title' => 'Управление пользователями',
-		'user_list' => 'Список пользователей',
-		'username' => 'Имя пользователя',
-		'users' => 'Пользователи',
-	),
-);
diff --git a/app/i18n/ru_RU.utf8/conf.php b/app/i18n/ru_RU.utf8/conf.php
deleted file mode 100644
index e502e9a43..000000000
--- a/app/i18n/ru_RU.utf8/conf.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-return array(
-	'archiving' => array(
-		'_' => 'Архивация',
-		'advanced' => 'Продвинутые настройки',
-		'delete_after' => 'Удалять статьи после',
-		'help' => 'Каждую подписку можно настроить более гибко',
-		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
-		'optimize' => 'Оптимизировать базу данных',
-		'optimize_help' => 'To do occasionally to reduce the size of the database',
-		'purge_now' => 'Очистить сейчас',
-		'title' => 'Архивация',
-		'ttl' => 'Не обновлять чаще чем',
-	),
-	'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' => 'Язык',
-		'notif_html5' => array(
-			'seconds' => 'seconds (0 means no timeout)',
-			'timeout' => 'HTML5 notification timeout',
-		),
-		'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',
-		'delete' => array(
-			'_' => 'Account deletion',
-			'warn' => 'Your account and all the related data will be deleted.',
-		),
-		'email_persona' => 'Login email 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(
-		'_' => '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',
-		'mark_updated_article_unread' => 'Mark updated articles as unread',
-		'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/ru_RU.utf8/feedback.php b/app/i18n/ru_RU.utf8/feedback.php
deleted file mode 100644
index c9189c0d0..000000000
--- a/app/i18n/ru_RU.utf8/feedback.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimisation 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.',
-			'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.',
-	),
-	'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',
-	),
-	'extensions' => array(
-		'already_enabled' => '%s is already 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',
-	),
-	'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.',
-	),
-	'sub' => array(
-		'actualize' => 'Actualise',
-		'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(
-			'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' => '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)',
-	),
-	'update' => array(
-		'can_apply' => 'FreshRSS will now be 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!',
-		'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/ru_RU.utf8/gen.php b/app/i18n/ru_RU.utf8/gen.php
deleted file mode 100644
index d23b12f95..000000000
--- a/app/i18n/ru_RU.utf8/gen.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-return array(
-	'action' => array(
-		'actualize' => 'Actualize',
-		'back_to_rss_feeds' => '← Go back to your RSS feeds',
-		'cancel' => 'Cancel',
-		'create' => 'Create',
-		'disable' => 'Disable',
-		'empty' => 'Empty',
-		'enable' => 'Enable',
-		'export' => 'Export',
-		'filter' => 'Filter',
-		'import' => 'Import',
-		'manage' => 'Manage',
-		'mark_read' => 'Mark as read',
-		'mark_favorite' => 'Mark as favourite',
-		'remove' => 'Remove',
-		'see_website' => 'See website',
-		'submit' => 'Submit',
-		'truncate' => 'Delete all articles',
-	),
-	'auth' => array(
-		'email' => 'Email address',
-		'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' => array(
-			'_' => 'Password',
-			'format' => '<small>At least 7 characters</small>',
-		),
-		'registration' => array(
-			'_' => 'New account',
-			'ask' => 'Create an account?',
-			'title' => 'Account creation',
-		),
-		'reset' => 'Authentication reset',
-		'username' => array(
-			'_' => 'Username',
-			'admin' => 'Administrator username',
-			'format' => '<small>maximum 16 alphanumeric characters</small>',
-		),
-		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
-	),
-	'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',
-		'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',
-		'month' => 'months',
-		'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',
-	),
-	'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!',
-		'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 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.',
-		'should_be_activated' => 'JavaScript must be enabled',
-	),
-	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'fr' => 'Français',
-		'it' => 'Italiano',
-		'nl' => 'Nederlands',
-	),
-	'menu' => array(
-		'about' => 'About',
-		'admin' => 'Administration',
-		'archiving' => 'Archiving',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'configuration' => 'Configuration',
-		'display' => 'Display',
-		'extensions' => 'Extensions',
-		'logs' => 'Logs',
-		'queries' => 'User queries',
-		'reading' => 'Reading',
-		'search' => 'Search words or #tags',
-		'sharing' => 'Sharing',
-		'shortcuts' => 'Shortcuts',
-		'stats' => 'Statistics',
-		'system' => 'System configuration',
-		'update' => 'Update',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
-	'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',
-	),
-	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'g+' => 'Google+',
-		'movim' => 'Movim',
-		'print' => 'Print',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
-	),
-	'short' => array(
-		'attention' => 'Warning!',
-		'blank_to_disable' => 'Leave blank to disable',
-		'by_author' => 'By <em>%s</em>',
-		'by_default' => 'By default',
-		'damn' => 'Damn!',
-		'default_category' => 'Uncategorized',
-		'no' => 'No',
-		'not_applicable' => 'Not available',
-		'ok' => 'Ok!',
-		'or' => 'or',
-		'yes' => 'Yes',
-	),
-);
diff --git a/app/i18n/ru_RU.utf8/index.php b/app/i18n/ru_RU.utf8/index.php
deleted file mode 100644
index 80fa3d950..000000000
--- a/app/i18n/ru_RU.utf8/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
-		'license' => 'License',
-		'project_website' => 'Project website',
-		'title' => 'About',
-		'version' => 'Version',
-		'website' => 'Website',
-	),
-	'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(
-		'_' => 'Logs',
-		'clear' => 'Clear the logs',
-		'empty' => 'Log file is empty',
-		'title' => 'Logs',
-	),
-	'menu' => array(
-		'about' => 'About FreshRSS',
-		'add_query' => 'Add a query',
-		'before_one_day' => 'Before one day',
-		'before_one_week' => 'Before one week',
-		'favorites' => 'Favourites (%s)',
-		'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',
-		'older_first' => 'Oldest first',
-		'queries' => 'User queries',
-		'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 unread',
-	),
-	'share' => 'Share',
-	'tag' => array(
-		'related' => 'Related tags',
-	),
-);
diff --git a/app/i18n/ru_RU.utf8/install.php b/app/i18n/ru_RU.utf8/install.php
deleted file mode 100644
index c838b2eba..000000000
--- a/app/i18n/ru_RU.utf8/install.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-return array(
-	'action' => array(
-		'finish' => 'Завершить установку',
-		'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу.',
-		'keep_install' => 'Сохранить предыдущую установку',
-		'next_step' => 'Перейти к следующему этапу',
-		'reinstall' => 'Переустановить FreshRSS',
-	),
-	'auth' => array(
-		'email_persona' => 'Почта (логин) для <br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-		'form' => 'Вэб-форма (традиционный, необходим JavaScript)',
-		'http' => 'HTTP (для продвинутых пользователей с HTTPS)',
-		'none' => 'Никакого (опасно)',
-		'password_form' => 'Пароль<br /><small>(для метода аутентификации на Вэб-формах)</small>',
-		'password_format' => 'Как минимум 7 букв',
-		'persona' => 'Mozilla Persona (современный, необходим JavaScript)',
-		'type' => 'Метод аутентификации',
-	),
-	'bdd' => array(
-		'_' => 'База данных',
-		'conf' => array(
-			'_' => 'Конфигурация базы данныхDatabase configuration',
-			'ko' => 'Проверьте конфигурацию базы данных.',
-			'ok' => 'Конфигурация базы данных сохранена.',
-		),
-		'host' => 'Хост',
-		'prefix' => 'Префикс таблицы',
-		'password' => 'Пароль HTTP',
-		'type' => 'Тип базы данных',
-		'username' => 'Имя пользователя HTTP',
-	),
-	'check' => array(
-		'_' => 'Проверки',
-		'already_installed' => 'Обнаружена предыдущая установка FreshRSS!',
-		'cache' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку кэша в порядке.',
-		),
-		'ctype' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для проверки типов символов (php-ctype).',
-			'ok' => 'У вас установлена необходимая библиотека для проверки типов символов (ctype).',
-		),
-		'curl' => array(
-			'nok' => 'У вас нет расширения cURL (пакет php5-curl).',
-			'ok' => 'У вас установлено расширение cURL.',
-		),
-		'data' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на <em>./data/</em> в порядке.',
-		),
-		'dom' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для просмотра DOM (пакет php-xml).',
-			'ok' => 'У вас установлена необходимая библиотека для просмотра DOM.',
-		),
-		'favicons' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку значков в порядке.',
-		),
-		'http_referer' => array(
-			'nok' => 'Убедитесь, что вы не изменяете ваш HTTP REFERER.',
-			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
-		),
-		'minz' => array(
-			'nok' => 'У вас не установлен фрейворк Minz.',
-			'ok' => 'У вас установлен фрейворк Minz.',
-		),
-		'pcre' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
-			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
-		),
-		'pdo' => array(
-			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
-			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
-		),
-		'persona' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку Mozilla Persona в порядке.',
-		),
-		'php' => array(
-			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
-			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
-		),
-		'users' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку users  в порядке.',
-		),
-	),
-	'conf' => array(
-		'_' => 'Общие настройки',
-		'ok' => 'Общие настройки были сохранены.',
-	),
-	'congratulations' => 'Поздравляем!',
-	'default_user' => 'Имя пользователя по умолчанию <small>(максимум 16 латинских букв и/или цифр)</small>',
-	'delete_articles_after' => 'Удалять статьи после',
-	'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу..',
-	'javascript_is_better' => 'FreshRSS принесёт больше удовольствия, если включить JavaScript',
-	'js' => array(
-		'confirm_reinstall' => 'Переустанавливая FreshRSS, вы потеряете предыдущую конфигурацию. Вы хотите продолжить?',
-	),
-	'language' => array(
-		'_' => 'Язык',
-		'choose' => 'Выберите язык для FreshRSS',
-		'defined' => 'Язык выбран.',
-	),
-	'not_deleted' => 'Что-то пошло не так; удалите файл <em>%s</em> вручную.',
-	'ok' => 'Установка успешна.',
-	'step' => '%d этап',
-	'steps' => 'Этапы',
-	'title' => 'Установка · FreshRSS',
-	'this_is_the_end' => 'Это конец',
-);
diff --git a/app/i18n/ru_RU.utf8/sub.php b/app/i18n/ru_RU.utf8/sub.php
deleted file mode 100644
index aaaa02827..000000000
--- a/app/i18n/ru_RU.utf8/sub.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-return array(
-	'category' => array(
-		'_' => 'Category',
-		'add' => 'Add a category',
-		'empty' => 'Empty category',
-		'new' => 'New category',
-	),
-	'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 (caution, 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, its 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',
-		'url' => 'Feed URL',
-		'validator' => 'Check the validity of the feed',
-		'website' => 'Website URL',
-		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
-	),
-	'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',
-		'subscription_management' => 'Subscriptions management',
-	),
-	'title' => array(
-		'_' => 'Subscriptions management',
-		'feed_management' => 'RSS feeds management',
-	),
-);
diff --git a/app/i18n/ru_RU/admin.php b/app/i18n/ru_RU/admin.php
new file mode 100644
index 000000000..dfea5b3cb
--- /dev/null
+++ b/app/i18n/ru_RU/admin.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Разрешить анонимное чтение статей для пользователя по умолчанию (%s)',
+		'allow_anonymous_refresh' => 'Разрешить анонимное обновление статей',
+		'api_enabled' => 'Включить доступ к <abbr>API</abbr> <small>(необходимо для мобильных приложений)</small>',
+		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
+		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
+		'none' => 'Без аутентификации (небезопасный)',
+		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
+		'title' => 'Аутентификации',
+		'title_reset' => 'Сброс аутентицикации',
+		'token' => 'Токен аутентификации',
+		'token_help' => 'Разрешает доступ к RSS ленте пользователя по умолчанию без аутентификации:',
+		'type' => 'Метод аутентификации',
+		'unsafe_autologin' => 'Разрешить небезопасный автоматический вход с использованием следующего формата: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em>. Сервер HTTP должен иметь права на запись в эту папку',
+			'ok' => 'Права на <em>./data/cache</em> в порядке.',
+		),
+		'categories' => array(
+			'nok' => 'Таблица категорий настроена неправильно.',
+			'ok' => 'Таблица категорий настроена правильно.',
+		),
+		'connection' => array(
+			'nok' => 'Подключение к базе данных не может быть установлено.',
+			'ok' => 'Подключение к базе данных в порядке.',
+		),
+		'ctype' => array(
+			'nok' => 'У вас не установлена библиотека для проверки типов символов (php-ctype).',
+			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
+			'ok' => 'У вас установлено расширение cURL.',
+		),
+		'data' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на <em>./data/</em> в порядке.',
+		),
+		'database' => 'Установка базы данных',
+		'dom' => array(
+			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
+			'ok' => 'У вас установлена библиотека для просмотра DOM.',
+		),
+		'entries' => array(
+			'nok' => 'Таблица статей (entry) неправильно настроена.',
+			'ok' => 'Таблица статей (entry) настроена правильно.',
+		),
+		'favicons' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку значков в порядке.',
+		),
+		'feeds' => array(
+			'nok' => 'Таблица подписок (feed) неправильно настроена.',
+			'ok' => 'Таблица подписок (feed) настроена правильно.',
+		),
+		'files' => 'Установка файлов',
+		'json' => array(
+			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
+			'ok' => 'У вас установлена библиотека для работы с JSON.',
+		),
+		'minz' => array(
+			'nok' => 'У вас не установлен фрейворк Minz.',
+			'ok' => 'У вас установлен фрейворк Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
+			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку Mozilla Persona в порядке.',
+		),
+		'php' => array(
+			'_' => 'PHP installation',
+			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
+			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'В базе данных отсуствует одна или больше таблица.',
+			'ok' => 'Все таблицы есть в базе данных.',
+		),
+		'title' => 'Проверка установки и настройки',
+		'tokens' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку tokens  в порядке.',
+		),
+		'users' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку users  в порядке.',
+		),
+		'zip' => array(
+			'nok' => 'You lack ZIP extension (php5-zip package).',
+			'ok' => 'You have ZIP extension.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Отключены',
+		'empty_list' => 'Расширения не установлены',
+		'enabled' => 'Включены',
+		'no_configure_view' => 'Это расширение нельзя настроить.',
+		'system' => array(
+			'_' => 'Системные расширения',
+			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
+		),
+		'title' => 'Расширения',
+		'user' => 'Расширения пользователя',
+	),
+	'stats' => array(
+		'_' => 'Статистика',
+		'all_feeds' => 'Все подписки',
+		'category' => 'Категория',
+		'entry_count' => 'Количество статей',
+		'entry_per_category' => 'Статей в категории',
+		'entry_per_day' => 'Статей за день (за последние 30 дней)',
+		'entry_per_day_of_week' => 'За неделю (в среднем - %.2f сообщений)',
+		'entry_per_hour' => 'За час (в среднем - %.2f сообщений)',
+		'entry_per_month' => 'За месяц (в среднем - %.2f сообщений)',
+		'entry_repartition' => 'Перерасределение статей',
+		'feed' => 'Подписка',
+		'feed_per_category' => 'Подписок в категории',
+		'idle' => 'Неактивные подписки',
+		'main' => 'Основная статистика',
+		'main_stream' => 'Основной поток',
+		'menu' => array(
+			'idle' => 'Неактивные подписки',
+			'main' => 'Основная статистика',
+			'repartition' => 'Перерасределение статей',
+		),
+		'no_idle' => 'Нет неактивных подписок!',
+		'number_entries' => 'статей: %d',
+		'percent_of_total' => '%% от всего',
+		'repartition' => 'Перераспределение статей',
+		'status_favorites' => 'Избранное',
+		'status_read' => 'Читать',
+		'status_total' => 'Всего',
+		'status_unread' => 'Не прочитано',
+		'title' => 'Статистика',
+		'top_feed' => '10 лучших подписок',
+	),
+	'system' => array(
+		'_' => 'Системные настройки',
+		'auto-update-url' => 'Адрес сервера для автоматического обновления',
+		'instance-name' => 'Название этого сервера',
+		'max-categories' => 'Количество категорий на пользователя',
+		'max-feeds' => 'Количество статей на пользователя',
+		'registration' => array(
+			'help' => '0 означает неограниченное количество пользователей',
+			'number' => 'Максимальное количество пользователей',
+		),
+	),
+	'update' => array(
+		'_' => 'Обновление системы',
+		'apply' => 'Применить',
+		'check' => 'Проверить обновления',
+		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
+		'last' => 'Последняя проверка: %s',
+		'none' => 'Нечего обновлять',
+		'title' => 'Обновить систему',
+	),
+	'user' => array(
+		'articles_and_size' => '%s статей (%s)',
+		'create' => 'Создать нового пользователя',
+		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Язык',
+		'number' => 'На данный момент создан %d аккаунт',
+		'numbers' => 'На данный момент аккаунтов создано:  %d',
+		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
+		'password_format' => 'Минимум 7 символов',
+		'title' => 'Управление пользователями',
+		'user_list' => 'Список пользователей',
+		'username' => 'Имя пользователя',
+		'users' => 'Пользователи',
+	),
+);
diff --git a/app/i18n/ru_RU/conf.php b/app/i18n/ru_RU/conf.php
new file mode 100644
index 000000000..e502e9a43
--- /dev/null
+++ b/app/i18n/ru_RU/conf.php
@@ -0,0 +1,174 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Архивация',
+		'advanced' => 'Продвинутые настройки',
+		'delete_after' => 'Удалять статьи после',
+		'help' => 'Каждую подписку можно настроить более гибко',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'optimize' => 'Оптимизировать базу данных',
+		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'purge_now' => 'Очистить сейчас',
+		'title' => 'Архивация',
+		'ttl' => 'Не обновлять чаще чем',
+	),
+	'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' => 'Язык',
+		'notif_html5' => array(
+			'seconds' => 'seconds (0 means no timeout)',
+			'timeout' => 'HTML5 notification timeout',
+		),
+		'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',
+		'delete' => array(
+			'_' => 'Account deletion',
+			'warn' => 'Your account and all the related data will be deleted.',
+		),
+		'email_persona' => 'Login email 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(
+		'_' => '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',
+		'mark_updated_article_unread' => 'Mark updated articles as unread',
+		'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/ru_RU/feedback.php b/app/i18n/ru_RU/feedback.php
new file mode 100644
index 000000000..c9189c0d0
--- /dev/null
+++ b/app/i18n/ru_RU/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimisation 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.',
+			'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.',
+	),
+	'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',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s is already 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',
+	),
+	'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.',
+	),
+	'sub' => array(
+		'actualize' => 'Actualise',
+		'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(
+			'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' => '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)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS will now be 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!',
+		'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/ru_RU/gen.php b/app/i18n/ru_RU/gen.php
new file mode 100644
index 000000000..d23b12f95
--- /dev/null
+++ b/app/i18n/ru_RU/gen.php
@@ -0,0 +1,181 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Actualize',
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',
+		'cancel' => 'Cancel',
+		'create' => 'Create',
+		'disable' => 'Disable',
+		'empty' => 'Empty',
+		'enable' => 'Enable',
+		'export' => 'Export',
+		'filter' => 'Filter',
+		'import' => 'Import',
+		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'remove' => 'Remove',
+		'see_website' => 'See website',
+		'submit' => 'Submit',
+		'truncate' => 'Delete all articles',
+	),
+	'auth' => array(
+		'email' => 'Email address',
+		'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' => array(
+			'_' => 'Password',
+			'format' => '<small>At least 7 characters</small>',
+		),
+		'registration' => array(
+			'_' => 'New account',
+			'ask' => 'Create an account?',
+			'title' => 'Account creation',
+		),
+		'reset' => 'Authentication reset',
+		'username' => array(
+			'_' => 'Username',
+			'admin' => 'Administrator username',
+			'format' => '<small>maximum 16 alphanumeric characters</small>',
+		),
+		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+	),
+	'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',
+		'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',
+		'month' => 'months',
+		'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',
+	),
+	'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!',
+		'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 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.',
+		'should_be_activated' => 'JavaScript must be enabled',
+	),
+	'lang' => array(
+		'cz' => 'Čeština',
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'it' => 'Italiano',
+		'nl' => 'Nederlands',
+	),
+	'menu' => array(
+		'about' => 'About',
+		'admin' => 'Administration',
+		'archiving' => 'Archiving',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'configuration' => 'Configuration',
+		'display' => 'Display',
+		'extensions' => 'Extensions',
+		'logs' => 'Logs',
+		'queries' => 'User queries',
+		'reading' => 'Reading',
+		'search' => 'Search words or #tags',
+		'sharing' => 'Sharing',
+		'shortcuts' => 'Shortcuts',
+		'stats' => 'Statistics',
+		'system' => 'System configuration',
+		'update' => 'Update',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'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',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'movim' => 'Movim',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Warning!',
+		'blank_to_disable' => 'Leave blank to disable',
+		'by_author' => 'By <em>%s</em>',
+		'by_default' => 'By default',
+		'damn' => 'Damn!',
+		'default_category' => 'Uncategorized',
+		'no' => 'No',
+		'not_applicable' => 'Not available',
+		'ok' => 'Ok!',
+		'or' => 'or',
+		'yes' => 'Yes',
+	),
+);
diff --git a/app/i18n/ru_RU/index.php b/app/i18n/ru_RU/index.php
new file mode 100644
index 000000000..80fa3d950
--- /dev/null
+++ b/app/i18n/ru_RU/index.php
@@ -0,0 +1,61 @@
+<?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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'license' => 'License',
+		'project_website' => 'Project website',
+		'title' => 'About',
+		'version' => 'Version',
+		'website' => 'Website',
+	),
+	'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(
+		'_' => 'Logs',
+		'clear' => 'Clear the logs',
+		'empty' => 'Log file is empty',
+		'title' => 'Logs',
+	),
+	'menu' => array(
+		'about' => 'About FreshRSS',
+		'add_query' => 'Add a query',
+		'before_one_day' => 'Before one day',
+		'before_one_week' => 'Before one week',
+		'favorites' => 'Favourites (%s)',
+		'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',
+		'older_first' => 'Oldest first',
+		'queries' => 'User queries',
+		'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 unread',
+	),
+	'share' => 'Share',
+	'tag' => array(
+		'related' => 'Related tags',
+	),
+);
diff --git a/app/i18n/ru_RU/install.php b/app/i18n/ru_RU/install.php
new file mode 100644
index 000000000..c838b2eba
--- /dev/null
+++ b/app/i18n/ru_RU/install.php
@@ -0,0 +1,113 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Завершить установку',
+		'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу.',
+		'keep_install' => 'Сохранить предыдущую установку',
+		'next_step' => 'Перейти к следующему этапу',
+		'reinstall' => 'Переустановить FreshRSS',
+	),
+	'auth' => array(
+		'email_persona' => 'Почта (логин) для <br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Вэб-форма (традиционный, необходим JavaScript)',
+		'http' => 'HTTP (для продвинутых пользователей с HTTPS)',
+		'none' => 'Никакого (опасно)',
+		'password_form' => 'Пароль<br /><small>(для метода аутентификации на Вэб-формах)</small>',
+		'password_format' => 'Как минимум 7 букв',
+		'persona' => 'Mozilla Persona (современный, необходим JavaScript)',
+		'type' => 'Метод аутентификации',
+	),
+	'bdd' => array(
+		'_' => 'База данных',
+		'conf' => array(
+			'_' => 'Конфигурация базы данныхDatabase configuration',
+			'ko' => 'Проверьте конфигурацию базы данных.',
+			'ok' => 'Конфигурация базы данных сохранена.',
+		),
+		'host' => 'Хост',
+		'prefix' => 'Префикс таблицы',
+		'password' => 'Пароль HTTP',
+		'type' => 'Тип базы данных',
+		'username' => 'Имя пользователя HTTP',
+	),
+	'check' => array(
+		'_' => 'Проверки',
+		'already_installed' => 'Обнаружена предыдущая установка FreshRSS!',
+		'cache' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку кэша в порядке.',
+		),
+		'ctype' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для проверки типов символов (php-ctype).',
+			'ok' => 'У вас установлена необходимая библиотека для проверки типов символов (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'У вас нет расширения cURL (пакет php5-curl).',
+			'ok' => 'У вас установлено расширение cURL.',
+		),
+		'data' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на <em>./data/</em> в порядке.',
+		),
+		'dom' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для просмотра DOM (пакет php-xml).',
+			'ok' => 'У вас установлена необходимая библиотека для просмотра DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку значков в порядке.',
+		),
+		'http_referer' => array(
+			'nok' => 'Убедитесь, что вы не изменяете ваш HTTP REFERER.',
+			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
+		),
+		'minz' => array(
+			'nok' => 'У вас не установлен фрейворк Minz.',
+			'ok' => 'У вас установлен фрейворк Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
+			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку Mozilla Persona в порядке.',
+		),
+		'php' => array(
+			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
+			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку users  в порядке.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Общие настройки',
+		'ok' => 'Общие настройки были сохранены.',
+	),
+	'congratulations' => 'Поздравляем!',
+	'default_user' => 'Имя пользователя по умолчанию <small>(максимум 16 латинских букв и/или цифр)</small>',
+	'delete_articles_after' => 'Удалять статьи после',
+	'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу..',
+	'javascript_is_better' => 'FreshRSS принесёт больше удовольствия, если включить JavaScript',
+	'js' => array(
+		'confirm_reinstall' => 'Переустанавливая FreshRSS, вы потеряете предыдущую конфигурацию. Вы хотите продолжить?',
+	),
+	'language' => array(
+		'_' => 'Язык',
+		'choose' => 'Выберите язык для FreshRSS',
+		'defined' => 'Язык выбран.',
+	),
+	'not_deleted' => 'Что-то пошло не так; удалите файл <em>%s</em> вручную.',
+	'ok' => 'Установка успешна.',
+	'step' => '%d этап',
+	'steps' => 'Этапы',
+	'title' => 'Установка · FreshRSS',
+	'this_is_the_end' => 'Это конец',
+);
diff --git a/app/i18n/ru_RU/sub.php b/app/i18n/ru_RU/sub.php
new file mode 100644
index 000000000..aaaa02827
--- /dev/null
+++ b/app/i18n/ru_RU/sub.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Category',
+		'add' => 'Add a category',
+		'empty' => 'Empty category',
+		'new' => 'New category',
+	),
+	'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 (caution, 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, its 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',
+		'url' => 'Feed URL',
+		'validator' => 'Check the validity of the feed',
+		'website' => 'Website URL',
+		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
+	),
+	'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',
+		'subscription_management' => 'Subscriptions management',
+	),
+	'title' => array(
+		'_' => 'Subscriptions management',
+		'feed_management' => 'RSS feeds management',
+	),
+);
-- 
cgit v1.2.3


From 053ab59d3dfc62e98866e0ef429d10bb4eb2374b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 11:54:53 +0200
Subject: i18n RU update Wallabag

https://github.com/FreshRSS/FreshRSS/pull/1085
https://github.com/FreshRSS/FreshRSS/pull/1150
---
 app/i18n/ru_RU/gen.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/i18n/ru_RU/gen.php b/app/i18n/ru_RU/gen.php
index d23b12f95..6511311a1 100644
--- a/app/i18n/ru_RU/gen.php
+++ b/app/i18n/ru_RU/gen.php
@@ -163,7 +163,8 @@ return array(
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
 		'attention' => 'Warning!',
-- 
cgit v1.2.3


From 6144413022f3d812528a6124072ac6606ca975ff Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 12:16:42 +0200
Subject: i18n RU finalize draft

https://github.com/FreshRSS/FreshRSS/pull/1085
---
 CHANGELOG.md                |   3 +-
 app/i18n/cz/gen.php         |   1 +
 app/i18n/de/gen.php         |   1 +
 app/i18n/en/gen.php         |   1 +
 app/i18n/fr/gen.php         |   1 +
 app/i18n/it/gen.php         |   1 +
 app/i18n/nl/gen.php         |   1 +
 app/i18n/ru/admin.php       | 183 +++++++++++++++++++++++++++++++++++++++++++
 app/i18n/ru/conf.php        | 174 +++++++++++++++++++++++++++++++++++++++++
 app/i18n/ru/feedback.php    | 110 ++++++++++++++++++++++++++
 app/i18n/ru/gen.php         | 185 ++++++++++++++++++++++++++++++++++++++++++++
 app/i18n/ru/index.php       |  61 +++++++++++++++
 app/i18n/ru/install.php     | 113 +++++++++++++++++++++++++++
 app/i18n/ru/sub.php         |  62 +++++++++++++++
 app/i18n/ru_RU/admin.php    | 183 -------------------------------------------
 app/i18n/ru_RU/conf.php     | 174 -----------------------------------------
 app/i18n/ru_RU/feedback.php | 110 --------------------------
 app/i18n/ru_RU/gen.php      | 182 -------------------------------------------
 app/i18n/ru_RU/index.php    |  61 ---------------
 app/i18n/ru_RU/install.php  | 113 ---------------------------
 app/i18n/ru_RU/sub.php      |  62 ---------------
 app/i18n/tr/gen.php         |   1 +
 22 files changed, 897 insertions(+), 886 deletions(-)
 create mode 100644 app/i18n/ru/admin.php
 create mode 100644 app/i18n/ru/conf.php
 create mode 100644 app/i18n/ru/feedback.php
 create mode 100644 app/i18n/ru/gen.php
 create mode 100644 app/i18n/ru/index.php
 create mode 100644 app/i18n/ru/install.php
 create mode 100644 app/i18n/ru/sub.php
 delete mode 100644 app/i18n/ru_RU/admin.php
 delete mode 100644 app/i18n/ru_RU/conf.php
 delete mode 100644 app/i18n/ru_RU/feedback.php
 delete mode 100644 app/i18n/ru_RU/gen.php
 delete mode 100644 app/i18n/ru_RU/index.php
 delete mode 100644 app/i18n/ru_RU/install.php
 delete mode 100644 app/i18n/ru_RU/sub.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 112d487b8..fcd5127f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## 2016-XX-YY FreshRSS 1.3.2-beta
 
-Nothing for the moment
+* I18n
+	* Draft of Russian [#1085](https://github.com/FreshRSS/FreshRSS/pull/1085)
 
 
 ## 2016-03-11 FreshRSS 1.3.1-beta
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 78ec80f68..af10967a7 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 	),
 	'menu' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 9b460d08d..4b85c722a 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 	),
 	'menu' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 685a7d1a9..ba4e2f86c 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 	),
 	'menu' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index f6695d887..031098aa2 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 	),
 	'menu' => array(
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index b3b4bd78e..bf817d8c2 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 	),
 	'menu' => array(
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 7bd8bbb09..24cba574e 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 	),
 	'menu' => array(
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
new file mode 100644
index 000000000..dfea5b3cb
--- /dev/null
+++ b/app/i18n/ru/admin.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Разрешить анонимное чтение статей для пользователя по умолчанию (%s)',
+		'allow_anonymous_refresh' => 'Разрешить анонимное обновление статей',
+		'api_enabled' => 'Включить доступ к <abbr>API</abbr> <small>(необходимо для мобильных приложений)</small>',
+		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
+		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
+		'none' => 'Без аутентификации (небезопасный)',
+		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
+		'title' => 'Аутентификации',
+		'title_reset' => 'Сброс аутентицикации',
+		'token' => 'Токен аутентификации',
+		'token_help' => 'Разрешает доступ к RSS ленте пользователя по умолчанию без аутентификации:',
+		'type' => 'Метод аутентификации',
+		'unsafe_autologin' => 'Разрешить небезопасный автоматический вход с использованием следующего формата: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em>. Сервер HTTP должен иметь права на запись в эту папку',
+			'ok' => 'Права на <em>./data/cache</em> в порядке.',
+		),
+		'categories' => array(
+			'nok' => 'Таблица категорий настроена неправильно.',
+			'ok' => 'Таблица категорий настроена правильно.',
+		),
+		'connection' => array(
+			'nok' => 'Подключение к базе данных не может быть установлено.',
+			'ok' => 'Подключение к базе данных в порядке.',
+		),
+		'ctype' => array(
+			'nok' => 'У вас не установлена библиотека для проверки типов символов (php-ctype).',
+			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
+			'ok' => 'У вас установлено расширение cURL.',
+		),
+		'data' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на <em>./data/</em> в порядке.',
+		),
+		'database' => 'Установка базы данных',
+		'dom' => array(
+			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
+			'ok' => 'У вас установлена библиотека для просмотра DOM.',
+		),
+		'entries' => array(
+			'nok' => 'Таблица статей (entry) неправильно настроена.',
+			'ok' => 'Таблица статей (entry) настроена правильно.',
+		),
+		'favicons' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку значков в порядке.',
+		),
+		'feeds' => array(
+			'nok' => 'Таблица подписок (feed) неправильно настроена.',
+			'ok' => 'Таблица подписок (feed) настроена правильно.',
+		),
+		'files' => 'Установка файлов',
+		'json' => array(
+			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
+			'ok' => 'У вас установлена библиотека для работы с JSON.',
+		),
+		'minz' => array(
+			'nok' => 'У вас не установлен фрейворк Minz.',
+			'ok' => 'У вас установлен фрейворк Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
+			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку Mozilla Persona в порядке.',
+		),
+		'php' => array(
+			'_' => 'PHP installation',
+			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
+			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'В базе данных отсуствует одна или больше таблица.',
+			'ok' => 'Все таблицы есть в базе данных.',
+		),
+		'title' => 'Проверка установки и настройки',
+		'tokens' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку tokens  в порядке.',
+		),
+		'users' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку users  в порядке.',
+		),
+		'zip' => array(
+			'nok' => 'You lack ZIP extension (php5-zip package).',
+			'ok' => 'You have ZIP extension.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Отключены',
+		'empty_list' => 'Расширения не установлены',
+		'enabled' => 'Включены',
+		'no_configure_view' => 'Это расширение нельзя настроить.',
+		'system' => array(
+			'_' => 'Системные расширения',
+			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
+		),
+		'title' => 'Расширения',
+		'user' => 'Расширения пользователя',
+	),
+	'stats' => array(
+		'_' => 'Статистика',
+		'all_feeds' => 'Все подписки',
+		'category' => 'Категория',
+		'entry_count' => 'Количество статей',
+		'entry_per_category' => 'Статей в категории',
+		'entry_per_day' => 'Статей за день (за последние 30 дней)',
+		'entry_per_day_of_week' => 'За неделю (в среднем - %.2f сообщений)',
+		'entry_per_hour' => 'За час (в среднем - %.2f сообщений)',
+		'entry_per_month' => 'За месяц (в среднем - %.2f сообщений)',
+		'entry_repartition' => 'Перерасределение статей',
+		'feed' => 'Подписка',
+		'feed_per_category' => 'Подписок в категории',
+		'idle' => 'Неактивные подписки',
+		'main' => 'Основная статистика',
+		'main_stream' => 'Основной поток',
+		'menu' => array(
+			'idle' => 'Неактивные подписки',
+			'main' => 'Основная статистика',
+			'repartition' => 'Перерасределение статей',
+		),
+		'no_idle' => 'Нет неактивных подписок!',
+		'number_entries' => 'статей: %d',
+		'percent_of_total' => '%% от всего',
+		'repartition' => 'Перераспределение статей',
+		'status_favorites' => 'Избранное',
+		'status_read' => 'Читать',
+		'status_total' => 'Всего',
+		'status_unread' => 'Не прочитано',
+		'title' => 'Статистика',
+		'top_feed' => '10 лучших подписок',
+	),
+	'system' => array(
+		'_' => 'Системные настройки',
+		'auto-update-url' => 'Адрес сервера для автоматического обновления',
+		'instance-name' => 'Название этого сервера',
+		'max-categories' => 'Количество категорий на пользователя',
+		'max-feeds' => 'Количество статей на пользователя',
+		'registration' => array(
+			'help' => '0 означает неограниченное количество пользователей',
+			'number' => 'Максимальное количество пользователей',
+		),
+	),
+	'update' => array(
+		'_' => 'Обновление системы',
+		'apply' => 'Применить',
+		'check' => 'Проверить обновления',
+		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
+		'last' => 'Последняя проверка: %s',
+		'none' => 'Нечего обновлять',
+		'title' => 'Обновить систему',
+	),
+	'user' => array(
+		'articles_and_size' => '%s статей (%s)',
+		'create' => 'Создать нового пользователя',
+		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Язык',
+		'number' => 'На данный момент создан %d аккаунт',
+		'numbers' => 'На данный момент аккаунтов создано:  %d',
+		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
+		'password_format' => 'Минимум 7 символов',
+		'title' => 'Управление пользователями',
+		'user_list' => 'Список пользователей',
+		'username' => 'Имя пользователя',
+		'users' => 'Пользователи',
+	),
+);
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
new file mode 100644
index 000000000..e502e9a43
--- /dev/null
+++ b/app/i18n/ru/conf.php
@@ -0,0 +1,174 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Архивация',
+		'advanced' => 'Продвинутые настройки',
+		'delete_after' => 'Удалять статьи после',
+		'help' => 'Каждую подписку можно настроить более гибко',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'optimize' => 'Оптимизировать базу данных',
+		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'purge_now' => 'Очистить сейчас',
+		'title' => 'Архивация',
+		'ttl' => 'Не обновлять чаще чем',
+	),
+	'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' => 'Язык',
+		'notif_html5' => array(
+			'seconds' => 'seconds (0 means no timeout)',
+			'timeout' => 'HTML5 notification timeout',
+		),
+		'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',
+		'delete' => array(
+			'_' => 'Account deletion',
+			'warn' => 'Your account and all the related data will be deleted.',
+		),
+		'email_persona' => 'Login email 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(
+		'_' => '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',
+		'mark_updated_article_unread' => 'Mark updated articles as unread',
+		'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/ru/feedback.php b/app/i18n/ru/feedback.php
new file mode 100644
index 000000000..c9189c0d0
--- /dev/null
+++ b/app/i18n/ru/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimisation 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.',
+			'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.',
+	),
+	'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',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s is already 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',
+	),
+	'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.',
+	),
+	'sub' => array(
+		'actualize' => 'Actualise',
+		'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(
+			'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' => '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)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS will now be 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!',
+		'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/ru/gen.php b/app/i18n/ru/gen.php
new file mode 100644
index 000000000..b8e8511d9
--- /dev/null
+++ b/app/i18n/ru/gen.php
@@ -0,0 +1,185 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Actualize',
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',
+		'cancel' => 'Cancel',
+		'create' => 'Create',
+		'disable' => 'Disable',
+		'empty' => 'Empty',
+		'enable' => 'Enable',
+		'export' => 'Export',
+		'filter' => 'Filter',
+		'import' => 'Import',
+		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'remove' => 'Remove',
+		'see_website' => 'See website',
+		'submit' => 'Submit',
+		'truncate' => 'Delete all articles',
+	),
+	'auth' => array(
+		'email' => 'Email address',
+		'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' => array(
+			'_' => 'Password',
+			'format' => '<small>At least 7 characters</small>',
+		),
+		'registration' => array(
+			'_' => 'New account',
+			'ask' => 'Create an account?',
+			'title' => 'Account creation',
+		),
+		'reset' => 'Authentication reset',
+		'username' => array(
+			'_' => 'Username',
+			'admin' => 'Administrator username',
+			'format' => '<small>maximum 16 alphanumeric characters</small>',
+		),
+		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+	),
+	'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',
+		'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',
+		'month' => 'months',
+		'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',
+	),
+	'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!',
+		'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 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.',
+		'should_be_activated' => 'JavaScript must be enabled',
+	),
+	'lang' => array(
+		'cz' => 'Čeština',
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'it' => 'Italiano',
+		'nl' => 'Nederlands',
+		'ru' => 'Русский',
+		'tr' => 'Türkçe',
+	),
+	'menu' => array(
+		'about' => 'About',
+		'admin' => 'Administration',
+		'archiving' => 'Archiving',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'configuration' => 'Configuration',
+		'display' => 'Display',
+		'extensions' => 'Extensions',
+		'logs' => 'Logs',
+		'queries' => 'User queries',
+		'reading' => 'Reading',
+		'search' => 'Search words or #tags',
+		'sharing' => 'Sharing',
+		'shortcuts' => 'Shortcuts',
+		'stats' => 'Statistics',
+		'system' => 'System configuration',
+		'update' => 'Update',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'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',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'jdh' => 'Journal du hacker',
+		'movim' => 'Movim',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
+	),
+	'short' => array(
+		'attention' => 'Warning!',
+		'blank_to_disable' => 'Leave blank to disable',
+		'by_author' => 'By <em>%s</em>',
+		'by_default' => 'By default',
+		'damn' => 'Damn!',
+		'default_category' => 'Uncategorized',
+		'no' => 'No',
+		'not_applicable' => 'Not available',
+		'ok' => 'Ok!',
+		'or' => 'or',
+		'yes' => 'Yes',
+	),
+);
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
new file mode 100644
index 000000000..80fa3d950
--- /dev/null
+++ b/app/i18n/ru/index.php
@@ -0,0 +1,61 @@
+<?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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'license' => 'License',
+		'project_website' => 'Project website',
+		'title' => 'About',
+		'version' => 'Version',
+		'website' => 'Website',
+	),
+	'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(
+		'_' => 'Logs',
+		'clear' => 'Clear the logs',
+		'empty' => 'Log file is empty',
+		'title' => 'Logs',
+	),
+	'menu' => array(
+		'about' => 'About FreshRSS',
+		'add_query' => 'Add a query',
+		'before_one_day' => 'Before one day',
+		'before_one_week' => 'Before one week',
+		'favorites' => 'Favourites (%s)',
+		'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',
+		'older_first' => 'Oldest first',
+		'queries' => 'User queries',
+		'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 unread',
+	),
+	'share' => 'Share',
+	'tag' => array(
+		'related' => 'Related tags',
+	),
+);
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
new file mode 100644
index 000000000..c838b2eba
--- /dev/null
+++ b/app/i18n/ru/install.php
@@ -0,0 +1,113 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Завершить установку',
+		'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу.',
+		'keep_install' => 'Сохранить предыдущую установку',
+		'next_step' => 'Перейти к следующему этапу',
+		'reinstall' => 'Переустановить FreshRSS',
+	),
+	'auth' => array(
+		'email_persona' => 'Почта (логин) для <br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Вэб-форма (традиционный, необходим JavaScript)',
+		'http' => 'HTTP (для продвинутых пользователей с HTTPS)',
+		'none' => 'Никакого (опасно)',
+		'password_form' => 'Пароль<br /><small>(для метода аутентификации на Вэб-формах)</small>',
+		'password_format' => 'Как минимум 7 букв',
+		'persona' => 'Mozilla Persona (современный, необходим JavaScript)',
+		'type' => 'Метод аутентификации',
+	),
+	'bdd' => array(
+		'_' => 'База данных',
+		'conf' => array(
+			'_' => 'Конфигурация базы данныхDatabase configuration',
+			'ko' => 'Проверьте конфигурацию базы данных.',
+			'ok' => 'Конфигурация базы данных сохранена.',
+		),
+		'host' => 'Хост',
+		'prefix' => 'Префикс таблицы',
+		'password' => 'Пароль HTTP',
+		'type' => 'Тип базы данных',
+		'username' => 'Имя пользователя HTTP',
+	),
+	'check' => array(
+		'_' => 'Проверки',
+		'already_installed' => 'Обнаружена предыдущая установка FreshRSS!',
+		'cache' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку кэша в порядке.',
+		),
+		'ctype' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для проверки типов символов (php-ctype).',
+			'ok' => 'У вас установлена необходимая библиотека для проверки типов символов (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'У вас нет расширения cURL (пакет php5-curl).',
+			'ok' => 'У вас установлено расширение cURL.',
+		),
+		'data' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на <em>./data/</em> в порядке.',
+		),
+		'dom' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для просмотра DOM (пакет php-xml).',
+			'ok' => 'У вас установлена необходимая библиотека для просмотра DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку значков в порядке.',
+		),
+		'http_referer' => array(
+			'nok' => 'Убедитесь, что вы не изменяете ваш HTTP REFERER.',
+			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
+		),
+		'minz' => array(
+			'nok' => 'У вас не установлен фрейворк Minz.',
+			'ok' => 'У вас установлен фрейворк Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
+			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку Mozilla Persona в порядке.',
+		),
+		'php' => array(
+			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
+			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+			'ok' => 'Права на папку users  в порядке.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Общие настройки',
+		'ok' => 'Общие настройки были сохранены.',
+	),
+	'congratulations' => 'Поздравляем!',
+	'default_user' => 'Имя пользователя по умолчанию <small>(максимум 16 латинских букв и/или цифр)</small>',
+	'delete_articles_after' => 'Удалять статьи после',
+	'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу..',
+	'javascript_is_better' => 'FreshRSS принесёт больше удовольствия, если включить JavaScript',
+	'js' => array(
+		'confirm_reinstall' => 'Переустанавливая FreshRSS, вы потеряете предыдущую конфигурацию. Вы хотите продолжить?',
+	),
+	'language' => array(
+		'_' => 'Язык',
+		'choose' => 'Выберите язык для FreshRSS',
+		'defined' => 'Язык выбран.',
+	),
+	'not_deleted' => 'Что-то пошло не так; удалите файл <em>%s</em> вручную.',
+	'ok' => 'Установка успешна.',
+	'step' => '%d этап',
+	'steps' => 'Этапы',
+	'title' => 'Установка · FreshRSS',
+	'this_is_the_end' => 'Это конец',
+);
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
new file mode 100644
index 000000000..aaaa02827
--- /dev/null
+++ b/app/i18n/ru/sub.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Category',
+		'add' => 'Add a category',
+		'empty' => 'Empty category',
+		'new' => 'New category',
+	),
+	'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 (caution, 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, its 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',
+		'url' => 'Feed URL',
+		'validator' => 'Check the validity of the feed',
+		'website' => 'Website URL',
+		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
+	),
+	'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',
+		'subscription_management' => 'Subscriptions management',
+	),
+	'title' => array(
+		'_' => 'Subscriptions management',
+		'feed_management' => 'RSS feeds management',
+	),
+);
diff --git a/app/i18n/ru_RU/admin.php b/app/i18n/ru_RU/admin.php
deleted file mode 100644
index dfea5b3cb..000000000
--- a/app/i18n/ru_RU/admin.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-return array(
-	'auth' => array(
-		'allow_anonymous' => 'Разрешить анонимное чтение статей для пользователя по умолчанию (%s)',
-		'allow_anonymous_refresh' => 'Разрешить анонимное обновление статей',
-		'api_enabled' => 'Включить доступ к <abbr>API</abbr> <small>(необходимо для мобильных приложений)</small>',
-		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
-		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
-		'none' => 'Без аутентификации (небезопасный)',
-		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
-		'title' => 'Аутентификации',
-		'title_reset' => 'Сброс аутентицикации',
-		'token' => 'Токен аутентификации',
-		'token_help' => 'Разрешает доступ к RSS ленте пользователя по умолчанию без аутентификации:',
-		'type' => 'Метод аутентификации',
-		'unsafe_autologin' => 'Разрешить небезопасный автоматический вход с использованием следующего формата: ',
-	),
-	'check_install' => array(
-		'cache' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em>. Сервер HTTP должен иметь права на запись в эту папку',
-			'ok' => 'Права на <em>./data/cache</em> в порядке.',
-		),
-		'categories' => array(
-			'nok' => 'Таблица категорий настроена неправильно.',
-			'ok' => 'Таблица категорий настроена правильно.',
-		),
-		'connection' => array(
-			'nok' => 'Подключение к базе данных не может быть установлено.',
-			'ok' => 'Подключение к базе данных в порядке.',
-		),
-		'ctype' => array(
-			'nok' => 'У вас не установлена библиотека для проверки типов символов (php-ctype).',
-			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
-		),
-		'curl' => array(
-			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
-			'ok' => 'У вас установлено расширение cURL.',
-		),
-		'data' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на <em>./data/</em> в порядке.',
-		),
-		'database' => 'Установка базы данных',
-		'dom' => array(
-			'nok' => 'У вас не установлена библиотека для просмотра DOM (пакет php-xml).',
-			'ok' => 'У вас установлена библиотека для просмотра DOM.',
-		),
-		'entries' => array(
-			'nok' => 'Таблица статей (entry) неправильно настроена.',
-			'ok' => 'Таблица статей (entry) настроена правильно.',
-		),
-		'favicons' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку значков в порядке.',
-		),
-		'feeds' => array(
-			'nok' => 'Таблица подписок (feed) неправильно настроена.',
-			'ok' => 'Таблица подписок (feed) настроена правильно.',
-		),
-		'files' => 'Установка файлов',
-		'json' => array(
-			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
-			'ok' => 'У вас установлена библиотека для работы с JSON.',
-		),
-		'minz' => array(
-			'nok' => 'У вас не установлен фрейворк Minz.',
-			'ok' => 'У вас установлен фрейворк Minz.',
-		),
-		'pcre' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
-			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
-		),
-		'pdo' => array(
-			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
-			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
-		),
-		'persona' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку Mozilla Persona в порядке.',
-		),
-		'php' => array(
-			'_' => 'PHP installation',
-			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
-			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
-		),
-		'tables' => array(
-			'nok' => 'В базе данных отсуствует одна или больше таблица.',
-			'ok' => 'Все таблицы есть в базе данных.',
-		),
-		'title' => 'Проверка установки и настройки',
-		'tokens' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку tokens  в порядке.',
-		),
-		'users' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку users  в порядке.',
-		),
-		'zip' => array(
-			'nok' => 'You lack ZIP extension (php5-zip package).',
-			'ok' => 'You have ZIP extension.',
-		),
-	),
-	'extensions' => array(
-		'disabled' => 'Отключены',
-		'empty_list' => 'Расширения не установлены',
-		'enabled' => 'Включены',
-		'no_configure_view' => 'Это расширение нельзя настроить.',
-		'system' => array(
-			'_' => 'Системные расширения',
-			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
-		),
-		'title' => 'Расширения',
-		'user' => 'Расширения пользователя',
-	),
-	'stats' => array(
-		'_' => 'Статистика',
-		'all_feeds' => 'Все подписки',
-		'category' => 'Категория',
-		'entry_count' => 'Количество статей',
-		'entry_per_category' => 'Статей в категории',
-		'entry_per_day' => 'Статей за день (за последние 30 дней)',
-		'entry_per_day_of_week' => 'За неделю (в среднем - %.2f сообщений)',
-		'entry_per_hour' => 'За час (в среднем - %.2f сообщений)',
-		'entry_per_month' => 'За месяц (в среднем - %.2f сообщений)',
-		'entry_repartition' => 'Перерасределение статей',
-		'feed' => 'Подписка',
-		'feed_per_category' => 'Подписок в категории',
-		'idle' => 'Неактивные подписки',
-		'main' => 'Основная статистика',
-		'main_stream' => 'Основной поток',
-		'menu' => array(
-			'idle' => 'Неактивные подписки',
-			'main' => 'Основная статистика',
-			'repartition' => 'Перерасределение статей',
-		),
-		'no_idle' => 'Нет неактивных подписок!',
-		'number_entries' => 'статей: %d',
-		'percent_of_total' => '%% от всего',
-		'repartition' => 'Перераспределение статей',
-		'status_favorites' => 'Избранное',
-		'status_read' => 'Читать',
-		'status_total' => 'Всего',
-		'status_unread' => 'Не прочитано',
-		'title' => 'Статистика',
-		'top_feed' => '10 лучших подписок',
-	),
-	'system' => array(
-		'_' => 'Системные настройки',
-		'auto-update-url' => 'Адрес сервера для автоматического обновления',
-		'instance-name' => 'Название этого сервера',
-		'max-categories' => 'Количество категорий на пользователя',
-		'max-feeds' => 'Количество статей на пользователя',
-		'registration' => array(
-			'help' => '0 означает неограниченное количество пользователей',
-			'number' => 'Максимальное количество пользователей',
-		),
-	),
-	'update' => array(
-		'_' => 'Обновление системы',
-		'apply' => 'Применить',
-		'check' => 'Проверить обновления',
-		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
-		'last' => 'Последняя проверка: %s',
-		'none' => 'Нечего обновлять',
-		'title' => 'Обновить систему',
-	),
-	'user' => array(
-		'articles_and_size' => '%s статей (%s)',
-		'create' => 'Создать нового пользователя',
-		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-		'language' => 'Язык',
-		'number' => 'На данный момент создан %d аккаунт',
-		'numbers' => 'На данный момент аккаунтов создано:  %d',
-		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
-		'password_format' => 'Минимум 7 символов',
-		'title' => 'Управление пользователями',
-		'user_list' => 'Список пользователей',
-		'username' => 'Имя пользователя',
-		'users' => 'Пользователи',
-	),
-);
diff --git a/app/i18n/ru_RU/conf.php b/app/i18n/ru_RU/conf.php
deleted file mode 100644
index e502e9a43..000000000
--- a/app/i18n/ru_RU/conf.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-return array(
-	'archiving' => array(
-		'_' => 'Архивация',
-		'advanced' => 'Продвинутые настройки',
-		'delete_after' => 'Удалять статьи после',
-		'help' => 'Каждую подписку можно настроить более гибко',
-		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
-		'optimize' => 'Оптимизировать базу данных',
-		'optimize_help' => 'To do occasionally to reduce the size of the database',
-		'purge_now' => 'Очистить сейчас',
-		'title' => 'Архивация',
-		'ttl' => 'Не обновлять чаще чем',
-	),
-	'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' => 'Язык',
-		'notif_html5' => array(
-			'seconds' => 'seconds (0 means no timeout)',
-			'timeout' => 'HTML5 notification timeout',
-		),
-		'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',
-		'delete' => array(
-			'_' => 'Account deletion',
-			'warn' => 'Your account and all the related data will be deleted.',
-		),
-		'email_persona' => 'Login email 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(
-		'_' => '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',
-		'mark_updated_article_unread' => 'Mark updated articles as unread',
-		'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/ru_RU/feedback.php b/app/i18n/ru_RU/feedback.php
deleted file mode 100644
index c9189c0d0..000000000
--- a/app/i18n/ru_RU/feedback.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimisation 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.',
-			'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.',
-	),
-	'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',
-	),
-	'extensions' => array(
-		'already_enabled' => '%s is already 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',
-	),
-	'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.',
-	),
-	'sub' => array(
-		'actualize' => 'Actualise',
-		'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(
-			'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' => '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)',
-	),
-	'update' => array(
-		'can_apply' => 'FreshRSS will now be 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!',
-		'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/ru_RU/gen.php b/app/i18n/ru_RU/gen.php
deleted file mode 100644
index 6511311a1..000000000
--- a/app/i18n/ru_RU/gen.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-return array(
-	'action' => array(
-		'actualize' => 'Actualize',
-		'back_to_rss_feeds' => '← Go back to your RSS feeds',
-		'cancel' => 'Cancel',
-		'create' => 'Create',
-		'disable' => 'Disable',
-		'empty' => 'Empty',
-		'enable' => 'Enable',
-		'export' => 'Export',
-		'filter' => 'Filter',
-		'import' => 'Import',
-		'manage' => 'Manage',
-		'mark_read' => 'Mark as read',
-		'mark_favorite' => 'Mark as favourite',
-		'remove' => 'Remove',
-		'see_website' => 'See website',
-		'submit' => 'Submit',
-		'truncate' => 'Delete all articles',
-	),
-	'auth' => array(
-		'email' => 'Email address',
-		'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' => array(
-			'_' => 'Password',
-			'format' => '<small>At least 7 characters</small>',
-		),
-		'registration' => array(
-			'_' => 'New account',
-			'ask' => 'Create an account?',
-			'title' => 'Account creation',
-		),
-		'reset' => 'Authentication reset',
-		'username' => array(
-			'_' => 'Username',
-			'admin' => 'Administrator username',
-			'format' => '<small>maximum 16 alphanumeric characters</small>',
-		),
-		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
-	),
-	'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',
-		'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',
-		'month' => 'months',
-		'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',
-	),
-	'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!',
-		'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 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.',
-		'should_be_activated' => 'JavaScript must be enabled',
-	),
-	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'fr' => 'Français',
-		'it' => 'Italiano',
-		'nl' => 'Nederlands',
-	),
-	'menu' => array(
-		'about' => 'About',
-		'admin' => 'Administration',
-		'archiving' => 'Archiving',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'configuration' => 'Configuration',
-		'display' => 'Display',
-		'extensions' => 'Extensions',
-		'logs' => 'Logs',
-		'queries' => 'User queries',
-		'reading' => 'Reading',
-		'search' => 'Search words or #tags',
-		'sharing' => 'Sharing',
-		'shortcuts' => 'Shortcuts',
-		'stats' => 'Statistics',
-		'system' => 'System configuration',
-		'update' => 'Update',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
-	'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',
-	),
-	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'g+' => 'Google+',
-		'movim' => 'Movim',
-		'print' => 'Print',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
-	),
-	'short' => array(
-		'attention' => 'Warning!',
-		'blank_to_disable' => 'Leave blank to disable',
-		'by_author' => 'By <em>%s</em>',
-		'by_default' => 'By default',
-		'damn' => 'Damn!',
-		'default_category' => 'Uncategorized',
-		'no' => 'No',
-		'not_applicable' => 'Not available',
-		'ok' => 'Ok!',
-		'or' => 'or',
-		'yes' => 'Yes',
-	),
-);
diff --git a/app/i18n/ru_RU/index.php b/app/i18n/ru_RU/index.php
deleted file mode 100644
index 80fa3d950..000000000
--- a/app/i18n/ru_RU/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
-		'license' => 'License',
-		'project_website' => 'Project website',
-		'title' => 'About',
-		'version' => 'Version',
-		'website' => 'Website',
-	),
-	'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(
-		'_' => 'Logs',
-		'clear' => 'Clear the logs',
-		'empty' => 'Log file is empty',
-		'title' => 'Logs',
-	),
-	'menu' => array(
-		'about' => 'About FreshRSS',
-		'add_query' => 'Add a query',
-		'before_one_day' => 'Before one day',
-		'before_one_week' => 'Before one week',
-		'favorites' => 'Favourites (%s)',
-		'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',
-		'older_first' => 'Oldest first',
-		'queries' => 'User queries',
-		'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 unread',
-	),
-	'share' => 'Share',
-	'tag' => array(
-		'related' => 'Related tags',
-	),
-);
diff --git a/app/i18n/ru_RU/install.php b/app/i18n/ru_RU/install.php
deleted file mode 100644
index c838b2eba..000000000
--- a/app/i18n/ru_RU/install.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-return array(
-	'action' => array(
-		'finish' => 'Завершить установку',
-		'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу.',
-		'keep_install' => 'Сохранить предыдущую установку',
-		'next_step' => 'Перейти к следующему этапу',
-		'reinstall' => 'Переустановить FreshRSS',
-	),
-	'auth' => array(
-		'email_persona' => 'Почта (логин) для <br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-		'form' => 'Вэб-форма (традиционный, необходим JavaScript)',
-		'http' => 'HTTP (для продвинутых пользователей с HTTPS)',
-		'none' => 'Никакого (опасно)',
-		'password_form' => 'Пароль<br /><small>(для метода аутентификации на Вэб-формах)</small>',
-		'password_format' => 'Как минимум 7 букв',
-		'persona' => 'Mozilla Persona (современный, необходим JavaScript)',
-		'type' => 'Метод аутентификации',
-	),
-	'bdd' => array(
-		'_' => 'База данных',
-		'conf' => array(
-			'_' => 'Конфигурация базы данныхDatabase configuration',
-			'ko' => 'Проверьте конфигурацию базы данных.',
-			'ok' => 'Конфигурация базы данных сохранена.',
-		),
-		'host' => 'Хост',
-		'prefix' => 'Префикс таблицы',
-		'password' => 'Пароль HTTP',
-		'type' => 'Тип базы данных',
-		'username' => 'Имя пользователя HTTP',
-	),
-	'check' => array(
-		'_' => 'Проверки',
-		'already_installed' => 'Обнаружена предыдущая установка FreshRSS!',
-		'cache' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку кэша в порядке.',
-		),
-		'ctype' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для проверки типов символов (php-ctype).',
-			'ok' => 'У вас установлена необходимая библиотека для проверки типов символов (ctype).',
-		),
-		'curl' => array(
-			'nok' => 'У вас нет расширения cURL (пакет php5-curl).',
-			'ok' => 'У вас установлено расширение cURL.',
-		),
-		'data' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на <em>./data/</em> в порядке.',
-		),
-		'dom' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для просмотра DOM (пакет php-xml).',
-			'ok' => 'У вас установлена необходимая библиотека для просмотра DOM.',
-		),
-		'favicons' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку значков в порядке.',
-		),
-		'http_referer' => array(
-			'nok' => 'Убедитесь, что вы не изменяете ваш HTTP REFERER.',
-			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
-		),
-		'minz' => array(
-			'nok' => 'У вас не установлен фрейворк Minz.',
-			'ok' => 'У вас установлен фрейворк Minz.',
-		),
-		'pcre' => array(
-			'nok' => 'У вас не установлена необходимая библиотека для работы с регулярными выражениями (php-pcre).',
-			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
-		),
-		'pdo' => array(
-			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
-			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
-		),
-		'persona' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку Mozilla Persona в порядке.',
-		),
-		'php' => array(
-			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
-			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
-		),
-		'users' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку users  в порядке.',
-		),
-	),
-	'conf' => array(
-		'_' => 'Общие настройки',
-		'ok' => 'Общие настройки были сохранены.',
-	),
-	'congratulations' => 'Поздравляем!',
-	'default_user' => 'Имя пользователя по умолчанию <small>(максимум 16 латинских букв и/или цифр)</small>',
-	'delete_articles_after' => 'Удалять статьи после',
-	'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу..',
-	'javascript_is_better' => 'FreshRSS принесёт больше удовольствия, если включить JavaScript',
-	'js' => array(
-		'confirm_reinstall' => 'Переустанавливая FreshRSS, вы потеряете предыдущую конфигурацию. Вы хотите продолжить?',
-	),
-	'language' => array(
-		'_' => 'Язык',
-		'choose' => 'Выберите язык для FreshRSS',
-		'defined' => 'Язык выбран.',
-	),
-	'not_deleted' => 'Что-то пошло не так; удалите файл <em>%s</em> вручную.',
-	'ok' => 'Установка успешна.',
-	'step' => '%d этап',
-	'steps' => 'Этапы',
-	'title' => 'Установка · FreshRSS',
-	'this_is_the_end' => 'Это конец',
-);
diff --git a/app/i18n/ru_RU/sub.php b/app/i18n/ru_RU/sub.php
deleted file mode 100644
index aaaa02827..000000000
--- a/app/i18n/ru_RU/sub.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-return array(
-	'category' => array(
-		'_' => 'Category',
-		'add' => 'Add a category',
-		'empty' => 'Empty category',
-		'new' => 'New category',
-	),
-	'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 (caution, 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, its 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',
-		'url' => 'Feed URL',
-		'validator' => 'Check the validity of the feed',
-		'website' => 'Website URL',
-		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
-	),
-	'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',
-		'subscription_management' => 'Subscriptions management',
-	),
-	'title' => array(
-		'_' => 'Subscriptions management',
-		'feed_management' => 'RSS feeds management',
-	),
-);
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 092c19752..492e2cb9b 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 	),
 	'menu' => array(
-- 
cgit v1.2.3


From e2bd228b002f070618c1e49973bd56e5e71f0ae5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 12:37:19 +0200
Subject: Changelog 1.3.2-beta

---
 CHANGELOG.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcd5127f1..136fcd642 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,26 @@
 # Changelog
 
-## 2016-XX-YY FreshRSS 1.3.2-beta
+## 2016-06-XX FreshRSS 1.3.2-beta
 
+* Compatibility
+	* Require at least PHP 5.3+ (drop PHP 5.2) [#1133](https://github.com/FreshRSS/FreshRSS/pull/1133)
+* Features
+	* Support for MySQL 5.7+ (e.g. Ubuntu 16.04 LTS) [#1132](https://github.com/FreshRSS/FreshRSS/pull/1132)
+	* Speed optimization for HTTP/2 [#1133](https://github.com/FreshRSS/FreshRSS/pull/1133)
+	* API support for REDIRECT_* HTTP headers (fcgi) [#1128](https://github.com/FreshRSS/FreshRSS/issues/1128)
+* SimplePie
+	* Support for feeds with invalid whitespace [#1142](https://github.com/FreshRSS/FreshRSS/issues/1142)
+* Bug fixing
+	* Fix bug when adding feeds with passwords [#1137](https://github.com/FreshRSS/FreshRSS/pull/1137)
+	* Fix validator link [#1147](https://github.com/FreshRSS/FreshRSS/pull/1147)
+	* Fix Favicon small bugs [#1135](https://github.com/FreshRSS/FreshRSS/pull/1135)
+* Security
+	* CSP compatibility for homepage [#1120](https://github.com/FreshRSS/FreshRSS/pull/1120)
 * I18n
 	* Draft of Russian [#1085](https://github.com/FreshRSS/FreshRSS/pull/1085)
+* Misc.
+	* Change default feed timeout to 15 seconds [#1146](https://github.com/FreshRSS/FreshRSS/pull/1146)
+	* Updated Wallabag v2 [#1150](https://github.com/FreshRSS/FreshRSS/pull/1150)
 
 
 ## 2016-03-11 FreshRSS 1.3.1-beta
-- 
cgit v1.2.3


From 571b594bbf0965569d4dbd6d855de6dc3c97fe46 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 12:42:50 +0200
Subject: Prepare for 1.3.2-beta

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index 2cf0f5bf4..4bf99585f 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.3.2-dev');
+define('FRESHRSS_VERSION', '1.3.2-beta');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 0b1606b23bd8e1e272b3835a326d5f7a80d202e5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 12:44:32 +0200
Subject: Release date 1.3.2-beta

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 136fcd642..bebbf0022 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-06-XX FreshRSS 1.3.2-beta
+## 2016-06-12 FreshRSS 1.3.2-beta
 
 * Compatibility
 	* Require at least PHP 5.3+ (drop PHP 5.2) [#1133](https://github.com/FreshRSS/FreshRSS/pull/1133)
-- 
cgit v1.2.3


From ea4deb6e0568adca6c0f1bea536fac6869f9c7ec Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 13:18:31 +0200
Subject: Check minimum PHP 5.3.0+

https://github.com/FreshRSS/FreshRSS/pull/1133
---
 app/install.php                     | 4 ++--
 app/views/update/checkInstall.phtml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/install.php b/app/install.php
index b47effc84..062f66814 100644
--- a/app/install.php
+++ b/app/install.php
@@ -309,7 +309,7 @@ function checkStep0() {
 }
 
 function checkStep1() {
-	$php = version_compare(PHP_VERSION, '5.2.1') >= 0;
+	$php = version_compare(PHP_VERSION, '5.3.0') >= 0;
 	$minz = file_exists(join_path(LIB_PATH, 'Minz'));
 	$curl = extension_loaded('curl');
 	$pdo_mysql = extension_loaded('pdo_mysql');
@@ -536,7 +536,7 @@ function printStep1() {
 	<?php if ($res['php'] == 'ok') { ?>
 	<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('gen.short.damn'); ?></span> <?php echo _t('install.check.php.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.3.0'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['minz'] == 'ok') { ?>
diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml
index a92860c7e..ed3858b56 100644
--- a/app/views/update/checkInstall.phtml
+++ b/app/views/update/checkInstall.phtml
@@ -9,7 +9,7 @@
 	<p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>">
 		<?php
 			if ($key === 'php') {
-				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.2.1');
+				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.3.0');
 			} else {
 				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'));
 			}
-- 
cgit v1.2.3


From 17de4363b5b0ab3f3ddc703ccf98332770040e17 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 13:24:20 +0200
Subject: i18n Movim Wallabag missing

https://github.com/FreshRSS/FreshRSS/pull/1165
---
 app/i18n/cz/gen.php | 3 ++-
 app/i18n/it/gen.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index af10967a7..5e15ae6f9 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -165,7 +165,8 @@ return array(
 		'print' => 'Tisk',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index bf817d8c2..d24377593 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -161,6 +161,7 @@ return array(
 		'email' => 'Email',
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
+		'movim' => 'Movim',
 		'print' => 'Stampa',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-- 
cgit v1.2.3


From 1cc890c0eb1f8201da16af8d5ee0f4ea4828f862 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 12 Jun 2016 22:27:04 +0200
Subject: Start next dev

https://github.com/FreshRSS/FreshRSS/pull/1165
---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index 4bf99585f..8d2708806 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.3.2-beta');
+define('FRESHRSS_VERSION', '1.3.3-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From d9e14621b5a0de1c189486bbc8c18a7b007d6965 Mon Sep 17 00:00:00 2001
From: romibi <romibi@bluewin.ch>
Date: Fri, 8 Jul 2016 19:12:43 +0200
Subject: Make Sidebar Sticky

---
 README.fr.md                       | 1 +
 README.md                          | 1 +
 app/FreshRSS.php                   | 3 ++-
 p/scripts/jquery.sticky-kit.min.js | 9 +++++++++
 p/scripts/main.js                  | 5 ++++-
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 p/scripts/jquery.sticky-kit.min.js

diff --git a/README.fr.md b/README.fr.md
index c28cd3069..8892ddc3f 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -126,6 +126,7 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 * [MINZ](https://github.com/marienfressinaud/MINZ)
 * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/)
 * [jQuery](http://jquery.com/)
+* [jQuery Plugin Sticky-Kit](http://leafo.net/sticky-kit/)
 * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/)
 * [flotr2](http://www.humblesoftware.com/flotr2)
 
diff --git a/README.md b/README.md
index db06b4315..0beed2946 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ mysqldump -u user -p --databases freshrss > freshrss.sql
 * [MINZ](https://github.com/marienfressinaud/MINZ)
 * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/)
 * [jQuery](http://jquery.com/)
+* [jQuery Plugin Sticky-Kit](http://leafo.net/sticky-kit/)
 * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/)
 * [flotr2](http://www.humblesoftware.com/flotr2)
 
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 4933892bc..b1c01478f 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -95,7 +95,8 @@ 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/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')),false,false,false);
+		Minz_View::appendScript(Minz_Url::display('/scripts/jquery.sticky-kit.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.sticky-kit.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/p/scripts/jquery.sticky-kit.min.js b/p/scripts/jquery.sticky-kit.min.js
new file mode 100644
index 000000000..e2a3c6de9
--- /dev/null
+++ b/p/scripts/jquery.sticky-kit.min.js
@@ -0,0 +1,9 @@
+/*
+ Sticky-kit v1.1.2 | WTFPL | Leaf Corcoran 2015 | http://leafo.net
+*/
+(function(){var b,f;b=this.jQuery||window.jQuery;f=b(window);b.fn.stick_in_parent=function(d){var A,w,J,n,B,K,p,q,k,E,t;null==d&&(d={});t=d.sticky_class;B=d.inner_scrolling;E=d.recalc_every;k=d.parent;q=d.offset_top;p=d.spacer;w=d.bottoming;null==q&&(q=0);null==k&&(k=void 0);null==B&&(B=!0);null==t&&(t="is_stuck");A=b(document);null==w&&(w=!0);J=function(a,d,n,C,F,u,r,G){var v,H,m,D,I,c,g,x,y,z,h,l;if(!a.data("sticky_kit")){a.data("sticky_kit",!0);I=A.height();g=a.parent();null!=k&&(g=g.closest(k));
+if(!g.length)throw"failed to find stick parent";v=m=!1;(h=null!=p?p&&a.closest(p):b("<div />"))&&h.css("position",a.css("position"));x=function(){var c,f,e;if(!G&&(I=A.height(),c=parseInt(g.css("border-top-width"),10),f=parseInt(g.css("padding-top"),10),d=parseInt(g.css("padding-bottom"),10),n=g.offset().top+c+f,C=g.height(),m&&(v=m=!1,null==p&&(a.insertAfter(h),h.detach()),a.css({position:"",top:"",width:"",bottom:""}).removeClass(t),e=!0),F=a.offset().top-(parseInt(a.css("margin-top"),10)||0)-q,
+u=a.outerHeight(!0),r=a.css("float"),h&&h.css({width:a.outerWidth(!0),height:u,display:a.css("display"),"vertical-align":a.css("vertical-align"),"float":r}),e))return l()};x();if(u!==C)return D=void 0,c=q,z=E,l=function(){var b,l,e,k;if(!G&&(e=!1,null!=z&&(--z,0>=z&&(z=E,x(),e=!0)),e||A.height()===I||x(),e=f.scrollTop(),null!=D&&(l=e-D),D=e,m?(w&&(k=e+u+c>C+n,v&&!k&&(v=!1,a.css({position:"fixed",bottom:"",top:c}).trigger("sticky_kit:unbottom"))),e<F&&(m=!1,c=q,null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),
+h.detach()),b={position:"",width:"",top:""},a.css(b).removeClass(t).trigger("sticky_kit:unstick")),B&&(b=f.height(),u+q>b&&!v&&(c-=l,c=Math.max(b-u,c),c=Math.min(q,c),m&&a.css({top:c+"px"})))):e>F&&(m=!0,b={position:"fixed",top:c},b.width="border-box"===a.css("box-sizing")?a.outerWidth()+"px":a.width()+"px",a.css(b).addClass(t),null==p&&(a.after(h),"left"!==r&&"right"!==r||h.append(a)),a.trigger("sticky_kit:stick")),m&&w&&(null==k&&(k=e+u+c>C+n),!v&&k)))return v=!0,"static"===g.css("position")&&g.css({position:"relative"}),
+a.css({position:"absolute",bottom:d,top:"auto"}).trigger("sticky_kit:bottom")},y=function(){x();return l()},H=function(){G=!0;f.off("touchmove",l);f.off("scroll",l);f.off("resize",y);b(document.body).off("sticky_kit:recalc",y);a.off("sticky_kit:detach",H);a.removeData("sticky_kit");a.css({position:"",bottom:"",top:"",width:""});g.position("position","");if(m)return null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),h.remove()),a.removeClass(t)},f.on("touchmove",l),f.on("scroll",l),f.on("resize",
+y),b(document.body).on("sticky_kit:recalc",y),a.on("sticky_kit:detach",H),setTimeout(l,0)}};n=0;for(K=this.length;n<K;n++)d=this[n],J(b(d));return this}}).call(this);
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f1b82900e..7ff43343e 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -508,7 +508,7 @@ function init_column_categories() {
 				this.alt = '▽';
 			}
 		});
-		$(this).parent().next(".tree-folder-items").slideToggle();
+		$(this).parent().next(".tree-folder-items").slideToggle( 400 , function() {  $(document.body).trigger("sticky_kit:recalc"); } );
 		return false;
 	});
 	$('#aside_feed').on('click', '.tree-folder-items .item .dropdown-toggle', function () {
@@ -519,6 +519,9 @@ function init_column_categories() {
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});
+	if( $('.toggle_aside').css('display')=='none') {
+		$('#aside_feed .tree').stick_in_parent();
+	}
 }
 
 function init_shortcuts() {
-- 
cgit v1.2.3


From 43f3be7098a908321c29a14a1fbe542389479155 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 23 Jul 2016 17:09:47 +0200
Subject: Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bebbf0022..5f0eb4589 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+## 2016-07-23 FreshRSS 1.4.0
 ## 2016-06-12 FreshRSS 1.3.2-beta
 
 * Compatibility
-- 
cgit v1.2.3


From 92d4ad32c9eb165dee6dc6d4b8cf510428dde9ec Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 23 Jul 2016 17:12:10 +0200
Subject: Version 1.4.0

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.php b/constants.php
index 4bf99585f..44e68c13c 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.3.2-beta');
+define('FRESHRSS_VERSION', '1.4.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From f63386703daad6b36162da90cc5011aa3afa349f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 23 Jul 2016 17:37:32 +0200
Subject: Prepare next dev version

---
 CHANGELOG.md  | 5 +++++
 constants.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f0eb4589..4d68e068a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## XXXX-XX-XX FreshRSS 1.5.0
+
+Nothing yet.
+
+
 ## 2016-07-23 FreshRSS 1.4.0
 ## 2016-06-12 FreshRSS 1.3.2-beta
 
diff --git a/constants.php b/constants.php
index 44e68c13c..8a6ce8a66 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.4.0');
+define('FRESHRSS_VERSION', '1.5.0-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From a78b3f5e7f19a1f1320fcb12f7c8b450f9a9dba4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 23 Jul 2016 17:48:07 +0200
Subject: Remove references about beta version

---
 README.fr.md | 1 -
 README.md    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index c28cd3069..fd01a507b 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -21,7 +21,6 @@ Voir la [liste des versions](../../releases).
 **Ce logiciel est en développement permanent !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
 
 * 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 veulent aider à tester les toutes dernières fonctionnalités, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
 
 # Avertissements
diff --git a/README.md b/README.md
index db06b4315..a0d22a75c 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,6 @@ See the [list of releases](../../releases).
 **This application is under continuous development!** Please use the branch that suits your needs:
 
 * 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 willing to help testing the latest features, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
 
 # Disclaimer
-- 
cgit v1.2.3


From 090c647cd54e4cde051b12ece24d79af1d222fde Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 Jul 2016 12:19:02 +0200
Subject: Fix logs style scroll bug

https://github.com/FreshRSS/FreshRSS/issues/1178
There was a conflict on the ".logs" class name
---
 app/views/index/logs.phtml           | 2 +-
 p/themes/BlueLagoon/BlueLagoon.css   | 2 +-
 p/themes/Dark/dark.css               | 2 +-
 p/themes/Flat/flat.css               | 2 +-
 p/themes/Origine/origine.css         | 2 +-
 p/themes/Pafat/pafat.css             | 2 +-
 p/themes/Screwdriver/screwdriver.css | 2 +-
 p/themes/base-theme/base.css         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 02256bd98..0938491c3 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -10,7 +10,7 @@
 	<?php $items = $this->logsPaginator->items(); ?>
 
 	<?php if (!empty($items)) { ?>
-	<div class="logs">
+	<div class="loglist">
 		<?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?>
 
 		<?php foreach ($items as $log) { ?>
diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index e1b93dac9..d64ffd9a0 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -1054,7 +1054,7 @@ opacity: 1;
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	border: 1px solid #aaa;
 	border-radius: 5px;
 	overflow: hidden;
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 65ee0a049..f72ed8b5b 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -928,7 +928,7 @@ a.btn {
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	overflow: hidden;
 	border: 1px solid #333;
 }
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 1e5cdf8ff..0672c6a38 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -921,7 +921,7 @@ a.btn {
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	overflow: hidden;
 	border: 1px solid #aaa;
 }
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index ee08b33bb..da461087b 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -966,7 +966,7 @@ a.btn {
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	border: 1px solid #aaa;
 	border-radius: 5px;
 	overflow: hidden;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 374471ebc..5e46a63ca 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -977,7 +977,7 @@ a.btn {
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	border: 1px solid #aaa;
 	border-radius: 5px;
 	overflow: hidden;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 8754b0b2f..b7bbd923e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -1052,7 +1052,7 @@ opacity: 1;
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	border: 1px solid #aaa;
 	border-radius: 5px;
 	overflow: hidden;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 6c788371d..192a957c9 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -731,7 +731,7 @@ a.btn {
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	overflow: hidden;
 }
 .log {
-- 
cgit v1.2.3


From fe18d12551f626c56257f825caf8f97a4a5461ce Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 Jul 2016 18:45:34 +0200
Subject: Update MySQL to utf8mb4 (full unicode) 🔥
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Requires MySQL 5.5.3+ (drop support for MySQL 5.0)
* Requires PHP 5.3.3+ (drop support for PHP 5.3.0)
https://github.com/FreshRSS/FreshRSS/issues/789#issuecomment-73878076
---
 README.fr.md                        |  4 +--
 README.md                           |  4 +--
 app/Controllers/feedController.php  | 14 +++++----
 app/Models/EntryDAO.php             | 60 +++++++++++++++++++++++++++++++------
 app/SQL/install.sql.mysql.php       | 31 +++++++++++++++----
 app/install.php                     | 10 +++----
 app/views/update/checkInstall.phtml |  2 +-
 lib/Minz/ModelPdo.php               | 12 +++-----
 8 files changed, 99 insertions(+), 38 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index fd01a507b..9da60408f 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -32,11 +32,11 @@ Nous sommes une communauté amicale.
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
-* PHP 5.3+ (PHP 5.3.7+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
+* PHP 5.3.3+ (PHP 5.3.7+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
 	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Inclus par défaut : [DOM](http://php.net/dom), [XML](http://php.net/xml)…
-* MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
+* MySQL 5.5.3+ (recommandé) ou SQLite 3.7.4+
 * Un navigateur Web récent tel Firefox, Chrome, Opera, Safari. [Internet Explorer ne fonctionne plus, mais ce sera corrigé](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Fonctionne aussi sur mobile
 * L’entête HTTP `Referer` ne doit pas être désactivé pour pouvoir utiliser le formulaire de connexion
diff --git a/README.md b/README.md
index a0d22a75c..db5e8c02d 100644
--- a/README.md
+++ b/README.md
@@ -32,11 +32,11 @@ We are a friendly community.
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
-* PHP 5.3+ (PHP 5.3.7+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
+* PHP 5.3.3+ (PHP 5.3.7+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
 	* Recommended extensions: [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Enabled by default: [DOM](http://php.net/dom), [XML](http://php.net/xml)…
-* MySQL 5.0.3+ (recommended) or SQLite 3.7.4+
+* MySQL 5.5.3+ (recommended) or SQLite 3.7.4+
 * A recent browser like Firefox, Chrome, Opera, Safari. [Internet Explorer currently not supported, but support will come back](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Works on mobile
 * The browser HTTP `Referer` header must not be disabled when using the form login method
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 6a8aa01cf..ffda1450d 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -200,7 +200,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$entryDAO->addEntry($values);
 			}
 			$feedDAO->updateLastUpdate($feed->id());
-			$feedDAO->commit();
+			if ($feedDAO->inTransaction()) {
+				$feedDAO->commit();
+			}
 
 			// Entries are in DB, we redirect to feed configuration page.
 			$url_redirect['params']['id'] = $feed->id();
@@ -364,7 +366,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 								//', old hash ' . $existingHash . ', new hash ' . $entry->hash());
 							//TODO: Make an updated/is_read policy by feed, in addition to the global one.
 							$entry->_isRead(FreshRSS_Context::$user_conf->mark_updated_article_unread ? false : null);	//Change is_read according to policy.
-							if (!$entryDAO->hasTransaction()) {
+							if (!$entryDAO->inTransaction()) {
 								$entryDAO->beginTransaction();
 							}
 							$entryDAO->updateEntry($entry->toArray());
@@ -396,7 +398,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							$feed->pubSubHubbubError(true);
 						}
 
-						if (!$entryDAO->hasTransaction()) {
+						if (!$entryDAO->inTransaction()) {
 							$entryDAO->beginTransaction();
 						}
 						$entryDAO->addEntry($entry->toArray());
@@ -408,7 +410,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 (see entry::purge)
 				// Remove old entries once in 30.
-				if (!$entryDAO->hasTransaction()) {
+				if (!$entryDAO->inTransaction()) {
 					$entryDAO->beginTransaction();
 				}
 
@@ -421,8 +423,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				}
 			}
 
-			$feedDAO->updateLastUpdate($feed->id(), 0, $entryDAO->hasTransaction());
-			if ($entryDAO->hasTransaction()) {
+			$feedDAO->updateLastUpdate($feed->id(), 0, $entryDAO->inTransaction());
+			if ($entryDAO->inTransaction()) {
 				$entryDAO->commit();
 			}
 
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index f74055835..fa5d87b55 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -11,7 +11,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	}
 
 	protected function addColumn($name) {
-		Minz_Log::debug('FreshRSS_EntryDAO::autoAddColumn: ' . $name);
+		Minz_Log::warning('FreshRSS_EntryDAO::addColumn: ' . $name);
 		$hasTransaction = false;
 		try {
 			$stm = null;
@@ -38,7 +38,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				return $stm && $stm->execute();
 			}
 		} catch (Exception $e) {
-			Minz_Log::debug('FreshRSS_EntryDAO::autoAddColumn error: ' . $e->getMessage());
+			Minz_Log::error('FreshRSS_EntryDAO::addColumn error: ' . $e->getMessage());
 			if ($hasTransaction) {
 				$this->bd->rollBack();
 			}
@@ -46,9 +46,44 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return false;
 	}
 
-	protected function autoAddColumn($errorInfo) {
+	private $triedUpdateToUtf8mb4 = false;
+
+	protected function updateToUtf8mb4() {
+		if ($this->triedUpdateToUtf8mb4) {
+			return false;
+		}
+		$this->triedUpdateToUtf8mb4 = true;
+		Minz_Log::warning('Updating MySQL to UTF8MB4...');
+		$db = FreshRSS_Context::$system_conf->db;
+		if ($db['type'] === 'mysql') {
+			include_once(APP_PATH . '/SQL/install.sql.mysql.php');
+			if (defined('SQL_UPDATE_UTF8MB4')) {
+				$hadTransaction = $this->bd->inTransaction();
+				if ($hadTransaction) {
+					$this->bd->commit();
+				}
+				$ok = false;
+				try {
+					$sql = sprintf(SQL_UPDATE_UTF8MB4, $this->prefix, $db['base']);
+					$stm = $this->bd->prepare($sql);
+					$ok = $stm->execute();
+				} catch (Exception $e) {
+					Minz_Log::error('FreshRSS_EntryDAO::updateToUtf8mb4 error: ' . $e->getMessage());
+				}
+				if ($hadTransaction) {
+					$this->bd->beginTransaction();
+					//NB: Transaction not starting. Why? (tested on PHP 7.0.8-0ubuntu and MySQL 5.7.13-0ubuntu)
+				}
+				return $ok;
+			}
+		}
+		return false;
+	}
+
+	protected function autoUpdateDb($errorInfo) {
 		if (isset($errorInfo[0])) {
-			if ($errorInfo[0] == '42S22') {	//ER_BAD_FIELD_ERROR
+			if ($errorInfo[0] === '42S22') {	//ER_BAD_FIELD_ERROR
+				//autoAddColumn
 				foreach (array('lastSeen', 'hash') as $column) {
 					if (stripos($errorInfo[2], $column) !== false) {
 						return $this->addColumn($column);
@@ -56,6 +91,11 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				}
 			}
 		}
+		if (isset($errorInfo[1])) {
+			if ($errorInfo[1] == '1366') {	//ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
+				return $this->updateToUtf8mb4();
+			}
+		}
 		return false;
 	}
 
@@ -94,7 +134,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $this->addEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->addEntryPrepared->errorInfo();
-			if ($this->autoAddColumn($info)) {
+			if ($this->autoUpdateDb($info)) {
 				return $this->addEntry($valuesTmp);
 			} elseif ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
 				Minz_Log::error('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
@@ -145,7 +185,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $this->updateEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->updateEntryPrepared->errorInfo();
-			if ($this->autoAddColumn($info)) {
+			if ($this->autoUpdateDb($info)) {
 				return $this->updateEntry($valuesTmp);
 			}
 			Minz_Log::error('SQL error updateEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
@@ -615,7 +655,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			return $result;
 		} else {
 			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
-			if ($this->autoAddColumn($info)) {
+			if ($this->autoUpdateDb($info)) {
 				return $this->listHashForFeedGuids($id_feed, $guids);
 			}
 			Minz_Log::error('SQL error listHashForFeedGuids: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
@@ -636,7 +676,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
-			if ($this->autoAddColumn($info)) {
+			if ($this->autoUpdateDb($info)) {
 				return $this->updateLastSeen($id_feed, $guids);
 			}
 			Minz_Log::error('SQL error updateLastSeen: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
@@ -692,7 +732,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	public function optimizeTable() {
 		$sql = 'OPTIMIZE TABLE `' . $this->prefix . 'entry`';	//MySQL
 		$stm = $this->bd->prepare($sql);
-		$stm->execute();
+		if ($stm) {
+			return $stm->execute();
+		}
 	}
 
 	public function size($all = false) {
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index 0f4e04620..c8755c1ad 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -2,17 +2,17 @@
 define('SQL_CREATE_TABLES', '
 CREATE TABLE IF NOT EXISTS `%1$scategory` (
 	`id` SMALLINT NOT NULL AUTO_INCREMENT,	-- v0.7
-	`name` varchar(255) NOT NULL,
+	`name` varchar(191) NOT NULL,
 	PRIMARY KEY (`id`),
 	UNIQUE KEY (`name`)	-- v0.7
-) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
 ENGINE = INNODB;
 
 CREATE TABLE IF NOT EXISTS `%1$sfeed` (
 	`id` SMALLINT NOT NULL AUTO_INCREMENT,	-- v0.7
 	`url` varchar(511) CHARACTER SET latin1 NOT NULL,
 	`category` SMALLINT DEFAULT 0,	-- v0.7
-	`name` varchar(255) NOT NULL,
+	`name` varchar(191) NOT NULL,
 	`website` varchar(255) CHARACTER SET latin1,
 	`description` text,
 	`lastUpdate` int(11) DEFAULT 0,	-- Until year 2038
@@ -30,7 +30,7 @@ CREATE TABLE IF NOT EXISTS `%1$sfeed` (
 	INDEX (`name`),	-- v0.7
 	INDEX (`priority`),	-- v0.7
 	INDEX (`keep_history`)	-- v0.7
-) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
 ENGINE = INNODB;
 
 CREATE TABLE IF NOT EXISTS `%1$sentry` (
@@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 	INDEX (`is_favorite`),	-- v0.7
 	INDEX (`is_read`),	-- v0.7
 	INDEX `entry_lastSeen_index` (`lastSeen`)	-- v1.1.1
-) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
 ENGINE = INNODB;
 
 INSERT IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");
@@ -62,3 +62,24 @@ INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) V
 ');
 
 define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
+
+define('SQL_UPDATE_UTF8MB4', '
+ALTER DATABASE `%2$s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+ALTER TABLE `%1$scategory` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+UPDATE `%1$scategory` SET name=SUBSTRING(name,1,190) where LENGTH(name) > 191;
+ALTER TABLE `%1$scategory` MODIFY `name` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
+OPTIMIZE TABLE `%1$scategory`;
+
+ALTER TABLE `%1$sfeed` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+UPDATE `%1$sfeed` SET name=SUBSTRING(name,1,190) where LENGTH(name) > 191;
+ALTER TABLE `%1$sfeed` MODIFY `name` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
+ALTER TABLE `%1$sfeed` MODIFY `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+OPTIMIZE TABLE `%1$sfeed`;
+
+ALTER TABLE `%1$sentry` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `%1$sentry` MODIFY `title` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
+ALTER TABLE `%1$sentry` MODIFY `author` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `%1$sentry` MODIFY `tags` VARCHAR(1023) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+OPTIMIZE TABLE `%1$sentry`;
+');
diff --git a/app/install.php b/app/install.php
index 062f66814..df6e1aeec 100644
--- a/app/install.php
+++ b/app/install.php
@@ -19,7 +19,7 @@ if (isset($_GET['step'])) {
 	define('STEP', 0);
 }
 
-define('SQL_CREATE_DB', 'CREATE DATABASE IF NOT EXISTS %1$s DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
+define('SQL_CREATE_DB', 'CREATE DATABASE IF NOT EXISTS %1$s DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
 
 if (STEP === 3 && isset($_POST['type'])) {
 	$_SESSION['bd_type'] = $_POST['type'];
@@ -253,7 +253,7 @@ function newPdo() {
 	case 'mysql':
 		$str = 'mysql:host=' . $_SESSION['bd_host'] . ';dbname=' . $_SESSION['bd_base'];
 		$driver_options = array(
-			PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+			PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
 		);
 		break;
 	case 'sqlite':
@@ -309,7 +309,7 @@ function checkStep0() {
 }
 
 function checkStep1() {
-	$php = version_compare(PHP_VERSION, '5.3.0') >= 0;
+	$php = version_compare(PHP_VERSION, '5.3.3') >= 0;
 	$minz = file_exists(join_path(LIB_PATH, 'Minz'));
 	$curl = extension_loaded('curl');
 	$pdo_mysql = extension_loaded('pdo_mysql');
@@ -437,7 +437,7 @@ function checkBD() {
 		switch ($_SESSION['bd_type']) {
 		case 'mysql':
 			$driver_options = array(
-				PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
+				PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'
 			);
 
 			try {	// on ouvre une connexion juste pour créer la base si elle n'existe pas
@@ -536,7 +536,7 @@ function printStep1() {
 	<?php if ($res['php'] == 'ok') { ?>
 	<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('gen.short.damn'); ?></span> <?php echo _t('install.check.php.nok', PHP_VERSION, '5.3.0'); ?></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.3.3'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['minz'] == 'ok') { ?>
diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml
index ed3858b56..543ab43de 100644
--- a/app/views/update/checkInstall.phtml
+++ b/app/views/update/checkInstall.phtml
@@ -9,7 +9,7 @@
 	<p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>">
 		<?php
 			if ($key === 'php') {
-				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.3.0');
+				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.3.3');
 			} else {
 				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'));
 			}
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 25999f02b..845aecaae 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -16,7 +16,6 @@ class Minz_ModelPdo {
 	public static $useSharedBd = true;
 	private static $sharedBd = null;
 	private static $sharedPrefix;
-	private static $has_transaction = false;
 	private static $sharedCurrentUser;
 	protected static $sharedDbType;
 
@@ -60,8 +59,8 @@ class Minz_ModelPdo {
 			if ($type === 'mysql') {
 				$string = 'mysql:host=' . $db['host']
 				        . ';dbname=' . $db['base']
-				        . ';charset=utf8';
-				$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8';
+				        . ';charset=utf8mb4';
+				$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8mb4';
 				$this->prefix = $db['prefix'] . $currentUser . '_';
 			} elseif ($type === 'sqlite') {
 				$string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite');
@@ -96,18 +95,15 @@ class Minz_ModelPdo {
 
 	public function beginTransaction() {
 		$this->bd->beginTransaction();
-		self::$has_transaction = true;
 	}
-	public function hasTransaction() {
-		return self::$has_transaction;
+	public function inTransaction() {
+		return $this->bd->inTransaction();	//requires PHP >= 5.3.3
 	}
 	public function commit() {
 		$this->bd->commit();
-		self::$has_transaction = false;
 	}
 	public function rollBack() {
 		$this->bd->rollBack();
-		self::$has_transaction = false;
 	}
 
 	public static function clean() {
-- 
cgit v1.2.3


From 462c1e208f02e4977c7e96c0f5936987931d5bc1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 Jul 2016 23:37:13 +0200
Subject: PSHB: work-around for SuperFeeder

Feeds using SuperFeeder for PubSubHubbub push had timeout problems
during substription.
SuperFeeder bot was returning 422 "We could not verify your callback
Error: ETIMEDOUT"
It seems to be due to the the fact that SuperFeeder bot uses keep-alive
but expects the server to close the connection.
https://github.com/FreshRSS/FreshRSS/issues/312#issuecomment-73716936
---
 p/api/pshb.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/p/api/pshb.php b/p/api/pshb.php
index 7de4cc1a2..136b98fc9 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -65,11 +65,13 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
 		$hubJson['error'] = true;	//Do not assume that PubSubHubbub works until the first successul push
 	}
 	file_put_contents('./!hub.json', json_encode($hubJson));
+	header('Connection: close');
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
 
 if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'unsubscribe') {
 	if (empty($hubJson['lease_end']) || $hubJson['lease_end'] < time()) {
+		header('Connection: close');
 		exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 	} else {
 		header('HTTP/1.1 422 Unprocessable Entity');
-- 
cgit v1.2.3


From 21a6521ba9ab8df18ad8386465cba9e9af99ce7f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 Jul 2016 01:38:46 +0200
Subject: More links for API help

https://github.com/FreshRSS/FreshRSS/issues/328#issuecomment-236100791
https://github.com/FreshRSS/FreshRSS/issues/957#issuecomment-133581712
---
 app/views/user/profile.phtml |  1 +
 p/api/index.html             | 20 --------------------
 p/api/index.php              | 29 +++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 p/api/index.html
 create mode 100644 p/api/index.php

diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 7ae2c7ede..a97970927 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -37,6 +37,7 @@
 					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 					<a class="btn toggle-password" data-toggle="apiPasswordPlain"><?php echo _i('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <kbd><a href="../api/"><?php echo Minz_Url::display('/api/greader.php', 'html', true); ?></a></kbd>
 			</div>
 		</div>
 		<?php } ?>
diff --git a/p/api/index.html b/p/api/index.html
deleted file mode 100644
index 8da0bcb58..000000000
--- a/p/api/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
-<head>
-<meta charset="UTF-8" />
-<title>FreshRSS API</title>
-<meta name="robots" content="noindex" />
-<link rel="start" href="../i/" />
-</head>
-
-<body>
-<h1>FreshRSS API</h1>
-
-<h2>Google Reader compatible API</h2>
-<ul>
-<li><a href="greader.php/check%2Fcompatibility" rel="nofollow">Check full server configuration (with <code>%2F</code> support)</a></li>
-<li><a href="greader.php/check/compatibility" rel="nofollow">Check partial server configuration (without <code>%2F</code> support)</a></li>
-</ul>
-
-</body>
-</html>
diff --git a/p/api/index.php b/p/api/index.php
new file mode 100644
index 000000000..3ab4e02b3
--- /dev/null
+++ b/p/api/index.php
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+<head>
+<meta charset="UTF-8" />
+<title>FreshRSS API</title>
+<meta name="robots" content="noindex" />
+<link rel="start" href="../i/" />
+</head>
+
+<body>
+<h1>FreshRSS API</h1>
+
+<h2>Google Reader compatible API</h2>
+<dl>
+<dt>Your API address:</dt>
+<dd><?php
+require('../../constants.php');
+require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
+Minz_Configuration::register('system', DATA_PATH . '/config.php', DATA_PATH . '/config.default.php');
+echo Minz_Url::display('/api/greader.php', 'html', true);
+?></dd>
+</dl>
+<ul>
+<li><a href="greader.php/check%2Fcompatibility" rel="nofollow">Check full server configuration</a></li>
+<li><a href="greader.php/check/compatibility" rel="nofollow">Check partial server configuration (without <code>%2F</code> support)</a></li>
+</ul>
+
+</body>
+</html>
-- 
cgit v1.2.3


From c1548e732d7472c40473b3d99858059333a05eae Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 Jul 2016 14:58:19 +0200
Subject: Remove Mozilla Persona login

https://github.com/FreshRSS/FreshRSS/issues/1052
---
 README.fr.md                            |   3 +-
 README.md                               |   3 +-
 app/Controllers/authController.php      | 152 +-------------------------------
 app/Controllers/userController.php      |  25 ------
 app/FreshRSS.php                        |   8 --
 app/Models/Auth.php                     |  18 +---
 app/Models/ConfigurationSetter.php      |   7 +-
 app/i18n/cz/admin.php                   |   6 --
 app/i18n/cz/conf.php                    |   1 -
 app/i18n/cz/feedback.php                |   1 -
 app/i18n/cz/gen.php                     |   3 -
 app/i18n/cz/install.php                 |   6 --
 app/i18n/de/admin.php                   |   6 --
 app/i18n/de/conf.php                    |   1 -
 app/i18n/de/feedback.php                |   1 -
 app/i18n/de/gen.php                     |   3 -
 app/i18n/de/install.php                 |   6 --
 app/i18n/en/admin.php                   |   6 --
 app/i18n/en/conf.php                    |   1 -
 app/i18n/en/feedback.php                |   1 -
 app/i18n/en/gen.php                     |   3 -
 app/i18n/en/install.php                 |   6 --
 app/i18n/fr/admin.php                   |   6 --
 app/i18n/fr/conf.php                    |   1 -
 app/i18n/fr/feedback.php                |   1 -
 app/i18n/fr/gen.php                     |   3 -
 app/i18n/fr/install.php                 |   6 --
 app/i18n/it/admin.php                   |   6 --
 app/i18n/it/conf.php                    |   1 -
 app/i18n/it/feedback.php                |   1 -
 app/i18n/it/gen.php                     |   3 -
 app/i18n/it/install.php                 |   6 --
 app/i18n/nl/admin.php                   |   6 --
 app/i18n/nl/conf.php                    |   1 -
 app/i18n/nl/feedback.php                |   1 -
 app/i18n/nl/gen.php                     |   3 -
 app/i18n/nl/install.php                 |   6 --
 app/i18n/ru/admin.php                   |   6 --
 app/i18n/ru/conf.php                    |   1 -
 app/i18n/ru/feedback.php                |   1 -
 app/i18n/ru/gen.php                     |   3 -
 app/i18n/ru/install.php                 |   6 --
 app/i18n/tr/admin.php                   |   6 --
 app/i18n/tr/conf.php                    |   1 -
 app/i18n/tr/feedback.php                |   1 -
 app/i18n/tr/gen.php                     |   3 -
 app/i18n/tr/install.php                 |   6 --
 app/install.php                         |  45 +---------
 app/views/auth/index.phtml              |   3 +-
 app/views/auth/personaLogin.phtml       |  28 ------
 app/views/auth/register.phtml           |   5 --
 app/views/auth/reset.phtml              |  33 -------
 app/views/helpers/javascript_vars.phtml |   2 -
 app/views/user/manage.phtml             |   8 --
 app/views/user/profile.phtml            |   9 --
 data/config.default.php                 |   1 -
 data/users/_/config.default.php         |   1 -
 lib/lib_rss.php                         |   1 -
 p/scripts/install.js                    |   8 +-
 p/scripts/persona.js                    |  76 ----------------
 60 files changed, 11 insertions(+), 561 deletions(-)
 delete mode 100644 app/views/auth/personaLogin.phtml
 delete mode 100644 app/views/auth/reset.phtml
 delete mode 100644 p/scripts/persona.js

diff --git a/README.fr.md b/README.fr.md
index fd01a507b..067d6d1a1 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -89,7 +89,6 @@ sudo chmod -R g+w ./data/
 # Contrôle d’accès
 Il est requis pour le mode multi-utilisateur, et recommandé dans tous les cas, de limiter l’accès à votre FreshRSS. Au choix :
 * En utilisant l’identification par formulaire (requiert JavaScript, et PHP 5.3.7+ recommandé – fonctionne avec certaines versions de PHP 5.3.3+)
-* En utilisant l’identification par [Mozilla Persona](https://login.persona.org/about) incluse dans FreshRSS
 * En utilisant un contrôle d’accès HTTP défini par votre serveur Web
 	* Voir par exemple la [documentation d’Apache sur l’authentification](http://httpd.apache.org/docs/trunk/howto/auth.html)
 		* Créer dans ce cas un fichier `./p/i/.htaccess` avec un fichier `.htpasswd` correspondant.
@@ -111,7 +110,7 @@ Par exemple, pour exécuter le script toutes les heures :
 * En cas de problème, les logs peuvent être utile à lire, soit depuis l’interface de FreshRSS, soit manuellement depuis `./data/log/*.log`.
 
 # Sauvegarde
-* Il faut conserver vos fichiers `./data/config.php` ainsi que `./data/*_user.php` et éventuellement `./data/persona/`
+* Il faut conserver vos fichiers `./data/config.php` ainsi que `./data/*_user.php`
 * Vous pouvez exporter votre liste de flux depuis FreshRSS au format OPML
 * Pour sauvegarder les articles eux-mêmes, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
 
diff --git a/README.md b/README.md
index a0d22a75c..76975adbd 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,6 @@ sudo chmod -R g+w ./data/
 # Access control
 It is needed for the multi-user mode to limit access to FreshRSS. You can:
 * use form authentication (need JavaScript and PHP 5.3.7+, works with some PHP 5.3.3+)
-* use [Mozilla Persona](https://login.persona.org/about) authentication included in FreshRSS
 * use HTTP authentication supported by your web server
 	* See [Apache documentation](http://httpd.apache.org/docs/trunk/howto/auth.html)
 		* In that case, create a `./p/i/.htaccess` file with a matching `.htpasswd` file.
@@ -111,7 +110,7 @@ For example, if you want to run the script every hour:
 * If you encounter any problem, logs are accessible 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
+* You need to keep `./data/config.php`, and `./data/*_user.php` files
 * You can export your feed list in OPML format from FreshRSS
 * To save articles, you can use [phpMyAdmin](http://www.phpmyadmin.net) or MySQL tools:
 
diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index f58b008de..9decba431 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -70,7 +70,7 @@ 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
+	 * It forwards to the correct login page (form) or main page if
 	 * the user is already connected.
 	 */
 	public function loginAction() {
@@ -83,9 +83,6 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		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!
@@ -188,81 +185,6 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		}
 	}
 
-	/**
-	 * 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);
-						$conf = get_user_configuration($current_user);
-						if (!is_null($conf)) {
-							$login_ok = strcasecmp($email, $conf->mail_login) === 0;
-						} else {
-							$reason = 'Invalid configuration for user ' .
-							          '[' . $current_user . ']';
-						}
-					}
-				} 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::warning($reason);
-
-				$res = array();
-				$res['status'] = 'failure';
-				$res['reason'] = _t('feedback.auth.login.invalid');
-			}
-
-			header('Content-Type: application/json; charset=UTF-8');
-			$this->view->res = $res;
-		}
-	}
-
 	/**
 	 * This action removes all accesses of the current user.
 	 */
@@ -273,78 +195,6 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		                   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('admin.auth.title_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 (FreshRSS_Context::$system_conf->auth_type != 'persona') {
-			$this->view->message = array(
-				'status' => 'bad',
-				'title' => _t('gen.short.damn'),
-				'body' => _t('feedback.auth.not_persona')
-			);
-			$this->view->no_form = true;
-			return;
-		}
-
-		$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(
-				'status' => 'bad',
-				'title' => _t('gen.short.damn'),
-				'body' => _t('feedback.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) {
-				FreshRSS_Context::$system_conf->auth_type = 'form';
-				$ok = FreshRSS_Context::$system_conf->save();
-
-				if ($ok) {
-					Minz_Request::good(_t('feedback.auth.form.set'));
-				} else {
-					Minz_Request::bad(_t('feedback.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('feedback.auth.login.invalid'),
-				                  array('c' => 'auth', 'a' => 'reset'));
-			}
-		}
-	}
-
 	/**
 	 * This action gives possibility to a user to create an account.
 	 */
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 1c7d621f1..0521bc008 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -64,21 +64,8 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				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);
-			}
-			$email = FreshRSS_Context::$user_conf->mail_login;
-			Minz_Session::_param('mail', $email);
-
 			$ok &= FreshRSS_Context::$user_conf->save();
 
-			if ($email != '') {
-				$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
-				@unlink($personaFile);
-				$ok &= (file_put_contents($personaFile, Minz_Session::param('currentUser', '_')) !== false);
-			}
-
 			if ($ok) {
 				Minz_Request::good(_t('feedback.profile.updated'),
 				                   array('c' => 'user', 'a' => 'profile'));
@@ -119,7 +106,6 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 *   - new_user_language
 	 *   - new_user_name
 	 *   - new_user_passwordPlain
-	 *   - new_user_email
 	 *   - r (i.e. a redirection url, optional)
 	 *
 	 * @todo clean up this method. Idea: write a method to init a user with basic information.
@@ -168,22 +154,12 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				if (empty($passwordHash)) {
 					$passwordHash = '';
 				}
-
-				$new_user_email = filter_var($_POST['new_user_email'], FILTER_VALIDATE_EMAIL);
-				if (empty($new_user_email)) {
-					$new_user_email = '';
-				} else {
-					$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,
-					'mail_login' => $new_user_email,
 				);
 				$ok &= (file_put_contents($configPath, "<?php\n return " . var_export($config_array, true) . ';') !== false);
 			}
@@ -255,7 +231,6 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$userDAO = new FreshRSS_UserDAO();
 				$ok &= $userDAO->deleteUser($username);
 				$ok &= recursive_unlink($user_data);
-				//TODO: delete Persona file
 			}
 			if ($ok && $self_deletion) {
 				FreshRSS_Auth::removeAccess();
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 4933892bc..20640266e 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -98,14 +98,6 @@ 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 (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');
-			$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/persona.js');
-			Minz_View::appendScript(Minz_Url::display('/scripts/persona.js?' . $file_mtime));
-		}
 	}
 
 	private static function loadNotifications() {
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 4e7a71947..d689f7cdb 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -60,16 +60,6 @@ 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:
@@ -93,9 +83,6 @@ 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'), $user_conf->mail_login) === 0;
-			break;
 		case 'none':
 			self::$login_ok = true;
 			break;
@@ -143,9 +130,6 @@ 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...
@@ -170,7 +154,7 @@ class FreshRSS_Auth {
 	public static function accessNeedsAction() {
 		$conf = Minz_Configuration::get('system');
 		$auth_type = $conf->auth_type;
-		return $auth_type === 'form' || $auth_type === 'persona';
+		return $auth_type === 'form';
 	}
 }
 
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 250c14c39..e472b1e7f 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -95,11 +95,6 @@ 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;
@@ -278,7 +273,7 @@ class FreshRSS_ConfigurationSetter {
 
 	private function _auth_type(&$data, $value) {
 		$value = strtolower($value);
-		if (!in_array($value, array('form', 'http_auth', 'persona', 'none'))) {
+		if (!in_array($value, array('form', 'http_auth', 'none'))) {
 			$value = 'none';
 		}
 		$data['auth_type'] = $value;
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 342ac7ccd..881c02fc6 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -8,7 +8,6 @@ return array(
 		'form' => 'Webový formulář (tradiční, vyžaduje JavaScript)',
 		'http' => 'HTTP (pro pokročilé uživatele s HTTPS)',
 		'none' => 'Žádný (nebezpečné)',
-		'persona' => 'Mozilla Persona (moderní, vyžaduje JavaScript)',
 		'title' => 'Přihlášení',
 		'title_reset' => 'Reset přihlášení',
 		'token' => 'Authentizační token',
@@ -75,10 +74,6 @@ return array(
 			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
 			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/persona</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
-			'ok' => 'Oprávnění adresáře Mozilla Persona jsou v pořádku.',
-		),
 		'php' => array(
 			'_' => 'PHP instalace',
 			'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
@@ -169,7 +164,6 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s článků (%s)',
 		'create' => 'Vytvořit nového uživatele',
-		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Jazyk',
 		'number' => 'Zatím je vytvořen %d účet',
 		'numbers' => 'Zatím je vytvořeno %d účtů',
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 823ab1ea3..ec25f988c 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Smazání účtu',
 			'warn' => 'Váš účet bude smazán spolu se všemi souvisejícími daty',
 		),
-		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Password API<br /><small>(tzn. pro mobilní aplikace)</small>',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index b75a4a15a..81302afca 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -21,7 +21,6 @@ return array(
 			'success' => 'Jste odhlášen',
 		),
 		'no_password_set' => 'Heslo administrátora nebylo nastaveno. Tato funkce není k dispozici.',
-		'not_persona' => 'Resetovat lze pouze systém Persona.',
 	),
 	'conf' => array(
 		'error' => 'Během ukládání nastavení došlo k chybě',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 5e15ae6f9..e73325c55 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'Email',
 		'keep_logged_in' => 'Zapamatovat přihlášení <small>(1 měsíc)</small>',
 		'login' => 'Login',
-		'login_persona' => 'Přihlášení pomocí Persona',
-		'login_persona_problem' => 'Problém s připojením k Persona?',
 		'logout' => 'Odhlášení',
 		'password' =>  array(
 			'_' => 'Heslo',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Název administrátorského účtu',
 			'format' => '<small>maximálně 16 alfanumerických znaků</small>',
 		),
-		'will_reset' => 'Přihlašovací systém bude vyresetován: místo sytému Persona bude použito přihlášení formulářem.',
 	),
 	'date' => array(
 		'Apr' => '\\D\\u\\b\\e\\n',
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index bc3e01992..6b94c0d4b 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'Reinstalovat FreshRSS',
 	),
 	'auth' => array(
-		'email_persona' => 'Email pro přihlášení<br /><small>(pro <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'form' => 'Webový formulář (tradiční, vyžaduje JavaScript)',
 		'http' => 'HTTP (pro pokročilé uživatele s HTTPS)',
 		'none' => 'Žádný (nebezpečné)',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
-		'persona' => 'Mozilla Persona (moderní, vyžaduje JavaScript)',
 		'type' => 'Způsob přihlášení',
 	),
 	'bdd' => array(
@@ -78,10 +76,6 @@ return array(
 			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
 			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/persona</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
-			'ok' => 'Oprávnění adresáře Mozilla Persona jsou v pořádku.',
-		),
 		'php' => array(
 			'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
 			'ok' => 'Vaše verze PHP je %s a je kompatibilní s FreshRSS.',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 6e6cc0956..7b75fe5f4 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -8,7 +8,6 @@ return array(
 		'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',
@@ -75,10 +74,6 @@ return 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' => 'Die 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.',
@@ -169,7 +164,6 @@ return array(
 	'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',
 		'number' => 'Es wurde bis jetzt %d Account erstellt',
 		'numbers' => 'Es wurden bis jetzt %d Accounts erstellt',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index c1a762f12..7c57d5655 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Accountlöschung',
 			'warn' => 'Dein Account und alle damit bezogenen Daten werden gelöscht.',
 		),
-		'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',
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index 4c15aadc3..f93992982 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -21,7 +21,6 @@ return array(
 			'success' => 'Sie sind abgemeldet',
 		),
 		'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 der Speicherung der Konfiguration trat ein Fehler auf',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 4b85c722a..c6e7f1ef3 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'E-Mail-Adresse',
 		'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' => array(
 			'_' => 'Passwort',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Administrator-Nutzername',
 			'format' => '<small>maximal 16 alphanumerische Zeichen</small>',
 		),
-		'will_reset' => 'Authentifikationssystem wird zurückgesetzt: ein Formular wird anstelle von Persona benutzt.',
 	),
 	'date' => array(
 		'Apr' => '\\A\\p\\r\\i\\l',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index d16496818..a77822e7b 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'Neuinstallation von FreshRSS',
 	),
 	'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>',
 		'password_format' => 'mindestens 7 Zeichen',
-		'persona' => 'Mozilla Persona (modern, benötigt JavaScript)',
 		'type' => 'Authentifizierungsmethode',
 	),
 	'bdd' => array(
@@ -78,10 +76,6 @@ return 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' => 'Die 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.',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index a58771edf..a88552087 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -8,7 +8,6 @@ return array(
 		'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',
@@ -75,10 +74,6 @@ return 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.',
@@ -169,7 +164,6 @@ return 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',
 		'number' => 'There is %d account created yet',
 		'numbers' => 'There are %d accounts created yet',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 38e9197e9..b5ab73510 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Account deletion',
 			'warn' => 'Your account and all the related data will be deleted.',
 		),
-		'email_persona' => 'Login email address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'API password<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',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index c9189c0d0..7ce2ae9cf 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -21,7 +21,6 @@ return 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.',
 	),
 	'conf' => array(
 		'error' => 'An error occurred during configuration saving',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index ba4e2f86c..17b47ba2f 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'Email address',
 		'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' => array(
 			'_' => 'Password',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Administrator username',
 			'format' => '<small>maximum 16 alphanumeric characters</small>',
 		),
-		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\A\\p\\r\\i\\l',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 4b5bbc62e..d1c5f37c8 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'Reinstall FreshRSS',
 	),
 	'auth' => array(
-		'email_persona' => 'Login email 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>',
 		'password_format' => 'At least 7 characters',
-		'persona' => 'Mozilla Persona (modern, requires JavaScript)',
 		'type' => 'Authentication method',
 	),
 	'bdd' => array(
@@ -78,10 +76,6 @@ return 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.',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index f4f267306..c359e9d24 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -8,7 +8,6 @@ return array(
 		'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',
@@ -75,10 +74,6 @@ return 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.',
@@ -169,7 +164,6 @@ return array(
 	'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',
 		'number' => '%d compte a déjà été créé',
 		'numbers' => '%d comptes ont déjà été créés',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 6193b7a01..7a6d12e17 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Suppression du compte',
 			'warn' => 'Le compte et toutes les données associées vont être supprimées.',
 		),
-		'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',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index e2364a251..15f3ab859 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -21,7 +21,6 @@ return 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é.',
 	),
 	'conf' => array(
 		'error' => 'Une erreur est survenue durant la sauvegarde de la configuration',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 031098aa2..d61a716a7 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'Adresse courriel',
 		'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' => array(
 			'_' => 'Mot de passe',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Nom d’utilisateur administrateur',
 			'format' => '<small>16 caractères alphanumériques maximum</small>',
 		),
-		'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',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 91dfbbb09..946a210ee 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'Réinstaller FreshRSS',
 	),
 	'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>',
 		'password_format' => '7 caractères minimum',
-		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
 		'type' => 'Méthode d’authentification',
 	),
 	'bdd' => array(
@@ -78,10 +76,6 @@ return 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.',
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index 94b2d6762..4eea158f6 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -8,7 +8,6 @@ return array(
 		'form' => 'Web form (tradizionale, richiede JavaScript)',
 		'http' => 'HTTP (per gli utenti avanzati con HTTPS)',
 		'none' => 'Nessuno (pericoloso)',
-		'persona' => 'Mozilla Persona (moderno, richiede JavaScript)',
 		'title' => 'Autenticazione',
 		'title_reset' => 'Reset autenticazione',
 		'token' => 'Token di autenticazione',
@@ -75,10 +74,6 @@ return array(
 			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite).',
 			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Verifica i permessi sulla cartella <em>./data/persona</em>. Il server HTTP deve avere i permessi per scriverci dentro',
-			'ok' => 'I permessi sulla cartella Mozilla Persona sono corretti.',
-		),
 		'php' => array(
 			'_' => 'Installazione PHP',
 			'nok' => 'Versione PHP %s FreshRSS richiede almeno la versione %s.',
@@ -169,7 +164,6 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s articoli (%s)',
 		'create' => 'Crea nuovo utente',
-		'email_persona' => 'Indirizzo mail<br /><small>(Login <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Lingua',
 		'number' => ' %d profilo utente creato',
 		'numbers' => 'Sono presenti %d profili utente',
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index b757b3210..19b62c9a7 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Cancellazione account',
 			'warn' => 'Il tuo account e tutti i dati associati saranno cancellati.',
 		),
-		'email_persona' => 'Indirizzo email<br /><small>(Login <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Password API<br /><small>(e.g., per applicazioni mobili)</small>',
 		'password_form' => 'Password<br /><small>(per il login classico)</small>',
 		'password_format' => 'Almeno 7 caratteri',
diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php
index caf1cd2b4..f217586b0 100644
--- a/app/i18n/it/feedback.php
+++ b/app/i18n/it/feedback.php
@@ -21,7 +21,6 @@ return array(
 			'success' => 'Disconnessione effettuata',
 		),
 		'no_password_set' => 'Password di amministrazione non impostata. Opzione non disponibile.',
-		'not_persona' => 'Solo il sistema Mozilla Persona può essere resettato.',
 	),
 	'conf' => array(
 		'error' => 'Si è verificato un errore durante il salvataggio della configurazione',
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index d24377593..c02ddd13a 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'Indirizzo email',
 		'keep_logged_in' => 'Ricorda i dati <small>(1 mese)</small>',
 		'login' => 'Accedi',
-		'login_persona' => 'Accedi con Mozilla Persona',
-		'login_persona_problem' => 'Problemi di connessione con Mozilla Persona?',
 		'logout' => 'Esci',
 		'password' => array(
 			'_' => 'Password',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Username amministratore',
 			'format' => '<small>massimo 16 caratteri alfanumerici</small>',
 		),
-		'will_reset' => 'Il sistema di autenticazione verrà resettato: un form verrà usato per Mozilla Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\A\\p\\r\\i\\l\\e',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index 8f5300bd5..a60dd4523 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'Reinstalla FreshRSS',
 	),
 	'auth' => array(
-		'email_persona' => 'Indirizzo mail<br /><small>(per <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'form' => 'Web form (tradizionale, richiede JavaScript)',
 		'http' => 'HTTP (per gli utenti avanzati con HTTPS)',
 		'none' => 'Nessuno (pericoloso)',
 		'password_form' => 'Password<br /><small>(per il login tramite Web-form tradizionale)</small>',
 		'password_format' => 'Almeno 7 caratteri',
-		'persona' => 'Mozilla Persona (moderno, richiede JavaScript)',
 		'type' => 'Metodo di autenticazione',
 	),
 	'bdd' => array(
@@ -78,10 +76,6 @@ return array(
 			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite).',
 			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Verifica i permessi sulla cartella <em>./data/persona</em>. Il server HTTP deve avere i permessi per scriverci dentro',
-			'ok' => 'I permessi sulla cartella Mozilla Persona sono corretti.',
-		),
 		'php' => array(
 			'_' => 'Installazione PHP',
 			'nok' => 'Versione di PHP %s FreshRSS richiede almeno la versione %s.',
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index bd7d63b6a..9f05d69b1 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -8,7 +8,6 @@ return array(
 		'form' => 'Web formulier (traditioneel, benodigd JavaScript)',
 		'http' => 'HTTP (voor geavanceerde gebruikers met HTTPS)',
 		'none' => 'Geen (gevaarlijk)',
-		'persona' => 'Mozilla Persona (modern, benodigd JavaScript)',
 		'title' => 'Authenticatie',
 		'title_reset' => 'Authenticatie terugzetten',
 		'token' => 'Authenticatie teken',
@@ -75,10 +74,6 @@ return array(
 			'nok' => 'U mist PDO of een van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
 			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Controleer de permissies op de <em>./data/persona</em> map. HTTP server moet rechten hebben om hierin te schrijven',
-			'ok' => 'Permissies op de Mozilla Persona map zijn goed.',
-		),
 		'php' => array(
 			'_' => 'PHP installatie',
 			'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
@@ -169,7 +164,6 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s artikelen (%s)',
 		'create' => 'Creëer  nieuwe gebruiker',
-		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Taal',
 		'number' => 'Er is %d accounts gemaakt',
 		'numbers' => 'Er zijn %d accounts gemaakt',
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index 9b0aff793..573dabf45 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Account verwijderen',
 			'warn' => 'Uw account en alle gerelateerde gegvens worden verwijderd.',
 		),
-		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Wachtwoord API<br /><small>(e.g., voor mobiele apps)</small>',
 		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
 		'password_format' => 'Ten minste 7 tekens',
diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php
index 54d84f7d6..b703c43cf 100644
--- a/app/i18n/nl/feedback.php
+++ b/app/i18n/nl/feedback.php
@@ -21,7 +21,6 @@ return array(
 			'success' => 'U bent uitgelogd',
 		),
 		'no_password_set' => 'Administrateur wachtwoord is niet ingesteld. Deze mogelijkheid is niet beschikbaar.',
-		'not_persona' => 'Alleen Persona systeem kan worden gereset.',
 	),
 	'conf' => array(
 		'error' => 'Er is een fout opgetreden tijdens het opslaan van de configuratie',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 24cba574e..7e03229c9 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'Email adres',
 		'keep_logged_in' => 'Ingelogd blijven voor <small>(1 maand)</small>',
 		'login' => 'Log in',
-		'login_persona' => 'Login met Persona',
-		'login_persona_problem' => 'Connectiviteits problemen met Persona',
 		'logout' => 'Log uit',
 		'password' => array(
 			'_' => 'Wachtwoord',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Administrator gebruikersnaam',
 			'format' => '<small>maximaal 16 alphanumerieke tekens</small>',
 		),
-		'will_reset' => 'Het authenticatie system zal worden gereset: een formulier zal worden gebruikt in plaats van Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\A\\p\\r\\i\\l',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index d16dda4ca..77783cd48 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'Installeer FreshRSS opnieuw',
 	),
 	'auth' => array(
-		'email_persona' => 'Log in mail adres<br /><small>(voor <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'form' => 'Web formulier (traditioneel, benodigd JavaScript)',
 		'http' => 'HTTP (voor geavanceerde gebruikers met HTTPS)',
 		'none' => 'Geen (gevaarlijk)',
 		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
 		'password_format' => 'Tenminste 7 tekens',
-		'persona' => 'Mozilla Persona (modern, benodigd JavaScript)',
 		'type' => 'Authenticatie methode',
 	),
 	'bdd' => array(
@@ -78,10 +76,6 @@ return array(
 			'nok' => 'U mist PDO of één van de ondersteunde (pdo_mysql, pdo_sqlite).',
 			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Controleer permissies van de <em>./data/persona</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
-			'ok' => 'Permissies van de Mozilla Persona map zijn goed.',
-		),
 		'php' => array(
 			'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
 			'ok' => 'Uw PHP versie is %s, welke compatibel is met FreshRSS.',
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index dfea5b3cb..caea627f3 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -8,7 +8,6 @@ return array(
 		'form' => 'На основе веб-формы (традиционный, необходим JavaScript)',
 		'http' => 'HTTP (для продвинутых пользователей - по HTTPS)',
 		'none' => 'Без аутентификации (небезопасный)',
-		'persona' => 'Mozilla Persona (новый, необходим JavaScript)',
 		'title' => 'Аутентификации',
 		'title_reset' => 'Сброс аутентицикации',
 		'token' => 'Токен аутентификации',
@@ -75,10 +74,6 @@ return array(
 			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
 			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку Mozilla Persona в порядке.',
-		),
 		'php' => array(
 			'_' => 'PHP installation',
 			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
@@ -169,7 +164,6 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s статей (%s)',
 		'create' => 'Создать нового пользователя',
-		'email_persona' => 'Адрес электронной почты для входа<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Язык',
 		'number' => 'На данный момент создан %d аккаунт',
 		'numbers' => 'На данный момент аккаунтов создано:  %d',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index e502e9a43..557fbe369 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Account deletion',
 			'warn' => 'Your account and all the related data will be deleted.',
 		),
-		'email_persona' => 'Login email 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',
diff --git a/app/i18n/ru/feedback.php b/app/i18n/ru/feedback.php
index c9189c0d0..7ce2ae9cf 100644
--- a/app/i18n/ru/feedback.php
+++ b/app/i18n/ru/feedback.php
@@ -21,7 +21,6 @@ return 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.',
 	),
 	'conf' => array(
 		'error' => 'An error occurred during configuration saving',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index b8e8511d9..eecd72749 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'Email address',
 		'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' => array(
 			'_' => 'Password',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Administrator username',
 			'format' => '<small>maximum 16 alphanumeric characters</small>',
 		),
-		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\A\\p\\r\\i\\l',
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index c838b2eba..a52e2959b 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'Переустановить FreshRSS',
 	),
 	'auth' => array(
-		'email_persona' => 'Почта (логин) для <br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'form' => 'Вэб-форма (традиционный, необходим JavaScript)',
 		'http' => 'HTTP (для продвинутых пользователей с HTTPS)',
 		'none' => 'Никакого (опасно)',
 		'password_form' => 'Пароль<br /><small>(для метода аутентификации на Вэб-формах)</small>',
 		'password_format' => 'Как минимум 7 букв',
-		'persona' => 'Mozilla Persona (современный, необходим JavaScript)',
 		'type' => 'Метод аутентификации',
 	),
 	'bdd' => array(
@@ -74,10 +72,6 @@ return array(
 			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
 			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => 'Проверьте права доступа к папке <em>./data/persona</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку Mozilla Persona в порядке.',
-		),
 		'php' => array(
 			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
 			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index 3a6f8118e..43f8e23c5 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -8,7 +8,6 @@ return array(
 		'form' => 'Web formu (geleneksel, JavaScript gerektirir)',
 		'http' => 'HTTP (ileri kullanıcılar için, HTTPS)',
 		'none' => 'Hiçbiri (tehlikeli)',
-		'persona' => 'Mozilla Persona (modern, JavaScript gerektirir)',
 		'title' => 'Kimlik doğrulama',
 		'title_reset' => 'Kimlik doğrulama sıfırla',
 		'token' => 'Kimlik doğrulama işareti',
@@ -75,10 +74,6 @@ return array(
 			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
 			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => '<em>./data/persona</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
-			'ok' => 'Mozilla Persona klasörü yetkileri sorunsuz.',
-		),
 		'php' => array(
 			'_' => 'PHP kurulumu',
 			'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
@@ -169,7 +164,6 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s makale (%s)',
 		'create' => 'Yeni kullanıcı oluştur',
-		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
 		'language' => 'Dil',
 		'number' => 'Oluşturulmuş %d hesap var',
 		'numbers' => 'Oluşturulmuş %d hesap var',
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index d9e275b21..2fdc248e4 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -76,7 +76,6 @@ return array(
 			'_' => 'Hesap silme',
 			'warn' => 'Hesabınız ve tüm verileriniz silinecek.',
 		),
-		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
 		'password_api' => 'API Şifresi<br /><small>(ör. mobil uygulamalar için)</small>',
 		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
 		'password_format' => 'En az 7 karakter',
diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php
index 0572c6da1..a53316206 100644
--- a/app/i18n/tr/feedback.php
+++ b/app/i18n/tr/feedback.php
@@ -21,7 +21,6 @@ return array(
 			'success' => 'Bağlantı koptu',
 		),
 		'no_password_set' => 'Yönetici şifresi ayarlanmadı. Bu özellik kullanıma uygun değil.',
-		'not_persona' => 'Sadece Persona sistem sıfırlanabilir.',
 	),
 	'conf' => array(
 		'error' => 'Yapılandırma ayarları kaydedilirken hata oluştu',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 492e2cb9b..865dbd4e2 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -24,8 +24,6 @@ return array(
 		'email' => 'Email adresleri',
 		'keep_logged_in' => '<small>(1 ay)</small> oturumu açık tut',
 		'login' => 'Giriş',
-		'login_persona' => 'Persona ile giriş yap',
-		'login_persona_problem' => 'Persona ile bağlantı sorununuz mu var ?',
 		'logout' => 'Çıkış',
 		'password' => array(
 			'_' => 'Şifre',
@@ -42,7 +40,6 @@ return array(
 			'admin' => 'Yönetici kullanıcı adı',
 			'format' => '<small>en fazla 16 alfanümerik karakter</small>',
 		),
-		'will_reset' => 'Kimlik doğrulama sistemi sıfırlanacak: Persone yerine bir form kullanılacak.',
 	),
 	'date' => array(
 		'Apr' => '\\N\\i\\s\\a\\n',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 85134845b..951a7c5fd 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -9,13 +9,11 @@ return array(
 		'reinstall' => 'FreshRSS i yeniden yükle',
 	),
 	'auth' => array(
-		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
 		'form' => 'Web formu (geleneksel, JavaScript gerektirir)',
 		'http' => 'HTTP (ileri kullanıcılar için, HTTPS)',
 		'none' => 'Hiçbiri (tehlikeli)',
 		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
 		'password_format' => 'En az 7 karakter',
-		'persona' => 'Mozilla Persona (modern, JavaScript gerektirir)',
 		'type' => 'Kimlik doğrulama yöntemi',
 	),
 	'bdd' => array(
@@ -78,10 +76,6 @@ return array(
 			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
 			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
 		),
-		'persona' => array(
-			'nok' => '<em>./data/persona</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
-			'ok' => 'Mozilla Persona klasörü yetkileri sorunsuz.',
-		),
 		'php' => array(
 			'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
 			'ok' => 'PHP versiyonunuz %s, FreshRSS ile tam uyumlu.',
diff --git a/app/install.php b/app/install.php
index 062f66814..e73bc9972 100644
--- a/app/install.php
+++ b/app/install.php
@@ -103,7 +103,6 @@ function saveStep1() {
 		$_SESSION['title'] = $system_conf->title;
 		$_SESSION['auth_type'] = $system_conf->auth_type;
 		$_SESSION['old_entries'] = $user_conf->old_entries;
-		$_SESSION['mail_login'] = $user_conf->mail_login;
 		$_SESSION['default_user'] = $current_user;
 		$_SESSION['passwordHash'] = $user_conf->passwordHash;
 
@@ -128,7 +127,6 @@ function saveStep2() {
 		$_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries);
 		$_SESSION['auth_type'] = param('auth_type', 'form');
 		$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16);
-		$_SESSION['mail_login'] = filter_var(param('mail_login', ''), FILTER_VALIDATE_EMAIL);
 
 		$password_plain = param('passwordPlain', false);
 		if ($password_plain !== false && cryptAvailable()) {
@@ -146,8 +144,7 @@ function saveStep2() {
 			return false;
 		}
 
-		if (($_SESSION['auth_type'] === 'form' && empty($_SESSION['passwordHash'])) ||
-				($_SESSION['auth_type'] === 'persona' && empty($_SESSION['mail_login']))) {
+		if ($_SESSION['auth_type'] === 'form' && empty($_SESSION['passwordHash'])) {
 			return false;
 		}
 
@@ -157,15 +154,11 @@ function saveStep2() {
 		}
 
 		$token = '';
-		if ($_SESSION['mail_login']) {
-			$token = sha1($_SESSION['salt'] . $_SESSION['mail_login']);
-		}
 
 		$config_array = array(
 			'language' => $_SESSION['language'],
 			'theme' => $user_default_config->theme,
 			'old_entries' => $_SESSION['old_entries'],
-			'mail_login' => $_SESSION['mail_login'],
 			'passwordHash' => $_SESSION['passwordHash'],
 			'token' => $token,
 		);
@@ -179,12 +172,6 @@ function saveStep2() {
 		mkdir($user_dir);
 		file_put_contents($user_config_path, "<?php\n return " . var_export($config_array, true) . ';');
 
-		if ($_SESSION['mail_login'] != '') {
-			$personaFile = join_path(DATA_PATH, 'persona', $_SESSION['mail_login'] . '.txt');
-			@unlink($personaFile);
-			file_put_contents($personaFile, $_SESSION['default_user']);
-		}
-
 		header('Location: index.php?step=3');
 	}
 }
@@ -324,7 +311,6 @@ function checkStep1() {
 	$cache = CACHE_PATH && is_writable(CACHE_PATH);
 	$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(
@@ -343,10 +329,9 @@ function checkStep1() {
 		'cache' => $cache ? '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 && $xml &&
-		         $data && $cache && $users && $favicons && $persona && $http_referer ?
+		         $data && $cache && $users && $favicons && $http_referer ?
 		         'ok' : 'ko'
 	);
 }
@@ -380,7 +365,6 @@ function freshrss_already_installed() {
 
 function checkStep2() {
 	$conf = !empty($_SESSION['old_entries']) &&
-	        isset($_SESSION['mail_login']) &&
 	        !empty($_SESSION['default_user']);
 
 	$form = (
@@ -388,11 +372,6 @@ function checkStep2() {
 		($_SESSION['auth_type'] != 'form' || !empty($_SESSION['passwordHash']))
 	);
 
-	$persona = (
-		isset($_SESSION['auth_type']) &&
-		($_SESSION['auth_type'] != 'persona' || !empty($_SESSION['mail_login']))
-	);
-
 	$defaultUser = empty($_POST['default_user']) ? null : $_POST['default_user'];
 	if ($defaultUser === null) {
 		$defaultUser = empty($_SESSION['default_user']) ? '' : $_SESSION['default_user'];
@@ -402,9 +381,8 @@ function checkStep2() {
 	return array(
 		'conf' => $conf ? 'ok' : 'ko',
 		'form' => $form ? 'ok' : 'ko',
-		'persona' => $persona ? 'ok' : 'ko',
 		'data' => $data ? 'ok' : 'ko',
-		'all' => $conf && $form && $persona && $data ? 'ok' : 'ko'
+		'all' => $conf && $form && $data ? 'ok' : 'ko'
 	);
 }
 
@@ -612,12 +590,6 @@ function printStep1() {
 	<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('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('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('gen.short.ok'); ?></span> <?php echo _t('install.check.http_referer.ok'); ?></p>
 	<?php } else { ?>
@@ -673,12 +645,11 @@ function printStep2() {
 				<select id="auth_type" name="auth_type" required="required" tabindex="4">
 					<?php
 						function no_auth($auth_type) {
-							return !in_array($auth_type, array('form', 'persona', 'http_auth', 'none'));
+							return !in_array($auth_type, array('form', 'http_auth', 'none'));
 						}
 						$auth_type = isset($_SESSION['auth_type']) ? $_SESSION['auth_type'] : '';
 					?>
 					<option value="form"<?php echo $auth_type === 'form' || (no_auth($auth_type) && cryptAvailable()) ? ' 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' || (no_auth($auth_type) && !cryptAvailable()) ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
 				</select>
@@ -697,14 +668,6 @@ function printStep2() {
 			</div>
 		</div>
 
-		<div class="form-group">
-			<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"' : ''; ?> tabindex="6"/>
-				<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" tabindex="7" ><?php echo _t('gen.action.submit'); ?></button>
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index 8e4df8c2c..8f81ac856 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -10,11 +10,10 @@
 			<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" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->auth_type; ?>">
-					<?php if (!in_array(FreshRSS_Context::$system_conf->auth_type, array('form', 'persona', 'http_auth', 'none'))) { ?>
+					<?php if (!in_array(FreshRSS_Context::$system_conf->auth_type, array('form', 'http_auth', 'none'))) { ?>
 						<option selected="selected"></option>
 					<?php } ?>
 					<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>
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
deleted file mode 100644
index c6d738bf6..000000000
--- a/app/views/auth/personaLogin.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php if ($this->res === false) { ?>
-<div class="prompt">
-	<h1><?php echo _t('gen.auth.login'); ?></h1>
-
-	<?php if (!max_registrations_reached()) { ?>
-		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.registration.ask'); ?></a>
-	<?php } ?>
-
-	<p>
-		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
-			<?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('gen.auth.login_persona_problem'); ?></a>
-		</small>
-	</p>
-
-	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
-</div>
-<?php
-} else {
-	echo json_encode($this->res);
-}
-?>
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index 306679601..0c261319a 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -16,11 +16,6 @@
             <noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
         </div>
 
-        <div>
-            <label class="group-name" for="new_user_email"><?php echo _t('gen.auth.email'); ?></label>
-            <input type="email" id="new_user_email" name="new_user_email" class="extend" required="required" autocomplete="off" />
-        </div>
-
         <div>
             <?php
                 $redirect_url = urlencode(Minz_Url::display(
diff --git a/app/views/auth/reset.phtml b/app/views/auth/reset.phtml
deleted file mode 100644
index 9c820c7c8..000000000
--- a/app/views/auth/reset.phtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="prompt">
-	<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'; ?>">
-		<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('gen.short.attention'); ?></span><br />
-			<?php echo _t('gen.auth.will_reset'); ?>
-		</p>
-
-		<div>
-			<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('gen.auth.password'); ?></label>
-				<input type="password" id="passwordPlain" required="required" />
-				<input type="hidden" id="challenge" name="challenge" /><br />
-				<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('gen.action.submit'); ?></button>
-		</div>
-	</form>
-	<?php } ?>
-</div>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 6178cacf2..1aa43a207 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,6 +1,5 @@
 <?php
 $mark = FreshRSS_Context::$user_conf->mark_when;
-$mail = Minz_Session::param('mail', false);
 $s = FreshRSS_Context::$user_conf->shortcuts;
 echo htmlspecialchars(json_encode(array(
 	'context' => array(
@@ -16,7 +15,6 @@ echo htmlspecialchars(json_encode(array(
 		'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
 		'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
 		'auth_type' => FreshRSS_Context::$system_conf->auth_type,
-		'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
 		'current_view' => Minz_Request::actionName(),
 	),
 	'shortcuts' => array(
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index fe1b6618b..e48841d9b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -37,14 +37,6 @@
 			</div>
 		</div>
 
-		<div class="form-group">
-			<label class="group-name" for="new_user_email"><?php echo _t('admin.user.email_persona'); ?></label>
-			<?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>
-		</div>
-
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 7ae2c7ede..e96b5aa32 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -41,15 +41,6 @@
 		</div>
 		<?php } ?>
 
-		<div class="form-group">
-			<label class="group-name" for="mail_login"><?php echo _t('conf.profile.email_persona'); ?></label>
-			<?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>
-			</div>
-		</div>
-
 		<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/data/config.default.php b/data/config.default.php
index cae15330f..be3fa8ae2 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -40,7 +40,6 @@ return array(
 	# Login method:
 	#	`none` is without password and shows only the default user;
 	#	`form` is a conventional Web login form;
-	#	`persona` is the email-based login by Mozilla;
 	#	`http_auth` is an access controled by the HTTP Web server (e.g. `/FreshRSS/p/i/.htaccess` for Apache)
 	#		if you use `http_auth`, remember to protect only `/FreshRSS/p/i/`,
 	#		and in particular not protect `/FreshRSS/p/api/` if you would like to use the API (different login system).
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index 8f8ff528c..4a3403453 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -5,7 +5,6 @@ return array (
 	'old_entries' => 3,
 	'keep_history_default' => 0,
 	'ttl_default' => 3600,
-	'mail_login' => '',
 	'token' => '',
 	'passwordHash' => '',
 	'apiPasswordHash' => '',
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index f89baf9b1..8196f7847 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -440,7 +440,6 @@ function check_install_files() {
 		'cache' => CACHE_PATH && is_writable(CACHE_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/scripts/install.js b/p/scripts/install.js
index 9a49e6031..57fc2450a 100644
--- a/p/scripts/install.js
+++ b/p/scripts/install.js
@@ -24,18 +24,12 @@ function auth_type_change() {
 	var auth_type = document.getElementById('auth_type');
 	if (auth_type) {
 		var auth_value = auth_type.value,
-			password_input = document.getElementById('passwordPlain'),
-			mail_input = document.getElementById('mail_login');
+			password_input = document.getElementById('passwordPlain');
 
 		if (auth_value === 'form') {
 			password_input.required = true;
-			mail_input.required = false;
-		} else if (auth_value === 'persona') {
-			password_input.required = false;
-			mail_input.required = true;
 		} else {
 			password_input.required = false;
-			mail_input.required = false;
 		}
 	}
 }
diff --git a/p/scripts/persona.js b/p/scripts/persona.js
deleted file mode 100644
index 63ab43795..000000000
--- a/p/scripts/persona.js
+++ /dev/null
@@ -1,76 +0,0 @@
-"use strict";
-
-function init_persona() {
-	if (!(navigator.id && window.$ && window.url)) {
-		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);
-}
-- 
cgit v1.2.3


From 93f7f849874dcdf1263370ff08c72a962f8de56f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 Jul 2016 18:25:02 +0200
Subject: Restaure compatibility with Internet Explorer 11 / Edge

https://github.com/FreshRSS/FreshRSS/issues/772
---
 README.fr.md                       | 2 +-
 README.md                          | 2 +-
 app/layout/aside_feed.phtml        | 4 ++--
 app/layout/nav_menu.phtml          | 4 ++--
 app/views/extension/index.phtml    | 3 ++-
 app/views/helpers/pagination.phtml | 4 ++--
 app/views/stats/idle.phtml         | 4 ++--
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index fd01a507b..29ce76caa 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -37,7 +37,7 @@ Nous sommes une communauté amicale.
 	* Recommandés : [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Inclus par défaut : [DOM](http://php.net/dom), [XML](http://php.net/xml)…
 * MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
-* Un navigateur Web récent tel Firefox, Chrome, Opera, Safari. [Internet Explorer ne fonctionne plus, mais ce sera corrigé](https://github.com/FreshRSS/FreshRSS/issues/772).
+* Un navigateur Web récent tel Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Fonctionne aussi sur mobile
 * L’entête HTTP `Referer` ne doit pas être désactivé pour pouvoir utiliser le formulaire de connexion
 
diff --git a/README.md b/README.md
index a0d22a75c..c44e6d481 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ We are a friendly community.
 	* Recommended extensions: [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Enabled by default: [DOM](http://php.net/dom), [XML](http://php.net/xml)…
 * MySQL 5.0.3+ (recommended) or SQLite 3.7.4+
-* A recent browser like Firefox, Chrome, Opera, Safari. [Internet Explorer currently not supported, but support will come back](https://github.com/FreshRSS/FreshRSS/issues/772).
+* A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Works on mobile
 * The browser HTTP `Referer` header must not be disabled when using the form login method
 
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 4e1903a7a..67507b88d 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -19,8 +19,7 @@
 	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
 	<?php } ?>
 
-	<form id="mark-read-aside" method="post" aria-hidden="true"></form>
-
+	<form id="mark-read-aside" method="post">
 	<ul class="tree">
 		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
@@ -69,6 +68,7 @@
 			}
 		?>
 	</ul>
+	</form>
 </div>
 
 <script id="feed_config_template" type="text/html">
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 0f303beb8..92268ff67 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -79,9 +79,8 @@
 		);
 	?>
 
-	<form id="mark-read-menu" method="post" aria-hidden="true"></form>
-
 	<div class="stick" id="nav_menu_read_all">
+		<form id="mark-read-menu" method="post">
 		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
@@ -123,6 +122,7 @@
 				</li>
 			</ul>
 		</div>
+		</form>
 	</div>
 	<?php } ?>
 
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 4b0d5ebeb..b26334937 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -5,7 +5,7 @@
 
 	<h1><?php echo _t('admin.extensions.title'); ?></h1>
 
-	<form id="form-extension" method="post" aria-hidden="true"></form>
+	<form id="form-extension" method="post">
 	<?php if (!empty($this->extension_list['system'])) { ?>
 	<h2><?php echo _t('admin.extensions.system'); ?></h2>
 	<?php
@@ -31,6 +31,7 @@
 	?>
 	<p class="alert alert-warn"><?php echo _t('admin.extensions.empty_list'); ?></p>
 	<?php } ?>
+	</form>
 </div>
 
 <?php $class = isset($this->extension) ? ' class="active"' : ''; ?>
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index 7eca8c525..d1c3cc72c 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -14,8 +14,7 @@
 	);
 ?>
 
-<form id="mark-read-pagination" method="post" aria-hidden="true"></form>
-
+<form id="mark-read-pagination" method="post">
 <ul class="pagination">
 	<li class="item pager-next">
 	<?php if (FreshRSS_Context::$next_id) { ?>
@@ -39,3 +38,4 @@
 	<?php } ?>
 	</li>
 </ul>
+</form>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index ba88b679f..8c5f182c2 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -18,8 +18,7 @@
 		<div class="stat">
 			<h2><?php echo _t('gen.date.' . $period); ?></h2>
 
-			<form id="form-delete" method="post" aria-hidden="true"></form>
-
+			<form id="form-delete" method="post">
 			<?php foreach ($feeds as $feed) { ?>
 			<ul class="horizontal-list">
 				<li class="item">
@@ -34,6 +33,7 @@
 				</li>
 			</ul>
 			<?php } ?>
+			</form>
 		</div>
 	<?php
 			}
-- 
cgit v1.2.3


From 2859eff94de87523a94b5a6ed84eaa94844f3fe9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 1 Aug 2016 17:52:21 +0200
Subject: MySQL UTF8MB4 minor details

---
 app/Models/EntryDAO.php       | 2 +-
 app/SQL/install.sql.mysql.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index fa5d87b55..c9e6f9742 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -53,11 +53,11 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			return false;
 		}
 		$this->triedUpdateToUtf8mb4 = true;
-		Minz_Log::warning('Updating MySQL to UTF8MB4...');
 		$db = FreshRSS_Context::$system_conf->db;
 		if ($db['type'] === 'mysql') {
 			include_once(APP_PATH . '/SQL/install.sql.mysql.php');
 			if (defined('SQL_UPDATE_UTF8MB4')) {
+				Minz_Log::warning('Updating MySQL to UTF8MB4...');
 				$hadTransaction = $this->bd->inTransaction();
 				if ($hadTransaction) {
 					$this->bd->commit();
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index c8755c1ad..c78839ef7 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -67,12 +67,12 @@ define('SQL_UPDATE_UTF8MB4', '
 ALTER DATABASE `%2$s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 ALTER TABLE `%1$scategory` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-UPDATE `%1$scategory` SET name=SUBSTRING(name,1,190) where LENGTH(name) > 191;
+UPDATE `%1$scategory` SET name=SUBSTRING(name,1,190) WHERE LENGTH(name) > 191;
 ALTER TABLE `%1$scategory` MODIFY `name` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
 OPTIMIZE TABLE `%1$scategory`;
 
 ALTER TABLE `%1$sfeed` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-UPDATE `%1$sfeed` SET name=SUBSTRING(name,1,190) where LENGTH(name) > 191;
+UPDATE `%1$sfeed` SET name=SUBSTRING(name,1,190) WHERE LENGTH(name) > 191;
 ALTER TABLE `%1$sfeed` MODIFY `name` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
 ALTER TABLE `%1$sfeed` MODIFY `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 OPTIMIZE TABLE `%1$sfeed`;
-- 
cgit v1.2.3


From efd87c4a439893f71c822e2ebc4aecd4c9ae44d4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 1 Aug 2016 18:11:45 +0200
Subject: Minor white line

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 6fc0f7a12..f46359219 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,6 @@ We are a friendly community.
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
 	* Recommended extensions: [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Enabled by default: [DOM](http://php.net/dom), [XML](http://php.net/xml)…
-
 * MySQL 5.5.3+ (recommended) or SQLite 3.7.4+
 * A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Works on mobile
-- 
cgit v1.2.3


From 42713ff89c28bf5d70deb1027bbaf5f8c945f2ec Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 1 Aug 2016 18:13:21 +0200
Subject: Merge conflict README.fr

---
 README.fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.fr.md b/README.fr.md
index 0229df8cb..91903305c 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -37,7 +37,7 @@ Nous sommes une communauté amicale.
 	* Recommandés : [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Inclus par défaut : [DOM](http://php.net/dom), [XML](http://php.net/xml)…
 * MySQL 5.5.3+ (recommandé) ou SQLite 3.7.4+
-* Un navigateur Web récent tel Firefox, Chrome, Opera, Safari. [Internet Explorer ne fonctionne plus, mais ce sera corrigé](https://github.com/FreshRSS/FreshRSS/issues/772).
+* Un navigateur Web récent tel Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Fonctionne aussi sur mobile
 * L’entête HTTP `Referer` ne doit pas être désactivé pour pouvoir utiliser le formulaire de connexion
 
-- 
cgit v1.2.3


From fde42d7af4cd6a1be433924eaddfa001fcd67cc6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 1 Aug 2016 18:31:30 +0200
Subject: Changelog

---
 CHANGELOG.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d68e068a..23a00cce5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # Changelog
 
-## XXXX-XX-XX FreshRSS 1.5.0
+## 2016-XX-XX FreshRSS 1.5.x-dev
 
-Nothing yet.
+* Compatibility
+	* Require at least MySQL 5.5.3+ [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
+	* Require at least PHP 5.3.3+ [#1183](https://github.com/FreshRSS/FreshRSS/pull/1183)
+	* Restore compatibility with Microsoft Internet Explorer 11 / Edge [#772](https://github.com/FreshRSS/FreshRSS/issues/772)
+* Features
+	* Support for full Unicode such as emoji 💕 in MySQL with utf8mb4 [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
+		* FreshRSS will automatically migrate MySQL tables to utf8mb4 the first time it is needed.
+* Security
+	* Remove Mozilla Persona login (the service closes on 2016-11-30) [#1052](https://github.com/FreshRSS/FreshRSS/issues/1052)
+* Bug fixing
+	* Fixed scroll in log view [#1178](https://github.com/FreshRSS/FreshRSS/issues/1178)
+* API
+	* Add API link in FreshRSS profile settings to ease set-up [#1186](https://github.com/FreshRSS/FreshRSS/pull/1186)
 
 
 ## 2016-07-23 FreshRSS 1.4.0
-- 
cgit v1.2.3


From b382f266de0369352344324f88bc5d3dc136119d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 2 Aug 2016 00:29:31 +0200
Subject: Fix bug articles not marked as read

https://github.com/FreshRSS/FreshRSS/issues/1123
https://github.com/FreshRSS/FreshRSS/issues/423
---
 p/scripts/main.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index f1b82900e..c6e108ca1 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -113,7 +113,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 	return isCurrentView;
 }
 
-var pending_feeds = [];
+var pending_entries = {};
 function mark_read(active, only_not_read) {
 	if (active.length === 0 ||
 		(only_not_read === true && !active.hasClass("not_read"))) {
@@ -126,14 +126,12 @@ function mark_read(active, only_not_read) {
 	}
 
 	var feed_url = active.find(".website>a").attr("href"),
-		feed_id = feed_url.substr(feed_url.lastIndexOf('f_')),
-		index_pending = pending_feeds.indexOf(feed_id);
+		feed_id = feed_url.substr(feed_url.lastIndexOf('f_'));
 
-	if (index_pending !== -1) {
+	if (pending_entries[active.attr('id')]) {
 		return false;
 	}
-
-	pending_feeds.push(feed_id);
+	pending_entries[active.attr('id')] = true;
 
 	$.ajax({
 		type: 'POST',
@@ -154,10 +152,10 @@ function mark_read(active, only_not_read) {
 		incUnreadsFeed(active, feed_id, inc);
 		faviconNbUnread();
 
-		pending_feeds.splice(index_pending, 1);
+		delete pending_entries[active.attr('id')];
 	}).fail(function (data) {
 		openNotification(i18n.notif_request_failed, 'bad');
-		pending_feeds.splice(index_pending, 1);
+		delete pending_entries[active.attr('id')];
 	});
 }
 
@@ -172,14 +170,12 @@ function mark_favorite(active) {
 	}
 
 	var feed_url = active.find(".website>a").attr("href"),
-		feed_id = feed_url.substr(feed_url.lastIndexOf('f_')),
-		index_pending = pending_feeds.indexOf(feed_id);
+		feed_id = feed_url.substr(feed_url.lastIndexOf('f_'));
 
-	if (index_pending !== -1) {
+	if (pending_entries[active.attr('id')]) {
 		return false;
 	}
-
-	pending_feeds.push(feed_id);
+	pending_entries[active.attr('id')] = true;
 
 	$.ajax({
 		type: 'POST',
@@ -212,10 +208,10 @@ function mark_favorite(active) {
 			}
 		}
 
-		pending_feeds.splice(index_pending, 1);
+		delete pending_entries[active.attr('id')];
 	}).fail(function (data) {
 		openNotification(i18n.notif_request_failed, 'bad');
-		pending_feeds.splice(index_pending, 1);
+		delete pending_entries[active.attr('id')];
 	});
 }
 
-- 
cgit v1.2.3


From 75d2fa3fd325f98a98304e7b1e1bdb56bf0f2af7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 2 Aug 2016 00:30:11 +0200
Subject: JS load optimization

Start loading what we can already before DOM is ready
---
 p/scripts/main.js | 49 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index c6e108ca1..69d0e33da 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1294,27 +1294,46 @@ function parseJsonVars() {
 	window.icons = json.icons;
 }
 
-function init_all() {
+function init_beforeDOM() {
 	if (!window.$) {
 		if (window.console) {
-			console.log('FreshRSS waiting for JS…');
+			console.log('FreshRSS waiting for jQuery…');
 		}
-		window.setTimeout(init_all, 50);
+		window.setTimeout(init_beforeDOM, 50);
 		return;
 	}
-	parseJsonVars();
-	init_notifications();
 	init_confirm_action();
+	if (['normal', 'reader', 'global'].indexOf(context['current_view']) >= 0) {
+		$stream = $('#stream');
+		if ($stream.length < 1) {
+			if (window.console) {
+				console.log('FreshRSS waiting for content…');
+			}
+			window.setTimeout(init_beforeDOM, 50);
+			return;
+		}
+		init_column_categories();
+		init_stream($stream);
+		init_shortcuts();
+		init_actualize();
+		faviconNbUnread();
+	}
+}
+
+function init_afterDOM() {
+	if (!window.$) {
+		if (window.console) {
+			console.log('FreshRSS waiting again for jQuery…');
+		}
+		window.setTimeout(init_afterDOM, 50);
+		return;
+	}
+	init_notifications();
 	$stream = $('#stream');
 	if ($stream.length > 0) {
-		init_actualize();
-		init_column_categories();
 		init_load_more($stream);
 		init_posts();
-		init_stream($stream);
 		init_nav_entries();
-		init_shortcuts();
-		faviconNbUnread();
 		init_print_action();
 		init_notifs_html5();
 		window.setInterval(refreshUnreads, 120000);
@@ -1335,16 +1354,16 @@ function init_all() {
 	}
 }
 
+parseJsonVars();
+init_beforeDOM();	//Can be called before DOM is fully loaded
+
 if (document.readyState && document.readyState !== 'loading') {
-	if (window.console) {
-		console.log('FreshRSS immediate init…');
-	}
-	init_all();
+	init_afterDOM();
 } else if (document.addEventListener) {
 	document.addEventListener('DOMContentLoaded', function () {
 		if (window.console) {
 			console.log('FreshRSS waiting for DOMContentLoaded…');
 		}
-		init_all();
+		init_afterDOM();
 	}, false);
 }
-- 
cgit v1.2.3


From 32b6ecc3afdc0cac3345ff89ee42f88c95c1775a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 2 Aug 2016 00:42:07 +0200
Subject: JS unused variables, syntax

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

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 69d0e33da..01c8c9cf5 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -125,9 +125,6 @@ function mark_read(active, only_not_read) {
 		return false;
 	}
 
-	var feed_url = active.find(".website>a").attr("href"),
-		feed_id = feed_url.substr(feed_url.lastIndexOf('f_'));
-
 	if (pending_entries[active.attr('id')]) {
 		return false;
 	}
@@ -149,6 +146,9 @@ function mark_read(active, only_not_read) {
 		}
 		$r.find('.icon').replaceWith(data.icon);
 
+		var feed_url = active.find(".website>a").attr("href"),
+			feed_id = feed_url.substr(feed_url.lastIndexOf('f_'));
+
 		incUnreadsFeed(active, feed_id, inc);
 		faviconNbUnread();
 
@@ -169,9 +169,6 @@ function mark_favorite(active) {
 		return false;
 	}
 
-	var feed_url = active.find(".website>a").attr("href"),
-		feed_id = feed_url.substr(feed_url.lastIndexOf('f_'));
-
 	if (pending_entries[active.attr('id')]) {
 		return false;
 	}
@@ -901,7 +898,7 @@ function notifs_html5_show(nb) {
 
 	notification.onclick = function() {
 		window.location.reload();
-	}
+	};
 
 	if (context['html5_notif_timeout'] !== 0) {
 		setTimeout(function() {
-- 
cgit v1.2.3


From 8ffb02e4d12b05bd142216dec75574f5a6bae64e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 2 Aug 2016 00:45:50 +0200
Subject: Changelog fix bug articles not marked as read

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23a00cce5..b96e280f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 	* Remove Mozilla Persona login (the service closes on 2016-11-30) [#1052](https://github.com/FreshRSS/FreshRSS/issues/1052)
 * Bug fixing
 	* Fixed scroll in log view [#1178](https://github.com/FreshRSS/FreshRSS/issues/1178)
+	* Fixed JavaScript bug when articles were not always marked as read [#1123](https://github.com/FreshRSS/FreshRSS/issues/1123)
 * API
 	* Add API link in FreshRSS profile settings to ease set-up [#1186](https://github.com/FreshRSS/FreshRSS/pull/1186)
 
-- 
cgit v1.2.3


From 7c1b5e322cca0134f57b3a436129985ba9170b9f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 2 Aug 2016 22:49:35 +0200
Subject: PostgreSQL draft

https://github.com/FreshRSS/FreshRSS/issues/416
Based on @Damstre work https://github.com/FreshRSS/FreshRSS/pull/1071
Not tested
---
 app/Models/CategoryDAO.php         |   7 +-
 app/Models/ConfigurationSetter.php |   1 +
 app/Models/EntryDAO.php            |   2 +-
 app/Models/EntryDAOPGSQL.php       |  92 ++++++++++++++++++
 app/Models/Factory.php             |  42 ++++----
 app/Models/FeedDAO.php             |   2 +-
 app/Models/StatsDAO.php            |   8 +-
 app/Models/StatsDAOPGSQL.php       | 192 +++++++++++++++++++++++++++++++++++++
 app/SQL/install.sql.mysql.php      |   2 +
 app/SQL/install.sql.pgsql.php      |  91 ++++++++++++++++++
 app/install.php                    |  31 +++++-
 lib/Minz/ModelPdo.php              |  77 +++++++++------
 p/scripts/install.js               |   6 +-
 13 files changed, 495 insertions(+), 58 deletions(-)
 create mode 100644 app/Models/EntryDAOPGSQL.php
 create mode 100644 app/Models/StatsDAOPGSQL.php
 create mode 100644 app/SQL/install.sql.pgsql.php

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index fc431553e..a44edb0f6 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -10,7 +10,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 		);
 
 		if ($stm && $stm->execute($values)) {
-			return $this->bd->lastInsertId();
+			return $this->bd->lastInsertId('"' . parent::prefix . 'category_id_seq"');
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error addCategory: ' . $info[2]);
@@ -207,12 +207,13 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 
 		$previousLine = null;
 		$feedsDao = array();
+		$feedDao = FreshRSS_Factory::createFeedDAO();
 		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(
 					$previousLine['c_name'],
-					FreshRSS_FeedDAO::daoToFeed($feedsDao, $previousLine['c_id'])
+					$feedDao->daoToFeed($feedsDao, $previousLine['c_id'])
 				);
 				$cat->_id($previousLine['c_id']);
 				$list[$previousLine['c_id']] = $cat;
@@ -228,7 +229,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 		if ($previousLine != null) {
 			$cat = new FreshRSS_Category(
 				$previousLine['c_name'],
-				FreshRSS_FeedDAO::daoToFeed($feedsDao, $previousLine['c_id'])
+				$feedDao->daoToFeed($feedsDao, $previousLine['c_id'])
 			);
 			$cat->_id($previousLine['c_id']);
 			$list[$previousLine['c_id']] = $cat;
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index e472b1e7f..988e83356 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -287,6 +287,7 @@ class FreshRSS_ConfigurationSetter {
 
 		switch ($value['type']) {
 		case 'mysql':
+		case 'pgsql':
 			if (empty($value['host']) ||
 					empty($value['user']) ||
 					empty($value['base']) ||
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index c9e6f9742..ba52d3f15 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -3,7 +3,7 @@
 class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 	public function isCompressed() {
-		return parent::$sharedDbType !== 'sqlite';
+		return parent::$sharedDbType === 'mysql';
 	}
 
 	public function hasNativeHex() {
diff --git a/app/Models/EntryDAOPGSQL.php b/app/Models/EntryDAOPGSQL.php
new file mode 100644
index 000000000..95c12ff5d
--- /dev/null
+++ b/app/Models/EntryDAOPGSQL.php
@@ -0,0 +1,92 @@
+<?php
+
+class FreshRSS_EntryDAOPGSQL extends FreshRSS_EntryDAO {
+
+	protected function addColumn($name) {
+		return false;
+	}
+
+	protected function updateCacheUnreads($catId = false, $feedId = false) {
+		return true;	//done via triggers
+	}
+
+	/**
+	 * 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 feed ID
+	 * @param integer $idMax fail safe article ID
+	 * @return integer affected rows
+	 */
+	public function markReadFeed($id_feed, $idMax = 0) {
+		if ($idMax == 0) {
+			$idMax = time() . '000000';
+			Minz_Log::debug('Calling markReadFeed(0) is deprecated!');
+		}
+		$this->bd->beginTransaction();
+
+		$sql = 'UPDATE "' . $this->prefix . 'entry" '
+			 . 'SET is_read=:is_read '
+			 . 'WHERE id_feed=:id_feed AND NOT is_read AND id <= :idmax';
+		$values = array($id_feed, $idMax);
+		$stm = $this->bd->prepare($sql);
+		$stm->bindValue(':is_read', true, PDO::PARAM_BOOL);
+		$stm->bindValue(':id_feed', $id_feed);
+		$stm->bindValue(':idmax', $idMax);
+
+		if (!($stm && $stm->execute())) {
+			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
+			Minz_Log::error('SQL error markReadFeed: ' . $info[2]);
+			$this->bd->rollBack();
+			return false;
+		}
+		$affected = $stm->rowCount();
+
+		$this->bd->commit();
+		return $affected;
+	}
+
+	public function listHashForFeedGuids($id_feed, $guids) {
+		if (count($guids) < 1) {
+			return array();
+		}
+		$sql = 'SELECT guid, hash AS hexHash FROM "' . $this->prefix . 'entry" WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
+		$stm = $this->bd->prepare($sql);
+		$values = array($id_feed);
+		$values = array_merge($values, $guids);
+		if ($stm && $stm->execute($values)) {
+			$result = array();
+			$rows = $stm->fetchAll(PDO::FETCH_ASSOC);
+			foreach ($rows as $row) {
+				$result[$row['guid']] = $row['hexHash'];
+			}
+			return $result;
+		} else {
+			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
+			if ($this->autoAddColumn($info)) {
+				return $this->listHashForFeedGuids($id_feed, $guids);
+			}
+			Minz_Log::error('SQL error listHashForFeedGuids: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
+				. ' while querying feed ' . $id_feed);
+			return false;
+		}
+	}
+
+	public function optimizeTable() {
+		return null;
+	}
+
+	public function size($all = true) {
+		$db = FreshRSS_Context::$system_conf->db;
+		$sql = 'SELECT pg_size_pretty(pg_database_size(?))';
+		$values = array($db['base']);
+		$stm = $this->bd->prepare($sql);
+		$stm->execute($values);
+		$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
+		return $res[0];
+	}
+
+}
diff --git a/app/Models/Factory.php b/app/Models/Factory.php
index db09d155d..764987c46 100644
--- a/app/Models/Factory.php
+++ b/app/Models/Factory.php
@@ -4,37 +4,47 @@ class FreshRSS_Factory {
 
 	public static function createFeedDao($username = null) {
 		$conf = Minz_Configuration::get('system');
-		if ($conf->db['type'] === 'sqlite') {
-			return new FreshRSS_FeedDAOSQLite($username);
-		} else {
-			return new FreshRSS_FeedDAO($username);
+		switch ($conf->db['type']) {
+			case 'sqlite':
+				return new FreshRSS_FeedDAOSQLite($username);
+			default:
+				return new FreshRSS_FeedDAO($username);
 		}
 	}
 
 	public static function createEntryDao($username = null) {
 		$conf = Minz_Configuration::get('system');
-		if ($conf->db['type'] === 'sqlite') {
-			return new FreshRSS_EntryDAOSQLite($username);
-		} else {
-			return new FreshRSS_EntryDAO($username);
+		switch ($conf->db['type']) {
+			case 'sqlite':
+				return new FreshRSS_EntryDAOSQLite($username);
+			case 'pgsql':
+				return new FreshRSS_EntryDAOPGSQL($username);
+			default:
+				return new FreshRSS_EntryDAO($username);
 		}
 	}
 
 	public static function createStatsDAO($username = null) {
 		$conf = Minz_Configuration::get('system');
-		if ($conf->db['type'] === 'sqlite') {
-			return new FreshRSS_StatsDAOSQLite($username);
-		} else {
-			return new FreshRSS_StatsDAO($username);
+		switch ($conf->db['type']) {
+			case 'sqlite':
+				return new FreshRSS_StatsDAOSQLite($username);
+			case 'pgsql':
+				return new FreshRSS_StatsDAOPGSQL($username);
+			default:
+				return new FreshRSS_StatsDAO($username);
 		}
 	}
 
 	public static function createDatabaseDAO($username = null) {
 		$conf = Minz_Configuration::get('system');
-		if ($conf->db['type'] === 'sqlite') {
-			return new FreshRSS_DatabaseDAOSQLite($username);
-		} else {
-			return new FreshRSS_DatabaseDAO($username);
+		switch ($conf->db['type']) {
+			case 'sqlite':
+				return new FreshRSS_DatabaseDAOSQLite($username);
+			case 'pgsql':
+				return new FreshRSS_DatabaseDAOPGSQL($username);
+			default:
+				return new FreshRSS_DatabaseDAO($username);
 		}
 	}
 
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 475d39286..f29dac9c0 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -16,7 +16,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		);
 
 		if ($stm && $stm->execute($values)) {
-			return $this->bd->lastInsertId();
+			return $this->bd->lastInsertId('"' . parent::prefix . 'feed_id_seq"');
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error addFeed: ' . $info[2]);
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 5ca333396..e18ba4748 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -37,10 +37,10 @@ class FreshRSS_StatsDAO extends Minz_ModelPdo {
 			$filter .= "AND e.id_feed = {$feed}";
 		}
 		$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`
+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
 , {$this->prefix}feed AS f
 WHERE e.id_feed = f.id
diff --git a/app/Models/StatsDAOPGSQL.php b/app/Models/StatsDAOPGSQL.php
new file mode 100644
index 000000000..0bde72e58
--- /dev/null
+++ b/app/Models/StatsDAOPGSQL.php
@@ -0,0 +1,192 @@
+<?php
+
+class FreshRSS_StatsDAOPGSQL extends FreshRSS_StatsDAO {
+
+	/**
+	 * Calculates entry repartition for the selection.
+	 * The repartition includes:
+	 *   - total entries
+	 *   - read entries
+	 *   - unread entries
+	 *   - favorite entries
+	 *
+	 * @param null|integer $feed feed id
+	 * @param boolean $only_main
+	 * @return array
+	 */
+	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(case when e.is_read then 1 else 0 end) AS unread,
+SUM(case when e.is_read then 1 else 0 end) AS read,
+SUM(case when e.is_favorite then 1 else 0 end) AS favorite
+FROM "{$this->prefix}entry" AS e
+, "{$this->prefix}feed" AS f
+WHERE e.id_feed = f.id
+{$filter}
+SQL;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+
+		return $res[0];
+	}
+
+	/**
+	 * Calculates entry count per day on a 30 days period.
+	 * Returns the result as a JSON string.
+	 *
+	 * @return string
+	 */
+	public function calculateEntryCount() {
+		$count = $this->initEntryCountArray();
+		$period = self::ENTRY_COUNT_PERIOD;
+
+		// Get stats per day for the last 30 days
+		$sql = <<<SQL
+SELECT to_timestamp(e.date) - NOW() AS day,
+COUNT(1) AS count
+FROM "{$this->prefix}entry" AS e
+WHERE to_timestamp(e.date) BETWEEN NOW() - INTERVAL '{$period} DAYS' AND NOW() - INTERVAL '1 DAY'
+GROUP BY day
+ORDER BY day ASC
+SQL;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+
+		foreach ($res as $value) {
+			$count[$value['day']] = (int) $value['count'];
+		}
+
+		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 to_timestamp(e.date) BETWEEN NOW() - INTERVAL '{$period} DAYS' AND NOW() - INTERVAL '1 DAY'
+SQL;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetch(PDO::FETCH_NAMED);
+
+		return round($res['average'], 2);
+	}
+
+	/**
+	 * Calculates the number of article per hour of the day per feed
+	 *
+	 * @param integer $feed id
+	 * @return string
+	 */
+	public function calculateEntryRepartitionPerFeedPerHour($feed = null) {
+		return $this->calculateEntryRepartitionPerFeedPerPeriod('hour', $feed);
+	}
+
+	/**
+	 * Calculates the number of article per day of week per feed
+	 *
+	 * @param integer $feed id
+	 * @return string
+	 */
+	public function calculateEntryRepartitionPerFeedPerDayOfWeek($feed = null) {
+		return $this->calculateEntryRepartitionPerFeedPerPeriod('day', $feed);
+	}
+
+	/**
+	 * Calculates the number of article per month per feed
+	 *
+	 * @param integer $feed
+	 * @return string
+	 */
+	public function calculateEntryRepartitionPerFeedPerMonth($feed = null) {
+		return $this->calculateEntryRepartitionPerFeedPerPeriod('month', $feed);
+	}
+
+	/**
+	 * Calculates the number of article per period per feed
+	 *
+	 * @param string $period format string to use for grouping
+	 * @param integer $feed id
+	 * @return string
+	 */
+	protected function calculateEntryRepartitionPerFeedPerPeriod($period, $feed = null) {
+		$restrict = '';
+		if ($feed) {
+			$restrict = "WHERE e.id_feed = {$feed}";
+		}
+		$sql = <<<SQL
+SELECT extract( {$period} from to_timestamp(e.date)) AS period
+, COUNT(1) AS count
+FROM "{$this->prefix}entry" AS e
+{$restrict}
+GROUP BY period
+ORDER BY period ASC
+SQL;
+
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_NAMED);
+
+		foreach ($res as $value) {
+			$repartition[(int) $value['period']] = (int) $value['count'];
+		}
+
+		return $this->convertToSerie($repartition);
+	}
+
+	/**
+	 * 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
+	 */
+	protected function calculateEntryAveragePerFeedPerPeriod($period, $feed = null) {
+		$restrict = '';
+		if ($feed) {
+			$restrict = "WHERE e.id_feed = {$feed}";
+		}
+		$sql = <<<SQL
+SELECT COUNT(1) AS count
+, MIN(date) AS date_min
+, MAX(date) AS date_max
+FROM "{$this->prefix}entry" AS e
+{$restrict}
+SQL;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetch(PDO::FETCH_NAMED);
+		$date_min = new \DateTime();
+		$date_min->setTimestamp($res['date_min']);
+		$date_max = new \DateTime();
+		$date_max->setTimestamp($res['date_max']);
+		$interval = $date_max->diff($date_min, true);
+		$interval_in_days = $interval->format('%a');
+		if ($interval_in_days <= 0) {
+			// Surely only one article.
+			// We will return count / (period/period) == count.
+			$interval_in_days = $period;
+		}
+
+		return $res['count'] / ($interval_in_days / $period);
+	}
+
+}
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index c78839ef7..92a00aecc 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -1,4 +1,6 @@
 <?php
+define('SQL_CREATE_DB', 'CREATE DATABASE IF NOT EXISTS %1$s DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
+
 define('SQL_CREATE_TABLES', '
 CREATE TABLE IF NOT EXISTS `%1$scategory` (
 	`id` SMALLINT NOT NULL AUTO_INCREMENT,	-- v0.7
diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
new file mode 100644
index 000000000..0f243bdb5
--- /dev/null
+++ b/app/SQL/install.sql.pgsql.php
@@ -0,0 +1,91 @@
+<?php
+define('SQL_CREATE_TABLES', '
+CREATE TABLE IF NOT EXISTS "%1$scategory" (
+	id SERIAL PRIMARY KEY,
+	name varchar(255) UNIQUE NOT NULL
+)
+
+CREATE TABLE IF NOT EXISTS "%1$sfeed" (
+	id SERIAL PRIMARY KEY,
+	url varchar(511) UNIQUE NOT NULL,
+	category SMALLINT DEFAULT 0,
+	name varchar(255) NOT NULL,
+	website varchar(255),
+	description text,
+	lastUpdate int DEFAULT 0,
+	priority smallint NOT NULL DEFAULT 10,
+	pathEntries varchar(511) DEFAULT NULL,
+	httpAuth varchar(511) DEFAULT NULL,
+	error boolean DEFAULT FALSE,
+	keep_history INT NOT NULL DEFAULT -2,
+	ttl INT NOT NULL DEFAULT -2,
+	cache_nbEntries int DEFAULT 0,
+	cache_nbUnreads int DEFAULT 0,
+	FOREIGN KEY (category) REFERENCES "%1$scategory" (id) ON DELETE SET NULL ON UPDATE CASCADE
+)
+CREATE INDEX name_index ON "%1$sfeed" (name)
+CREATE INDEX priority_index ON "%1$sfeed" (priority)
+CREATE INDEX keep_history_index ON "%1$sfeed" (keep_history)
+
+CREATE TABLE IF NOT EXISTS "%1$sentry" (
+	id bigint NOT NULL PRIMARY KEY,
+	guid varchar(760) UNIQUE NOT NULL,
+	title varchar(255) NOT NULL,
+	author varchar(255),
+	content_bin text,
+	link varchar(1023) NOT NULL,
+	date INT,
+	lastSeen INT DEFAULT 0,
+	hash BYTEA,
+	is_read boolean NOT NULL DEFAULT false,
+	is_favorite boolean NOT NULL DEFAULT false,
+	id_feed SMALLINT,
+	tags varchar(1023),
+	FOREIGN KEY (id_feed) REFERENCES "%1$sfeed" (id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+CREATE INDEX is_favorite_index ON "%1$sentry" (is_favorite)
+CREATE INDEX is_read_index ON "%1$sentry" (is_read)
+CREATE INDEX entry_lastSeen_index ON "%1$sentry" (lastSeen)
+
+CREATE OR REPLACE FUNCTION update_unread_feed() RETURNS TRIGGER AS $$
+	BEGIN
+		UPDATE "%1$sfeed" 
+			SET cache_nbUnreads=(SELECT COUNT(*) FROM "%1$sentry" WHERE id_feed=OLD.id_feed AND NOT is_read)
+			WHERE id=OLD.id_feed;
+		return NULL;
+	end;
+	$$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER update_unread_feed
+	AFTER UPDATE OF is_read OR DELETE OR INSERT ON "%1$sentry"
+	FOR EACH ROW
+	EXECUTE PROCEDURE update_unread_feed();
+
+CREATE OR REPLACE FUNCTION reset_feed_seq() RETURNS TRIGGER AS $$
+	BEGIN
+		PERFORM 1 FROM "%1$sfeed";
+		IF NOT FOUND THEN
+			ALTER SEQUENCE IF EXISTS "%1$sfeed_id_seq" RESTART;
+		END IF;
+		return NULL;
+	end;
+	$$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER reset_feed_seq
+	AFTER DELETE ON "%1$sfeed"
+	FOR EACH STATEMENT
+	EXECUTE PROCEDURE reset_feed_seq();
+
+
+CREATE OR REPLACE RULE check_constraints_on_entry AS ON INSERT TO "%1$sentry" WHERE EXISTS(SELECT 1 FROM "%1$sentry" WHERE guid=NEW.guid) DO INSTEAD NOTHING;
+CREATE OR REPLACE RULE check_constraints_on_feed AS ON INSERT TO "%1$sfeed" WHERE EXISTS(SELECT 1 FROM "%1$sfeed" WHERE url=NEW.url) DO INSTEAD NOTHING;
+CREATE OR REPLACE RULE check_constraints_on_category AS ON INSERT TO "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;
+CREATE OR REPLACE RULE check_constraints_on_category as on update to "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;
+
+
+INSERT IGNORE INTO "%1$scategory" (id, name) VALUES(1, "%2$s");
+INSERT IGNORE INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);
+INSERT IGNORE INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS @ GitHub", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);
+');
+
+define('SQL_DROP_TABLES', 'DROP TABLES "%1$sentry", "%1$sfeed", "%1$scategory"');
diff --git a/app/install.php b/app/install.php
index 62695ceb6..ffff9f8e9 100644
--- a/app/install.php
+++ b/app/install.php
@@ -19,8 +19,6 @@ if (isset($_GET['step'])) {
 	define('STEP', 0);
 }
 
-define('SQL_CREATE_DB', 'CREATE DATABASE IF NOT EXISTS %1$s DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
-
 if (STEP === 3 && isset($_POST['type'])) {
 	$_SESSION['bd_type'] = $_POST['type'];
 }
@@ -33,6 +31,9 @@ if (isset($_SESSION['bd_type'])) {
 	case 'sqlite':
 		include(APP_PATH . '/SQL/install.sql.sqlite.php');
 		break;
+	case 'pgsql':
+		include(APP_PATH . '/SQL/install.sql.pgsql.php');
+		break;
 	}
 }
 
@@ -301,7 +302,8 @@ function checkStep1() {
 	$curl = extension_loaded('curl');
 	$pdo_mysql = extension_loaded('pdo_mysql');
 	$pdo_sqlite = extension_loaded('pdo_sqlite');
-	$pdo = $pdo_mysql || $pdo_sqlite;
+	$pdo_pgsql = extension_loaded('pdo_pgsql');
+	$pdo = $pdo_mysql || $pdo_sqlite || $pdo_pgsql;
 	$pcre = extension_loaded('pcre');
 	$ctype = extension_loaded('ctype');
 	$dom = class_exists('DOMDocument');
@@ -319,6 +321,7 @@ function checkStep1() {
 		'curl' => $curl ? 'ok' : 'ko',
 		'pdo-mysql' => $pdo_mysql ? 'ok' : 'ko',
 		'pdo-sqlite' => $pdo_sqlite ? 'ok' : 'ko',
+		'pdo-pgsql' => $pdo_pgsql ? 'ok' : 'ko',
 		'pdo' => $pdo ? 'ok' : 'ko',
 		'pcre' => $pcre ? 'ok' : 'ko',
 		'ctype' => $ctype ? 'ok' : 'ko',
@@ -435,6 +438,22 @@ function checkBD() {
 				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
 			);
 			break;
+		case 'pgsql':
+			$driver_options = array(
+				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+			);
+
+			try {	// on ouvre une connexion juste pour créer la base si elle n'existe pas
+				$str = 'pgsql:host=' . $_SESSION['bd_host'] . ';';
+				$c = new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
+				$sql = sprintf(SQL_CREATE_DB, $_SESSION['bd_base']);
+				$res = $c->query($sql);
+			} catch (PDOException $e) {
+			}
+
+			// on écrase la précédente connexion en sélectionnant la nouvelle BDD
+			$str = 'pgsql:host=' . $_SESSION['bd_host'] . ';dbname=' . $_SESSION['bd_base'];
+			break;
 		default:
 			return false;
 		}
@@ -708,6 +727,12 @@ function printStep3() {
 					SQLite
 				</option>
 				<?php }?>
+				<?php if (extension_loaded('pdo_pgsql')) {?>
+				<option value="sqlite"
+					<?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'pgsql') ? 'selected="selected"' : ''; ?>>
+					PostgreSQL
+				</option>
+				<?php }?>
 				</select>
 			</div>
 		</div>
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 845aecaae..b98a26d06 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -55,36 +55,36 @@ class Minz_ModelPdo {
 		$driver_options = isset($conf->db['pdo_options']) && is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
 
 		try {
-			$type = $db['type'];
-			if ($type === 'mysql') {
-				$string = 'mysql:host=' . $db['host']
-				        . ';dbname=' . $db['base']
-				        . ';charset=utf8mb4';
-				$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8mb4';
-				$this->prefix = $db['prefix'] . $currentUser . '_';
-			} elseif ($type === 'sqlite') {
-				$string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite');
-				//$driver_options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_EXCEPTION;
-				$this->prefix = '';
-			} else {
-				throw new Minz_PDOConnectionException(
-					'Invalid database type!',
-					$db['user'], Minz_Exception::ERROR
-				);
-			}
-			self::$sharedDbType = $type;
-			self::$sharedPrefix = $this->prefix;
-
-			$this->bd = new MinzPDO(
-				$string,
-				$db['user'],
-				$db['password'],
-				$driver_options
-			);
-			if ($type === 'sqlite') {
-				$this->bd->exec('PRAGMA foreign_keys = ON;');
+			switch ($db['type']) {
+				case 'mysql':
+					$string = 'mysql:host=' . $db['host'] . ';dbname=' . $db['base'] . ';charset=utf8mb4';
+					$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8mb4';
+					$this->prefix = $db['prefix'] . $currentUser . '_';
+					$this->bd = new MinzPDO($string, $db['user'], $db['password'], $driver_options);
+					//TODO Consider: $this->bd->exec("SET SESSION sql_mode = 'ANSI_QUOTES';");
+					break;
+				case 'sqlite':
+					$string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite');
+					$this->prefix = '';
+					$this->bd = new MinzPDO($string, $db['user'], $db['password'], $driver_options);
+					$this->bd->exec('PRAGMA foreign_keys = ON;');
+					break;
+				case 'pgsql':
+					$string = 'pgsql:host=' . $db['host'] . ';dbname=' . $db['base'] . ';charset=utf8';
+					$this->prefix = $db['prefix'] . $currentUser . '_';
+					$this->bd = new MinzPDOPGSQL($string, $db['user'], $db['password'], $driver_options);
+					$this->bd->exec("SET NAMES 'UTF8';");
+					break;
+				default:
+					throw new Minz_PDOConnectionException(
+						'Invalid database type!',
+						$db['user'], Minz_Exception::ERROR
+					);
+					break;
 			}
 			self::$sharedBd = $this->bd;
+			self::$sharedDbType = $db['type'];
+			self::$sharedPrefix = $this->prefix;
 		} catch (Exception $e) {
 			throw new Minz_PDOConnectionException(
 				$string,
@@ -119,18 +119,39 @@ class MinzPDO extends PDO {
 		}
 	}
 
+	protected function compatibility($statement) {
+		return $statement;
+	}
+
 	public function prepare($statement, $driver_options = array()) {
 		MinzPDO::check($statement);
+		$statement = MinzPDO::compatibility($statement);
 		return parent::prepare($statement, $driver_options);
 	}
 
 	public function exec($statement) {
 		MinzPDO::check($statement);
+		$statement = MinzPDO::compatibility($statement);
 		return parent::exec($statement);
 	}
 
 	public function query($statement) {
 		MinzPDO::check($statement);
+		$statement = MinzPDO::compatibility($statement);
 		return parent::query($statement);
 	}
+
+	public function lastInsertId($name = null) {
+		return parent::lastInsertId();	//We discard the name, only used by PostgreSQL
+	}
+}
+
+class MinzPDOPGSQL extends MinzPDO {
+	protected function compatibility($statement) {
+		return str_replace(array('`', " X'"), array('"', " E'\\x"), $statement);
+	}
+
+	public function lastInsertId($name = null) {
+		return parent::lastInsertId($name);
+	}
 }
diff --git a/p/scripts/install.js b/p/scripts/install.js
index 57fc2450a..3e1db57b5 100644
--- a/p/scripts/install.js
+++ b/p/scripts/install.js
@@ -42,13 +42,15 @@ if (auth_type) {
 function mySqlShowHide() {
 	var mysql = document.getElementById('mysql');
 	if (mysql) {
-		mysql.style.display = document.getElementById('type').value === 'mysql' ? 'block' : 'none';
-		if (document.getElementById('type').value !== 'mysql') {
+		if (document.getElementById('type').value === 'sqlite') {
 			document.getElementById('host').value = '';
 			document.getElementById('user').value = '';
 			document.getElementById('pass').value = '';
 			document.getElementById('base').value = '';
 			document.getElementById('prefix').value = '';
+			mysql.style.display = 'none';
+		} else {
+			mysql.style.display = 'block';
 		}
 	}
 }
-- 
cgit v1.2.3


From d5382ff0d06fd9f202ca2e6d3fb3cb757ed912e3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 2 Aug 2016 23:02:47 +0200
Subject: DatabaseDAO for PostgreSQL

From
https://github.com/Damstre/FreshRSS/blob/be2b15d12c413755be64ecb0625dce5a8ad280bf/app/Models/DatabaseDAOpgSQL.php
---
 app/Models/DatabaseDAOPGSQL.php | 43 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 app/Models/DatabaseDAOPGSQL.php

diff --git a/app/Models/DatabaseDAOPGSQL.php b/app/Models/DatabaseDAOPGSQL.php
new file mode 100644
index 000000000..a4edaa448
--- /dev/null
+++ b/app/Models/DatabaseDAOPGSQL.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This class is used to test database is well-constructed.
+ */
+class FreshRSS_DatabaseDAOPGSQL extends FreshRSS_DatabaseDAO {
+	public function tablesAreCorrect() {
+		$db = FreshRSS_Context::$system_conf->db;
+		$dbowner = $db['user'];
+		$sql = 'SELECT * FROM pg_catalog.pg_tables where tableowner=?';
+		$stm = $this->bd->prepare($sql);
+		$values = array($dbowner);
+		$stm->execute($values);
+		$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 = 'select column_name as field, data_type as type, column_default as default, is_nullable as null from INFORMATION_SCHEMA.COLUMNS where table_name = ?';
+		$stm = $this->bd->prepare($sql);
+		$stm->execute(array($this->prefix . $table));
+		return $this->listDaoToSchema($stm->fetchAll(PDO::FETCH_ASSOC));
+	}
+
+	public function daoToSchema($dao) {
+		return array(
+			'name' => $dao['field'],
+			'type' => strtolower($dao['type']),
+			'notnull' => (bool)$dao['null'],
+			'default' => $dao['default'],
+		);
+	}
+}
-- 
cgit v1.2.3


From 3e1b2e75e01dfc9ac2414940adaf4d62251075e9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 2 Aug 2016 23:13:46 +0200
Subject: Forgotten method name update for SQLite

https://github.com/FreshRSS/FreshRSS/pull/1183
https://github.com/FreshRSS/FreshRSS/issues/1153
---
 app/Models/EntryDAOSQLite.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index ff049d813..19b97fd3a 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -2,11 +2,12 @@
 
 class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 
-	protected function autoAddColumn($errorInfo) {
+	protected function autoUpdateDb($errorInfo) {
 		if (empty($errorInfo[0]) || $errorInfo[0] == '42S22') {	//ER_BAD_FIELD_ERROR
+			//autoAddColumn
 			if ($tableInfo = $this->bd->query("SELECT sql FROM sqlite_master where name='entry'")) {
 				$showCreate = $tableInfo->fetchColumn();
-				Minz_Log::debug('FreshRSS_EntryDAOSQLite::autoAddColumn: ' . $showCreate);
+				Minz_Log::debug('FreshRSS_EntryDAOSQLite::autoUpdateDb: ' . $showCreate);
 				foreach (array('lastSeen', 'hash') as $column) {
 					if (stripos($showCreate, $column) === false) {
 						return $this->addColumn($column);
-- 
cgit v1.2.3


From 4402d92f013ada8fa814a02d8ee1a6a61a7e5001 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 3 Aug 2016 00:06:06 +0200
Subject: Install script bug

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

diff --git a/app/install.php b/app/install.php
index ffff9f8e9..6e902485c 100644
--- a/app/install.php
+++ b/app/install.php
@@ -709,7 +709,7 @@ function printStep3() {
 	<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">
+	<form action="index.php?step=3" method="post" autocomplete="off">
 		<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>
@@ -728,7 +728,7 @@ function printStep3() {
 				</option>
 				<?php }?>
 				<?php if (extension_loaded('pdo_pgsql')) {?>
-				<option value="sqlite"
+				<option value="pgsql"
 					<?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'pgsql') ? 'selected="selected"' : ''; ?>>
 					PostgreSQL
 				</option>
@@ -755,7 +755,7 @@ function printStep3() {
 		<div class="form-group">
 			<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'] : ''; ?>" tabindex="4" />
+				<input type="password" id="pass" name="pass" value="<?php echo isset($_SESSION['bd_password']) ? $_SESSION['bd_password'] : ''; ?>" tabindex="4" autocomplete="off" />
 			</div>
 		</div>
 
-- 
cgit v1.2.3


From 3652dea854200f31492a71243727f6a1be317c4a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Aug 2016 13:18:46 +0200
Subject: JSHint and safer async init_normal

---
 p/scripts/category.js    |   4 +-
 p/scripts/global_view.js |   3 +
 p/scripts/install.js     |   1 +
 p/scripts/main.js        | 140 +++++++++++++++++++++++++----------------------
 p/scripts/repartition.js |  18 +++---
 p/scripts/stats.js       |   3 +
 6 files changed, 93 insertions(+), 76 deletions(-)

diff --git a/p/scripts/category.js b/p/scripts/category.js
index c33e68528..be9605bec 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -1,4 +1,6 @@
 "use strict";
+/* globals i18n */
+/* jshint globalstrict: true */
 
 var loading = false,
 	dnd_successful = false;
@@ -20,7 +22,7 @@ function dragend_process(t) {
 		$(t).remove();
 
 		if (parent.children().length <= 0) {
-			parent.append('<li class="item disabled" dropzone="move">' + i18n['category_empty'] + '</li>');
+			parent.append('<li class="item disabled" dropzone="move">' + i18n.category_empty + '</li>');
 		}
 	}
 }
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 7d7ba22b5..f1b9c8ad4 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -1,4 +1,7 @@
 "use strict";
+/* globals init_load_more, init_posts, init_stream */
+/* jshint globalstrict: true */
+
 var panel_loading = false;
 
 function load_panel(link) {
diff --git a/p/scripts/install.js b/p/scripts/install.js
index 57fc2450a..d7f4e7b02 100644
--- a/p/scripts/install.js
+++ b/p/scripts/install.js
@@ -1,4 +1,5 @@
 "use strict";
+/* jshint globalstrict: true */
 
 function show_password() {
 	var button = this;
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 01c8c9cf5..21e26d6df 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1,4 +1,7 @@
 "use strict";
+/* globals context, i18n, shortcut, shortcuts, url */
+/* jshint globalstrict: true */
+
 var $stream = null,
 	isCollapsed = true,
 	shares = 0,
@@ -49,9 +52,7 @@ function numberFormat(nStr) {
 
 function incLabel(p, inc, spaceAfter) {
 	var i = str2int(p) + inc;
-	return i > 0
-		? ((spaceAfter ? '' : ' ') + '(' + numberFormat(i) + ')' + (spaceAfter ? ' ' : ''))
-		: '';
+	return i > 0 ? ((spaceAfter ? '' : ' ') + '(' + numberFormat(i) + ')' + (spaceAfter ? ' ' : '')) : '';
 }
 
 function incUnreadsFeed(article, feed_id, nb) {
@@ -217,7 +218,7 @@ function toggleContent(new_active, old_active) {
 		return;
 	}
 
-	if (context['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');
@@ -230,17 +231,17 @@ 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')) {
+		if (context.auto_remove_article && !old_active.hasClass('not_read')) {
 			auto_remove(old_active);
 		}
 	} else {
 		new_active.toggleClass('active');
 	}
 
-	var relative_move = context['current_view'] === 'global',
+	var relative_move = context.current_view === 'global',
 		box_to_move = $(relative_move ? "#panel" : "html,body");
 
-	if (context['sticky_post']) {
+	if (context.sticky_post) {
 		var prev_article = new_active.prevAll('.flux'),
 			new_pos = new_active.offset().top,
 			old_scroll = box_to_move.scrollTop();
@@ -252,7 +253,7 @@ function toggleContent(new_active, old_active) {
 			}
 		}
 
-		if (context['hide_posts']) {
+		if (context.hide_posts) {
 			if (relative_move) {
 				new_pos += old_scroll;
 			}
@@ -271,7 +272,7 @@ function toggleContent(new_active, old_active) {
 		}
 	}
 
-	if (context['auto_mark_article'] && new_active.hasClass('active')) {
+	if (context.auto_mark_article && new_active.hasClass('active')) {
 		mark_read(new_active, true);
 	}
 }
@@ -381,7 +382,7 @@ function collapse_entry() {
 
 	var flux_current = $(".flux.current");
 	flux_current.toggleClass("active");
-	if (isCollapsed && context['auto_mark_article']) {
+	if (isCollapsed && context.auto_mark_article) {
 		mark_read(flux_current, true);
 	}
 }
@@ -456,11 +457,11 @@ function inMarkViewport(flux, box_to_follow) {
 
 function init_posts() {
 	var box_to_follow = $(window);
-	if (context['current_view'] === 'global') {
+	if (context.current_view === 'global') {
 		box_to_follow = $("#panel");
 	}
 
-	if (context['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)) {
@@ -470,7 +471,7 @@ function init_posts() {
 		});
 	}
 
-	if (context['auto_load_more']) {
+	if (context.auto_load_more) {
 		box_to_follow.scroll(function () {
 			var load_more = $("#load_more");
 			if (!load_more.is(':visible')) {
@@ -487,7 +488,7 @@ function init_posts() {
 }
 
 function init_column_categories() {
-	if (context['current_view'] !== 'normal') {
+	if (context.current_view !== 'normal') {
 		return;
 	}
 
@@ -559,14 +560,16 @@ function init_shortcuts() {
 	}, {
 		'disable_in_input': true
 	});
-	for(var i = 1; i < 10; i++){
-		shortcut.add(i.toString(), function (e) {
-			if ($('#dropdown-query').siblings('.dropdown-menu').is(':visible')) {
-				user_filter(String.fromCharCode(e.keyCode));
-			} else {
-				auto_share(String.fromCharCode(e.keyCode));
-			}
-		}, {
+
+	function addShortcut(evt) {
+		if ($('#dropdown-query').siblings('.dropdown-menu').is(':visible')) {
+			user_filter(String.fromCharCode(evt.keyCode));
+		} else {
+			auto_share(String.fromCharCode(evt.keyCode));
+		}
+	}
+	for(var i = 1; i < 10; i++) {
+		shortcut.add(i.toString(), addShortcut, {
 			'disable_in_input': true
 		});
 	}
@@ -628,7 +631,7 @@ function init_shortcuts() {
 	shortcut.add(shortcuts.go_website, function () {
 		var url_website = $('.flux.current > .flux_header > .title > a').attr("href");
 
-		if (context['auto_mark_site']) {
+		if (context.auto_mark_site) {
 			$(".flux.current").each(function () {
 				mark_read($(this), true);
 			});
@@ -652,7 +655,7 @@ function init_shortcuts() {
 	});
 
 	shortcut.add(shortcuts.help, function () {
-		redirect(url['help'], true);
+		redirect(url.help, true);
 	}, {
 		'disable_in_input': true
 	});
@@ -674,7 +677,7 @@ function init_stream(divStream) {
 			new_active = $(this).parent();
 		isCollapsed = true;
 		if (e.target.tagName.toUpperCase() === 'A') {	//Leave real links alone
-			if (context['auto_mark_article']) {
+			if (context.auto_mark_article) {
 				mark_read(new_active, true);
 			}
 			return true;
@@ -684,7 +687,7 @@ function init_stream(divStream) {
 
 	divStream.on('click', '.flux a.read', function () {
 		var active = $(this).parents(".flux");
-		if (context['auto_remove_article'] && active.hasClass('not_read')) {
+		if (context.auto_remove_article && active.hasClass('not_read')) {
 			auto_remove(active);
 		}
 		mark_read(active, false);
@@ -710,9 +713,9 @@ function init_stream(divStream) {
 
 		if (e.which == 2) {
 			// If middle click, we want same behaviour as CTRL+click.
-			var e = jQuery.Event("click");
-			e.ctrlKey = true;
-			$(this).trigger(e);
+			var ev = jQuery.Event("click");
+			ev.ctrlKey = true;
+			$(this).trigger(ev);
 		} else if(e.which == 1) {
 			// Normal click, just toggle article.
 			$(this).parent().click();
@@ -723,7 +726,7 @@ function init_stream(divStream) {
 		$(this).attr('target', '_blank');
 	});
 
-	if (context['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) {
@@ -765,17 +768,17 @@ var feed_processed = 0;
 
 function updateFeed(feeds, feeds_count) {
 	var feed = feeds.pop();
-	if (feed == undefined) {
+	if (!feed) {
 		return;
 	}
 
 	$.ajax({
 		type: 'POST',
-		url: feed['url'],
+		url: feed.url,
 	}).complete(function (data) {
 		feed_processed++;
 		$("#actualizeProgress .progress").html(feed_processed + " / " + feeds_count);
-		$("#actualizeProgress .title").html(feed['title']);
+		$("#actualizeProgress .title").html(feed.title);
 
 		if (feed_processed === feeds_count) {
 			window.location.reload();
@@ -819,7 +822,7 @@ function init_actualize() {
 		return false;
 	});
 
-	if (context['auto_actualize_feeds']) {
+	if (context.auto_actualize_feeds) {
 		auto = true;
 		$("#actualize").click();
 	}
@@ -887,12 +890,12 @@ function notifs_html5_ask_permission() {
 
 function notifs_html5_show(nb) {
 	if (notifs_html5_permission !== "granted") {
-		return
+		return;
 	}
 
-	var notification = new window.Notification(i18n['notif_title_articles'], {
+	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"
 	});
 
@@ -900,10 +903,10 @@ function notifs_html5_show(nb) {
 		window.location.reload();
 	};
 
-	if (context['html5_notif_timeout'] !== 0) {
+	if (context.html5_notif_timeout !== 0) {
 		setTimeout(function() {
 			notification.close();
-		}, context['html5_notif_timeout'] * 1000);
+		}, context.html5_notif_timeout * 1000);
 	}
 }
 
@@ -930,7 +933,7 @@ function refreshUnreads() {
 				(nbUnreads - feed_unreads > 0)) {
 				$('#new-article').attr('aria-hidden', 'false').show();
 				new_articles = true;
-			};
+			}
 		});
 
 		var nb_unreads = str2int($('.category.all .title').attr('data-unread'));
@@ -957,7 +960,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 (context['display_order'] === 'ASC') {
+		if (context.display_order === 'ASC') {
 			$('#nav_menu_read_all > .read_all').attr(
 				'formaction', $('#bigMarkAsRead').attr('formaction')
 			);
@@ -988,7 +991,7 @@ function focus_search() {
 function init_load_more(box) {
 	box_load_more = box;
 
-	if (!context['does_lazyload']) {
+	if (!context.does_lazyload) {
 		$('img[postpone], audio[postpone], iframe[postpone], video[postpone]').each(function () {
 			this.removeAttribute('postpone');
 		});
@@ -1027,6 +1030,7 @@ function poormanSalt() {	//If crypto.getRandomValues is not available
 }
 
 function init_crypto_form() {
+	/* globals dcodeIO */
 	var $crypto_form = $('#crypto-form');
 	if ($crypto_form.length === 0) {
 		return;
@@ -1050,7 +1054,7 @@ function init_crypto_form() {
 			dataType: 'json',
 			async: false
 		}).done(function (data) {
-			if (data.salt1 == '' || data.nonce == '') {
+			if (!data.salt1 || !data.nonce) {
 				openNotification('Invalid user!', 'bad');
 			} else {
 				try {
@@ -1058,7 +1062,7 @@ function init_crypto_form() {
 						s = dcodeIO.bcrypt.hashSync($('#passwordPlain').val(), data.salt1),
 						c = dcodeIO.bcrypt.hashSync(data.nonce + s, strong ? dcodeIO.bcrypt.genSaltSync(4) : poormanSalt());
 					$('#challenge').val(c);
-					if (s == '' || c == '') {
+					if (!s || !c) {
 						openNotification('Crypto error!', 'bad');
 					} else {
 						success = true;
@@ -1083,7 +1087,7 @@ function init_confirm_action() {
 	$('body').on('click', '.confirm', function () {
 		var str_confirmation = $(this).attr('data-str-confirm');
 		if (!str_confirmation) {
-			str_confirmation = i18n['confirmation_default'];
+			str_confirmation = i18n.confirmation_default;
 		}
 
 		return confirm(str_confirmation);
@@ -1092,13 +1096,13 @@ function init_confirm_action() {
 
 function init_print_action() {
 	$('.item.share > a[href="#"]').click(function () {
-		var content = "<html><head><style>"
-			+ "body { font-family: Serif; text-align: justify; }"
-			+ "a { color: #000; text-decoration: none; }"
-			+ "a:after { content: ' [' attr(href) ']'}"
-			+ "</style></head><body>"
-			+ $(".flux.current .content").html()
-			+ "</body></html>";
+		var content = "<html><head><style>" +
+			"body { font-family: Serif; text-align: justify; }" +
+			"a { color: #000; text-decoration: none; }" +
+			"a:after { content: ' [' attr(href) ']'}" +
+			"</style></head><body>" +
+			$(".flux.current .content").html() +
+			"</body></html>";
 
 		var tmp_window = window.open();
 		tmp_window.document.writeln(content);
@@ -1291,6 +1295,22 @@ function parseJsonVars() {
 	window.icons = json.icons;
 }
 
+function init_normal() {
+	$stream = $('#stream');
+	if ($stream.length < 1) {
+		if (window.console) {
+			console.log('FreshRSS waiting for content…');
+		}
+		window.setTimeout(init_normal, 50);
+		return;
+	}
+	init_column_categories();
+	init_stream($stream);
+	init_shortcuts();
+	init_actualize();
+	faviconNbUnread();
+}
+
 function init_beforeDOM() {
 	if (!window.$) {
 		if (window.console) {
@@ -1300,20 +1320,8 @@ function init_beforeDOM() {
 		return;
 	}
 	init_confirm_action();
-	if (['normal', 'reader', 'global'].indexOf(context['current_view']) >= 0) {
-		$stream = $('#stream');
-		if ($stream.length < 1) {
-			if (window.console) {
-				console.log('FreshRSS waiting for content…');
-			}
-			window.setTimeout(init_beforeDOM, 50);
-			return;
-		}
-		init_column_categories();
-		init_stream($stream);
-		init_shortcuts();
-		init_actualize();
-		faviconNbUnread();
+	if (['normal', 'reader', 'global'].indexOf(context.current_view) >= 0) {
+		init_normal();
 	}
 }
 
diff --git a/p/scripts/repartition.js b/p/scripts/repartition.js
index a391de2f2..be70456fa 100644
--- a/p/scripts/repartition.js
+++ b/p/scripts/repartition.js
@@ -1,4 +1,7 @@
 "use strict";
+/* globals Flotr, numberFormat */
+/* jshint globalstrict: true */
+
 function initStats() {
 	if (!window.Flotr) {
 		if (window.console) {
@@ -19,9 +22,8 @@ function initStats() {
 		{
 			grid: {verticalLines: false},
 			xaxis: {noTicks: 23,
-				tickFormatter: function(x) {
-					var x = parseInt(x);
-					return x + 1;
+				tickFormatter: function(x1) {
+					return 1 + parseInt(x1);
 				},
 				min: -0.9,
 				max: 23.9,
@@ -38,9 +40,8 @@ function initStats() {
 		{
 			grid: {verticalLines: false},
 			xaxis: {noTicks: 6,
-				tickFormatter: function(x) {
-					var x = parseInt(x);
-					return stats.days[x];
+				tickFormatter: function(x2) {
+					return stats.days[parseInt(x2)];
 				},
 				min: -0.9,
 				max: 6.9,
@@ -57,9 +58,8 @@ function initStats() {
 		{
 			grid: {verticalLines: false},
 			xaxis: {noTicks: 12,
-				tickFormatter: function(x) {
-					var x = parseInt(x);
-					return stats.months[(x - 1)];
+				tickFormatter: function(x3) {
+					return stats.months[parseInt(x3) - 1];
 				},
 				min: 0.1,
 				max: 12.9,
diff --git a/p/scripts/stats.js b/p/scripts/stats.js
index 2e8ab6e27..9cd14721c 100644
--- a/p/scripts/stats.js
+++ b/p/scripts/stats.js
@@ -1,4 +1,7 @@
 "use strict";
+/* globals Flotr, numberFormat */
+/* jshint globalstrict: true */
+
 function initStats() {
 	if (!window.Flotr) {
 		if (window.console) {
-- 
cgit v1.2.3


From 5fa4f40133c78388ce3474f3d211707ea3c04ce6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Aug 2016 13:24:04 +0200
Subject: jQuery 3.1.0

http://blog.jquery.com/2016/07/07/jquery-3-1-0-released-no-more-silent-errors/
---
 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 349030de9..f6a6a99e6 100644
--- a/p/scripts/jquery.min.js
+++ b/p/scripts/jquery.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v2.2.1 | (c) jQuery Foundation | 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=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.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 e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.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()},push:g,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){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!k.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?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.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){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[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):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.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,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"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=ga(),z=ga(),A=ga(),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="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),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")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=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)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){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 fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(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 la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(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 oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.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]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);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"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' 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(".#.+[+~]")}),ia(function(a){var b=n.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=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.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===n||a.ownerDocument===v&&t(v,a)?-1:b===n||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,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!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 fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.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},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.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=fa.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=fa.selectors={cacheLength:50,createPseudo:ha,match:W,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(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===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]||fa.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]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.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(ba,ca).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=fa.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(P," ")+" ").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,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(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:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(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:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).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 Y.test(a.nodeName)},input:function(a){return X.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:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(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]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.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=R.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[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?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(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,k=[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(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(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 ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(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 va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(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=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(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=[ra(sa(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 va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.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(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.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(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(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}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=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},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(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(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==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(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};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=w.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.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.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.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(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 u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(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&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},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().progress(c.notify).done(c.resolve).fail(c.reject):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=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;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||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=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)K(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},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][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=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c}catch(e){}O.set(a,b,c);
-}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.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=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.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 N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.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=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={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,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.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"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.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)),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=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.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)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.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.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!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&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(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)>-1: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 detail 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,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&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)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},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?ga:ha):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={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&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}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,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=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(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 qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.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])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(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 ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(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 K(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&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),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),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Da=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},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Ba.test(g)&&Aa.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 Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(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+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ca(b),i="border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Fa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Ba.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+Oa(b,c,e||(i?"border":"content"),f,h)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.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=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,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]=Ma(h)||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=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.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]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[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+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(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 Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.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},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.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?N.get(a,"olddisplay")||za(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],Ua.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?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(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 $a(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 _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),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:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),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.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,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(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.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(V).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=_a(this,n.extend({},a),f);(e||N.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=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.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=N.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(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("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(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=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(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(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(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);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)}}),ab={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=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(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){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.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 eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(void 0===a||"boolean"===c)&&(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\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(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){return n.trim(a.value)}},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)&&(l.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(n.valHooks.option.get(d),f)>-1)&&(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)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var hb=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!hb.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,hb.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}}),n.fn.extend({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}}),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)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var ib=a.location,jb=n.now(),kb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return(!c||c.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+b),c};var lb=/#.*$/,mb=/([?&])_=[^&]*/,nb=/^(.*?):[ \t]*([^\r\n]*)$/gm,ob=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,pb=/^(?:GET|HEAD)$/,qb=/^\/\//,rb={},sb={},tb="*/".concat("*"),ub=d.createElement("a");ub.href=ib.href;function vb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];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 wb(a,b,c,d){var e={},f=a===sb;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 xb(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 yb(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 zb(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:ib.href,type:"GET",isLocal:ob.test(ib.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":tb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},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?xb(xb(a,n.ajaxSettings),b):xb(n.ajaxSettings,a)},ajaxPrefilter:vb(rb),ajaxTransport:vb(sb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=nb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||ib.href)+"").replace(lb,"").replace(qb,ib.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=ub.protocol+"//"+ub.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),wb(rb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!pb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(kb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=mb.test(f)?f.replace(mb,"$1_="+jb++):f+(kb.test(f)?"&":"?")+"_="+jb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+tb+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=wb(sb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=yb(m,x,d)),u=zb(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,(b||!y)&&(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},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(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&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 n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(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!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Ab=/%20/g,Bb=/\[\]$/,Cb=/\r?\n/g,Db=/^(?:submit|button|image|reset|file)$/i,Eb=/^(?:input|select|textarea|keygen)/i;function Fb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Bb.test(a)?d(a,e):Fb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Fb(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)Fb(c,a[c],b,e);return d.join("&").replace(Ab,"+")},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")&&Eb.test(this.nodeName)&&!Db.test(a)&&(this.checked||!X.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(Cb,"\r\n")}}):{name:b.name,value:c.replace(Cb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Gb={0:200,1223:204},Hb=n.ajaxSettings.xhr();l.cors=!!Hb&&"withCredentials"in Hb,l.ajax=Hb=!!Hb,n.ajaxTransport(function(b){var c,d;return l.cors||Hb&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Gb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},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(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Ib=[],Jb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Ib.pop()||n.expando+"_"+jb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Jb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Jb.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(Jb,"$1"+e):b.jsonp!==!1&&(b.url+=(kb.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(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Ib.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),l.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||(l.createHTMLDocument?d.implementation.createHTMLDocument(""):d);var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Kb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Kb)return Kb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(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||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,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};function Lb(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,n.extend({},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)?(e=d.getBoundingClientRect(),c=Lb(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;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Lb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.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 K(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.extend({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)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Mb=a.jQuery,Nb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Nb),b&&a.jQuery===n&&(a.jQuery=Mb),n},b||(a.jQuery=a.$=n),n});
+/*! jQuery v3.1.0 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"use strict";"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){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.0",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null!=a?a<0?this[a+this.length]:this[a]:f.call(this)},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.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||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},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?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;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;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=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=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"label"in b&&b.disabled===a||"form"in b&&b.disabled===a||"form"in b&&b.disabled===!1&&(b.isDisabled===a||b.isDisabled!==!a&&("label"in b||!ea(b))!==a)}}function pa(a){return ia(function(b){return b=+b,ia(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 qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.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]:[]}},d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(_,aa);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){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.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===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(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,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!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 ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.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},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.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=ga.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=ga.selectors={cacheLength:50,createPseudo:ia,match:V,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(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===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]||ga.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]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.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(_,aa).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("(^|"+K+")"+a+"("+K+"|$)"))&&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=ga.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(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},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,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(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:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).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:oa(!1),disabled:oa(!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 X.test(a.nodeName)},input:function(a){return W.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:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?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]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.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=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[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?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e)}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}}}function ua(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 va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(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?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(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}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.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(_,aa),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=V.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(_,aa),$.test(j[0].type)&&qa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&sa(j),!a)return G.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||$.test(a)&&qa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){if(r.isFunction(b))return r.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return r.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(C.test(b))return r.filter(b,a,c);b=r.filter(b,a)}return r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType})}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/\S+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,M,e),g(f,c,N,e)):(f++,j.call(a,g(f,c,M,e),g(f,c,N,e),g(f,c,M,c.notifyWith))):(d!==M&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R),a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,
+r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;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},T=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function U(){this.expando=r.expando+U.uid++}U.uid=1,U.prototype={cache:function(a){var b=a[this.expando];return b||(b={},T(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){r.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(K)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var V=new U,W=new U,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Y=/[A-Z]/g;function Z(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Y,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c||"false"!==c&&("null"===c?null:+c+""===c?+c:X.test(c)?JSON.parse(c):c)}catch(e){}W.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return W.hasData(a)||V.hasData(a)},data:function(a,b,c){return W.access(a,b,c)},removeData:function(a,b){W.remove(a,b)},_data:function(a,b,c){return V.access(a,b,c)},_removeData:function(a,b){V.remove(a,b)}}),r.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=W.get(f),1===f.nodeType&&!V.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),Z(f,d,e[d])));V.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){W.set(this,a)}):S(this,function(b){var c;if(f&&void 0===b){if(c=W.get(f,a),void 0!==c)return c;if(c=Z(f,a),void 0!==c)return c}else this.each(function(){W.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.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 V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.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=V.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var $=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,_=new RegExp("^(?:([+-])=|)("+$+")([a-z%]*)$","i"),aa=["Top","Right","Bottom","Left"],ba=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ca=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};function da(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&_.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ea={};function fa(a){var b,c=a.ownerDocument,d=a.nodeName,e=ea[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ea[d]=e,e)}function ga(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=V.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&ba(d)&&(e[f]=fa(d))):"none"!==c&&(e[f]="none",V.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ga(this,!0)},hide:function(){return ga(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){ba(this)?r(this).show():r(this).hide()})}});var ha=/^(?:checkbox|radio)$/i,ia=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ja=/^$|\/(?:java|ecma)script/i,ka={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,"",""]};ka.optgroup=ka.option,ka.tbody=ka.tfoot=ka.colgroup=ka.caption=ka.thead,ka.th=ka.td;function la(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function ma(a,b){for(var c=0,d=a.length;c<d;c++)V.set(a[c],"globalEval",!b||V.get(b[c],"globalEval"))}var na=/<|&#?\w+;/;function oa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(na.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ia.exec(f)||["",""])[1].toLowerCase(),i=ka[h]||ka._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=la(l.appendChild(f),"script"),j&&ma(g),c){k=0;while(f=g[k++])ja.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var pa=d.documentElement,qa=/^key/,ra=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,sa=/^([^.]*)(?:\.(.+)|)/;function ta(){return!0}function ua(){return!1}function va(){try{return d.activeElement}catch(a){}}function wa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)wa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ua;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(pa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),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),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==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,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;c<h;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?r(e,this).index(i)>-1:r.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},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==va()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===va()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&r.nodeName(this,"input"))return this.click(),!1},_default:function(a){return r.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ta:ua,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:ua,isPropagationStopped:ua,isImmediatePropagationStopped:ua,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ta,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ta,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ta,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&qa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ra.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return wa(this,a,b,c,d)},one:function(a,b,c,d){return wa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(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=ua),this.each(function(){r.event.remove(this,a,c,b)})}});var xa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,ya=/<script|<style|<link/i,za=/checked\s*(?:[^=]|=\s*.checked.)/i,Aa=/^true\/(.*)/,Ba=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ca(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Da(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ea(a){var b=Aa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}W.hasData(a)&&(h=W.access(a),i=r.extend({},h),W.set(b,i))}}function Ga(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ha.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ha(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&za.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(m&&(e=oa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(la(e,"script"),Da),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,la(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ea),l=0;l<i;l++)j=h[l],ja.test(j.type||"")&&!V.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Ba,""),k))}return a}function Ia(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(la(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&ma(la(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(xa,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=la(h),f=la(a),d=0,e=f.length;d<e;d++)Ga(f[d],g[d]);if(b)if(c)for(f=f||la(a),g=g||la(h),d=0,e=f.length;d<e;d++)Fa(f[d],g[d]);else Fa(a,h);return g=la(h,"script"),g.length>0&&ma(g,!i&&la(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.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 Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(la(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(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&&!ya.test(a)&&!ka[(ia.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(la(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(la(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var Ja=/^margin/,Ka=new RegExp("^("+$+")(?!px)[a-z%]+$","i"),La=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",pa.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,pa.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Ma(a,b,c){var d,e,f,g,h=a.style;return c=c||La(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ka.test(g)&&Ja.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 Na(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Oa=/^(none|table(?!-c[ea]).+)/,Pa={position:"absolute",visibility:"hidden",display:"block"},Qa={letterSpacing:"0",fontWeight:"400"},Ra=["Webkit","Moz","ms"],Sa=d.createElement("div").style;function Ta(a){if(a in Sa)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ra.length;while(c--)if(a=Ra[c]+b,a in Sa)return a}function Ua(a,b,c){var d=_.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Va(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+aa[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+aa[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+aa[f]+"Width",!0,e))):(g+=r.css(a,"padding"+aa[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+aa[f]+"Width",!0,e)));return g}function Wa(a,b,c){var d,e=!0,f=La(a),g="border-box"===r.css(a,"boxSizing",!1,f);if(a.getClientRects().length&&(d=a.getBoundingClientRect()[b]),d<=0||null==d){if(d=Ma(a,b,f),(d<0||null==d)&&(d=a.style[b]),Ka.test(d))return d;e=g&&(o.boxSizingReliable()||d===a.style[b]),d=parseFloat(d)||0}return d+Va(a,b,c||(g?"border":"content"),e,f)+"px"}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ma(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,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=r.camelCase(b),i=a.style;return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.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=_.exec(c))&&e[1]&&(c=da(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.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=r.camelCase(b);return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Ma(a,b,d)),"normal"===e&&b in Qa&&(e=Qa[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Oa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?Wa(a,b,d):ca(a,Pa,function(){return Wa(a,b,d)})},set:function(a,c,d){var e,f=d&&La(a),g=d&&Va(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=_.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ua(a,c,g)}}}),r.cssHooks.marginLeft=Na(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Ma(a,"marginLeft"))||a.getBoundingClientRect().left-ca(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+aa[d]+b]=f[d]||f[d-2]||f[0];return e}},Ja.test(a)||(r.cssHooks[a+b].set=Ua)}),r.fn.extend({css:function(a,b){return S(this,function(a,b,c){var d,e,f={},g=0;if(r.isArray(b)){for(d=La(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function Xa(a,b,c,d,e){return new Xa.prototype.init(a,b,c,d,e)}r.Tween=Xa,Xa.prototype={constructor:Xa,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Xa.propHooks[this.prop];return a&&a.get?a.get(this):Xa.propHooks._default.get(this)},run:function(a){var b,c=Xa.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Xa.propHooks._default.set(this),this}},Xa.prototype.init.prototype=Xa.prototype,Xa.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Xa.propHooks.scrollTop=Xa.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Xa.prototype.init,r.fx.step={};var Ya,Za,$a=/^(?:toggle|show|hide)$/,_a=/queueHooks$/;function ab(){Za&&(a.requestAnimationFrame(ab),r.fx.tick())}function bb(){return a.setTimeout(function(){Ya=void 0}),Ya=r.now()}function cb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=aa[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function db(a,b,c){for(var d,e=(gb.tweeners[b]||[]).concat(gb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function eb(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&ba(a),q=V.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],$a.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=V.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ga([a],!0),j=a.style.display||j,k=r.css(a,"display"),ga([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=V.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ga([a],!0),m.done(function(){p||ga([a]),V.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=db(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function fb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],r.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.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 gb(a,b,c){var d,e,f=0,g=gb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Ya||bb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:Ya||bb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.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;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(fb(k,j.opts.specialEasing);f<g;f++)if(d=gb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,db,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),r.fx.timer(r.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)}r.Animation=r.extend(gb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return da(c.elem,a,_.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(K);for(var c,d=0,e=a.length;d<e;d++)c=a[d],gb.tweeners[c]=gb.tweeners[c]||[],gb.tweeners[c].unshift(b)},prefilters:[eb],prefilter:function(a,b){b?gb.prefilters.unshift(a):gb.prefilters.push(a)}}),r.speed=function(a,b,c){var e=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off||d.hidden?e.duration=0:e.duration="number"==typeof e.duration?e.duration:e.duration in r.fx.speeds?r.fx.speeds[e.duration]:r.fx.speeds._default,null!=e.queue&&e.queue!==!0||(e.queue="fx"),e.old=e.complete,e.complete=function(){r.isFunction(e.old)&&e.old.call(this),e.queue&&r.dequeue(this,e.queue)},e},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(ba).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=gb(this,r.extend({},a),f);(e||V.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=r.timers,g=V.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&_a.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||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=V.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.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;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(cb(b,!0),a,d,e)}}),r.each({slideDown:cb("show"),slideUp:cb("hide"),slideToggle:cb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(Ya=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),Ya=void 0},r.fx.timer=function(a){r.timers.push(a),a()?r.fx.start():r.timers.pop()},r.fx.interval=13,r.fx.start=function(){Za||(Za=a.requestAnimationFrame?a.requestAnimationFrame(ab):a.setInterval(r.fx.tick,r.fx.interval))},r.fx.stop=function(){a.cancelAnimationFrame?a.cancelAnimationFrame(Za):a.clearInterval(Za),Za=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var hb,ib=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return S(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?hb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);
+if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),hb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ib[b]||r.find.attr;ib[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=ib[g],ib[g]=e,e=null!=c(a,b,d)?g:null,ib[g]=f),e}});var jb=/^(?:input|select|textarea|button)$/i,kb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.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){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):jb.test(a.nodeName)||kb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});var lb=/[\t\r\n\f]/g;function mb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,mb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,mb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,mb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=mb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(c)+" ").replace(lb," ").indexOf(b)>-1)return!0;return!1}});var nb=/\r/g,ob=/[\x20\t\r\n\f]+/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(nb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:r.trim(r.text(a)).replace(ob," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type,g=f?null:[],h=f?e+1:d.length,i=e<0?h:f?e:0;i<h;i++)if(c=d[i],(c.selected||i===e)&&!c.disabled&&(!c.parentNode.disabled||!r.nodeName(c.parentNode,"optgroup"))){if(b=r(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ha.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.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 Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.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 Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(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}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(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}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,""),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(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 r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Qb=[],Rb=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Qb.pop()||r.expando+"_"+rb++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Rb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rb.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Rb,"$1"+e):b.jsonp!==!1&&(b.url+=(sb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Qb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=B.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=oa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=r.trim(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length};function Sb(a){return r.isWindow(a)?a:9===a.nodeType&&a.defaultView}r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.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),r.isFunction(b)&&(b=b.call(a,c,r.extend({},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)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),d.width||d.height?(e=f.ownerDocument,c=Sb(e),b=e.documentElement,{top:d.top+c.pageYOffset-b.clientTop,left:d.left+c.pageXOffset-b.clientLeft}):d):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),r.nodeName(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||pa})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return S(this,function(a,d,e){var f=Sb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Na(o.pixelPosition,function(a,c){if(c)return c=Ma(a,b),Ka.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return S(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({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)}}),r.parseJSON=JSON.parse,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Tb=a.jQuery,Ub=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Ub),b&&a.jQuery===r&&(a.jQuery=Tb),r},b||(a.jQuery=a.$=r),r});
-- 
cgit v1.2.3


From a051970d5b15a60e79ac2428280652486644c11c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Aug 2016 14:13:03 +0200
Subject: jQuery 3 compatibility

https://jquery.com/upgrade-guide/3.0/

* event.props removed

https://jquery.com/upgrade-guide/3.0/#breaking-change-jquery-event-props-and-jquery-event-fixhooks-removed
https://github.com/jquery/api.jquery.com/issues/405

* jqXHR.success(), jqXHR.error(), and jqXHR.complete() removed
---
 p/scripts/category.js | 18 ++++++++----------
 p/scripts/main.js     |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/p/scripts/category.js b/p/scripts/category.js
index c33e68528..8c7ba37b0 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -34,15 +34,13 @@ function init_draggable() {
 		return;
 	}
 
-	$.event.props.push('dataTransfer');
-
 	var draggable = '[draggable="true"]',
 	    dropzone = '[dropzone="move"]';
 
 	$('.drop-section').on('dragstart', draggable, function(e) {
-		e.dataTransfer.effectAllowed = 'move';
-		e.dataTransfer.setData('text/html', e.target.outerHTML);
-		e.dataTransfer.setData('text', e.target.getAttribute('data-feed-id'));
+		e.originalEvent.dataTransfer.effectAllowed = 'move';
+		e.originalEvent.dataTransfer.setData('text/html', e.target.outerHTML);
+		e.originalEvent.dataTransfer.setData('text', e.target.getAttribute('data-feed-id'));
 		e.target.style.opacity = 0.3;
 
 		dnd_successful = false;
@@ -74,13 +72,13 @@ function init_draggable() {
 		$(this).removeClass('drag-hover');
 	});
 	$('.drop-section').on('dragover', dropzone, function(e) {
-		e.dataTransfer.dropEffect = "move";
+		e.originalEvent.dataTransfer.dropEffect = "move";
 
 		e.preventDefault();
 		return false;
 	});
 	$('.drop-section').on('drop', dropzone, function(e) {
-		var feed_id = e.dataTransfer.getData('text'),
+		var feed_id = e.originalEvent.dataTransfer.getData('text'),
 		    cat_id = e.target.parentNode.getAttribute('data-cat-id');
 
 		loading = true;
@@ -92,13 +90,13 @@ function init_draggable() {
 				f_id: feed_id,
 				c_id: cat_id
 			}
-		}).success(function() {
-			$(e.target).after(e.dataTransfer.getData('text/html'));
+		}).done(function() {
+			$(e.target).after(e.originalEvent.dataTransfer.getData('text/html'));
 			if ($(e.target).hasClass('disabled')) {
 				$(e.target).remove();
 			}
 			dnd_successful = true;
-		}).complete(function() {
+		}).always(function() {
 			loading = false;
 		});
 
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 01c8c9cf5..c95df54fa 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -772,7 +772,7 @@ function updateFeed(feeds, feeds_count) {
 	$.ajax({
 		type: 'POST',
 		url: feed['url'],
-	}).complete(function (data) {
+	}).always(function (data) {
 		feed_processed++;
 		$("#actualizeProgress .progress").html(feed_processed + " / " + feeds_count);
 		$("#actualizeProgress .title").html(feed['title']);
-- 
cgit v1.2.3


From de2c6fab7ae2f6c456c2e98196b01f368dba9917 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Aug 2016 15:43:28 +0200
Subject: Fix drag in Chrome

---
 p/scripts/category.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/p/scripts/category.js b/p/scripts/category.js
index fe8b4c058..e882da0c8 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -40,10 +40,11 @@ function init_draggable() {
 	    dropzone = '[dropzone="move"]';
 
 	$('.drop-section').on('dragstart', draggable, function(e) {
+		var drag = $(e.target).closest('[draggable]')[0];
 		e.originalEvent.dataTransfer.effectAllowed = 'move';
-		e.originalEvent.dataTransfer.setData('text/html', e.target.outerHTML);
-		e.originalEvent.dataTransfer.setData('text', e.target.getAttribute('data-feed-id'));
-		e.target.style.opacity = 0.3;
+		e.originalEvent.dataTransfer.setData('text/html', drag.outerHTML);
+		e.originalEvent.dataTransfer.setData('text', drag.getAttribute('data-feed-id'));
+		drag.style.opacity = 0.3;
 
 		dnd_successful = false;
 	});
@@ -81,6 +82,7 @@ function init_draggable() {
 	});
 	$('.drop-section').on('drop', dropzone, function(e) {
 		var feed_id = e.originalEvent.dataTransfer.getData('text'),
+		    html = e.originalEvent.dataTransfer.getData('text/html'),
 		    cat_id = e.target.parentNode.getAttribute('data-cat-id');
 
 		loading = true;
@@ -93,7 +95,7 @@ function init_draggable() {
 				c_id: cat_id
 			}
 		}).done(function() {
-			$(e.target).after(e.originalEvent.dataTransfer.getData('text/html'));
+			$(e.target).after(html);
 			if ($(e.target).hasClass('disabled')) {
 				$(e.target).remove();
 			}
-- 
cgit v1.2.3


From 157781c8eb91531627adfe9220ac3197e6b15325 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 6 Aug 2016 20:52:08 +0200
Subject: Fix drag in Internet Explorer

Internet Explorer does not support setData('text/html') and setData() is
deprecated
https://msdn.microsoft.com/en-us/library/ms536744(v=vs.85).aspx
---
 p/scripts/category.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/p/scripts/category.js b/p/scripts/category.js
index e882da0c8..29c049924 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -27,6 +27,9 @@ function dragend_process(t) {
 	}
 }
 
+var dragFeedId = '',
+	dragHtml = '';
+
 function init_draggable() {
 	if (!(window.$ && window.i18n)) {
 		if (window.console) {
@@ -42,8 +45,9 @@ function init_draggable() {
 	$('.drop-section').on('dragstart', draggable, function(e) {
 		var drag = $(e.target).closest('[draggable]')[0];
 		e.originalEvent.dataTransfer.effectAllowed = 'move';
-		e.originalEvent.dataTransfer.setData('text/html', drag.outerHTML);
-		e.originalEvent.dataTransfer.setData('text', drag.getAttribute('data-feed-id'));
+		dragHtml = drag.outerHTML;
+		dragFeedId = drag.getAttribute('data-feed-id');
+		e.originalEvent.dataTransfer.setData('text', dragFeedId);
 		drag.style.opacity = 0.3;
 
 		dnd_successful = false;
@@ -81,27 +85,25 @@ function init_draggable() {
 		return false;
 	});
 	$('.drop-section').on('drop', dropzone, function(e) {
-		var feed_id = e.originalEvent.dataTransfer.getData('text'),
-		    html = e.originalEvent.dataTransfer.getData('text/html'),
-		    cat_id = e.target.parentNode.getAttribute('data-cat-id');
-
 		loading = true;
 
 		$.ajax({
 			type: 'POST',
 			url: './?c=feed&a=move',
 			data : {
-				f_id: feed_id,
-				c_id: cat_id
+				f_id: dragFeedId,
+				c_id: e.target.parentNode.getAttribute('data-cat-id'),
 			}
 		}).done(function() {
-			$(e.target).after(html);
+			$(e.target).after(dragHtml);
 			if ($(e.target).hasClass('disabled')) {
 				$(e.target).remove();
 			}
 			dnd_successful = true;
 		}).always(function() {
 			loading = false;
+			dragFeedId = '';
+			dragHtml = '';
 		});
 
 		$(this).removeClass('drag-hover');
-- 
cgit v1.2.3


From 396ebb0fd20400d2aa014bf05187d3e1ae1b26a0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 7 Aug 2016 00:17:34 +0200
Subject: Minor JavaScript problems with drag & drop

Independent of the jQuery update
---
 p/scripts/category.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/p/scripts/category.js b/p/scripts/category.js
index 29c049924..eb08ecd6e 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -6,17 +6,19 @@ var loading = false,
 	dnd_successful = false;
 
 function dragend_process(t) {
-	t.style.display = 'none';
+	t.setAttribute('draggable', 'false');
 
 	if (loading) {
 		window.setTimeout(function() {
 			dragend_process(t);
 		}, 50);
+		return;
 	}
 
 	if (!dnd_successful) {
-		t.style.display = 'block';
-		t.style.opacity = 1.0;
+		t.style.display = '';
+		t.style.opacity = '';
+		t.setAttribute('draggable', 'true');
 	} else {
 		var parent = $(t.parentNode);
 		$(t).remove();
-- 
cgit v1.2.3


From bee833bf524e58ea9cf5309fb89f6f8b30005720 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 7 Aug 2016 00:54:49 +0200
Subject: Problematic MySQL reserved keyword

`read` and `reads` are reserved keywords
---
 app/Models/StatsDAO.php           |  6 +++---
 app/views/stats/index.phtml       | 12 ++++++------
 app/views/stats/repartition.phtml |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index e18ba4748..3f5bf8515 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -38,9 +38,9 @@ class FreshRSS_StatsDAO extends Minz_ModelPdo {
 		}
 		$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
+COUNT(1) - SUM(e.is_read) AS count_unreads,
+SUM(e.is_read) AS count_reads,
+SUM(e.is_favorite) AS count_favorites
 FROM {$this->prefix}entry AS e
 , {$this->prefix}feed AS f
 WHERE e.id_feed = f.id
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 0a2fbdb10..a36f812a8 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -23,18 +23,18 @@
 				</tr>
 				<tr>
 					<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>
+					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['count_reads']); ?></td>
+					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['count_reads']); ?></td>
 				</tr>
 				<tr>
 					<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>
+					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['count_unreads']); ?></td>
+					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['count_unreads']); ?></td>
 				</tr>
 				<tr>
 					<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>
+					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['count_favorites']); ?></td>
+					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['count_favorites']); ?></td>
 				</tr>
 			</tbody>
 		</table>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index ffb2c361e..5ebcdce5a 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -12,7 +12,7 @@
 		if (!empty($feeds)) {
 			echo '<optgroup label="', $category->name(), '">';
 			foreach ($feeds as $feed) {
-				if ($this->feed && $feed->id() == $this->feed->id()){
+				if ($this->feed && $feed->id() == $this->feed->id()) {
 					echo '<option value="', $feed->id(), '" selected="selected" data-url="', _url('stats', 'repartition', 'id', $feed->id()), '">', $feed->name(), '</option>';
 				} else {
 					echo '<option value="', $feed->id(), '" data-url="', _url('stats', 'repartition', 'id', $feed->id()), '">', $feed->name(), '</option>';
@@ -39,9 +39,9 @@
 		</tr>
 		<tr>
 			<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>
+			<td class="numeric"><?php echo $this->repartition['count_reads']; ?></td>
+			<td class="numeric"><?php echo $this->repartition['count_unreads']; ?></td>
+			<td class="numeric"><?php echo $this->repartition['count_favorites']; ?></td>
 		</tr>
 		</table>
 	</div>
-- 
cgit v1.2.3


From dccc2a84355149c702dbd2db7e560d38b0e05c01 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 7 Aug 2016 13:52:57 +0200
Subject: meta referrer origin

https://github.com/FreshRSS/FreshRSS/issues/955
Tested in Firefox 48, Chrome 53, Edge 25
---
 app/layout/layout.phtml | 2 ++
 data/config.default.php | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 6906fa05f..7fdc01241 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -41,6 +41,8 @@
 		$url_rss['a'] = 'rss';
 ?>
 		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
+<?php } if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
+		<meta name="referrer" content="origin" />
 <?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
 		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8'); ?>" />
 <?php } else { ?>
diff --git a/data/config.default.php b/data/config.default.php
index be3fa8ae2..af1482d03 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -66,6 +66,9 @@ return array(
 	# Allow or not Web robots (e.g. search engines) in HTML headers.
 	'allow_robots' => false,
 
+	# If true does nothing, if false restricts HTTP Referer via: meta referrer origin
+	'allow_referrer' => false,
+
 	'limits' => array(
 
 		# Duration in seconds of the SimplePie cache,
-- 
cgit v1.2.3


From 6266b86998718074b13b779e4f733485e2d39324 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 7 Aug 2016 20:33:34 +0200
Subject: Apache Etag issue

A -gzip suffix seems to be added and not removed somewhere in the Apache
+ PHP7 stack, which caused the caching to fail (the 304 Not Modified
responses were not working anymore).
Related to https://bz.apache.org/bugzilla/show_bug.cgi?id=39727
---
 lib/http-conditional.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/http-conditional.php b/lib/http-conditional.php
index 59fbef41f..6d3a0a97f 100644
--- a/lib/http-conditional.php
+++ b/lib/http-conditional.php
@@ -35,12 +35,12 @@
   ... //Rest of the script, just as you would do normally.
  ?>
 
- Version 1.7 beta, 2013-12-02, http://alexandre.alapetite.fr/doc-alex/php-http-304/
+ Version 1.8 beta, 2016-08-07, http://alexandre.alapetite.fr/doc-alex/php-http-304/
 
  ------------------------------------------------------------------
  Written by Alexandre Alapetite, http://alexandre.alapetite.fr/cv/
 
- Copyright 2004-2013, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR),
+ Copyright 2004-2016, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR),
  http://creativecommons.org/licenses/by-sa/2.0/fr/
  http://alexandre.alapetite.fr/divers/apropos/#by-sa
  - Attribution. You must give the original author credit
@@ -96,7 +96,8 @@ function httpConditional($UnixTimeStamp,$cacheSeconds=0,$cachePrivacy=0,$feedMod
 	if ((!$is412)&&isset($_SERVER['HTTP_IF_MATCH']))
 	{//rfc2616-sec14.html#sec14.24
 		$etagsClient=stripslashes($_SERVER['HTTP_IF_MATCH']);
-		$is412=(($etagClient!=='*')&&(strpos($etagsClient,$etagServer)===false));
+		$etagsClient=str_ireplace('-gzip','',$etagsClient);
+		$is412=(($etagsClient!=='*')&&(strpos($etagsClient,$etagServer)===false));
 	}
 	if ($is304&&isset($_SERVER['HTTP_IF_MODIFIED_SINCE']))
 	{//rfc2616-sec14.html#sec14.25 //rfc1945.txt
@@ -111,6 +112,7 @@ function httpConditional($UnixTimeStamp,$cacheSeconds=0,$cachePrivacy=0,$feedMod
 	{//rfc2616-sec14.html#sec14.26
 		$nbCond++;
 		$etagClient=stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+		$etagClient=str_ireplace('-gzip','',$etagClient);
 		$is304=(($etagClient===$etagServer)||($etagClient==='*'));
 	}
 	if ((!$is412)&&isset($_SERVER['HTTP_IF_UNMODIFIED_SINCE']))
-- 
cgit v1.2.3


From 374311c28c189eff622d272a00124791c26f843d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 9 Aug 2016 00:36:13 +0200
Subject: More changelog 1.5.x-dev

https://github.com/FreshRSS/FreshRSS/milestone/18
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b96e280f4..601bc9d4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,11 +11,17 @@
 		* FreshRSS will automatically migrate MySQL tables to utf8mb4 the first time it is needed.
 * Security
 	* Remove Mozilla Persona login (the service closes on 2016-11-30) [#1052](https://github.com/FreshRSS/FreshRSS/issues/1052)
+	* Use Referrer Policy `<meta name="referrer" content="origin" />` for limiting HTTP Referer [#1198](https://github.com/FreshRSS/FreshRSS/pull/1198)
 * Bug fixing
 	* Fixed scroll in log view [#1178](https://github.com/FreshRSS/FreshRSS/issues/1178)
 	* Fixed JavaScript bug when articles were not always marked as read [#1123](https://github.com/FreshRSS/FreshRSS/issues/1123)
+	* Fixed Apache Etag issue that prevented caching [#1199](https://github.com/FreshRSS/FreshRSS/pull/1199)
+* UI
+	* Updated to jQuery 3.1.0 and several JavaScript fixes (e.g. drag & drop) [#1197](https://github.com/FreshRSS/FreshRSS/pull/1197)
 * API
 	* Add API link in FreshRSS profile settings to ease set-up [#1186](https://github.com/FreshRSS/FreshRSS/pull/1186)
+* Mics.
+	* JSHint of JavaScript code and better initialisation [#1196](https://github.com/FreshRSS/FreshRSS/pull/1196)
 
 
 ## 2016-07-23 FreshRSS 1.4.0
-- 
cgit v1.2.3


From 0b2c5b82d0baf7092b9ce0ed1ef2ad99abf8dec5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 11 Aug 2016 21:13:33 +0200
Subject: Fixed credits links, updated credits, fixed broken images

https://github.com/FreshRSS/FreshRSS/issues/1201
* We do not use getfavicon service anymore
* Links to images hosted on http://marienfressinaud.fr were broken.
---
 README.fr.md                |   5 +++--
 README.md                   |   5 +++--
 app/i18n/cz/index.php       |   2 +-
 app/i18n/de/index.php       |   2 +-
 app/i18n/en/index.php       |   2 +-
 app/i18n/fr/index.php       |   2 +-
 app/i18n/it/index.php       |   2 +-
 app/i18n/nl/index.php       |   2 +-
 app/i18n/ru/index.php       |   2 +-
 app/i18n/tr/index.php       |   2 +-
 doc/FreshRSS-logo.png       | Bin 0 -> 14476 bytes
 doc/FreshRSS-screenshot.png | Bin 0 -> 215409 bytes
 12 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 doc/FreshRSS-logo.png
 create mode 100644 doc/FreshRSS-screenshot.png

diff --git a/README.fr.md b/README.fr.md
index 91903305c..a53653286 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -12,7 +12,7 @@ Il supporte [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) pour des not
 * Démo : http://demo.freshrss.org/
 * 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)
+![Logo de FreshRSS](./doc/FreshRSS-logo.png)
 
 # Téléchargement
 Voir la [liste des versions](../../releases).
@@ -41,7 +41,7 @@ Nous sommes une communauté amicale.
 	* Fonctionne aussi sur mobile
 * L’entête HTTP `Referer` ne doit pas être désactivé pour pouvoir utiliser le formulaire de connexion
 
-![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
+![Capture d’écran de FreshRSS](./doc/FreshRSS-screenshot.png)
 
 # Installation
 1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](../releases)
@@ -124,6 +124,7 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 * [MINZ](https://github.com/marienfressinaud/MINZ)
 * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/)
 * [jQuery](http://jquery.com/)
+* [ArthurHoaro/favicon](https://github.com/ArthurHoaro/favicon)
 * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/)
 * [flotr2](http://www.humblesoftware.com/flotr2)
 
diff --git a/README.md b/README.md
index f46359219..1c9f89c78 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ It supports [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) for instant
 * Demo: http://demo.freshrss.org/
 * License: [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
-![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
+![FreshRSS logo](./doc/FreshRSS-logo.png)
 
 # Releases
 See the [list of releases](../../releases).
@@ -41,7 +41,7 @@ We are a friendly community.
 	* Works on mobile
 * The browser HTTP `Referer` header must not be disabled when using the form login method
 
-![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
+![FreshRSS screenshot](./doc/FreshRSS-screenshot.png)
 
 # Installation
 1. Get FreshRSS with git or [by downloading the archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip)
@@ -124,6 +124,7 @@ mysqldump -u user -p --databases freshrss > freshrss.sql
 * [MINZ](https://github.com/marienfressinaud/MINZ)
 * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/)
 * [jQuery](http://jquery.com/)
+* [ArthurHoaro/favicon](https://github.com/ArthurHoaro/favicon)
 * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/)
 * [flotr2](http://www.humblesoftware.com/flotr2)
 
diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php
index 5691d12af..cb0e5955d 100644
--- a/app/i18n/cz/index.php
+++ b/app/i18n/cz/index.php
@@ -6,7 +6,7 @@ return array(
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Hlášení chyb',
 		'credits' => 'Poděkování',
-		'credits_content' => 'Některé designové prvky pocházejí z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, FreshRSS ale tuto platformu nevyužívá. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> pocházejí z <a href="https://www.gnome.org/">GNOME projektu</a>. Font <em>Open Sans</em> vytvořil <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicony jsou shromažďovány pomocí <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS je založen na PHP framework <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
+		'credits_content' => 'Některé designové prvky pocházejí z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, FreshRSS ale tuto platformu nevyužívá. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> pocházejí z <a href="https://www.gnome.org/">GNOME projektu</a>. Font <em>Open Sans</em> vytvořil <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS je založen na PHP framework <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
 		'freshrss_description' => 'FreshRSS je čtečka RSS kanálů určená k provozu na vlastním serveru, podobná <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> nebo <a href="http://projet.idleman.fr/leed/">Leed</a>. Je to nenáročný a jednoduchý, zároveň ale mocný a konfigurovatelný nástroj.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Github</a>',
 		'license' => 'Licence',
diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 04798cdce..df92d8085 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -6,7 +6,7 @@ return array(
 		'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.',
+		'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://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> erstellt. 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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'Lizenz',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 80fa3d950..eb6413e3c 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -6,7 +6,7 @@ return array(
 		'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.',
+		'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://fonts.google.com/specimen/Open+Sans">Steve Matteson</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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'License',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 7e028ab92..9f22f4b05 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -6,7 +6,7 @@ return array(
 		'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.',
+		'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://fonts.google.com/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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sur Github</a>',
 		'license' => 'Licence',
diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php
index 584b044b1..d79502c79 100644
--- a/app/i18n/it/index.php
+++ b/app/i18n/it/index.php
@@ -6,7 +6,7 @@ return array(
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Bugs',
 		'credits' => 'Crediti',
-		'credits_content' => 'Alcuni elementi di design provengono da <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> sebbene FreshRSS non usi questo framework. Le <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icone</a> provengono dal progetto <a href="https://www.gnome.org/">GNOME</a>. Il carattere <em>Open Sans</em> è stato creato da <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Le Favicons vengono estratte con le API <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS è basato su <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
+		'credits_content' => 'Alcuni elementi di design provengono da <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> sebbene FreshRSS non usi questo framework. Le <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icone</a> provengono dal progetto <a href="https://www.gnome.org/">GNOME</a>. Il carattere <em>Open Sans</em> è stato creato da <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS è basato su <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
 		'freshrss_description' => 'FreshRSS è un aggregatore di feeds RSS da installare sul proprio host come <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="http://projet.idleman.fr/leed/">Leed</a>. Leggero e facile da mantenere pur essendo molto configurabile e potente.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">su Github</a>',
 		'license' => 'Licenza',
diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php
index df6a064e4..88e877e2e 100644
--- a/app/i18n/nl/index.php
+++ b/app/i18n/nl/index.php
@@ -6,7 +6,7 @@ return array(
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Rapporteer fouten',
 		'credits' => 'Waarderingen',
-		'credits_content' => 'Sommige ontwerp elementen komen van <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> alhoewel FreshRSS dit raamwerk niet gebruikt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Pictogrammen</a> komen van het <a href="https://www.gnome.org/">GNOME project</a>. <em>De Open Sans</em> font police is gemaakt door <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons zijn verzameld met de <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is gebaseerd op <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, een PHP raamwerk. Nederlandse vertaling door Wanabo, <a href="http://www.nieuwskop.be" title="NieuwsKop">NieuwsKop.be</a>. Link naar de Nederlandse vertaling, <a href="https://github.com/Wanabo/FreshRSS-Dutch-translation/tree/master">FreshRSS-Dutch-translation</a>.',
+		'credits_content' => 'Sommige ontwerp elementen komen van <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> alhoewel FreshRSS dit raamwerk niet gebruikt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Pictogrammen</a> komen van het <a href="https://www.gnome.org/">GNOME project</a>. <em>De Open Sans</em> font police is gemaakt door <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. Favicons zijn verzameld met de <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is gebaseerd op <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, een PHP raamwerk. Nederlandse vertaling door Wanabo, <a href="http://www.nieuwskop.be" title="NieuwsKop">NieuwsKop.be</a>. Link naar de Nederlandse vertaling, <a href="https://github.com/Wanabo/FreshRSS-Dutch-translation/tree/master">FreshRSS-Dutch-translation</a>.',
 		'freshrss_description' => 'FreshRSS is een RSS feed aggregator om zelf te hosten zoals <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> of <a href="http://projet.idleman.fr/leed/">Leed</a>. Het gebruikt weinig systeembronnen en is makkelijk te administreren terwijl het een krachtig en makkelijk te configureren programma is.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">op Github</a>',
 		'license' => 'License',
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
index 80fa3d950..eb6413e3c 100644
--- a/app/i18n/ru/index.php
+++ b/app/i18n/ru/index.php
@@ -6,7 +6,7 @@ return array(
 		'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.',
+		'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://fonts.google.com/specimen/Open+Sans">Steve Matteson</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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'License',
diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php
index 9912203c8..cb36d6717 100644
--- a/app/i18n/tr/index.php
+++ b/app/i18n/tr/index.php
@@ -6,7 +6,7 @@ return array(
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Hata raporu',
 		'credits' => 'Tanıtım',
-		'credits_content' => 'Bu frameworkü kullanmamasına rağmen FreshRSS bazı tasarım ögelerini <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> dan almıştır. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">İkonlar</a> <a href="https://www.gnome.org/">GNOME projesinden</a> alınmıştır. <em>Open Sans</em> yazı tipi <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a> tarafından oluşturulmuştur. Site ikonları <a href="https://getfavicon.appspot.com/">getFavicon API</a> ile oluşturuldu. FreshRSS bir PHP framework olan <a href="https://github.com/marienfressinaud/MINZ">Minz</a> i temel alır.',
+		'credits_content' => 'Bu frameworkü kullanmamasına rağmen FreshRSS bazı tasarım ögelerini <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> dan almıştır. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">İkonlar</a> <a href="https://www.gnome.org/">GNOME projesinden</a> alınmıştır. <em>Open Sans</em> yazı tipi <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> tarafından oluşturulmuştur. FreshRSS bir PHP framework olan <a href="https://github.com/marienfressinaud/MINZ">Minz</a> i temel alır.',
 		'freshrss_description' => 'FreshRSS <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> veya <a href="http://projet.idleman.fr/leed/">Leed</a> gibi kendi hostunuzda çalışan bir RSS akış toplayıcısıdır. Güçlü ve yapılandırılabilir araçlarıyla basit ve kullanımı kolay bir uygulamadır.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github sayfası</a>',
 		'license' => 'Lisans',
diff --git a/doc/FreshRSS-logo.png b/doc/FreshRSS-logo.png
new file mode 100644
index 000000000..763b19cb1
Binary files /dev/null and b/doc/FreshRSS-logo.png differ
diff --git a/doc/FreshRSS-screenshot.png b/doc/FreshRSS-screenshot.png
new file mode 100644
index 000000000..2bcd6e6bf
Binary files /dev/null and b/doc/FreshRSS-screenshot.png differ
-- 
cgit v1.2.3


From a26aad728add510417b924335c34263b6835a352 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 11 Aug 2016 21:20:47 +0200
Subject: More credit updated

https://github.com/FreshRSS/FreshRSS/issues/1201
https://github.com/FreshRSS/FreshRSS/pull/1204
---
 app/i18n/fr/index.php | 2 +-
 app/i18n/nl/index.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 9f22f4b05..62eedc280 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -6,7 +6,7 @@ return array(
 		'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://fonts.google.com/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.',
+		'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://fonts.google.com/specimen/Open+Sans">Steve Matteson</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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sur Github</a>',
 		'license' => 'Licence',
diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php
index 88e877e2e..751806bfa 100644
--- a/app/i18n/nl/index.php
+++ b/app/i18n/nl/index.php
@@ -6,7 +6,7 @@ return array(
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Rapporteer fouten',
 		'credits' => 'Waarderingen',
-		'credits_content' => 'Sommige ontwerp elementen komen van <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> alhoewel FreshRSS dit raamwerk niet gebruikt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Pictogrammen</a> komen van het <a href="https://www.gnome.org/">GNOME project</a>. <em>De Open Sans</em> font police is gemaakt door <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. Favicons zijn verzameld met de <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is gebaseerd op <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, een PHP raamwerk. Nederlandse vertaling door Wanabo, <a href="http://www.nieuwskop.be" title="NieuwsKop">NieuwsKop.be</a>. Link naar de Nederlandse vertaling, <a href="https://github.com/Wanabo/FreshRSS-Dutch-translation/tree/master">FreshRSS-Dutch-translation</a>.',
+		'credits_content' => 'Sommige ontwerp elementen komen van <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> alhoewel FreshRSS dit raamwerk niet gebruikt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Pictogrammen</a> komen van het <a href="https://www.gnome.org/">GNOME project</a>. <em>De Open Sans</em> font police is gemaakt door <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is gebaseerd op <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, een PHP raamwerk. Nederlandse vertaling door Wanabo, <a href="http://www.nieuwskop.be" title="NieuwsKop">NieuwsKop.be</a>. Link naar de Nederlandse vertaling, <a href="https://github.com/Wanabo/FreshRSS-Dutch-translation/tree/master">FreshRSS-Dutch-translation</a>.',
 		'freshrss_description' => 'FreshRSS is een RSS feed aggregator om zelf te hosten zoals <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> of <a href="http://projet.idleman.fr/leed/">Leed</a>. Het gebruikt weinig systeembronnen en is makkelijk te administreren terwijl het een krachtig en makkelijk te configureren programma is.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">op Github</a>',
 		'license' => 'License',
-- 
cgit v1.2.3


From 29d79185880f361545cf08b9faa4c755206c296e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 11 Aug 2016 22:44:42 +0200
Subject: Support for OPML 2.0 category attribute

https://github.com/FreshRSS/FreshRSS/issues/1202
---
 CHANGELOG.md     |  2 ++
 README.fr.md     |  1 +
 README.md        |  1 +
 lib/lib_opml.php | 31 ++++++++++++++++++++++++++++++-
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 601bc9d4b..017bd6e1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,12 +16,14 @@
 	* Fixed scroll in log view [#1178](https://github.com/FreshRSS/FreshRSS/issues/1178)
 	* Fixed JavaScript bug when articles were not always marked as read [#1123](https://github.com/FreshRSS/FreshRSS/issues/1123)
 	* Fixed Apache Etag issue that prevented caching [#1199](https://github.com/FreshRSS/FreshRSS/pull/1199)
+	* Fixed OPML import of categories [#1202](https://github.com/FreshRSS/FreshRSS/issues/1202)
 * UI
 	* Updated to jQuery 3.1.0 and several JavaScript fixes (e.g. drag & drop) [#1197](https://github.com/FreshRSS/FreshRSS/pull/1197)
 * API
 	* Add API link in FreshRSS profile settings to ease set-up [#1186](https://github.com/FreshRSS/FreshRSS/pull/1186)
 * Mics.
 	* JSHint of JavaScript code and better initialisation [#1196](https://github.com/FreshRSS/FreshRSS/pull/1196)
+	* Updated credits, and images in README [#1201](https://github.com/FreshRSS/FreshRSS/issues/1201)
 
 
 ## 2016-07-23 FreshRSS 1.4.0
diff --git a/README.fr.md b/README.fr.md
index a53653286..8324b9657 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -125,6 +125,7 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/)
 * [jQuery](http://jquery.com/)
 * [ArthurHoaro/favicon](https://github.com/ArthurHoaro/favicon)
+* [lib_opml](https://github.com/marienfressinaud/lib_opml)
 * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/)
 * [flotr2](http://www.humblesoftware.com/flotr2)
 
diff --git a/README.md b/README.md
index 1c9f89c78..844967f4f 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,7 @@ mysqldump -u user -p --databases freshrss > freshrss.sql
 * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/)
 * [jQuery](http://jquery.com/)
 * [ArthurHoaro/favicon](https://github.com/ArthurHoaro/favicon)
+* [lib_opml](https://github.com/marienfressinaud/lib_opml)
 * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/)
 * [flotr2](http://www.humblesoftware.com/flotr2)
 
diff --git a/lib/lib_opml.php b/lib/lib_opml.php
index 66b854313..0414868fb 100644
--- a/lib/lib_opml.php
+++ b/lib/lib_opml.php
@@ -12,7 +12,7 @@
  *
  * @author   Marien Fressinaud <dev@marienfressinaud.fr>
  * @link     https://github.com/marienfressinaud/lib_opml
- * @version  0.2
+ * @version  0.2-FreshRSS~1.5.1
  * @license  public domain
  *
  * Usages:
@@ -123,6 +123,32 @@ function libopml_parse_outline($outline_xml, $strict = true) {
 	return $outline;
 }
 
+/**
+ * Reformat the XML document as a hierarchy when
+ * the OPML 2.0 category attribute is used
+ */
+function preprocessing_categories($doc) {
+	$outline_categories = [];
+	$body = $doc->getElementsByTagName('body')->item(0);
+	$xpath = new DOMXpath($doc);
+	$outlines = $xpath->query("/opml/body/outline[@category]");
+	foreach ($outlines as $outline) {
+		$category = trim($outline->getAttribute('category'));
+		if ($category != '') {
+			$outline_categorie = null;
+			if (!isset($outline_categories[$category])) {
+				$outline_categorie = $doc->createElement('outline');
+				$outline_categorie->setAttribute('text', $category);
+				$body->insertBefore($outline_categorie, $body->firstChild);
+				$outline_categories[$category] = $outline_categorie;
+			} else {
+				$outline_categorie = $outline_categories[$category];
+			}
+			$outline->parentNode->removeChild($outline);
+			$outline_categorie->appendChild($outline);
+		}
+	}
+}
 
 /**
  * Parse a string as a XML one and returns the corresponding array
@@ -140,6 +166,9 @@ function libopml_parse_string($xml, $strict = true) {
 	$dom->loadXML($xml);
 	$dom->encoding = 'UTF-8';
 
+	//Partial compatibility with the category attribute of OPML 2.0
+	preprocessing_categories($dom);
+
 	$opml = simplexml_import_dom($dom);
 
 	if (!$opml) {
-- 
cgit v1.2.3


From 2c92860310d389f33fe7a10011e2a3921883b7bc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 11 Aug 2016 23:13:28 +0200
Subject: Minor quotes

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

diff --git a/lib/lib_opml.php b/lib/lib_opml.php
index 0414868fb..a3af54596 100644
--- a/lib/lib_opml.php
+++ b/lib/lib_opml.php
@@ -131,7 +131,7 @@ function preprocessing_categories($doc) {
 	$outline_categories = [];
 	$body = $doc->getElementsByTagName('body')->item(0);
 	$xpath = new DOMXpath($doc);
-	$outlines = $xpath->query("/opml/body/outline[@category]");
+	$outlines = $xpath->query('/opml/body/outline[@category]');
 	foreach ($outlines as $outline) {
 		$category = trim($outline->getAttribute('category'));
 		if ($category != '') {
-- 
cgit v1.2.3


From 40f1873de790b28890d65263ec1f8426121ae951 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 12 Aug 2016 18:43:32 +0200
Subject: OPML compatibility PHP 5.3

https://github.com/FreshRSS/FreshRSS/issues/1202
https://github.com/FreshRSS/FreshRSS/pull/1206
---
 lib/lib_opml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lib_opml.php b/lib/lib_opml.php
index a3af54596..b89e92977 100644
--- a/lib/lib_opml.php
+++ b/lib/lib_opml.php
@@ -128,7 +128,7 @@ function libopml_parse_outline($outline_xml, $strict = true) {
  * the OPML 2.0 category attribute is used
  */
 function preprocessing_categories($doc) {
-	$outline_categories = [];
+	$outline_categories = array();
 	$body = $doc->getElementsByTagName('body')->item(0);
 	$xpath = new DOMXpath($doc);
 	$outlines = $xpath->query('/opml/body/outline[@category]');
-- 
cgit v1.2.3


From a6071a0d9824908ea48099a66435d70d74b9b1b8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 12 Aug 2016 22:56:02 +0200
Subject: PHP 5.3 compatibility for callback

https://github.com/FreshRSS/FreshRSS/issues/1208
---
 app/Controllers/indexController.php | 10 +++++-----
 app/layout/layout.phtml             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 7e626720e..2333ff69d 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -32,9 +32,9 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Error::error(404);
 		}
 
-		$this->view->callbackBeforeContent = function() {
+		$this->view->callbackBeforeContent = function($view) {
 			try {
-				$entries = $this->listEntriesByContext();
+				$entries = FreshRSS_index_Controller::listEntriesByContext();
 
 				$nb_entries = count($entries);
 				if ($nb_entries > FreshRSS_Context::$number) {
@@ -55,7 +55,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 					}
 				}
 
-				$this->view->entries = $entries;
+				$view->entries = $entries;
 			} catch (FreshRSS_EntriesGetter_Exception $e) {
 				Minz_Log::notice($e->getMessage());
 				Minz_Error::error(404);
@@ -132,7 +132,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 
 		try {
-			$this->view->entries = $this->listEntriesByContext();
+			$this->view->entries = FreshRSS_index_Controller::listEntriesByContext();
 		} catch (FreshRSS_EntriesGetter_Exception $e) {
 			Minz_Log::notice($e->getMessage());
 			Minz_Error::error(404);
@@ -189,7 +189,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	/**
 	 * This method returns a list of entries based on the Context object.
 	 */
-	private function listEntriesByContext() {
+	private static function listEntriesByContext() {
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
 		$get = FreshRSS_Context::currentGet(true);
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 7fdc01241..2aeba40a9 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -23,7 +23,7 @@
 <?php
 	flush();
 	if (isset($this->callbackBeforeContent)) {
-		call_user_func($this->callbackBeforeContent);
+		call_user_func($this->callbackBeforeContent, $this);
 	}
 ?>
 		<?php echo self::headTitle(); ?>
-- 
cgit v1.2.3


From 99ce8d342de9691cea8120b8f316d0f1d15a4ccc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 12 Aug 2016 23:13:43 +0200
Subject: Restore compatibility with PHP 5.3.3

https://github.com/FreshRSS/FreshRSS/issues/1208
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 017bd6e1a..91bc0e525 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Compatibility
 	* Require at least MySQL 5.5.3+ [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
 	* Require at least PHP 5.3.3+ [#1183](https://github.com/FreshRSS/FreshRSS/pull/1183)
+		* Restore compatibility with PHP 5.3.3 [#1208](https://github.com/FreshRSS/FreshRSS/issues/1208)
 	* Restore compatibility with Microsoft Internet Explorer 11 / Edge [#772](https://github.com/FreshRSS/FreshRSS/issues/772)
 * Features
 	* Support for full Unicode such as emoji 💕 in MySQL with utf8mb4 [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
-- 
cgit v1.2.3


From af31f1b20fa7675a208c7a73933231ac2fb8928a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 Aug 2016 10:35:45 +0200
Subject: PHP 5.3 scope compatibility

https://github.com/FreshRSS/FreshRSS/issues/1208
---
 app/Controllers/indexController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 2333ff69d..5d7925eed 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -189,7 +189,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	/**
 	 * This method returns a list of entries based on the Context object.
 	 */
-	private static function listEntriesByContext() {
+	public static function listEntriesByContext() {
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
 		$get = FreshRSS_Context::currentGet(true);
-- 
cgit v1.2.3


From 02d1d66235d9ca5dd71929c76a1ecec94cf14f3d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 Aug 2016 15:35:52 +0200
Subject: PHP 5.3 more compatibility

https://github.com/FreshRSS/FreshRSS/pull/1209#issuecomment-239617504
https://github.com/FreshRSS/FreshRSS/issues/1208
---
 app/Controllers/indexController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 5d7925eed..2332d225d 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -61,9 +61,9 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 				Minz_Error::error(404);
 			}
 
-			$this->view->categories = FreshRSS_Context::$categories;
+			$view->categories = FreshRSS_Context::$categories;
 
-			$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
+			$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;
-- 
cgit v1.2.3


From e6fd34bdda5d067a9e74714aaae10c89ed998a46 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 Aug 2016 17:49:31 +0200
Subject: CSRF token, update HTTP Referrer policy to same-origin

https://www.w3.org/TR/referrer-policy/#referrer-policy-no-referrer
https://github.com/FreshRSS/FreshRSS/issues/570
https://github.com/FreshRSS/FreshRSS/issues/955
https://github.com/FreshRSS/FreshRSS/issues/1198
https://github.com/FreshRSS/FreshRSS/issues/565
https://github.com/FreshRSS/FreshRSS/issues/554
---
 app/FreshRSS.php                        |  2 +-
 app/Models/Auth.php                     | 21 +++++++++++++
 app/layout/aside_feed.phtml             |  1 +
 app/layout/layout.phtml                 |  2 +-
 app/layout/nav_menu.phtml               |  1 +
 app/views/auth/formLogin.phtml          |  1 +
 app/views/auth/index.phtml              |  1 +
 app/views/auth/register.phtml           | 55 +++++++++++++++++----------------
 app/views/configure/archiving.phtml     |  2 ++
 app/views/configure/display.phtml       |  1 +
 app/views/configure/queries.phtml       |  1 +
 app/views/configure/reading.phtml       |  1 +
 app/views/configure/sharing.phtml       |  1 +
 app/views/configure/shortcut.phtml      |  1 +
 app/views/configure/system.phtml        |  1 +
 app/views/extension/index.phtml         |  1 +
 app/views/feed/add.phtml                |  1 +
 app/views/helpers/feed/update.phtml     |  1 +
 app/views/helpers/javascript_vars.phtml |  1 +
 app/views/helpers/pagination.phtml      |  1 +
 app/views/importExport/index.phtml      |  2 ++
 app/views/index/logs.phtml              |  1 +
 app/views/stats/idle.phtml              |  1 +
 app/views/subscription/index.phtml      |  7 ++++-
 app/views/user/manage.phtml             |  2 ++
 app/views/user/profile.phtml            |  2 ++
 lib/lib_rss.php                         |  2 +-
 p/scripts/main.js                       | 13 ++++++--
 28 files changed, 94 insertions(+), 33 deletions(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 20640266e..f9c371d27 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -57,7 +57,7 @@ class FreshRSS extends Minz_FrontController {
 
 	private static function initAuth() {
 		FreshRSS_Auth::init();
-		if (Minz_Request::isPost() && !is_referer_from_same_domain()) {
+		if (Minz_Request::isPost() && !(is_referer_from_same_domain() && FreshRSS_Auth::isCsrfOk())) {
 			// Basic protection against XSRF attacks
 			FreshRSS_Auth::removeAccess();
 			$http_referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index d689f7cdb..f0e8db5a2 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -124,6 +124,7 @@ class FreshRSS_Auth {
 		self::$login_ok = false;
 		$conf = Minz_Configuration::get('system');
 		Minz_Session::_param('currentUser', $conf->default_user);
+		Minz_Session::_param('csrf');
 
 		switch ($conf->auth_type) {
 		case 'form':
@@ -156,6 +157,26 @@ class FreshRSS_Auth {
 		$auth_type = $conf->auth_type;
 		return $auth_type === 'form';
 	}
+
+	public static function csrfToken() {
+		$csrf = Minz_Session::param('csrf');
+		if ($csrf == '') {
+			$salt = FreshRSS_Context::$system_conf->salt;
+			$csrf = sha1($salt . uniqid(mt_rand(), true));
+			Minz_Session::_param('csrf', $csrf);
+		}
+		return $csrf;
+	}
+	public static function isCsrfOk($token = null) {
+		$csrf = Minz_Session::param('csrf');
+		if ($csrf == '') {
+			return true;	//Not logged in yet
+		}
+		if ($token === null) {
+			$token = Minz_Request::param('_csrf');
+		}
+		return $token === $csrf;
+	}
 }
 
 
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 67507b88d..e8fdbf842 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -20,6 +20,7 @@
 	<?php } ?>
 
 	<form id="mark-read-aside" method="post">
+	<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 	<ul class="tree">
 		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 2aeba40a9..189d93fbe 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -42,7 +42,7 @@
 ?>
 		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
 <?php } if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
-		<meta name="referrer" content="origin" />
+		<meta name="referrer" content="never" />
 <?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
 		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8'); ?>" />
 <?php } else { ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 92268ff67..17655acbf 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -88,6 +88,7 @@
 		        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 
 		<div class="dropdown">
+			<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 			<div id="dropdown-read" class="dropdown-target"></div>
 
 			<a class="dropdown-toggle btn" href="#dropdown-read"><?php echo _i('down'); ?></a>
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index b0083944f..4bbc8ed55 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -6,6 +6,7 @@
 	<?php } ?>
 
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<div>
 			<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" />
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index 8f81ac856..74e692ec5 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -4,6 +4,7 @@
 	<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'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('admin.auth.type'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index 0c261319a..1f9976391 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -1,33 +1,34 @@
 <div class="prompt">
-    <h1><?php echo _t('gen.auth.registration'); ?></h1>
+	<h1><?php echo _t('gen.auth.registration'); ?></h1>
 
-    <form method="post" action="<?php echo _url('user', 'create'); ?>">
-        <div>
-            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'), '<br />', _i('help'), ' ', _t('gen.auth.username.format'); ?></label>
-            <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}" />
-        </div>
+	<form method="post" action="<?php echo _url('user', 'create'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
+		<div>
+			<label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'), '<br />', _i('help'), ' ', _t('gen.auth.username.format'); ?></label>
+			<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}" />
+		</div>
 
-        <div>
-            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'), '<br />', _i('help'), ' ', _t('gen.auth.password.format'); ?></label>
-            <div class="stick">
-                <input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" required="required" autocomplete="off" pattern=".{7,}" />
-                <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>
+		<div>
+			<label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'), '<br />', _i('help'), ' ', _t('gen.auth.password.format'); ?></label>
+			<div class="stick">
+				<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" required="required" autocomplete="off" pattern=".{7,}" />
+				<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>
 
-        <div>
-            <?php
-                $redirect_url = urlencode(Minz_Url::display(
-                    array('c' => 'index', 'a' => 'index'),
-                    'php', true
-                ));
-            ?>
-            <input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
-            <button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
-            <a class="btn" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.cancel'); ?></a>
-        </div>
-    </form>
+		<div>
+			<?php
+				$redirect_url = urlencode(Minz_Url::display(
+					array('c' => 'index', 'a' => 'index'),
+					'php', true
+				));
+			?>
+			<input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
+			<button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
+			<a class="btn" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.cancel'); ?></a>
+		</div>
+	</form>
 
-    <p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
 </div>
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 52ee98a48..2254f5dba 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -4,6 +4,7 @@
 	<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'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.archiving'); ?></legend>
 		<p><?php echo _i('help'); ?> <?php echo _t('conf.archiving.help'); ?></p>
 
@@ -55,6 +56,7 @@
 	</form>
 
 	<form method="post" action="<?php echo _url('entry', 'optimize'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.archiving.advanced'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index db6d7951c..62ecc1080 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -4,6 +4,7 @@
 	<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'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.display'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index 50df4cfea..0dffa268d 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -4,6 +4,7 @@
 	<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'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.query'); ?></legend>
 
 		<?php foreach ($this->queries as $key => $query) { ?>
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 9c54b6bd5..07dabf15f 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -4,6 +4,7 @@
 	<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'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.reading'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 7bf435777..0dad5bf6d 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -15,6 +15,7 @@
 			<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('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.sharing'); ?></legend>
 		<?php
 			foreach (FreshRSS_Context::$user_conf->sharing as $key => $share_options) {
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 264a5f805..dceeb17de 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -12,6 +12,7 @@
 	<?php $s = FreshRSS_Context::$user_conf->shortcuts; ?>
 
 	<form method="post" action="<?php echo _url('configure', 'shortcut'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.shortcut'); ?></legend>
 
 		<noscript><p class="alert alert-error"><?php echo _t('conf.shortcut.javascript'); ?></p></noscript>
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
index 4af669eb0..935b49fda 100644
--- a/app/views/configure/system.phtml
+++ b/app/views/configure/system.phtml
@@ -4,6 +4,7 @@
 	<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', 'system'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('admin.system'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index b26334937..7cb16bfff 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -6,6 +6,7 @@
 	<h1><?php echo _t('admin.extensions.title'); ?></h1>
 
 	<form id="form-extension" method="post">
+	<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 	<?php if (!empty($this->extension_list['system'])) { ?>
 	<h2><?php echo _t('admin.extensions.system'); ?></h2>
 	<?php
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index fd6d41b1d..caf685d79 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -7,6 +7,7 @@
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('sub.feed.informations'); ?></legend>
 		<?php if ($this->load_ok) { ?>
 		<div class="form-group">
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 72084d8fa..b7e8f68cd 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -18,6 +18,7 @@
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url('subscription', 'feed', 'id', $this->feed->id()); ?>" autocomplete="off">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('sub.feed.informations'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="name"><?php echo _t('sub.feed.title'); ?></label>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 1aa43a207..745baa195 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -16,6 +16,7 @@ echo htmlspecialchars(json_encode(array(
 		'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
 		'auth_type' => FreshRSS_Context::$system_conf->auth_type,
 		'current_view' => Minz_Request::actionName(),
+		'csrf' => FreshRSS_Auth::csrfToken(),
 	),
 	'shortcuts' => array(
 		'mark_read' => @$s['mark_read'],
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index d1c3cc72c..23c45114d 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -15,6 +15,7 @@
 ?>
 
 <form id="mark-read-pagination" method="post">
+<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 <ul class="pagination">
 	<li class="item pager-next">
 	<?php if (FreshRSS_Context::$next_id) { ?>
diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml
index a64524bf1..c0bc412c3 100644
--- a/app/views/importExport/index.phtml
+++ b/app/views/importExport/index.phtml
@@ -4,6 +4,7 @@
 	<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">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('sub.import_export.import'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="file">
@@ -23,6 +24,7 @@
 
 	<?php if (count($this->feeds) > 0) { ?>
 	<form method="post" action="<?php echo _url('importExport', 'export'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('sub.import_export.export'); ?></legend>
 		<div class="form-group">
 			<div class="group-controls">
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 0938491c3..a88f89278 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -3,6 +3,7 @@
 
 	<h1><?php echo _t('index.log'); ?></h1>
 	<form method="post" action="<?php echo _url('index', 'logs'); ?>"><p>
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<input type="hidden" name="clearLogs" />
 		<button type="submit" class="btn"><?php echo _t('index.log.clear'); ?></button>
 	</p></form>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 8c5f182c2..88c78d465 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -19,6 +19,7 @@
 			<h2><?php echo _t('gen.date.' . $period); ?></h2>
 
 			<form id="form-delete" method="post">
+			<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 			<?php foreach ($feeds as $feed) { ?>
 			<ul class="horizontal-list">
 				<li class="item">
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 07cebf817..48f760d3e 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -6,6 +6,7 @@
 	<h2><?php echo _t('sub.title'); ?></h2>
 
 	<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<div class="stick">
 			<input type="url" name="url_rss" class="long" placeholder="<?php echo _t('sub.feed.add'); ?>" />
 			<div class="dropdown">
@@ -56,13 +57,16 @@
 
 		<ul class="box-content box-content-centered">
 			<form action="<?php echo _url('category', 'create'); ?>" method="post">
+				<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 				<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>
 
-	<form id="controller-category" method="post" aria-hidden="true"></form>
+	<form id="controller-category" method="post" aria-hidden="true">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
+	</form>
 
 	<?php
 		foreach ($this->categories as $cat) {
@@ -71,6 +75,7 @@
 	<div class="box">
 		<div class="box-title">
 			<form action="<?php echo _url('category', 'update', 'id', $cat->id()); ?>" method="post">
+				<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 				<input type="text" name="name" value="<?php echo $cat->name(); ?>" />
 
 				<div class="dropdown">
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index e48841d9b..aab3aa4c4 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -4,6 +4,7 @@
 	<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'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('admin.user.create'); ?></legend>
 
 		<div class="form-group">
@@ -46,6 +47,7 @@
 	</form>
 
 	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('admin.user.users'); ?></legend>
 
 		<div class="form-group">
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 51a5aed2f..429375e44 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -4,6 +4,7 @@
 	<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'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.profile'); ?></legend>
 
 		<div class="form-group">
@@ -52,6 +53,7 @@
 
 	<?php if (!FreshRSS_Auth::hasAccess('admin')) { ?>
 	<form id="crypto-form" method="post" action="<?php echo _url('user', 'delete'); ?>">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.profile.delete'); ?></legend>
 
 		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('conf.profile.delete.warn'); ?></p>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8196f7847..b5ba78889 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -391,7 +391,7 @@ function cryptAvailable() {
 
 function is_referer_from_same_domain() {
 	if (empty($_SERVER['HTTP_REFERER'])) {
-		return false;
+		return true;	//Accept empty referer while waiting for good support of meta referrer same-origin policy in browsers
 	}
 	$host = parse_url(((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ? 'https://' : 'http://') .
 		(empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 62f0fbb1a..89edc54e5 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -134,7 +134,10 @@ function mark_read(active, only_not_read) {
 	$.ajax({
 		type: 'POST',
 		url: url,
-		data : { ajax: true }
+		data : {
+			ajax: true,
+			_csrf: context.csrf,
+		},
 	}).done(function (data) {
 		var $r = active.find("a.read").attr("href", data.url),
 			inc = 0;
@@ -178,7 +181,10 @@ function mark_favorite(active) {
 	$.ajax({
 		type: 'POST',
 		url: url,
-		data : { ajax: true }
+		data : {
+			ajax: true,
+			_csrf: context.csrf,
+		},
 	}).done(function (data) {
 		var $b = active.find("a.bookmark").attr("href", data.url),
 			inc = 0;
@@ -775,6 +781,9 @@ function updateFeed(feeds, feeds_count) {
 	$.ajax({
 		type: 'POST',
 		url: feed.url,
+		data : {
+			_csrf: context.csrf,
+		},
 	}).always(function (data) {
 		feed_processed++;
 		$("#actualizeProgress .progress").html(feed_processed + " / " + feeds_count);
-- 
cgit v1.2.3


From 56ffc115d15bf136bfced74707ccc1f41c7b5e44 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 Aug 2016 19:10:32 +0200
Subject: Do not mix POST and GET params

Avoid returning CSRF POST token for a GET
---
 app/Controllers/configureController.php |  4 ++--
 app/Models/Auth.php                     |  2 +-
 app/views/entry/bookmark.phtml          | 19 +++++++++----------
 app/views/entry/read.phtml              | 19 +++++++++----------
 app/views/helpers/logs_pagination.phtml |  2 +-
 app/views/index/global.phtml            |  2 +-
 6 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index d0f0bd68b..147a2fe06 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -139,7 +139,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
-			$params = Minz_Request::params();
+			$params = Minz_Request::fetchGET();
 			FreshRSS_Context::$user_conf->sharing = $params['share'];
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
@@ -282,7 +282,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
 			$queries[$key] = new FreshRSS_UserQuery($query, $feed_dao, $category_dao);
 		}
-		$params = Minz_Request::params();
+		$params = Minz_Request::fetchGET();
 		$params['url'] = Minz_Url::display(array('params' => $params));
 		$params['name'] = _t('conf.query.number', count($queries) + 1);
 		$queries[] = new FreshRSS_UserQuery($params, $feed_dao, $category_dao);
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index f0e8db5a2..b93942e19 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -173,7 +173,7 @@ class FreshRSS_Auth {
 			return true;	//Not logged in yet
 		}
 		if ($token === null) {
-			$token = Minz_Request::param('_csrf');
+			$token = Minz_Request::fetchPOST('_csrf');
 		}
 		return $token === $csrf;
 	}
diff --git a/app/views/entry/bookmark.phtml b/app/views/entry/bookmark.phtml
index 6b5a4ed03..d85706669 100755
--- a/app/views/entry/bookmark.phtml
+++ b/app/views/entry/bookmark.phtml
@@ -1,17 +1,16 @@
 <?php
 header('Content-Type: application/json; charset=UTF-8');
 
-if (Minz_Request::param('is_favorite', true)) {
-	Minz_Request::_param('is_favorite', 0);
-} else {
-	Minz_Request::_param('is_favorite', 1);
-}
-
-$url = Minz_Url::display(array(
+$url = array(
 	'c' => Minz_Request::controllerName(),
 	'a' => Minz_Request::actionName(),
-	'params' => Minz_Request::params(),
-));
+	'params' => Minz_Request::fetchGET(),
+);
+
+$url['params']['is_favorite'] = Minz_Request::param('is_favorite', true) ? '0' : '1';
 
 FreshRSS::loadStylesAndScripts();
-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;', '&', Minz_Url::display($url)),
+		'icon' => _i($url['params']['is_favorite'] === '1' ? 'non-starred' : 'starred')
+	));
diff --git a/app/views/entry/read.phtml b/app/views/entry/read.phtml
index 7d0e3de82..73977d94b 100755
--- a/app/views/entry/read.phtml
+++ b/app/views/entry/read.phtml
@@ -1,17 +1,16 @@
 <?php
 header('Content-Type: application/json; charset=UTF-8');
 
-if (Minz_Request::param('is_read', true)) {
-	Minz_Request::_param('is_read', 0);
-} else {
-	Minz_Request::_param('is_read', 1);
-}
-
-$url = Minz_Url::display(array(
+$url = array(
 	'c' => Minz_Request::controllerName(),
 	'a' => Minz_Request::actionName(),
-	'params' => Minz_Request::params(),
-));
+	'params' => Minz_Request::fetchGET(),
+);
+
+$url['params']['is_read'] = Minz_Request::param('is_read', true) ? '0' : '1';
 
 FreshRSS::loadStylesAndScripts();
-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;', '&', Minz_Url::display($url)),
+		'icon' => _i($url['params']['is_read'] === '1' ? 'unread' : 'read')
+	));
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
index 58b3c68f4..bf9d91f04 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();
+	$params = Minz_Request::fetchGET();
 ?>
 
 <?php if ($this->nbPage > 1) { ?>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 0ffa3bc54..1e53e4f8c 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -14,7 +14,7 @@
 	$url_base = array(
 		'c' => 'index',
 		'a' => 'normal',
-		'params' => Minz_Request::params()
+		'params' => Minz_Request::fetchGET(),
 	);
 
 	foreach ($this->categories as $cat) {
-- 
cgit v1.2.3


From b3963f6ed6316745593da8a68116006a179a817e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 Aug 2016 19:18:17 +0200
Subject: README: Add CSRF tokens

https://github.com/FreshRSS/FreshRSS/issues/570
https://github.com/FreshRSS/FreshRSS/issues/955
https://github.com/FreshRSS/FreshRSS/pull/1198
---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91bc0e525..7d0c583a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@
 		* FreshRSS will automatically migrate MySQL tables to utf8mb4 the first time it is needed.
 * Security
 	* Remove Mozilla Persona login (the service closes on 2016-11-30) [#1052](https://github.com/FreshRSS/FreshRSS/issues/1052)
-	* Use Referrer Policy `<meta name="referrer" content="origin" />` for limiting HTTP Referer [#1198](https://github.com/FreshRSS/FreshRSS/pull/1198)
+	* Use Referrer Policy `<meta name="referrer" content="never" />` for stopping HTTP Referer [#955](https://github.com/FreshRSS/FreshRSS/issues/955)
+	* Implement CSRF tokens for POST security [#570](https://github.com/FreshRSS/FreshRSS/issues/570)
 * Bug fixing
 	* Fixed scroll in log view [#1178](https://github.com/FreshRSS/FreshRSS/issues/1178)
 	* Fixed JavaScript bug when articles were not always marked as read [#1123](https://github.com/FreshRSS/FreshRSS/issues/1123)
-- 
cgit v1.2.3


From cda414ff0f142d180c616eca1e08204e7c9c6ef9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 Aug 2016 19:34:32 +0200
Subject: Changelog minor

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d0c583a6..0c8655bca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changelog
+# Changelog
 
 ## 2016-XX-XX FreshRSS 1.5.x-dev
 
@@ -12,7 +12,7 @@
 		* FreshRSS will automatically migrate MySQL tables to utf8mb4 the first time it is needed.
 * Security
 	* Remove Mozilla Persona login (the service closes on 2016-11-30) [#1052](https://github.com/FreshRSS/FreshRSS/issues/1052)
-	* Use Referrer Policy `<meta name="referrer" content="never" />` for stopping HTTP Referer [#955](https://github.com/FreshRSS/FreshRSS/issues/955)
+	* Use Referrer Policy `<meta name="referrer" content="never" />` for anonymizing HTTP Referer [#955](https://github.com/FreshRSS/FreshRSS/issues/955)
 	* Implement CSRF tokens for POST security [#570](https://github.com/FreshRSS/FreshRSS/issues/570)
 * Bug fixing
 	* Fixed scroll in log view [#1178](https://github.com/FreshRSS/FreshRSS/issues/1178)
@@ -112,7 +112,7 @@
 	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
 	* Better error handling for PubSubHubbub [#939](https://github.com/FreshRSS/FreshRSS/issues/939)
 	* Fix tag search link from articles [#970](https://github.com/FreshRSS/FreshRSS/issues/970)
-	* Fix all quieries deleted when deleting a feed or category [#982](https://github.com/FreshRSS/FreshRSS/pull/982)
+	* Fix all queries deleted when deleting a feed or category [#982](https://github.com/FreshRSS/FreshRSS/pull/982)
 
 
 ## 2015-07-30 FreshRSS 1.1.2-beta
-- 
cgit v1.2.3


From a180485f9146f22d48470f3ba541317dbc2ee076 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 Aug 2016 23:39:52 +0200
Subject: sticky-kit fix, and compatible async defer

And set correct parent option
https://github.com/FreshRSS/FreshRSS/pull/1172
---
 CHANGELOG.md      |  1 +
 app/FreshRSS.php  |  3 +--
 p/scripts/main.js | 37 +++++++++++++++++++++++++++++--------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c8655bca..50498da99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 	* Fixed Apache Etag issue that prevented caching [#1199](https://github.com/FreshRSS/FreshRSS/pull/1199)
 	* Fixed OPML import of categories [#1202](https://github.com/FreshRSS/FreshRSS/issues/1202)
 * UI
+	* Use sticky category column [#1172](https://github.com/FreshRSS/FreshRSS/pull/1172)
 	* Updated to jQuery 3.1.0 and several JavaScript fixes (e.g. drag & drop) [#1197](https://github.com/FreshRSS/FreshRSS/pull/1197)
 * API
 	* Add API link in FreshRSS profile settings to ease set-up [#1186](https://github.com/FreshRSS/FreshRSS/pull/1186)
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 6b36c87f4..f9c371d27 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -95,8 +95,7 @@ class FreshRSS extends Minz_FrontController {
 			}
 		}
 
-		Minz_View::appendScript(Minz_Url::display('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')),false,false,false);
-		Minz_View::appendScript(Minz_Url::display('/scripts/jquery.sticky-kit.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.sticky-kit.min.js')));
+		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/p/scripts/main.js b/p/scripts/main.js
index 9bf0c6dd3..b0ea40965 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -493,6 +493,27 @@ function init_posts() {
 	}
 }
 
+function inject_script(name) {
+	var script = document.createElement('script');
+	script.async = 'async';
+	script.defer = 'defer';
+	script.src = '../scripts/' + name;
+	document.head.appendChild(script);
+}
+
+function init_sticky_column() {
+	if (!window.$ || !window.$.fn.stick_in_parent) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Sticky-kit…');
+		}
+		window.setTimeout(init_sticky_column, 200);
+		return;
+	}
+	if ($('.toggle_aside').css('display') === 'none') {
+		$('#aside_feed .tree').stick_in_parent({parent:'#aside_feed'});
+	}
+}
+
 function init_column_categories() {
 	if (context.current_view !== 'normal') {
 		return;
@@ -508,7 +529,7 @@ function init_column_categories() {
 				this.alt = '▽';
 			}
 		});
-		$(this).parent().next(".tree-folder-items").slideToggle( 400 , function() {  $(document.body).trigger("sticky_kit:recalc"); } );
+		$(this).parent().next(".tree-folder-items").slideToggle(300 , function() { $(document.body).trigger("sticky_kit:recalc"); });
 		return false;
 	});
 	$('#aside_feed').on('click', '.tree-folder-items .item .dropdown-toggle', function () {
@@ -519,9 +540,8 @@ function init_column_categories() {
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});
-	if( $('.toggle_aside').css('display')=='none') {
-		$('#aside_feed .tree').stick_in_parent();
-	}
+
+	init_sticky_column();
 }
 
 function init_shortcuts() {
@@ -529,7 +549,7 @@ function init_shortcuts() {
 		if (window.console) {
 			console.log('FreshRSS waiting for sortcut.js…');
 		}
-		window.setTimeout(init_shortcuts, 50);
+		window.setTimeout(init_shortcuts, 200);
 		return;
 	}
 	// Touches de manipulation
@@ -1313,7 +1333,7 @@ function init_normal() {
 		if (window.console) {
 			console.log('FreshRSS waiting for content…');
 		}
-		window.setTimeout(init_normal, 50);
+		window.setTimeout(init_normal, 100);
 		return;
 	}
 	init_column_categories();
@@ -1328,11 +1348,12 @@ function init_beforeDOM() {
 		if (window.console) {
 			console.log('FreshRSS waiting for jQuery…');
 		}
-		window.setTimeout(init_beforeDOM, 50);
+		window.setTimeout(init_beforeDOM, 100);
 		return;
 	}
 	init_confirm_action();
 	if (['normal', 'reader', 'global'].indexOf(context.current_view) >= 0) {
+		inject_script('jquery.sticky-kit.min.js');
 		init_normal();
 	}
 }
@@ -1342,7 +1363,7 @@ function init_afterDOM() {
 		if (window.console) {
 			console.log('FreshRSS waiting again for jQuery…');
 		}
-		window.setTimeout(init_afterDOM, 50);
+		window.setTimeout(init_afterDOM, 100);
 		return;
 	}
 	init_notifications();
-- 
cgit v1.2.3


From b66da6f5e2bf2be23c9990fb9bb5b879ad42f7c6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 00:13:00 +0200
Subject: Credits updated

---
 CREDITS.md | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index b21e8be85..042fa5659 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -9,17 +9,22 @@ People are sorted by name so please keep this order.
 * [Alexandre Alapetite](https://github.com/Alkarex): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alkarex), [Web](http://alexandre.alapetite.fr/)
 * [Alexis Degrugillier](https://github.com/aledeg): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=aledeg)
 * [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin)
-* [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade)
+* [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade), [Web](https://amaury.carrade.eu/)
+* [ASMfreaK](https://github.com/ASMfreaK): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ASMfreaK)
+* [danc](https://github.com/danc): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=danc), [Web](http://tintouli.free.fr/)
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
-* [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry)
-* [Marcus Rohrmoser](https://github.com/mro):
-[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=mro)
+* [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/)
+* [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)
+* [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/)
+* [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/)
+* [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry), [Web](https://www.fiat-tux.fr/)
+* [marcomrc](https://github.com/marcomrc): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marcomrc)
+* [Marcus Rohrmoser](https://github.com/mro): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=mro), [Web](http://mro.name/~me)
 * [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/)
-* [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek)
+* [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek), [Web](http://x2a.yt/)
 * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
 * [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
-* [Tets42](https://github.com/Tets42):
-[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
-* [thomasE1993](https://github.com/thomasE1993):
-[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=thomasE1993)
+* [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=romibi)
+* [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
 * [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
+* [Wanabo](https://github.com/Wanabo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Wanabo)
-- 
cgit v1.2.3


From 6346b2ca7b6233b17014249f6f95a5db0c730320 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 00:26:51 +0200
Subject: More credits

---
 CREDITS.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CREDITS.md b/CREDITS.md
index 042fa5659..95c01b747 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -11,9 +11,11 @@ People are sorted by name so please keep this order.
 * [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin)
 * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade), [Web](https://amaury.carrade.eu/)
 * [ASMfreaK](https://github.com/ASMfreaK): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ASMfreaK)
+* [Damstre](https://github.com/Damstre): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Damstre),
 * [danc](https://github.com/danc): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=danc), [Web](http://tintouli.free.fr/)
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
 * [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/)
+* [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=kokaz), [Web](http://www.guillaume-fillon.com/)
 * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)
 * [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/)
 * [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/)
@@ -24,6 +26,7 @@ People are sorted by name so please keep this order.
 * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek), [Web](http://x2a.yt/)
 * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
 * [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
+* [purexo](https://github.com/purexo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=purexo), [Web](https://purexo.mom/)
 * [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=romibi)
 * [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
 * [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
-- 
cgit v1.2.3


From 836248feeabcf1c2fc0a06edd7cfff6dc9e30c91 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 00:37:16 +0200
Subject: Fix some gitHub credits links

---
 CREDITS.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index 95c01b747..65c1318b3 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -11,11 +11,11 @@ People are sorted by name so please keep this order.
 * [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin)
 * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade), [Web](https://amaury.carrade.eu/)
 * [ASMfreaK](https://github.com/ASMfreaK): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ASMfreaK)
-* [Damstre](https://github.com/Damstre): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Damstre),
+* [Damstre](https://github.com/Damstre): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Damstre),
 * [danc](https://github.com/danc): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=danc), [Web](http://tintouli.free.fr/)
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
 * [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/)
-* [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=kokaz), [Web](http://www.guillaume-fillon.com/)
+* [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:kokaz), [Web](http://www.guillaume-fillon.com/)
 * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)
 * [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/)
 * [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/)
@@ -26,8 +26,8 @@ People are sorted by name so please keep this order.
 * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek), [Web](http://x2a.yt/)
 * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
 * [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
-* [purexo](https://github.com/purexo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=purexo), [Web](https://purexo.mom/)
-* [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=romibi)
+* [purexo](https://github.com/purexo): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:purexo), [Web](https://purexo.mom/)
+* [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi)
 * [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
 * [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
 * [Wanabo](https://github.com/Wanabo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Wanabo)
-- 
cgit v1.2.3


From fd0f719c0c5297f4342395a60249b1eb442e0586 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 10:09:15 +0200
Subject: Readme SuperFeeder

https://github.com/FreshRSS/FreshRSS/pull/1184
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50498da99..f0bb94c39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 * API
 	* Add API link in FreshRSS profile settings to ease set-up [#1186](https://github.com/FreshRSS/FreshRSS/pull/1186)
 * Mics.
+	* Work-around for SuperFeeder time-outs during PubSubHubbub registration [#1184](https://github.com/FreshRSS/FreshRSS/pull/1184)
 	* JSHint of JavaScript code and better initialisation [#1196](https://github.com/FreshRSS/FreshRSS/pull/1196)
 	* Updated credits, and images in README [#1201](https://github.com/FreshRSS/FreshRSS/issues/1201)
 
-- 
cgit v1.2.3


From e315192c4b3df89dddb1ac37c6c7a01531d7952f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 11:06:31 +0200
Subject: Bug static

---
 app/Models/CategoryDAO.php | 2 +-
 app/Models/FeedDAO.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index a44edb0f6..3b1519c20 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -10,7 +10,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 		);
 
 		if ($stm && $stm->execute($values)) {
-			return $this->bd->lastInsertId('"' . parent::prefix . 'category_id_seq"');
+			return $this->bd->lastInsertId('"' . $this->prefix . 'category_id_seq"');
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error addCategory: ' . $info[2]);
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index f29dac9c0..ce65ed8b1 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -16,7 +16,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		);
 
 		if ($stm && $stm->execute($values)) {
-			return $this->bd->lastInsertId('"' . parent::prefix . 'feed_id_seq"');
+			return $this->bd->lastInsertId('"' . $this->prefix . 'feed_id_seq"');
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error addFeed: ' . $info[2]);
-- 
cgit v1.2.3


From 46bcaf5f9d224c5fae8f8c92a738f78a764c6405 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 19:34:44 +0200
Subject: Define JSON_UNESCAPED_UNICODE for PHP 5.3

https://github.com/FreshRSS/FreshRSS/issues/1208
---
 lib/lib_rss.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index b5ba78889..986dc1fb6 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -15,6 +15,8 @@ if (!function_exists('json_encode')) {
 	}
 }
 
+defined('JSON_UNESCAPED_UNICODE') or define('JSON_UNESCAPED_UNICODE', 256);	//PHP 5.3
+
 if (!function_exists('array_replace_recursive')) {	//PHP 5.2
 	function arr_recurse($array, $array1) {
 		foreach ($array1 as $key => $value) {
-- 
cgit v1.2.3


From dd7d5855e3aedfca2ca216049afd3a1aaa23733b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 19:55:27 +0200
Subject: Remove code for PHP 5.3.2-

---
 README.fr.md                       |  2 +-
 README.md                          |  2 +-
 app/Models/ConfigurationSetter.php |  7 +-----
 lib/lib_rss.php                    | 45 +++++---------------------------------
 4 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 577c7b73e..507a6010d 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -32,7 +32,7 @@ Nous sommes une communauté amicale.
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
-* PHP 5.3.3+ (PHP 5.3.7+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
+* PHP 5.3.3+ (PHP 5.4+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
 	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Inclus par défaut : [DOM](http://php.net/dom), [XML](http://php.net/xml)…
diff --git a/README.md b/README.md
index 9a8355f9c..cc1e258ff 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ We are a friendly community.
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
-* PHP 5.3.3+ (PHP 5.3.7+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
+* PHP 5.3.3+ (PHP 5.4+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
 	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
 	* Recommended extensions: [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
 	* Enabled by default: [DOM](http://php.net/dom), [XML](http://php.net/xml)…
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index e472b1e7f..79bd0170b 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -129,12 +129,7 @@ class FreshRSS_ConfigurationSetter {
 
 			// 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
+				$is_url = filter_var($value['url'], FILTER_VALIDATE_URL);
 				if (!$is_url) {
 					continue;
 				}
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index b5ba78889..cf56ae9b2 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -15,35 +15,6 @@ if (!function_exists('json_encode')) {
 	}
 }
 
-if (!function_exists('array_replace_recursive')) {	//PHP 5.2
-	function arr_recurse($array, $array1) {
-		foreach ($array1 as $key => $value) {
-			if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
-				$array[$key] = array();	//create new key in $array, if it is empty or not an array
-			}
-			if (is_array($value)) {
-				$value = arr_recurse($array[$key], $value);	// overwrite the value in the base array
-			}
-			$array[$key] = $value;
-		}
-		return $array;
-	}
-	function array_replace_recursive($array, $array1) {	//http://php.net/manual/function.array-replace-recursive.php#92574
-		// handle the arguments, merge one by one
-		$args = func_get_args();
-		$array = $args[0];
-		if (!is_array($array)) {
-			return $array;
-		}
-		for ($i = 1; $i < count($args); $i++) {
-			if (is_array($args[$i])) {
-				$array = arr_recurse($array, $args[$i]);
-			}
-		}
-		return $array;
-	}
-}
-
 /**
  * Build a directory path by concatenating a list of directory names.
  *
@@ -103,9 +74,7 @@ function checkUrl($url) {
 		$url = 'http://' . $url;
 	}
 	$url = idn_to_puny($url);	//PHP bug #53474 IDN
-	if (filter_var($url, FILTER_VALIDATE_URL) ||
-		(version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($url, '-') > 0) &&	//PHP bug #51192
-		 ($url === filter_var($url, FILTER_SANITIZE_URL)))) {
+	if (filter_var($url, FILTER_VALIDATE_URL)) {
 		return $url;
 	} else {
 		return false;
@@ -379,12 +348,10 @@ function httpAuthUser() {
 }
 
 function cryptAvailable() {
-	if (version_compare(PHP_VERSION, '5.3.3', '>=')) {
-		try {
-			$hash = '$2y$04$usesomesillystringfore7hnbRJHxXVLeakoG8K30oukPsA.ztMG';
-			return $hash === @crypt('password', $hash);
-		} catch (Exception $e) {
-		}
+	try {
+		$hash = '$2y$04$usesomesillystringfore7hnbRJHxXVLeakoG8K30oukPsA.ztMG';
+		return $hash === @crypt('password', $hash);
+	} catch (Exception $e) {
 	}
 	return false;
 }
@@ -416,7 +383,7 @@ 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,
+		'php' => version_compare(PHP_VERSION, '5.3.3') >= 0,
 		'minz' => file_exists(LIB_PATH . '/Minz'),
 		'curl' => extension_loaded('curl'),
 		'pdo' => $pdo_mysql || $pdo_sqlite,
-- 
cgit v1.2.3


From 6941b4c742fb4c3593e08c80ff09d52f3520dc03 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Aug 2016 23:00:07 +0200
Subject: Refresh sticky column after auto-load

https://github.com/FreshRSS/FreshRSS/pull/1172
---
 p/scripts/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index b0ea40965..6f1f40642 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1013,6 +1013,7 @@ function load_more_posts() {
 
 		$('#load_more').removeClass('loading');
 		load_more = false;
+		$(document.body).trigger('sticky_kit:recalc');
 	});
 }
 
-- 
cgit v1.2.3


From a0230ad70b0e1d5cef7423f101adeba1e1fe34b3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Aug 2016 21:57:37 +0200
Subject: Minor HTML fixes

Fix aria bug. Move some content before the flush. XHTML syntax.
---
 app/layout/layout.phtml   | 15 ++++++++-------
 app/layout/nav_menu.phtml |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 189d93fbe..4d9ad5458 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -11,16 +11,19 @@
 		<?php echo self::headScript(); ?>
 		<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'); ?>" />
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>">
-		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>">
-		<link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>">
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>" />
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>" />
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>" />
+		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>" />
+		<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 FreshRSS_Context::$system_conf->title; ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
+<?php if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
+		<meta name="referrer" content="never" />
 <?php
+	}
 	flush();
 	if (isset($this->callbackBeforeContent)) {
 		call_user_func($this->callbackBeforeContent, $this);
@@ -41,8 +44,6 @@
 		$url_rss['a'] = 'rss';
 ?>
 		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
-<?php } if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
-		<meta name="referrer" content="never" />
 <?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
 		<meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8'); ?>" />
 <?php } else { ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 17655acbf..488c6fdef 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -22,7 +22,7 @@
 		?>
 		<a id="toggle-<?php echo $state_str; ?>"
 		   class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
-		   aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
+		   role="checkbox" aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
 		   title="<?php echo _t('index.menu.' . $state_str); ?>"
 		   href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
 		<?php } ?>
-- 
cgit v1.2.3


From 1d6c71e216898729cf2cc8330130b568ab198f2a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Aug 2016 23:07:47 +0200
Subject: Read-all bug fixed

Introduced by the new forms of
https://github.com/FreshRSS/FreshRSS/issues/772
https://github.com/FreshRSS/FreshRSS/pull/1188
---
 p/scripts/main.js                    | 4 ++--
 p/themes/BlueLagoon/BlueLagoon.css   | 2 +-
 p/themes/Screwdriver/screwdriver.css | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 6f1f40642..8980fe2f6 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -993,12 +993,12 @@ function load_more_posts() {
 		box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day'));
 		$('.pagination').replaceWith($('.pagination', data));
 		if (context.display_order === 'ASC') {
-			$('#nav_menu_read_all > .read_all').attr(
+			$('#nav_menu_read_all .read_all').attr(
 				'formaction', $('#bigMarkAsRead').attr('formaction')
 			);
 		} else {
 			$('#bigMarkAsRead').attr(
-				'formaction', $('#nav_menu_read_all > .read_all').attr('formaction')
+				'formaction', $('#nav_menu_read_all .read_all').attr('formaction')
 			);
 		}
 
diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index d64ffd9a0..27bae5404 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -753,7 +753,7 @@ a.btn {
 	border: 1px solid #CCC;
 	box-shadow: 0px 1px #FFF;
 }
-#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{
+#panel > .nav_menu > #nav_menu_read_all .dropdown > .btn.dropdown-toggle {
 	border-radius: 0 4px 4px 0;
 	border:none;
 	border-left: solid 1px #ccc;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index b7bbd923e..9dbe523a1 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -748,7 +748,7 @@ a.btn {
 	border: 1px solid #CCC;
 	box-shadow: 0px 1px #FFF;
 }
-#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{
+#panel > .nav_menu > #nav_menu_read_all .dropdown > .btn.dropdown-toggle {
 	border-radius: 0 4px 4px 0;
 	border:none;
 	border-left: solid 1px #ccc;
-- 
cgit v1.2.3


From 32c734ef622f4ed83d212d3eb1d15d83d406bd86 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 18 Aug 2016 00:00:08 +0200
Subject: SQL mark search as read

https://github.com/FreshRSS/FreshRSS/issues/608
---
 app/Controllers/entryController.php |  19 ++++-
 app/Models/EntryDAO.php             | 150 ++++++++++++++++++++----------------
 app/layout/nav_menu.phtml           |   2 +
 app/views/helpers/pagination.phtml  |   2 +
 4 files changed, 102 insertions(+), 71 deletions(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index bff1073ef..c40588105 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -40,6 +40,17 @@ 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);
+		FreshRSS_Context::$search = new FreshRSS_Search(Minz_Request::param('search', ''));
+
+		FreshRSS_Context::$state = Minz_Request::param('state', 0);
+		if (FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_FAVORITE)) {
+			FreshRSS_Context::$state = FreshRSS_Entry::STATE_FAVORITE;
+		} elseif (FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_FAVORITE)) {
+			FreshRSS_Context::$state = FreshRSS_Entry::STATE_NOT_FAVORITE;
+		} else {
+			FreshRSS_Context::$state = 0;
+		}
+
 		$params = array();
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
@@ -58,16 +69,16 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 				$get = substr($get, 2);
 				switch($type_get) {
 				case 'c':
-					$entryDAO->markReadCat($get, $id_max);
+					$entryDAO->markReadCat($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state);
 					break;
 				case 'f':
-					$entryDAO->markReadFeed($get, $id_max);
+					$entryDAO->markReadFeed($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state);
 					break;
 				case 's':
-					$entryDAO->markReadEntries($id_max, true);
+					$entryDAO->markReadEntries($id_max, true, 0, FreshRSS_Context::$search);
 					break;
 				case 'a':
-					$entryDAO->markReadEntries($id_max);
+					$entryDAO->markReadEntries($id_max, false, 0, FreshRSS_Context::$search, FreshRSS_Context::$state);
 					break;
 				}
 
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index c9e6f9742..3bb8a720c 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -344,7 +344,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 * @param integer $priorityMin
 	 * @return integer affected rows
 	 */
-	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
+	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0, $filter = null, $state = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadEntries(0) is deprecated!');
@@ -359,8 +359,11 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$sql .= ' AND f.priority > ' . intval($priorityMin);
 		}
 		$values = array($idMax);
-		$stm = $this->bd->prepare($sql);
-		if (!($stm && $stm->execute($values))) {
+
+		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+
+		$stm = $this->bd->prepare($sql . $search);
+		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error markReadEntries: ' . $info[2]);
 			return false;
@@ -383,7 +386,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 * @param integer $idMax fail safe article ID
 	 * @return integer affected rows
 	 */
-	public function markReadCat($id, $idMax = 0) {
+	public function markReadCat($id, $idMax = 0, $filter = null, $state = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadCat(0) is deprecated!');
@@ -393,8 +396,11 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			 . 'SET e.is_read=1 '
 			 . 'WHERE f.category=? AND e.is_read=0 AND e.id <= ?';
 		$values = array($id, $idMax);
-		$stm = $this->bd->prepare($sql);
-		if (!($stm && $stm->execute($values))) {
+
+		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+
+		$stm = $this->bd->prepare($sql . $search);
+		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error markReadCat: ' . $info[2]);
 			return false;
@@ -417,19 +423,22 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 * @param integer $idMax fail safe article ID
 	 * @return integer affected rows
 	 */
-	public function markReadFeed($id_feed, $idMax = 0) {
+	public function markReadFeed($id_feed, $idMax = 0, $filter = null, $state = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadFeed(0) is deprecated!');
 		}
 		$this->bd->beginTransaction();
 
-		$sql = 'UPDATE `' . $this->prefix . 'entry` '
-			 . 'SET is_read=1 '
-			 . 'WHERE id_feed=? AND is_read=0 AND id <= ?';
+		$sql = 'UPDATE `' . $this->prefix . 'entry` e '
+			 . 'SET e.is_read=1 '
+			 . 'WHERE e.id_feed=? AND e.is_read=0 AND e.id <= ?';
 		$values = array($id_feed, $idMax);
-		$stm = $this->bd->prepare($sql);
-		if (!($stm && $stm->execute($values))) {
+
+		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+
+		$stm = $this->bd->prepare($sql . $search);
+		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error markReadFeed: ' . $info[2]);
 			$this->bd->rollBack();
@@ -493,52 +502,24 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		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) {
-		if (!$state) {
-			$state = FreshRSS_Entry::STATE_ALL;
-		}
-		$where = '';
-		$joinFeed = false;
+	private function sqlListEntriesWhere($filter = null, $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $firstId = '', $date_min = 0) {
+		$search = ' ';
 		$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 . ']!');
-		}
-
 		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
 			if (!($state & FreshRSS_Entry::STATE_READ)) {
-				$where .= 'AND e1.is_read=0 ';
+				$search .= 'AND e.is_read=0 ';
 			}
 		}
 		elseif ($state & FreshRSS_Entry::STATE_READ) {
-			$where .= 'AND e1.is_read=1 ';
+			$search .= 'AND e.is_read=1 ';
 		}
 		if ($state & FreshRSS_Entry::STATE_FAVORITE) {
 			if (!($state & FreshRSS_Entry::STATE_NOT_FAVORITE)) {
-				$where .= 'AND e1.is_favorite=1 ';
+				$search .= 'AND e.is_favorite=1 ';
 			}
 		}
 		elseif ($state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
-			$where .= 'AND e1.is_favorite=0 ';
+			$search .= 'AND e.is_favorite=0 ';
 		}
 
 		switch ($order) {
@@ -552,76 +533,111 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$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 . ' ';
+			$search .= 'AND e.id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' ';
 		}
 		if ($date_min > 0) {
-			$where .= 'AND e1.id >= ' . $date_min . '000000 ';
+			$search .= 'AND e.id >= ' . $date_min . '000000 ';
 		}
-		$search = '';
 		if ($filter) {
 			if ($filter->getIntitle()) {
-				$search .= 'AND e1.title LIKE ? ';
+				$search .= 'AND e.title LIKE ? ';
 				$values[] = "%{$filter->getIntitle()}%";
 			}
 			if ($filter->getInurl()) {
-				$search .= 'AND CONCAT(e1.link, e1.guid) LIKE ? ';
+				$search .= 'AND CONCAT(e.link, e.guid) LIKE ? ';
 				$values[] = "%{$filter->getInurl()}%";
 			}
 			if ($filter->getAuthor()) {
-				$search .= 'AND e1.author LIKE ? ';
+				$search .= 'AND e.author LIKE ? ';
 				$values[] = "%{$filter->getAuthor()}%";
 			}
 			if ($filter->getMinDate()) {
-				$search .= 'AND e1.id >= ? ';
+				$search .= 'AND e.id >= ? ';
 				$values[] = "{$filter->getMinDate()}000000";
 			}
 			if ($filter->getMaxDate()) {
-				$search .= 'AND e1.id <= ? ';
+				$search .= 'AND e.id <= ? ';
 				$values[] = "{$filter->getMaxDate()}000000";
 			}
 			if ($filter->getMinPubdate()) {
-				$search .= 'AND e1.date >= ? ';
+				$search .= 'AND e.date >= ? ';
 				$values[] = $filter->getMinPubdate();
 			}
 			if ($filter->getMaxPubdate()) {
-				$search .= 'AND e1.date <= ? ';
+				$search .= 'AND e.date <= ? ';
 				$values[] = $filter->getMaxPubdate();
 			}
 			if ($filter->getTags()) {
 				$tags = $filter->getTags();
 				foreach ($tags as $tag) {
-					$search .= 'AND e1.tags LIKE ? ';
+					$search .= 'AND e.tags LIKE ? ';
 					$values[] = "%{$tag}%";
 				}
 			}
 			if ($filter->getSearch()) {
 				$search_values = $filter->getSearch();
 				foreach ($search_values as $search_value) {
-					$search .= 'AND ' . $this->sqlconcat('e1.title', $this->isCompressed() ? 'UNCOMPRESS(content_bin)' : 'content') . ' LIKE ? ';
+					$search .= 'AND ' . $this->sqlconcat('e.title', $this->isCompressed() ? 'UNCOMPRESS(content_bin)' : 'content') . ' LIKE ? ';
 					$values[] = "%{$search_value}%";
 				}
 			}
 		}
-		return array($values,
-			'SELECT e1.id FROM `' . $this->prefix . 'entry` e1 '
-			. ($joinFeed ? 'INNER JOIN `' . $this->prefix . 'feed` f ON e1.id_feed=f.id ' : '')
+		return array($values, $search);
+	}
+
+	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;
+		}
+		$where = '';
+		$joinFeed = false;
+		$values = array();
+		switch ($type) {
+		case 'a':
+			$where .= 'f.priority > 0 ';
+			$joinFeed = true;
+			break;
+		case 's':	//Deprecated: use $state instead
+			$where .= 'e.is_favorite=1 ';
+			break;
+		case 'c':
+			$where .= 'f.category=? ';
+			$values[] = intval($id);
+			$joinFeed = true;
+			break;
+		case 'f':
+			$where .= 'e.id_feed=? ';
+			$values[] = intval($id);
+			break;
+		case 'A':
+			$where .= '1 ';
+			break;
+		default:
+			throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!');
+		}
+
+		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state, $order, $firstId, $date_min);
+
+		return array(array_merge($values, $searchValues),
+			'SELECT e.id FROM `' . $this->prefix . 'entry` e '
+			. ($joinFeed ? 'INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id ' : '')
 			. 'WHERE ' . $where
 			. $search
-			. 'ORDER BY e1.id ' . $order
+			. 'ORDER BY e.id ' . $order
 			. ($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) {
 		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min);
 
-		$sql = 'SELECT e.id, e.guid, e.title, e.author, '
+		$sql = 'SELECT e0.id, e0.guid, e0.title, e0.author, '
 		     . ($this->isCompressed() ? 'UNCOMPRESS(content_bin) AS content' : 'content')
-		     . ', e.link, e.date, e.is_read, e.is_favorite, e.id_feed, e.tags '
-		     . 'FROM `' . $this->prefix . 'entry` e '
+		     . ', e0.link, e0.date, e0.is_read, e0.is_favorite, e0.id_feed, e0.tags '
+		     . 'FROM `' . $this->prefix . 'entry` e0 '
 		     . 'INNER JOIN ('
 		     . $sql
-		     . ') e2 ON e2.id=e.id '
-		     . 'ORDER BY e.id ' . $order;
+		     . ') e2 ON e2.id=e0.id '
+		     . 'ORDER BY e0.id ' . $order;
 
 		$stm = $this->bd->prepare($sql);
 		$stm->execute($values);
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 488c6fdef..23255f04f 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -75,6 +75,8 @@
 				'get' => $get,
 				'nextGet' => FreshRSS_Context::$next_get,
 				'idMax' => FreshRSS_Context::$id_max,
+				'search' => FreshRSS_Context::$search,
+				'state' => FreshRSS_Context::$state,
 			)
 		);
 	?>
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index 23c45114d..20957fc67 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -10,6 +10,8 @@
 			'get' => FreshRSS_Context::currentGet(),
 			'nextGet' => FreshRSS_Context::$next_get,
 			'idMax' => FreshRSS_Context::$id_max,
+			'search' => FreshRSS_Context::$search,
+			'state' => FreshRSS_Context::$state,
 		)
 	);
 ?>
-- 
cgit v1.2.3


From 206480e28fc3911b02895f31a5629be9d7bf92b7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 18 Aug 2016 00:01:36 +0200
Subject: Readme mark a search as read

https://github.com/FreshRSS/FreshRSS/issues/608
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0bb94c39..c19042972 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 		* Restore compatibility with PHP 5.3.3 [#1208](https://github.com/FreshRSS/FreshRSS/issues/1208)
 	* Restore compatibility with Microsoft Internet Explorer 11 / Edge [#772](https://github.com/FreshRSS/FreshRSS/issues/772)
 * Features
+	* Mark a search as read [#608](https://github.com/FreshRSS/FreshRSS/issues/608)
 	* Support for full Unicode such as emoji 💕 in MySQL with utf8mb4 [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
 		* FreshRSS will automatically migrate MySQL tables to utf8mb4 the first time it is needed.
 * Security
-- 
cgit v1.2.3


From ca8d49c3777c3a1134616561d34d00c7e536336f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 18 Aug 2016 23:13:44 +0200
Subject: Misc changelog 1.5.0-dev

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0bb94c39..d716d984d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-XX-XX FreshRSS 1.5.x-dev
+## 2016-08-XX FreshRSS 1.5.0-dev
 
 * Compatibility
 	* Require at least MySQL 5.5.3+ [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
@@ -24,7 +24,7 @@
 	* Updated to jQuery 3.1.0 and several JavaScript fixes (e.g. drag & drop) [#1197](https://github.com/FreshRSS/FreshRSS/pull/1197)
 * API
 	* Add API link in FreshRSS profile settings to ease set-up [#1186](https://github.com/FreshRSS/FreshRSS/pull/1186)
-* Mics.
+* Misc.
 	* Work-around for SuperFeeder time-outs during PubSubHubbub registration [#1184](https://github.com/FreshRSS/FreshRSS/pull/1184)
 	* JSHint of JavaScript code and better initialisation [#1196](https://github.com/FreshRSS/FreshRSS/pull/1196)
 	* Updated credits, and images in README [#1201](https://github.com/FreshRSS/FreshRSS/issues/1201)
-- 
cgit v1.2.3


From 6afa36e7e101236b4ac08f8c267f4e2bd78f4ea6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 19 Aug 2016 11:05:24 +0200
Subject: SQLite fix for mark search as read

https://github.com/FreshRSS/FreshRSS/issues/1220
https://github.com/FreshRSS/FreshRSS/pull/1218
https://github.com/FreshRSS/FreshRSS/issues/608
---
 app/Models/EntryDAO.php       |  2 +-
 app/Models/EntryDAOSQLite.php | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 3bb8a720c..769d2ae6c 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -502,7 +502,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return 'CONCAT(' . $s1 . ',' . $s2 . ')';	//MySQL
 	}
 
-	private function sqlListEntriesWhere($filter = null, $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $firstId = '', $date_min = 0) {
+	protected function sqlListEntriesWhere($filter = null, $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $firstId = '', $date_min = 0) {
 		$search = ' ';
 		$values = array();
 		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index 19b97fd3a..de02616d6 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -119,7 +119,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	 * @param integer $priorityMin
 	 * @return integer affected rows
 	 */
-	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
+	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0, $filter = null, $state = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadEntries(0) is deprecated!');
@@ -132,8 +132,11 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 			$sql .= ' AND id_feed IN (SELECT f.id FROM `' . $this->prefix . 'feed` f WHERE f.priority > ' . intval($priorityMin) . ')';
 		}
 		$values = array($idMax);
-		$stm = $this->bd->prepare($sql);
-		if (!($stm && $stm->execute($values))) {
+
+		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+
+		$stm = $this->bd->prepare($sql . $search);
+		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error markReadEntries: ' . $info[2]);
 			return false;
@@ -156,7 +159,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	 * @param integer $idMax fail safe article ID
 	 * @return integer affected rows
 	 */
-	public function markReadCat($id, $idMax = 0) {
+	public function markReadCat($id, $idMax = 0, $filter = null, $state = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadCat(0) is deprecated!');
@@ -166,9 +169,12 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 			 . 'SET is_read=1 '
 			 . 'WHERE is_read=0 AND id <= ? AND '
 			 . 'id_feed IN (SELECT f.id FROM `' . $this->prefix . 'feed` f WHERE f.category=?)';
-		$values = array($idMax, $id);
-		$stm = $this->bd->prepare($sql);
-		if (!($stm && $stm->execute($values))) {
+		$values = array($id, $idMax);
+
+		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+
+		$stm = $this->bd->prepare($sql . $search);
+		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
 			Minz_Log::error('SQL error markReadCat: ' . $info[2]);
 			return false;
-- 
cgit v1.2.3


From edd4516178c49f966248d832e63776f5f2f90236 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 19 Aug 2016 14:33:08 +0200
Subject: More SQLite fix for mark search as read

---
 app/Models/EntryDAO.php       | 40 ++++++++++++++++++++--------------------
 app/Models/EntryDAOSQLite.php |  6 +++---
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 769d2ae6c..8f64098e5 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -360,7 +360,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 		$values = array($idMax);
 
-		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+		list($searchValues, $search) = $this->sqlListEntriesWhere('e.', $filter, $state);
 
 		$stm = $this->bd->prepare($sql . $search);
 		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
@@ -397,7 +397,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			 . 'WHERE f.category=? AND e.is_read=0 AND e.id <= ?';
 		$values = array($id, $idMax);
 
-		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+		list($searchValues, $search) = $this->sqlListEntriesWhere('e.', $filter, $state);
 
 		$stm = $this->bd->prepare($sql . $search);
 		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
@@ -435,7 +435,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			 . 'WHERE e.id_feed=? AND e.is_read=0 AND e.id <= ?';
 		$values = array($id_feed, $idMax);
 
-		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+		list($searchValues, $search) = $this->sqlListEntriesWhere('e.', $filter, $state);
 
 		$stm = $this->bd->prepare($sql . $search);
 		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
@@ -502,24 +502,24 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return 'CONCAT(' . $s1 . ',' . $s2 . ')';	//MySQL
 	}
 
-	protected function sqlListEntriesWhere($filter = null, $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $firstId = '', $date_min = 0) {
+	protected function sqlListEntriesWhere($alias = '', $filter = null, $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $firstId = '', $date_min = 0) {
 		$search = ' ';
 		$values = array();
 		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
 			if (!($state & FreshRSS_Entry::STATE_READ)) {
-				$search .= 'AND e.is_read=0 ';
+				$search .= 'AND ' . $alias . 'is_read=0 ';
 			}
 		}
 		elseif ($state & FreshRSS_Entry::STATE_READ) {
-			$search .= 'AND e.is_read=1 ';
+			$search .= 'AND ' . $alias . 'is_read=1 ';
 		}
 		if ($state & FreshRSS_Entry::STATE_FAVORITE) {
 			if (!($state & FreshRSS_Entry::STATE_NOT_FAVORITE)) {
-				$search .= 'AND e.is_favorite=1 ';
+				$search .= 'AND ' . $alias . 'is_favorite=1 ';
 			}
 		}
 		elseif ($state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
-			$search .= 'AND e.is_favorite=0 ';
+			$search .= 'AND ' . $alias . 'is_favorite=0 ';
 		}
 
 		switch ($order) {
@@ -533,51 +533,51 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$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 !== '') {
-			$search .= 'AND e.id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' ';
+			$search .= 'AND ' . $alias . 'id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' ';
 		}
 		if ($date_min > 0) {
-			$search .= 'AND e.id >= ' . $date_min . '000000 ';
+			$search .= 'AND ' . $alias . 'id >= ' . $date_min . '000000 ';
 		}
 		if ($filter) {
 			if ($filter->getIntitle()) {
-				$search .= 'AND e.title LIKE ? ';
+				$search .= 'AND ' . $alias . 'title LIKE ? ';
 				$values[] = "%{$filter->getIntitle()}%";
 			}
 			if ($filter->getInurl()) {
-				$search .= 'AND CONCAT(e.link, e.guid) LIKE ? ';
+				$search .= 'AND CONCAT(' . $alias . 'link, ' . $alias . 'guid) LIKE ? ';
 				$values[] = "%{$filter->getInurl()}%";
 			}
 			if ($filter->getAuthor()) {
-				$search .= 'AND e.author LIKE ? ';
+				$search .= 'AND ' . $alias . 'author LIKE ? ';
 				$values[] = "%{$filter->getAuthor()}%";
 			}
 			if ($filter->getMinDate()) {
-				$search .= 'AND e.id >= ? ';
+				$search .= 'AND ' . $alias . 'id >= ? ';
 				$values[] = "{$filter->getMinDate()}000000";
 			}
 			if ($filter->getMaxDate()) {
-				$search .= 'AND e.id <= ? ';
+				$search .= 'AND ' . $alias . 'id <= ? ';
 				$values[] = "{$filter->getMaxDate()}000000";
 			}
 			if ($filter->getMinPubdate()) {
-				$search .= 'AND e.date >= ? ';
+				$search .= 'AND ' . $alias . 'date >= ? ';
 				$values[] = $filter->getMinPubdate();
 			}
 			if ($filter->getMaxPubdate()) {
-				$search .= 'AND e.date <= ? ';
+				$search .= 'AND ' . $alias . 'date <= ? ';
 				$values[] = $filter->getMaxPubdate();
 			}
 			if ($filter->getTags()) {
 				$tags = $filter->getTags();
 				foreach ($tags as $tag) {
-					$search .= 'AND e.tags LIKE ? ';
+					$search .= 'AND ' . $alias . 'tags LIKE ? ';
 					$values[] = "%{$tag}%";
 				}
 			}
 			if ($filter->getSearch()) {
 				$search_values = $filter->getSearch();
 				foreach ($search_values as $search_value) {
-					$search .= 'AND ' . $this->sqlconcat('e.title', $this->isCompressed() ? 'UNCOMPRESS(content_bin)' : 'content') . ' LIKE ? ';
+					$search .= 'AND ' . $this->sqlconcat($alias . 'title', $this->isCompressed() ? 'UNCOMPRESS(' . $alias . 'content_bin)' : '' . $alias . 'content') . ' LIKE ? ';
 					$values[] = "%{$search_value}%";
 				}
 			}
@@ -616,7 +616,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!');
 		}
 
-		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state, $order, $firstId, $date_min);
+		list($searchValues, $search) = $this->sqlListEntriesWhere('e.', $filter, $state, $order, $firstId, $date_min);
 
 		return array(array_merge($values, $searchValues),
 			'SELECT e.id FROM `' . $this->prefix . 'entry` e '
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index de02616d6..dad34a93d 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -133,7 +133,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		}
 		$values = array($idMax);
 
-		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+		list($searchValues, $search) = $this->sqlListEntriesWhere('', $filter, $state);
 
 		$stm = $this->bd->prepare($sql . $search);
 		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
@@ -169,9 +169,9 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 			 . 'SET is_read=1 '
 			 . 'WHERE is_read=0 AND id <= ? AND '
 			 . 'id_feed IN (SELECT f.id FROM `' . $this->prefix . 'feed` f WHERE f.category=?)';
-		$values = array($id, $idMax);
+		$values = array($idMax, $id);
 
-		list($searchValues, $search) = $this->sqlListEntriesWhere($filter, $state);
+		list($searchValues, $search) = $this->sqlListEntriesWhere('', $filter, $state);
 
 		$stm = $this->bd->prepare($sql . $search);
 		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
-- 
cgit v1.2.3


From bc3e77555d0e9df7cde0fa35fb208dd0e9f35135 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 19 Aug 2016 14:48:35 +0200
Subject: Readme Ubuntu 16.04 with PHP7

---
 README.fr.md | 9 ++++++---
 README.md    | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 507a6010d..f9d884295 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -61,13 +61,16 @@ sudo apt-get install apache2
 sudo a2enmod headers expires rewrite ssl
 # (optionnel) Si vous voulez un serveur de base de données MySQL
 sudo apt-get install mysql-server mysql-client php5-mysql
-# Composants principaux (git est optionnel si vous déployez manuellement les fichiers d’installation)
-sudo apt-get install git php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
+# Composants principaux (pour Ubuntu <= 15.10)
+sudo apt-get install php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
+# Composants principaux (pour Ubuntu >= 16.04)
+sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-sqlite3 php-xml
 # Redémarrage du serveur Web
 sudo service apache2 restart
 
-# Pour FreshRSS lui-même
+# Pour FreshRSS lui-même (git est optionnel si vous déployez manuellement les fichiers d’installation)
 cd /usr/share/
+sudo apt-get install git
 sudo git clone https://github.com/FreshRSS/FreshRSS.git
 # Mettre les droits d’accès pour le serveur Web
 cd FreshRSS
diff --git a/README.md b/README.md
index cc1e258ff..63debfcee 100644
--- a/README.md
+++ b/README.md
@@ -61,13 +61,16 @@ sudo apt-get install apache2
 sudo a2enmod headers expires rewrite ssl
 # (Optional) If you want a MySQL database server
 sudo apt-get install mysql-server mysql-client php5-mysql
-# Main components (git is optional if you manually download the installation files)
-sudo apt-get install git php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
+# Main components (for Ubuntu <= 15.10)
+sudo apt-get install php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
+# Main components (for Ubuntu >= 16.04)
+sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-sqlite3 php-xml
 # Restart Web server
 sudo service apache2 restart
 
-# For FreshRSS itself
+# For FreshRSS itself (git is optional if you manually download the installation files)
 cd /usr/share/
+sudo apt-get install git
 sudo git clone https://github.com/FreshRSS/FreshRSS.git
 # Set the rights so that your Web browser can access the files
 cd FreshRSS
-- 
cgit v1.2.3


From f9359cd406bafdbb1ffaa8bad8a5810a02efc820 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 19 Aug 2016 20:02:18 +0200
Subject: Readme Ubuntu

---
 README.fr.md | 12 +++++-------
 README.md    | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index f9d884295..99de1f618 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -33,13 +33,11 @@ Nous sommes une communauté amicale.
 	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.3.3+ (PHP 5.4+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
-	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
-	* Recommandés : [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
-	* Inclus par défaut : [DOM](http://php.net/dom), [XML](http://php.net/xml)…
+	* Requis : [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl)
+	* Recommandés : [JSON](http://php.net/json), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](http://php.net/mbstring) et/ou [iconv](http://php.net/iconv) (pour conversion d’encodages), [Zip](http://php.net/zip) (pour import/export), [zlib](http://php.net/zlib) (pour les flux compressés)
 * MySQL 5.5.3+ (recommandé) ou SQLite 3.7.4+
 * Un navigateur Web récent tel Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Fonctionne aussi sur mobile
-* L’entête HTTP `Referer` ne doit pas être désactivé pour pouvoir utiliser le formulaire de connexion
 
 ![Capture d’écran de FreshRSS](./doc/FreshRSS-screenshot.png)
 
@@ -61,10 +59,10 @@ sudo apt-get install apache2
 sudo a2enmod headers expires rewrite ssl
 # (optionnel) Si vous voulez un serveur de base de données MySQL
 sudo apt-get install mysql-server mysql-client php5-mysql
-# Composants principaux (pour Ubuntu <= 15.10)
+# Composants principaux (pour Ubuntu <= 15.10, Debian <= 8 Jessie)
 sudo apt-get install php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
-# Composants principaux (pour Ubuntu >= 16.04)
-sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-sqlite3 php-xml
+# Composants principaux (pour Ubuntu >= 16.04, Debian >= 9 Stretch)
+sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-mbstring php-sqlite3 php-xml php-zip
 # Redémarrage du serveur Web
 sudo service apache2 restart
 
diff --git a/README.md b/README.md
index 63debfcee..846652878 100644
--- a/README.md
+++ b/README.md
@@ -33,13 +33,11 @@ We are a friendly community.
 	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
 * PHP 5.3.3+ (PHP 5.4+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
-	* 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) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
-	* Recommended extensions: [iconv](http://php.net/iconv), [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [Zip](http://php.net/zip), [zlib](http://php.net/zlib)
-	* Enabled by default: [DOM](http://php.net/dom), [XML](http://php.net/xml)…
+	* Required extensions: [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl)
+	* Recommended extensions: [JSON](http://php.net/json), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names), [mbstring](http://php.net/mbstring) and/or [iconv](http://php.net/iconv) (for charset conversion), [Zip](http://php.net/zip) (for import/export), [zlib](http://php.net/zlib) (for compressed feeds)
 * MySQL 5.5.3+ (recommended) or SQLite 3.7.4+
 * A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Works on mobile
-* The browser HTTP `Referer` header must not be disabled when using the form login method
 
 ![FreshRSS screenshot](./doc/FreshRSS-screenshot.png)
 
@@ -61,10 +59,10 @@ sudo apt-get install apache2
 sudo a2enmod headers expires rewrite ssl
 # (Optional) If you want a MySQL database server
 sudo apt-get install mysql-server mysql-client php5-mysql
-# Main components (for Ubuntu <= 15.10)
+# Main components (for Ubuntu <= 15.10, Debian <= 8 Jessie)
 sudo apt-get install php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
-# Main components (for Ubuntu >= 16.04)
-sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-sqlite3 php-xml
+# Main components (for Ubuntu >= 16.04, Debian >= 9 Stretch)
+sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-mbstring php-sqlite3 php-xml php-zip
 # Restart Web server
 sudo service apache2 restart
 
-- 
cgit v1.2.3


From c25fdbcc0990b637e305665a456e52e1aa3dec0a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 23 Aug 2016 00:02:54 +0200
Subject: More PostgreSQL

---
 app/Models/EntryDAO.php       |  75 ++++++++++++++---------
 app/Models/EntryDAOPGSQL.php  |  79 +++---------------------
 app/Models/EntryDAOSQLite.php |   4 ++
 app/SQL/install.sql.pgsql.php | 136 +++++++++++++++++-------------------------
 app/install.php               |  26 ++------
 lib/Minz/ModelPdo.php         |  29 +++++----
 6 files changed, 138 insertions(+), 211 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 3a1dc1ba5..8d136cd6c 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -10,6 +10,14 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return parent::$sharedDbType !== 'sqlite';
 	}
 
+	public function sqlHexDecode($x) {
+		return 'X' . $x;
+	}
+
+	public function sqlHexEncode($x) {
+		return 'hex(' . $x . ')';
+	}
+
 	protected function addColumn($name) {
 		Minz_Log::warning('FreshRSS_EntryDAO::addColumn: ' . $name);
 		$hasTransaction = false;
@@ -106,31 +114,42 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$sql = 'INSERT INTO `' . $this->prefix . 'entry` (id, guid, title, author, '
 			     . ($this->isCompressed() ? 'content_bin' : 'content')
 			     . ', link, date, lastSeen, hash, is_read, is_favorite, id_feed, tags) '
-			     . 'VALUES(?, ?, ?, ?, '
-			     . ($this->isCompressed() ? 'COMPRESS(?)' : '?')
-			     . ', ?, ?, ?, '
-			     . ($this->hasNativeHex() ? 'X?' : '?')
-			     . ', ?, ?, ?, ?)';
+			     . 'VALUES(:id, :guid, :title, :author, '
+			     . ($this->isCompressed() ? 'COMPRESS(:content)' : ':content')
+			     . ', :link, :date, :last_seen, '
+			     . $this->sqlHexDecode(':hash')
+			     . ', :is_read, :is_favorite, :id_feed, :tags)';
 			$this->addEntryPrepared = $this->bd->prepare($sql);
 		}
+		$this->addEntryPrepared->bindParam(':id', $valuesTmp['id']);
+		$valuesTmp['guid'] = substr($valuesTmp['guid'], 0, 760);
+		$this->addEntryPrepared->bindParam(':guid', $valuesTmp['guid']);
+		$valuesTmp['title'] = substr($valuesTmp['title'], 0, 255);
+		$this->addEntryPrepared->bindParam(':title', $valuesTmp['title']);
+		$valuesTmp['author'] = substr($valuesTmp['author'], 0, 255);
+		$this->addEntryPrepared->bindParam(':author', $valuesTmp['author']);
+		$this->addEntryPrepared->bindParam(':content', $valuesTmp['content']);
+		$valuesTmp['link'] = substr($valuesTmp['link'], 0, 1023);
+		$this->addEntryPrepared->bindParam(':link', $valuesTmp['link']);
+		$this->addEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
+		$valuesTmp['lastSeen'] = time();
+		$this->addEntryPrepared->bindParam(':last_seen', $valuesTmp['lastSeen'], PDO::PARAM_INT);
+		$valuesTmp['is_read'] = $valuesTmp['is_read'] ? 1 : 0;
+		$this->addEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'], PDO::PARAM_INT);
+		$valuesTmp['is_favorite'] = $valuesTmp['is_favorite'] ? 1 : 0;
+		$this->addEntryPrepared->bindParam(':is_favorite', $valuesTmp['is_favorite'], PDO::PARAM_INT);
+		$this->addEntryPrepared->bindParam(':id_feed', $valuesTmp['id_feed'], PDO::PARAM_INT);
+		$valuesTmp['tags'] = substr($valuesTmp['tags'], 0, 1023);
+		$this->addEntryPrepared->bindParam(':tags', $valuesTmp['tags']);
+
+		if ($this->hasNativeHex()) {
+			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hash']);
+		} else {
+			$valuesTmp['hashBin'] = pack('H*', $valuesTmp['hash']);
+			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hashBin']);	// X'09AF' hexadecimal literals do not work with SQLite/PDO	//hex2bin() is PHP5.4+
+		}
 
-		$values = array(
-			$valuesTmp['id'],
-			substr($valuesTmp['guid'], 0, 760),
-			substr($valuesTmp['title'], 0, 255),
-			substr($valuesTmp['author'], 0, 255),
-			$valuesTmp['content'],
-			substr($valuesTmp['link'], 0, 1023),
-			$valuesTmp['date'],
-			time(),
-			$this->hasNativeHex() ? $valuesTmp['hash'] : pack('H*', $valuesTmp['hash']),	// X'09AF' hexadecimal literals do not work with SQLite/PDO	//hex2bin() is PHP5.4+
-			$valuesTmp['is_read'] ? 1 : 0,
-			$valuesTmp['is_favorite'] ? 1 : 0,
-			$valuesTmp['id_feed'],
-			substr($valuesTmp['tags'], 0, 1023),
-		);
-
-		if ($this->addEntryPrepared && $this->addEntryPrepared->execute($values)) {
+		if ($this->addEntryPrepared && $this->addEntryPrepared->execute()) {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $this->addEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->addEntryPrepared->errorInfo();
@@ -156,7 +175,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			     . 'SET title=?, author=?, '
 			     . ($this->isCompressed() ? 'content_bin=COMPRESS(?)' : 'content=?')
 			     . ', link=?, date=?, lastSeen=?, hash='
-			     . ($this->hasNativeHex() ? 'X?' : '?')
+			     . ($this->hasNativeHex() ? 'X?' : '?')	//TODO PostgreSQL
 			     . ', ' . ($valuesTmp['is_read'] === null ? '' : 'is_read=?, ')
 			     . 'tags=? '
 			     . 'WHERE id_feed=? AND guid=?';
@@ -430,12 +449,12 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 		$this->bd->beginTransaction();
 
-		$sql = 'UPDATE `' . $this->prefix . 'entry` e '
-			 . 'SET e.is_read=1 '
-			 . 'WHERE e.id_feed=? AND e.is_read=0 AND e.id <= ?';
+		$sql = 'UPDATE `' . $this->prefix . 'entry` '
+			 . 'SET is_read=1 '
+			 . 'WHERE id_feed=? AND is_read=0 AND id <= ?';
 		$values = array($id_feed, $idMax);
 
-		list($searchValues, $search) = $this->sqlListEntriesWhere('e.', $filter, $state);
+		list($searchValues, $search) = $this->sqlListEntriesWhere('', $filter, $state);
 
 		$stm = $this->bd->prepare($sql . $search);
 		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
@@ -658,7 +677,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if (count($guids) < 1) {
 			return array();
 		}
-		$sql = 'SELECT guid, hex(hash) AS hexHash FROM `' . $this->prefix . 'entry` WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
+		$sql = 'SELECT guid, ' . $this->sqlHexEncode('hash') . ' AS hexHash FROM `' . $this->prefix . 'entry` WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
 		$stm = $this->bd->prepare($sql);
 		$values = array($id_feed);
 		$values = array_merge($values, $guids);
diff --git a/app/Models/EntryDAOPGSQL.php b/app/Models/EntryDAOPGSQL.php
index 95c12ff5d..b96a62ebc 100644
--- a/app/Models/EntryDAOPGSQL.php
+++ b/app/Models/EntryDAOPGSQL.php
@@ -1,82 +1,21 @@
 <?php
 
-class FreshRSS_EntryDAOPGSQL extends FreshRSS_EntryDAO {
+class FreshRSS_EntryDAOPGSQL extends FreshRSS_EntryDAOSQLite {
 
-	protected function addColumn($name) {
-		return false;
-	}
-
-	protected function updateCacheUnreads($catId = false, $feedId = false) {
-		return true;	//done via triggers
+	public function sqlHexDecode($x) {
+		return 'decode(' . $x . ", 'hex')";
 	}
 
-	/**
-	 * 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 feed ID
-	 * @param integer $idMax fail safe article ID
-	 * @return integer affected rows
-	 */
-	public function markReadFeed($id_feed, $idMax = 0) {
-		if ($idMax == 0) {
-			$idMax = time() . '000000';
-			Minz_Log::debug('Calling markReadFeed(0) is deprecated!');
-		}
-		$this->bd->beginTransaction();
-
-		$sql = 'UPDATE "' . $this->prefix . 'entry" '
-			 . 'SET is_read=:is_read '
-			 . 'WHERE id_feed=:id_feed AND NOT is_read AND id <= :idmax';
-		$values = array($id_feed, $idMax);
-		$stm = $this->bd->prepare($sql);
-		$stm->bindValue(':is_read', true, PDO::PARAM_BOOL);
-		$stm->bindValue(':id_feed', $id_feed);
-		$stm->bindValue(':idmax', $idMax);
-
-		if (!($stm && $stm->execute())) {
-			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::error('SQL error markReadFeed: ' . $info[2]);
-			$this->bd->rollBack();
-			return false;
-		}
-		$affected = $stm->rowCount();
-
-		$this->bd->commit();
-		return $affected;
+	public function sqlHexEncode($x) {
+		return 'encode(' . $x . ", 'hex')";
 	}
 
-	public function listHashForFeedGuids($id_feed, $guids) {
-		if (count($guids) < 1) {
-			return array();
-		}
-		$sql = 'SELECT guid, hash AS hexHash FROM "' . $this->prefix . 'entry" WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
-		$stm = $this->bd->prepare($sql);
-		$values = array($id_feed);
-		$values = array_merge($values, $guids);
-		if ($stm && $stm->execute($values)) {
-			$result = array();
-			$rows = $stm->fetchAll(PDO::FETCH_ASSOC);
-			foreach ($rows as $row) {
-				$result[$row['guid']] = $row['hexHash'];
-			}
-			return $result;
-		} else {
-			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
-			if ($this->autoAddColumn($info)) {
-				return $this->listHashForFeedGuids($id_feed, $guids);
-			}
-			Minz_Log::error('SQL error listHashForFeedGuids: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while querying feed ' . $id_feed);
-			return false;
-		}
+	protected function autoUpdateDb($errorInfo) {
+		return false;
 	}
 
-	public function optimizeTable() {
-		return null;
+	protected function addColumn($name) {
+		return false;
 	}
 
 	public function size($all = true) {
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index dad34a93d..80dbcca6b 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -2,6 +2,10 @@
 
 class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 
+	public function sqlHexDecode($x) {
+		return $x;
+	}
+
 	protected function autoUpdateDb($errorInfo) {
 		if (empty($errorInfo[0]) || $errorInfo[0] == '42S22') {	//ER_BAD_FIELD_ERROR
 			//autoAddColumn
diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index 0f243bdb5..04e35af68 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -1,91 +1,65 @@
 <?php
-define('SQL_CREATE_TABLES', '
-CREATE TABLE IF NOT EXISTS "%1$scategory" (
-	id SERIAL PRIMARY KEY,
-	name varchar(255) UNIQUE NOT NULL
-)
+define('SQL_CREATE_DB', 'CREATE DATABASE %1$s ENCODING \'UTF8\';');
 
-CREATE TABLE IF NOT EXISTS "%1$sfeed" (
-	id SERIAL PRIMARY KEY,
-	url varchar(511) UNIQUE NOT NULL,
-	category SMALLINT DEFAULT 0,
-	name varchar(255) NOT NULL,
-	website varchar(255),
-	description text,
-	lastUpdate int DEFAULT 0,
-	priority smallint NOT NULL DEFAULT 10,
-	pathEntries varchar(511) DEFAULT NULL,
-	httpAuth varchar(511) DEFAULT NULL,
-	error boolean DEFAULT FALSE,
-	keep_history INT NOT NULL DEFAULT -2,
-	ttl INT NOT NULL DEFAULT -2,
-	cache_nbEntries int DEFAULT 0,
-	cache_nbUnreads int DEFAULT 0,
-	FOREIGN KEY (category) REFERENCES "%1$scategory" (id) ON DELETE SET NULL ON UPDATE CASCADE
-)
-CREATE INDEX name_index ON "%1$sfeed" (name)
-CREATE INDEX priority_index ON "%1$sfeed" (priority)
-CREATE INDEX keep_history_index ON "%1$sfeed" (keep_history)
+global $SQL_CREATE_TABLES;
+$SQL_CREATE_TABLES = array(
+'CREATE TABLE IF NOT EXISTS "%1$scategory" (
+	"id" SERIAL PRIMARY KEY,
+	"name" varchar(255) UNIQUE NOT NULL
+);',
 
-CREATE TABLE IF NOT EXISTS "%1$sentry" (
-	id bigint NOT NULL PRIMARY KEY,
-	guid varchar(760) UNIQUE NOT NULL,
-	title varchar(255) NOT NULL,
-	author varchar(255),
-	content_bin text,
-	link varchar(1023) NOT NULL,
-	date INT,
-	lastSeen INT DEFAULT 0,
-	hash BYTEA,
-	is_read boolean NOT NULL DEFAULT false,
-	is_favorite boolean NOT NULL DEFAULT false,
-	id_feed SMALLINT,
-	tags varchar(1023),
-	FOREIGN KEY (id_feed) REFERENCES "%1$sfeed" (id) ON DELETE CASCADE ON UPDATE CASCADE
-)
-CREATE INDEX is_favorite_index ON "%1$sentry" (is_favorite)
-CREATE INDEX is_read_index ON "%1$sentry" (is_read)
-CREATE INDEX entry_lastSeen_index ON "%1$sentry" (lastSeen)
-
-CREATE OR REPLACE FUNCTION update_unread_feed() RETURNS TRIGGER AS $$
-	BEGIN
-		UPDATE "%1$sfeed" 
-			SET cache_nbUnreads=(SELECT COUNT(*) FROM "%1$sentry" WHERE id_feed=OLD.id_feed AND NOT is_read)
-			WHERE id=OLD.id_feed;
-		return NULL;
-	end;
-	$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER update_unread_feed
-	AFTER UPDATE OF is_read OR DELETE OR INSERT ON "%1$sentry"
-	FOR EACH ROW
-	EXECUTE PROCEDURE update_unread_feed();
+'CREATE TABLE IF NOT EXISTS "%1$sfeed" (
+	"id" SERIAL PRIMARY KEY,
+	"url" varchar(511) UNIQUE NOT NULL,
+	"category" SMALLINT DEFAULT 0,
+	"name" varchar(255) NOT NULL,
+	"website" varchar(255),
+	"description" text,
+	"lastUpdate" int DEFAULT 0,
+	"priority" smallint NOT NULL DEFAULT 10,
+	"pathEntries" varchar(511) DEFAULT NULL,
+	"httpAuth" varchar(511) DEFAULT NULL,
+	"error" smallint DEFAULT 0,
+	"keep_history" INT NOT NULL DEFAULT -2,
+	"ttl" INT NOT NULL DEFAULT -2,
+	"cache_nbEntries" int DEFAULT 0,
+	"cache_nbUnreads" int DEFAULT 0,
+	FOREIGN KEY (category) REFERENCES "%1$scategory" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);',
+'CREATE INDEX name_index ON "%1$sfeed" ("name");',
+'CREATE INDEX priority_index ON "%1$sfeed" ("priority");',
+'CREATE INDEX keep_history_index ON "%1$sfeed" ("keep_history");',
 
-CREATE OR REPLACE FUNCTION reset_feed_seq() RETURNS TRIGGER AS $$
-	BEGIN
-		PERFORM 1 FROM "%1$sfeed";
-		IF NOT FOUND THEN
-			ALTER SEQUENCE IF EXISTS "%1$sfeed_id_seq" RESTART;
-		END IF;
-		return NULL;
-	end;
-	$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER reset_feed_seq
-	AFTER DELETE ON "%1$sfeed"
-	FOR EACH STATEMENT
-	EXECUTE PROCEDURE reset_feed_seq();
+'CREATE TABLE IF NOT EXISTS "%1$sentry" (
+	"id" bigint NOT NULL PRIMARY KEY,
+	"guid" varchar(760) UNIQUE NOT NULL,
+	"title" varchar(255) NOT NULL,
+	"author" varchar(255),
+	"content" text,
+	"link" varchar(1023) NOT NULL,
+	"date" INT,
+	"lastSeen" INT DEFAULT 0,
+	"hash" BYTEA,
+	"is_read" smallint NOT NULL DEFAULT 0,
+	"is_favorite" smallint NOT NULL DEFAULT 0,
+	"id_feed" SMALLINT,
+	"tags" varchar(1023),
+	FOREIGN KEY (id_feed) REFERENCES "%1$sfeed" (id) ON DELETE CASCADE ON UPDATE CASCADE
+);',
+'CREATE INDEX is_favorite_index ON "%1$sentry" ("is_favorite");',
+'CREATE INDEX is_read_index ON "%1$sentry" ("is_read");',
+'CREATE INDEX entry_lastSeen_index ON "%1$sentry" ("lastSeen");',
 
 
-CREATE OR REPLACE RULE check_constraints_on_entry AS ON INSERT TO "%1$sentry" WHERE EXISTS(SELECT 1 FROM "%1$sentry" WHERE guid=NEW.guid) DO INSTEAD NOTHING;
-CREATE OR REPLACE RULE check_constraints_on_feed AS ON INSERT TO "%1$sfeed" WHERE EXISTS(SELECT 1 FROM "%1$sfeed" WHERE url=NEW.url) DO INSTEAD NOTHING;
-CREATE OR REPLACE RULE check_constraints_on_category AS ON INSERT TO "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;
-CREATE OR REPLACE RULE check_constraints_on_category as on update to "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;
+'CREATE OR REPLACE RULE check_constraints_on_entry AS ON INSERT TO "%1$sentry" WHERE EXISTS(SELECT 1 FROM "%1$sentry" WHERE guid=NEW.guid) DO INSTEAD NOTHING;',
+'CREATE OR REPLACE RULE check_constraints_on_feed AS ON INSERT TO "%1$sfeed" WHERE EXISTS(SELECT 1 FROM "%1$sfeed" WHERE url=NEW.url) DO INSTEAD NOTHING;',
+'CREATE OR REPLACE RULE check_constraints_on_category AS ON INSERT TO "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;',
+'CREATE OR REPLACE RULE check_constraints_on_category as on update to "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;',
 
 
-INSERT IGNORE INTO "%1$scategory" (id, name) VALUES(1, "%2$s");
-INSERT IGNORE INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);
-INSERT IGNORE INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS @ GitHub", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);
-');
+'INSERT INTO "%1$scategory" (id, name) VALUES(1, \'%2$s\');',
+'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400);',
+'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400);',
+);
 
 define('SQL_DROP_TABLES', 'DROP TABLES "%1$sentry", "%1$sfeed", "%1$scategory"');
diff --git a/app/install.php b/app/install.php
index 6e902485c..db16ca6b1 100644
--- a/app/install.php
+++ b/app/install.php
@@ -200,6 +200,9 @@ function saveStep3() {
 			$_SESSION['bd_prefix'] = substr($_POST['prefix'], 0, 16);
 			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] . (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_'));
 		}
+		if ($_SESSION['bd_type'] === 'pgsql') {
+			$_SESSION['bd_base'] = strtolower($_SESSION['bd_base']);
+		}
 
 		// We use dirname to remove the /i part
 		$base_url = dirname(Minz_Request::guessBaseUrl());
@@ -236,26 +239,6 @@ function saveStep3() {
 	invalidateHttpCache();
 }
 
-function newPdo() {
-	switch ($_SESSION['bd_type']) {
-	case 'mysql':
-		$str = 'mysql:host=' . $_SESSION['bd_host'] . ';dbname=' . $_SESSION['bd_base'];
-		$driver_options = array(
-			PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
-		);
-		break;
-	case 'sqlite':
-		$str = 'sqlite:' . join_path(USERS_PATH, $_SESSION['default_user'], 'db.sqlite');
-		$driver_options = array(
-			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-		);
-		break;
-	default:
-		return false;
-	}
-	return new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
-}
-
 function deleteInstall() {
 	$res = unlink(join_path(DATA_PATH, 'do-install.txt'));
 
@@ -444,11 +427,12 @@ function checkBD() {
 			);
 
 			try {	// on ouvre une connexion juste pour créer la base si elle n'existe pas
-				$str = 'pgsql:host=' . $_SESSION['bd_host'] . ';';
+				$str = 'pgsql:host=' . $_SESSION['bd_host'] . ';dbname=postgres';
 				$c = new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
 				$sql = sprintf(SQL_CREATE_DB, $_SESSION['bd_base']);
 				$res = $c->query($sql);
 			} catch (PDOException $e) {
+				syslog(LOG_DEBUG, 'pgsql ' . $e->getMessage());
 			}
 
 			// on écrase la précédente connexion en sélectionnant la nouvelle BDD
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index b98a26d06..41a9f60bf 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -60,17 +60,17 @@ class Minz_ModelPdo {
 					$string = 'mysql:host=' . $db['host'] . ';dbname=' . $db['base'] . ';charset=utf8mb4';
 					$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8mb4';
 					$this->prefix = $db['prefix'] . $currentUser . '_';
-					$this->bd = new MinzPDO($string, $db['user'], $db['password'], $driver_options);
+					$this->bd = new MinzPDOMySql($string, $db['user'], $db['password'], $driver_options);
 					//TODO Consider: $this->bd->exec("SET SESSION sql_mode = 'ANSI_QUOTES';");
 					break;
 				case 'sqlite':
 					$string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite');
 					$this->prefix = '';
-					$this->bd = new MinzPDO($string, $db['user'], $db['password'], $driver_options);
+					$this->bd = new MinzPDOMSQLite($string, $db['user'], $db['password'], $driver_options);
 					$this->bd->exec('PRAGMA foreign_keys = ON;');
 					break;
 				case 'pgsql':
-					$string = 'pgsql:host=' . $db['host'] . ';dbname=' . $db['base'] . ';charset=utf8';
+					$string = 'pgsql:host=' . $db['host'] . ';dbname=' . $db['base'];
 					$this->prefix = $db['prefix'] . $currentUser . '_';
 					$this->bd = new MinzPDOPGSQL($string, $db['user'], $db['password'], $driver_options);
 					$this->bd->exec("SET NAMES 'UTF8';");
@@ -125,33 +125,40 @@ class MinzPDO extends PDO {
 
 	public function prepare($statement, $driver_options = array()) {
 		MinzPDO::check($statement);
-		$statement = MinzPDO::compatibility($statement);
+		$statement = $this->compatibility($statement);
 		return parent::prepare($statement, $driver_options);
 	}
 
 	public function exec($statement) {
 		MinzPDO::check($statement);
-		$statement = MinzPDO::compatibility($statement);
+		$statement = $this->compatibility($statement);
 		return parent::exec($statement);
 	}
 
 	public function query($statement) {
 		MinzPDO::check($statement);
-		$statement = MinzPDO::compatibility($statement);
+		$statement = $this->compatibility($statement);
 		return parent::query($statement);
 	}
+}
 
+class MinzPDOMySql extends PDO {
 	public function lastInsertId($name = null) {
 		return parent::lastInsertId();	//We discard the name, only used by PostgreSQL
 	}
 }
 
-class MinzPDOPGSQL extends MinzPDO {
-	protected function compatibility($statement) {
-		return str_replace(array('`', " X'"), array('"', " E'\\x"), $statement);
+class MinzPDOMSQLite extends PDO {
+	public function lastInsertId($name = null) {
+		return parent::lastInsertId();	//We discard the name, only used by PostgreSQL
 	}
+}
 
-	public function lastInsertId($name = null) {
-		return parent::lastInsertId($name);
+class MinzPDOPGSQL extends MinzPDO {
+	protected function compatibility($statement) {
+		return str_replace(
+			array('`', 'lastUpdate', 'pathEntries', 'httpAuth', 'cache_nbEntries', 'cache_nbUnreads', 'lastSeen'),
+			array('"', '"lastUpdate"', '"pathEntries"', '"httpAuth"', '"cache_nbEntries"', '"cache_nbUnreads"', '"lastSeen"'),
+			$statement);
 	}
 }
-- 
cgit v1.2.3


From 961407b4e0546dd38a696a650898fcefbe2d6c8c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Aug 2016 13:36:11 +0200
Subject: Variable initialization

PHP warning when not feed is iddle
https://github.com/FreshRSS/FreshRSS/issues/1227#issuecomment-242702464
---
 app/Models/StatsDAO.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 5ca333396..4f83ff577 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -168,6 +168,7 @@ SQL;
 		$stm->execute();
 		$res = $stm->fetchAll(PDO::FETCH_NAMED);
 
+		$repartition = array();
 		foreach ($res as $value) {
 			$repartition[(int) $value['period']] = (int) $value['count'];
 		}
-- 
cgit v1.2.3


From 1a0f11ee3862d54b561185d9db3ff1f1a3947fff Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Aug 2016 13:57:18 +0200
Subject: PSHB base_url bug

https://github.com/FreshRSS/FreshRSS/issues/1227
Bug if base_url does not end with /
---
 app/Models/Feed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 986cc5015..9855ca742 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -446,7 +446,7 @@ class FreshRSS_Feed extends Minz_Model {
 				Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url);
 				return false;
 			}
-			$callbackUrl = checkUrl(FreshRSS_Context::$system_conf->base_url . 'api/pshb.php?k=' . $hubJson['key']);
+			$callbackUrl = checkUrl(Minz_Request::getBaseUrl() . '/api/pshb.php?k=' . $hubJson['key']);
 			if ($callbackUrl == '') {
 				Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url);
 				return false;
-- 
cgit v1.2.3


From 67ca4a9ac610efc889dc7ca8f500b25a1cb3f378 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Aug 2016 14:00:06 +0200
Subject: Changelog PSHB callback

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8fccae3f..93d3dcd3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 	* Fixed JavaScript bug when articles were not always marked as read [#1123](https://github.com/FreshRSS/FreshRSS/issues/1123)
 	* Fixed Apache Etag issue that prevented caching [#1199](https://github.com/FreshRSS/FreshRSS/pull/1199)
 	* Fixed OPML import of categories [#1202](https://github.com/FreshRSS/FreshRSS/issues/1202)
+	* Fixed PubSubHubbub callback address bug on some configurations [1229](https://github.com/FreshRSS/FreshRSS/pull/1229)
 * UI
 	* Use sticky category column [#1172](https://github.com/FreshRSS/FreshRSS/pull/1172)
 	* Updated to jQuery 3.1.0 and several JavaScript fixes (e.g. drag & drop) [#1197](https://github.com/FreshRSS/FreshRSS/pull/1197)
-- 
cgit v1.2.3


From ccecebc2b467ae381a2364a70ae2a916bdcf22be Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Aug 2016 16:35:54 +0200
Subject: SimplePie error message XML PCRE

https://github.com/FreshRSS/FreshRSS/issues/1227
---
 app/Models/Feed.php         | 2 +-
 lib/SimplePie/SimplePie.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 9855ca742..6104b1e31 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -241,7 +241,7 @@ class FreshRSS_Feed extends Minz_Model {
 
 				if ((!$mtime) || $feed->error()) {
 					$errorMessage = $feed->error();
-					throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Feed error' : $errorMessage) . ' [' . $url . ']');
+					throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Unknown error for feed' : $errorMessage) . ' [' . $url . ']');
 				}
 
 				$links = $feed->get_links('self');
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 8af55c9fd..8026fb149 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1304,6 +1304,7 @@ class SimplePie
 		// Check absolute bare minimum requirements.
 		if (!extension_loaded('xml') || !extension_loaded('pcre'))
 		{
+			$this->error = 'XML and PCRE extensions not loaded!';
 			return false;
 		}
 		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
-- 
cgit v1.2.3


From 531f6ada99958553983c258fae444382efa18804 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Aug 2016 16:37:35 +0200
Subject: SimplePie better message

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

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 8026fb149..0f2fdbb87 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1304,7 +1304,7 @@ class SimplePie
 		// Check absolute bare minimum requirements.
 		if (!extension_loaded('xml') || !extension_loaded('pcre'))
 		{
-			$this->error = 'XML and PCRE extensions not loaded!';
+			$this->error = 'XML or PCRE extensions not loaded!';
 			return false;
 		}
 		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
-- 
cgit v1.2.3


From 1a53058ef0887df6dfb91ae269ef76ee5d3f9a31 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Mon, 29 Aug 2016 09:44:18 +0200
Subject: HTTP security: prevent reflection abuse

https://msdn.microsoft.com/en-us/library/gg622941(v=vs.85).aspx
---
 p/api/pshb.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/p/api/pshb.php b/p/api/pshb.php
index 136b98fc9..650767114 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -5,6 +5,7 @@ require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 define('MAX_PAYLOAD', 3145728);
 
 header('Content-Type: text/plain; charset=UTF-8');
+header('X-Content-Type-Options: nosniff');
 
 function logMe($text) {
 	file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
-- 
cgit v1.2.3


From d552703f67da5568a5e826bc453f572e03d081cd Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 29 Aug 2016 19:46:41 +0200
Subject: Release version 1.5.0

---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93d3dcd3b..e8a06eac0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-08-XX FreshRSS 1.5.0-dev
+## 2016-08-29 FreshRSS 1.5.0
 
 * Compatibility
 	* Require at least MySQL 5.5.3+ [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
diff --git a/constants.php b/constants.php
index 8a6ce8a66..80a22c8f0 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.5.0-dev');
+define('FRESHRSS_VERSION', '1.5.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 57705c679b56b0f9eb5c343fd24f15fc80926b5b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 31 Aug 2016 15:56:07 +0200
Subject: Start 1.6.0-dev

---
 CHANGELOG.md  | 3 +++
 constants.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8a06eac0..1002873d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2016-XX-XX FreshRSS 1.6.0-dev
+
+
 ## 2016-08-29 FreshRSS 1.5.0
 
 * Compatibility
diff --git a/constants.php b/constants.php
index 80a22c8f0..2a8486ad1 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.5.0');
+define('FRESHRSS_VERSION', '1.6.0-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 0f1bc956d4f301e61618cff2dd5bfcac1532067f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 31 Aug 2016 21:23:09 +0200
Subject: MinzPDO inheritance

---
 lib/Minz/ModelPdo.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 41a9f60bf..93a22fc3d 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -142,13 +142,13 @@ class MinzPDO extends PDO {
 	}
 }
 
-class MinzPDOMySql extends PDO {
+class MinzPDOMySql extends MinzPDO {
 	public function lastInsertId($name = null) {
 		return parent::lastInsertId();	//We discard the name, only used by PostgreSQL
 	}
 }
 
-class MinzPDOMSQLite extends PDO {
+class MinzPDOMSQLite extends MinzPDO {
 	public function lastInsertId($name = null) {
 		return parent::lastInsertId();	//We discard the name, only used by PostgreSQL
 	}
-- 
cgit v1.2.3


From f66be86e41d89214688a28243b412ffa43ce500d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 31 Aug 2016 21:47:12 +0200
Subject: Quoted upper-cases instead of string replace

---
 app/Models/CategoryDAO.php    |  2 +-
 app/Models/EntryDAO.php       | 14 +++++++-------
 app/Models/EntryDAOSQLite.php |  4 ++--
 app/Models/FeedDAO.php        | 22 +++++++++++-----------
 app/Models/FeedDAOSQLite.php  |  4 ++--
 lib/Minz/ModelPdo.php         |  5 +----
 6 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 3b1519c20..1dab60ea9 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -100,7 +100,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 	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 ')
+			     . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.website, f.priority, f.error, f.`cache_nbEntries`, f.`cache_nbUnreads` ')
 			     . 'FROM `' . $this->prefix . 'category` c '
 			     . 'LEFT OUTER JOIN `' . $this->prefix . 'feed` f ON f.category=c.id '
 			     . 'GROUP BY f.id, c_id '
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 8d136cd6c..d39f0237c 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -28,7 +28,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 					$this->bd->beginTransaction();
 					$hasTransaction = true;
 				}
-				$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN lastSeen INT(11) DEFAULT 0');
+				$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN `lastSeen` INT(11) DEFAULT 0');
 				if ($stm && $stm->execute()) {
 					$stm = $this->bd->prepare('CREATE INDEX entry_lastSeen_index ON `' . $this->prefix . 'entry`(`lastSeen`);');	//"IF NOT EXISTS" does not exist in MySQL 5.7
 					if ($stm && $stm->execute()) {
@@ -113,7 +113,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if ($this->addEntryPrepared === null) {
 			$sql = 'INSERT INTO `' . $this->prefix . 'entry` (id, guid, title, author, '
 			     . ($this->isCompressed() ? 'content_bin' : 'content')
-			     . ', link, date, lastSeen, hash, is_read, is_favorite, id_feed, tags) '
+			     . ', link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags) '
 			     . 'VALUES(:id, :guid, :title, :author, '
 			     . ($this->isCompressed() ? 'COMPRESS(:content)' : ':content')
 			     . ', :link, :date, :last_seen, '
@@ -174,7 +174,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$sql = 'UPDATE `' . $this->prefix . 'entry` '
 			     . 'SET title=?, author=?, '
 			     . ($this->isCompressed() ? 'content_bin=COMPRESS(?)' : 'content=?')
-			     . ', link=?, date=?, lastSeen=?, hash='
+			     . ', link=?, date=?, `lastSeen`=?, hash='
 			     . ($this->hasNativeHex() ? 'X?' : '?')	//TODO PostgreSQL
 			     . ', ' . ($valuesTmp['is_read'] === null ? '' : 'is_read=?, ')
 			     . 'tags=? '
@@ -265,7 +265,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		 .	'WHERE e.is_read=0 '
 		 .	'GROUP BY e.id_feed'
 		 . ') x ON x.id_feed=f.id '
-		 . 'SET f.cache_nbUnreads=COALESCE(x.nbUnreads, 0) '
+		 . 'SET f.`cache_nbUnreads`=COALESCE(x.nbUnreads, 0) '
 		 . 'WHERE 1';
 		$values = array();
 		if ($feedId !== false) {
@@ -328,7 +328,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		} else {
 			$sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id '
 				 . 'SET e.is_read=?,'
-				 . 'f.cache_nbUnreads=f.cache_nbUnreads' . ($is_read ? '-' : '+') . '1 '
+				 . 'f.`cache_nbUnreads`=f.`cache_nbUnreads`' . ($is_read ? '-' : '+') . '1 '
 				 . 'WHERE e.id=? AND e.is_read=?';
 			$values = array($is_read ? 1 : 0, $ids, $is_read ? 0 : 1);
 			$stm = $this->bd->prepare($sql);
@@ -467,7 +467,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 		if ($affected > 0) {
 			$sql = 'UPDATE `' . $this->prefix . 'feed` '
-				 . 'SET cache_nbUnreads=cache_nbUnreads-' . $affected
+				 . 'SET `cache_nbUnreads`=`cache_nbUnreads`-' . $affected
 				 . ' WHERE id=?';
 			$values = array($id_feed);
 			$stm = $this->bd->prepare($sql);
@@ -703,7 +703,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if (count($guids) < 1) {
 			return 0;
 		}
-		$sql = 'UPDATE `' . $this->prefix . 'entry` SET lastSeen=? WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
+		$sql = 'UPDATE `' . $this->prefix . 'entry` SET `lastSeen`=? WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
 		$stm = $this->bd->prepare($sql);
 		$values = array(time(), $id_feed);
 		$values = array_merge($values, $guids);
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index 80dbcca6b..fd5d25bf6 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -28,7 +28,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 
 	protected function updateCacheUnreads($catId = false, $feedId = false) {
 		$sql = 'UPDATE `' . $this->prefix . 'feed` '
-		 . 'SET cache_nbUnreads=('
+		 . 'SET `cache_nbUnreads`=('
 		 .	'SELECT COUNT(*) AS nbUnreads FROM `' . $this->prefix . 'entry` e '
 		 .	'WHERE e.id_feed=`' . $this->prefix . 'feed`.id AND e.is_read=0) '
 		 . 'WHERE 1';
@@ -86,7 +86,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 			}
 			$affected = $stm->rowCount();
 			if ($affected > 0) {
-				$sql = 'UPDATE `' . $this->prefix . 'feed` SET cache_nbUnreads=cache_nbUnreads' . ($is_read ? '-' : '+') . '1 '
+				$sql = 'UPDATE `' . $this->prefix . 'feed` SET `cache_nbUnreads`=`cache_nbUnreads`' . ($is_read ? '-' : '+') . '1 '
 				 . 'WHERE id=(SELECT e.id_feed FROM `' . $this->prefix . 'entry` e WHERE e.id=?)';
 				$values = array($ids);
 				$stm = $this->bd->prepare($sql);
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index ce65ed8b1..6e6d8857b 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -2,7 +2,7 @@
 
 class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	public function addFeed($valuesTmp) {
-		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history, ttl) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2, -2)';
+		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, `lastUpdate`, priority, `httpAuth`, error, keep_history, ttl) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2, -2)';
 		$stm = $this->bd->prepare($sql);
 
 		$values = array(
@@ -85,13 +85,13 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	public function updateLastUpdate($id, $inError = 0, $updateCache = true) {
 		if ($updateCache) {
 			$sql = 'UPDATE `' . $this->prefix . 'feed` '	//2 sub-requests with FOREIGN KEY(e.id_feed), INDEX(e.is_read) faster than 1 request with GROUP BY or CASE
-			     . 'SET cache_nbEntries=(SELECT COUNT(e1.id) FROM `' . $this->prefix . 'entry` e1 WHERE e1.id_feed=`' . $this->prefix . 'feed`.id),'
-			     . 'cache_nbUnreads=(SELECT COUNT(e2.id) FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=`' . $this->prefix . 'feed`.id AND e2.is_read=0),'
-			     . 'lastUpdate=?, error=? '
+			     . 'SET `cache_nbEntries`=(SELECT COUNT(e1.id) FROM `' . $this->prefix . 'entry` e1 WHERE e1.id_feed=`' . $this->prefix . 'feed`.id),'
+			     . '`cache_nbUnreads`=(SELECT COUNT(e2.id) FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=`' . $this->prefix . 'feed`.id AND e2.is_read=0),'
+			     . '`lastUpdate`=?, error=? '
 			     . 'WHERE id=?';
 		} else {
 			$sql = 'UPDATE `' . $this->prefix . 'feed` '
-			     . 'SET lastUpdate=?, error=? '
+			     . 'SET `lastUpdate`=?, error=? '
 			     . 'WHERE id=?';
 		}
 
@@ -226,10 +226,10 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if ($defaultCacheDuration < 0) {
 			$defaultCacheDuration = 2147483647;
 		}
-		$sql = 'SELECT id, url, name, website, lastUpdate, pathEntries, httpAuth, keep_history, ttl '
+		$sql = 'SELECT id, url, name, website, `lastUpdate`, `pathEntries`, `httpAuth`, keep_history, ttl '
 		     . 'FROM `' . $this->prefix . 'feed` '
-		     . 'WHERE ttl <> -1 AND lastUpdate < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) '
-		     . 'ORDER BY lastUpdate';
+		     . 'WHERE ttl <> -1 AND `lastUpdate` < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) '
+		     . 'ORDER BY `lastUpdate`';
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute())) {
 			$sql2 = 'ALTER TABLE `' . $this->prefix . 'feed` ADD COLUMN ttl INT NOT NULL DEFAULT -2';	//v0.7.3
@@ -282,7 +282,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		     .	'FROM `' . $this->prefix . 'entry` e '
 		     .	'GROUP BY e.id_feed'
 		     . ') x ON x.id_feed=f.id '
-		     . 'SET f.cache_nbEntries=x.nbEntries, f.cache_nbUnreads=x.nbUnreads';
+		     . 'SET f.`cache_nbEntries`=x.nbEntries, f.`cache_nbUnreads`=x.nbUnreads';
 		$stm = $this->bd->prepare($sql);
 
 		if ($stm && $stm->execute()) {
@@ -308,7 +308,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$affected = $stm->rowCount();
 
 		$sql = 'UPDATE `' . $this->prefix . 'feed` '
-			 . 'SET cache_nbEntries=0, cache_nbUnreads=0 WHERE id=?';
+			 . 'SET `cache_nbEntries`=0, `cache_nbUnreads`=0 WHERE id=?';
 		$values = array($id);
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute($values))) {
@@ -326,7 +326,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$sql = 'DELETE FROM `' . $this->prefix . 'entry` '
 		     . 'WHERE id_feed=:id_feed AND id<=:id_max '
 		     . 'AND is_favorite=0 '	//Do not remove favourites
-		     . 'AND lastSeen < (SELECT maxLastSeen FROM (SELECT (MAX(e3.lastSeen)-99) AS maxLastSeen FROM `' . $this->prefix . 'entry` e3 WHERE e3.id_feed=:id_feed) recent) '	//Do not remove the most newly seen articles, plus a few seconds of tolerance
+		     . 'AND `lastSeen` < (SELECT maxLastSeen FROM (SELECT (MAX(e3.`lastSeen`)-99) AS maxLastSeen FROM `' . $this->prefix . 'entry` e3 WHERE e3.id_feed=:id_feed) recent) '	//Do not remove the most newly seen articles, plus a few seconds of tolerance
 		     . 'AND id NOT IN (SELECT id FROM (SELECT e2.id FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=:id_feed ORDER BY id DESC LIMIT :keep) keep)';	//Double select: MySQL doesn't support 'LIMIT & IN/ALL/ANY/SOME subquery'
 		$stm = $this->bd->prepare($sql);
 
diff --git a/app/Models/FeedDAOSQLite.php b/app/Models/FeedDAOSQLite.php
index 7599fda53..440ae74da 100644
--- a/app/Models/FeedDAOSQLite.php
+++ b/app/Models/FeedDAOSQLite.php
@@ -4,8 +4,8 @@ class FreshRSS_FeedDAOSQLite extends FreshRSS_FeedDAO {
 
 	public function updateCachedValues() {	//For one single feed, call updateLastUpdate($id)
 		$sql = 'UPDATE `' . $this->prefix . 'feed` '
-		     . 'SET cache_nbEntries=(SELECT COUNT(e1.id) FROM `' . $this->prefix . 'entry` e1 WHERE e1.id_feed=`' . $this->prefix . 'feed`.id),'
-		     . 'cache_nbUnreads=(SELECT COUNT(e2.id) FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=`' . $this->prefix . 'feed`.id AND e2.is_read=0)';
+		     . 'SET `cache_nbEntries`=(SELECT COUNT(e1.id) FROM `' . $this->prefix . 'entry` e1 WHERE e1.id_feed=`' . $this->prefix . 'feed`.id),'
+		     . '`cache_nbUnreads`=(SELECT COUNT(e2.id) FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=`' . $this->prefix . 'feed`.id AND e2.is_read=0)';
 		$stm = $this->bd->prepare($sql);
 		if ($stm && $stm->execute()) {
 			return $stm->rowCount();
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 93a22fc3d..78b44ea7f 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -156,9 +156,6 @@ class MinzPDOMSQLite extends MinzPDO {
 
 class MinzPDOPGSQL extends MinzPDO {
 	protected function compatibility($statement) {
-		return str_replace(
-			array('`', 'lastUpdate', 'pathEntries', 'httpAuth', 'cache_nbEntries', 'cache_nbUnreads', 'lastSeen'),
-			array('"', '"lastUpdate"', '"pathEntries"', '"httpAuth"', '"cache_nbEntries"', '"cache_nbUnreads"', '"lastSeen"'),
-			$statement);
+		return str_replace('`', '"', $statement);
 	}
 }
-- 
cgit v1.2.3


From 2fa5ef354c82b036e146c178edf495bf8e08d0ee Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 3 Sep 2016 11:29:18 +0200
Subject: pdo_pgsql documentation

---
 README.fr.md            | 23 +++++++++++++++--------
 README.md               | 23 +++++++++++++++--------
 app/i18n/cz/admin.php   |  4 ++--
 app/i18n/cz/install.php |  4 ++--
 app/i18n/de/admin.php   |  4 ++--
 app/i18n/de/install.php |  4 ++--
 app/i18n/en/admin.php   |  4 ++--
 app/i18n/en/install.php |  4 ++--
 app/i18n/fr/admin.php   |  4 ++--
 app/i18n/fr/install.php |  4 ++--
 app/i18n/it/admin.php   |  4 ++--
 app/i18n/it/install.php |  4 ++--
 app/i18n/nl/admin.php   |  4 ++--
 app/i18n/nl/install.php |  4 ++--
 app/i18n/ru/admin.php   |  4 ++--
 app/i18n/ru/install.php |  4 ++--
 app/i18n/tr/admin.php   |  4 ++--
 app/i18n/tr/install.php |  4 ++--
 18 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 99de1f618..8dc0f6fec 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -33,9 +33,9 @@ Nous sommes une communauté amicale.
 	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.3.3+ (PHP 5.4+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
-	* Requis : [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl)
+	* Requis : [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite) ou [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
 	* Recommandés : [JSON](http://php.net/json), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](http://php.net/mbstring) et/ou [iconv](http://php.net/iconv) (pour conversion d’encodages), [Zip](http://php.net/zip) (pour import/export), [zlib](http://php.net/zlib) (pour les flux compressés)
-* MySQL 5.5.3+ (recommandé) ou SQLite 3.7.4+
+* MySQL 5.5.3+ (recommandé), ou SQLite 3.7.4+, ou PostgreSQL
 * Un navigateur Web récent tel Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Fonctionne aussi sur mobile
 
@@ -56,13 +56,20 @@ Nous sommes une communauté amicale.
 ```sh
 # Si vous utilisez le serveur Web Apache (sinon il faut un autre serveur Web)
 sudo apt-get install apache2
-sudo a2enmod headers expires rewrite ssl
-# (optionnel) Si vous voulez un serveur de base de données MySQL
-sudo apt-get install mysql-server mysql-client php5-mysql
-# Composants principaux (pour Ubuntu <= 15.10, Debian <= 8 Jessie)
+sudo a2enmod headers expires rewrite ssl	#Modules Apache
+
+# Pour Ubuntu <= 15.10, Debian <= 8 Jessie
 sudo apt-get install php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
-# Composants principaux (pour Ubuntu >= 16.04, Debian >= 9 Stretch)
-sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-mbstring php-sqlite3 php-xml php-zip
+sudo apt-get install libapache2-mod-php5	#Pour Apache
+sudo apt-get install mysql-server mysql-client php5-mysql	#Base de données MySQL optionnelle
+sudo apt-get install postgresql php5-pgsql	#Base de données PostgreSQL optionnelle
+
+# Pour Ubuntu >= 16.04, Debian >= 9 Stretch
+sudo apt install php php-curl php-gmp php-intl php-mbstring php-sqlite3 php-xml php-zip
+sudo apt install libapache2-mod-php	#Pour Apache
+sudo apt install mysql-server mysql-client php-mysql	#Base de données MySQL optionnelle
+sudo apt install postgresql php-pgsql	#Base de données PostgreSQL optionnelle
+
 # Redémarrage du serveur Web
 sudo service apache2 restart
 
diff --git a/README.md b/README.md
index 846652878..fc2c6fdb9 100644
--- a/README.md
+++ b/README.md
@@ -33,9 +33,9 @@ We are a friendly community.
 	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
 * PHP 5.3.3+ (PHP 5.4+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
-	* Required extensions: [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl)
+	* Required extensions: [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite) or [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
 	* Recommended extensions: [JSON](http://php.net/json), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names), [mbstring](http://php.net/mbstring) and/or [iconv](http://php.net/iconv) (for charset conversion), [Zip](http://php.net/zip) (for import/export), [zlib](http://php.net/zlib) (for compressed feeds)
-* MySQL 5.5.3+ (recommended) or SQLite 3.7.4+
+* MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL
 * A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Works on mobile
 
@@ -56,13 +56,20 @@ We are a friendly community.
 ```sh
 # If you use an Apache Web server (otherwise you need another Web server)
 sudo apt-get install apache2
-sudo a2enmod headers expires rewrite ssl
-# (Optional) If you want a MySQL database server
-sudo apt-get install mysql-server mysql-client php5-mysql
-# Main components (for Ubuntu <= 15.10, Debian <= 8 Jessie)
+sudo a2enmod headers expires rewrite ssl	#Apache modules
+
+# For Ubuntu <= 15.10, Debian <= 8 Jessie
 sudo apt-get install php5 php5-curl php5-gmp php5-intl php5-json php5-sqlite
-# Main components (for Ubuntu >= 16.04, Debian >= 9 Stretch)
-sudo apt install php libapache2-mod-php php-curl php-gmp php-intl php-mbstring php-sqlite3 php-xml php-zip
+sudo apt-get install libapache2-mod-php5	#For Apache
+sudo apt-get install mysql-server mysql-client php5-mysql	#Optional MySQL database
+sudo apt-get install postgresql php5-pgsql	#Optional PostgreSQL database
+
+# For Ubuntu >= 16.04, Debian >= 9 Stretch
+sudo apt install php php-curl php-gmp php-intl php-mbstring php-sqlite3 php-xml php-zip
+sudo apt install libapache2-mod-php	#For Apache
+sudo apt install mysql-server mysql-client php-mysql	#Optional MySQL database
+sudo apt install postgresql php-pgsql	#Optional PostgreSQL database
+
 # Restart Web server
 sudo service apache2 restart
 
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 881c02fc6..781ca2fe3 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -71,8 +71,8 @@ return array(
 			'ok' => 'Máte požadovanou knihovnu pro regulární výrazy (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
-			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
+			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'PHP instalace',
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index 6b94c0d4b..e29a51888 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -73,8 +73,8 @@ return array(
 			'ok' => 'Máte požadovanou knihovnu pro regulární výrazy (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
-			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite).',
+			'nok' => 'Nemáte PDO nebo některý z podporovaných ovladačů (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 7b75fe5f4..b1c29b901 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -71,8 +71,8 @@ return array(
 			'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).',
+			'nok' => 'Ihnen fehlt PDO oder einer der unterstützten Treiber (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Sie haben PDO und mindestens einen der unterstützten Treiber (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'PHP-Installation',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index a77822e7b..eb0c2eb89 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -73,8 +73,8 @@ return array(
 			'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).',
+			'nok' => 'Ihnen fehlt PDO oder einer der unterstützten Treiber (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Sie haben PDO und mindestens einen der unterstützten Treiber (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index a88552087..f6b63d44c 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -71,8 +71,8 @@ return array(
 			'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).',
+			'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'PHP installation',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index d1c5f37c8..54ce8edb2 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -73,8 +73,8 @@ return array(
 			'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).',
+			'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index c359e9d24..c796fb539 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -71,8 +71,8 @@ return array(
 			'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).',
+			'nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'Installation de PHP',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 946a210ee..3b1dfb2f1 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -73,8 +73,8 @@ return array(
 			'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).',
+			'nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index 4eea158f6..475865984 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -71,8 +71,8 @@ return array(
 			'ok' => 'Libreria richiesta per le regular expressions presente (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite).',
-			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite).',
+			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'Installazione PHP',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index a60dd4523..e7ea61d23 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -73,8 +73,8 @@ return array(
 			'ok' => 'Libreria richiesta per le regular expressions presente (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite).',
-			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite).',
+			'nok' => 'Manca PDO o uno degli altri driver supportati (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'Installazione PHP',
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index 9f05d69b1..f0296b827 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -71,8 +71,8 @@ return array(
 			'ok' => 'U hebt de benodigde bibliotheek voor regular expressions (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'U mist PDO of een van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
-			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
+			'nok' => 'U mist PDO of een van de ondersteunde drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'PHP installatie',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index 77783cd48..6aac1db20 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -73,8 +73,8 @@ return array(
 			'ok' => 'U hebt de benodigde bibliotheek voor regular expressions (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'U mist PDO of één van de ondersteunde (pdo_mysql, pdo_sqlite).',
-			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite).',
+			'nok' => 'U mist PDO of één van de ondersteunde (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index caea627f3..9bc241f96 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -71,8 +71,8 @@ return array(
 			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
-			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'PHP installation',
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index a52e2959b..3a808d544 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -69,8 +69,8 @@ return array(
 			'ok' => 'У вас установлена необходимая библиотека для работы с регулярными выражениями (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite).',
-			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite).',
+			'nok' => 'У вас не установлен PDO или один из необходимых драйверов (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index 43f8e23c5..4e0f755d9 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -71,8 +71,8 @@ return array(
 			'ok' => 'Düzenli ifadeler kütüphanesi sorunsuz (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
-			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
+			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'_' => 'PHP kurulumu',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 951a7c5fd..8302a95f4 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -73,8 +73,8 @@ return array(
 			'ok' => 'Düzenli ifadeler kütüphanesi sorunsuz (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
-			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
+			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
-- 
cgit v1.2.3


From 3b2b91e1f2bd7ad653a6e8dd079bce34910d9361 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 3 Sep 2016 21:46:43 +0200
Subject: Download icon 💾 for podcasts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/FreshRSS/FreshRSS/issues/1236
---
 CHANGELOG.md                     | 3 +++
 app/Models/Feed.php              | 6 +++---
 p/themes/base-theme/template.css | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1002873d2..c61478b33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 2016-XX-XX FreshRSS 1.6.0-dev
 
+* UI
+	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
+
 
 ## 2016-08-29 FreshRSS 1.5.0
 
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 6104b1e31..5d09e7be8 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -309,11 +309,11 @@ class FreshRSS_Feed extends Minz_Model {
 					$elinks[$elink] = '1';
 					$mime = strtolower($enclosure->get_type());
 					if (strpos($mime, 'image/') === 0) {
-						$content .= '<br /><img lazyload="" postpone="" src="' . $elink . '" alt="" />';
+						$content .= '<br /><img lazyload="" src="' . $elink . '" alt="" />';
 					} elseif (strpos($mime, 'audio/') === 0) {
-						$content .= '<br /><audio lazyload="" postpone="" preload="none" src="' . $elink . '" controls="controls" />';
+						$content .= '<br /><audio preload="none" src="' . $elink . '" controls="controls"></audio> <a class="download-enclosure" href="' . $elink . '">💾</a>';
 					} elseif (strpos($mime, 'video/') === 0) {
-						$content .= '<br /><video lazyload="" postpone="" preload="none" src="' . $elink . '" controls="controls" />';
+						$content .= '<br /><video preload="none" src="' . $elink . '" controls="controls"></video> <a class="download-enclosure" href="' . $elink . '">💾</a>';
 					} else {
 						unset($elinks[$elink]);
 					}
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 8a12423be..0902dac0c 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -807,6 +807,10 @@ input:checked + .slide-container .properties {
 	display: none;
 }
 
+.download-enclosure {
+	font-size: xx-large;
+	margin-left: .8em;
+}
 
 /*=== MOBILE */
 /*===========*/
-- 
cgit v1.2.3


From f14cb04e8bc7935886052cafeacf997e1896c23d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 3 Sep 2016 21:58:53 +0200
Subject: 💾 in paragraph
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5d09e7be8..f13c42b0b 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -309,11 +309,11 @@ class FreshRSS_Feed extends Minz_Model {
 					$elinks[$elink] = '1';
 					$mime = strtolower($enclosure->get_type());
 					if (strpos($mime, 'image/') === 0) {
-						$content .= '<br /><img lazyload="" src="' . $elink . '" alt="" />';
+						$content .= '<p><img lazyload="" src="' . $elink . '" alt="" /></p>';
 					} elseif (strpos($mime, 'audio/') === 0) {
-						$content .= '<br /><audio preload="none" src="' . $elink . '" controls="controls"></audio> <a class="download-enclosure" href="' . $elink . '">💾</a>';
+						$content .= '<p><audio preload="none" src="' . $elink . '" controls="controls"></audio> <a class="download-enclosure" download="" href="' . $elink . '">💾</a></p>';
 					} elseif (strpos($mime, 'video/') === 0) {
-						$content .= '<br /><video preload="none" src="' . $elink . '" controls="controls"></video> <a class="download-enclosure" href="' . $elink . '">💾</a>';
+						$content .= '<p><video preload="none" src="' . $elink . '" controls="controls"></video> <a class="download-enclosure" download="" href="' . $elink . '">💾</a></p>';
 					} else {
 						unset($elinks[$elink]);
 					}
-- 
cgit v1.2.3


From a31b86ace3a68880461cc90b746cee395c023702 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 4 Sep 2016 16:54:43 +0200
Subject: Remove Persona folder

https://github.com/FreshRSS/FreshRSS/issues/1219#issuecomment-244603417
---
 data/persona/.gitignore |  1 -
 data/persona/index.html | 13 -------------
 2 files changed, 14 deletions(-)
 delete mode 100644 data/persona/.gitignore
 delete mode 100644 data/persona/index.html

diff --git a/data/persona/.gitignore b/data/persona/.gitignore
deleted file mode 100644
index 314f02b1b..000000000
--- a/data/persona/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt
\ No newline at end of file
diff --git a/data/persona/index.html b/data/persona/index.html
deleted file mode 100644
index 85faaa37e..000000000
--- a/data/persona/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
-<head>
-<meta charset="UTF-8" />
-<meta http-equiv="Refresh" content="0; url=/" />
-<title>Redirection</title>
-<meta name="robots" content="noindex" />
-</head>
-
-<body>
-<p><a href="/">Redirection</a></p>
-</body>
-</html>
-- 
cgit v1.2.3


From abdf85094d053d2c2e8617342a45ae242f2a2d35 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 4 Sep 2016 17:05:10 +0200
Subject: Change style for podcast download

https://github.com/FreshRSS/FreshRSS/issues/1236
---
 app/Models/Feed.php              | 6 +++---
 p/themes/base-theme/template.css | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index f13c42b0b..4403a23c4 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -309,11 +309,11 @@ class FreshRSS_Feed extends Minz_Model {
 					$elinks[$elink] = '1';
 					$mime = strtolower($enclosure->get_type());
 					if (strpos($mime, 'image/') === 0) {
-						$content .= '<p><img lazyload="" src="' . $elink . '" alt="" /></p>';
+						$content .= '<p class="enclosure"><img lazyload="" src="' . $elink . '" alt="" /></p>';
 					} elseif (strpos($mime, 'audio/') === 0) {
-						$content .= '<p><audio preload="none" src="' . $elink . '" controls="controls"></audio> <a class="download-enclosure" download="" href="' . $elink . '">💾</a></p>';
+						$content .= '<p class="enclosure"><audio preload="none" src="' . $elink . '" controls="controls"></audio> <a download="" href="' . $elink . '">💾</a></p>';
 					} elseif (strpos($mime, 'video/') === 0) {
-						$content .= '<p><video preload="none" src="' . $elink . '" controls="controls"></video> <a class="download-enclosure" download="" href="' . $elink . '">💾</a></p>';
+						$content .= '<p class="enclosure"><video preload="none" src="' . $elink . '" controls="controls"></video> <a download="" href="' . $elink . '">💾</a></p>';
 					} else {
 						unset($elinks[$elink]);
 					}
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 0902dac0c..5b3389129 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -807,7 +807,7 @@ input:checked + .slide-container .properties {
 	display: none;
 }
 
-.download-enclosure {
+.enclosure > [download] {
 	font-size: xx-large;
 	margin-left: .8em;
 }
-- 
cgit v1.2.3


From 0564f5e1c4d85d34ec14a493dfa529fb724878d1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 5 Sep 2016 21:09:15 +0200
Subject: Support custom MySQL ports

https://github.com/FreshRSS/FreshRSS/issues/1241
---
 app/install.php       | 2 +-
 lib/Minz/ModelPdo.php | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/install.php b/app/install.php
index 62695ceb6..dad3535dc 100644
--- a/app/install.php
+++ b/app/install.php
@@ -716,7 +716,7 @@ function printStep3() {
 		<div class="form-group">
 			<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'] : $system_default_config->db['host']; ?>" tabindex="2" />
+				<input type="text" id="host" name="host" pattern="[0-9A-Za-z_.-]{1,64}(:[0-9]{2,5})?" value="<?php echo isset($_SESSION['bd_host']) ? $_SESSION['bd_host'] : $system_default_config->db['host']; ?>" tabindex="2" />
 			</div>
 		</div>
 
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 845aecaae..f82045df9 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -53,13 +53,17 @@ class Minz_ModelPdo {
 		self::$sharedCurrentUser = $currentUser;
 
 		$driver_options = isset($conf->db['pdo_options']) && is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
+		$dbServer = parse_url('db://' . $db['host']);
 
 		try {
 			$type = $db['type'];
 			if ($type === 'mysql') {
-				$string = 'mysql:host=' . $db['host']
+				$string = 'mysql:host=' . $dbServer['host']
 				        . ';dbname=' . $db['base']
 				        . ';charset=utf8mb4';
+				if (!empty($dbServer['port'])) {
+					$string .= ';port=' . $dbServer['port'];
+				}
 				$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8mb4';
 				$this->prefix = $db['prefix'] . $currentUser . '_';
 			} elseif ($type === 'sqlite') {
-- 
cgit v1.2.3


From 9f04e2bf3246ec5a65280908f017533d6f622a88 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Tue, 6 Sep 2016 09:15:32 +0200
Subject: MySQL use unhex instead of hex litteral

X' syntax did not work well with bind values
---
 app/Models/EntryDAO.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index d39f0237c..159f9673b 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -11,7 +11,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	}
 
 	public function sqlHexDecode($x) {
-		return 'X' . $x;
+		return 'unhex(' . $x . ')';
 	}
 
 	public function sqlHexEncode($x) {
-- 
cgit v1.2.3


From 8a776f146182bc6870702cfeb87041e3af66b24b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 7 Sep 2016 14:35:51 +0200
Subject: Prevent a target _blank attacks with window.opener

https://mathiasbynens.github.io/rel-noopener/
noopener is implied by noreferrer
https://html.spec.whatwg.org/multipage/semantics.html#link-type-noreferrer
The API for window.open() does not seem stable yet
https://bugzilla.mozilla.org/show_bug.cgi?id=1267339
---
 app/layout/aside_feed.phtml                       | 2 +-
 app/layout/aside_subscription.phtml               | 2 +-
 app/layout/nav_menu.phtml                         | 2 +-
 app/views/configure/sharing.phtml                 | 4 ++--
 app/views/feed/add.phtml                          | 6 +++---
 app/views/helpers/feed/update.phtml               | 6 +++---
 app/views/helpers/index/normal/entry_bottom.phtml | 4 ++--
 app/views/helpers/index/normal/entry_header.phtml | 4 ++--
 app/views/index/normal.phtml                      | 2 +-
 p/scripts/main.js                                 | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index e8fdbf842..94c281b7f 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -79,7 +79,7 @@
 		<?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('gen.action.see_website'); ?></a></li>
+		<li class="item"><a target="_blank" rel="noreferrer" 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>
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index fa10d63e8..e14afe2a7 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -10,7 +10,7 @@
 	</li>
 
 	<li class="item">
-		<a class="bookmarkClick" 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');})();">
+		<a class="bookmarkClick" href="javascript:(function(){var%20url%20=%20location.href;var%20otherWindow=window.open('about:blank','_blank');otherWindow.opener=null;otherWindow.location='<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url);})();">
 			<?php echo _t('sub.menu.bookmark'); ?>
 		</a>
 	</li>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 23255f04f..d77c1abf9 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -152,7 +152,7 @@
 				$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); ?>">
+		<a class="view_rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
 		</a>
 	</div>
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 0dad5bf6d..ffcfb8b29 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -13,7 +13,7 @@
 			<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('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
+			<a target="_blank" rel="noreferrer" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
 		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('conf.sharing'); ?></legend>
@@ -38,7 +38,7 @@
 						<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 					</div>
 					<?php if ($share->formType() === 'advanced') { ?>
-						<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" rel="noreferrer" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="<?php echo $share->help(); ?>"><?php echo _i('help'); ?></a>
 					<?php } ?>
 				</div>
 			</div>
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index caf685d79..5cd59d298 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -30,7 +30,7 @@
 			<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>
+				<a class="btn" target="_blank" rel="noreferrer" href="<?php echo $this->feed->website(); ?>"><?php echo _i('link'); ?></a>
 			</div>
 		</div>
 		<?php } ?>
@@ -40,9 +40,9 @@
 			<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>
+					<a class="btn" target="_blank" rel="noreferrer" 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('sub.feed.validator'); ?></a>
+				<a class="btn" target="_blank" rel="noreferrer" 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">
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index b7e8f68cd..bf87a255a 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -37,7 +37,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 _i('link'); ?></a>
+					<a class="btn" target="_blank" rel="noreferrer" href="<?php echo $this->feed->website(); ?>"><?php echo _i('link'); ?></a>
 				</div>
 			</div>
 		</div>
@@ -46,10 +46,10 @@
 			<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>
+					<a class="btn" target="_blank" rel="noreferrer" 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 rawurlencode(htmlspecialchars_decode($this->feed->url(), ENT_QUOTES)); ?>"><?php echo _t('sub.feed.validator'); ?></a>
+				<a class="btn" target="_blank" rel="noreferrer" href="http://validator.w3.org/feed/check.cgi?url=<?php echo rawurlencode(htmlspecialchars_decode($this->feed->url(), ENT_QUOTES)); ?>"><?php echo _t('sub.feed.validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 3af7436c3..a9d5a80ca 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -52,7 +52,7 @@
 						$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>
+					<a target="_blank" rel="noreferrer" href="<?php echo $share->url(); ?>"><?php echo $share->name(); ?></a>
 				</li><?php
 					}
 			?></ul>
@@ -81,6 +81,6 @@
 		?><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
+		?><li class="item link"><a target="_blank" rel="noreferrer" 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
index dc544298f..86298e59f 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -27,7 +27,7 @@
 		}
 	}
 	?><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>
+	<li class="item title"><a target="_blank" rel="noreferrer" 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 } ?>
+	<?php if ($topline_link) { ?><li class="item link"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
 </ul>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 91ebcebd3..6fda11ed9 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -66,7 +66,7 @@ if (!empty($this->entries)) {
 
 		?><div class="flux_content">
 			<div class="content <?php echo $content_width; ?>">
-				<h1 class="title"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></h1>
+				<h1 class="title"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></h1>
 				<?php
 					$author = $this->entry->author();
 					echo $author != '' ? '<div class="author">' . _t('gen.short.by_author', $author) . '</div>' : '',
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 8980fe2f6..74631451a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -752,7 +752,7 @@ function init_stream(divStream) {
 	});
 
 	divStream.on('click', '.flux .content a', function () {
-		$(this).attr('target', '_blank');
+		$(this).attr('target', '_blank').attr('rel', 'noreferrer');
 	});
 
 	if (context.auto_mark_site) {
-- 
cgit v1.2.3


From 6450839b87b6a05b71af87490325acda9ffd5a44 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 7 Sep 2016 14:38:52 +0200
Subject: Changelog noopener

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c61478b33..fca908ff0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2016-XX-XX FreshRSS 1.6.0-dev
 
+* Security
+	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 
-- 
cgit v1.2.3


From ccb56bcbf3ef69228ae4147a76cf3059f519bbf3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 11 Sep 2016 11:24:32 +0200
Subject: Simplify SQL in statistics

Reduce the use of product-specific date functions. Improve performances.
Remove redundant functions.
---
 app/Controllers/statsController.php | 36 +++++++++++++++++-----
 app/Models/StatsDAO.php             | 61 ++++++-------------------------------
 app/Models/StatsDAOSQLite.php       | 55 ---------------------------------
 3 files changed, 39 insertions(+), 113 deletions(-)

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 4a597ae7d..5d1dee72c 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -18,6 +18,27 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(_t('admin.stats.title') . ' · ');
 	}
 
+	private function convertToSerie($data) {
+		$serie = array();
+
+		foreach ($data as $key => $value) {
+			$serie[] = array($key, $value);
+		}
+
+		return $serie;
+	}
+
+	private function convertToPieSerie($data) {
+		$serie = array();
+
+		foreach ($data as $value) {
+			$value['data'] = array(array(0, (int) $value['data']));
+			$serie[] = $value;
+		}
+
+		return $serie;
+	}
+
 	/**
 	 * This action handles the statistic main page.
 	 *
@@ -33,10 +54,11 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$statsDAO = FreshRSS_Factory::createStatsDAO();
 		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();
+		$entryCount = $statsDAO->calculateEntryCount();
+		$this->view->count = $this->convertToSerie($entryCount);
+		$this->view->average = round(array_sum(array_values($entryCount)) / count($entryCount), 2);
+		$this->view->feedByCategory = $this->convertToPieSerie($statsDAO->calculateFeedByCategory());
+		$this->view->entryByCategory = $this->convertToPieSerie($statsDAO->calculateEntryByCategory());
 		$this->view->topFeed = $statsDAO->calculateTopFeed();
 	}
 
@@ -118,11 +140,11 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$this->view->days = $statsDAO->getDays();
 		$this->view->months = $statsDAO->getMonths();
 		$this->view->repartition = $statsDAO->calculateEntryRepartitionPerFeed($id);
-		$this->view->repartitionHour = $statsDAO->calculateEntryRepartitionPerFeedPerHour($id);
+		$this->view->repartitionHour = $this->convertToSerie($statsDAO->calculateEntryRepartitionPerFeedPerHour($id));
 		$this->view->averageHour = $statsDAO->calculateEntryAveragePerFeedPerHour($id);
-		$this->view->repartitionDayOfWeek = $statsDAO->calculateEntryRepartitionPerFeedPerDayOfWeek($id);
+		$this->view->repartitionDayOfWeek = $this->convertToSerie($statsDAO->calculateEntryRepartitionPerFeedPerDayOfWeek($id));
 		$this->view->averageDayOfWeek = $statsDAO->calculateEntryAveragePerFeedPerDayOfWeek($id);
-		$this->view->repartitionMonth = $statsDAO->calculateEntryRepartitionPerFeedPerMonth($id);
+		$this->view->repartitionMonth = $this->convertToSerie($statsDAO->calculateEntryRepartitionPerFeedPerMonth($id));
 		$this->view->averageMonth = $statsDAO->calculateEntryAveragePerFeedPerMonth($id);
 	}
 }
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 4f83ff577..28882baab 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -61,14 +61,15 @@ SQL;
 	 */
 	public function calculateEntryCount() {
 		$count = $this->initEntryCountArray();
-		$period = self::ENTRY_COUNT_PERIOD;
+		$midnight = mktime(0, 0, 0);
+		$oldest = $midnight - (self::ENTRY_COUNT_PERIOD * 86400);
 
 		// Get stats per day for the last 30 days
 		$sql = <<<SQL
-SELECT DATEDIFF(FROM_UNIXTIME(e.date), NOW()) AS day,
-COUNT(1) AS count
-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')
+SELECT FLOOR((date - {$midnight}) / 86400) AS day,
+COUNT(*) as count
+FROM {$this->prefix}entry
+WHERE date >= {$oldest} AND date < {$midnight}
 GROUP BY day
 ORDER BY day ASC
 SQL;
@@ -80,28 +81,7 @@ SQL;
 			$count[$value['day']] = (int) $value['count'];
 		}
 
-		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);
+		return $count;
 	}
 
 	/**
@@ -173,7 +153,7 @@ SQL;
 			$repartition[(int) $value['period']] = (int) $value['count'];
 		}
 
-		return $this->convertToSerie($repartition);
+		return $repartition;
 	}
 
 	/**
@@ -276,7 +256,7 @@ SQL;
 		$stm->execute();
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
-		return $this->convertToPieSerie($res);
+		return $res;
 	}
 
 	/**
@@ -301,7 +281,7 @@ SQL;
 		$stm->execute();
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
-		return $this->convertToPieSerie($res);
+		return $res;
 	}
 
 	/**
@@ -351,27 +331,6 @@ SQL;
 		return $stm->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-	protected function convertToSerie($data) {
-		$serie = array();
-
-		foreach ($data as $key => $value) {
-			$serie[] = array($key, $value);
-		}
-
-		return $serie;
-	}
-
-	protected function convertToPieSerie($data) {
-		$serie = array();
-
-		foreach ($data as $value) {
-			$value['data'] = array(array(0, (int) $value['data']));
-			$serie[] = $value;
-		}
-
-		return $serie;
-	}
-
 	/**
 	 * Gets days ready for graphs
 	 *
diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php
index 9bfe8b20a..e09d18c77 100644
--- a/app/Models/StatsDAOSQLite.php
+++ b/app/Models/StatsDAOSQLite.php
@@ -2,61 +2,6 @@
 
 class FreshRSS_StatsDAOSQLite extends FreshRSS_StatsDAO {
 
-	/**
-	 * Calculates entry count per day on a 30 days period.
-	 * Returns the result as a JSON object.
-	 *
-	 * @return JSON object
-	 */
-	public function calculateEntryCount() {
-		$count = $this->initEntryCountArray();
-		$period = parent::ENTRY_COUNT_PERIOD;
-
-		// Get stats per day for the last 30 days
-		$sql = <<<SQL
-SELECT round(julianday(e.date, 'unixepoch') - julianday('now')) AS day,
-COUNT(1) AS count
-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')
-GROUP BY day
-ORDER BY day ASC
-SQL;
-		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-
-		foreach ($res as $value) {
-			$count[(int) $value['day']] = (int) $value['count'];
-		}
-
-		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}";
-- 
cgit v1.2.3


From ede0c839cbde7a51fadf27f5b754604cbf13836c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 11 Sep 2016 11:41:23 +0200
Subject: Changelog custom database port

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c61478b33..5628d2dd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2016-XX-XX FreshRSS 1.6.0-dev
 
+* Features
+	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 
-- 
cgit v1.2.3


From 2a5aa34ad2796df00fa09de41361c20764ccdfa8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 11 Sep 2016 15:06:33 +0200
Subject: Better control of number of entries per page or RSS feed

https://github.com/FreshRSS/FreshRSS/issues/1249
* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
* Limited by `min_posts_per_rss` and `max_posts_per_rss` in user config
---
 CHANGELOG.md                        |  4 ++++
 app/Controllers/indexController.php | 39 +++++++++++++++++++++++++++++++------
 app/Models/Context.php              |  1 +
 app/layout/layout.phtml             |  3 +++
 app/layout/nav_menu.phtml           |  3 +++
 app/views/auth/index.phtml          |  2 +-
 data/users/_/config.default.php     |  3 +++
 7 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3c46bdb6..f82f68fff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ## 2016-XX-XX FreshRSS 1.6.0-dev
 
 * Features
+	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
+		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
+		* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
+		* Limited by `min_posts_per_rss` and `max_posts_per_rss` in user config
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 * Security
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 2332d225d..4e2717920 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -34,7 +34,9 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 
 		$this->view->callbackBeforeContent = function($view) {
 			try {
+				FreshRSS_Context::$number++;	//+1 for pagination
 				$entries = FreshRSS_index_Controller::listEntriesByContext();
+				FreshRSS_Context::$number--;
 
 				$nb_entries = count($entries);
 				if ($nb_entries > FreshRSS_Context::$number) {
@@ -154,6 +156,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 *   - order (default: conf->sort_order)
 	 *   - nb (default: conf->posts_per_page)
 	 *   - next (default: empty string)
+	 *   - hours (default: 0)
 	 */
 	private function updateContext() {
 		// Update number of read / unread variables.
@@ -180,10 +183,14 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		FreshRSS_Context::$order = Minz_Request::param(
 			'order', FreshRSS_Context::$user_conf->sort_order
 		);
-		FreshRSS_Context::$number = Minz_Request::param(
-			'nb', FreshRSS_Context::$user_conf->posts_per_page
-		);
+		FreshRSS_Context::$number = intval(Minz_Request::param('nb', FreshRSS_Context::$user_conf->posts_per_page));
+		if (FreshRSS_Context::$number > FreshRSS_Context::$user_conf->max_posts_per_rss) {
+			FreshRSS_Context::$number = max(
+				FreshRSS_Context::$user_conf->max_posts_per_rss,
+				FreshRSS_Context::$user_conf->posts_per_page);
+		}
 		FreshRSS_Context::$first_id = Minz_Request::param('next', '');
+		FreshRSS_Context::$sinceHours = intval(Minz_Request::param('hours', 0));
 	}
 
 	/**
@@ -201,11 +208,31 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			$id = '';
 		}
 
-		return $entryDAO->listWhere(
+		$limit = FreshRSS_Context::$number;
+
+		$date_min = 0;
+		if (FreshRSS_Context::$sinceHours) {
+			$date_min = time() - (FreshRSS_Context::$sinceHours * 3600);
+			$limit = FreshRSS_Context::$user_conf->max_posts_per_rss;
+		}
+
+		$entries = $entryDAO->listWhere(
 			$type, $id, FreshRSS_Context::$state, FreshRSS_Context::$order,
-			FreshRSS_Context::$number + 1, FreshRSS_Context::$first_id,
-			FreshRSS_Context::$search
+			$limit, FreshRSS_Context::$first_id,
+			FreshRSS_Context::$search, $date_min
 		);
+
+		if (FreshRSS_Context::$sinceHours && (count($entries) < FreshRSS_Context::$user_conf->min_posts_per_rss)) {
+			$date_min = 0;
+			$limit = FreshRSS_Context::$user_conf->min_posts_per_rss;
+			$entries = $entryDAO->listWhere(
+				$type, $id, FreshRSS_Context::$state, FreshRSS_Context::$order,
+				$limit, FreshRSS_Context::$first_id,
+				FreshRSS_Context::$search, $date_min
+			);
+		}
+
+		return $entries;
 	}
 
 	/**
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 2a58bd4ba..33e65a619 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -35,6 +35,7 @@ class FreshRSS_Context {
 	public static $first_id = '';
 	public static $next_id = '';
 	public static $id_max = '';
+	public static $sinceHours = 0;
 
 	/**
 	 * Initialize the context.
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 4d9ad5458..1f11e0af1 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -42,6 +42,9 @@
 	} if (isset($this->rss_title)) {
 		$url_rss = $url_base;
 		$url_rss['a'] = 'rss';
+		if (FreshRSS_Context::$user_conf->since_hours_posts_per_rss) {
+			$url_rss['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
+		}
 ?>
 		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
 <?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index d77c1abf9..c02232242 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -151,6 +151,9 @@
 			if (FreshRSS_Context::$user_conf->token) {
 				$url_output['params']['token'] = FreshRSS_Context::$user_conf->token;
 			}
+			if (FreshRSS_Context::$user_conf->since_hours_posts_per_rss) {
+				$url_output['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
+			}
 		?>
 		<a class="view_rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index 74e692ec5..7195bab5d 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -60,7 +60,7 @@
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
 					echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?php echo $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>
+				<kbd><?php echo Minz_Url::display(array('params' => array('output' => 'rss', 'token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true); ?></kbd>
 			</div>
 		</div>
 		<?php } ?>
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index 4a3403453..2c56d5f45 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -9,6 +9,9 @@ return array (
 	'passwordHash' => '',
 	'apiPasswordHash' => '',
 	'posts_per_page' => 20,
+	'since_hours_posts_per_rss' => 168,
+	'min_posts_per_rss' => 2,
+	'max_posts_per_rss' => 400,
 	'view_mode' => 'normal',
 	'default_view' => 'adaptive',
 	'default_state' => FreshRSS_Entry::STATE_NOT_READ,
-- 
cgit v1.2.3


From 4a9cc67d90ac167d745c50f98aa1738f6d1131e9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 15 Sep 2016 11:36:31 +0200
Subject: API: add iconUrl

https://github.com/jangernert/FeedReader/issues/59#issuecomment-247182291
https://github.com/FreshRSS/FreshRSS/issues/1252
---
 p/api/greader.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 894c2e960..98ae60475 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -158,7 +158,7 @@ function authorizationToUser() {
 					Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.');
 					unauthorized();
 				}
-				$system_conf = Minz_Configuration::get('system');
+				global $system_conf;
 				if ($headerAuthX[1] === sha1($system_conf->salt . $user . $conf->apiPasswordHash)) {
 					return $user;
 				} else {
@@ -189,7 +189,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');
+			global $system_conf;
 			$auth = $email . '/' . sha1($system_conf->salt . $email . $conf->apiPasswordHash);
 			echo 'SID=', $auth, "\n",
 				'Auth=', $auth, "\n";
@@ -209,7 +209,7 @@ function token($conf) {
 //https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
 	$user = Minz_Session::param('currentUser', '_');
 	//logMe('token('. $user . ")");	//TODO: Implement real token that expires
-	$system_conf = Minz_Configuration::get('system');
+	global $system_conf;
 	$token = str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
 	echo $token, "\n";
 	exit();
@@ -219,7 +219,7 @@ function checkToken($conf, $token) {
 //http://code.google.com/p/google-reader-api/wiki/ActionToken
 	$user = Minz_Session::param('currentUser', '_');
 	//logMe('checkToken(' . $token . ")");
-	$system_conf = Minz_Configuration::get('system');
+	global $system_conf;
 	if ($token === str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
 		return true;
 	}
@@ -261,6 +261,8 @@ function subscriptionList() {
 	$stm->execute();
 	$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
+	global $system_conf;
+	$salt = $system_conf->salt;
 	$subscriptions = array();
 
 	foreach ($res as $line) {
@@ -277,7 +279,7 @@ function subscriptionList() {
 			//'firstitemmsec' => 0,
 			'url' => $line['url'],
 			'htmlUrl' => $line['website'],
-			//'iconUrl' => '',
+			'iconUrl' => Minz_Url::display('/f.php?' . hash('crc32b', $salt . $line['url']), '', true),
 		);
 	}
 
-- 
cgit v1.2.3


From 12fa756bbc10685438c8972dcca046c90ed4f548 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 17 Sep 2016 01:24:04 +0200
Subject: API: start draft of edit subscriptions

https://github.com/FreshRSS/FreshRSS/issues/443
https://github.com/FreshRSS/FreshRSS/issues/1252

https://github.com/jangernert/FeedReader/issues/59#issuecomment-247484124
---
 p/api/greader.php | 90 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 81 insertions(+), 9 deletions(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 98ae60475..3da1156c2 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -287,6 +287,66 @@ function subscriptionList() {
 	exit();
 }
 
+function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '') {
+	//https://github.com/mihaip/google-reader-api/blob/master/wiki/ApiSubscriptionEdit.wiki
+	switch ($action) {
+		case 'subscribe':
+		case 'unsubscribe':
+		case 'edit':
+		default:
+			badRequest();
+	}
+	$addCatId = 0;
+	$categoryDAO = null;
+	if ($add != '' || $remove != '') {
+		$categoryDAO = new FreshRSS_CategoryDAO();
+	}
+	if ($add != '' && strpos($add, 'user/-/label/') === 0) {	//user/-/label/Example
+		$c_name = basename($add);
+		$cat = $categoryDAO->searchByName($c_name);
+		$addCatId = $cat == null ? -1 : $cat->id();
+	} else if ($remove != '' && strpos($remove, 'user/-/label/') {
+		$addCatId = 1;	//Default category
+	}
+	$feedDAO = FreshRSS_Factory::createFeedDao();
+	for ($i = count($streamNames) - 1; $i >= 0; $i--) {
+		$streamName = $streamNames[$i];	//feed/http://example.net/sample.xml	;	feed/338
+		if (strpos($streamName, 'feed/') === 0) {
+			$streamName = basename($streamName);
+			$feedId = 0;
+			if (ctype_digit($streamName)) {
+				if ($action === 'subscribe') {
+					continue;
+				}
+				$feedId = $streamName;
+			} else {
+				$feed = $feedDAO->searchByUrl($streamName);
+				$feedId = $feed == null ? -1 : $feed->id();
+			}
+			$title = isset($titles[$i]) ? $titles[$i] : '';
+			switch ($action) {
+				case 'subscribe':
+					if ($feedId <= 0) {
+						//TODO
+					}
+					break;
+				case 'unsubscribe':
+					if ($feedId > 0) {
+						//TODO
+					}
+					break;
+				case 'edit':
+					if ($feedId > 0) {
+						//TODO
+					}
+					break;
+			}
+		}
+	}
+	notImplemented();
+	exit('OK');
+}
+
 function unreadCount() {	//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#unread-count
 	//logMe("unreadCount()");
 	header('Content-Type: application/json; charset=UTF-8');
@@ -523,8 +583,7 @@ function editTag($e_ids, $a, $r) {
 			break;
 	}
 
-	echo 'OK';
-	exit();
+	exit('OK');
 }
 
 function markAllAsRead($streamId, $olderThanId) {
@@ -542,8 +601,7 @@ function markAllAsRead($streamId, $olderThanId) {
 		$entryDAO->markReadEntries($olderThanId, false, -1);
 	}
 
-	echo 'OK';
-	exit();
+	exit('OK');
 }
 
 //logMe('----------------------------------------------------------------');
@@ -625,14 +683,28 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			if (isset($pathInfos[5]) && $pathInfos[5] === 'list') {
 				$output = isset($_GET['output']) ? $_GET['output'] : '';
 				if ($output !== 'json') notImplemented();
-				tagList($_GET['output']);
+				tagList($output);
 			}
 			break;
 		case 'subscription':
-			if (isset($pathInfos[5]) && $pathInfos[5] === 'list') {
-				$output = isset($_GET['output']) ? $_GET['output'] : '';
-				if ($output !== 'json') notImplemented();
-				subscriptionList($_GET['output']);
+			if (isset($pathInfos[5])) {
+				switch ($pathInfos[5]) {
+					case 'list':
+						$output = isset($_GET['output']) ? $_GET['output'] : '';
+						if ($output !== 'json') notImplemented();
+						subscriptionList($_GET['output']);
+						break;
+					case 'edit':
+						if (isset($_POST['s']) && isset($_POST['ac'])) {
+							$streamNames = multiplePosts('s');	//StreamId to operate on. The parameter may be repeated to edit multiple subscriptions at once
+							$titles = multiplePosts('t');	//Title to use for the subscription. For the `subscribe` action, if not specified then the feed's current title will be used. Can be used with the `edit` action to rename a subscription
+							$action = $_POST['ac'];	//Action to perform on the given StreamId. Possible values are `subscribe`, `unsubscribe` and `edit`
+							$add = isset($_POST['a']) ? $_POST['a'] : '';	//StreamId to add the subscription to (generally a user label)
+							$remove = isset($_POST['r']) ? $_POST['r'] : '';	//StreamId to remove the subscription from (generally a user label)
+							subscriptionEdit($streamNames, $titles $action, $add, $remove);
+						}
+						break;
+				}
 			}
 			break;
 		case 'unread-count':
-- 
cgit v1.2.3


From d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 17:32:30 +0200
Subject: Fix bug move feed to another category

CSRF
---
 p/scripts/category.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/p/scripts/category.js b/p/scripts/category.js
index eb08ecd6e..fbcd83a01 100644
--- a/p/scripts/category.js
+++ b/p/scripts/category.js
@@ -95,6 +95,7 @@ function init_draggable() {
 			data : {
 				f_id: dragFeedId,
 				c_id: e.target.parentNode.getAttribute('data-cat-id'),
+				_csrf: context.csrf,
 			}
 		}).done(function() {
 			$(e.target).after(dragHtml);
-- 
cgit v1.2.3


From 44f22ab8b4c46befab98440f69a05725928bed75 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 17:36:33 +0200
Subject: API move feed to another category

https://github.com/jangernert/FeedReader/issues/59
https://github.com/FreshRSS/FreshRSS/issues/443
---
 app/Controllers/feedController.php | 14 +-------------
 app/Models/FeedDAO.php             | 13 +++++++++++++
 p/api/greader.php                  |  7 +++++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ffda1450d..c64b67a80 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -511,21 +511,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		$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))) {
+		if ($feedDAO->moveFeed($feed_id, $cat_id)) {
 			// TODO: return something useful
 		} else {
 			Minz_Log::warning('Cannot move feed `' . $feed_id . '` ' .
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 475d39286..2fd2c6194 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -136,6 +136,19 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 	}
 
+	public function moveFeed($feed_id, $cat_id) {
+		if ($cat_id <= 0) {
+			// If category was not given get the default one.
+			$catDAO = new FreshRSS_CategoryDAO();
+			$catDAO->checkDefault();
+			$def_cat = $catDAO->getDefault();
+			$cat_id = $def_cat->id();
+		}
+		$feed = $this->searchById($feed_id);
+		return $feed && ($feed->category() == $cat_id ||
+			$this->updateFeed($feed_id, array('category' => $cat_id)));
+	}
+
 	public function deleteFeed($id) {
 		$sql = 'DELETE FROM `' . $this->prefix . 'feed` WHERE id=?';
 		$stm = $this->bd->prepare($sql);
diff --git a/p/api/greader.php b/p/api/greader.php
index 3da1156c2..426f3fe44 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -337,14 +337,17 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 					break;
 				case 'edit':
 					if ($feedId > 0) {
-						//TODO
+						if ($feedDAO->moveFeed($feed_id, $cat_id)) {
+							exit('OK');
+						} else {
+							badRequest();
+						}
 					}
 					break;
 			}
 		}
 	}
 	notImplemented();
-	exit('OK');
 }
 
 function unreadCount() {	//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#unread-count
-- 
cgit v1.2.3


From f1f8ea2da3a9334d20d54c083735855c90a21d9e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 18:10:53 +0200
Subject: API fix change feed category

---
 p/api/greader.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/p/api/greader.php b/p/api/greader.php
index 426f3fe44..7094fb381 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -288,12 +288,15 @@ function subscriptionList() {
 }
 
 function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '') {
+	//logMe("subscriptionEdit()");
 	//https://github.com/mihaip/google-reader-api/blob/master/wiki/ApiSubscriptionEdit.wiki
 	switch ($action) {
 		case 'subscribe':
 		case 'unsubscribe':
 		case 'edit':
+			break;
 		default:
+			logMe("Bad action: $action");
 			badRequest();
 	}
 	$addCatId = 0;
@@ -305,7 +308,7 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 		$c_name = basename($add);
 		$cat = $categoryDAO->searchByName($c_name);
 		$addCatId = $cat == null ? -1 : $cat->id();
-	} else if ($remove != '' && strpos($remove, 'user/-/label/') {
+	} else if ($remove != '' && strpos($remove, 'user/-/label/')) {
 		$addCatId = 1;	//Default category
 	}
 	$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -328,21 +331,22 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 				case 'subscribe':
 					if ($feedId <= 0) {
 						//TODO
+					} else {
+						badRequest();
 					}
 					break;
 				case 'unsubscribe':
 					if ($feedId > 0) {
 						//TODO
+					} else {
+						badRequest();
 					}
 					break;
 				case 'edit':
-					if ($feedId > 0) {
-						if ($feedDAO->moveFeed($feed_id, $cat_id)) {
-							exit('OK');
-						} else {
-							badRequest();
-						}
+					if ($feedId > 0 && $feedDAO->moveFeed($feedId, $addCatId)) {
+						exit('OK');
 					}
+					badRequest();
 					break;
 			}
 		}
@@ -704,7 +708,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 							$action = $_POST['ac'];	//Action to perform on the given StreamId. Possible values are `subscribe`, `unsubscribe` and `edit`
 							$add = isset($_POST['a']) ? $_POST['a'] : '';	//StreamId to add the subscription to (generally a user label)
 							$remove = isset($_POST['r']) ? $_POST['r'] : '';	//StreamId to remove the subscription from (generally a user label)
-							subscriptionEdit($streamNames, $titles $action, $add, $remove);
+							subscriptionEdit($streamNames, $titles, $action, $add, $remove);
 						}
 						break;
 				}
-- 
cgit v1.2.3


From d6b4186040011aad16a173a1ceaa5a5084025470 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 19:26:40 +0200
Subject: API implement delete feed + refactor move feed

---
 app/Controllers/feedController.php | 45 ++++++++++++++++++++++++++++---------
 app/Models/FeedDAO.php             | 13 -----------
 p/api/greader.php                  | 46 +++++++++++++++++---------------------
 3 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c64b67a80..0ff27e0da 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -492,6 +492,23 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		return $updated_feeds;
 	}
 
+	public static function moveFeed($feed_id, $cat_id) {
+		if ($feed_id <= 0) {
+			return false;
+		}
+		if ($cat_id <= 0) {
+			// 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();
+		$feed = $feedDAO->searchById($feed_id);
+		return $feed && ($feed->category() == $cat_id ||
+			$feedDAO->updateFeed($feed_id, array('category' => $cat_id)));
+	}
+
 	/**
 	 * This action changes the category of a feed.
 	 *
@@ -511,9 +528,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		$feed_id = Minz_Request::param('f_id');
 		$cat_id = Minz_Request::param('c_id');
-		$feedDAO = FreshRSS_Factory::createFeedDao();
 
-		if ($feedDAO->moveFeed($feed_id, $cat_id)) {
+		if (self::moveFeed($feed_id, $cat_id)) {
 			// TODO: return something useful
 		} else {
 			Minz_Log::warning('Cannot move feed `' . $feed_id . '` ' .
@@ -522,6 +538,21 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
+	public static function deleteFeed($feed_id) {
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		if ($feedDAO->deleteFeed($feed_id)) {
+			// TODO: Delete old favicon
+
+			// Remove related queries
+			FreshRSS_Context::$user_conf->queries = remove_query_by_get(
+				'f_' . $feed_id, FreshRSS_Context::$user_conf->queries);
+			FreshRSS_Context::$user_conf->save();
+
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * This action deletes a feed.
 	 *
@@ -540,21 +571,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		if (!$redirect_url) {
 			$redirect_url = array('c' => 'subscription', 'a' => 'index');
 		}
-
 		if (!Minz_Request::isPost()) {
 			Minz_Request::forward($redirect_url, true);
 		}
 
 		$id = Minz_Request::param('id');
-		$feedDAO = FreshRSS_Factory::createFeedDao();
-		if ($feedDAO->deleteFeed($id)) {
-			// TODO: Delete old favicon
-
-			// Remove related queries
-			FreshRSS_Context::$user_conf->queries = remove_query_by_get(
-				'f_' . $id, FreshRSS_Context::$user_conf->queries);
-			FreshRSS_Context::$user_conf->save();
 
+		if (self::deleteFeed($id)) {
 			Minz_Request::good(_t('feedback.sub.feed.deleted'), $redirect_url);
 		} else {
 			Minz_Request::bad(_t('feedback.sub.feed.error'), $redirect_url);
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 2fd2c6194..475d39286 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -136,19 +136,6 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 	}
 
-	public function moveFeed($feed_id, $cat_id) {
-		if ($cat_id <= 0) {
-			// If category was not given get the default one.
-			$catDAO = new FreshRSS_CategoryDAO();
-			$catDAO->checkDefault();
-			$def_cat = $catDAO->getDefault();
-			$cat_id = $def_cat->id();
-		}
-		$feed = $this->searchById($feed_id);
-		return $feed && ($feed->category() == $cat_id ||
-			$this->updateFeed($feed_id, array('category' => $cat_id)));
-	}
-
 	public function deleteFeed($id) {
 		$sql = 'DELETE FROM `' . $this->prefix . 'feed` WHERE id=?';
 		$stm = $this->bd->prepare($sql);
diff --git a/p/api/greader.php b/p/api/greader.php
index 7094fb381..9b07e0729 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -153,13 +153,12 @@ function authorizationToUser() {
 		if (count($headerAuthX) === 2) {
 			$user = $headerAuthX[0];
 			if (ctype_alnum($user)) {
-				$conf = get_user_configuration($user);
-				if (is_null($conf)) {
+				FreshRSS_Context::$user_conf = get_user_configuration($user);
+				if (FreshRSS_Context::$user_conf == null) {
 					Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.');
 					unauthorized();
 				}
-				global $system_conf;
-				if ($headerAuthX[1] === sha1($system_conf->salt . $user . $conf->apiPasswordHash)) {
+				if ($headerAuthX[1] === sha1(FreshRSS_Context::$system_conf->salt . $user . FreshRSS_Context::$user_conf->apiPasswordHash)) {
 					return $user;
 				} else {
 					logMe('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1]);
@@ -181,16 +180,15 @@ function clientLogin($email, $pass) {	//http://web.archive.org/web/2013060409104
 			include_once(LIB_PATH . '/password_compat.php');
 		}
 
-		$conf = get_user_configuration($email);
-		if (is_null($conf)) {
+		FreshRSS_Context::$user_conf = get_user_configuration($email);
+		if (FreshRSS_Context::$user_conf == null) {
 			Minz_Log::warning('Invalid API user ' . $email . ': configuration cannot be found.');
 			unauthorized();
 		}
 
-		if ($conf->apiPasswordHash != '' && password_verify($pass, $conf->apiPasswordHash)) {
+		if (FreshRSS_Context::$user_conf->apiPasswordHash != '' && password_verify($pass, FreshRSS_Context::$user_conf->apiPasswordHash)) {
 			header('Content-Type: text/plain; charset=UTF-8');
-			global $system_conf;
-			$auth = $email . '/' . sha1($system_conf->salt . $email . $conf->apiPasswordHash);
+			$auth = $email . '/' . sha1(FreshRSS_Context::$system_conf->salt . $email . FreshRSS_Context::$user_conf->apiPasswordHash);
 			echo 'SID=', $auth, "\n",
 				'Auth=', $auth, "\n";
 			exit();
@@ -209,8 +207,7 @@ function token($conf) {
 //https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
 	$user = Minz_Session::param('currentUser', '_');
 	//logMe('token('. $user . ")");	//TODO: Implement real token that expires
-	global $system_conf;
-	$token = str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
+	$token = str_pad(sha1(FreshRSS_Context::$system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
 	echo $token, "\n";
 	exit();
 }
@@ -219,8 +216,7 @@ function checkToken($conf, $token) {
 //http://code.google.com/p/google-reader-api/wiki/ActionToken
 	$user = Minz_Session::param('currentUser', '_');
 	//logMe('checkToken(' . $token . ")");
-	global $system_conf;
-	if ($token === str_pad(sha1($system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
+	if ($token === str_pad(sha1(FreshRSS_Context::$system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
 		return true;
 	}
 	unauthorized();
@@ -261,8 +257,7 @@ function subscriptionList() {
 	$stm->execute();
 	$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
-	global $system_conf;
-	$salt = $system_conf->salt;
+	$salt = FreshRSS_Context::$system_conf->salt;
 	$subscriptions = array();
 
 	foreach ($res as $line) {
@@ -296,7 +291,6 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 		case 'edit':
 			break;
 		default:
-			logMe("Bad action: $action");
 			badRequest();
 	}
 	$addCatId = 0;
@@ -336,14 +330,14 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 					}
 					break;
 				case 'unsubscribe':
-					if ($feedId > 0) {
-						//TODO
+					if ($feedId > 0 && FreshRSS_feed_Controller::deleteFeed($feedId)) {
+						exit('OK');
 					} else {
 						badRequest();
 					}
 					break;
 				case 'edit':
-					if ($feedId > 0 && $feedDAO->moveFeed($feedId, $addCatId)) {
+					if ($feedId > 0 && FreshRSS_feed_Controller::moveFeed($feedId, $addCatId)) {
 						exit('OK');
 					}
 					badRequest();
@@ -620,17 +614,17 @@ $pathInfos = explode('/', $pathInfo);
 Minz_Configuration::register('system',
                              DATA_PATH . '/config.php',
                              DATA_PATH . '/config.default.php');
-$system_conf = Minz_Configuration::get('system');
-if (!$system_conf->api_enabled) {
+FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
+if (!FreshRSS_Context::$system_conf->api_enabled) {
 	serviceUnavailable();
 }
 
 Minz_Session::init('FreshRSS');
 
 $user = authorizationToUser();
-$conf = null;
+FreshRSS_Context::$user_conf = null;
 if ($user !== '') {
-	$conf = get_user_configuration($user);
+	FreshRSS_Context::$user_conf = get_user_configuration($user);
 }
 
 //logMe('User => ' . $user);
@@ -722,7 +716,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			break;
 		case 'edit-tag':	//http://blog.martindoms.com/2010/01/20/using-the-google-reader-api-part-3/
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken($conf, $token);
+			checkToken(FreshRSS_Context::$user_conf, $token);
 			$a = isset($_POST['a']) ? $_POST['a'] : '';	//Add:	user/-/state/com.google/read	user/-/state/com.google/starred
 			$r = isset($_POST['r']) ? $_POST['r'] : '';	//Remove:	user/-/state/com.google/read	user/-/state/com.google/starred
 			$e_ids = multiplePosts('i');	//item IDs
@@ -730,7 +724,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			break;
 		case 'mark-all-as-read':
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken($conf, $token);
+			checkToken(FreshRSS_Context::$user_conf, $token);
 			$streamId = $_POST['s'];	//StreamId
 			$ts = isset($_POST['ts']) ? $_POST['ts'] : '0';	//Older than timestamp in nanoseconds
 			if (!ctype_digit($ts)) {
@@ -739,7 +733,7 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			markAllAsRead($streamId, $ts);
 			break;
 		case 'token':
-			token($conf);
+			token(FreshRSS_Context::$user_conf);
 			break;
 	}
 } elseif ($pathInfos[1] === 'check' && $pathInfos[2] === 'compatibility') {
-- 
cgit v1.2.3


From 6a812b0d31df275d9b8b211a90628400ee097644 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 19:54:46 +0200
Subject: API rename feed

---
 app/Controllers/feedController.php | 12 +++++++++---
 p/api/greader.php                  | 19 ++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0ff27e0da..0364424f5 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -492,6 +492,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		return $updated_feeds;
 	}
 
+	public static function renameFeed($feed_id, $feed_name) {
+		if ($feed_id <= 0 || $feed_name == '') {
+			return false;
+		}
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		return $feedDAO->updateFeed($feed_id, array('name' => $feed_name));
+	}
+
 	public static function moveFeed($feed_id, $cat_id) {
 		if ($feed_id <= 0) {
 			return false;
@@ -504,9 +512,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$cat_id = $def_cat->id();
 		}
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$feed = $feedDAO->searchById($feed_id);
-		return $feed && ($feed->category() == $cat_id ||
-			$feedDAO->updateFeed($feed_id, array('category' => $cat_id)));
+		return $feedDAO->updateFeed($feed_id, array('category' => $cat_id));
 	}
 
 	/**
diff --git a/p/api/greader.php b/p/api/greader.php
index 9b07e0729..131eb65c5 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -325,27 +325,32 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 				case 'subscribe':
 					if ($feedId <= 0) {
 						//TODO
+						notImplemented();
 					} else {
 						badRequest();
 					}
 					break;
 				case 'unsubscribe':
-					if ($feedId > 0 && FreshRSS_feed_Controller::deleteFeed($feedId)) {
-						exit('OK');
-					} else {
+					if (!($feedId > 0 && FreshRSS_feed_Controller::deleteFeed($feedId))) {
 						badRequest();
 					}
 					break;
 				case 'edit':
-					if ($feedId > 0 && FreshRSS_feed_Controller::moveFeed($feedId, $addCatId)) {
-						exit('OK');
+					if ($feedId > 0) {
+						if ($addCatId > 0) {
+							FreshRSS_feed_Controller::moveFeed($feedId, $addCatId);
+						}
+						if ($title != '') {
+							FreshRSS_feed_Controller::renameFeed($feedId, $title);
+						}
+					} else {
+						badRequest();
 					}
-					badRequest();
 					break;
 			}
 		}
 	}
-	notImplemented();
+	exit('OK');
 }
 
 function unreadCount() {	//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#unread-count
-- 
cgit v1.2.3


From 0a79d4085b18c5607438f8ebd56543508e7db3a8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 20:43:52 +0200
Subject: Refactor controller for actualize feed

---
 app/Controllers/feedController.php | 46 +++++++++++++++++++++-----------------
 lib/lib_rss.php                    |  2 +-
 p/api/pshb.php                     |  7 ++----
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0364424f5..25d504480 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -261,33 +261,18 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
-	/**
-	 * This action actualizes entries from one or several feeds.
-	 *
-	 * Parameters are:
-	 *   - id (default: false): Feed ID
-	 *   - url (default: false): Feed URL
-	 *   - force (default: false)
-	 * If id and url are 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($simplePiePush = null) {
+	public static function actualizeFeed($feed_id, $feed_url, $force, $simplePiePush = null) {
 		@set_time_limit(300);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
-		Minz_Session::_param('actualize_feeds', false);
-		$id = Minz_Request::param('id');
-		$url = Minz_Request::param('url');
-		$force = Minz_Request::param('force');
-
 		// Create a list of feeds to actualize.
-		// If id is set and valid, corresponding feed is added to the list but
+		// If feed_id is set and valid, corresponding feed is added to the list but
 		// alone in order to automatize further process.
 		$feeds = array();
-		if ($id || $url) {
-			$feed = $id ? $feedDAO->searchById($id) : $feedDAO->searchByUrl($url);
+		if ($feed_id > 0 || $feed_url) {
+			$feed = $feed_id > 0 ? $feedDAO->searchById($feed_id) : $feedDAO->searchByUrl($feed_url);
 			if ($feed) {
 				$feeds[] = $feed;
 			}
@@ -309,7 +294,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$url = $feed->url();	//For detection of HTTP 301
 
 			$pubSubHubbubEnabled = $pubsubhubbubEnabledGeneral && $feed->pubSubHubbubEnabled();
-			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
+			if ((!$simplePiePush) && (!$feed_id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
 				//$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
 				//Minz_Log::debug($text);
 				//file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
@@ -464,6 +449,26 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				break;
 			}
 		}
+		return array($updated_feeds, reset($feeds));
+	}
+
+	/**
+	 * This action actualizes entries from one or several feeds.
+	 *
+	 * Parameters are:
+	 *   - id (default: false): Feed ID
+	 *   - url (default: false): Feed URL
+	 *   - force (default: false)
+	 * If id and url are 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() {
+		Minz_Session::_param('actualize_feeds', false);
+		$id = Minz_Request::param('id');
+		$url = Minz_Request::param('url');
+		$force = Minz_Request::param('force');
+
+		list($updated_feeds, $feed) = self::actualizeFeed($id, $url, $force);
 
 		if (Minz_Request::param('ajax')) {
 			// Most of the time, ajax request is for only one feed. But since
@@ -479,7 +484,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		} else {
 			// Redirect to the main page with correct notification.
 			if ($updated_feeds === 1) {
-				$feed = reset($feeds);
 				Minz_Request::good(_t('feedback.sub.feed.actualized', $feed->name()), array(
 					'params' => array('get' => 'f_' . $feed->id())
 				));
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 82ddced2c..a4cd8e782 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -165,7 +165,7 @@ function customSimplePie() {
 	$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_useragent('FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_syslog($system_conf->simplepie_syslog_enabled);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration($limits['cache_duration']);
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 650767114..94a0068ed 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -88,9 +88,6 @@ if ($ORIGINAL_INPUT == '') {
 Minz_Configuration::register('system', DATA_PATH . '/config.php', DATA_PATH . '/config.default.php');
 $system_conf = Minz_Configuration::get('system');
 $system_conf->auth_type = 'none';	// avoid necessity to be logged in (not saved!)
-Minz_Translate::init('en');
-Minz_Request::_param('ajax', true);
-$feedController = new FreshRSS_feed_Controller();
 
 $simplePie = customSimplePie();
 $simplePie->set_raw_data($ORIGINAL_INPUT);
@@ -106,7 +103,6 @@ if ($self !== base64url_decode($canonical64)) {
 	//die('Self URL does not match registered canonical URL!');
 	$self = base64url_decode($canonical64);
 }
-Minz_Request::_param('url', $self);
 
 $nb = 0;
 foreach ($users as $userFilename) {
@@ -121,7 +117,8 @@ foreach ($users as $userFilename) {
 		                             join_path(USERS_PATH, $username, 'config.php'),
 		                             join_path(USERS_PATH, '_', 'config.default.php'));
 		FreshRSS_Context::init();
-		if ($feedController->actualizeAction($simplePie) > 0) {
+		list($updated_feeds, $feed) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie);
+		if ($updated_feeds > 0) {
 			$nb++;
 		}
 	} catch (Exception $e) {
-- 
cgit v1.2.3


From 324c83348ca44f3c13f4e0efeea25bbc96ed3b05 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 23:29:49 +0200
Subject: Refactor controller add feed

---
 app/Controllers/feedController.php            | 181 +++++++++++---------------
 app/Exceptions/AlreadySubscribedException.php |  14 ++
 app/Exceptions/FeedNotAddedException.php      |  14 ++
 app/Models/Feed.php                           |   4 +-
 4 files changed, 105 insertions(+), 108 deletions(-)
 create mode 100644 app/Exceptions/AlreadySubscribedException.php
 create mode 100644 app/Exceptions/FeedNotAddedException.php

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 25d504480..c6adc64cb 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -26,6 +26,63 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
+	public static function addFeed($url, $cat_id = 0, $new_cat_name = '', $http_auth = '') {
+		@set_time_limit(300);
+
+		$catDAO = new FreshRSS_CategoryDAO();
+
+		$cat = null;
+		if ($cat_id > 0) {
+			$cat = $catDAO->searchById($cat_id);
+		}
+		if ($cat == null && $new_cat_name != '') {
+			$cat = $catDAO->addCategory(array('name' => $new_cat_name));
+		}
+		if ($cat == null) {
+			$catDAO->checkDefault();
+			$def_cat = $catDAO->getDefault();
+			$cat = $def_cat->id();
+		}
+
+		$feed = new FreshRSS_Feed($url);	//Throws FreshRSS_BadUrl_Exception
+		$feed->_httpAuth($http_auth);
+		$feed->load(true);	//Throws FreshRSS_Feed_Exception, Minz_FileNotExistException
+		$feed->_category($cat_id);
+
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		if ($feedDAO->searchByUrl($feed->url())) {
+			throw new FreshRSS_AlreadySubscribed_Exception($url, $feed->name());
+		}
+
+		// Call the extension hook
+		$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
+		if ($feed === null) {
+			throw new FreshRSS_FeedNotAdded_Exception($url, $feed->name());
+		}
+
+		$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.
+			throw new FreshRSS_FeedNotAdded_Exception($url, $feed->name());
+		}
+		$feed->_id($id);
+
+		// Ok, feed has been added in database. Now we have to refresh entries.
+		self::actualizeFeed($id, $url, false, null, true);
+
+		return $feed;
+	}
+
 	/**
 	 * This action subscribes to a feed.
 	 *
@@ -59,7 +116,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->catDAO = new FreshRSS_CategoryDAO();
 		$url_redirect = array(
 			'c' => 'subscription',
 			'a' => 'index',
@@ -74,26 +130,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 
 		if (Minz_Request::isPost()) {
-			@set_time_limit(300);
-
 			$cat = Minz_Request::param('category');
+			$new_cat_name = '';
 			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;
-				} else {
-					$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();
+				$new_cat_name = isset($new_cat['name']) ? $new_cat['name'] : '';
 			}
 
 			// HTTP information are useful if feed is protected behind a
@@ -105,103 +148,24 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$http_auth = $user . ':' . $pass;
 			}
 
-			$transaction_started = false;
 			try {
-				$feed = new FreshRSS_Feed($url);
+				$feed = self::addFeed($url, $cat, $new_cat_name, $http_auth);
 			} catch (FreshRSS_BadUrl_Exception $e) {
 				// Given url was not a valid url!
 				Minz_Log::warning($e->getMessage());
 				Minz_Request::bad(_t('feedback.sub.feed.invalid_url', $url), $url_redirect);
-			}
-
-			$feed->_httpAuth($http_auth);
-
-			try {
-				$feed->load(true);
 			} catch (FreshRSS_Feed_Exception $e) {
 				// Something went bad (timeout, server not found, etc.)
 				Minz_Log::warning($e->getMessage());
-				Minz_Request::bad(
-					_t('feedback.sub.feed.internal_problem', _url('index', 'logs')),
-					$url_redirect
-				);
+				Minz_Request::bad(_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('feedback.sub.feed.internal_problem', _url('index', 'logs')),
-					$url_redirect
-				);
-			}
-
-			if ($feedDAO->searchByUrl($feed->url())) {
-				Minz_Request::bad(
-					_t('feedback.sub.feed.already_subscribed', $feed->name()),
-					$url_redirect
-				);
-			}
-
-			$feed->_category($cat);
-
-			// Call the extension hook
-			$name = $feed->name();
-			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
-			if ($feed === null) {
-				Minz_Request::bad(_t('feedback.sub.feed.not_added', $name), $url_redirect);
-			}
-
-			$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('feedback.sub.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();
-			//$feed->pubSubHubbubPrepare();	//TODO: prepare PubSubHubbub already when adding the feed
-
-			$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::$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
-			// performances.
-			$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 ($entry === null) {
-					// An extension has returned a null value, there is nothing to insert.
-					continue;
-				}
-
-				$values = $entry->toArray();
-				$entryDAO->addEntry($values);
-			}
-			$feedDAO->updateLastUpdate($feed->id());
-			if ($feedDAO->inTransaction()) {
-				$feedDAO->commit();
+				Minz_Request::bad(_t('feedback.sub.feed.internal_problem', _url('index', 'logs')), $url_redirect);
+			} catch (FreshRSS_AlreadySubscribed_Exception $e) {
+				Minz_Request::bad(_t('feedback.sub.feed.already_subscribed', $e->feedName()), $url_redirect);
+			} catch (FreshRSS_FeedNotAdded_Exception $e) {
+				Minz_Request::bad(_t('feedback.sub.feed.not_added', $e->feedName()), $url_redirect);
 			}
 
 			// Entries are in DB, we redirect to feed configuration page.
@@ -211,6 +175,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// GET request: we must ask confirmation to user before adding feed.
 			Minz_View::prependTitle(_t('sub.feed.title_add') . ' · ');
 
+			$this->catDAO = new FreshRSS_CategoryDAO();
 			$this->view->categories = $this->catDAO->listCategories(false);
 			$this->view->feed = new FreshRSS_Feed($url);
 			try {
@@ -261,7 +226,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
-	public static function actualizeFeed($feed_id, $feed_url, $force, $simplePiePush = null) {
+	public static function actualizeFeed($feed_id, $feed_url, $force, $simplePiePush = null, $isNewFeed = false) {
 		@set_time_limit(300);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -310,7 +275,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				if ($simplePiePush) {
 					$feed->loadEntries($simplePiePush);	//Used by PubSubHubbub
 				} else {
-					$feed->load(false);
+					$feed->load(false, $isNewFeed);
 				}
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::warning($e->getMessage());
@@ -320,7 +285,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			$feed_history = $feed->keepHistory();
-			if ($feed_history == -2) {
+			if ($isNewFeed) {
+				$feed_history = -1; //∞
+			} elseif ($feed_history == -2) {
 				// TODO: -2 must be a constant!
 				// -2 means we take the default value from configuration
 				$feed_history = FreshRSS_Context::$user_conf->keep_history_default;
@@ -360,7 +327,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						// This entry should not be added considering configuration and date.
 						$oldGuids[] = $entry->guid();
 					} else {
-						if ($entry_date < $date_min) {
+						if ($isNewFeed) {
+							$id = min(time(), $entry_date) . uSecString();
+						} elseif ($entry_date < $date_min) {
 							$id = min(time(), $entry_date) . uSecString();
 							$entry->_isRead(true);	//Old article that was not in database. Probably an error, so mark as read
 						} else {
diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Exceptions/AlreadySubscribedException.php
new file mode 100644
index 000000000..f85d51300
--- /dev/null
+++ b/app/Exceptions/AlreadySubscribedException.php
@@ -0,0 +1,14 @@
+<?php
+
+class FreshRSS_AlreadySubscribed_Exception extends Exception {
+	private $feedName = '';
+
+	public function __construct($url, $feedName) {
+		parent::__construct('Already subscribed! ' . $url, 2135);
+		$this->$feedName = $feedName;
+	}
+
+	public function feedName() {
+		return $this->feedName();
+	}
+}
diff --git a/app/Exceptions/FeedNotAddedException.php b/app/Exceptions/FeedNotAddedException.php
new file mode 100644
index 000000000..02a8bc6be
--- /dev/null
+++ b/app/Exceptions/FeedNotAddedException.php
@@ -0,0 +1,14 @@
+<?php
+
+class FreshRSS_FeedNotAdded_Exception extends Exception {
+	private $feedName = '';
+
+	public function __construct($url, $feedName) {
+		parent::__construct('Feed not added! ' . $url, 2147);
+		$this->$feedName = $feedName;
+	}
+
+	public function feedName() {
+		return $this->feedName();
+	}
+}
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 4403a23c4..658b9ccca 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -216,7 +216,7 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->nbEntries = intval($value);
 	}
 
-	public function load($loadDetails = false) {
+	public function load($loadDetails = false, $noCache = false) {
 		if ($this->url !== null) {
 			if (CACHE_PATH === false) {
 				throw new Minz_FileNotExistException(
@@ -268,7 +268,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$this->_url($clean_url);
 				}
 
-				if (($mtime === true) || ($mtime > $this->lastUpdate)) {
+				if (($mtime === true) || ($mtime > $this->lastUpdate) || $noCache) {
 					//Minz_Log::debug('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $clean_url);
 					$this->loadEntries($feed);	// et on charge les articles du flux
 				} else {
-- 
cgit v1.2.3


From 71b98a0ffc41ea869e8c49c2889cda5b3e113030 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Sep 2016 00:14:36 +0200
Subject: API add feed

---
 app/Controllers/feedController.php | 10 +++++-----
 p/api/greader.php                  | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c6adc64cb..faf670e6e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -26,7 +26,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 	}
 
-	public static function addFeed($url, $cat_id = 0, $new_cat_name = '', $http_auth = '') {
+	public static function addFeed($url, $title = '', $cat_id = 0, $new_cat_name = '', $http_auth = '') {
 		@set_time_limit(300);
 
 		$catDAO = new FreshRSS_CategoryDAO();
@@ -40,9 +40,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 		if ($cat == null) {
 			$catDAO->checkDefault();
-			$def_cat = $catDAO->getDefault();
-			$cat = $def_cat->id();
+			$cat = $catDAO->getDefault();
 		}
+		$cat_id = $cat->id();
 
 		$feed = new FreshRSS_Feed($url);	//Throws FreshRSS_BadUrl_Exception
 		$feed->_httpAuth($http_auth);
@@ -63,7 +63,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$values = array(
 			'url' => $feed->url(),
 			'category' => $feed->category(),
-			'name' => $feed->name(),
+			'name' => $title != '' ? $title : $feed->name(),
 			'website' => $feed->website(),
 			'description' => $feed->description(),
 			'lastUpdate' => time(),
@@ -149,7 +149,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			try {
-				$feed = self::addFeed($url, $cat, $new_cat_name, $http_auth);
+				$feed = self::addFeed($url, '', $cat, $new_cat_name, $http_auth);
 			} catch (FreshRSS_BadUrl_Exception $e) {
 				// Given url was not a valid url!
 				Minz_Log::warning($e->getMessage());
diff --git a/p/api/greader.php b/p/api/greader.php
index 131eb65c5..dc8dd92bc 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -298,18 +298,22 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 	if ($add != '' || $remove != '') {
 		$categoryDAO = new FreshRSS_CategoryDAO();
 	}
+	$c_name = '';
 	if ($add != '' && strpos($add, 'user/-/label/') === 0) {	//user/-/label/Example
-		$c_name = basename($add);
+		$c_name = substr($add, 13);
 		$cat = $categoryDAO->searchByName($c_name);
 		$addCatId = $cat == null ? -1 : $cat->id();
 	} else if ($remove != '' && strpos($remove, 'user/-/label/')) {
 		$addCatId = 1;	//Default category
 	}
+	if ($addCatId <= 0 && $c_name = '') {
+		$addCatId = 1;	//Default category
+	}
 	$feedDAO = FreshRSS_Factory::createFeedDao();
 	for ($i = count($streamNames) - 1; $i >= 0; $i--) {
 		$streamName = $streamNames[$i];	//feed/http://example.net/sample.xml	;	feed/338
 		if (strpos($streamName, 'feed/') === 0) {
-			$streamName = basename($streamName);
+			$streamName = substr($streamName, 5);
 			$feedId = 0;
 			if (ctype_digit($streamName)) {
 				if ($action === 'subscribe') {
@@ -324,11 +328,15 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 			switch ($action) {
 				case 'subscribe':
 					if ($feedId <= 0) {
-						//TODO
-						notImplemented();
-					} else {
-						badRequest();
+						$http_auth = '';	//TODO
+						try {
+							$feed = FreshRSS_feed_Controller::addFeed($streamName, $title, $addCatId, $c_name, $http_auth);
+							continue;
+						} catch (Exception $e) {
+							logMe("subscriptionEdit error subscribe: " . $e->getMessage());
+						}
 					}
+					badRequest();
 					break;
 				case 'unsubscribe':
 					if (!($feedId > 0 && FreshRSS_feed_Controller::deleteFeed($feedId))) {
-- 
cgit v1.2.3


From 85c8fba94fa08dbf71afa0d0ef4fd95607ddb493 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Sep 2016 00:34:49 +0200
Subject: API add feed bug with PSHB

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

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 658b9ccca..f2f345662 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -460,7 +460,7 @@ class FreshRSS_Feed extends Minz_Model {
 				CURLOPT_URL => $this->hubUrl,
 				CURLOPT_FOLLOWLOCATION => true,
 				CURLOPT_RETURNTRANSFER => true,
-				CURLOPT_USERAGENT => _t('gen.freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')',
+				CURLOPT_USERAGENT => 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')',
 				CURLOPT_POSTFIELDS => 'hub.verify=sync'
 					. '&hub.mode=' . ($state ? 'subscribe' : 'unsubscribe')
 					. '&hub.topic=' . urlencode($this->selfUrl)
-- 
cgit v1.2.3


From 36e6c10f21aa682a737aa3754750f8ee8820598e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Sep 2016 01:05:00 +0200
Subject: API rename category

---
 p/api/greader.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/p/api/greader.php b/p/api/greader.php
index dc8dd92bc..96c2b2ee3 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -600,6 +600,22 @@ function editTag($e_ids, $a, $r) {
 	exit('OK');
 }
 
+function renameTag($s, $dest) {
+	//logMe("renameTag()");
+	if ($s != '' && strpos($s, 'user/-/label/') === 0 &&
+		$dest != '' &&  strpos($dest, 'user/-/label/') === 0) {
+		$s = substr($s, 13);
+		$categoryDAO = new FreshRSS_CategoryDAO();
+		$cat = $categoryDAO->searchByName($s);
+		if ($cat != null) {
+			$dest = substr($dest, 13);
+			$categoryDAO->updateCategory($cat->id(), array('name' => $dest));
+			exit('OK');
+		}
+	}
+	badRequest();
+}
+
 function markAllAsRead($streamId, $olderThanId) {
 	//logMe("markAllAsRead($streamId, $olderThanId)");
 	$entryDAO = FreshRSS_Factory::createEntryDao();
@@ -735,6 +751,13 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			$e_ids = multiplePosts('i');	//item IDs
 			editTag($e_ids, $a, $r);
 			break;
+		case 'rename-tag':	//https://github.com/theoldreader/api
+			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
+			checkToken(FreshRSS_Context::$user_conf, $token);
+			$s = isset($_POST['s']) ? $_POST['s'] : '';	//user/-/label/Folder
+			$dest = isset($_POST['dest']) ? $_POST['dest'] : '';	//user/-/label/NewFolder
+			renameTag($s, $dest);
+			break;
 		case 'mark-all-as-read':
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
 			checkToken(FreshRSS_Context::$user_conf, $token);
-- 
cgit v1.2.3


From 86a470b1483a8a0cb77ed00da53813f1777a1895 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Sep 2016 01:11:52 +0200
Subject: API delete category

---
 p/api/greader.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/p/api/greader.php b/p/api/greader.php
index 96c2b2ee3..e77ef3726 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -616,6 +616,21 @@ function renameTag($s, $dest) {
 	badRequest();
 }
 
+function disableTag($s, $dest) {
+	//logMe("renameTag()");
+	if ($s != '' && strpos($s, 'user/-/label/') === 0) {
+		$s = substr($s, 13);
+		$categoryDAO = new FreshRSS_CategoryDAO();
+		$cat = $categoryDAO->searchByName($s);
+		if ($cat != null) {
+			$feedDAO = FreshRSS_Factory::createFeedDao();
+			$feedDAO->changeCategory($cat->id(), 0);
+			exit('OK');
+		}
+	}
+	badRequest();
+}
+
 function markAllAsRead($streamId, $olderThanId) {
 	//logMe("markAllAsRead($streamId, $olderThanId)");
 	$entryDAO = FreshRSS_Factory::createEntryDao();
@@ -758,6 +773,12 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 			$dest = isset($_POST['dest']) ? $_POST['dest'] : '';	//user/-/label/NewFolder
 			renameTag($s, $dest);
 			break;
+		case 'disable-tag':	//https://github.com/theoldreader/api
+			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
+			checkToken(FreshRSS_Context::$user_conf, $token);
+			$s = isset($_POST['s']) ? $_POST['s'] : '';	//user/-/label/Folder
+			disableTag($s);
+			break;
 		case 'mark-all-as-read':
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
 			checkToken(FreshRSS_Context::$user_conf, $token);
-- 
cgit v1.2.3


From eebeb02eceb4d0716eb96ff5ba32179c5bd18459 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Sep 2016 01:25:05 +0200
Subject: Readme API

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f82f68fff..2c8dbec9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,16 @@
 
 ## 2016-XX-XX FreshRSS 1.6.0-dev
 
+* API
+	* Support for editing feeds and categories from client applications [#1261](https://github.com/FreshRSS/FreshRSS/pull/1261)
 * Features
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
 		* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
 		* Limited by `min_posts_per_rss` and `max_posts_per_rss` in user config
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
+* Bug fixing
+	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 * Security
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
 * UI
-- 
cgit v1.2.3


From e1528845d8827716c11322f15a5f9ce1523fd2d7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Sep 2016 15:45:06 +0200
Subject: API subscription/quickadd

https://github.com/FreshRSS/FreshRSS/issues/1254
---
 CHANGELOG.md      |  2 +-
 p/api/greader.php | 26 ++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c8dbec9b..a1fe033bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 2016-XX-XX FreshRSS 1.6.0-dev
 
 * API
-	* Support for editing feeds and categories from client applications [#1261](https://github.com/FreshRSS/FreshRSS/pull/1261)
+	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
 * Features
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
diff --git a/p/api/greader.php b/p/api/greader.php
index e77ef3726..e2d7dc039 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -361,6 +361,23 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 	exit('OK');
 }
 
+function quickadd($url) {
+	//logMe("quickadd($url)");
+	try {
+		$feed = FreshRSS_feed_Controller::addFeed($url);
+		exit(json_encode(array(
+				'numResults' => 1,
+				'streamId' => $feed->id(),
+			)));
+	} catch (Exception $e) {
+		logMe("subscriptionEdit error subscribe: " . $e->getMessage());
+		die(json_encode(array(
+				'numResults' => 0,
+				'error' => $e->getMessage(),
+			)));
+	}
+}
+
 function unreadCount() {	//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#unread-count
 	//logMe("unreadCount()");
 	header('Content-Type: application/json; charset=UTF-8');
@@ -531,7 +548,7 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 		$id = basename($streamId);
 	} elseif (strpos($streamId, 'user/-/label/') === 0) {
 		$type = 'c';
-		$c_name = basename($streamId);
+		$c_name = substr($streamId, 13);
 		$categoryDAO = new FreshRSS_CategoryDAO();
 		$cat = $categoryDAO->searchByName($c_name);
 		$id = $cat == null ? -1 : $cat->id();
@@ -638,7 +655,7 @@ function markAllAsRead($streamId, $olderThanId) {
 		$f_id = basename($streamId);
 		$entryDAO->markReadFeed($f_id, $olderThanId);
 	} elseif (strpos($streamId, 'user/-/label/') === 0) {
-		$c_name = basename($streamId);
+		$c_name = substr($streamId, 13);
 		$categoryDAO = new FreshRSS_CategoryDAO();
 		$cat = $categoryDAO->searchByName($c_name);
 		$entryDAO->markReadCat($cat === null ? -1 : $cat->id(), $olderThanId);
@@ -749,6 +766,11 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 							subscriptionEdit($streamNames, $titles, $action, $add, $remove);
 						}
 						break;
+					case 'quickadd':	//https://github.com/theoldreader/api
+						if (isset($_GET['quickadd'])) {
+							quickadd($_GET['quickadd']);
+						}
+						break;
 				}
 			}
 			break;
-- 
cgit v1.2.3


From a37484fd2fee58d48d8e58535b34d8c63352c51e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 25 Sep 2016 15:55:28 +0200
Subject: Fix SimplePie autodiscovery for text/xml HTML pages

https://github.com/FreshRSS/FreshRSS/issues/1264
---
 CHANGELOG.md                                     | 2 ++
 lib/SimplePie/SimplePie/Content/Type/Sniffer.php | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1fe033bc..f13922837 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
+* SimplePie
+	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Security
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
 * UI
diff --git a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
index a32f47f59..daec3607d 100644
--- a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
+++ b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
@@ -109,9 +109,7 @@ class SimplePie_Content_Type_Sniffer
 			{
 				return $this->unknown();
 			}
-			elseif (substr($official, -4) === '+xml'
-				|| $official === 'text/xml'
-				|| $official === 'application/xml')
+			elseif (substr($official, -4) === '+xml')
 			{
 				return $official;
 			}
@@ -126,7 +124,9 @@ class SimplePie_Content_Type_Sniffer
 					return $official;
 				}
 			}
-			elseif ($official === 'text/html')
+			elseif ($official === 'text/html'
+				|| $official === 'text/xml'
+				|| $official === 'application/xml')
 			{
 				return $this->feed_or_html();
 			}
-- 
cgit v1.2.3


From 9291748c4745ff8f4be2beaa2998869fd26e907e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Mon, 26 Sep 2016 10:44:44 +0200
Subject: API implement user-info and fix edits

https://github.com/FreshRSS/FreshRSS/issues/1254

https://github.com/jangernert/FeedReader/issues/59#issuecomment-249491580
---
 app/Controllers/feedController.php | 20 +++++++++++-----
 app/Models/CategoryDAO.php         |  3 +++
 data/users/_/config.default.php    |  1 +
 p/api/greader.php                  | 47 ++++++++++++++++++++++++++++++--------
 4 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index faf670e6e..ca7a818c6 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -473,17 +473,25 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		return $feedDAO->updateFeed($feed_id, array('name' => $feed_name));
 	}
 
-	public static function moveFeed($feed_id, $cat_id) {
+	public static function moveFeed($feed_id, $cat_id, $new_cat_name = '') {
 		if ($feed_id <= 0) {
 			return false;
 		}
-		if ($cat_id <= 0) {
-			// If category was not given get the default one.
-			$catDAO = new FreshRSS_CategoryDAO();
+
+		$catDAO = new FreshRSS_CategoryDAO();
+		if ($cat_id > 0) {
+			$cat = $catDAO->searchById($cat_id);
+			$cat_id = $cat == null ? 0 : $cat->id();
+		}
+		if ($cat_id <= 1 && $new_cat_name != '') {
+			$cat_id = $catDAO->addCategory(array('name' => $new_cat_name));
+		}
+		if ($cat_id <= 1) {
 			$catDAO->checkDefault();
-			$def_cat = $catDAO->getDefault();
-			$cat_id = $def_cat->id();
+			$cat = $catDAO->getDefault();
+			$cat_id = $cat->id();
 		}
+
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		return $feedDAO->updateFeed($feed_id, array('category' => $cat_id));
 	}
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index fc431553e..c103163a1 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -50,6 +50,9 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 	}
 
 	public function deleteCategory($id) {
+		if ($id <= 1) {
+			return false;
+		}
 		$sql = 'DELETE FROM `' . $this->prefix . 'category` WHERE id=?';
 		$stm = $this->bd->prepare($sql);
 
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index 2c56d5f45..6e1d497bc 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -5,6 +5,7 @@ return array (
 	'old_entries' => 3,
 	'keep_history_default' => 0,
 	'ttl_default' => 3600,
+	'mail_login' => '',
 	'token' => '',
 	'passwordHash' => '',
 	'apiPasswordHash' => '',
diff --git a/p/api/greader.php b/p/api/greader.php
index e2d7dc039..8b1e0ffb1 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -222,6 +222,17 @@ function checkToken($conf, $token) {
 	unauthorized();
 }
 
+function userInfo() {	//https://github.com/theoldreader/api#user-info
+	//logMe("userInfo()");
+	$user = Minz_Session::param('currentUser', '_');
+	exit(json_encode(array(
+			'userId' => $user,
+			'userName' => $user,
+			'userProfileId' => $user,
+			'userEmail' => FreshRSS_Context::$user_conf->mail_login,
+		)));
+}
+
 function tagList() {
 	//logMe("tagList()");
 	header('Content-Type: application/json; charset=UTF-8');
@@ -299,14 +310,24 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 		$categoryDAO = new FreshRSS_CategoryDAO();
 	}
 	$c_name = '';
-	if ($add != '' && strpos($add, 'user/-/label/') === 0) {	//user/-/label/Example
-		$c_name = substr($add, 13);
+	if ($add != '' && strpos($add, 'user/') === 0) {	//user/-/label/Example ; user/username/label/Example
+		if (strpos($add, 'user/-/label/') === 0) {
+			$c_name = substr($add, 13);
+		} else {
+			$user = Minz_Session::param('currentUser', '_');
+			$prefix = 'user/' . $user . '/label/';
+			if (strpos($add, $prefix) === 0) {
+				$c_name = substr($add, strlen($prefix));
+			} else {
+				$c_name = '';
+			}
+		}
 		$cat = $categoryDAO->searchByName($c_name);
 		$addCatId = $cat == null ? -1 : $cat->id();
 	} else if ($remove != '' && strpos($remove, 'user/-/label/')) {
 		$addCatId = 1;	//Default category
 	}
-	if ($addCatId <= 0 && $c_name = '') {
+	if ($addCatId <= 0 && $c_name == '') {
 		$addCatId = 1;	//Default category
 	}
 	$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -345,9 +366,7 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 					break;
 				case 'edit':
 					if ($feedId > 0) {
-						if ($addCatId > 0) {
-							FreshRSS_feed_Controller::moveFeed($feedId, $addCatId);
-						}
+						FreshRSS_feed_Controller::moveFeed($feedId, $addCatId, $c_name);
 						if ($title != '') {
 							FreshRSS_feed_Controller::renameFeed($feedId, $title);
 						}
@@ -633,8 +652,8 @@ function renameTag($s, $dest) {
 	badRequest();
 }
 
-function disableTag($s, $dest) {
-	//logMe("renameTag()");
+function disableTag($s) {
+	//logMe("disableTag($s)");
 	if ($s != '' && strpos($s, 'user/-/label/') === 0) {
 		$s = substr($s, 13);
 		$categoryDAO = new FreshRSS_CategoryDAO();
@@ -642,6 +661,9 @@ function disableTag($s, $dest) {
 		if ($cat != null) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
 			$feedDAO->changeCategory($cat->id(), 0);
+			if ($cat->id() > 1) {
+				$categoryDAO->deleteCategory($cat->id());
+			}
 			exit('OK');
 		}
 	}
@@ -798,8 +820,10 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 		case 'disable-tag':	//https://github.com/theoldreader/api
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
 			checkToken(FreshRSS_Context::$user_conf, $token);
-			$s = isset($_POST['s']) ? $_POST['s'] : '';	//user/-/label/Folder
-			disableTag($s);
+			$s_s = multiplePosts('s');
+			foreach ($s_s as $s) {
+				disableTag($s);	//user/-/label/Folder
+			}
 			break;
 		case 'mark-all-as-read':
 			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
@@ -814,6 +838,9 @@ elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfo
 		case 'token':
 			token(FreshRSS_Context::$user_conf);
 			break;
+		case 'user-info':
+			userInfo();
+			break;
 	}
 } elseif ($pathInfos[1] === 'check' && $pathInfos[2] === 'compatibility') {
 	checkCompatibility();
-- 
cgit v1.2.3


From d5ca360ca967d327a184429a2e37aed196add7a0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Mon, 26 Sep 2016 15:20:02 +0200
Subject: API fix feed rename

https://github.com/FreshRSS/FreshRSS/issues/1254

https://github.com/jangernert/FeedReader/issues/59#issuecomment-249558202
---
 app/Controllers/feedController.php | 2 +-
 p/api/greader.php                  | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ca7a818c6..c2a22aeb3 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -474,7 +474,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	}
 
 	public static function moveFeed($feed_id, $cat_id, $new_cat_name = '') {
-		if ($feed_id <= 0) {
+		if ($feed_id <= 0 || ($cat_id <= 0 && $new_cat_name == '')) {
 			return false;
 		}
 
diff --git a/p/api/greader.php b/p/api/greader.php
index 8b1e0ffb1..4965ffd3b 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -323,13 +323,10 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 			}
 		}
 		$cat = $categoryDAO->searchByName($c_name);
-		$addCatId = $cat == null ? -1 : $cat->id();
+		$addCatId = $cat == null ? 0 : $cat->id();
 	} else if ($remove != '' && strpos($remove, 'user/-/label/')) {
 		$addCatId = 1;	//Default category
 	}
-	if ($addCatId <= 0 && $c_name == '') {
-		$addCatId = 1;	//Default category
-	}
 	$feedDAO = FreshRSS_Factory::createFeedDao();
 	for ($i = count($streamNames) - 1; $i >= 0; $i--) {
 		$streamName = $streamNames[$i];	//feed/http://example.net/sample.xml	;	feed/338
@@ -366,7 +363,9 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 					break;
 				case 'edit':
 					if ($feedId > 0) {
-						FreshRSS_feed_Controller::moveFeed($feedId, $addCatId, $c_name);
+						if ($addCatId > 0 || $c_name != '') {
+							FreshRSS_feed_Controller::moveFeed($feedId, $addCatId, $c_name);
+						}
 						if ($title != '') {
 							FreshRSS_feed_Controller::renameFeed($feedId, $title);
 						}
-- 
cgit v1.2.3


From dbc68590da1d95c249f780e2d3ff4707f6f504e9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 27 Sep 2016 23:35:39 +0200
Subject: A bit more PostgreSQL

Simplified statistics https://github.com/FreshRSS/FreshRSS/pull/1250
---
 CHANGELOG.md                  |   2 +
 README.fr.md                  |   2 +-
 README.md                     |   2 +-
 app/Models/StatsDAO.php       |  30 +++++-----
 app/Models/StatsDAOPGSQL.php  | 125 ------------------------------------------
 app/Models/StatsDAOSQLite.php |   2 +-
 app/install.php               |   2 +-
 7 files changed, 21 insertions(+), 144 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f13922837..e88daba93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * API
 	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
+* Compatibility:
+	* Experimental support for PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
 * Features
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
diff --git a/README.fr.md b/README.fr.md
index 8dc0f6fec..65cef544f 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -35,7 +35,7 @@ Nous sommes une communauté amicale.
 * PHP 5.3.3+ (PHP 5.4+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
 	* Requis : [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite) ou [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
 	* Recommandés : [JSON](http://php.net/json), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](http://php.net/mbstring) et/ou [iconv](http://php.net/iconv) (pour conversion d’encodages), [Zip](http://php.net/zip) (pour import/export), [zlib](http://php.net/zlib) (pour les flux compressés)
-* MySQL 5.5.3+ (recommandé), ou SQLite 3.7.4+, ou PostgreSQL
+* MySQL 5.5.3+ (recommandé), ou SQLite 3.7.4+, ou PostgreSQL (experimental)
 * Un navigateur Web récent tel Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Fonctionne aussi sur mobile
 
diff --git a/README.md b/README.md
index fc2c6fdb9..505a1d970 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ We are a friendly community.
 * PHP 5.3.3+ (PHP 5.4+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
 	* Required extensions: [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite) or [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
 	* Recommended extensions: [JSON](http://php.net/json), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names), [mbstring](http://php.net/mbstring) and/or [iconv](http://php.net/iconv) (for charset conversion), [Zip](http://php.net/zip) (for import/export), [zlib](http://php.net/zlib) (for compressed feeds)
-* MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL
+* MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL (experimental)
 * A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Works on mobile
 
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index e6998a6d7..fa682f488 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -41,8 +41,8 @@ SELECT COUNT(1) AS total,
 COUNT(1) - SUM(e.is_read) AS count_unreads,
 SUM(e.is_read) AS count_reads,
 SUM(e.is_favorite) AS count_favorites
-FROM {$this->prefix}entry AS e
-, {$this->prefix}feed AS f
+FROM `{$this->prefix}entry` AS e
+, `{$this->prefix}feed` AS f
 WHERE e.id_feed = f.id
 {$filter}
 SQL;
@@ -68,7 +68,7 @@ SQL;
 		$sql = <<<SQL
 SELECT FLOOR((date - {$midnight}) / 86400) AS day,
 COUNT(*) as count
-FROM {$this->prefix}entry
+FROM `{$this->prefix}entry`
 WHERE date >= {$oldest} AND date < {$midnight}
 GROUP BY day
 ORDER BY day ASC
@@ -138,7 +138,7 @@ SQL;
 		$sql = <<<SQL
 SELECT DATE_FORMAT(FROM_UNIXTIME(e.date), '{$period}') AS period
 , COUNT(1) AS count
-FROM {$this->prefix}entry AS e
+FROM `{$this->prefix}entry` AS e
 {$restrict}
 GROUP BY period
 ORDER BY period ASC
@@ -202,7 +202,7 @@ SQL;
 SELECT COUNT(1) AS count
 , MIN(date) AS date_min
 , MAX(date) AS date_max
-FROM {$this->prefix}entry AS e
+FROM `{$this->prefix}entry` AS e
 {$restrict}
 SQL;
 		$stm = $this->bd->prepare($sql);
@@ -246,8 +246,8 @@ SQL;
 		$sql = <<<SQL
 SELECT c.name AS label
 , COUNT(f.id) AS data
-FROM {$this->prefix}category AS c,
-{$this->prefix}feed AS f
+FROM `{$this->prefix}category` AS c,
+`{$this->prefix}feed` AS f
 WHERE c.id = f.category
 GROUP BY label
 ORDER BY data DESC
@@ -269,9 +269,9 @@ SQL;
 		$sql = <<<SQL
 SELECT c.name AS label
 , COUNT(e.id) AS data
-FROM {$this->prefix}category AS c,
-{$this->prefix}feed AS f,
-{$this->prefix}entry AS e
+FROM `{$this->prefix}category` AS c,
+`{$this->prefix}feed` AS f,
+`{$this->prefix}entry` AS e
 WHERE c.id = f.category
 AND f.id = e.id_feed
 GROUP BY label
@@ -295,9 +295,9 @@ SELECT f.id AS id
 , MAX(f.name) AS name
 , MAX(c.name) AS category
 , COUNT(e.id) AS count
-FROM {$this->prefix}category AS c,
-{$this->prefix}feed AS f,
-{$this->prefix}entry AS e
+FROM `{$this->prefix}category` AS c,
+`{$this->prefix}feed` AS f,
+`{$this->prefix}entry` AS e
 WHERE c.id = f.category
 AND f.id = e.id_feed
 GROUP BY f.id
@@ -320,8 +320,8 @@ SELECT MAX(f.id) as id
 , MAX(f.name) AS name
 , MAX(date) AS last_date
 , COUNT(*) AS nb_articles
-FROM {$this->prefix}feed AS f,
-{$this->prefix}entry AS e
+FROM `{$this->prefix}feed` AS f,
+`{$this->prefix}entry` AS e
 WHERE f.id = e.id_feed
 GROUP BY f.id
 ORDER BY name
diff --git a/app/Models/StatsDAOPGSQL.php b/app/Models/StatsDAOPGSQL.php
index 0bde72e58..649dfa8b5 100644
--- a/app/Models/StatsDAOPGSQL.php
+++ b/app/Models/StatsDAOPGSQL.php
@@ -2,94 +2,6 @@
 
 class FreshRSS_StatsDAOPGSQL extends FreshRSS_StatsDAO {
 
-	/**
-	 * Calculates entry repartition for the selection.
-	 * The repartition includes:
-	 *   - total entries
-	 *   - read entries
-	 *   - unread entries
-	 *   - favorite entries
-	 *
-	 * @param null|integer $feed feed id
-	 * @param boolean $only_main
-	 * @return array
-	 */
-	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(case when e.is_read then 1 else 0 end) AS unread,
-SUM(case when e.is_read then 1 else 0 end) AS read,
-SUM(case when e.is_favorite then 1 else 0 end) AS favorite
-FROM "{$this->prefix}entry" AS e
-, "{$this->prefix}feed" AS f
-WHERE e.id_feed = f.id
-{$filter}
-SQL;
-		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-
-		return $res[0];
-	}
-
-	/**
-	 * Calculates entry count per day on a 30 days period.
-	 * Returns the result as a JSON string.
-	 *
-	 * @return string
-	 */
-	public function calculateEntryCount() {
-		$count = $this->initEntryCountArray();
-		$period = self::ENTRY_COUNT_PERIOD;
-
-		// Get stats per day for the last 30 days
-		$sql = <<<SQL
-SELECT to_timestamp(e.date) - NOW() AS day,
-COUNT(1) AS count
-FROM "{$this->prefix}entry" AS e
-WHERE to_timestamp(e.date) BETWEEN NOW() - INTERVAL '{$period} DAYS' AND NOW() - INTERVAL '1 DAY'
-GROUP BY day
-ORDER BY day ASC
-SQL;
-		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-
-		foreach ($res as $value) {
-			$count[$value['day']] = (int) $value['count'];
-		}
-
-		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 to_timestamp(e.date) BETWEEN NOW() - INTERVAL '{$period} DAYS' AND NOW() - INTERVAL '1 DAY'
-SQL;
-		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetch(PDO::FETCH_NAMED);
-
-		return round($res['average'], 2);
-	}
-
 	/**
 	 * Calculates the number of article per hour of the day per feed
 	 *
@@ -152,41 +64,4 @@ SQL;
 		return $this->convertToSerie($repartition);
 	}
 
-	/**
-	 * 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
-	 */
-	protected function calculateEntryAveragePerFeedPerPeriod($period, $feed = null) {
-		$restrict = '';
-		if ($feed) {
-			$restrict = "WHERE e.id_feed = {$feed}";
-		}
-		$sql = <<<SQL
-SELECT COUNT(1) AS count
-, MIN(date) AS date_min
-, MAX(date) AS date_max
-FROM "{$this->prefix}entry" AS e
-{$restrict}
-SQL;
-		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetch(PDO::FETCH_NAMED);
-		$date_min = new \DateTime();
-		$date_min->setTimestamp($res['date_min']);
-		$date_max = new \DateTime();
-		$date_max->setTimestamp($res['date_max']);
-		$interval = $date_max->diff($date_min, true);
-		$interval_in_days = $interval->format('%a');
-		if ($interval_in_days <= 0) {
-			// Surely only one article.
-			// We will return count / (period/period) == count.
-			$interval_in_days = $period;
-		}
-
-		return $res['count'] / ($interval_in_days / $period);
-	}
-
 }
diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php
index e09d18c77..ec0cfa81a 100644
--- a/app/Models/StatsDAOSQLite.php
+++ b/app/Models/StatsDAOSQLite.php
@@ -11,7 +11,7 @@ class FreshRSS_StatsDAOSQLite extends FreshRSS_StatsDAO {
 		$sql = <<<SQL
 SELECT strftime('{$period}', e.date, 'unixepoch') AS period
 , COUNT(1) AS count
-FROM {$this->prefix}entry AS e
+FROM `{$this->prefix}entry` AS e
 {$restrict}
 GROUP BY period
 ORDER BY period ASC
diff --git a/app/install.php b/app/install.php
index 7f4e65034..1972379e5 100644
--- a/app/install.php
+++ b/app/install.php
@@ -714,7 +714,7 @@ function printStep3() {
 				<?php if (extension_loaded('pdo_pgsql')) {?>
 				<option value="pgsql"
 					<?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'pgsql') ? 'selected="selected"' : ''; ?>>
-					PostgreSQL
+					PostgreSQL (⚠️ experimental)
 				</option>
 				<?php }?>
 				</select>
-- 
cgit v1.2.3


From 63a8f5e167e4bf17f76eb6e8baa9b75814c4512d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 29 Sep 2016 22:48:56 +0200
Subject: Fix global view

Bug introduced in version 1.5.0 by
https://github.com/FreshRSS/FreshRSS/commit/56ffc115d15bf136bfced74707ccc1f41c7b5e44
---
 app/views/index/global.phtml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 1e53e4f8c..f35732c8f 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -11,10 +11,13 @@
 
 <div id="stream" class="global<?php echo $class; ?>">
 <?php
+	$params = Minz_Request::fetchGET();
+	unset($params['c']);
+	unset($params['a']);
 	$url_base = array(
 		'c' => 'index',
 		'a' => 'normal',
-		'params' => Minz_Request::fetchGET(),
+		'params' => $params,
 	);
 
 	foreach ($this->categories as $cat) {
-- 
cgit v1.2.3


From b1a16f985cabeb67ff58fa16951aa49ca96c2c4a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 29 Sep 2016 22:50:55 +0200
Subject: Readme fix Global view

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f13922837..1c2d47586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
+	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
 * SimplePie
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Security
-- 
cgit v1.2.3


From c35111fe53ba2081abc735cb61e83987ade5ce86 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 29 Sep 2016 23:36:25 +0200
Subject: Fix SQLite

---
 app/Models/StatsDAO.php       | 7 ++++++-
 app/Models/StatsDAOSQLite.php | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index fa682f488..2ce4f2944 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -4,6 +4,10 @@ class FreshRSS_StatsDAO extends Minz_ModelPdo {
 
 	const ENTRY_COUNT_PERIOD = 30;
 
+	protected function sqlFloor($s) {
+		return "FLOOR($s)";
+	}
+
 	/**
 	 * Calculates entry repartition for all feeds and for main stream.
 	 *
@@ -65,8 +69,9 @@ SQL;
 		$oldest = $midnight - (self::ENTRY_COUNT_PERIOD * 86400);
 
 		// Get stats per day for the last 30 days
+		$sqlDay = $this->sqlFloor("(date - $midnight) / 86400");
 		$sql = <<<SQL
-SELECT FLOOR((date - {$midnight}) / 86400) AS day,
+SELECT {$sqlDay} AS day,
 COUNT(*) as count
 FROM `{$this->prefix}entry`
 WHERE date >= {$oldest} AND date < {$midnight}
diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php
index ec0cfa81a..6cfc20463 100644
--- a/app/Models/StatsDAOSQLite.php
+++ b/app/Models/StatsDAOSQLite.php
@@ -2,6 +2,10 @@
 
 class FreshRSS_StatsDAOSQLite extends FreshRSS_StatsDAO {
 
+	protected function sqlFloor($s) {
+		return "CAST(($s) AS INT)";
+	}
+
 	protected function calculateEntryRepartitionPerFeedPerPeriod($period, $feed = null) {
 		if ($feed) {
 			$restrict = "WHERE e.id_feed = {$feed}";
@@ -26,7 +30,7 @@ SQL;
 			$repartition[(int) $value['period']] = (int) $value['count'];
 		}
 
-		return $this->convertToSerie($repartition);
+		return $repartition;
 	}
 
 }
-- 
cgit v1.2.3


From 4d8c63a51e9738f1600de895c1b747f2634f4078 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 30 Sep 2016 09:22:51 +0200
Subject: Minz URL bug

More general fix for https://github.com/FreshRSS/FreshRSS/pull/1269
---
 lib/Minz/Url.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index c7c67123e..99c0443c1 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -78,6 +78,8 @@ class Minz_Url {
 		}
 
 		if (isset($url['params'])) {
+			unset($url['params']['c']);
+			unset($url['params']['a']);
 			foreach ($url['params'] as $key => $param) {
 				$uri .= $separator . urlencode($key) . '=' . urlencode($param);
 				$separator = $and;
-- 
cgit v1.2.3


From 44a57ba12db39439f6cc43fe7542efd92cf402bb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 30 Sep 2016 23:30:16 +0200
Subject: Change default value for keep history

Larger value by default, for limiting the risk of re-adding an article
previously purged, e.g. with feeds which do not have good dates, which
do not update so often, and for which the list of articles is not so
stable.
---
 data/users/_/config.default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index 6e1d497bc..280b13422 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -3,7 +3,7 @@
 return array (
 	'language' => 'en',
 	'old_entries' => 3,
-	'keep_history_default' => 0,
+	'keep_history_default' => 50,
 	'ttl_default' => 3600,
 	'mail_login' => '',
 	'token' => '',
-- 
cgit v1.2.3


From c16a973d453078a037a2a6a6e8e3d17ffd3bf2e6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 09:24:46 +0200
Subject: PostgreSQL schema update

---
 app/Models/StatsDAOPGSQL.php  |  2 +-
 app/SQL/install.sql.pgsql.php | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/Models/StatsDAOPGSQL.php b/app/Models/StatsDAOPGSQL.php
index 649dfa8b5..1effbb64b 100644
--- a/app/Models/StatsDAOPGSQL.php
+++ b/app/Models/StatsDAOPGSQL.php
@@ -61,7 +61,7 @@ SQL;
 			$repartition[(int) $value['period']] = (int) $value['count'];
 		}
 
-		return $this->convertToSerie($repartition);
+		return $repartition;
 	}
 
 }
diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index 04e35af68..c2c32ef59 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -24,7 +24,7 @@ $SQL_CREATE_TABLES = array(
 	"ttl" INT NOT NULL DEFAULT -2,
 	"cache_nbEntries" int DEFAULT 0,
 	"cache_nbUnreads" int DEFAULT 0,
-	FOREIGN KEY (category) REFERENCES "%1$scategory" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+	FOREIGN KEY ("category") REFERENCES "%1$scategory" ("id") ON DELETE SET NULL ON UPDATE CASCADE
 );',
 'CREATE INDEX name_index ON "%1$sfeed" ("name");',
 'CREATE INDEX priority_index ON "%1$sfeed" ("priority");',
@@ -44,19 +44,13 @@ $SQL_CREATE_TABLES = array(
 	"is_favorite" smallint NOT NULL DEFAULT 0,
 	"id_feed" SMALLINT,
 	"tags" varchar(1023),
-	FOREIGN KEY (id_feed) REFERENCES "%1$sfeed" (id) ON DELETE CASCADE ON UPDATE CASCADE
+	FOREIGN KEY ("id_feed") REFERENCES "%1$sfeed" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+	UNIQUE ("id_feed","guid")
 );',
 'CREATE INDEX is_favorite_index ON "%1$sentry" ("is_favorite");',
 'CREATE INDEX is_read_index ON "%1$sentry" ("is_read");',
 'CREATE INDEX entry_lastSeen_index ON "%1$sentry" ("lastSeen");',
 
-
-'CREATE OR REPLACE RULE check_constraints_on_entry AS ON INSERT TO "%1$sentry" WHERE EXISTS(SELECT 1 FROM "%1$sentry" WHERE guid=NEW.guid) DO INSTEAD NOTHING;',
-'CREATE OR REPLACE RULE check_constraints_on_feed AS ON INSERT TO "%1$sfeed" WHERE EXISTS(SELECT 1 FROM "%1$sfeed" WHERE url=NEW.url) DO INSTEAD NOTHING;',
-'CREATE OR REPLACE RULE check_constraints_on_category AS ON INSERT TO "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;',
-'CREATE OR REPLACE RULE check_constraints_on_category as on update to "%1$scategory" WHERE EXISTS(SELECT 1 FROM "%1$scategory" WHERE name=NEW.name) DO INSTEAD NOTHING;',
-
-
 'INSERT INTO "%1$scategory" (id, name) VALUES(1, \'%2$s\');',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400);',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400);',
-- 
cgit v1.2.3


From e979b67ceb31c42955843b2c0c70cd4dfb9a4e95 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 09:34:09 +0200
Subject: PostgreSQL uppercase keywords

---
 app/SQL/install.sql.pgsql.php | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index c2c32ef59..e60c5a07b 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -5,25 +5,25 @@ global $SQL_CREATE_TABLES;
 $SQL_CREATE_TABLES = array(
 'CREATE TABLE IF NOT EXISTS "%1$scategory" (
 	"id" SERIAL PRIMARY KEY,
-	"name" varchar(255) UNIQUE NOT NULL
+	"name" VARCHAR(255) UNIQUE NOT NULL
 );',
 
 'CREATE TABLE IF NOT EXISTS "%1$sfeed" (
 	"id" SERIAL PRIMARY KEY,
 	"url" varchar(511) UNIQUE NOT NULL,
 	"category" SMALLINT DEFAULT 0,
-	"name" varchar(255) NOT NULL,
-	"website" varchar(255),
+	"name" VARCHAR(255) NOT NULL,
+	"website" VARCHAR(255),
 	"description" text,
-	"lastUpdate" int DEFAULT 0,
-	"priority" smallint NOT NULL DEFAULT 10,
-	"pathEntries" varchar(511) DEFAULT NULL,
-	"httpAuth" varchar(511) DEFAULT NULL,
+	"lastUpdate" INT DEFAULT 0,
+	"priority" SMALLINT NOT NULL DEFAULT 10,
+	"pathEntries" VARCHAR(511) DEFAULT NULL,
+	"httpAuth" VARCHAR(511) DEFAULT NULL,
 	"error" smallint DEFAULT 0,
 	"keep_history" INT NOT NULL DEFAULT -2,
 	"ttl" INT NOT NULL DEFAULT -2,
-	"cache_nbEntries" int DEFAULT 0,
-	"cache_nbUnreads" int DEFAULT 0,
+	"cache_nbEntries" INT DEFAULT 0,
+	"cache_nbUnreads" INT DEFAULT 0,
 	FOREIGN KEY ("category") REFERENCES "%1$scategory" ("id") ON DELETE SET NULL ON UPDATE CASCADE
 );',
 'CREATE INDEX name_index ON "%1$sfeed" ("name");',
@@ -31,19 +31,19 @@ $SQL_CREATE_TABLES = array(
 'CREATE INDEX keep_history_index ON "%1$sfeed" ("keep_history");',
 
 'CREATE TABLE IF NOT EXISTS "%1$sentry" (
-	"id" bigint NOT NULL PRIMARY KEY,
-	"guid" varchar(760) UNIQUE NOT NULL,
-	"title" varchar(255) NOT NULL,
-	"author" varchar(255),
-	"content" text,
-	"link" varchar(1023) NOT NULL,
+	"id" BIGINT NOT NULL PRIMARY KEY,
+	"guid" VARCHAR(760) UNIQUE NOT NULL,
+	"title" VARCHAR(255) NOT NULL,
+	"author" VARCHAR(255),
+	"content" TEXT,
+	"link" VARCHAR(1023) NOT NULL,
 	"date" INT,
 	"lastSeen" INT DEFAULT 0,
 	"hash" BYTEA,
-	"is_read" smallint NOT NULL DEFAULT 0,
-	"is_favorite" smallint NOT NULL DEFAULT 0,
+	"is_read" SMALLINT NOT NULL DEFAULT 0,
+	"is_favorite" SMALLINT NOT NULL DEFAULT 0,
 	"id_feed" SMALLINT,
-	"tags" varchar(1023),
+	"tags" VARCHAR(1023),
 	FOREIGN KEY ("id_feed") REFERENCES "%1$sfeed" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
 	UNIQUE ("id_feed","guid")
 );',
-- 
cgit v1.2.3


From 272afc0b7eef5f1873fcc3763e114a24bab9bef6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 09:42:23 +0200
Subject: PostgreSQL case-insensitive SQL LIKE

Compatibility with MySQL and SQLite
---
 lib/Minz/ModelPdo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 5bc18bf1f..da28909df 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -162,6 +162,6 @@ class MinzPDOMSQLite extends MinzPDO {
 
 class MinzPDOPGSQL extends MinzPDO {
 	protected function compatibility($statement) {
-		return str_replace('`', '"', $statement);
+		return str_replace(array('`', ' LIKE '), array('"', ' ILIKE '), $statement);
 	}
 }
-- 
cgit v1.2.3


From 548250620bbf16677f043e23c7134e991506ed76 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 10:09:28 +0200
Subject: PostgreSQL updateEntry()

---
 app/Models/EntryDAO.php | 57 ++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 159f9673b..40f67061d 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -145,8 +145,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if ($this->hasNativeHex()) {
 			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hash']);
 		} else {
-			$valuesTmp['hashBin'] = pack('H*', $valuesTmp['hash']);
-			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hashBin']);	// X'09AF' hexadecimal literals do not work with SQLite/PDO	//hex2bin() is PHP5.4+
+			$valuesTmp['hashBin'] = pack('H*', $valuesTmp['hash']);	//hex2bin() is PHP5.4+
+			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hashBin']);
 		}
 
 		if ($this->addEntryPrepared && $this->addEntryPrepared->execute()) {
@@ -172,33 +172,42 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 		if ($this->updateEntryPrepared === null) {
 			$sql = 'UPDATE `' . $this->prefix . 'entry` '
-			     . 'SET title=?, author=?, '
-			     . ($this->isCompressed() ? 'content_bin=COMPRESS(?)' : 'content=?')
-			     . ', link=?, date=?, `lastSeen`=?, hash='
-			     . ($this->hasNativeHex() ? 'X?' : '?')	//TODO PostgreSQL
-			     . ', ' . ($valuesTmp['is_read'] === null ? '' : 'is_read=?, ')
-			     . 'tags=? '
-			     . 'WHERE id_feed=? AND guid=?';
+			     . 'SET title=:title, author=:author, '
+			     . ($this->isCompressed() ? 'content_bin=COMPRESS(:content)' : 'content=:content')
+			     . ', link=:link, date=:date, `lastSeen`=:last_seen, '
+			     . 'hash=' . $this->sqlHexDecode(':hash')
+			     . ', ' . ($valuesTmp['is_read'] === null ? '' : 'is_read=:is_read, ')
+			     . 'tags=:tags '
+			     . 'WHERE id_feed=:id_feed AND guid=:guid';
 			$this->updateEntryPrepared = $this->bd->prepare($sql);
 		}
 
-		$values = array(
-			substr($valuesTmp['title'], 0, 255),
-			substr($valuesTmp['author'], 0, 255),
-			$valuesTmp['content'],
-			substr($valuesTmp['link'], 0, 1023),
-			$valuesTmp['date'],
-			time(),
-			$this->hasNativeHex() ? $valuesTmp['hash'] : pack('H*', $valuesTmp['hash']),
-		);
+		$valuesTmp['guid'] = substr($valuesTmp['guid'], 0, 760);
+		$this->addEntryPrepared->bindParam(':guid', $valuesTmp['guid']);
+		$valuesTmp['title'] = substr($valuesTmp['title'], 0, 255);
+		$this->addEntryPrepared->bindParam(':title', $valuesTmp['title']);
+		$valuesTmp['author'] = substr($valuesTmp['author'], 0, 255);
+		$this->addEntryPrepared->bindParam(':author', $valuesTmp['author']);
+		$this->addEntryPrepared->bindParam(':content', $valuesTmp['content']);
+		$valuesTmp['link'] = substr($valuesTmp['link'], 0, 1023);
+		$this->addEntryPrepared->bindParam(':link', $valuesTmp['link']);
+		$this->addEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
+		$valuesTmp['lastSeen'] = time();
+		$this->addEntryPrepared->bindParam(':last_seen', $valuesTmp['lastSeen'], PDO::PARAM_INT);
 		if ($valuesTmp['is_read'] !== null) {
-			$values[] = $valuesTmp['is_read'] ? 1 : 0;
+			$this->addEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'] ? 1 : 0, PDO::PARAM_INT);
+		}
+		$this->addEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'], PDO::PARAM_INT);
+		$this->addEntryPrepared->bindParam(':id_feed', $valuesTmp['id_feed'], PDO::PARAM_INT);
+		$valuesTmp['tags'] = substr($valuesTmp['tags'], 0, 1023);
+		$this->addEntryPrepared->bindParam(':tags', $valuesTmp['tags']);
+
+		if ($this->hasNativeHex()) {
+			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hash']);
+		} else {
+			$valuesTmp['hashBin'] = pack('H*', $valuesTmp['hash']);	//hex2bin() is PHP5.4+
+			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hashBin']);
 		}
-		$values = array_merge($values, array(
-			substr($valuesTmp['tags'], 0, 1023),
-			$valuesTmp['id_feed'],
-			substr($valuesTmp['guid'], 0, 760),
-		));
 
 		if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute($values)) {
 			return $this->bd->lastInsertId();
-- 
cgit v1.2.3


From 1d8c24c73fd76fa81a53808088f70cbb4fe063a6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 14:50:17 +0200
Subject: BindParam bug

---
 app/Models/EntryDAO.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 40f67061d..9874bce1c 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -197,7 +197,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if ($valuesTmp['is_read'] !== null) {
 			$this->addEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'] ? 1 : 0, PDO::PARAM_INT);
 		}
-		$this->addEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'], PDO::PARAM_INT);
 		$this->addEntryPrepared->bindParam(':id_feed', $valuesTmp['id_feed'], PDO::PARAM_INT);
 		$valuesTmp['tags'] = substr($valuesTmp['tags'], 0, 1023);
 		$this->addEntryPrepared->bindParam(':tags', $valuesTmp['tags']);
-- 
cgit v1.2.3


From a7b605f2a56c9e5ff5edbd3c94b38e7bb7ad9b81 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 15:14:37 +0200
Subject: Bug updateEntry()

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

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 9874bce1c..956a06e93 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -183,29 +183,29 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 
 		$valuesTmp['guid'] = substr($valuesTmp['guid'], 0, 760);
-		$this->addEntryPrepared->bindParam(':guid', $valuesTmp['guid']);
+		$this->updateEntryPrepared->bindParam(':guid', $valuesTmp['guid']);
 		$valuesTmp['title'] = substr($valuesTmp['title'], 0, 255);
-		$this->addEntryPrepared->bindParam(':title', $valuesTmp['title']);
+		$this->updateEntryPrepared->bindParam(':title', $valuesTmp['title']);
 		$valuesTmp['author'] = substr($valuesTmp['author'], 0, 255);
-		$this->addEntryPrepared->bindParam(':author', $valuesTmp['author']);
-		$this->addEntryPrepared->bindParam(':content', $valuesTmp['content']);
+		$this->updateEntryPrepared->bindParam(':author', $valuesTmp['author']);
+		$this->updateEntryPrepared->bindParam(':content', $valuesTmp['content']);
 		$valuesTmp['link'] = substr($valuesTmp['link'], 0, 1023);
-		$this->addEntryPrepared->bindParam(':link', $valuesTmp['link']);
-		$this->addEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
+		$this->updateEntryPrepared->bindParam(':link', $valuesTmp['link']);
+		$this->updateEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
 		$valuesTmp['lastSeen'] = time();
-		$this->addEntryPrepared->bindParam(':last_seen', $valuesTmp['lastSeen'], PDO::PARAM_INT);
+		$this->updateEntryPrepared->bindParam(':last_seen', $valuesTmp['lastSeen'], PDO::PARAM_INT);
 		if ($valuesTmp['is_read'] !== null) {
-			$this->addEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'] ? 1 : 0, PDO::PARAM_INT);
+			$this->updateEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'] ? 1 : 0, PDO::PARAM_INT);
 		}
-		$this->addEntryPrepared->bindParam(':id_feed', $valuesTmp['id_feed'], PDO::PARAM_INT);
+		$this->updateEntryPrepared->bindParam(':id_feed', $valuesTmp['id_feed'], PDO::PARAM_INT);
 		$valuesTmp['tags'] = substr($valuesTmp['tags'], 0, 1023);
-		$this->addEntryPrepared->bindParam(':tags', $valuesTmp['tags']);
+		$this->updateEntryPrepared->bindParam(':tags', $valuesTmp['tags']);
 
 		if ($this->hasNativeHex()) {
-			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hash']);
+			$this->updateEntryPrepared->bindParam(':hash', $valuesTmp['hash']);
 		} else {
 			$valuesTmp['hashBin'] = pack('H*', $valuesTmp['hash']);	//hex2bin() is PHP5.4+
-			$this->addEntryPrepared->bindParam(':hash', $valuesTmp['hashBin']);
+			$this->updateEntryPrepared->bindParam(':hash', $valuesTmp['hashBin']);
 		}
 
 		if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute($values)) {
-- 
cgit v1.2.3


From 32ac41439a67e2c5777f9da80324fe0bfbf394ff Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 19:31:43 +0200
Subject: PostgreSQL case-insensitivity bug

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

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 956a06e93..63565e73a 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -685,7 +685,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if (count($guids) < 1) {
 			return array();
 		}
-		$sql = 'SELECT guid, ' . $this->sqlHexEncode('hash') . ' AS hexHash FROM `' . $this->prefix . 'entry` WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
+		$sql = 'SELECT guid, ' . $this->sqlHexEncode('hash') . ' AS hex_hash FROM `' . $this->prefix . 'entry` WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
 		$stm = $this->bd->prepare($sql);
 		$values = array($id_feed);
 		$values = array_merge($values, $guids);
@@ -693,7 +693,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$result = array();
 			$rows = $stm->fetchAll(PDO::FETCH_ASSOC);
 			foreach ($rows as $row) {
-				$result[$row['guid']] = $row['hexHash'];
+				$result[$row['guid']] = $row['hex_hash'];
 			}
 			return $result;
 		} else {
-- 
cgit v1.2.3


From c4b43316c756c4e8f5b35128e6ab40bc4f724337 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 20:22:34 +0200
Subject: Export files with date

---
 app/Controllers/importExportController.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 60e467255..9dfc479f0 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -469,20 +469,21 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$export_opml = Minz_Request::param('export_opml', false);
 		$export_starred = Minz_Request::param('export_starred', false);
 		$export_feeds = Minz_Request::param('export_feeds', array());
+		$day = date('Y-m-d');
 
 		$export_files = array();
 		if ($export_opml) {
-			$export_files['feeds.opml'] = $this->generateOpml();
+			$export_files["feeds_${day}.opml.xml"] = $this->generateOpml();
 		}
 
 		if ($export_starred) {
-			$export_files['starred.json'] = $this->generateEntries('starred');
+			$export_files["starred_${day}.json"] = $this->generateEntries('starred');
 		}
 
 		foreach ($export_feeds as $feed_id) {
 			$feed = $this->feedDAO->searchById($feed_id);
 			if ($feed) {
-				$filename = 'feed_' . $feed->category() . '_'
+				$filename = "feed_${day}_" . $feed->category() . '_'
 				          . $feed->id() . '.json';
 				$export_files[$filename] = $this->generateEntries('feed', $feed);
 			}
@@ -579,7 +580,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$zip->close();
 		header('Content-Type: application/zip');
 		header('Content-Length: ' . filesize($zip_file));
-		header('Content-Disposition: attachment; filename="freshrss_export.zip"');
+		$day = date('Y-m-d');
+		header('Content-Disposition: attachment; filename="freshrss_' . $day . '_export.zip"');
 		readfile($zip_file);
 		unlink($zip_file);
 	}
@@ -599,9 +601,9 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		$content_type = '';
 		if ($type === 'opml') {
-			$content_type = "text/opml";
+			$content_type = 'application/xml';
 		} elseif ($type === 'json_feed' || $type === 'json_starred') {
-			$content_type = "text/json";
+			$content_type = 'application/json';
 		}
 
 		header('Content-Type: ' . $content_type . '; charset=utf-8');
-- 
cgit v1.2.3


From 2621e1cc49818e2bd5566d5072a8a7dc537536d0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 20:25:38 +0200
Subject: Changelog add date to exported files

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40b4df1f9..1327a8cc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 		* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
 		* Limited by `min_posts_per_rss` and `max_posts_per_rss` in user config
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
+	* Add date to exported files [#1240](https://github.com/FreshRSS/FreshRSS/issues/1240)
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
-- 
cgit v1.2.3


From 9b22272eee6e37963f6ed5f60b9f82382b23adc2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Oct 2016 20:54:08 +0200
Subject: PostgreSQL multiuser bug

https://github.com/FreshRSS/FreshRSS/pull/1195
---
 app/Models/UserDAO.php         |  5 +++--
 app/SQL/install.sql.pgsql.php  | 12 ++++++------
 app/SQL/install.sql.sqlite.php | 32 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index b55766ab4..e35be848c 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -8,8 +8,9 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 		$userPDO = new Minz_ModelPdo($username);
 
 		$ok = false;
+		$bd_prefix_user = $db['prefix'] . $username . '_';
 		if (defined('SQL_CREATE_TABLES')) {	//E.g. MySQL
-			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('gen.short.default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $bd_prefix_user, _t('gen.short.default_category'));
 			$stm = $userPDO->bd->prepare($sql);
 			$ok = $stm && $stm->execute();
 		} else {	//E.g. SQLite
@@ -17,7 +18,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('gen.short.default_category'));
+					$sql = sprintf($instruction, $bd_prefix_user, _t('gen.short.default_category'));
 					$stm = $userPDO->bd->prepare($sql);
 					$ok &= ($stm && $stm->execute());
 				}
diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index e60c5a07b..841003def 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -26,9 +26,9 @@ $SQL_CREATE_TABLES = array(
 	"cache_nbUnreads" INT DEFAULT 0,
 	FOREIGN KEY ("category") REFERENCES "%1$scategory" ("id") ON DELETE SET NULL ON UPDATE CASCADE
 );',
-'CREATE INDEX name_index ON "%1$sfeed" ("name");',
-'CREATE INDEX priority_index ON "%1$sfeed" ("priority");',
-'CREATE INDEX keep_history_index ON "%1$sfeed" ("keep_history");',
+'CREATE INDEX %1$sname_index ON "%1$sfeed" ("name");',
+'CREATE INDEX %1$spriority_index ON "%1$sfeed" ("priority");',
+'CREATE INDEX %1$skeep_history_index ON "%1$sfeed" ("keep_history");',
 
 'CREATE TABLE IF NOT EXISTS "%1$sentry" (
 	"id" BIGINT NOT NULL PRIMARY KEY,
@@ -47,9 +47,9 @@ $SQL_CREATE_TABLES = array(
 	FOREIGN KEY ("id_feed") REFERENCES "%1$sfeed" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
 	UNIQUE ("id_feed","guid")
 );',
-'CREATE INDEX is_favorite_index ON "%1$sentry" ("is_favorite");',
-'CREATE INDEX is_read_index ON "%1$sentry" ("is_read");',
-'CREATE INDEX entry_lastSeen_index ON "%1$sentry" ("lastSeen");',
+'CREATE INDEX %1$sis_favorite_index ON "%1$sentry" ("is_favorite");',
+'CREATE INDEX %1$sis_read_index ON "%1$sentry" ("is_read");',
+'CREATE INDEX %1$sentry_lastSeen_index ON "%1$sentry" ("lastSeen");',
 
 'INSERT INTO "%1$scategory" (id, name) VALUES(1, \'%2$s\');',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400);',
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 87d5cf286..9d146d6f0 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -1,16 +1,16 @@
 <?php
 global $SQL_CREATE_TABLES;
 $SQL_CREATE_TABLES = array(
-'CREATE TABLE IF NOT EXISTS `%1$scategory` (
+'CREATE TABLE IF NOT EXISTS `category` (
 	`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
 	`name` varchar(255) NOT NULL,
 	UNIQUE (`name`)
 );',
 
-'CREATE TABLE IF NOT EXISTS `%1$sfeed` (
+'CREATE TABLE IF NOT EXISTS `feed` (
 	`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
 	`url` varchar(511) NOT NULL,
-	`%1$scategory` SMALLINT DEFAULT 0,
+	`category` SMALLINT DEFAULT 0,
 	`name` varchar(255) NOT NULL,
 	`website` varchar(255),
 	`description` text,
@@ -23,15 +23,15 @@ $SQL_CREATE_TABLES = array(
 	`ttl` INT NOT NULL DEFAULT -2,
 	`cache_nbEntries` int DEFAULT 0,
 	`cache_nbUnreads` int DEFAULT 0,
-	FOREIGN KEY (`%1$scategory`) REFERENCES `%1$scategory`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+	FOREIGN KEY (`category`) REFERENCES `category`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
 	UNIQUE (`url`)
 );',
 
-'CREATE INDEX IF NOT EXISTS feed_name_index ON `%1$sfeed`(`name`);',
-'CREATE INDEX IF NOT EXISTS feed_priority_index ON `%1$sfeed`(`priority`);',
-'CREATE INDEX IF NOT EXISTS feed_keep_history_index ON `%1$sfeed`(`keep_history`);',
+'CREATE INDEX IF NOT EXISTS feed_name_index ON `feed`(`name`);',
+'CREATE INDEX IF NOT EXISTS feed_priority_index ON `feed`(`priority`);',
+'CREATE INDEX IF NOT EXISTS feed_keep_history_index ON `feed`(`keep_history`);',
 
-'CREATE TABLE IF NOT EXISTS `%1$sentry` (
+'CREATE TABLE IF NOT EXISTS `entry` (
 	`id` bigint NOT NULL,
 	`guid` varchar(760) NOT NULL,
 	`title` varchar(255) NOT NULL,
@@ -46,17 +46,17 @@ $SQL_CREATE_TABLES = array(
 	`id_feed` SMALLINT,
 	`tags` varchar(1023),
 	PRIMARY KEY (`id`),
-	FOREIGN KEY (`id_feed`) REFERENCES `%1$sfeed`(`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+	FOREIGN KEY (`id_feed`) REFERENCES `feed`(`id`) ON DELETE CASCADE ON UPDATE CASCADE,
 	UNIQUE (`id_feed`,`guid`)
 );',
 
-'CREATE INDEX IF NOT EXISTS entry_is_favorite_index ON `%1$sentry`(`is_favorite`);',
-'CREATE INDEX IF NOT EXISTS entry_is_read_index ON `%1$sentry`(`is_read`);',
-'CREATE INDEX IF NOT EXISTS entry_lastSeen_index ON `%1$sentry`(`lastSeen`);',	//v1.1.1
+'CREATE INDEX IF NOT EXISTS entry_is_favorite_index ON `entry`(`is_favorite`);',
+'CREATE INDEX IF NOT EXISTS entry_is_read_index ON `entry`(`is_read`);',
+'CREATE INDEX IF NOT EXISTS entry_lastSeen_index ON `entry`(`lastSeen`);',	//v1.1.1
 
-'INSERT OR IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");',
-'INSERT OR IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);',
-'INSERT OR IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS releases", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);',
+'INSERT OR IGNORE INTO `category` (id, name) VALUES(1, "%2$s");',
+'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);',
+'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS releases", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);',
 );
 
-define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
+define('SQL_DROP_TABLES', 'DROP TABLES entry, feed, category');
-- 
cgit v1.2.3


From f81c441920d2de087099c85f0119e823d15225c4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 4 Oct 2016 21:06:37 +0200
Subject: Fix bug language option for new user

https://github.com/FreshRSS/FreshRSS/issues/1273
---
 app/Controllers/userController.php |  4 ++--
 app/Models/UserDAO.php             | 41 +++++++++++++++++++++++---------------
 app/views/user/manage.phtml        |  4 ++--
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 0521bc008..c259ffde9 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -121,7 +121,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$user_conf->language);
 			$languages = Minz_Translate::availableLanguages();
-			if (!isset($languages[$new_user_language])) {
+			if (!in_array($new_user_language, $languages)) {
 				$new_user_language = FreshRSS_Context::$user_conf->language;
 			}
 
@@ -165,7 +165,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			}
 			if ($ok) {
 				$userDAO = new FreshRSS_UserDAO();
-				$ok &= $userDAO->createUser($new_user_name);
+				$ok &= $userDAO->createUser($new_user_name, $new_user_language);
 			}
 			invalidateHttpCache();
 
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index e35be848c..597182693 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -1,35 +1,44 @@
 <?php
 
 class FreshRSS_UserDAO extends Minz_ModelPdo {
-	public function createUser($username) {
+	public function createUser($username, $new_user_language) {
 		$db = FreshRSS_Context::$system_conf->db;
 		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 		$userPDO = new Minz_ModelPdo($username);
 
-		$ok = false;
-		$bd_prefix_user = $db['prefix'] . $username . '_';
-		if (defined('SQL_CREATE_TABLES')) {	//E.g. MySQL
-			$sql = sprintf(SQL_CREATE_TABLES, $bd_prefix_user, _t('gen.short.default_category'));
-			$stm = $userPDO->bd->prepare($sql);
-			$ok = $stm && $stm->execute();
-		} else {	//E.g. SQLite
-			global $SQL_CREATE_TABLES;
-			if (is_array($SQL_CREATE_TABLES)) {
-				$ok = true;
-				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, $bd_prefix_user, _t('gen.short.default_category'));
-					$stm = $userPDO->bd->prepare($sql);
-					$ok &= ($stm && $stm->execute());
+		$currentLanguage = Minz_Translate::language();
+
+		try {
+			Minz_Translate::reset($new_user_language);
+			$ok = false;
+			$bd_prefix_user = $db['prefix'] . $username . '_';
+			if (defined('SQL_CREATE_TABLES')) {	//E.g. MySQL
+				$sql = sprintf(SQL_CREATE_TABLES, $bd_prefix_user, _t('gen.short.default_category'));
+				$stm = $userPDO->bd->prepare($sql);
+				$ok = $stm && $stm->execute();
+			} else {	//E.g. SQLite
+				global $SQL_CREATE_TABLES;
+				if (is_array($SQL_CREATE_TABLES)) {
+					$ok = true;
+					foreach ($SQL_CREATE_TABLES as $instruction) {
+						$sql = sprintf($instruction, $bd_prefix_user, _t('gen.short.default_category'));
+						$stm = $userPDO->bd->prepare($sql);
+						$ok &= ($stm && $stm->execute());
+					}
 				}
 			}
+		} catch (Exception $e) {
+			Minz_Log::error('Error while creating user: ' . $e->getMessage());
 		}
 
+		Minz_Translate::reset($currentLanguage);
+
 		if ($ok) {
 			return true;
 		} else {
 			$info = empty($stm) ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::error('SQL error : ' . $info[2]);
+			Minz_Log::error('SQL error: ' . $info[2]);
 			return false;
 		}
 	}
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index aab3aa4c4..a32247d14 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -3,7 +3,7 @@
 <div class="post">
 	<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'); ?>">
+	<form method="post" action="<?php echo _url('user', 'create'); ?>" autocomplete="off">
 		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 		<legend><?php echo _t('admin.user.create'); ?></legend>
 
@@ -30,7 +30,7 @@
 			<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,}" />
+					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="new-password" 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'); ?>
-- 
cgit v1.2.3


From 6a6ae345db5e0f0ac2c9d8fbef4e0272e687b81c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 4 Oct 2016 21:08:46 +0200
Subject: Changelog new user language

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1327a8cc3..6fcb3410e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
+	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
 * SimplePie
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Security
-- 
cgit v1.2.3


From 05cabe99ae48a187a77e0246dfffc60f2434b5e5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 5 Oct 2016 00:39:54 +0200
Subject: Take better advantage of other users refresh

---
 app/Controllers/feedController.php | 18 ++++++++++++++++--
 app/Models/EntryDAO.php            |  7 +++++--
 app/Models/Feed.php                |  4 ++++
 app/Models/FeedDAO.php             |  8 ++++----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c2a22aeb3..15f373833 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -242,7 +242,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feeds[] = $feed;
 			}
 		} else {
-			$feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
+			$feeds = $feedDAO->listFeedsOrderUpdate(-1);
 		}
 
 		// Calculate date of oldest entries we accept in DB.
@@ -266,6 +266,20 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;	//When PubSubHubbub is used, do not pull refresh so often
 			}
 
+			$mtime = 0;
+			$ttl = $feed->ttl();
+			if ($ttl == -1) {
+				continue;	//Feed refresh is disabled
+			}
+			if (feed->lastUpdate() < time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) {
+				//Too early to refresh from source, but check if the feed was already updated by another user
+				$mtime = feed->cacheModifiedTime();
+				if (feed->lastUpdate() >= $mtime + 10) {
+					continue;	//Nothing newer from other users
+				}
+				Minz_Log::debug($feed->url() . ' was recently updated by another user');
+			}
+
 			if (!$feed->lock()) {
 				Minz_Log::notice('Feed already being actualized: ' . $feed->url());
 				continue;
@@ -358,7 +372,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						$entryDAO->addEntry($entry->toArray());
 					}
 				}
-				$entryDAO->updateLastSeen($feed->id(), $oldGuids);
+				$entryDAO->updateLastSeen($feed->id(), $oldGuids, $mtime);
 			}
 
 			if ($feed_history >= 0 && rand(0, 30) === 1) {
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 63565e73a..43ac21f9e 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -707,13 +707,16 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 	}
 
-	public function updateLastSeen($id_feed, $guids) {
+	public function updateLastSeen($id_feed, $guids, $mtime = 0) {
 		if (count($guids) < 1) {
 			return 0;
 		}
 		$sql = 'UPDATE `' . $this->prefix . 'entry` SET `lastSeen`=? WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
 		$stm = $this->bd->prepare($sql);
-		$values = array(time(), $id_feed);
+		if ($mtime <= 0) {
+			$mtime = time();
+		}
+		$values = array($mtime, $id_feed);
 		$values = array_merge($values, $guids);
 		if ($stm && $stm->execute($values)) {
 			return $stm->rowCount();
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index f2f345662..f435620c8 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -340,6 +340,10 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->entries = $entries;
 	}
 
+	function cacheModifiedTime() {
+		return @filemtime(CACHE_PATH . '/' . md5($this->url) . '.spc');
+	}
+
 	function lock() {
 		$this->lockPath = TMP_PATH . '/' . $this->hash() . '.freshrss.lock';
 		if (file_exists($this->lockPath) && ((time() - @filemtime($this->lockPath)) > 3600)) {
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 6e6d8857b..ad3cb0c2e 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -222,13 +222,13 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return $feedCategoryNames;
 	}
 
+	/**
+	 * Use $defaultCacheDuration == -1 to return all feeds, without filtering them by TTL.
+	 */
 	public function listFeedsOrderUpdate($defaultCacheDuration = 3600) {
-		if ($defaultCacheDuration < 0) {
-			$defaultCacheDuration = 2147483647;
-		}
 		$sql = 'SELECT id, url, name, website, `lastUpdate`, `pathEntries`, `httpAuth`, keep_history, ttl '
 		     . 'FROM `' . $this->prefix . 'feed` '
-		     . 'WHERE ttl <> -1 AND `lastUpdate` < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) '
+		     . ($defaultCacheDuration < 0 ? '' : 'WHERE ttl <> -1 AND `lastUpdate` < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) ')
 		     . 'ORDER BY `lastUpdate`';
 		$stm = $this->bd->prepare($sql);
 		if (!($stm && $stm->execute())) {
-- 
cgit v1.2.3


From 9e34d7275eb936e1a08b872aca7adbce5a5674c5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 5 Oct 2016 00:44:14 +0200
Subject: Typo

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

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 15f373833..d85a53446 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -271,10 +271,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($ttl == -1) {
 				continue;	//Feed refresh is disabled
 			}
-			if (feed->lastUpdate() < time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) {
-				//Too early to refresh from source, but check if the feed was already updated by another user
-				$mtime = feed->cacheModifiedTime();
-				if (feed->lastUpdate() >= $mtime + 10) {
+			if ($feed->lastUpdate() < time() + 60 - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) {
+				//Too early to refresh from source, but check whether the feed was updated by another user
+				$mtime = $feed->cacheModifiedTime();
+				if ($feed->lastUpdate() >= $mtime + 10) {
 					continue;	//Nothing newer from other users
 				}
 				Minz_Log::debug($feed->url() . ' was recently updated by another user');
-- 
cgit v1.2.3


From fe65eec5bbdaee37177e3673e31e241b1f1b938d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 5 Oct 2016 17:48:24 +0200
Subject: Better multiuser update

---
 app/Controllers/feedController.php |  9 +++++----
 app/Models/FeedDAO.php             | 10 +++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index d85a53446..dadc8aa83 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -271,13 +271,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($ttl == -1) {
 				continue;	//Feed refresh is disabled
 			}
-			if ($feed->lastUpdate() < time() + 60 - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) {
+			if ($feed->lastUpdate() + 10 >= time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) {
 				//Too early to refresh from source, but check whether the feed was updated by another user
 				$mtime = $feed->cacheModifiedTime();
-				if ($feed->lastUpdate() >= $mtime + 10) {
+				if ($feed->lastUpdate() + 10 >= $mtime) {
 					continue;	//Nothing newer from other users
 				}
-				Minz_Log::debug($feed->url() . ' was recently updated by another user');
+				//Minz_Log::debug($feed->url() . ' was updated at ' . date('c', $mtime) . ' by another user');
+				//Will take advantage of the newer cache
 			}
 
 			if (!$feed->lock()) {
@@ -391,7 +392,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				}
 			}
 
-			$feedDAO->updateLastUpdate($feed->id(), 0, $entryDAO->inTransaction());
+			$feedDAO->updateLastUpdate($feed->id(), false, $entryDAO->inTransaction(), $mtime);
 			if ($entryDAO->inTransaction()) {
 				$entryDAO->commit();
 			}
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index ad3cb0c2e..c680d270c 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -82,7 +82,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 	}
 
-	public function updateLastUpdate($id, $inError = 0, $updateCache = true) {
+	public function updateLastUpdate($id, $inError = false, $updateCache = true, $mtime = 0) {
 		if ($updateCache) {
 			$sql = 'UPDATE `' . $this->prefix . 'feed` '	//2 sub-requests with FOREIGN KEY(e.id_feed), INDEX(e.is_read) faster than 1 request with GROUP BY or CASE
 			     . 'SET `cache_nbEntries`=(SELECT COUNT(e1.id) FROM `' . $this->prefix . 'entry` e1 WHERE e1.id_feed=`' . $this->prefix . 'feed`.id),'
@@ -95,9 +95,13 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			     . 'WHERE id=?';
 		}
 
+		if ($mtime <= 0) {
+			$mtime = time();
+		}
+
 		$values = array(
-			time(),
-			$inError,
+			$mtime,
+			$inError ? 1 : 0,
 			$id,
 		);
 
-- 
cgit v1.2.3


From 1df76fb6b5bd3dced52bd3b41eda54a518bd399b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 5 Oct 2016 21:00:19 +0200
Subject: Changelog multiuser optimisation

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fcb3410e..823a2e8a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
 		* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
 		* Limited by `min_posts_per_rss` and `max_posts_per_rss` in user config
+	* In a multi-user context, take better advantage of other users’ refreshes [#1280](https://github.com/FreshRSS/FreshRSS/pull/1280)
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 	* Add date to exported files [#1240](https://github.com/FreshRSS/FreshRSS/issues/1240)
 * Bug fixing
-- 
cgit v1.2.3


From 3a7d79fc89a3dfa048643c8a16f48106b0c93bd5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 5 Oct 2016 22:06:53 +0200
Subject: Changelog references to clients and deployments

https://github.com/FreshRSS/FreshRSS/issues/328
https://github.com/jangernert/FeedReader/issues/59
https://github.com/YunoHost-Apps/freshrss_ynh/pull/21
---
 CHANGELOG.md |  1 +
 README.fr.md | 19 ++++++++++++++++---
 README.md    | 19 ++++++++++++++++---
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 823a2e8a8..5fa3388de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
 * Compatibility:
 	* Experimental support for PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
+	* New client supporting FreshRSS on Linux: FeedReader [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
 * Features
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
diff --git a/README.fr.md b/README.fr.md
index 65cef544f..5a41a6413 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -50,7 +50,8 @@ Nous sommes une communauté amicale.
 6. Des paramètres de configuration avancée peuvent être accédés depuis [config.php](./data/config.default.php).
 
 ## Installation automatisée
-[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/gh-pages/img/deploy.png)](https://dfabric.github.io/DPlatform-ShellCore)
+* [![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/gh-pages/img/deploy.png)](https://dfabric.github.io/DPlatform-ShellCore)
+* [YunoHost](https://github.com/YunoHost-Apps/freshrss_ynh)
 
 ## Exemple d’installation complète sur Linux Debian/Ubuntu
 ```sh
@@ -70,7 +71,7 @@ sudo apt install libapache2-mod-php	#Pour Apache
 sudo apt install mysql-server mysql-client php-mysql	#Base de données MySQL optionnelle
 sudo apt install postgresql php-pgsql	#Base de données PostgreSQL optionnelle
 
-# Redémarrage du serveur Web
+## Redémarrage du serveur Web
 sudo service apache2 restart
 
 # Pour FreshRSS lui-même (git est optionnel si vous déployez manuellement les fichiers d’installation)
@@ -94,7 +95,7 @@ sudo chown -R :www-data .
 sudo chmod -R g+w ./data/
 ```
 
-# Contrôle d’accès
+## Contrôle d’accès
 Il est requis pour le mode multi-utilisateur, et recommandé dans tous les cas, de limiter l’accès à votre FreshRSS. Au choix :
 * En utilisant l’identification par formulaire (requiert JavaScript, et PHP 5.3.7+ recommandé – fonctionne avec certaines versions de PHP 5.3.3+)
 * En utilisant un contrôle d’accès HTTP défini par votre serveur Web
@@ -111,12 +112,14 @@ Par exemple, pour exécuter le script toutes les heures :
 7 * * * * php /votre-chemin/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
+
 # Conseils
 * Pour une meilleure sécurité, faites en sorte que seul le répertoire `./p/` soit accessible depuis le Web, par exemple en faisant pointer un sous-domaine sur le répertoire `./p/`.
 	* En particulier, les données personnelles se trouvent dans le répertoire `./data/`.
 * Le fichier `./constants.php` définit les chemins d’accès aux répertoires clés de l’application. Si vous les bougez, tout se passe ici.
 * En cas de problème, les logs peuvent être utile à lire, soit depuis l’interface de FreshRSS, soit manuellement depuis `./data/log/*.log`.
 
+
 # Sauvegarde
 * Il faut conserver vos fichiers `./data/config.php` ainsi que `./data/*_user.php`
 * Vous pouvez exporter votre liste de flux depuis FreshRSS au format OPML
@@ -145,3 +148,13 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 ## Si les fonctions natives ne sont pas disponibles
 * [Services_JSON](http://pear.php.net/pepr/pepr-proposal-show.php?id=198)
 * [password_compat](https://github.com/ircmaxell/password_compat)
+
+
+# Clients compatibles
+Tout client supportant une API de type Google Reader. Sélection :
+
+* Android
+	* (Propriétaire) [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader)
+	* (Libre, F-Droid) [EasyRSS](https://github.com/Alkarex/EasyRSS)
+* Linux
+	* (Libre) [FeedReader](https://jangernert.github.io/FeedReader/)
diff --git a/README.md b/README.md
index 505a1d970..f3f84f189 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,8 @@ We are a friendly community.
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
 ## Automated install
-[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/gh-pages/img/deploy.png)](https://dfabric.github.io/DPlatform-ShellCore)
+* [![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/gh-pages/img/deploy.png)](https://dfabric.github.io/DPlatform-ShellCore)
+* [YunoHost](https://github.com/YunoHost-Apps/freshrss_ynh)
 
 ## Example of full installation on Linux Debian/Ubuntu
 ```sh
@@ -94,14 +95,14 @@ sudo chown -R :www-data .
 sudo chmod -R g+w ./data/
 ```
 
-# Access control
+## Access control
 It is needed for the multi-user mode to limit access to FreshRSS. You can:
 * use form authentication (need JavaScript and PHP 5.3.7+, works with some PHP 5.3.3+)
 * use HTTP authentication supported by your web server
 	* See [Apache documentation](http://httpd.apache.org/docs/trunk/howto/auth.html)
 		* In that case, create a `./p/i/.htaccess` file with a matching `.htpasswd` file.
 
-# Automatic feed update
+## Automatic feed update
 * You can add a Cron job to launch the update script.
 Check the Cron documentation related to your distribution ([Debian/Ubuntu](https://help.ubuntu.com/community/CronHowto), [Red Hat/Fedora](https://fedoraproject.org/wiki/Administration_Guide_Draft/Cron), [Slackware](http://docs.slackware.com/fr:slackbook:process_control?#cron), [Gentoo](https://wiki.gentoo.org/wiki/Cron), [Arch Linux](https://wiki.archlinux.org/index.php/Cron)…).
 It’s a good idea to use the Web server user.
@@ -111,12 +112,14 @@ For example, if you want to run the script every hour:
 7 * * * * php /your-path/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
+
 # Advices
 * For a better security, expose only the `./p/` folder on the web.
 	* 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 accessible from the interface or manually in `./data/log/*.log` files.
 
+
 # Backup
 * You need to keep `./data/config.php`, and `./data/*_user.php` files
 * You can export your feed list in OPML format from FreshRSS
@@ -145,3 +148,13 @@ mysqldump -u user -p --databases freshrss > freshrss.sql
 ## If native functions are not available
 * [Services_JSON](http://pear.php.net/pepr/pepr-proposal-show.php?id=198)
 * [password_compat](https://github.com/ircmaxell/password_compat)
+
+
+# Compatible clients
+Any client supporting a Google Reader-like API. Selection:
+
+* Android
+	* (Closed source) [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader)
+	* (Open source, F-Droid) [EasyRSS](https://github.com/Alkarex/EasyRSS)
+* Linux
+	* (Open source) [FeedReader](https://jangernert.github.io/FeedReader/)
-- 
cgit v1.2.3


From 35121e56f55124ef836387879aaccc492fcb428d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 5 Oct 2016 22:10:21 +0200
Subject: Readme clients

---
 README.fr.md | 6 +++---
 README.md    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 5a41a6413..540145fa8 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -154,7 +154,7 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 Tout client supportant une API de type Google Reader. Sélection :
 
 * Android
-	* (Propriétaire) [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader)
-	* (Libre, F-Droid) [EasyRSS](https://github.com/Alkarex/EasyRSS)
+	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Propriétaire)
+	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Libre, F-Droid)
 * Linux
-	* (Libre) [FeedReader](https://jangernert.github.io/FeedReader/)
+	* [FeedReader](https://jangernert.github.io/FeedReader/) (Libre)
diff --git a/README.md b/README.md
index f3f84f189..2f3021ef5 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ mysqldump -u user -p --databases freshrss > freshrss.sql
 Any client supporting a Google Reader-like API. Selection:
 
 * Android
-	* (Closed source) [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader)
-	* (Open source, F-Droid) [EasyRSS](https://github.com/Alkarex/EasyRSS)
+	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Closed source)
+	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, F-Droid)
 * Linux
-	* (Open source) [FeedReader](https://jangernert.github.io/FeedReader/)
+	* [FeedReader](https://jangernert.github.io/FeedReader/) (Open source)
-- 
cgit v1.2.3


From d973d9efaba81eb9a60e6eaf3827331dfcc7bfa9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 5 Oct 2016 22:25:46 +0200
Subject: Fix display bug for example of URL with token

https://github.com/FreshRSS/FreshRSS/issues/1274
---
 app/views/auth/index.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml
index 7195bab5d..010eae33f 100644
--- a/app/views/auth/index.phtml
+++ b/app/views/auth/index.phtml
@@ -60,7 +60,7 @@
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
 					echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?php echo $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, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true); ?></kbd>
+				<kbd><?php echo Minz_Url::display(array('a' => 'rss', 'params' => array('token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true); ?></kbd>
 			</div>
 		</div>
 		<?php } ?>
-- 
cgit v1.2.3


From 9c475dbc638676ae0193fd6f5ffaae714e9f0a15 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 5 Oct 2016 22:27:17 +0200
Subject: Readme Bug in example of URL for FreshRS RSS output with token

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 823a2e8a8..2bc9d1e36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
 	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
+	* Bug in example of URL for FreshRS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
 * SimplePie
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Security
-- 
cgit v1.2.3


From ad58ae923cbb4a49745719056e06a7c19c50bf36 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 6 Oct 2016 17:21:20 +0200
Subject: Update php-* extension names

https://github.com/FreshRSS/FreshRSS/issues/1283
---
 app/i18n/cz/admin.php   |  4 ++--
 app/i18n/cz/install.php |  2 +-
 app/i18n/de/admin.php   |  4 ++--
 app/i18n/de/install.php |  2 +-
 app/i18n/en/admin.php   | 18 +++++++++---------
 app/i18n/en/install.php | 18 +++++++++---------
 app/i18n/fr/admin.php   | 24 ++++++++++++------------
 app/i18n/fr/install.php | 18 +++++++++---------
 app/i18n/it/admin.php   |  4 ++--
 app/i18n/it/install.php |  2 +-
 app/i18n/nl/admin.php   |  4 ++--
 app/i18n/nl/install.php |  2 +-
 app/i18n/ru/admin.php   |  4 ++--
 app/i18n/ru/install.php |  2 +-
 app/i18n/tr/admin.php   |  4 ++--
 app/i18n/tr/install.php |  2 +-
 16 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 781ca2fe3..84bc58a17 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -33,7 +33,7 @@ return array(
 			'ok' => 'Máte požadovanou knihovnu pro ověřování znaků (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'Nemáte cURL (balíček php5-curl).',
+			'nok' => 'Nemáte cURL (balíček php-curl).',
 			'ok' => 'Máte rozšíření cURL.',
 		),
 		'data' => array(
@@ -93,7 +93,7 @@ return array(
 			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
 		),
 		'zip' => array(
-			'nok' => 'Nemáte rozšíření ZIP (balíček php5-zip).',
+			'nok' => 'Nemáte rozšíření ZIP (balíček php-zip).',
 			'ok' => 'Máte rozšíření ZIP.',
 		),
 	),
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index e29a51888..c40ae46e2 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -41,7 +41,7 @@ return array(
 			'ok' => 'Je nainstalována požadovaná knihovna pro ověřování znaků (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'Nemáte cURL (balíček php5-curl).',
+			'nok' => 'Nemáte cURL (balíček php-curl).',
 			'ok' => 'Máte rozšíření cURL.',
 		),
 		'data' => array(
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index b1c29b901..c12f32bc8 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -33,7 +33,7 @@ return array(
 			'ok' => 'Sie haben die benötigte Bibliothek für die Überprüfung von Zeichentypen (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'Ihnen fehlt cURL (Paket php5-curl).',
+			'nok' => 'Ihnen fehlt cURL (Paket php-curl).',
 			'ok' => 'Sie haben die cURL-Erweiterung.',
 		),
 		'data' => array(
@@ -93,7 +93,7 @@ return array(
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
 		'zip' => array(
-			'nok' => 'Ihnen fehlt die ZIP-Erweiterung (Paket php5-zip).',
+			'nok' => 'Ihnen fehlt die ZIP-Erweiterung (Paket php-zip).',
 			'ok' => 'Sie haben die ZIP-Erweiterung.',
 		),
 	),
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index eb0c2eb89..f2a597d29 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -41,7 +41,7 @@ return array(
 			'ok' => 'Sie haben die benötigte Bibliothek für die Überprüfung von Zeichentypen (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'Ihnen fehlt cURL (Paket php5-curl).',
+			'nok' => 'Ihnen fehlt cURL (Paket php-curl).',
 			'ok' => 'Sie haben die cURL-Erweiterung.',
 		),
 		'data' => array(
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index f6b63d44c..e5286d948 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -29,12 +29,12 @@ return array(
 			'ok' => 'Connection to the database is ok.',
 		),
 		'ctype' => array(
-			'nok' => 'You lack a required library for character type checking (php-ctype).',
+			'nok' => 'Cannot find 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.',
+			'nok' => 'Cannot find the cURL library (php-curl package).',
+			'ok' => 'You have the cURL library.',
 		),
 		'data' => array(
 			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
@@ -42,7 +42,7 @@ return array(
 		),
 		'database' => 'Database installation',
 		'dom' => array(
-			'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+			'nok' => 'Cannot find a required library to browse the DOM (php-xml package).',
 			'ok' => 'You have the required library to browse the DOM.',
 		),
 		'entries' => array(
@@ -59,19 +59,19 @@ return array(
 		),
 		'files' => 'File installation',
 		'json' => array(
-			'nok' => 'You lack JSON (php5-json package).',
+			'nok' => 'Cannot find JSON (php5-json package).',
 			'ok' => 'You have JSON extension.',
 		),
 		'minz' => array(
-			'nok' => 'You lack the Minz framework.',
+			'nok' => 'Cannot find the Minz framework.',
 			'ok' => 'You have the Minz framework.',
 		),
 		'pcre' => array(
-			'nok' => 'You lack a required library for regular expressions (php-pcre).',
+			'nok' => 'Cannot find 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, pdo_pgsql).',
+			'nok' => 'Cannot find PDO or one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
@@ -93,7 +93,7 @@ return array(
 			'ok' => 'Permissions on users directory are good.',
 		),
 		'zip' => array(
-			'nok' => 'You lack ZIP extension (php5-zip package).',
+			'nok' => 'Cannot find ZIP extension (php-zip package).',
 			'ok' => 'You have ZIP extension.',
 		),
 	),
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 54ce8edb2..3cb85ce10 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -37,19 +37,19 @@ return array(
 			'ok' => 'Permissions on cache directory are good.',
 		),
 		'ctype' => array(
-			'nok' => 'You lack a required library for character type checking (php-ctype).',
+			'nok' => 'Cannot find 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.',
+			'nok' => 'Cannot find the cURL library (php-curl package).',
+			'ok' => 'You have the cURL library.',
 		),
 		'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.',
+			'nok' => 'Cannot find a required library to browse the DOM.',
 			'ok' => 'You have the required library to browse the DOM.',
 		),
 		'favicons' => array(
@@ -61,19 +61,19 @@ return array(
 			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
+			'nok' => 'Cannot find a recommended library to parse JSON.',
 			'ok' => 'You have a recommended library to parse JSON.',
 		),
 		'minz' => array(
-			'nok' => 'You lack the Minz framework.',
+			'nok' => 'Cannot find the Minz framework.',
 			'ok' => 'You have the Minz framework.',
 		),
 		'pcre' => array(
-			'nok' => 'You lack a required library for regular expressions (php-pcre).',
+			'nok' => 'Cannot find 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, pdo_pgsql).',
+			'nok' => 'Cannot find PDO or one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
@@ -85,7 +85,7 @@ return array(
 			'ok' => 'Permissions on users directory are good.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
+			'nok' => 'Cannot find the required library to parse XML.',
 			'ok' => 'You have the required library to parse XML.',
 		),
 	),
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index c796fb539..e9263a5e2 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -29,12 +29,12 @@ return array(
 			'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).',
+			'nok' => 'Impossible de trouver une librairie pour la vérification des types de caractères (php-ctype).',
+			'ok' => 'Vous disposez de la librairie 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.',
+			'nok' => 'Impossible de trouver la librairie cURL (paquet php-curl).',
+			'ok' => 'Vous disposez de la librairie 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',
@@ -42,8 +42,8 @@ return array(
 		),
 		'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.',
+			'nok' => 'Impossible de trouver une librairie pour parcourir le DOM (paquet php-xml).',
+			'ok' => 'Vous disposez de la librairie pour parcourir le DOM.',
 		),
 		'entries' => array(
 			'nok' => 'La table entry est mal configurée.',
@@ -60,15 +60,15 @@ return array(
 		'files' => 'Installation des fichiers',
 		'json' => array(
 			'nok' => 'Vous ne disposez pas de JSON (paquet php5-json).',
-			'ok' => 'Vous disposez de l\'extension JSON.',
+			'ok' => 'Vous disposez de l’extension JSON.',
 		),
 		'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).',
+			'nok' => 'Impossible de trouver une librairie pour les expressions régulières (php-pcre).',
+			'ok' => 'Vous disposez de la librairie 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, pdo_pgsql).',
@@ -80,7 +80,7 @@ return array(
 			'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.',
+			'nok' => 'Impossible de trouver 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',
@@ -93,8 +93,8 @@ return array(
 			'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.',
+			'nok' => 'Vous ne disposez pas de l’extension ZIP (paquet php-zip).',
+			'ok' => 'Vous disposez de l’extension ZIP.',
 		),
 	),
 	'extensions' => array(
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 3b1dfb2f1..99437234f 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -37,11 +37,11 @@ return array(
 			'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).',
+			'nok' => 'Impossible de trouver une librairie pour la vérification des types de caractères (php-ctype).',
+			'ok' => 'Vous disposez de la librairie pour la vérification des types de caractères (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'Vous ne disposez pas de cURL (paquet php5-curl).',
+			'nok' => 'Vous ne disposez pas de cURL (paquet php-curl).',
 			'ok' => 'Vous disposez de cURL.',
 		),
 		'data' => array(
@@ -49,8 +49,8 @@ return array(
 			'ok' => 'Les droits sur le répertoire de data sont bons.',
 		),
 		'dom' => array(
-			'nok' => 'Il manque une librairie pour parcourir le DOM.',
-			'ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
+			'nok' => 'Impossible de trouver une librairie pour parcourir le DOM.',
+			'ok' => 'Vous disposez de la librairie 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',
@@ -61,7 +61,7 @@ return array(
 			'ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
 		),
 		'json' => array(
-			'nok' => 'Il manque une librairie recommandée pour JSON.',
+			'nok' => 'Impossible de trouver une librairie recommandée pour JSON.',
 			'ok' => 'Vouz disposez de la librairie recommandée pour JSON.',
 		),
 		'minz' => array(
@@ -69,8 +69,8 @@ return array(
 			'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).',
+			'nok' => 'Impossible de trouver une librairie pour les expressions régulières (php-pcre).',
+			'ok' => 'Vous disposez de la librairie 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, pdo_pgsql).',
@@ -85,7 +85,7 @@ return array(
 			'ok' => 'Les droits sur le répertoire des utilisateurs sont bons.',
 		),
 		'xml' => array(
-			'nok' => 'Il manque une librairie requise pour XML.',
+			'nok' => 'Impossible de trouver une librairie requise pour XML.',
 			'ok' => 'Vouz disposez de la librairie requise pour XML.',
 		),
 	),
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index 475865984..c399bc8c8 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -33,7 +33,7 @@ return array(
 			'ok' => 'Libreria richiesta per il controllo dei caratteri presente (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'Manca il supporto per cURL (pacchetto php5-curl).',
+			'nok' => 'Manca il supporto per cURL (pacchetto php-curl).',
 			'ok' => 'Estensione cURL presente.',
 		),
 		'data' => array(
@@ -93,7 +93,7 @@ return array(
 			'ok' => 'I permessi sulla cartella users sono corretti.',
 		),
 		'zip' => array(
-			'nok' => 'Manca estensione ZIP (pacchetto php5-zip).',
+			'nok' => 'Manca estensione ZIP (pacchetto php-zip).',
 			'ok' => 'Estensione ZIP presente.',
 		),
 	),
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index e7ea61d23..440d22af3 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -41,7 +41,7 @@ return array(
 			'ok' => 'Libreria richiesta per il controllo dei caratteri presente (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'Manca il supporto per cURL (pacchetto php5-curl).',
+			'nok' => 'Manca il supporto per cURL (pacchetto php-curl).',
 			'ok' => 'Estensione cURL presente.',
 		),
 		'data' => array(
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index f0296b827..59637bfef 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -33,7 +33,7 @@ return array(
 			'ok' => 'U hebt de benodigde bibliotheek voor character type checking (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'U mist de cURL (php5-curl package).',
+			'nok' => 'U mist de cURL (php-curl package).',
 			'ok' => 'U hebt de cURL uitbreiding.',
 		),
 		'data' => array(
@@ -93,7 +93,7 @@ return array(
 			'ok' => 'Permissies op de users map zijn goed.',
 		),
 		'zip' => array(
-			'nok' => 'U mist ZIP uitbreiding (php5-zip package).',
+			'nok' => 'U mist ZIP uitbreiding (php-zip package).',
 			'ok' => 'U hebt ZIP uitbreiding.',
 		),
 	),
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index 6aac1db20..28318d4cb 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -41,7 +41,7 @@ return array(
 			'ok' => 'U hebt de benodigde bibliotheek voor character type checking (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'U mist cURL (php5-curl package).',
+			'nok' => 'U mist cURL (php-curl package).',
 			'ok' => 'U hebt de cURL uitbreiding.',
 		),
 		'data' => array(
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index 9bc241f96..355100689 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -33,7 +33,7 @@ return array(
 			'ok' => 'У вас не установлена библиотека для проверки типов символов (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'У вас не установлено расширение cURL (пакет php5-curl).',
+			'nok' => 'У вас не установлено расширение cURL (пакет php-curl).',
 			'ok' => 'У вас установлено расширение cURL.',
 		),
 		'data' => array(
@@ -93,7 +93,7 @@ return array(
 			'ok' => 'Права на папку users  в порядке.',
 		),
 		'zip' => array(
-			'nok' => 'You lack ZIP extension (php5-zip package).',
+			'nok' => 'You lack ZIP extension (php-zip package).',
 			'ok' => 'You have ZIP extension.',
 		),
 	),
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index 3a808d544..925601011 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -41,7 +41,7 @@ return array(
 			'ok' => 'У вас установлена необходимая библиотека для проверки типов символов (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'У вас нет расширения cURL (пакет php5-curl).',
+			'nok' => 'У вас нет расширения cURL (пакет php-curl).',
 			'ok' => 'У вас установлено расширение cURL.',
 		),
 		'data' => array(
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index 4e0f755d9..e0dbd288d 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -33,7 +33,7 @@ return array(
 			'ok' => 'Karakter yazım kontrolü için kütüphane sorunsuz (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'cURL eksik (php5-curl package).',
+			'nok' => 'cURL eksik (php-curl package).',
 			'ok' => 'cURL eklentisi sorunsuz.',
 		),
 		'data' => array(
@@ -93,7 +93,7 @@ return array(
 			'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
 		),
 		'zip' => array(
-			'nok' => 'ZIP eklentisi eksik (php5-zip package).',
+			'nok' => 'ZIP eklentisi eksik (php-zip package).',
 			'ok' => 'ZIP eklentisi sorunsuz.',
 		),
 	),
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 8302a95f4..62ddb6ddc 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -41,7 +41,7 @@ return array(
 			'ok' => 'Karakter yazım kontrolü için kütüphane sorunsuz (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'cURL eksik (php5-curl package).',
+			'nok' => 'cURL eksik (php-curl package).',
 			'ok' => 'cURL eklentisi sorunsuz.',
 		),
 		'data' => array(
-- 
cgit v1.2.3


From a1311900078ee56225fd574135e9dc9d5e3175dc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 6 Oct 2016 17:41:01 +0200
Subject: i18n: Keep previous configuration

https://github.com/FreshRSS/FreshRSS/issues/1284
---
 app/i18n/de/install.php | 2 +-
 app/i18n/en/install.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index eb0c2eb89..756929323 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -4,7 +4,7 @@ return array(
 	'action' => array(
 		'finish' => 'Installation fertigstellen',
 		'fix_errors_before' => 'Bitte Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
-		'keep_install' => 'Vorherige Installation beibehalten (Daten)',
+		'keep_install' => 'Vorherige Konfiguration beibehalten',
 		'next_step' => 'Zum nächsten Schritt springen',
 		'reinstall' => 'Neuinstallation von FreshRSS',
 	),
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 54ce8edb2..ca9cfbd20 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -4,7 +4,7 @@ return array(
 	'action' => array(
 		'finish' => 'Complete installation',
 		'fix_errors_before' => 'Please fix errors before skipping to the next step.',
-		'keep_install' => 'Keep previous installation',
+		'keep_install' => 'Keep previous configuration',
 		'next_step' => 'Go to the next step',
 		'reinstall' => 'Reinstall FreshRSS',
 	),
-- 
cgit v1.2.3


From 4efc8f76e6948e6102fc5b8f11f8027374d87a35 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 6 Oct 2016 17:43:09 +0200
Subject: i18n italian keep previous installation

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

diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index e7ea61d23..f8c26e2ed 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -4,7 +4,7 @@ return array(
 	'action' => array(
 		'finish' => 'Installazione completata',
 		'fix_errors_before' => 'Per favore correggi gli errori prima di passare al passaggio successivo.',
-		'keep_install' => 'Mantieni installazione precedente',
+		'keep_install' => 'Mantieni configurazione precedente',
 		'next_step' => 'Vai al prossimo passaggio',
 		'reinstall' => 'Reinstalla FreshRSS',
 	),
-- 
cgit v1.2.3


From 7adcc0d29d54461222d57924d5d2875d639ca698 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 6 Oct 2016 19:07:54 +0200
Subject: FreshRSS custom event 'freshrss:load-more'

https://github.com/FreshRSS/FreshRSS/issues/1278
---
 p/scripts/main.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 74631451a..2ebd09bcb 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1021,6 +1021,9 @@ function focus_search() {
 	$('#search').focus();
 }
 
+var freshrssLoadMoreEvent = document.createEvent('Event');
+freshrssLoadMoreEvent.initEvent('freshrss:load-more', true, true);
+
 function init_load_more(box) {
 	box_load_more = box;
 
@@ -1030,6 +1033,8 @@ function init_load_more(box) {
 		});
 	}
 
+	document.body.dispatchEvent(freshrssLoadMoreEvent);
+
 	var $next_link = $("#load_more");
 	if (!$next_link.length) {
 		// no more article to load
-- 
cgit v1.2.3


From e6e8cac3c4694cdf09e6853ad27fae603272a653 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 6 Oct 2016 21:00:02 +0200
Subject: Allow extensions for default accout in anonymous mode

https://github.com/FreshRSS/FreshRSS/issues/1257#issuecomment-248111169
---
 app/FreshRSS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index f9c371d27..e4caf23d1 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -49,7 +49,7 @@ class FreshRSS extends Minz_FrontController {
 		self::initI18n();
 		self::loadNotifications();
 		// Enable extensions for the current (logged) user.
-		if (FreshRSS_Auth::hasAccess()) {
+		if (FreshRSS_Auth::hasAccess() || $system_conf->allow_anonymous) {
 			$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
 			Minz_ExtensionManager::enableByList($ext_list);
 		}
-- 
cgit v1.2.3


From 2fa269fafcb260addca269e097d25bec77acf0b6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 6 Oct 2016 22:25:15 +0200
Subject: Changelog freshrss:load-more

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bc9d1e36..1bc3ba3df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,8 @@
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
+* Extensions
+	* Trigger a `freshrss:load-more` JavaScript event to help extensions [#1278](https://github.com/FreshRSS/FreshRSS/issues/1278)
 
 
 ## 2016-08-29 FreshRSS 1.5.0
-- 
cgit v1.2.3


From 3a54572b524bcbd686e83ec01c9289db05eaf295 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 18:23:17 +0200
Subject: Changelog Allow extensions for default accout in anonymous mode

https://github.com/FreshRSS/FreshRSS/issues/1257#issuecomment-248111169
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bc3ba3df..602499442 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * Extensions
+	* Allow extensions for default accout in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
 	* Trigger a `freshrss:load-more` JavaScript event to help extensions [#1278](https://github.com/FreshRSS/FreshRSS/issues/1278)
 
 
-- 
cgit v1.2.3


From b5ffa8cb479131f68139ec40313fa22a3c08240d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 19:50:59 +0200
Subject: Auto-refresh favicons

Every 15 days. https://github.com/FreshRSS/FreshRSS/issues/1181
---
 lib/Favicon/DataAccess.php |  2 +-
 p/f.php                    | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/Favicon/DataAccess.php b/lib/Favicon/DataAccess.php
index 17f26b333..ae7509881 100644
--- a/lib/Favicon/DataAccess.php
+++ b/lib/Favicon/DataAccess.php
@@ -16,7 +16,7 @@ class DataAccess {
 	public function retrieveHeader($url) {
 	    $this->set_context();
 		$headers = @get_headers($url, 1);
-		return array_change_key_case($headers);
+		return $headers ? array_change_key_case($headers) : array();
 	}
 	
     public function saveCache($file, $data) {
diff --git a/p/f.php b/p/f.php
index 0f23921e3..6523cc759 100644
--- a/p/f.php
+++ b/p/f.php
@@ -15,6 +15,7 @@ $default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.ico';
 function download_favicon($website, $dest) {
 	global $favicons_dir, $default_favicon;
 
+	syslog(LOG_DEBUG, 'FreshRSS Favicon discovery GET ' . $website);
 	$favicon_getter = new \Favicon\Favicon();
 	$favicon_getter->setCacheDir($favicons_dir);
 	$favicon_url = $favicon_getter->get($website);
@@ -23,6 +24,7 @@ function download_favicon($website, $dest) {
 		return @copy($default_favicon, $dest);
 	}
 
+	syslog(LOG_DEBUG, 'FreshRSS Favicon GET ' . $favicon_url);
 	$c = curl_init($favicon_url);
 	curl_setopt($c, CURLOPT_HEADER, false);
 	curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
@@ -69,18 +71,22 @@ $txt_mtime = @filemtime($txt);
 
 header('Content-Type: image/x-icon');
 
-if ($ico_mtime == false || $txt_mtime > $ico_mtime) {
+if ($ico_mtime == false || $txt_mtime > $ico_mtime || ($ico_mtime < time() - 15 * 86400)) {
 	if ($txt_mtime == false) {
 		show_default_favicon(1800);
-		return;
+		exit();
 	}
 
 	// 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(86400);
-		return;
+		// Download failed
+		if ($ico_mtime == false) {
+			show_default_favicon(86400);
+			exit();
+		} else {
+			touch($ico);
+		}
 	}
 }
 
-- 
cgit v1.2.3


From d4c2231a7898b084b6741ceb9b175c9974be65cb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 19:54:02 +0200
Subject: Changelog Auto-refresh favicons

https://github.com/FreshRSS/FreshRSS/issues/1181
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 602499442..e11e9a0e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 	* In a multi-user context, take better advantage of other users’ refreshes [#1280](https://github.com/FreshRSS/FreshRSS/pull/1280)
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 	* Add date to exported files [#1240](https://github.com/FreshRSS/FreshRSS/issues/1240)
+	* Auto-refresh favicons after 15 days [#1181](https://github.com/FreshRSS/FreshRSS/issues/1181)
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
-- 
cgit v1.2.3


From ca4dcca5b20c3e2e6da1293746cd46674d97c710 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 21:46:48 +0200
Subject: PSHB bugs

Introduced by https://github.com/FreshRSS/FreshRSS/pull/1280
---
 app/Controllers/feedController.php | 3 ++-
 p/api/pshb.php                     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index dadc8aa83..8751d2fff 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -271,7 +271,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($ttl == -1) {
 				continue;	//Feed refresh is disabled
 			}
-			if ($feed->lastUpdate() + 10 >= time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) {
+			if ((!$simplePiePush) && (!$feed_id) &&
+				($feed->lastUpdate() + 10 >= time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl))) {
 				//Too early to refresh from source, but check whether the feed was updated by another user
 				$mtime = $feed->cacheModifiedTime();
 				if ($feed->lastUpdate() + 10 >= $mtime) {
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 94a0068ed..e9b66b167 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -116,6 +116,7 @@ foreach ($users as $userFilename) {
 		Minz_Configuration::register('user',
 		                             join_path(USERS_PATH, $username, 'config.php'),
 		                             join_path(USERS_PATH, '_', 'config.default.php'));
+		new Minz_ModelPdo($username);	//TODO: FIXME: Quick-fix while waiting for a better FreshRSS() constructor/init
 		FreshRSS_Context::init();
 		list($updated_feeds, $feed) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie);
 		if ($updated_feeds > 0) {
-- 
cgit v1.2.3


From 533af6fcc9341d4475be27d7016ab58fbd96a944 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 21:52:04 +0200
Subject: FeedReader 2.0+

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fa3388de..8d30c7b1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
 * Compatibility:
 	* Experimental support for PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
-	* New client supporting FreshRSS on Linux: FeedReader [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
+	* New client supporting FreshRSS on Linux: FeedReader 2.0+ [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
 * Features
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
-- 
cgit v1.2.3


From d48722add55ecc285d300a342bfa584c4cd8d93d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 21:53:44 +0200
Subject: README FeedReader 2.0+

---
 README.fr.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 540145fa8..77b255e7d 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -157,4 +157,4 @@ Tout client supportant une API de type Google Reader. Sélection :
 	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Propriétaire)
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Libre, F-Droid)
 * Linux
-	* [FeedReader](https://jangernert.github.io/FeedReader/) (Libre)
+	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Libre)
diff --git a/README.md b/README.md
index 2f3021ef5..67c2f79fc 100644
--- a/README.md
+++ b/README.md
@@ -157,4 +157,4 @@ Any client supporting a Google Reader-like API. Selection:
 	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Closed source)
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, F-Droid)
 * Linux
-	* [FeedReader](https://jangernert.github.io/FeedReader/) (Open source)
+	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Open source)
-- 
cgit v1.2.3


From 8c9ec7e8d5b33dc5cd85cdc6a528f3125b2e7ea2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 22:32:39 +0200
Subject: jQuery 3.1.1

---
 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 f6a6a99e6..4c5be4c0f 100644
--- a/p/scripts/jquery.min.js
+++ b/p/scripts/jquery.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v3.1.0 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"use strict";"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){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.0",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null!=a?a<0?this[a+this.length]:this[a]:f.call(this)},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.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||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},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?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;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;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=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=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"label"in b&&b.disabled===a||"form"in b&&b.disabled===a||"form"in b&&b.disabled===!1&&(b.isDisabled===a||b.isDisabled!==!a&&("label"in b||!ea(b))!==a)}}function pa(a){return ia(function(b){return b=+b,ia(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 qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.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]:[]}},d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(_,aa);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){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.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===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(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,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!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 ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.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},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.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=ga.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=ga.selectors={cacheLength:50,createPseudo:ia,match:V,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(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===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]||ga.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]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.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(_,aa).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("(^|"+K+")"+a+"("+K+"|$)"))&&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=ga.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(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},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,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(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:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).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:oa(!1),disabled:oa(!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 X.test(a.nodeName)},input:function(a){return W.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:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?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]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.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=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[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?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e)}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}}}function ua(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 va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(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?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(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}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.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(_,aa),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=V.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(_,aa),$.test(j[0].type)&&qa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&sa(j),!a)return G.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||$.test(a)&&qa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){if(r.isFunction(b))return r.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return r.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(C.test(b))return r.filter(b,a,c);b=r.filter(b,a)}return r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType})}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/\S+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,M,e),g(f,c,N,e)):(f++,j.call(a,g(f,c,M,e),g(f,c,N,e),g(f,c,M,c.notifyWith))):(d!==M&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R),a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,
-r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;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},T=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function U(){this.expando=r.expando+U.uid++}U.uid=1,U.prototype={cache:function(a){var b=a[this.expando];return b||(b={},T(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){r.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(K)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var V=new U,W=new U,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Y=/[A-Z]/g;function Z(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Y,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c||"false"!==c&&("null"===c?null:+c+""===c?+c:X.test(c)?JSON.parse(c):c)}catch(e){}W.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return W.hasData(a)||V.hasData(a)},data:function(a,b,c){return W.access(a,b,c)},removeData:function(a,b){W.remove(a,b)},_data:function(a,b,c){return V.access(a,b,c)},_removeData:function(a,b){V.remove(a,b)}}),r.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=W.get(f),1===f.nodeType&&!V.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),Z(f,d,e[d])));V.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){W.set(this,a)}):S(this,function(b){var c;if(f&&void 0===b){if(c=W.get(f,a),void 0!==c)return c;if(c=Z(f,a),void 0!==c)return c}else this.each(function(){W.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.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 V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.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=V.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var $=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,_=new RegExp("^(?:([+-])=|)("+$+")([a-z%]*)$","i"),aa=["Top","Right","Bottom","Left"],ba=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ca=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};function da(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&_.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ea={};function fa(a){var b,c=a.ownerDocument,d=a.nodeName,e=ea[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ea[d]=e,e)}function ga(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=V.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&ba(d)&&(e[f]=fa(d))):"none"!==c&&(e[f]="none",V.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ga(this,!0)},hide:function(){return ga(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){ba(this)?r(this).show():r(this).hide()})}});var ha=/^(?:checkbox|radio)$/i,ia=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ja=/^$|\/(?:java|ecma)script/i,ka={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,"",""]};ka.optgroup=ka.option,ka.tbody=ka.tfoot=ka.colgroup=ka.caption=ka.thead,ka.th=ka.td;function la(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function ma(a,b){for(var c=0,d=a.length;c<d;c++)V.set(a[c],"globalEval",!b||V.get(b[c],"globalEval"))}var na=/<|&#?\w+;/;function oa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(na.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ia.exec(f)||["",""])[1].toLowerCase(),i=ka[h]||ka._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=la(l.appendChild(f),"script"),j&&ma(g),c){k=0;while(f=g[k++])ja.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var pa=d.documentElement,qa=/^key/,ra=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,sa=/^([^.]*)(?:\.(.+)|)/;function ta(){return!0}function ua(){return!1}function va(){try{return d.activeElement}catch(a){}}function wa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)wa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ua;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(pa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),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),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==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,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;c<h;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?r(e,this).index(i)>-1:r.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},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==va()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===va()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&r.nodeName(this,"input"))return this.click(),!1},_default:function(a){return r.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ta:ua,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:ua,isPropagationStopped:ua,isImmediatePropagationStopped:ua,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ta,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ta,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ta,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&qa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ra.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return wa(this,a,b,c,d)},one:function(a,b,c,d){return wa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(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=ua),this.each(function(){r.event.remove(this,a,c,b)})}});var xa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,ya=/<script|<style|<link/i,za=/checked\s*(?:[^=]|=\s*.checked.)/i,Aa=/^true\/(.*)/,Ba=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ca(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Da(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ea(a){var b=Aa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}W.hasData(a)&&(h=W.access(a),i=r.extend({},h),W.set(b,i))}}function Ga(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ha.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ha(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&za.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(m&&(e=oa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(la(e,"script"),Da),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,la(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ea),l=0;l<i;l++)j=h[l],ja.test(j.type||"")&&!V.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Ba,""),k))}return a}function Ia(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(la(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&ma(la(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(xa,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=la(h),f=la(a),d=0,e=f.length;d<e;d++)Ga(f[d],g[d]);if(b)if(c)for(f=f||la(a),g=g||la(h),d=0,e=f.length;d<e;d++)Fa(f[d],g[d]);else Fa(a,h);return g=la(h,"script"),g.length>0&&ma(g,!i&&la(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.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 Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(la(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(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&&!ya.test(a)&&!ka[(ia.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(la(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(la(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var Ja=/^margin/,Ka=new RegExp("^("+$+")(?!px)[a-z%]+$","i"),La=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",pa.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,pa.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Ma(a,b,c){var d,e,f,g,h=a.style;return c=c||La(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ka.test(g)&&Ja.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 Na(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Oa=/^(none|table(?!-c[ea]).+)/,Pa={position:"absolute",visibility:"hidden",display:"block"},Qa={letterSpacing:"0",fontWeight:"400"},Ra=["Webkit","Moz","ms"],Sa=d.createElement("div").style;function Ta(a){if(a in Sa)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ra.length;while(c--)if(a=Ra[c]+b,a in Sa)return a}function Ua(a,b,c){var d=_.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Va(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+aa[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+aa[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+aa[f]+"Width",!0,e))):(g+=r.css(a,"padding"+aa[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+aa[f]+"Width",!0,e)));return g}function Wa(a,b,c){var d,e=!0,f=La(a),g="border-box"===r.css(a,"boxSizing",!1,f);if(a.getClientRects().length&&(d=a.getBoundingClientRect()[b]),d<=0||null==d){if(d=Ma(a,b,f),(d<0||null==d)&&(d=a.style[b]),Ka.test(d))return d;e=g&&(o.boxSizingReliable()||d===a.style[b]),d=parseFloat(d)||0}return d+Va(a,b,c||(g?"border":"content"),e,f)+"px"}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ma(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,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=r.camelCase(b),i=a.style;return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.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=_.exec(c))&&e[1]&&(c=da(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.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=r.camelCase(b);return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Ma(a,b,d)),"normal"===e&&b in Qa&&(e=Qa[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Oa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?Wa(a,b,d):ca(a,Pa,function(){return Wa(a,b,d)})},set:function(a,c,d){var e,f=d&&La(a),g=d&&Va(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=_.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ua(a,c,g)}}}),r.cssHooks.marginLeft=Na(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Ma(a,"marginLeft"))||a.getBoundingClientRect().left-ca(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+aa[d]+b]=f[d]||f[d-2]||f[0];return e}},Ja.test(a)||(r.cssHooks[a+b].set=Ua)}),r.fn.extend({css:function(a,b){return S(this,function(a,b,c){var d,e,f={},g=0;if(r.isArray(b)){for(d=La(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function Xa(a,b,c,d,e){return new Xa.prototype.init(a,b,c,d,e)}r.Tween=Xa,Xa.prototype={constructor:Xa,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Xa.propHooks[this.prop];return a&&a.get?a.get(this):Xa.propHooks._default.get(this)},run:function(a){var b,c=Xa.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Xa.propHooks._default.set(this),this}},Xa.prototype.init.prototype=Xa.prototype,Xa.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Xa.propHooks.scrollTop=Xa.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Xa.prototype.init,r.fx.step={};var Ya,Za,$a=/^(?:toggle|show|hide)$/,_a=/queueHooks$/;function ab(){Za&&(a.requestAnimationFrame(ab),r.fx.tick())}function bb(){return a.setTimeout(function(){Ya=void 0}),Ya=r.now()}function cb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=aa[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function db(a,b,c){for(var d,e=(gb.tweeners[b]||[]).concat(gb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function eb(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&ba(a),q=V.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],$a.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=V.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ga([a],!0),j=a.style.display||j,k=r.css(a,"display"),ga([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=V.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ga([a],!0),m.done(function(){p||ga([a]),V.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=db(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function fb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],r.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.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 gb(a,b,c){var d,e,f=0,g=gb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Ya||bb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:Ya||bb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.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;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(fb(k,j.opts.specialEasing);f<g;f++)if(d=gb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,db,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),r.fx.timer(r.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)}r.Animation=r.extend(gb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return da(c.elem,a,_.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(K);for(var c,d=0,e=a.length;d<e;d++)c=a[d],gb.tweeners[c]=gb.tweeners[c]||[],gb.tweeners[c].unshift(b)},prefilters:[eb],prefilter:function(a,b){b?gb.prefilters.unshift(a):gb.prefilters.push(a)}}),r.speed=function(a,b,c){var e=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off||d.hidden?e.duration=0:e.duration="number"==typeof e.duration?e.duration:e.duration in r.fx.speeds?r.fx.speeds[e.duration]:r.fx.speeds._default,null!=e.queue&&e.queue!==!0||(e.queue="fx"),e.old=e.complete,e.complete=function(){r.isFunction(e.old)&&e.old.call(this),e.queue&&r.dequeue(this,e.queue)},e},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(ba).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=gb(this,r.extend({},a),f);(e||V.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=r.timers,g=V.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&_a.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||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=V.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.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;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(cb(b,!0),a,d,e)}}),r.each({slideDown:cb("show"),slideUp:cb("hide"),slideToggle:cb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(Ya=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),Ya=void 0},r.fx.timer=function(a){r.timers.push(a),a()?r.fx.start():r.timers.pop()},r.fx.interval=13,r.fx.start=function(){Za||(Za=a.requestAnimationFrame?a.requestAnimationFrame(ab):a.setInterval(r.fx.tick,r.fx.interval))},r.fx.stop=function(){a.cancelAnimationFrame?a.cancelAnimationFrame(Za):a.clearInterval(Za),Za=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var hb,ib=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return S(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?hb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);
-if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),hb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ib[b]||r.find.attr;ib[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=ib[g],ib[g]=e,e=null!=c(a,b,d)?g:null,ib[g]=f),e}});var jb=/^(?:input|select|textarea|button)$/i,kb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.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){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):jb.test(a.nodeName)||kb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});var lb=/[\t\r\n\f]/g;function mb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,mb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,mb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,mb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=mb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(c)+" ").replace(lb," ").indexOf(b)>-1)return!0;return!1}});var nb=/\r/g,ob=/[\x20\t\r\n\f]+/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(nb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:r.trim(r.text(a)).replace(ob," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type,g=f?null:[],h=f?e+1:d.length,i=e<0?h:f?e:0;i<h;i++)if(c=d[i],(c.selected||i===e)&&!c.disabled&&(!c.parentNode.disabled||!r.nodeName(c.parentNode,"optgroup"))){if(b=r(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ha.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.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 Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.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 Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(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}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(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}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,""),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(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 r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Qb=[],Rb=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Qb.pop()||r.expando+"_"+rb++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Rb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rb.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Rb,"$1"+e):b.jsonp!==!1&&(b.url+=(sb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Qb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=B.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=oa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=r.trim(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length};function Sb(a){return r.isWindow(a)?a:9===a.nodeType&&a.defaultView}r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.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),r.isFunction(b)&&(b=b.call(a,c,r.extend({},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)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),d.width||d.height?(e=f.ownerDocument,c=Sb(e),b=e.documentElement,{top:d.top+c.pageYOffset-b.clientTop,left:d.left+c.pageXOffset-b.clientLeft}):d):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),r.nodeName(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||pa})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return S(this,function(a,d,e){var f=Sb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Na(o.pixelPosition,function(a,c){if(c)return c=Ma(a,b),Ka.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return S(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({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)}}),r.parseJSON=JSON.parse,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Tb=a.jQuery,Ub=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Ub),b&&a.jQuery===r&&(a.jQuery=Tb),r},b||(a.jQuery=a.$=r),r});
+/*! jQuery v3.1.1 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"use strict";"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){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.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||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},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?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;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;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=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=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(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 qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),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){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.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===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(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,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!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 ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.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},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.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=ga.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=ga.selectors={cacheLength:50,createPseudo:ia,match:V,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(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===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]||ga.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]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.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(_,aa).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("(^|"+K+")"+a+"("+K+"|$)"))&&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=ga.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(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},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,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(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:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).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:oa(!1),disabled:oa(!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 X.test(a.nodeName)},input:function(a){return W.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:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?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]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.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=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[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?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e);return!1}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}return!1}}function ua(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 va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(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?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(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}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):C.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/[^\x20\t\r\n\f]+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,M,e),g(f,c,N,e)):(f++,j.call(a,g(f,c,M,e),g(f,c,N,e),g(f,c,M,c.notifyWith))):(d!==M&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R),
+a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;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},T=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function U(){this.expando=r.expando+U.uid++}U.uid=1,U.prototype={cache:function(a){var b=a[this.expando];return b||(b={},T(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){r.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(K)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var V=new U,W=new U,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Y=/[A-Z]/g;function Z(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:X.test(a)?JSON.parse(a):a)}function $(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Y,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=Z(c)}catch(e){}W.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return W.hasData(a)||V.hasData(a)},data:function(a,b,c){return W.access(a,b,c)},removeData:function(a,b){W.remove(a,b)},_data:function(a,b,c){return V.access(a,b,c)},_removeData:function(a,b){V.remove(a,b)}}),r.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=W.get(f),1===f.nodeType&&!V.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),$(f,d,e[d])));V.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){W.set(this,a)}):S(this,function(b){var c;if(f&&void 0===b){if(c=W.get(f,a),void 0!==c)return c;if(c=$(f,a),void 0!==c)return c}else this.each(function(){W.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.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 V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.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=V.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var _=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,aa=new RegExp("^(?:([+-])=|)("+_+")([a-z%]*)$","i"),ba=["Top","Right","Bottom","Left"],ca=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},da=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};function ea(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&aa.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var fa={};function ga(a){var b,c=a.ownerDocument,d=a.nodeName,e=fa[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),fa[d]=e,e)}function ha(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=V.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&ca(d)&&(e[f]=ga(d))):"none"!==c&&(e[f]="none",V.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ha(this,!0)},hide:function(){return ha(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){ca(this)?r(this).show():r(this).hide()})}});var ia=/^(?:checkbox|radio)$/i,ja=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ka=/^$|\/(?:java|ecma)script/i,la={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,"",""]};la.optgroup=la.option,la.tbody=la.tfoot=la.colgroup=la.caption=la.thead,la.th=la.td;function ma(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function na(a,b){for(var c=0,d=a.length;c<d;c++)V.set(a[c],"globalEval",!b||V.get(b[c],"globalEval"))}var oa=/<|&#?\w+;/;function pa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(oa.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ja.exec(f)||["",""])[1].toLowerCase(),i=la[h]||la._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=ma(l.appendChild(f),"script"),j&&na(g),c){k=0;while(f=g[k++])ka.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var qa=d.documentElement,ra=/^key/,sa=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ta=/^([^.]*)(?:\.(.+)|)/;function ua(){return!0}function va(){return!1}function wa(){try{return d.activeElement}catch(a){}}function xa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)xa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=va;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(qa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),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),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==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,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g,h=[],i=b.delegateCount,j=a.target;if(i&&j.nodeType&&!("click"===a.type&&a.button>=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c<i;c++)d=b[c],e=d.selector+" ",void 0===g[e]&&(g[e]=d.needsContext?r(e,this).index(j)>-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i<b.length&&h.push({elem:j,handlers:b.slice(i)}),h},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==wa()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===wa()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&r.nodeName(this,"input"))return this.click(),!1},_default:function(a){return r.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ua:va,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:va,isPropagationStopped:va,isImmediatePropagationStopped:va,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ua,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ua,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ua,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&ra.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&sa.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return xa(this,a,b,c,d)},one:function(a,b,c,d){return xa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(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=va),this.each(function(){r.event.remove(this,a,c,b)})}});var ya=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,za=/<script|<style|<link/i,Aa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ba=/^true\/(.*)/,Ca=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Da(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Ea(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Fa(a){var b=Ba.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ga(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}W.hasData(a)&&(h=W.access(a),i=r.extend({},h),W.set(b,i))}}function Ha(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ia.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ia(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&Aa.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ia(f,b,c,d)});if(m&&(e=pa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(ma(e,"script"),Ea),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,ma(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Fa),l=0;l<i;l++)j=h[l],ka.test(j.type||"")&&!V.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Ca,""),k))}return a}function Ja(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(ma(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&na(ma(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(ya,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=ma(h),f=ma(a),d=0,e=f.length;d<e;d++)Ha(f[d],g[d]);if(b)if(c)for(f=f||ma(a),g=g||ma(h),d=0,e=f.length;d<e;d++)Ga(f[d],g[d]);else Ga(a,h);return g=ma(h,"script"),g.length>0&&na(g,!i&&ma(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ja(this,a,!0)},remove:function(a){return Ja(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.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 Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.appendChild(a)}})},prepend:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(ma(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(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&&!za.test(a)&&!la[(ja.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(ma(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ia(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(ma(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var Ka=/^margin/,La=new RegExp("^("+_+")(?!px)[a-z%]+$","i"),Ma=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",qa.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,qa.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Na(a,b,c){var d,e,f,g,h=a.style;return c=c||Ma(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&La.test(g)&&Ka.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 Oa(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Pa=/^(none|table(?!-c[ea]).+)/,Qa={position:"absolute",visibility:"hidden",display:"block"},Ra={letterSpacing:"0",fontWeight:"400"},Sa=["Webkit","Moz","ms"],Ta=d.createElement("div").style;function Ua(a){if(a in Ta)return a;var b=a[0].toUpperCase()+a.slice(1),c=Sa.length;while(c--)if(a=Sa[c]+b,a in Ta)return a}function Va(a,b,c){var d=aa.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Wa(a,b,c,d,e){var f,g=0;for(f=c===(d?"border":"content")?4:"width"===b?1:0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+ba[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+ba[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+ba[f]+"Width",!0,e))):(g+=r.css(a,"padding"+ba[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+ba[f]+"Width",!0,e)));return g}function Xa(a,b,c){var d,e=!0,f=Ma(a),g="border-box"===r.css(a,"boxSizing",!1,f);if(a.getClientRects().length&&(d=a.getBoundingClientRect()[b]),d<=0||null==d){if(d=Na(a,b,f),(d<0||null==d)&&(d=a.style[b]),La.test(d))return d;e=g&&(o.boxSizingReliable()||d===a.style[b]),d=parseFloat(d)||0}return d+Wa(a,b,c||(g?"border":"content"),e,f)+"px"}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Na(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,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=r.camelCase(b),i=a.style;return b=r.cssProps[h]||(r.cssProps[h]=Ua(h)||h),g=r.cssHooks[b]||r.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=aa.exec(c))&&e[1]&&(c=ea(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.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=r.camelCase(b);return b=r.cssProps[h]||(r.cssProps[h]=Ua(h)||h),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Na(a,b,d)),"normal"===e&&b in Ra&&(e=Ra[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Pa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?Xa(a,b,d):da(a,Qa,function(){return Xa(a,b,d)})},set:function(a,c,d){var e,f=d&&Ma(a),g=d&&Wa(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=aa.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Va(a,c,g)}}}),r.cssHooks.marginLeft=Oa(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Na(a,"marginLeft"))||a.getBoundingClientRect().left-da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+ba[d]+b]=f[d]||f[d-2]||f[0];return e}},Ka.test(a)||(r.cssHooks[a+b].set=Va)}),r.fn.extend({css:function(a,b){return S(this,function(a,b,c){var d,e,f={},g=0;if(r.isArray(b)){for(d=Ma(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function Ya(a,b,c,d,e){return new Ya.prototype.init(a,b,c,d,e)}r.Tween=Ya,Ya.prototype={constructor:Ya,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Ya.propHooks[this.prop];return a&&a.get?a.get(this):Ya.propHooks._default.get(this)},run:function(a){var b,c=Ya.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ya.propHooks._default.set(this),this}},Ya.prototype.init.prototype=Ya.prototype,Ya.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Ya.propHooks.scrollTop=Ya.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Ya.prototype.init,r.fx.step={};var Za,$a,_a=/^(?:toggle|show|hide)$/,ab=/queueHooks$/;function bb(){$a&&(a.requestAnimationFrame(bb),r.fx.tick())}function cb(){return a.setTimeout(function(){Za=void 0}),Za=r.now()}function db(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ba[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function eb(a,b,c){for(var d,e=(hb.tweeners[b]||[]).concat(hb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function fb(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&ca(a),q=V.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],_a.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=V.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ha([a],!0),j=a.style.display||j,k=r.css(a,"display"),ha([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=V.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ha([a],!0),m.done(function(){p||ha([a]),V.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=eb(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function gb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],r.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.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 hb(a,b,c){var d,e,f=0,g=hb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Za||cb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:Za||cb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.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;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(gb(k,j.opts.specialEasing);f<g;f++)if(d=hb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,eb,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),r.fx.timer(r.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)}r.Animation=r.extend(hb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return ea(c.elem,a,aa.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(K);for(var c,d=0,e=a.length;d<e;d++)c=a[d],hb.tweeners[c]=hb.tweeners[c]||[],hb.tweeners[c].unshift(b)},prefilters:[fb],prefilter:function(a,b){b?hb.prefilters.unshift(a):hb.prefilters.push(a)}}),r.speed=function(a,b,c){var e=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off||d.hidden?e.duration=0:"number"!=typeof e.duration&&(e.duration in r.fx.speeds?e.duration=r.fx.speeds[e.duration]:e.duration=r.fx.speeds._default),null!=e.queue&&e.queue!==!0||(e.queue="fx"),e.old=e.complete,e.complete=function(){r.isFunction(e.old)&&e.old.call(this),e.queue&&r.dequeue(this,e.queue)},e},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(ca).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=hb(this,r.extend({},a),f);(e||V.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=r.timers,g=V.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&ab.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||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=V.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.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;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(db(b,!0),a,d,e)}}),r.each({slideDown:db("show"),slideUp:db("hide"),slideToggle:db("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(Za=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),Za=void 0},r.fx.timer=function(a){r.timers.push(a),a()?r.fx.start():r.timers.pop()},r.fx.interval=13,r.fx.start=function(){$a||($a=a.requestAnimationFrame?a.requestAnimationFrame(bb):a.setInterval(r.fx.tick,r.fx.interval))},r.fx.stop=function(){a.cancelAnimationFrame?a.cancelAnimationFrame($a):a.clearInterval($a),$a=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var ib,jb=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return S(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?ib:void 0)),
+void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),ib={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=jb[b]||r.find.attr;jb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=jb[g],jb[g]=e,e=null!=c(a,b,d)?g:null,jb[g]=f),e}});var kb=/^(?:input|select|textarea|button)$/i,lb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.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){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):kb.test(a.nodeName)||lb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function mb(a){var b=a.match(K)||[];return b.join(" ")}function nb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,nb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,nb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,nb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=nb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(nb(c))+" ").indexOf(b)>-1)return!0;return!1}});var ob=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(ob,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:mb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!r.nodeName(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ia.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.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 Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.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 Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(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}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(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}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,"$1"),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(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 r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Qb=[],Rb=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Qb.pop()||r.expando+"_"+rb++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Rb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rb.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Rb,"$1"+e):b.jsonp!==!1&&(b.url+=(sb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Qb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=B.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=pa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=mb(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length};function Sb(a){return r.isWindow(a)?a:9===a.nodeType&&a.defaultView}r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.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),r.isFunction(b)&&(b=b.call(a,c,r.extend({},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)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),d.width||d.height?(e=f.ownerDocument,c=Sb(e),b=e.documentElement,{top:d.top+c.pageYOffset-b.clientTop,left:d.left+c.pageXOffset-b.clientLeft}):d):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),r.nodeName(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||qa})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return S(this,function(a,d,e){var f=Sb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Oa(o.pixelPosition,function(a,c){if(c)return c=Na(a,b),La.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return S(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({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)}}),r.parseJSON=JSON.parse,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Tb=a.jQuery,Ub=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Ub),b&&a.jQuery===r&&(a.jQuery=Tb),r},b||(a.jQuery=a.$=r),r});
-- 
cgit v1.2.3


From 79696f31adde2a3e0a224294104b19ccc77565cc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 7 Oct 2016 22:54:23 +0200
Subject: Meta description option

https://github.com/FreshRSS/FreshRSS/issues/1105
---
 app/Models/Context.php  | 2 ++
 data/config.default.php | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app/Models/Context.php b/app/Models/Context.php
index 33e65a619..a38b1e0f1 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -144,11 +144,13 @@ class FreshRSS_Context {
 		case 'a':
 			self::$current_get['all'] = true;
 			self::$name = _t('index.feed.title');
+			self::$description = self::$system_conf->meta_description;
 			self::$get_unread = self::$total_unread;
 			break;
 		case 's':
 			self::$current_get['starred'] = true;
 			self::$name = _t('index.feed.title_fav');
+			self::$description = self::$system_conf->meta_description;
 			self::$get_unread = self::$total_starred['unread'];
 
 			// Update state if favorite is not yet enabled.
diff --git a/data/config.default.php b/data/config.default.php
index af1482d03..d3cd3bf22 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -27,6 +27,9 @@ return array(
 	# Title of this FreshRSS instance in the Web user interface.
 	'title' => 'FreshRSS',
 
+	# Meta description used when `allow_robots` is true.
+	'meta_description' => '',
+
 	# Name of the user that has administration rights.
 	'default_user' => '_',
 
-- 
cgit v1.2.3


From 6bc37cef47b41821055fc9e2c1ecb0ffbcc5d0d3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 8 Oct 2016 21:45:47 +0200
Subject: W3C resource-priorities have been abandonned

https://github.com/FreshRSS/FreshRSS/issues/1222
---
 app/Models/Feed.php | 2 +-
 lib/lib_rss.php     | 7 +++----
 p/scripts/main.js   | 6 ------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index f435620c8..21c1ef93d 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -309,7 +309,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$elinks[$elink] = '1';
 					$mime = strtolower($enclosure->get_type());
 					if (strpos($mime, 'image/') === 0) {
-						$content .= '<p class="enclosure"><img lazyload="" src="' . $elink . '" alt="" /></p>';
+						$content .= '<p class="enclosure"><img src="' . $elink . '" alt="" /></p>';
 					} elseif (strpos($mime, 'audio/') === 0) {
 						$content .= '<p class="enclosure"><audio preload="none" src="' . $elink . '" controls="controls"></audio> <a download="" href="' . $elink . '">💾</a></p>';
 					} elseif (strpos($mime, 'video/') === 0) {
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index a4cd8e782..b18512484 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -182,10 +182,9 @@ function customSimplePie() {
 		'onmouseover', 'onmousemove', 'onmouseout', 'onfocus', 'onblur',
 		'onkeypress', 'onkeydown', 'onkeyup', 'onselect', 'onchange', 'seamless', 'sizes', 'srcset')));
 	$simplePie->add_attributes(array(
-		'img' => array('lazyload' => '', 'postpone' => ''),	//http://www.w3.org/TR/resource-priorities/
-		'audio' => array('lazyload' => '', 'postpone' => '', 'preload' => 'none'),
-		'iframe' => array('lazyload' => '', 'postpone' => '', 'sandbox' => 'allow-scripts allow-same-origin'),
-		'video' => array('lazyload' => '', 'postpone' => '', 'preload' => 'none'),
+		'audio' => array('preload' => 'none'),
+		'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'),
+		'video' => array('preload' => 'none'),
 	));
 	$simplePie->set_url_replacements(array(
 		'a' => 'href',
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 2ebd09bcb..3c0a36629 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1027,12 +1027,6 @@ freshrssLoadMoreEvent.initEvent('freshrss:load-more', true, true);
 function init_load_more(box) {
 	box_load_more = box;
 
-	if (!context.does_lazyload) {
-		$('img[postpone], audio[postpone], iframe[postpone], video[postpone]').each(function () {
-			this.removeAttribute('postpone');
-		});
-	}
-
 	document.body.dispatchEvent(freshrssLoadMoreEvent);
 
 	var $next_link = $("#load_more");
-- 
cgit v1.2.3


From 464ca2840290b72c0a804f62181ecbfd2e99dba4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 8 Oct 2016 22:16:42 +0200
Subject: Changelog removed *resource-priorities*

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c19eb40c9..6ff289886 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@
 * Extensions
 	* Allow extensions for default accout in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
 	* Trigger a `freshrss:load-more` JavaScript event to help extensions [#1278](https://github.com/FreshRSS/FreshRSS/issues/1278)
+* Mics.
+	* Removed *resource-priorities* attributes (`defer`, `lazyload`), deprecated by W3C [#1222](https://github.com/FreshRSS/FreshRSS/pull/1222)
 
 
 ## 2016-08-29 FreshRSS 1.5.0
-- 
cgit v1.2.3


From 55fce1ef14649464463bf29132c54e8d690249c9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 8 Oct 2016 22:29:32 +0200
Subject: Readme wording

https://github.com/FreshRSS/FreshRSS/pull/1281
---
 README.fr.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 77b255e7d..e5f24f4e2 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -154,7 +154,7 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 Tout client supportant une API de type Google Reader. Sélection :
 
 * Android
-	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Propriétaire)
+	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) avec [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Propriétaire)
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Libre, F-Droid)
 * Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Libre)
diff --git a/README.md b/README.md
index 67c2f79fc..f5eb38499 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ mysqldump -u user -p --databases freshrss > freshrss.sql
 Any client supporting a Google Reader-like API. Selection:
 
 * Android
-	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) + [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Closed source)
+	* [News+](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus) with [News+ Google Reader extension](https://play.google.com/store/apps/details?id=com.noinnion.android.newsplus.extension.google_reader) (Closed source)
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, F-Droid)
 * Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Open source)
-- 
cgit v1.2.3


From 39cd93e8bab7122558511994e8920eea1ac804a4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 9 Oct 2016 19:13:43 +0200
Subject: Ubuntu example for Cron

https://github.com/FreshRSS/FreshRSS/issues/1180#issuecomment-252475962
---
 README.fr.md | 9 ++++++++-
 README.md    | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index e5f24f4e2..e96bf4239 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -109,7 +109,14 @@ C’est une bonne idée d’utiliser le même utilisateur que votre serveur Web
 Par exemple, pour exécuter le script toutes les heures :
 
 ```
-7 * * * * php /votre-chemin/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+8 * * * * php /votre-chemin/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+```
+
+### Exemple pour Debian / Ubuntu
+Créer `/etc/cron.d/FreshRSS` avec :
+
+```
+7,37 * * * * www-data php -f /usr/share/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 
diff --git a/README.md b/README.md
index f5eb38499..01ce290ac 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,14 @@ It’s a good idea to use the Web server user.
 For example, if you want to run the script every hour:
 
 ```
-7 * * * * php /your-path/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+9 * * * * php /usr/share/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+```
+
+### Example on Debian / Ubuntu
+Create `/etc/cron.d/FreshRSS` with:
+
+```
+6,36 * * * * www-data php -f /usr/share/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 
-- 
cgit v1.2.3


From 5abe8603edcd507c9f69074f6ec78ff7ccbd07e6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 9 Oct 2016 19:15:40 +0200
Subject: Cron in /usr/share/FreshRSS

---
 README.fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.fr.md b/README.fr.md
index e96bf4239..4e2961bee 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -109,7 +109,7 @@ C’est une bonne idée d’utiliser le même utilisateur que votre serveur Web
 Par exemple, pour exécuter le script toutes les heures :
 
 ```
-8 * * * * php /votre-chemin/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+8 * * * * php /usr/share/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 ### Exemple pour Debian / Ubuntu
-- 
cgit v1.2.3


From 189692e6adea2acb098bae5bc9ce75844080d040 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 10 Oct 2016 21:57:33 +0200
Subject: Fix bug share

https://github.com/FreshRSS/FreshRSS/issues/1289
Was using deprecated non-standard parameter in string.replace()

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace#Firefox-specific_notes
---
 p/scripts/main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 3c0a36629..d42704f7a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1153,10 +1153,10 @@ function init_share_observers() {
 	$('.share.add').on('click', function(e) {
 		var opt = $(this).siblings('select').find(':selected');
 		var row = $(this).parents('form').data(opt.data('form'));
-		row = row.replace('##label##', opt.html().trim(), 'g');
-		row = row.replace('##type##', opt.val(), 'g');
-		row = row.replace('##help##', opt.data('help'), 'g');
-		row = row.replace('##key##', shares, 'g');
+		row = row.replace(/##label##/g, opt.html().trim());
+		row = row.replace(/##type##/g, opt.val());
+		row = row.replace(/##help##/g, opt.data('help'));
+		row = row.replace(/##key##/g, shares);
 		$(this).parents('.form-group').before(row);
 		shares++;
 
-- 
cgit v1.2.3


From cbb6c26db79b5a74e588110d2cf8fc8cf9137ab8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 10 Oct 2016 22:07:58 +0200
Subject: Fix share POST

https://github.com/FreshRSS/FreshRSS/issues/1289
---
 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 147a2fe06..e73f106a6 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -139,7 +139,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
-			$params = Minz_Request::fetchGET();
+			$params = Minz_Request::fetchPOST();
 			FreshRSS_Context::$user_conf->sharing = $params['share'];
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
-- 
cgit v1.2.3


From f14a65549d109cf51822727a4e86142bbff7d117 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 10 Oct 2016 22:10:30 +0200
Subject: Fix sharing bug

https://github.com/FreshRSS/FreshRSS/issues/1289
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ff289886..7f05b77c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
+	* Fix sharing bug [#1289](https://github.com/FreshRSS/FreshRSS/issues/1289)
 	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
 	* Bug in example of URL for FreshRS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
 * SimplePie
-- 
cgit v1.2.3


From 50827447e3684ad59e0ecb8c2e76f473d07d1748 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 11 Oct 2016 19:34:46 +0200
Subject: Better error message in markReadFeed

https://github.com/FreshRSS/FreshRSS/issues/1299
---
 app/Models/EntryDAO.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 43ac21f9e..6563b0f93 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -467,7 +467,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$stm = $this->bd->prepare($sql . $search);
 		if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::error('SQL error markReadFeed: ' . $info[2]);
+			Minz_Log::error('SQL error markReadFeed: ' . $info[2] . ' with SQL: ' . $sql . $search);
 			$this->bd->rollBack();
 			return false;
 		}
@@ -481,7 +481,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$stm = $this->bd->prepare($sql);
 			if (!($stm && $stm->execute($values))) {
 				$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-				Minz_Log::error('SQL error markReadFeed: ' . $info[2]);
+				Minz_Log::error('SQL error markReadFeed cache: ' . $info[2]);
 				$this->bd->rollBack();
 				return false;
 			}
-- 
cgit v1.2.3


From c64918f839febe483fdfe91901f7874699f0eca6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Oct 2016 09:49:38 +0200
Subject: Randomize favicon refresh

https://github.com/FreshRSS/FreshRSS/issues/1298
---
 p/f.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/p/f.php b/p/f.php
index 6523cc759..df3e4b5f3 100644
--- a/p/f.php
+++ b/p/f.php
@@ -71,7 +71,7 @@ $txt_mtime = @filemtime($txt);
 
 header('Content-Type: image/x-icon');
 
-if ($ico_mtime == false || $txt_mtime > $ico_mtime || ($ico_mtime < time() - 15 * 86400)) {
+if ($ico_mtime == false || $txt_mtime > $ico_mtime || ($ico_mtime < time() - (rand(15, 20) * 86400))) {
 	if ($txt_mtime == false) {
 		show_default_favicon(1800);
 		exit();
@@ -92,6 +92,6 @@ if ($ico_mtime == false || $txt_mtime > $ico_mtime || ($ico_mtime < time() - 15
 
 header('Content-Disposition: inline; filename="' . $id . '.ico"');
 
-if (!httpConditional($ico_mtime, 2592000, 2)) {
+if (!httpConditional($ico_mtime, rand(14, 21) * 86400, 2)) {
 	readfile($ico);
 }
-- 
cgit v1.2.3


From f080774059232de636d08a0ad76bb60fd91be657 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Oct 2016 09:59:27 +0200
Subject: Changelog randomize favicon refresh

https://github.com/FreshRSS/FreshRSS/issues/1298
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f05b77c8..68967bbba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
 	* In a multi-user context, take better advantage of other users’ refreshes [#1280](https://github.com/FreshRSS/FreshRSS/pull/1280)
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 	* Add date to exported files [#1240](https://github.com/FreshRSS/FreshRSS/issues/1240)
-	* Auto-refresh favicons after 15 days [#1181](https://github.com/FreshRSS/FreshRSS/issues/1181)
+	* Auto-refresh favicons once or twice a month [#1181](https://github.com/FreshRSS/FreshRSS/issues/1181), [#1298](https://github.com/FreshRSS/FreshRSS/issues/1298)
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
-- 
cgit v1.2.3


From e8d1a6dcc9c6aeb5204a8afc47aaae3c6bdd9dc4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Oct 2016 15:47:04 +0200
Subject: Cron refresh favicons

Related to
https://github.com/FreshRSS/FreshRSS/issues/1181
https://github.com/FreshRSS/FreshRSS/issues/1298
---
 app/Models/Context.php   |  2 ++
 app/Models/Feed.php      | 24 ++++++++++++++++++------
 app/actualize_script.php |  1 +
 lib/favicons.php         | 40 ++++++++++++++++++++++++++++++++++++++++
 p/f.php                  | 46 ++--------------------------------------------
 5 files changed, 63 insertions(+), 50 deletions(-)
 create mode 100644 lib/favicons.php

diff --git a/app/Models/Context.php b/app/Models/Context.php
index a38b1e0f1..889ddab1e 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -37,6 +37,8 @@ class FreshRSS_Context {
 	public static $id_max = '';
 	public static $sinceHours = 0;
 
+	public static $isCron = false;
+
 	/**
 	 * Initialize the context.
 	 *
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 21c1ef93d..b78f5f064 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -131,13 +131,25 @@ class FreshRSS_Feed extends Minz_Model {
 		return $this->nbNotRead;
 	}
 	public function faviconPrepare() {
-		$file = DATA_PATH . '/favicons/' . $this->hash() . '.txt';
-		if (!file_exists($file)) {
-			$t = $this->website;
-			if ($t == '') {
-				$t = $this->url;
+		require_once(LIB_PATH . '/favicons.php');
+		$url = $this->website;
+		if ($url == '') {
+			$url = $this->url;
+		}
+		$txt = $favicons_dir . $this->hash() . '.txt';
+		if (!file_exists($txt)) {
+			file_put_contents($txt, $url);
+		}
+		if (FreshRSS_Context::$isCron) {
+			$ico = $favicons_dir . $this->hash() . '.ico';
+			$ico_mtime = @filemtime($ico);
+			$txt_mtime = @filemtime($txt);
+			if ($txt_mtime != false &&
+				($ico_mtime == false || $ico_mtime < $txt_mtime || ($ico_mtime < 14 * 86400))) {
+				// no ico file or we should download a new one.
+				$url = file_get_contents($txt);
+				download_favicon($url, $ico) || touch($ico);
 			}
-			file_put_contents($file, $t);
 		}
 	}
 	public static function faviconDelete($hash) {
diff --git a/app/actualize_script.php b/app/actualize_script.php
index fc4f9bfbb..78712d721 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -28,6 +28,7 @@ $app = new FreshRSS();
 
 $system_conf = Minz_Configuration::get('system');
 $system_conf->auth_type = 'none';  // avoid necessity to be logged in (not saved!)
+FreshRSS_Context::$isCron = true;
 
 // Create the list of users to actualize.
 // Users are processed in a random order but always start with admin
diff --git a/lib/favicons.php b/lib/favicons.php
new file mode 100644
index 000000000..6709f6745
--- /dev/null
+++ b/lib/favicons.php
@@ -0,0 +1,40 @@
+<?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.ico';
+
+function download_favicon($website, $dest) {
+	global $favicons_dir, $default_favicon;
+
+	syslog(LOG_DEBUG, 'FreshRSS Favicon discovery GET ' . $website);
+	$favicon_getter = new \Favicon\Favicon();
+	$favicon_getter->setCacheDir($favicons_dir);
+	$favicon_url = $favicon_getter->get($website);
+
+	if ($favicon_url === false) {
+		return @copy($default_favicon, $dest);
+	}
+
+	syslog(LOG_DEBUG, 'FreshRSS Favicon GET ' . $favicon_url);
+	$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;
+}
diff --git a/p/f.php b/p/f.php
index df3e4b5f3..e4c82bb16 100644
--- a/p/f.php
+++ b/p/f.php
@@ -1,51 +1,9 @@
 <?php
 
 require('../constants.php');
-
-include(LIB_PATH . '/Favicon/Favicon.php');
-include(LIB_PATH . '/Favicon/DataAccess.php');
+require(LIB_PATH . '/favicons.php');
 require(LIB_PATH . '/http-conditional.php');
 
-
-$favicons_dir = DATA_PATH . '/favicons/';
-$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, $default_favicon;
-
-	syslog(LOG_DEBUG, 'FreshRSS Favicon discovery GET ' . $website);
-	$favicon_getter = new \Favicon\Favicon();
-	$favicon_getter->setCacheDir($favicons_dir);
-	$favicon_url = $favicon_getter->get($website);
-
-	if ($favicon_url === false) {
-		return @copy($default_favicon, $dest);
-	}
-
-	syslog(LOG_DEBUG, 'FreshRSS Favicon GET ' . $favicon_url);
-	$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;
-}
-
-
 function show_default_favicon($cacheSeconds = 3600) {
 	global $default_favicon;
 
@@ -71,7 +29,7 @@ $txt_mtime = @filemtime($txt);
 
 header('Content-Type: image/x-icon');
 
-if ($ico_mtime == false || $txt_mtime > $ico_mtime || ($ico_mtime < time() - (rand(15, 20) * 86400))) {
+if ($ico_mtime == false || $ico_mtime < $txt_mtime || ($ico_mtime < time() - (rand(15, 20) * 86400))) {
 	if ($txt_mtime == false) {
 		show_default_favicon(1800);
 		exit();
-- 
cgit v1.2.3


From 2f339b324816e909e87bc328d3bcd8788991a62e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Oct 2016 15:49:51 +0200
Subject: Changelog cron refresh favicons

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68967bbba..4067dc5a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 	* Add date to exported files [#1240](https://github.com/FreshRSS/FreshRSS/issues/1240)
 	* Auto-refresh favicons once or twice a month [#1181](https://github.com/FreshRSS/FreshRSS/issues/1181), [#1298](https://github.com/FreshRSS/FreshRSS/issues/1298)
+		* Cron updates will also refresh favicons every 14 days [#1306](https://github.com/FreshRSS/FreshRSS/pull/1306)
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
-- 
cgit v1.2.3


From 8a923aa8c75cae951e9700b44010304aea506340 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Oct 2016 21:36:00 +0200
Subject: Finalize cron refresh favicons

---
 CHANGELOG.md        | 2 +-
 app/Models/Feed.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4067dc5a7..3178e6ae7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 	* Add date to exported files [#1240](https://github.com/FreshRSS/FreshRSS/issues/1240)
 	* Auto-refresh favicons once or twice a month [#1181](https://github.com/FreshRSS/FreshRSS/issues/1181), [#1298](https://github.com/FreshRSS/FreshRSS/issues/1298)
-		* Cron updates will also refresh favicons every 14 days [#1306](https://github.com/FreshRSS/FreshRSS/pull/1306)
+		* Cron updates will also refresh favicons every 2 weeks [#1306](https://github.com/FreshRSS/FreshRSS/pull/1306)
 * Bug fixing
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index b78f5f064..55c2db4d6 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -131,6 +131,7 @@ class FreshRSS_Feed extends Minz_Model {
 		return $this->nbNotRead;
 	}
 	public function faviconPrepare() {
+		global $favicons_dir;
 		require_once(LIB_PATH . '/favicons.php');
 		$url = $this->website;
 		if ($url == '') {
@@ -145,7 +146,7 @@ class FreshRSS_Feed extends Minz_Model {
 			$ico_mtime = @filemtime($ico);
 			$txt_mtime = @filemtime($txt);
 			if ($txt_mtime != false &&
-				($ico_mtime == false || $ico_mtime < $txt_mtime || ($ico_mtime < 14 * 86400))) {
+				($ico_mtime == false || $ico_mtime < $txt_mtime || ($ico_mtime < time() - (14 * 86400)))) {
 				// no ico file or we should download a new one.
 				$url = file_get_contents($txt);
 				download_favicon($url, $ico) || touch($ico);
-- 
cgit v1.2.3


From 6ebbaaa7fabeedaa2d668d2274ee323d77cc0de9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Oct 2016 23:24:02 +0200
Subject: Update gitignore rules

---
 data/.gitignore                    | 10 +++-------
 data/PubSubHubbub/feeds/.gitignore |  3 ++-
 data/users/.gitignore              |  9 +++++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/data/.gitignore b/data/.gitignore
index c2ed350a6..76314fc12 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,10 +1,6 @@
-application.ini
 config.php
-*.sqlite
-touch.txt
-no-cache.txt
-*.bak.php
-*.lock.txt
+config.php.bak.php
+force-https.txt
 last_update.txt
+no-cache.txt
 update.php
-force-https.txt
diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore
index 150f68c80..16b0ae4bc 100644
--- a/data/PubSubHubbub/feeds/.gitignore
+++ b/data/PubSubHubbub/feeds/.gitignore
@@ -1 +1,2 @@
-*/*
+*/*.json
+*/*.txt
diff --git a/data/users/.gitignore b/data/users/.gitignore
index a8b7cd60f..3705c06b7 100644
--- a/data/users/.gitignore
+++ b/data/users/.gitignore
@@ -1,4 +1,5 @@
-db.sqlite
-config.php
-log*.txt
-
+*/
+*/config.php
+*/db.sqlite
+!_/
+*/log*.txt
-- 
cgit v1.2.3


From 576f9737a8aab276e1571287c1b6ccb23d068b0a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 12 Oct 2016 23:31:39 +0200
Subject: Minz::Log bug when currentUser is empty string

`Minz_Session::param('currentUser', '_')` could return an empty string
---
 lib/Minz/Log.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php
index 2a9e10993..9559a0bd4 100644
--- a/lib/Minz/Log.php
+++ b/lib/Minz/Log.php
@@ -42,7 +42,11 @@ class Minz_Log {
 		       || ($env === 'production'
 		       && ($level >= Minz_Log::NOTICE)))) {
 			if ($file_name === null) {
-				$file_name = join_path(USERS_PATH, Minz_Session::param('currentUser', '_'), 'log.txt');
+				$username = Minz_Session::param('currentUser', '');
+				if ($username == '') {
+					$username = '_';
+				}
+				$file_name = join_path(USERS_PATH, $username, 'log.txt');
 			}
 
 			switch ($level) {
-- 
cgit v1.2.3


From b4298f498f8afb5c5ac0bfa65bb628cf47561a21 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 13 Oct 2016 23:33:42 +0200
Subject: Scroll as read

https://github.com/FreshRSS/FreshRSS/issues/1258
---
 p/scripts/main.js | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index d42704f7a..b2bd994ad 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -116,21 +116,18 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 var pending_entries = {};
 function mark_read(active, only_not_read) {
-	if (active.length === 0 ||
+	if (active.length === 0 || active.attr('id') == '' ||
 		(only_not_read === true && !active.hasClass("not_read"))) {
 		return false;
 	}
 
-	var url = active.find("a.read").attr("href");
-	if (url === undefined) {
-		return false;
-	}
-
 	if (pending_entries[active.attr('id')]) {
 		return false;
 	}
 	pending_entries[active.attr('id')] = true;
 
+	var url = '.?c=entry&a=read&id=' + active.attr('id').replace(/^flux_/, '');
+
 	$.ajax({
 		type: 'POST',
 		url: url,
@@ -150,10 +147,11 @@ function mark_read(active, only_not_read) {
 		}
 		$r.find('.icon').replaceWith(data.icon);
 
-		var feed_url = active.find(".website>a").attr("href"),
-			feed_id = feed_url.substr(feed_url.lastIndexOf('f_'));
-
-		incUnreadsFeed(active, feed_id, inc);
+		var feed_url = active.find(".website>a").attr("href");
+		if (feed_url) {
+			var feed_id = feed_url.substr(feed_url.lastIndexOf('f_'));
+			incUnreadsFeed(active, feed_id, inc);
+		}
 		faviconNbUnread();
 
 		delete pending_entries[active.attr('id')];
@@ -451,14 +449,9 @@ function auto_share(key) {
 }
 
 function inMarkViewport(flux, box_to_follow) {
-	var top = flux.offset().top;
-	var height = flux.height(),
-		begin = top + 3 * height / 4,
-		bot = Math.min(begin + 75, top + height),
-		windowTop = box_to_follow.scrollTop(),
-		windowBot = windowTop + box_to_follow.height() / 2;
-
-	return (windowBot >= begin && bot >= windowBot);
+	var bottom = flux.offset().top + flux.height(),
+		windowTop = box_to_follow.scrollTop();
+	return bottom < windowTop + 40;
 }
 
 function init_posts() {
@@ -470,7 +463,7 @@ function init_posts() {
 	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)) {
+				if (inMarkViewport($(this), box_to_follow)) {
 					mark_read($(this), true);
 				}
 			});
-- 
cgit v1.2.3


From f766f34775c7162058b929b397ac7fd20dc885b2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 13 Oct 2016 23:38:25 +0200
Subject: Scroll as read minor variable

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

diff --git a/p/scripts/main.js b/p/scripts/main.js
index b2bd994ad..75d194906 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -463,8 +463,9 @@ function init_posts() {
 	if (context.auto_mark_scroll) {
 		box_to_follow.scroll(function () {
 			$('.not_read:visible').each(function () {
-				if (inMarkViewport($(this), box_to_follow)) {
-					mark_read($(this), true);
+				var $this = $(this);
+				if (inMarkViewport($this, box_to_follow)) {
+					mark_read($this, true);
 				}
 			});
 		});
-- 
cgit v1.2.3


From 626d9cbccbd0a52c7ece4ffeaab9bd09f62a3761 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Fri, 14 Oct 2016 09:20:11 +0200
Subject: Scroll as read: mark as unread bug

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

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 75d194906..b3531e884 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -126,7 +126,8 @@ function mark_read(active, only_not_read) {
 	}
 	pending_entries[active.attr('id')] = true;
 
-	var url = '.?c=entry&a=read&id=' + active.attr('id').replace(/^flux_/, '');
+	var url = '.?c=entry&a=read&id=' + active.attr('id').replace(/^flux_/, '') +
+		(active.hasClass('not_read') ? '' : '&is_read=0');
 
 	$.ajax({
 		type: 'POST',
-- 
cgit v1.2.3


From 3366945a90b58929cc3b9e980ce9a52027151556 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 14 Oct 2016 17:49:33 +0200
Subject: Default option mark as read during scroll

---
 CHANGELOG.md                    | 1 +
 data/users/_/config.default.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3178e6ae7..a21e4a093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 	* Experimental support for PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
 	* New client supporting FreshRSS on Linux: FeedReader 2.0+ [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
 * Features
+	* Rework the “mark as read during scroll” option, now enabled by default [#1258](https://github.com/FreshRSS/FreshRSS/issues/1258), [#1309](https://github.com/FreshRSS/FreshRSS/pull/1309)
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
 		* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index 280b13422..f28ef9724 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -35,7 +35,7 @@ return array (
 	'mark_when' => array (
 		'article' => true,
 		'site' => true,
-		'scroll' => false,
+		'scroll' => true,
 		'reception' => false,
 	),
 	'theme' => 'Origine',
-- 
cgit v1.2.3


From 6d7ebaeb3b75969fbf44a8f36dbb5e9993f0c623 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 14 Oct 2016 17:50:27 +0200
Subject: Readme mark as read during scroll

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a21e4a093..4aa5ada8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 	* Experimental support for PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
 	* New client supporting FreshRSS on Linux: FeedReader 2.0+ [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
 * Features
-	* Rework the “mark as read during scroll” option, now enabled by default [#1258](https://github.com/FreshRSS/FreshRSS/issues/1258), [#1309](https://github.com/FreshRSS/FreshRSS/pull/1309)
+	* Rework the “mark as read during scroll” option, enabled by default for new users [#1258](https://github.com/FreshRSS/FreshRSS/issues/1258), [#1309](https://github.com/FreshRSS/FreshRSS/pull/1309)
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
 		* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
-- 
cgit v1.2.3


From d184478fb4c98e035dca1ebef36a5946d43c6a3a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 14 Oct 2016 23:05:05 +0200
Subject: PostgreSQL compatibility boolean

https://github.com/FreshRSS/FreshRSS/issues/1311
---
 app/Models/EntryDAO.php       | 12 ++++++++----
 app/Models/EntryDAOSQLite.php | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 6563b0f93..938d90886 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -273,15 +273,19 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		 .	'WHERE e.is_read=0 '
 		 .	'GROUP BY e.id_feed'
 		 . ') x ON x.id_feed=f.id '
-		 . 'SET f.`cache_nbUnreads`=COALESCE(x.nbUnreads, 0) '
-		 . 'WHERE 1';
+		 . 'SET f.`cache_nbUnreads`=COALESCE(x.nbUnreads, 0)';
+		$hasWhere = false;
 		$values = array();
 		if ($feedId !== false) {
-			$sql .= ' AND f.id=?';
+			$sql .= $hasWhere ? ' AND' : ' WHERE';
+			$hasWhere = true;
+			$sql .= ' f.id=?';
 			$values[] = $id;
 		}
 		if ($catId !== false) {
-			$sql .= ' AND f.category=?';
+			$sql .= $hasWhere ? ' AND' : ' WHERE';
+			$hasWhere = true;
+			$sql .= ' f.category=?';
 			$values[] = $catId;
 		}
 		$stm = $this->bd->prepare($sql);
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index fd5d25bf6..34e854608 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -30,15 +30,19 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		$sql = 'UPDATE `' . $this->prefix . 'feed` '
 		 . 'SET `cache_nbUnreads`=('
 		 .	'SELECT COUNT(*) AS nbUnreads FROM `' . $this->prefix . 'entry` e '
-		 .	'WHERE e.id_feed=`' . $this->prefix . 'feed`.id AND e.is_read=0) '
-		 . 'WHERE 1';
+		 .	'WHERE e.id_feed=`' . $this->prefix . 'feed`.id AND e.is_read=0)';
+		$hasWhere = false;
 		$values = array();
 		if ($feedId !== false) {
-			$sql .= ' AND id=?';
+			$sql .= $hasWhere ? ' AND' : ' WHERE';
+			$hasWhere = true;
+			$sql .= ' id=?';
 			$values[] = $feedId;
 		}
 		if ($catId !== false) {
-			$sql .= ' AND category=?';
+			$sql .= $hasWhere ? ' AND' : ' WHERE';
+			$hasWhere = true;
+			$sql .= ' category=?';
 			$values[] = $catId;
 		}
 		$stm = $this->bd->prepare($sql);
-- 
cgit v1.2.3


From 0eb7a717e61ecce6a7a5c8484e42268b4904a79c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 00:04:51 +0200
Subject: PostgreSQL avoid duplicate category 1

https://github.com/FreshRSS/FreshRSS/issues/1312
---
 app/SQL/install.sql.pgsql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index 841003def..6e1d4a103 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -51,7 +51,7 @@ $SQL_CREATE_TABLES = array(
 'CREATE INDEX %1$sis_read_index ON "%1$sentry" ("is_read");',
 'CREATE INDEX %1$sentry_lastSeen_index ON "%1$sentry" ("lastSeen");',
 
-'INSERT INTO "%1$scategory" (id, name) VALUES(1, \'%2$s\');',
+'INSERT INTO "%1$scategory" (id, name) SELECT 1, \'%2$s\' WHERE NOT EXISTS (SELECT id FROM "%1$scategory" WHERE id = 1);',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400);',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400);',
 );
-- 
cgit v1.2.3


From c24d60372ad59932638964e37cb84ba0de8b1661 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 00:49:10 +0200
Subject: PostgreSQL emulate "INSERT IGNORE"

Would have liked to use UPSERT, but it is first available from
PostgreSQL 9.5.
---
 app/SQL/install.sql.pgsql.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index 6e1d4a103..91c5b257d 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -52,8 +52,8 @@ $SQL_CREATE_TABLES = array(
 'CREATE INDEX %1$sentry_lastSeen_index ON "%1$sentry" ("lastSeen");',
 
 'INSERT INTO "%1$scategory" (id, name) SELECT 1, \'%2$s\' WHERE NOT EXISTS (SELECT id FROM "%1$scategory" WHERE id = 1);',
-'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400);',
-'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) VALUES(\'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400);',
+'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) SELECT \'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400 WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'http://freshrss.org/feeds/all.atom.xml\');',
+'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) SELECT \'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400 WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'https://github.com/FreshRSS/FreshRSS/releases.atom\');',
 );
 
 define('SQL_DROP_TABLES', 'DROP TABLES "%1$sentry", "%1$sfeed", "%1$scategory"');
-- 
cgit v1.2.3


From a0127d980c37b69c48db6982733fac60eaf8601c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 01:27:39 +0200
Subject: Fix bug JSON import duplicates

https://github.com/FreshRSS/FreshRSS/issues/1312
---
 app/Controllers/importExportController.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 9dfc479f0..c2e68f465 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -360,6 +360,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			}
 		}
 
+		$newGuids = array();
+		foreach ($article_object['items'] as $item) {
+			$newGuids[] = $item['id'];
+		}
+		// For this feed, check existing GUIDs already in database.
+		$existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
+		unset($newGuids);
+
 		// Then, articles are imported.
 		$this->entryDAO->beginTransaction();
 		foreach ($article_object['items'] as $item) {
@@ -395,7 +403,11 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			}
 
 			$values = $entry->toArray();
-			$id = $this->entryDAO->addEntry($values);
+			if (isset($existingHashForGuids[$entry->guid()])) {
+				$id = $this->entryDAO->updateEntry($values);
+			} else {
+				$id = $this->entryDAO->addEntry($values);
+			}
 
 			if (!$error && ($id === false)) {
 				$error = true;
-- 
cgit v1.2.3


From 2ac71f2bd683bae06f1e4056e2893d74cf4ad430 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 13:37:21 +0200
Subject: Readme gitignore

---
 CHANGELOG.md                       | 1 +
 data/PubSubHubbub/feeds/.gitignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3178e6ae7..a2d938436 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Security
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
+	* Updated gitignore rules to keep user directories during a `git clean -f -d` [#1307](https://github.com/FreshRSS/FreshRSS/pull/1307)
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * Extensions
diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore
index 16b0ae4bc..d8f9df042 100644
--- a/data/PubSubHubbub/feeds/.gitignore
+++ b/data/PubSubHubbub/feeds/.gitignore
@@ -1,2 +1,3 @@
+*/
 */*.json
 */*.txt
-- 
cgit v1.2.3


From 50f1e027e3e3a77abf367f9d4559b51573b1b295 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 14:18:23 +0200
Subject: Fix import bug

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

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index c2e68f465..d36c57deb 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -365,7 +365,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$newGuids[] = $item['id'];
 		}
 		// For this feed, check existing GUIDs already in database.
-		$existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
+		$existingHashForGuids = $this->entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
 		unset($newGuids);
 
 		// Then, articles are imported.
-- 
cgit v1.2.3


From 021c377f80223868c7423feb3256135938849cab Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 14:25:34 +0200
Subject: Changelog fix bug import favourites

https://github.com/FreshRSS/FreshRSS/issues/1312
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbc23e1b9..7d4e36c7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
 	* Fix sharing bug [#1289](https://github.com/FreshRSS/FreshRSS/issues/1289)
+	* Fix bug during import of favourites [#1315](https://github.com/FreshRSS/FreshRSS/pull/1315), [#1312](https://github.com/FreshRSS/FreshRSS/issues/1312)
 	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
 	* Bug in example of URL for FreshRS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
 * SimplePie
-- 
cgit v1.2.3


From 56f66f4b6168276ca449d18a440b6958c6817088 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 14:58:40 +0200
Subject: Remove superflous category request

A category request was systematically done, although it is not always
needed.
---
 app/Controllers/indexController.php |  5 +++++
 app/Models/Context.php              | 15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 4e2717920..5ca147ff3 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -159,6 +159,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	 *   - hours (default: 0)
 	 */
 	private function updateContext() {
+		if (empty(FreshRSS_Context::$categories)) {
+			$catDAO = new FreshRSS_CategoryDAO();
+			FreshRSS_Context::$categories = $catDAO->listCategories();
+		}
+
 		// Update number of read / unread variables.
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 		FreshRSS_Context::$total_starred = $entryDAO->countUnreadReadFavorites();
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 889ddab1e..fe4fa6281 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -48,9 +48,6 @@ class FreshRSS_Context {
 		// Init configuration.
 		self::$system_conf = Minz_Configuration::get('system');
 		self::$user_conf = Minz_Configuration::get('user');
-
-		$catDAO = new FreshRSS_CategoryDAO();
-		self::$categories = $catDAO->listCategories();
 	}
 
 	/**
@@ -142,6 +139,11 @@ class FreshRSS_Context {
 		$id = substr($get, 2);
 		$nb_unread = 0;
 
+		if (empty(self::$categories)) {
+			$catDAO = new FreshRSS_CategoryDAO();
+			self::$categories = $catDAO->listCategories();
+		}
+
 		switch($type) {
 		case 'a':
 			self::$current_get['all'] = true;
@@ -203,11 +205,16 @@ class FreshRSS_Context {
 	/**
 	 * Set the value of $next_get attribute.
 	 */
-	public static function _nextGet() {
+	private static function _nextGet() {
 		$get = self::currentGet();
 		// By default, $next_get == $get
 		self::$next_get = $get;
 
+		if (empty(self::$categories)) {
+			$catDAO = new FreshRSS_CategoryDAO();
+			self::$categories = $catDAO->listCategories();
+		}
+
 		if (self::$user_conf->onread_jump_next && strlen($get) > 2) {
 			$another_unread_id = '';
 			$found_current_get = false;
-- 
cgit v1.2.3


From 4d9fbb97c80f450d13b455377482ad94d4637671 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 15:12:19 +0200
Subject: Readme remove superfluous SQL request

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d4e36c7f..6243611c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,8 +33,10 @@
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * Extensions
-	* Allow extensions for default accout in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
+	* Allow extensions for default account in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
 	* Trigger a `freshrss:load-more` JavaScript event to help extensions [#1278](https://github.com/FreshRSS/FreshRSS/issues/1278)
+* SQL
+	* Increase performances by removing a superfluous category request [#1316](https://github.com/FreshRSS/FreshRSS/pull/1316)
 * Mics.
 	* Removed *resource-priorities* attributes (`defer`, `lazyload`), deprecated by W3C [#1222](https://github.com/FreshRSS/FreshRSS/pull/1222)
 
-- 
cgit v1.2.3


From 6c50041b139e2638ed0957c1c70bea5e45345710 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 15:18:16 +0200
Subject: Readme PostgreSQL

https://github.com/FreshRSS/FreshRSS/issues/416
---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6243611c1..f7275398d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 * API
 	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
 * Compatibility:
-	* Experimental support for PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
+	* Support for PostgreSQL [#416](https://github.com/FreshRSS/FreshRSS/issues/416)
 	* New client supporting FreshRSS on Linux: FeedReader 2.0+ [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
 * Features
 	* Rework the “mark as read during scroll” option, enabled by default for new users [#1258](https://github.com/FreshRSS/FreshRSS/issues/1258), [#1309](https://github.com/FreshRSS/FreshRSS/pull/1309)
@@ -36,6 +36,7 @@
 	* Allow extensions for default account in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
 	* Trigger a `freshrss:load-more` JavaScript event to help extensions [#1278](https://github.com/FreshRSS/FreshRSS/issues/1278)
 * SQL
+	* Slightly modified several SQL requests (MySQL, SQLite) to simplify support of PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
 	* Increase performances by removing a superfluous category request [#1316](https://github.com/FreshRSS/FreshRSS/pull/1316)
 * Mics.
 	* Removed *resource-priorities* attributes (`defer`, `lazyload`), deprecated by W3C [#1222](https://github.com/FreshRSS/FreshRSS/pull/1222)
-- 
cgit v1.2.3


From 1336875aeeac46790055fd0a6935165e8bc5d508 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 15:20:21 +0200
Subject: Readme FreshRSS 1.6 in October 2016

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7275398d..e93c9717c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-XX-XX FreshRSS 1.6.0-dev
+## 2016-10-XX FreshRSS 1.6.0-dev
 
 * API
 	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
-- 
cgit v1.2.3


From 64d5d61910367b24be446c086a84aefb3aec0874 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 15:31:42 +0200
Subject: Readme other users’ refreshes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e93c9717c..d15c95069 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,11 @@
 	* New client supporting FreshRSS on Linux: FeedReader 2.0+ [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
 * Features
 	* Rework the “mark as read during scroll” option, enabled by default for new users [#1258](https://github.com/FreshRSS/FreshRSS/issues/1258), [#1309](https://github.com/FreshRSS/FreshRSS/pull/1309)
+	* In a multi-user context, take better advantage of other users’ refreshes [#1280](https://github.com/FreshRSS/FreshRSS/pull/1280)
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
 		* Explicit number: `https://freshrss.example/i/?a=rss&nb=10`
 		* Limited by `min_posts_per_rss` and `max_posts_per_rss` in user config
-	* In a multi-user context, take better advantage of other users’ refreshes [#1280](https://github.com/FreshRSS/FreshRSS/pull/1280)
 	* Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241)
 	* Add date to exported files [#1240](https://github.com/FreshRSS/FreshRSS/issues/1240)
 	* Auto-refresh favicons once or twice a month [#1181](https://github.com/FreshRSS/FreshRSS/issues/1181), [#1298](https://github.com/FreshRSS/FreshRSS/issues/1298)
-- 
cgit v1.2.3


From 8d7ff90594df6d87dfc995150e4a1996634f92b3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 18:38:27 +0200
Subject: Fix bug auto load more

https://github.com/FreshRSS/FreshRSS/issues/1318
---
 app/views/helpers/pagination.phtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index 20957fc67..eb3114fcd 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -1,6 +1,7 @@
 <?php
 	$url_next = Minz_Request::currentRequest();
 	$url_next['params']['next'] = FreshRSS_Context::$next_id;
+	$url_next['params']['state'] = FreshRSS_Context::$state;
 	$url_next['params']['ajax'] = 1;
 
 	$url_mark_read = array(
-- 
cgit v1.2.3


From 5e3a9480d1b6c5fab7444681547f00f38f4060be Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 18:41:31 +0200
Subject: Readme auto-load article

https://github.com/FreshRSS/FreshRSS/issues/1318
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d15c95069..546e5c0fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
 	* Fix sharing bug [#1289](https://github.com/FreshRSS/FreshRSS/issues/1289)
+	* Fix bug in auto-load more articles after marking an article as un-read [#1318](https://github.com/FreshRSS/FreshRSS/issues/1318)
 	* Fix bug during import of favourites [#1315](https://github.com/FreshRSS/FreshRSS/pull/1315), [#1312](https://github.com/FreshRSS/FreshRSS/issues/1312)
 	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
 	* Bug in example of URL for FreshRS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
-- 
cgit v1.2.3


From 36320c40b34c4f18496518203330fbb705cf6610 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 19:55:15 +0200
Subject: Global view scroll top

---
 p/scripts/global_view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index f1b9c8ad4..de0b9cb9f 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -26,6 +26,7 @@ function load_panel(link) {
 		// Sans ça, si l'on scroll en lisant une catégorie par exemple,
 		// en en ouvrant une autre ensuite, on se retrouve au même point de scroll
 		$("#panel").scrollTop(0);
+		$(window).scrollTop(0);
 
 		$('#panel').on('click', '#nav_menu_read_all button, #bigMarkAsRead', function () {
 			console.log($(this).attr("formaction"));
-- 
cgit v1.2.3


From 34e38e3a97814eae27174839dd04bcf79c3d62b5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 20:01:48 +0200
Subject: SQL DROP TABLE

https://github.com/FreshRSS/FreshRSS/issues/1320
---
 app/SQL/install.sql.mysql.php  | 2 +-
 app/SQL/install.sql.pgsql.php  | 2 +-
 app/SQL/install.sql.sqlite.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index 92a00aecc..ca181303e 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -63,7 +63,7 @@ INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) V
 INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS @ GitHub", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);
 ');
 
-define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
+define('SQL_DROP_TABLES', 'DROP TABLE IF EXISTS `%1$sentry`, `%1$sfeed`, `%1$scategory`');
 
 define('SQL_UPDATE_UTF8MB4', '
 ALTER DATABASE `%2$s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index 91c5b257d..0b86908cd 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -56,4 +56,4 @@ $SQL_CREATE_TABLES = array(
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) SELECT \'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400 WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'https://github.com/FreshRSS/FreshRSS/releases.atom\');',
 );
 
-define('SQL_DROP_TABLES', 'DROP TABLES "%1$sentry", "%1$sfeed", "%1$scategory"');
+define('SQL_DROP_TABLES', 'DROP TABLE IF EXISTS "%1$sentry", "%1$sfeed", "%1$scategory"');
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 9d146d6f0..1d3a5d92f 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -59,4 +59,4 @@ $SQL_CREATE_TABLES = array(
 'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS releases", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);',
 );
 
-define('SQL_DROP_TABLES', 'DROP TABLES entry, feed, category');
+define('SQL_DROP_TABLES', 'DROP TABLE IF EXISTS entry, feed, category');
-- 
cgit v1.2.3


From 84bbb33e128b01b2622f44efe2a2f2e0a3d8d5d6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 20:17:44 +0200
Subject: Minor text changes

---
 CHANGELOG.md | 8 ++++----
 README.md    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 546e5c0fb..8aed3c016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,19 +26,19 @@
 	* Fix bug during import of favourites [#1315](https://github.com/FreshRSS/FreshRSS/pull/1315), [#1312](https://github.com/FreshRSS/FreshRSS/issues/1312)
 	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
 	* Bug in example of URL for FreshRS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
-* SimplePie
-	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Security
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
 	* Updated gitignore rules to keep user directories during a `git clean -f -d` [#1307](https://github.com/FreshRSS/FreshRSS/pull/1307)
-* UI
-	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * Extensions
 	* Allow extensions for default account in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
 	* Trigger a `freshrss:load-more` JavaScript event to help extensions [#1278](https://github.com/FreshRSS/FreshRSS/issues/1278)
 * SQL
 	* Slightly modified several SQL requests (MySQL, SQLite) to simplify support of PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
 	* Increase performances by removing a superfluous category request [#1316](https://github.com/FreshRSS/FreshRSS/pull/1316)
+* UI
+	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
+* SimplePie
+	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Mics.
 	* Removed *resource-priorities* attributes (`defer`, `lazyload`), deprecated by W3C [#1222](https://github.com/FreshRSS/FreshRSS/pull/1222)
 
diff --git a/README.md b/README.md
index 01ce290ac..5bd8b9607 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ sudo service apache2 restart
 cd /usr/share/
 sudo apt-get install git
 sudo git clone https://github.com/FreshRSS/FreshRSS.git
-# Set the rights so that your Web browser can access the files
+# Set the rights so that your Web server can access the files
 cd FreshRSS
 sudo chown -R :www-data .
 sudo chmod -R g+w ./data/
-- 
cgit v1.2.3


From f1eaf02a0c323c401950bca6189a795915193c3a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 15 Oct 2016 23:09:21 +0200
Subject: PostgreSQL workaround for SERIAL strange behaviour

http://stackoverflow.com/questions/18389537/does-postgresql-serial-work-differently
---
 app/SQL/install.sql.pgsql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index 0b86908cd..b343bda86 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -51,7 +51,7 @@ $SQL_CREATE_TABLES = array(
 'CREATE INDEX %1$sis_read_index ON "%1$sentry" ("is_read");',
 'CREATE INDEX %1$sentry_lastSeen_index ON "%1$sentry" ("lastSeen");',
 
-'INSERT INTO "%1$scategory" (id, name) SELECT 1, \'%2$s\' WHERE NOT EXISTS (SELECT id FROM "%1$scategory" WHERE id = 1);',
+'INSERT INTO "%1$scategory" (name) SELECT \'%2$s\' WHERE NOT EXISTS (SELECT id FROM "%1$scategory" WHERE id = 1);',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) SELECT \'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400 WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'http://freshrss.org/feeds/all.atom.xml\');',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) SELECT \'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400 WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'https://github.com/FreshRSS/FreshRSS/releases.atom\');',
 );
-- 
cgit v1.2.3


From ce14841cc05e500819c0cdb2c594be8b44e91e2d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 12:31:13 +0200
Subject: Scroll as read for Global view + throttle event

https://github.com/FreshRSS/FreshRSS/issues/1317
https://github.com/FreshRSS/FreshRSS/pull/1309
---
 p/scripts/main.js | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index b3531e884..400abf947 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -449,26 +449,22 @@ function auto_share(key) {
 	}
 }
 
-function inMarkViewport(flux, box_to_follow) {
-	var bottom = flux.offset().top + flux.height(),
-		windowTop = box_to_follow.scrollTop();
-	return bottom < windowTop + 40;
-}
-
 function init_posts() {
-	var box_to_follow = $(window);
-	if (context.current_view === 'global') {
-		box_to_follow = $("#panel");
-	}
+	var box_to_follow = context.current_view === 'global' ? $("#panel") : $(window);
 
 	if (context.auto_mark_scroll) {
+		var lastScroll = 0;	//Throttle
 		box_to_follow.scroll(function () {
-			$('.not_read:visible').each(function () {
-				var $this = $(this);
-				if (inMarkViewport($this, box_to_follow)) {
-					mark_read($this, true);
-				}
-			});
+			if (lastScroll + 500 < Date.now()) {
+				lastScroll = Date.now();
+				$('.not_read:visible').each(function () {
+					var $this = $(this),
+						minTop = (context.current_view === 'global') ? box_to_follow.offset().top : box_to_follow.scrollTop();
+					if ($this.offset().top + $this.height() < minTop + 40) {
+						mark_read($this, true);
+					}
+				});
+			}
 		});
 	}
 
-- 
cgit v1.2.3


From eb88fee64bccfacbb8b1f5d84ba833d3a8286aa0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 15:10:21 +0200
Subject: Scroll performance

Fewer events, and ensure an event is fired after the end of the scroll.
https://github.com/FreshRSS/FreshRSS/pull/1309
---
 p/scripts/main.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 400abf947..47d651d5b 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -449,21 +449,31 @@ function auto_share(key) {
 	}
 }
 
+function scrollAsRead(box_to_follow) {
+	var minTop = 40 + (context.current_view === 'global' ? box_to_follow.offset().top : box_to_follow.scrollTop());
+	$('.not_read:visible').each(function () {
+			var $this = $(this);
+			if ($this.offset().top + $this.height() < minTop) {
+				mark_read($this, true);
+			}
+		});
+}
+
 function init_posts() {
 	var box_to_follow = context.current_view === 'global' ? $("#panel") : $(window);
 
 	if (context.auto_mark_scroll) {
-		var lastScroll = 0;	//Throttle
+		var lastScroll = 0,	//Throttle
+			timerId = 0;
 		box_to_follow.scroll(function () {
+			window.clearTimeout(timerId);
 			if (lastScroll + 500 < Date.now()) {
 				lastScroll = Date.now();
-				$('.not_read:visible').each(function () {
-					var $this = $(this),
-						minTop = (context.current_view === 'global') ? box_to_follow.offset().top : box_to_follow.scrollTop();
-					if ($this.offset().top + $this.height() < minTop + 40) {
-						mark_read($this, true);
-					}
-				});
+				scrollAsRead(box_to_follow);
+			} else {
+				timerId = window.setTimeout(function() {
+						scrollAsRead(box_to_follow);
+					}, 500);
 			}
 		});
 	}
-- 
cgit v1.2.3


From 38289beb66b51ce518cf7dc03faf6abc388eedbd Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 15:19:11 +0200
Subject: Fix updateEntry warning

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

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 938d90886..3959cb191 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -208,7 +208,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			$this->updateEntryPrepared->bindParam(':hash', $valuesTmp['hashBin']);
 		}
 
-		if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute($values)) {
+		if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute()) {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $this->updateEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->updateEntryPrepared->errorInfo();
-- 
cgit v1.2.3


From 3f78bad3970113f14b80db19808e2c58af8fb19e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 15:53:08 +0200
Subject: Scroll as read: keep unread function

https://github.com/FreshRSS/FreshRSS/pull/1309
---
 p/scripts/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 47d651d5b..138a223de 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -144,6 +144,7 @@ function mark_read(active, only_not_read) {
 			inc--;
 		} else if (only_not_read !== true || active.hasClass("not_read")) {
 			active.addClass("not_read");
+			active.addClass("keep_unread");
 			inc++;
 		}
 		$r.find('.icon').replaceWith(data.icon);
@@ -451,7 +452,7 @@ function auto_share(key) {
 
 function scrollAsRead(box_to_follow) {
 	var minTop = 40 + (context.current_view === 'global' ? box_to_follow.offset().top : box_to_follow.scrollTop());
-	$('.not_read:visible').each(function () {
+	$('.not_read:not(.keep_unread):visible').each(function () {
 			var $this = $(this);
 			if ($this.offset().top + $this.height() < minTop) {
 				mark_read($this, true);
-- 
cgit v1.2.3


From 6cd38d73d0b41ea7cd4da1fe611d761d7d442f2b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 16:10:58 +0200
Subject: mark_read optimisation

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

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 138a223de..51323a969 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -116,8 +116,8 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 var pending_entries = {};
 function mark_read(active, only_not_read) {
-	if (active.length === 0 || active.attr('id') == '' ||
-		(only_not_read === true && !active.hasClass("not_read"))) {
+	if ((active.length === 0) || (!active.attr('id')) ||
+		(only_not_read && !active.hasClass("not_read"))) {
 		return false;
 	}
 
@@ -142,7 +142,7 @@ function mark_read(active, only_not_read) {
 		if (active.hasClass("not_read")) {
 			active.removeClass("not_read");
 			inc--;
-		} else if (only_not_read !== true || active.hasClass("not_read")) {
+		} else {
 			active.addClass("not_read");
 			active.addClass("keep_unread");
 			inc++;
-- 
cgit v1.2.3


From cfb2f03c20ef73f97f2ce7ae090624daaef52da0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 17:02:46 +0200
Subject: Readme typo

https://github.com/FreshRSS/FreshRSS/issues/1328
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aed3c016..c04b79e45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 	* Fix bug in auto-load more articles after marking an article as un-read [#1318](https://github.com/FreshRSS/FreshRSS/issues/1318)
 	* Fix bug during import of favourites [#1315](https://github.com/FreshRSS/FreshRSS/pull/1315), [#1312](https://github.com/FreshRSS/FreshRSS/issues/1312)
 	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
-	* Bug in example of URL for FreshRS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
+	* Bug in example of URL for FreshRSS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
 * Security
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
 	* Updated gitignore rules to keep user directories during a `git clean -f -d` [#1307](https://github.com/FreshRSS/FreshRSS/pull/1307)
-- 
cgit v1.2.3


From b89a7a875af17aae86e32e609120df4b19cd5a61 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 17:20:51 +0200
Subject: Readme keep unread function

https://github.com/FreshRSS/FreshRSS/pull/1327
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c04b79e45..ece77e87b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 	* New client supporting FreshRSS on Linux: FeedReader 2.0+ [#1252](https://github.com/FreshRSS/FreshRSS/issues/1252)
 * Features
 	* Rework the “mark as read during scroll” option, enabled by default for new users [#1258](https://github.com/FreshRSS/FreshRSS/issues/1258), [#1309](https://github.com/FreshRSS/FreshRSS/pull/1309)
+		* Including a *keep unread* function [#1327](https://github.com/FreshRSS/FreshRSS/pull/1327)
 	* In a multi-user context, take better advantage of other users’ refreshes [#1280](https://github.com/FreshRSS/FreshRSS/pull/1280)
 	* Better control of number of entries per page or RSS feed [#1249](https://github.com/FreshRSS/FreshRSS/issues/1249)
 		* Since X hours: `https://freshrss.example/i/?a=rss&hours=3`
-- 
cgit v1.2.3


From 83a1a137557be7c9847dacd7870d6d2b3623cea1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 17:58:22 +0200
Subject: Readme typos

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ece77e87b..d7c15d5a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,10 +20,10 @@
 	* Auto-refresh favicons once or twice a month [#1181](https://github.com/FreshRSS/FreshRSS/issues/1181), [#1298](https://github.com/FreshRSS/FreshRSS/issues/1298)
 		* Cron updates will also refresh favicons every 2 weeks [#1306](https://github.com/FreshRSS/FreshRSS/pull/1306)
 * Bug fixing
-	* Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
+	* Correction of bugs related to CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f)
 	* Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269)
 	* Fix sharing bug [#1289](https://github.com/FreshRSS/FreshRSS/issues/1289)
-	* Fix bug in auto-load more articles after marking an article as un-read [#1318](https://github.com/FreshRSS/FreshRSS/issues/1318)
+	* Fix bug in auto-loading more articles after marking an article as un-read [#1318](https://github.com/FreshRSS/FreshRSS/issues/1318)
 	* Fix bug during import of favourites [#1315](https://github.com/FreshRSS/FreshRSS/pull/1315), [#1312](https://github.com/FreshRSS/FreshRSS/issues/1312)
 	* Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273)
 	* Bug in example of URL for FreshRSS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274)
-- 
cgit v1.2.3


From 8a45743b9036078344ea362b183358f8ca8e4dd3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Oct 2016 22:45:25 +0200
Subject: Readme chmod

---
 README.fr.md | 2 ++
 README.md    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/README.fr.md b/README.fr.md
index 4e2961bee..3fcedd337 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -81,6 +81,7 @@ sudo git clone https://github.com/FreshRSS/FreshRSS.git
 # Mettre les droits d’accès pour le serveur Web
 cd FreshRSS
 sudo chown -R :www-data .
+sudo chmod -R g+r .
 sudo chmod -R g+w ./data/
 # Publier FreshRSS dans votre répertoire HTML public
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
@@ -92,6 +93,7 @@ cd /usr/share/FreshRSS
 sudo git reset --hard
 sudo git pull
 sudo chown -R :www-data .
+sudo chmod -R g+r .
 sudo chmod -R g+w ./data/
 ```
 
diff --git a/README.md b/README.md
index 5bd8b9607..5c8f586fa 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ sudo git clone https://github.com/FreshRSS/FreshRSS.git
 # Set the rights so that your Web server can access the files
 cd FreshRSS
 sudo chown -R :www-data .
+sudo chmod -R g+r .
 sudo chmod -R g+w ./data/
 # Publish FreshRSS in your public HTML directory
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
@@ -92,6 +93,7 @@ cd /usr/share/FreshRSS
 sudo git reset --hard
 sudo git pull
 sudo chown -R :www-data .
+sudo chmod -R g+r .
 sudo chmod -R g+w ./data/
 ```
 
-- 
cgit v1.2.3


From 1893fc61e0e576519f878267fd877247445d1055 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 20 Oct 2016 01:19:59 +0200
Subject: guid and urls should not contain low/high characters

It looks like SimplePie does not always filter everything
Having a character not in latin1 would create MySQL collate errors
---
 app/Controllers/feedController.php         |  4 +++-
 app/Controllers/importExportController.php |  4 +++-
 app/Models/EntryDAO.php                    |  4 ++++
 app/Models/FeedDAO.php                     | 10 ++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 8751d2fff..d4a6c9955 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -314,7 +314,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if (count($entries) > 0) {
 				$newGuids = array();
 				foreach ($entries as $entry) {
-					$newGuids[] = $entry->guid();
+					$guid = $entry->guid();
+					$guid = filter_var($guid, FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+					$newGuids[] = $guid;
 				}
 				// For this feed, check existing GUIDs already in database.
 				$existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index d36c57deb..e380323c4 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -362,7 +362,9 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		$newGuids = array();
 		foreach ($article_object['items'] as $item) {
-			$newGuids[] = $item['id'];
+			$guid = $item['id'];
+			$guid = filter_var($guid, FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+			$newGuids[] = $guid;
 		}
 		// For this feed, check existing GUIDs already in database.
 		$existingHashForGuids = $this->entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 3959cb191..466e6f5a3 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -123,6 +123,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 		$this->addEntryPrepared->bindParam(':id', $valuesTmp['id']);
 		$valuesTmp['guid'] = substr($valuesTmp['guid'], 0, 760);
+		$valuesTmp['guid'] = filter_var($valuesTmp['guid'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
 		$this->addEntryPrepared->bindParam(':guid', $valuesTmp['guid']);
 		$valuesTmp['title'] = substr($valuesTmp['title'], 0, 255);
 		$this->addEntryPrepared->bindParam(':title', $valuesTmp['title']);
@@ -130,6 +131,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$this->addEntryPrepared->bindParam(':author', $valuesTmp['author']);
 		$this->addEntryPrepared->bindParam(':content', $valuesTmp['content']);
 		$valuesTmp['link'] = substr($valuesTmp['link'], 0, 1023);
+		$valuesTmp['link'] = filter_var($valuesTmp['link'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
 		$this->addEntryPrepared->bindParam(':link', $valuesTmp['link']);
 		$this->addEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
 		$valuesTmp['lastSeen'] = time();
@@ -190,6 +192,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$this->updateEntryPrepared->bindParam(':author', $valuesTmp['author']);
 		$this->updateEntryPrepared->bindParam(':content', $valuesTmp['content']);
 		$valuesTmp['link'] = substr($valuesTmp['link'], 0, 1023);
+		$valuesTmp['link'] = filter_var($valuesTmp['link'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
 		$this->updateEntryPrepared->bindParam(':link', $valuesTmp['link']);
 		$this->updateEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
 		$valuesTmp['lastSeen'] = time();
@@ -689,6 +692,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if (count($guids) < 1) {
 			return array();
 		}
+		$guids = array_unique($guids);
 		$sql = 'SELECT guid, ' . $this->sqlHexEncode('hash') . ' AS hex_hash FROM `' . $this->prefix . 'entry` WHERE id_feed=? AND guid IN (' . str_repeat('?,', count($guids) - 1). '?)';
 		$stm = $this->bd->prepare($sql);
 		$values = array($id_feed);
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index c680d270c..33e19d750 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -5,6 +5,9 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, `lastUpdate`, priority, `httpAuth`, error, keep_history, ttl) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2, -2)';
 		$stm = $this->bd->prepare($sql);
 
+		$valuesTmp['url'] = filter_var($valuesTmp['url'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+		$valuesTmp['website'] = filter_var($valuesTmp['website'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+
 		$values = array(
 			substr($valuesTmp['url'], 0, 511),
 			$valuesTmp['category'],
@@ -55,6 +58,13 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	}
 
 	public function updateFeed($id, $valuesTmp) {
+		if (isset($valuesTmp['url'])) {
+			$valuesTmp['url'] = filter_var($valuesTmp['url'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+		}
+		if (isset($valuesTmp['website'])) {
+			$valuesTmp['website'] = filter_var($valuesTmp['website'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+		}
+
 		$set = '';
 		foreach ($valuesTmp as $key => $v) {
 			$set .= $key . '=?, ';
-- 
cgit v1.2.3


From 7f2b0439ec4158ee7d78571d60e9bcc995e87cac Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 20 Oct 2016 01:38:23 +0200
Subject: Extract function safe_ascii()

---
 app/Controllers/feedController.php         | 4 +---
 app/Controllers/importExportController.php | 4 +---
 app/Models/EntryDAO.php                    | 6 +++---
 app/Models/FeedDAO.php                     | 8 ++++----
 lib/lib_rss.php                            | 3 +++
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index d4a6c9955..ed3229687 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -314,9 +314,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if (count($entries) > 0) {
 				$newGuids = array();
 				foreach ($entries as $entry) {
-					$guid = $entry->guid();
-					$guid = filter_var($guid, FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
-					$newGuids[] = $guid;
+					$newGuids[] = safe_ascii($entry->guid());
 				}
 				// For this feed, check existing GUIDs already in database.
 				$existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index e380323c4..a1f789805 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -362,9 +362,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		$newGuids = array();
 		foreach ($article_object['items'] as $item) {
-			$guid = $item['id'];
-			$guid = filter_var($guid, FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
-			$newGuids[] = $guid;
+			$newGuids[] = safe_ascii($item['id']);
 		}
 		// For this feed, check existing GUIDs already in database.
 		$existingHashForGuids = $this->entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 466e6f5a3..4c6a9ea20 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -123,7 +123,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 		$this->addEntryPrepared->bindParam(':id', $valuesTmp['id']);
 		$valuesTmp['guid'] = substr($valuesTmp['guid'], 0, 760);
-		$valuesTmp['guid'] = filter_var($valuesTmp['guid'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+		$valuesTmp['guid'] = safe_ascii($valuesTmp['guid']);
 		$this->addEntryPrepared->bindParam(':guid', $valuesTmp['guid']);
 		$valuesTmp['title'] = substr($valuesTmp['title'], 0, 255);
 		$this->addEntryPrepared->bindParam(':title', $valuesTmp['title']);
@@ -131,7 +131,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$this->addEntryPrepared->bindParam(':author', $valuesTmp['author']);
 		$this->addEntryPrepared->bindParam(':content', $valuesTmp['content']);
 		$valuesTmp['link'] = substr($valuesTmp['link'], 0, 1023);
-		$valuesTmp['link'] = filter_var($valuesTmp['link'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+		$valuesTmp['link'] = safe_ascii($valuesTmp['link']);
 		$this->addEntryPrepared->bindParam(':link', $valuesTmp['link']);
 		$this->addEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
 		$valuesTmp['lastSeen'] = time();
@@ -192,7 +192,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$this->updateEntryPrepared->bindParam(':author', $valuesTmp['author']);
 		$this->updateEntryPrepared->bindParam(':content', $valuesTmp['content']);
 		$valuesTmp['link'] = substr($valuesTmp['link'], 0, 1023);
-		$valuesTmp['link'] = filter_var($valuesTmp['link'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+		$valuesTmp['link'] = safe_ascii($valuesTmp['link']);
 		$this->updateEntryPrepared->bindParam(':link', $valuesTmp['link']);
 		$this->updateEntryPrepared->bindParam(':date', $valuesTmp['date'], PDO::PARAM_INT);
 		$valuesTmp['lastSeen'] = time();
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 33e19d750..b21f19b66 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -5,8 +5,8 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, `lastUpdate`, priority, `httpAuth`, error, keep_history, ttl) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, -2, -2)';
 		$stm = $this->bd->prepare($sql);
 
-		$valuesTmp['url'] = filter_var($valuesTmp['url'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
-		$valuesTmp['website'] = filter_var($valuesTmp['website'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+		$valuesTmp['url'] = safe_ascii($valuesTmp['url']);
+		$valuesTmp['website'] = safe_ascii($valuesTmp['website']);
 
 		$values = array(
 			substr($valuesTmp['url'], 0, 511),
@@ -59,10 +59,10 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 	public function updateFeed($id, $valuesTmp) {
 		if (isset($valuesTmp['url'])) {
-			$valuesTmp['url'] = filter_var($valuesTmp['url'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+			$valuesTmp['url'] = safe_ascii($valuesTmp['url']);
 		}
 		if (isset($valuesTmp['website'])) {
-			$valuesTmp['website'] = filter_var($valuesTmp['website'], FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+			$valuesTmp['website'] = safe_ascii($valuesTmp['website']);
 		}
 
 		$set = '';
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index b18512484..75046fd54 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -83,6 +83,9 @@ function checkUrl($url) {
 	}
 }
 
+function safe_ascii($text) {
+	return filter_var($text, FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
+}
 
 /**
  * Test if a given server address is publicly accessible.
-- 
cgit v1.2.3


From 0a3ab899a01cc20919881f913619ade9e6cdfba5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 20 Oct 2016 23:10:15 +0200
Subject: Add support for UTF-8 BOM in SimplePie feed_or_html()

https://github.com/FreshRSS/FreshRSS/issues/1336
---
 lib/SimplePie/SimplePie/Content/Type/Sniffer.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
index daec3607d..ec0bf0952 100644
--- a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
+++ b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
@@ -256,7 +256,12 @@ class SimplePie_Content_Type_Sniffer
 	public function feed_or_html()
 	{
 		$len = strlen($this->file->body);
-		$pos = strspn($this->file->body, "\x09\x0A\x0D\x20");
+		$pos = 0;
+		if (isset($this->file->body[2]) && $this->file->body[0] === "\xEF" &&
+			$this->file->body[1] === "\xBB" && $this->file->body[2] === "\xBF") {
+			$pos += 3;	//UTF-8 BOM
+		}
+		$pos += strspn($this->file->body, "\x09\x0A\x0D\x20", $pos);
 
 		while ($pos < $len)
 		{
-- 
cgit v1.2.3


From e1f214e9e2e09a83a9920e33fbf617dfe48fbb7e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 12:58:06 +0200
Subject: CLI list-users and create-user

https://github.com/FreshRSS/FreshRSS/issues/1095
https://github.com/FreshRSS/FreshRSS/issues/1090
---
 app/Controllers/userController.php | 125 +++++++++++++++++++------------------
 app/Models/Context.php             |   2 +-
 app/Models/Feed.php                |   2 +-
 app/actualize_script.php           |   4 +-
 cli/.htaccess                      |   3 +
 cli/_cli.php                       |  39 ++++++++++++
 cli/create-user.php                |  41 ++++++++++++
 cli/index.html                     |  13 ++++
 cli/list-users.php                 |  14 +++++
 lib/lib_rss.php                    |   9 ++-
 10 files changed, 184 insertions(+), 68 deletions(-)
 create mode 100644 cli/.htaccess
 create mode 100644 cli/_cli.php
 create mode 100644 cli/create-user.php
 create mode 100644 cli/index.html
 create mode 100644 cli/list-users.php

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index c259ffde9..f880b951d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -24,6 +24,16 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		}
 	}
 
+	private static function hashPassword($passwordPlain) {
+		if (!function_exists('password_hash')) {
+			include_once(LIB_PATH . '/password_compat.php');
+		}
+		$passwordHash = password_hash($passwordPlain, PASSWORD_BCRYPT, array('cost' => self::BCRYPT_COST));
+		$passwordPlain = '';
+		$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
+		return $passwordHash == '' ? '' : $passwordHash;
+	}
+
 	/**
 	 * This action displays the user profile page.
 	 */
@@ -41,12 +51,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			if ($passwordPlain != '') {
 				Minz_Request::_param('newPasswordPlain');	//Discard plain-text password ASAP
 				$_POST['newPasswordPlain'] = '';
-				if (!function_exists('password_hash')) {
-					include_once(LIB_PATH . '/password_compat.php');
-				}
-				$passwordHash = password_hash($passwordPlain, PASSWORD_BCRYPT, array('cost' => self::BCRYPT_COST));
-				$passwordPlain = '';
-				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
+				$passwordHash = self::hashPassword($passwordPlain);
 				$ok &= ($passwordHash != '');
 				FreshRSS_Context::$user_conf->passwordHash = $passwordHash;
 			}
@@ -54,12 +59,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 			$passwordPlain = Minz_Request::param('apiPasswordPlain', '', true);
 			if ($passwordPlain != '') {
-				if (!function_exists('password_hash')) {
-					include_once(LIB_PATH . '/password_compat.php');
-				}
-				$passwordHash = password_hash($passwordPlain, PASSWORD_BCRYPT, array('cost' => self::BCRYPT_COST));
-				$passwordPlain = '';
-				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
+				$passwordHash = self::hashPassword($passwordPlain);
 				$ok &= ($passwordHash != '');
 				FreshRSS_Context::$user_conf->apiPasswordHash = $passwordHash;
 			}
@@ -99,6 +99,53 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		$this->view->size_user = $entryDAO->size();
 	}
 
+	public static function createUser($new_user_name, $passwordPlain, $apiPasswordPlain, $userConfig = array()) {
+		if (!is_array($userConfig)) {
+			$userConfig = array();
+		}
+
+		$ok = ($new_user_name != '') && ctype_alnum($new_user_name);
+
+		if ($ok) {
+			$languages = Minz_Translate::availableLanguages();
+			if (empty($userConfig['language']) || !in_array($userConfig['language'], $languages)) {
+				$userConfig['language'] = 'en';
+			}
+
+			$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
+
+			$configPath = join_path(DATA_PATH, 'users', $new_user_name, 'config.php');
+			$ok &= !file_exists($configPath);
+		}
+		if ($ok) {
+			$passwordHash = '';
+			if ($passwordPlain != '') {
+				$passwordHash = self::hashPassword($passwordPlain);
+				$ok &= ($passwordHash != '');
+			}
+
+			$apiPasswordHash = '';
+			if ($apiPasswordPlain != '') {
+				$apiPasswordHash = self::hashPassword($apiPasswordPlain);
+				$ok &= ($apiPasswordHash != '');
+			}
+		}
+		if ($ok) {
+			mkdir(join_path(DATA_PATH, 'users', $new_user_name));
+			$userConfig['passwordHash'] = $passwordHash;
+			$userConfig['apiPasswordHash'] = $apiPasswordHash;
+			$ok &= (file_put_contents($configPath, "<?php\n return " . var_export($userConfig, true) . ';') !== false);
+		}
+		if ($ok) {
+			$userDAO = new FreshRSS_UserDAO();
+			$ok &= $userDAO->createUser($new_user_name, $userConfig['language']);
+		}
+		return $ok;
+	}
+
 	/**
 	 * This action creates a new user.
 	 *
@@ -116,57 +163,13 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				FreshRSS_Auth::hasAccess('admin') ||
 				!max_registrations_reached()
 		)) {
-			$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);
-			$languages = Minz_Translate::availableLanguages();
-			if (!in_array($new_user_language, $languages)) {
-				$new_user_language = FreshRSS_Context::$user_conf->language;
-			}
-
 			$new_user_name = Minz_Request::param('new_user_name');
-			$ok = ($new_user_name != '') && ctype_alnum($new_user_name);
-
-			if ($ok) {
-				$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
+			$passwordPlain = Minz_Request::param('new_user_passwordPlain', '', true);
+			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$user_conf->language);
 
-				$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 != '') {
-					Minz_Request::_param('new_user_passwordPlain');	//Discard plain-text password ASAP
-					$_POST['new_user_passwordPlain'] = '';
-					if (!function_exists('password_hash')) {
-						include_once(LIB_PATH . '/password_compat.php');
-					}
-					$passwordHash = password_hash($passwordPlain, PASSWORD_BCRYPT, array('cost' => self::BCRYPT_COST));
-					$passwordPlain = '';
-					$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
-					$ok &= ($passwordHash != '');
-				}
-				if (empty($passwordHash)) {
-					$passwordHash = '';
-				}
-			}
-			if ($ok) {
-				mkdir(join_path(DATA_PATH, 'users', $new_user_name));
-				$config_array = array(
-					'language' => $new_user_language,
-					'passwordHash' => $passwordHash,
-				);
-				$ok &= (file_put_contents($configPath, "<?php\n return " . var_export($config_array, true) . ';') !== false);
-			}
-			if ($ok) {
-				$userDAO = new FreshRSS_UserDAO();
-				$ok &= $userDAO->createUser($new_user_name, $new_user_language);
-			}
+			$ok = self::createUser($new_user_name, $passwordPlain, '', array('language' => $new_user_language));
+			Minz_Request::_param('new_user_passwordPlain');	//Discard plain-text password ASAP
+			$_POST['new_user_passwordPlain'] = '';
 			invalidateHttpCache();
 
 			$notif = array(
diff --git a/app/Models/Context.php b/app/Models/Context.php
index fe4fa6281..fd0e79fc1 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -37,7 +37,7 @@ class FreshRSS_Context {
 	public static $id_max = '';
 	public static $sinceHours = 0;
 
-	public static $isCron = false;
+	public static $isCli = false;
 
 	/**
 	 * Initialize the context.
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 55c2db4d6..97cb1c47e 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -141,7 +141,7 @@ class FreshRSS_Feed extends Minz_Model {
 		if (!file_exists($txt)) {
 			file_put_contents($txt, $url);
 		}
-		if (FreshRSS_Context::$isCron) {
+		if (FreshRSS_Context::$isCli) {
 			$ico = $favicons_dir . $this->hash() . '.ico';
 			$ico_mtime = @filemtime($ico);
 			$txt_mtime = @filemtime($txt);
diff --git a/app/actualize_script.php b/app/actualize_script.php
index 78712d721..deaa1bf7c 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -28,13 +28,13 @@ $app = new FreshRSS();
 
 $system_conf = Minz_Configuration::get('system');
 $system_conf->auth_type = 'none';  // avoid necessity to be logged in (not saved!)
-FreshRSS_Context::$isCron = true;
+FreshRSS_Context::$isCli = true;
 
 // Create the list of users to actualize.
 // Users are processed in a random order but always start with admin
 $users = listUsers();
 shuffle($users);
-if ($system_conf->default_user !== ''){
+if ($system_conf->default_user !== '') {
 	array_unshift($users, $system_conf->default_user);
 	$users = array_unique($users);
 }
diff --git a/cli/.htaccess b/cli/.htaccess
new file mode 100644
index 000000000..9e768397d
--- /dev/null
+++ b/cli/.htaccess
@@ -0,0 +1,3 @@
+Order	Allow,Deny
+Deny	from all
+Satisfy	all
diff --git a/cli/_cli.php b/cli/_cli.php
new file mode 100644
index 000000000..cb6d8ec32
--- /dev/null
+++ b/cli/_cli.php
@@ -0,0 +1,39 @@
+<?php
+if (php_sapi_name() !== 'cli') {
+	die('FreshRSS error: This PHP script may only be invoked from command line!');
+}
+
+require(dirname(__FILE__) . '/../constants.php');
+require(LIB_PATH . '/lib_rss.php');
+
+Minz_Configuration::register('system',
+	DATA_PATH . '/config.php',
+	DATA_PATH . '/config.default.php');
+FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
+Minz_Translate::init();
+
+FreshRSS_Context::$isCli = true;
+
+function fail($message) {
+	fwrite(STDERR, $message . "\n");
+	die(1);
+}
+
+function cliInitUser($username) {
+	if (!ctype_alnum($username)) {
+		fail('FreshRSS error: invalid username: ' . $username . "\n");
+	}
+
+	$usernames = listUsers();
+	if (!in_array($username, $usernames)) {
+		fail('FreshRSS error: user not found: ' . $username . "\n");
+	}
+
+	FreshRSS_Context::$user_conf = get_user_configuration($username);
+	if (FreshRSS_Context::$user_conf == null) {
+		fail('FreshRSS error: invalid configuration for user: ' . $username . "\n");
+	}
+	new Minz_ModelPdo($username);
+
+	return $username;
+}
diff --git a/cli/create-user.php b/cli/create-user.php
new file mode 100644
index 000000000..08c057af8
--- /dev/null
+++ b/cli/create-user.php
@@ -0,0 +1,41 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$options = getopt('', array(
+		'user:',
+		'password::',
+		'api-password::',
+		'language::',
+		'email::',
+		'token::',
+	));
+
+if (empty($options['user'])) {
+	fail('Usage: ' . basename(__FILE__) . " --user=username --password='password' --api-password='api_password'" .
+		" --language=en --email=user@example.net --token='longRandomString'");
+}
+$new_user_name = $options['user'];
+if (!ctype_alnum($new_user_name)) {
+	fail('FreshRSS error: invalid username “' . $new_user_name . '”');
+}
+
+$usernames = listUsers();
+if (preg_grep("/^$new_user_name$/i", $usernames)) {
+	fail('FreshRSS error: username already taken “' . $new_user_name . '”');
+}
+
+echo 'FreshRSS creating user “', $new_user_name, "”…\n";
+
+$ok = FreshRSS_user_Controller::createUser($new_user_name,
+	empty($options['password']) ? '' : $options['password'],
+	empty($options['api-password']) ? '' : $options['api-password'],
+	array(
+		'language' => empty($options['language']) ? '' : $options['language'],
+		'token' => empty($options['token']) ? '' : $options['token'],
+	));
+
+invalidateHttpCache(FreshRSS_Context::$system_conf->default_user);
+
+echo 'Result: ', ($ok ? 'success' : 'fail'), ".\n";
+exit($ok ? 0 : 1);
diff --git a/cli/index.html b/cli/index.html
new file mode 100644
index 000000000..85faaa37e
--- /dev/null
+++ b/cli/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+<head>
+<meta charset="UTF-8" />
+<meta http-equiv="Refresh" content="0; url=/" />
+<title>Redirection</title>
+<meta name="robots" content="noindex" />
+</head>
+
+<body>
+<p><a href="/">Redirection</a></p>
+</body>
+</html>
diff --git a/cli/list-users.php b/cli/list-users.php
new file mode 100644
index 000000000..cc1cf5269
--- /dev/null
+++ b/cli/list-users.php
@@ -0,0 +1,14 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$users = listUsers();
+sort($users);
+if ($system_conf->default_user !== '') {
+	array_unshift($users, $system_conf->default_user);
+	$users = array_unique($users);
+}
+
+foreach ($users as $user) {
+	echo $user, "\n";
+}
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 75046fd54..143b55bee 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -282,9 +282,12 @@ function uSecString() {
 	return str_pad($t['usec'], 6, '0');
 }
 
-function invalidateHttpCache() {
-	Minz_Session::_param('touch', uTimeString());
-	return touch(join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt'));
+function invalidateHttpCache($username = '') {
+	if (($username == '') || (!ctype_alnum($username))) {
+		Minz_Session::_param('touch', uTimeString());
+		$username = Minz_Session::param('currentUser', '_');
+	}
+	return touch(join_path(DATA_PATH, 'users', $username, 'log.txt'));
 }
 
 function listUsers() {
-- 
cgit v1.2.3


From 2cd370a736fbb81e90f20240d8d37649ac5f53f7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 13:02:37 +0200
Subject: +x execution rights

---
 cli/create-user.php | 0
 cli/list-users.php  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cli/create-user.php
 mode change 100644 => 100755 cli/list-users.php

diff --git a/cli/create-user.php b/cli/create-user.php
old mode 100644
new mode 100755
diff --git a/cli/list-users.php b/cli/list-users.php
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 9f043a701fb26a0e6150b2ad2b1c723e90b0c965 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 13:28:53 +0200
Subject: i18n install corrections

https://github.com/FreshRSS/FreshRSS/issues/1328#issuecomment-255519363
---
 app/i18n/en/install.php | 4 ++--
 app/i18n/fr/install.php | 4 ++--
 app/i18n/it/install.php | 4 ++--
 app/i18n/nl/install.php | 4 ++--
 app/i18n/ru/install.php | 4 ++--
 app/i18n/tr/install.php | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 55afba0ca..63d31fe53 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Host',
 		'prefix' => 'Table prefix',
-		'password' => 'HTTP password',
+		'password' => 'Database password',
 		'type' => 'Type of database',
-		'username' => 'HTTP username',
+		'username' => 'Database username',
 	),
 	'check' => array(
 		'_' => 'Checks',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 99437234f..c50807107 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -24,10 +24,10 @@ return array(
 			'ok' => 'La configuration de la base de données a été enregistrée.',
 		),
 		'host' => 'Hôte',
-		'password' => 'Mot de passe',
+		'password' => 'Mot de passe pour base de données',
 		'prefix' => 'Préfixe des tables',
 		'type' => 'Type de base de données',
-		'username' => 'Nom d’utilisateur',
+		'username' => 'Nom d’utilisateur pour base de données',
 	),
 	'check' => array(
 		'_' => 'Vérifications',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index b907bd51c..2fa298508 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Host',
 		'prefix' => 'Prefisso tabella',
-		'password' => 'HTTP password',
+		'password' => 'Password del database',
 		'type' => 'Tipo di database',
-		'username' => 'HTTP username',
+		'username' => 'Nome utente del database',
 	),
 	'check' => array(
 		'_' => 'Controlli',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index 28318d4cb..bd2ba0cce 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Host',
 		'prefix' => 'Tabel voorvoegsel',
-		'password' => 'HTTP wachtwoord',
+		'password' => 'Database wachtwoord',
 		'type' => 'Type database',
-		'username' => 'HTTP gebruikersnaam',
+		'username' => 'Database gebruikersnaam',
 	),
 	'check' => array(
 		'_' => 'Controles',
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index 925601011..bad59bbb3 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Хост',
 		'prefix' => 'Префикс таблицы',
-		'password' => 'Пароль HTTP',
+		'password' => 'Пароль базы данных',
 		'type' => 'Тип базы данных',
-		'username' => 'Имя пользователя HTTP',
+		'username' => 'Имя пользователя базы данных',
 	),
 	'check' => array(
 		'_' => 'Проверки',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 62ddb6ddc..4daa45099 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Sunucu',
 		'prefix' => 'Tablo ön eki',
-		'password' => 'HTTP şifre',
+		'password' => 'Veritabanı şifresi',
 		'type' => 'Veritabanı türü',
-		'username' => 'HTTP kullanıcı adı',
+		'username' => 'Veritabanı kullanıcı adı',
 	),
 	'check' => array(
 		'_' => 'Kontroller',
-- 
cgit v1.2.3


From 7ef23b0836bb273a877eb9468300da302798b45f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 13:46:48 +0200
Subject: Readme i18n install translation errors

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7c15d5a0..84db24290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@
 * SQL
 	* Slightly modified several SQL requests (MySQL, SQLite) to simplify support of PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
 	* Increase performances by removing a superfluous category request [#1316](https://github.com/FreshRSS/FreshRSS/pull/1316)
+* I18n
+	* Fix some messages during installation [#1339](https://github.com/FreshRSS/FreshRSS/pull/1339)
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * SimplePie
-- 
cgit v1.2.3


From 8058c059d7581a908169d325f38aa5226f472f18 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 18:57:58 +0200
Subject: CSS line-height bug with sup in dates

https://github.com/FreshRSS/FreshRSS/issues/534#issuecomment-255519269
https://www.cs.tut.fi/~jkorpela/www/linespacing.html
---
 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 5b3389129..cc36c3ffa 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -44,6 +44,12 @@ p {
 	margin: 1em 0 0.5em;
 	font-size: 1em;
 }
+sup {
+	line-height: 25px;
+	position: relative;
+	top: -0.8em;
+	vertical-align: baseline;
+}
 
 /*=== Images */
 img {
-- 
cgit v1.2.3


From f260bfc251ace92fdd36b833740ec5c1f43b617b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 19:11:06 +0200
Subject: Changelog CSS line-height bug

https://github.com/FreshRSS/FreshRSS/issues/534#issuecomment-255519269
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84db24290..08e99d641 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 * I18n
 	* Fix some messages during installation [#1339](https://github.com/FreshRSS/FreshRSS/pull/1339)
 * UI
+	* Fix CSS line-height bug with <sup> in dates (English, Russian, Turkish) [#1340](https://github.com/FreshRSS/FreshRSS/pull/1340)
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * SimplePie
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
-- 
cgit v1.2.3


From 6c48675a3049659731327066b9e5cf6bab1cffbe Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 19:42:32 +0200
Subject: Readme typo

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08e99d641..c35b3b578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,7 @@
 * I18n
 	* Fix some messages during installation [#1339](https://github.com/FreshRSS/FreshRSS/pull/1339)
 * UI
-	* Fix CSS line-height bug with <sup> in dates (English, Russian, Turkish) [#1340](https://github.com/FreshRSS/FreshRSS/pull/1340)
+	* Fix CSS line-height bug with `<sup>` in dates (English, Russian, Turkish) [#1340](https://github.com/FreshRSS/FreshRSS/pull/1340)
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * SimplePie
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
-- 
cgit v1.2.3


From 5b1b43ab57da6a7bc1599c224d47455b2e56d53d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Oct 2016 20:32:16 +0200
Subject: CLI delete user https://github.com/FreshRSS/FreshRSS/issues/1095

---
 app/Controllers/userController.php | 39 ++++++++++++++++++++++----------------
 cli/delete-user.php                | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100755 cli/delete-user.php

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index f880b951d..2f04c7a1d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -186,6 +186,27 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		Minz_Request::forward($redirect_url, true);
 	}
 
+	public static function deleteUser($username) {
+		$db = FreshRSS_Context::$system_conf->db;
+		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
+
+		$ok = ctype_alnum($username);
+		if ($ok) {
+			$default_user = FreshRSS_Context::$system_conf->default_user;
+			$ok &= (strcasecmp($username, $default_user) !== 0);	//It is forbidden to delete the default user
+		}
+		$user_data = join_path(DATA_PATH, 'users', $username);
+		if ($ok) {
+			$ok &= is_dir($user_data);
+		}
+		if ($ok) {
+			$userDAO = new FreshRSS_UserDAO();
+			$ok &= $userDAO->deleteUser($username);
+			$ok &= recursive_unlink($user_data);
+		}
+		return $ok;
+	}
+
 	/**
 	 * This action delete an existing user.
 	 *
@@ -207,16 +228,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				FreshRSS_Auth::hasAccess('admin') ||
 				$self_deletion
 		)) {
-			$db = FreshRSS_Context::$system_conf->db;
-			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
-
-			$ok = ctype_alnum($username);
-			$user_data = join_path(DATA_PATH, 'users', $username);
-
-			if ($ok) {
-				$default_user = FreshRSS_Context::$system_conf->default_user;
-				$ok &= (strcasecmp($username, $default_user) !== 0);	//It is forbidden to delete the default user
-			}
+			$ok = true;
 			if ($ok && $self_deletion) {
 				// We check the password if it's a self-destruction
 				$nonce = Minz_Session::param('nonce');
@@ -228,12 +240,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				);
 			}
 			if ($ok) {
-				$ok &= is_dir($user_data);
-			}
-			if ($ok) {
-				$userDAO = new FreshRSS_UserDAO();
-				$ok &= $userDAO->deleteUser($username);
-				$ok &= recursive_unlink($user_data);
+				$ok &= self::deleteUser($username);
 			}
 			if ($ok && $self_deletion) {
 				FreshRSS_Auth::removeAccess();
diff --git a/cli/delete-user.php b/cli/delete-user.php
new file mode 100755
index 000000000..46332fe34
--- /dev/null
+++ b/cli/delete-user.php
@@ -0,0 +1,33 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$options = getopt('', array(
+		'user:',
+	));
+
+if (empty($options['user'])) {
+	fail('Usage: ' . basename(__FILE__) . " --user=username");
+}
+$username = $options['user'];
+if (!ctype_alnum($username)) {
+	fail('FreshRSS error: invalid username “' . $username . '”');
+}
+
+$usernames = listUsers();
+if (!preg_grep("/^$username$/i", $usernames)) {
+	fail('FreshRSS error: username not found “' . $username . '”');
+}
+
+if (strcasecmp($username, FreshRSS_Context::$system_conf->default_user) === 0) {
+	fail('FreshRSS error: default user must not be deleted: “' . $username . '”');
+}
+
+echo 'FreshRSS deleting user “', $username, "”…\n";
+
+$ok = FreshRSS_user_Controller::deleteUser($username);
+
+invalidateHttpCache(FreshRSS_Context::$system_conf->default_user);
+
+echo 'Result: ', ($ok ? 'success' : 'fail'), ".\n";
+exit($ok ? 0 : 1);
-- 
cgit v1.2.3


From 4d6fdc589e89c2a7d4072b497d9dfd8504a1cb5c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 22 Oct 2016 22:04:00 +0200
Subject: Fix syntax error in new exceptions

Bug from https://github.com/FreshRSS/FreshRSS/pull/1261
---
 app/Exceptions/AlreadySubscribedException.php | 4 ++--
 app/Exceptions/FeedNotAddedException.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Exceptions/AlreadySubscribedException.php
index f85d51300..33b9f9555 100644
--- a/app/Exceptions/AlreadySubscribedException.php
+++ b/app/Exceptions/AlreadySubscribedException.php
@@ -5,10 +5,10 @@ class FreshRSS_AlreadySubscribed_Exception extends Exception {
 
 	public function __construct($url, $feedName) {
 		parent::__construct('Already subscribed! ' . $url, 2135);
-		$this->$feedName = $feedName;
+		$this->feedName = $feedName;
 	}
 
 	public function feedName() {
-		return $this->feedName();
+		return $this->feedName;
 	}
 }
diff --git a/app/Exceptions/FeedNotAddedException.php b/app/Exceptions/FeedNotAddedException.php
index 02a8bc6be..350a17c56 100644
--- a/app/Exceptions/FeedNotAddedException.php
+++ b/app/Exceptions/FeedNotAddedException.php
@@ -5,10 +5,10 @@ class FreshRSS_FeedNotAdded_Exception extends Exception {
 
 	public function __construct($url, $feedName) {
 		parent::__construct('Feed not added! ' . $url, 2147);
-		$this->$feedName = $feedName;
+		$this->feedName = $feedName;
 	}
 
 	public function feedName() {
-		return $this->feedName();
+		return $this->feedName;
 	}
 }
-- 
cgit v1.2.3


From 1b8eb6c7e732f1eda4fc8f22e847b363b016f857 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 23 Oct 2016 01:46:14 +0200
Subject: CLI import ZIP/OPML/JSON for user

https://github.com/FreshRSS/FreshRSS/issues/1095
https://github.com/FreshRSS/FreshRSS/issues/851
---
 CHANGELOG.md                               |   2 +-
 README.fr.md                               |   2 +-
 README.md                                  |   2 +-
 app/Controllers/categoryController.php     |   5 +-
 app/Controllers/feedController.php         |   6 +-
 app/Controllers/importExportController.php | 273 ++++++++++++++++++-----------
 app/Exceptions/ZipException.php            |  14 ++
 app/Exceptions/ZipMissingException.php     |   4 +
 app/Models/CategoryDAO.php                 |  11 +-
 app/i18n/cz/feedback.php                   |   6 +-
 app/i18n/cz/sub.php                        |   4 +-
 app/i18n/de/feedback.php                   |   6 +-
 app/i18n/de/sub.php                        |   2 +-
 app/i18n/en/feedback.php                   |   6 +-
 app/i18n/en/sub.php                        |   4 +-
 app/i18n/fr/feedback.php                   |   6 +-
 app/i18n/fr/sub.php                        |   4 +-
 app/i18n/it/feedback.php                   |   6 +-
 app/i18n/it/sub.php                        |   4 +-
 app/i18n/nl/feedback.php                   |   6 +-
 app/i18n/nl/sub.php                        |   4 +-
 app/i18n/ru/feedback.php                   |   6 +-
 app/i18n/ru/sub.php                        |   4 +-
 app/i18n/tr/feedback.php                   |   6 +-
 app/i18n/tr/sub.php                        |   4 +-
 cli/_cli.php                               |   5 +
 cli/create-user.php                        |  17 +-
 cli/delete-user.php                        |   3 +-
 cli/import-for-user.php                    |  36 ++++
 cli/list-users.php                         |   4 +-
 lib/Minz/ModelPdo.php                      |  13 +-
 31 files changed, 296 insertions(+), 179 deletions(-)
 create mode 100644 app/Exceptions/ZipException.php
 create mode 100644 app/Exceptions/ZipMissingException.php
 create mode 100644 cli/import-for-user.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c35b3b578..d24ec0739 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -390,7 +390,7 @@
 	* Possibility to combine search filters, e.g. `date:2014-05 intitle:FreshRSS intitle:Open great reader #Internet`
 * Change nav menu with more buttons instead of dropdown menus and add some filters
 * New system of import / export
-	* Support OPML, Json (like Google Reader) and Zip archives
+	* Support OPML, Json (like Google Reader) and ZIP archives
 	* Can export and import articles (specific option for favorites)
 * Refactor "Origine" theme
 	* Some improvements
diff --git a/README.fr.md b/README.fr.md
index 3fcedd337..2a2da256d 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -34,7 +34,7 @@ Nous sommes une communauté amicale.
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.3.3+ (PHP 5.4+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
 	* Requis : [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite) ou [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
-	* Recommandés : [JSON](http://php.net/json), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](http://php.net/mbstring) et/ou [iconv](http://php.net/iconv) (pour conversion d’encodages), [Zip](http://php.net/zip) (pour import/export), [zlib](http://php.net/zlib) (pour les flux compressés)
+	* Recommandés : [JSON](http://php.net/json), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](http://php.net/mbstring) et/ou [iconv](http://php.net/iconv) (pour conversion d’encodages), [ZIP](http://php.net/zip) (pour import/export), [zlib](http://php.net/zlib) (pour les flux compressés)
 * MySQL 5.5.3+ (recommandé), ou SQLite 3.7.4+, ou PostgreSQL (experimental)
 * Un navigateur Web récent tel Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Fonctionne aussi sur mobile
diff --git a/README.md b/README.md
index 5c8f586fa..a541d6dea 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ We are a friendly community.
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
 * PHP 5.3.3+ (PHP 5.4+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
 	* Required extensions: [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite) or [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
-	* Recommended extensions: [JSON](http://php.net/json), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names), [mbstring](http://php.net/mbstring) and/or [iconv](http://php.net/iconv) (for charset conversion), [Zip](http://php.net/zip) (for import/export), [zlib](http://php.net/zlib) (for compressed feeds)
+	* Recommended extensions: [JSON](http://php.net/json), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names), [mbstring](http://php.net/mbstring) and/or [iconv](http://php.net/iconv) (for charset conversion), [ZIP](http://php.net/zip) (for import/export), [zlib](http://php.net/zlib) (for compressed feeds)
 * MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL (experimental)
 * A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
 	* Works on mobile
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index e65c146de..922f92844 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -117,7 +117,6 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	public function deleteAction() {
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$catDAO = new FreshRSS_CategoryDAO();
-		$default_category = $catDAO->getDefault();
 		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
@@ -128,11 +127,11 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('feedback.sub.category.no_id'), $url_redirect);
 			}
 
-			if ($id === $default_category->id()) {
+			if ($id === FreshRSS_CategoryDAO::defaultCategoryId) {
 				Minz_Request::bad(_t('feedback.sub.category.not_delete_default'), $url_redirect);
 			}
 
-			if ($feedDAO->changeCategory($id, $default_category->id()) === false) {
+			if ($feedDAO->changeCategory($id, FreshRSS_CategoryDAO::defaultCategoryId) === false) {
 				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
 
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ed3229687..c4115584a 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -40,9 +40,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 		if ($cat == null) {
 			$catDAO->checkDefault();
-			$cat = $catDAO->getDefault();
 		}
-		$cat_id = $cat->id();
+		$cat_id = $cat == null ? FreshRSS_CategoryDAO::defaultCategoryId : $cat->id();
 
 		$feed = new FreshRSS_Feed($url);	//Throws FreshRSS_BadUrl_Exception
 		$feed->_httpAuth($http_auth);
@@ -504,8 +503,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		}
 		if ($cat_id <= 1) {
 			$catDAO->checkDefault();
-			$cat = $catDAO->getDefault();
-			$cat_id = $cat->id();
+			$cat_id = FreshRSS_CategoryDAO::defaultCategoryId;
 		}
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index a1f789805..fbebb2a78 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -29,32 +29,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(_t('sub.import_export.title') . ' · ');
 	}
 
-	/**
-	 * 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);
-		}
-
-		$file = $_FILES['file'];
-		$status_file = $file['error'];
-
-		if ($status_file !== 0) {
-			Minz_Log::warning('File cannot be uploaded. Error code: ' . $status_file);
-			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'),
-			                  array('c' => 'importExport', 'a' => 'index'));
-		}
+	public function importFile($name, $path, $username = null) {
+		require_once(LIB_PATH . '/lib_opml.php');
 
-		@set_time_limit(300);
+		$this->catDAO = new FreshRSS_CategoryDAO($username);
+		$this->entryDAO = FreshRSS_Factory::createEntryDao($username);
+		$this->feedDAO = FreshRSS_Factory::createFeedDao($username);
 
-		$type_file = $this->guessFileType($file['name']);
+		$type_file = self::guessFileType($name);
 
 		$list_files = array(
 			'opml' => array(),
@@ -65,21 +47,17 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		// We try to list all files according to their type
 		$list = array();
 		if ($type_file === 'zip' && extension_loaded('zip')) {
-			$zip = zip_open($file['tmp_name']);
-
+			$zip = zip_open($path);
 			if (!is_resource($zip)) {
 				// zip_open cannot open file: something is wrong
-				Minz_Log::warning('Zip archive cannot be imported. Error code: ' . $zip);
-				Minz_Request::bad(_t('feedback.import_export.zip_error'),
-				                  array('c' => 'importExport', 'a' => 'index'));
+				throw new FreshRSS_Zip_Exception($zip);
 			}
-
 			while (($zipfile = zip_read($zip)) !== false) {
 				if (!is_resource($zipfile)) {
 					// zip_entry() can also return an error code!
-					Minz_Log::warning('Zip file cannot be imported. Error code: ' . $zipfile);
+					throw new FreshRSS_Zip_Exception($zipfile);
 				} else {
-					$type_zipfile = $this->guessFileType(zip_entry_name($zipfile));
+					$type_zipfile = self::guessFileType(zip_entry_name($zipfile));
 					if ($type_file !== 'unknown') {
 						$list_files[$type_zipfile][] = zip_entry_read(
 							$zipfile,
@@ -88,29 +66,82 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 					}
 				}
 			}
-
 			zip_close($zip);
 		} elseif ($type_file === 'zip') {
-			// Zip extension is not loaded
-			Minz_Request::bad(_t('feedback.import_export.no_zip_extension'),
-			                  array('c' => 'importExport', 'a' => 'index'));
+			// ZIP extension is not loaded
+			throw new FreshRSS_ZipMissing_Exception();
 		} elseif ($type_file !== 'unknown') {
-			$list_files[$type_file][] = file_get_contents($file['tmp_name']);
+			$list_files[$type_file][] = file_get_contents($path);
 		}
 
 		// Import file contents.
 		// OPML first(so categories and feeds are imported)
 		// Starred articles then so the "favourite" status is already set
 		// And finally all other files.
-		$error = false;
+		$ok = true;
 		foreach ($list_files['opml'] as $opml_file) {
-			$error = $this->importOpml($opml_file);
+			if (!$this->importOpml($opml_file)) {
+				$ok = false;
+				if (FreshRSS_Context::$isCli) {
+					fwrite(STDERR, 'FreshRSS error during OPML import' . "\n");
+				}
+			}
 		}
 		foreach ($list_files['json_starred'] as $article_file) {
-			$error = $this->importJson($article_file, true);
+			if (!$this->importJson($article_file, true)) {
+				$ok = false;
+				if (FreshRSS_Context::$isCli) {
+					fwrite(STDERR, 'FreshRSS error during JSON stars import' . "\n");
+				}
+			}
 		}
 		foreach ($list_files['json_feed'] as $article_file) {
-			$error = $this->importJson($article_file);
+			if (!$this->importJson($article_file)) {
+				$ok = false;
+				if (FreshRSS_Context::$isCli) {
+					fwrite(STDERR, 'FreshRSS error during JSON feeds import' . "\n");
+				}
+			}
+		}
+
+		return $ok;
+	}
+
+	/**
+	 * 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);
+		}
+
+		$file = $_FILES['file'];
+		$status_file = $file['error'];
+
+		if ($status_file !== 0) {
+			Minz_Log::warning('File cannot be uploaded. Error code: ' . $status_file);
+			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'),
+			                  array('c' => 'importExport', 'a' => 'index'));
+		}
+
+		@set_time_limit(300);
+
+		$error = false;
+		try {
+			$error = !$this->importFile($file['name'], $file['tmp_name']);
+		} catch (FreshRSS_ZipMissing_Exception $zme) {
+			Minz_Request::bad(_t('feedback.import_export.no_zip_extension'),
+				array('c' => 'importExport', 'a' => 'index'));
+		} catch (FreshRSS_Zip_Exception $ze) {
+			Minz_Log::warning('ZIP archive cannot be imported. Error code: ' . $ze->zipErrorCode());
+			Minz_Request::bad(_t('feedback.import_export.zip_error'),
+				array('c' => 'importExport', 'a' => 'index'));
 		}
 
 		// And finally, we get import status and redirect to the home page
@@ -126,7 +157,7 @@ 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.
 	 */
-	private function guessFileType($filename) {
+	private static function guessFileType($filename) {
 		if (substr_compare($filename, '.zip', -4) === 0) {
 			return 'zip';
 		} elseif (substr_compare($filename, '.opml', -5) === 0 ||
@@ -146,15 +177,19 @@ 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.
+	 * @return boolean false if an error occured, true otherwise.
 	 */
 	private function importOpml($opml_file) {
 		$opml_array = array();
 		try {
 			$opml_array = libopml_parse_string($opml_file, false);
 		} catch (LibOPML_Exception $e) {
-			Minz_Log::warning($e->getMessage());
-			return true;
+			if (FreshRSS_Context::$isCli) {
+				fwrite(STDERR, 'FreshRSS error during OPML parsing: ' . $e->getMessage() . "\n");
+			} else {
+				Minz_Log::warning($e->getMessage());
+			}
+			return false;
 		}
 
 		$this->catDAO->checkDefault();
@@ -167,51 +202,53 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 *
 	 * @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.
+	 * @return boolean false if an error occured, true otherwise.
 	 */
 	private function addOpmlElements($opml_elements, $parent_cat = null) {
-		$error = false;
+		$ok = true;
 
 		$nb_feeds = count($this->feedDAO->listFeeds());
 		$nb_cats = count($this->catDAO->listCategories(false));
 		$limits = FreshRSS_Context::$system_conf->limits;
 
 		foreach ($opml_elements as $elt) {
-			$is_error = false;
 			if (isset($elt['xmlUrl'])) {
 				// If xmlUrl exists, it means it is a feed
-				if ($nb_feeds >= $limits['max_feeds']) {
-					Minz_Log::warning(_t('feedback.sub.feed.over_max',
-					                  $limits['max_feeds']));
-					$is_error = true;
-					continue;
+				if (!FreshRSS_Context::$isCli) {
+					if ($nb_feeds >= $limits['max_feeds']) {
+						Minz_Log::warning(_t('feedback.sub.feed.over_max',
+										  $limits['max_feeds']));
+						$ok = false;
+						continue;
+					}
 				}
 
-				$is_error = $this->addFeedOpml($elt, $parent_cat);
-				if (!$is_error) {
-					$nb_feeds += 1;
+				if ($this->addFeedOpml($elt, $parent_cat)) {
+					$nb_feeds++;
+				} else {
+					$ok = false;
 				}
 			} else {
 				// No xmlUrl? It should be a category!
 				$limit_reached = ($nb_cats >= $limits['max_categories']);
-				if ($limit_reached) {
-					Minz_Log::warning(_t('feedback.sub.category.over_max',
-					                  $limits['max_categories']));
+				if (!FreshRSS_Context::$isCli) {
+					if ($limit_reached) {
+						Minz_Log::warning(_t('feedback.sub.category.over_max',
+										  $limits['max_categories']));
+					}
+					$ok = false;
+					continue;
 				}
 
-				$is_error = $this->addCategoryOpml($elt, $parent_cat, $limit_reached);
-				if (!$is_error) {
-					$nb_cats += 1;
+				if ($this->addCategoryOpml($elt, $parent_cat, $limit_reached)) {
+					$nb_cats++;
+				} else {
+					$ok = false;
 				}
 			}
-
-			if (!$error && $is_error) {
-				// oops: there is at least one error!
-				$error = $is_error;
-			}
 		}
 
-		return $error;
+		return $ok;
 	}
 
 	/**
@@ -219,21 +256,23 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 *
 	 * @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.
+	 * @return boolean false if an error occured, true otherwise.
 	 */
 	private function addFeedOpml($feed_elt, $parent_cat) {
-		$default_cat = $this->catDAO->getDefault();
-		if (is_null($parent_cat)) {
+		if ($parent_cat == null) {
 			// This feed has no parent category so we get the default one
+			$this->catDAO->checkDefault();
+			$default_cat = $this->catDAO->getDefault();
 			$parent_cat = $default_cat->name();
 		}
 
 		$cat = $this->catDAO->searchByName($parent_cat);
-		if (is_null($cat)) {
+		if ($cat == null) {
 			// If there is not $cat, it means parent category does not exist in
 			// database.
 			// If it happens, take the default category.
-			$cat = $default_cat;
+			$this->catDAO->checkDefault();
+			$cat = $this->catDAO->getDefault();
 		}
 
 		// We get different useful information
@@ -259,7 +298,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 			// Call the extension hook
 			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
-			if (!is_null($feed)) {
+			if ($feed != null) {
 				// addFeedObject checks if feed is already in DB so nothing else to
 				// check here
 				$id = $this->feedDAO->addFeedObject($feed);
@@ -268,11 +307,23 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				$error = true;
 			}
 		} catch (FreshRSS_Feed_Exception $e) {
-			Minz_Log::warning($e->getMessage());
+			if (FreshRSS_Context::$isCli) {
+				fwrite(STDERR, 'FreshRSS error during OPML feed import: ' . $e->getMessage() . "\n");
+			} else {
+				Minz_Log::warning($e->getMessage());
+			}
 			$error = true;
 		}
 
-		return $error;
+		if ($error) {
+			if (FreshRSS_Context::$isCli) {
+				fwrite(STDERR, 'FreshRSS error during OPML feed import from URL: ' . $url . ' in category ' . $cat->id() . "\n");
+			} else {
+				Minz_Log::warning('Error during OPML feed import from URL: ' . $url . ' in category ' . $cat->id());
+			}
+		}
+
+		return !$error;
 	}
 
 	/**
@@ -282,29 +333,34 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 * @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.
+	 * @return boolean false if an error occured, true otherwise.
 	 */
 	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']));
+		$catName = Minz_Helper::htmlspecialchars_utf8($cat_elt['text']);
+		$cat = new FreshRSS_Category($catName);
 
 		$error = true;
-		if (!$cat_limit_reached) {
+		if (FreshRSS_Context::$isCli || !$cat_limit_reached) {
 			$id = $this->catDAO->addCategoryObject($cat);
 			$error = ($id === false);
 		}
+		if ($error) {
+			if (FreshRSS_Context::$isCli) {
+				fwrite(STDERR, 'FreshRSS error during OPML category import from URL: ' . $catName . "\n");
+			} else {
+				Minz_Log::warning('Error during OPML category import from URL: ' . $catName);
+			}
+		}
 
 		if (isset($cat_elt['@outlines'])) {
 			// Our cat_elt contains more categories or more feeds, so we
 			// add them recursively.
 			// Note: FreshRSS does not support yet category arborescence
-			$res = $this->addOpmlElements($cat_elt['@outlines'], $cat->name());
-			if (!$error && $res) {
-				$error = true;
-			}
+			$error &= !$this->addOpmlElements($cat_elt['@outlines'], $catName);
 		}
 
-		return $error;
+		return !$error;
 	}
 
 	/**
@@ -312,13 +368,17 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 *
 	 * @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.
+	 * @return boolean false if an error occured, true otherwise.
 	 */
 	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');
-			return true;
+		if ($article_object == null) {
+			if (FreshRSS_Context::$isCli) {
+				fwrite(STDERR, 'FreshRSS error trying to import a non-JSON file' . "\n");
+			} else {
+				Minz_Log::warning('Try to import a non-JSON file');
+			}
+			return false;
 		}
 
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
@@ -337,25 +397,24 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$feed = new FreshRSS_Feed($item['origin'][$key]);
 			$feed = $this->feedDAO->searchByUrl($feed->url());
 
-			if (is_null($feed)) {
+			if ($feed == null) {
 				// Feed does not exist in DB,we should to try to add it.
-				if ($nb_feeds >= $limits['max_feeds']) {
+				if ((!FreshRSS_Context::$isCli) && ($nb_feeds >= $limits['max_feeds'])) {
 					// Oops, no more place!
 					Minz_Log::warning(_t('feedback.sub.feed.over_max', $limits['max_feeds']));
 				} else {
 					$feed = $this->addFeedJson($item['origin'], $google_compliant);
 				}
 
-				if (is_null($feed)) {
+				if ($feed == null) {
 					// Still null? It means something went wrong.
 					$error = true;
 				} else {
-					// Nice! Increase the counter.
-					$nb_feeds += 1;
+					$nb_feeds++;
 				}
 			}
 
-			if (!is_null($feed)) {
+			if ($feed != null) {
 				$article_to_feed[$item['id']] = $feed->id();
 			}
 		}
@@ -384,7 +443,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			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;
+					return strpos($var, '/state/com.google') !== false;
 				});
 			}
 
@@ -397,7 +456,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$entry->_tags($tags);
 
 			$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
-			if (is_null($entry)) {
+			if ($entry == null) {
 				// An extension has returned a null value, there is nothing to insert.
 				continue;
 			}
@@ -415,7 +474,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		}
 		$this->entryDAO->commit();
 
-		return $error;
+		return !$error;
 	}
 
 	/**
@@ -427,8 +486,6 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 *         else null.
 	 */
 	private function addFeedJson($origin, $google_compliant) {
-		$default_cat = $this->catDAO->getDefault();
-
 		$return = null;
 		$key = $google_compliant ? 'htmlUrl' : 'feedUrl';
 		$url = $origin[$key];
@@ -438,13 +495,13 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		try {
 			// Create a Feed object and add it in database.
 			$feed = new FreshRSS_Feed($url);
-			$feed->_category($default_cat->id());
+			$feed->_category(FreshRSS_CategoryDAO::defaultCategoryId);
 			$feed->_name($name);
 			$feed->_website($website);
 
 			// Call the extension hook
 			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
-			if (!is_null($feed)) {
+			if ($feed != null) {
 				// addFeedObject checks if feed is already in DB so nothing else to
 				// check here.
 				$id = $this->feedDAO->addFeedObject($feed);
@@ -455,7 +512,11 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				}
 			}
 		} catch (FreshRSS_Feed_Exception $e) {
-			Minz_Log::warning($e->getMessage());
+			if (FreshRSS_Context::$isCli) {
+				fwrite(STDERR, 'FreshRSS error during JSON feed import: ' . $e->getMessage() . "\n");
+			} else {
+				Minz_Log::warning($e->getMessage());
+			}
 		}
 
 		return $return;
@@ -503,18 +564,18 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		$nb_files = count($export_files);
 		if ($nb_files > 1) {
-			// If there are more than 1 file to export, we need a zip archive.
+			// If there are more than 1 file to export, we need a ZIP archive.
 			try {
 				$this->exportZip($export_files);
 			} catch (Exception $e) {
-				# Oops, there is no Zip extension!
+				# Oops, there is no ZIP extension!
 				Minz_Request::bad(_t('feedback.import_export.export_no_zip_extension'),
 				                  array('c' => 'importExport', 'a' => 'index'));
 			}
 		} elseif ($nb_files === 1) {
 			// Only one file? Guess its type and export it.
 			$filename = key($export_files);
-			$type = $this->guessFileType($filename);
+			$type = self::guessFileType($filename);
 			$this->exportFile('freshrss_' . $filename, $export_files[$filename], $type);
 		} else {
 			// Nothing to do...
@@ -555,7 +616,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$this->view->entries = $this->entryDAO->listWhere(
 				's', '', FreshRSS_Entry::STATE_ALL, 'ASC', $unread_fav['all']
 			);
-		} elseif ($type == 'feed' && !is_null($feed)) {
+		} elseif ($type === 'feed' && $feed != null) {
 			$this->view->list_title = _t('sub.import_export.feed_list', $feed->name());
 			$this->view->type = 'feed/' . $feed->id();
 			$this->view->entries = $this->entryDAO->listWhere(
diff --git a/app/Exceptions/ZipException.php b/app/Exceptions/ZipException.php
new file mode 100644
index 000000000..8441daedf
--- /dev/null
+++ b/app/Exceptions/ZipException.php
@@ -0,0 +1,14 @@
+<?php
+
+class FreshRSS_Zip_Exception extends Exception {
+	private $zipErrorCode = 0;
+	
+	public function __construct($zipErrorCode) {
+		parent::__construct('ZIP error! ' . $url, 2141);
+		$this->zipErrorCode = $zipErrorCode;
+	}
+
+	public function zipErrorCode() {
+		return $this->zipErrorCode;
+	}
+}
diff --git a/app/Exceptions/ZipMissingException.php b/app/Exceptions/ZipMissingException.php
new file mode 100644
index 000000000..864cc3991
--- /dev/null
+++ b/app/Exceptions/ZipMissingException.php
@@ -0,0 +1,4 @@
+<?php
+
+class FreshRSS_ZipMissing_Exception extends Exception {
+}
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 45fdcb5af..c2d57c241 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,6 +1,9 @@
 <?php
 
 class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
+
+	const defaultCategoryId = 1;
+
 	public function addCategory($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'category`(name) VALUES(?)';
 		$stm = $this->bd->prepare($sql);
@@ -50,7 +53,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 	}
 
 	public function deleteCategory($id) {
-		if ($id <= 1) {
+		if ($id <= self::defaultCategoryId) {
 			return false;
 		}
 		$sql = 'DELETE FROM `' . $this->prefix . 'category` WHERE id=?';
@@ -120,7 +123,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 	}
 
 	public function getDefault() {
-		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=1';
+		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=' . self::defaultCategoryId;
 		$stm = $this->bd->prepare($sql);
 
 		$stm->execute();
@@ -134,11 +137,11 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 		}
 	}
 	public function checkDefault() {
-		$def_cat = $this->searchById(1);
+		$def_cat = $this->searchById(self::defaultCategoryId);
 
 		if ($def_cat == null) {
 			$cat = new FreshRSS_Category(_t('gen.short.default_category'));
-			$cat->_id(1);
+			$cat->_id(self::defaultCategoryId);
 
 			$values = array(
 				'id' => $cat->id(),
diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index 81302afca..f2bd87c77 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s neexistuje',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'Na serveru není naistalována podpora zip. Zkuste prosím exportovat soubory jeden po druhém.',
+		'export_no_zip_extension' => 'Na serveru není naistalována podpora ZIP. Zkuste prosím exportovat soubory jeden po druhém.',
 		'feeds_imported' => 'Vaše kanály byly naimportovány a nyní budou aktualizovány',
 		'feeds_imported_with_errors' => 'Vaše kanály byly naimportovány, došlo ale k nějakým chybám',
 		'file_cannot_be_uploaded' => 'Soubor nelze nahrát!',
-		'no_zip_extension' => 'Na serveru není naistalována podpora zip.',
-		'zip_error' => 'Během importu zip souboru došlo k chybě.',
+		'no_zip_extension' => 'Na serveru není naistalována podpora ZIP.',
+		'zip_error' => 'Během importu ZIP souboru došlo k chybě.',
 	),
 	'sub' => array(
 		'actualize' => 'Aktualizovat',
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index cea0541e3..274cf16e1 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -44,8 +44,8 @@ return array(
 		'export_opml' => 'Exportovat seznam kanálů (OPML)',
 		'export_starred' => 'Exportovat oblíbené',
 		'feed_list' => 'Seznam %s článků',
-		'file_to_import' => 'Soubor k importu<br />(OPML, Json nebo Zip)',
-		'file_to_import_no_zip' => 'Soubor k importu<br />(OPML nebo Json)',
+		'file_to_import' => 'Soubor k importu<br />(OPML, JSON nebo ZIP)',
+		'file_to_import_no_zip' => 'Soubor k importu<br />(OPML nebo JSON)',
 		'import' => 'Import',
 		'starred_list' => 'Seznam oblíbených článků',
 		'title' => 'Import / export',
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index f93992982..195083b36 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s existiert nicht',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'Die Zip-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie die Dateien eine nach der anderen zu exportieren.',
+		'export_no_zip_extension' => 'Die ZIP-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie die 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' => 'Die 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.',
+		'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',
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 0f05a5635..cc98fd25c 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -44,7 +44,7 @@ return array(
 		'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' => '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',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 7ce2ae9cf..e7f6b9f85 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s does not exist',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
+		'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.',
+		'no_zip_extension' => 'ZIP extension is not present on your server.',
+		'zip_error' => 'An error occured during ZIP import.',
 	),
 	'sub' => array(
 		'actualize' => 'Actualise',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index aaaa02827..789433ee6 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -44,8 +44,8 @@ return array(
 		'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)',
+		'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',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index 15f3ab859..5966fc3a7 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s n’existe pas',
 	),
 	'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.',
+		'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.',
+		'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.',
 	),
 	'sub' => array(
 		'actualize' => 'Actualiser',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index e3631eb8b..bb3f2fefc 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -44,8 +44,8 @@ return array(
 		'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)',
+		'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',
diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php
index f217586b0..5851cb2e6 100644
--- a/app/i18n/it/feedback.php
+++ b/app/i18n/it/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s non disponibile',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'Estensione Zip non presente sul server. Per favore esporta i files singolarmente.',
+		'export_no_zip_extension' => 'Estensione ZIP non presente sul server. Per favore esporta i files singolarmente.',
 		'feeds_imported' => 'I tuoi feed sono stati importati e saranno aggiornati',
 		'feeds_imported_with_errors' => 'I tuoi feeds sono stati importati ma si sono verificati alcuni errori',
 		'file_cannot_be_uploaded' => 'Il file non può essere caricato!',
-		'no_zip_extension' => 'Estensione Zip non presente sul server.',
-		'zip_error' => 'Si è verificato un errore importando il file Zip',
+		'no_zip_extension' => 'Estensione ZIP non presente sul server.',
+		'zip_error' => 'Si è verificato un errore importando il file ZIP',
 	),
 	'sub' => array(
 		'actualize' => 'Aggiorna',
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index dfcee2ce3..758e322c5 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -44,8 +44,8 @@ return array(
 		'export_opml' => 'Esporta tutta la lista dei feed (OPML)',
 		'export_starred' => 'Esporta i tuoi preferiti',
 		'feed_list' => 'Elenco di %s articoli',
-		'file_to_import' => 'File da importare<br />(OPML, Json o Zip)',
-		'file_to_import_no_zip' => 'File da importare<br />(OPML o Json)',
+		'file_to_import' => 'File da importare<br />(OPML, JSON o ZIP)',
+		'file_to_import_no_zip' => 'File da importare<br />(OPML o JSON)',
 		'import' => 'Importa',
 		'starred_list' => 'Elenco articoli preferiti',
 		'title' => 'Importa / esporta',
diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php
index b703c43cf..386b8d415 100644
--- a/app/i18n/nl/feedback.php
+++ b/app/i18n/nl/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s bestaat niet',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'Zip uitbreiding is niet aanwezig op uw server. Exporteer a.u.b. uw bestanden één voor één.',
+		'export_no_zip_extension' => 'ZIP uitbreiding is niet aanwezig op uw server. Exporteer a.u.b. uw bestanden één voor één.',
 		'feeds_imported' => 'Uw feeds zijn geimporteerd en worden nu vernieuwd',
 		'feeds_imported_with_errors' => 'Uw feeds zijn geimporteerd maar er zijn enige fouten opgetreden',
 		'file_cannot_be_uploaded' => 'Bestand kan niet worden verzonden!',
-		'no_zip_extension' => 'Zip uitbreiding is niet aanwezig op uw server.',
-		'zip_error' => 'Er is een fout opgetreden tijdens het imporeren van het Zip bestand.',
+		'no_zip_extension' => 'ZIP uitbreiding is niet aanwezig op uw server.',
+		'zip_error' => 'Er is een fout opgetreden tijdens het imporeren van het ZIP bestand.',
 	),
 	'sub' => array(
 		'actualize' => 'Actualiseren',
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index 159a58b27..a1ba3f03d 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -44,8 +44,8 @@ return array(
 		'export_opml' => 'Exporteer lijst van feeds (OPML)',
 		'export_starred' => 'Exporteer je fovorieten',
 		'feed_list' => 'Lijst van %s artikelen',
-		'file_to_import' => 'Bestand om te importeren<br />(OPML, Json of Zip)',
-		'file_to_import_no_zip' => 'Bestand om te importeren<br />(OPML of Json)',
+		'file_to_import' => 'Bestand om te importeren<br />(OPML, JSON of ZIP)',
+		'file_to_import_no_zip' => 'Bestand om te importeren<br />(OPML of JSON)',
 		'import' => 'Importeer',
 		'starred_list' => 'Lijst van favoriete artikelen',
 		'title' => 'Importeren / exporteren',
diff --git a/app/i18n/ru/feedback.php b/app/i18n/ru/feedback.php
index 7ce2ae9cf..e7f6b9f85 100644
--- a/app/i18n/ru/feedback.php
+++ b/app/i18n/ru/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s does not exist',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
+		'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.',
+		'no_zip_extension' => 'ZIP extension is not present on your server.',
+		'zip_error' => 'An error occured during ZIP import.',
 	),
 	'sub' => array(
 		'actualize' => 'Actualise',
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index aaaa02827..789433ee6 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -44,8 +44,8 @@ return array(
 		'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)',
+		'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',
diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php
index a53316206..87361ff51 100644
--- a/app/i18n/tr/feedback.php
+++ b/app/i18n/tr/feedback.php
@@ -43,12 +43,12 @@ return array(
 		'not_found' => '%s bulunmamaktadır',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'Zip eklentisi mevcut sunucunuzda yer almıyor. Lütfen başka dosya formatında dışarı aktarmayı deneyin.',
+		'export_no_zip_extension' => 'ZIP eklentisi mevcut sunucunuzda yer almıyor. Lütfen başka dosya formatında dışarı aktarmayı deneyin.',
 		'feeds_imported' => 'Akışlarınız içe aktarıldı ve şimdi güncellenecek',
 		'feeds_imported_with_errors' => 'Akışlarınız içeri aktarıldı ama bazı hatalar meydana geldi',
 		'file_cannot_be_uploaded' => 'Dosya yüklenemedi!',
-		'no_zip_extension' => 'Zip eklentisi mevcut sunucunuzda yer almıyor.',
-		'zip_error' => 'Zip içe aktarımı sırasında hata meydana geldi.',
+		'no_zip_extension' => 'ZIP eklentisi mevcut sunucunuzda yer almıyor.',
+		'zip_error' => 'ZIP içe aktarımı sırasında hata meydana geldi.',
 	),
 	'sub' => array(
 		'actualize' => 'Güncelleme',
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index 5ab367ebb..7592096d9 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -44,8 +44,8 @@ return array(
 		'export_opml' => 'Akış listesini dışarı aktar (OPML)',
 		'export_starred' => 'Favorileri dışarı aktar',
 		'feed_list' => '%s makalenin listesi',
-		'file_to_import' => 'Dosyadan içe aktar<br />(OPML, Json or Zip)',
-		'file_to_import_no_zip' => 'Dosyadan içe aktar<br />(OPML or Json)',
+		'file_to_import' => 'Dosyadan içe aktar<br />(OPML, JSON or ZIP)',
+		'file_to_import_no_zip' => 'Dosyadan içe aktar<br />(OPML or JSON)',
 		'import' => 'İçe aktar',
 		'starred_list' => 'Favori makaleleirn listesi',
 		'title' => 'İçe / dışa aktar',
diff --git a/cli/_cli.php b/cli/_cli.php
index cb6d8ec32..d81d83d66 100644
--- a/cli/_cli.php
+++ b/cli/_cli.php
@@ -37,3 +37,8 @@ function cliInitUser($username) {
 
 	return $username;
 }
+
+function done($ok) {
+	echo 'Result: ', ($ok ? 'success' : 'fail'), ".\n";
+	exit($ok ? 0 : 1);
+}
diff --git a/cli/create-user.php b/cli/create-user.php
index 08c057af8..387b503b6 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -15,19 +15,19 @@ if (empty($options['user'])) {
 	fail('Usage: ' . basename(__FILE__) . " --user=username --password='password' --api-password='api_password'" .
 		" --language=en --email=user@example.net --token='longRandomString'");
 }
-$new_user_name = $options['user'];
-if (!ctype_alnum($new_user_name)) {
-	fail('FreshRSS error: invalid username “' . $new_user_name . '”');
+$username = $options['user'];
+if (!ctype_alnum($username)) {
+	fail('FreshRSS error: invalid username “' . $username . '”');
 }
 
 $usernames = listUsers();
-if (preg_grep("/^$new_user_name$/i", $usernames)) {
-	fail('FreshRSS error: username already taken “' . $new_user_name . '”');
+if (preg_grep("/^$username$/i", $usernames)) {
+	fail('FreshRSS error: username already taken “' . $username . '”');
 }
 
-echo 'FreshRSS creating user “', $new_user_name, "”…\n";
+echo 'FreshRSS creating user “', $username, "”…\n";
 
-$ok = FreshRSS_user_Controller::createUser($new_user_name,
+$ok = FreshRSS_user_Controller::createUser($username,
 	empty($options['password']) ? '' : $options['password'],
 	empty($options['api-password']) ? '' : $options['api-password'],
 	array(
@@ -37,5 +37,4 @@ $ok = FreshRSS_user_Controller::createUser($new_user_name,
 
 invalidateHttpCache(FreshRSS_Context::$system_conf->default_user);
 
-echo 'Result: ', ($ok ? 'success' : 'fail'), ".\n";
-exit($ok ? 0 : 1);
+done($ok);
diff --git a/cli/delete-user.php b/cli/delete-user.php
index 46332fe34..da48103f7 100755
--- a/cli/delete-user.php
+++ b/cli/delete-user.php
@@ -29,5 +29,4 @@ $ok = FreshRSS_user_Controller::deleteUser($username);
 
 invalidateHttpCache(FreshRSS_Context::$system_conf->default_user);
 
-echo 'Result: ', ($ok ? 'success' : 'fail'), ".\n";
-exit($ok ? 0 : 1);
+done($ok);
diff --git a/cli/import-for-user.php b/cli/import-for-user.php
new file mode 100644
index 000000000..308786599
--- /dev/null
+++ b/cli/import-for-user.php
@@ -0,0 +1,36 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$options = getopt('', array(
+		'user:',
+		'filename:',
+		'clear-existing',
+	));
+
+if (empty($options['user']) || empty($options['filename'])) {
+	fail('Usage: ' . basename(__FILE__) . " --user=username --filename='/path/to/file.ext' --clear-existing");
+}
+
+$username = cliInitUser($options['user']);
+
+$filename = $options['filename'];
+if (!is_readable($filename)) {
+	fail('FreshRSS error: file is not readable “' . $filename . '”');
+}
+
+echo 'FreshRSS importing ZIP/OPML/JSON for user “', $username, "”…\n";
+
+$importController = new FreshRSS_importExport_Controller();
+
+$ok = false;
+try {
+	$ok = $importController->importFile($filename, $filename, $username);
+} catch (FreshRSS_ZipMissing_Exception $zme) {
+	fail('FreshRSS error: Lacking php-zip extension!');
+} catch (FreshRSS_Zip_Exception $ze) {
+	fail('FreshRSS error: ZIP archive cannot be imported! Error code: ' . $ze->zipErrorCode());
+}
+invalidateHttpCache($username);
+
+done($ok);
diff --git a/cli/list-users.php b/cli/list-users.php
index cc1cf5269..e690ff451 100755
--- a/cli/list-users.php
+++ b/cli/list-users.php
@@ -4,8 +4,8 @@ require('_cli.php');
 
 $users = listUsers();
 sort($users);
-if ($system_conf->default_user !== '') {
-	array_unshift($users, $system_conf->default_user);
+if (FreshRSS_Context::$system_conf->default_user !== '') {
+	array_unshift($users, FreshRSS_Context::$system_conf->default_user);
 	$users = array_unique($users);
 }
 
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index da28909df..45139b0d6 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -36,22 +36,21 @@ class Minz_ModelPdo {
 	 * HOST, BASE, USER et PASS définies dans le fichier de configuration
 	 */
 	public function __construct($currentUser = null) {
-		if (self::$useSharedBd && self::$sharedBd != null && $currentUser === null) {
+		if ($currentUser === null) {
+			$currentUser = Minz_Session::param('currentUser', '_');
+		}
+		if (self::$useSharedBd && self::$sharedBd != null && $currentUser === self::$sharedCurrentUser) {
 			$this->bd = self::$sharedBd;
 			$this->prefix = self::$sharedPrefix;
 			$this->current_user = self::$sharedCurrentUser;
 			return;
 		}
+		$this->current_user = $currentUser;
+		self::$sharedCurrentUser = $currentUser;
 
 		$conf = Minz_Configuration::get('system');
 		$db = $conf->db;
 
-		if ($currentUser === null) {
-			$currentUser = Minz_Session::param('currentUser', '_');
-		}
-		$this->current_user = $currentUser;
-		self::$sharedCurrentUser = $currentUser;
-
 		$driver_options = isset($conf->db['pdo_options']) && is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
 		$dbServer = parse_url('db://' . $db['host']);
 
-- 
cgit v1.2.3


From 179d126cc858fcc1df8f008237e947e0e109c3f0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 23 Oct 2016 01:47:18 +0200
Subject: +x execution rights

---
 cli/import-for-user.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cli/import-for-user.php

diff --git a/cli/import-for-user.php b/cli/import-for-user.php
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From fcb9280fc87c159539f5832ab35f174cd515654e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 23 Oct 2016 13:37:48 +0200
Subject: CLI export

ZIP export, OPML export.
Corrected height of feeds select in Pafat theme.
https://github.com/FreshRSS/FreshRSS/pull/1338
https://github.com/FreshRSS/FreshRSS/issues/1039
https://github.com/FreshRSS/FreshRSS/issues/1277
---
 app/Controllers/importExportController.php | 84 +++++++++++++++++++-----------
 app/Models/FeedDAO.php                     |  7 +++
 app/views/importExport/index.phtml         |  2 +-
 cli/_cli.php                               |  4 +-
 cli/create-user.php                        | 14 ++---
 cli/delete-user.php                        |  2 +-
 cli/export-opml-for-user.php               | 24 +++++++++
 cli/export-zip-for-user.php                | 30 +++++++++++
 cli/import-for-user.php                    |  3 +-
 p/themes/Pafat/pafat.css                   |  3 --
 10 files changed, 128 insertions(+), 45 deletions(-)
 create mode 100644 cli/export-opml-for-user.php
 create mode 100644 cli/export-zip-for-user.php

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index fbebb2a78..bb22ac739 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -522,26 +522,21 @@ 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);
-		}
+	public function exportFile($export_opml = true, $export_starred = false, $export_feeds = array(), $maxFeedEntries = 50, $username = null) {
+		require_once(LIB_PATH . '/lib_opml.php');
 
-		$this->view->_useLayout(false);
+		$this->catDAO = new FreshRSS_CategoryDAO($username);
+		$this->entryDAO = FreshRSS_Factory::createEntryDao($username);
+		$this->feedDAO = FreshRSS_Factory::createFeedDao($username);
+
+		if ($export_feeds === true) {
+			//All feeds
+			$export_feeds = $this->feedDAO->listFeedsIds();
+		}
+		if (!is_array($export_feeds)) {
+			$export_feeds = array();
+		}
 
-		$export_opml = Minz_Request::param('export_opml', false);
-		$export_starred = Minz_Request::param('export_starred', false);
-		$export_feeds = Minz_Request::param('export_feeds', array());
 		$day = date('Y-m-d');
 
 		$export_files = array();
@@ -558,7 +553,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			if ($feed) {
 				$filename = "feed_${day}_" . $feed->category() . '_'
 				          . $feed->id() . '.json';
-				$export_files[$filename] = $this->generateEntries('feed', $feed);
+				$export_files[$filename] = $this->generateEntries('feed', $feed, $maxFeedEntries);
 			}
 		}
 
@@ -566,18 +561,49 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		if ($nb_files > 1) {
 			// If there are more than 1 file to export, we need a ZIP archive.
 			try {
-				$this->exportZip($export_files);
+				$this->sendZip($export_files);
 			} catch (Exception $e) {
-				# Oops, there is no ZIP extension!
-				Minz_Request::bad(_t('feedback.import_export.export_no_zip_extension'),
-				                  array('c' => 'importExport', 'a' => 'index'));
+				throw new FreshRSS_ZipMissing_Exception($e);
 			}
 		} elseif ($nb_files === 1) {
 			// Only one file? Guess its type and export it.
 			$filename = key($export_files);
 			$type = self::guessFileType($filename);
-			$this->exportFile('freshrss_' . $filename, $export_files[$filename], $type);
-		} else {
+			$this->sendFile('freshrss_' . $filename, $export_files[$filename], $type);
+		}
+		return $nb_files;
+	}
+
+	/**
+	 * 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);
+		}
+		$this->view->_useLayout(false);
+
+		$nb_files = 0;
+		try {
+			$nb_files = $this->exportFile(
+					Minz_Request::param('export_opml', false),
+					Minz_Request::param('export_starred', false),
+					Minz_Request::param('export_feeds', array())
+				);
+		} catch (FreshRSS_ZipMissing_Exception $zme) {
+			# Oops, there is no ZIP extension!
+			Minz_Request::bad(_t('feedback.import_export.export_no_zip_extension'),
+			                  array('c' => 'importExport', 'a' => 'index'));
+		}
+
+		if ($nb_files < 1) {
 			// Nothing to do...
 			Minz_Request::forward(array('c' => 'importExport', 'a' => 'index'), true);
 		}
@@ -606,7 +632,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 * @param FreshRSS_Feed $feed feed of which we want to get entries.
 	 * @return string the JSON file content.
 	 */
-	private function generateEntries($type, $feed = NULL) {
+	private function generateEntries($type, $feed = NULL, $maxFeedEntries = 50) {
 		$this->view->categories = $this->catDAO->listCategories();
 
 		if ($type == 'starred') {
@@ -621,7 +647,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::$user_conf->posts_per_page
+				$maxFeedEntries
 			);
 			$this->view->feed = $feed;
 		}
@@ -635,7 +661,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 * @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) {
+	private function sendZip($files) {
 		if (!extension_loaded('zip')) {
 			throw new Exception();
 		}
@@ -667,7 +693,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 * @param string $type the file type (opml, json_feed or json_starred).
 	 *                     If equals to unknown, nothing happens.
 	 */
-	private function exportFile($filename, $content, $type) {
+	private function sendFile($filename, $content, $type) {
 		if ($type === 'unknown') {
 			return;
 		}
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index b21f19b66..68398efd5 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -212,6 +212,13 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 	}
 
+	public function listFeedsIds() {
+		$sql = 'SELECT id FROM `' . $this->prefix . 'feed`';
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		return $stm->fetchAll(PDO::FETCH_COLUMN, 0);
+	}
+
 	public function listFeeds() {
 		$sql = 'SELECT * FROM `' . $this->prefix . 'feed` ORDER BY name';
 		$stm = $this->bd->prepare($sql);
diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml
index c0bc412c3..c5049e3ea 100644
--- a/app/views/importExport/index.phtml
+++ b/app/views/importExport/index.phtml
@@ -44,7 +44,7 @@
 						$select_args = ' size="' . min(10, count($this->feeds)) .'" multiple="multiple"';
 					}
 				?>
-				<select name="export_feeds[]"<?php echo $select_args; ?>>
+				<select name="export_feeds[]"<?php echo $select_args; ?> size="10">
 					<?php echo extension_loaded('zip') ? '' : '<option></option>'; ?>
 					<?php foreach ($this->feeds as $feed) { ?>
 					<option value="<?php echo $feed->id(); ?>"><?php echo $feed->name(); ?></option>
diff --git a/cli/_cli.php b/cli/_cli.php
index d81d83d66..66506f07a 100644
--- a/cli/_cli.php
+++ b/cli/_cli.php
@@ -10,7 +10,7 @@ Minz_Configuration::register('system',
 	DATA_PATH . '/config.php',
 	DATA_PATH . '/config.default.php');
 FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
-Minz_Translate::init();
+Minz_Translate::init('en');
 
 FreshRSS_Context::$isCli = true;
 
@@ -39,6 +39,6 @@ function cliInitUser($username) {
 }
 
 function done($ok) {
-	echo 'Result: ', ($ok ? 'success' : 'fail'), ".\n";
+	fwrite(STDERR, 'Result: ' . ($ok ? 'success' : 'fail') . "\n");
 	exit($ok ? 0 : 1);
 }
diff --git a/cli/create-user.php b/cli/create-user.php
index 387b503b6..243e65a35 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -4,16 +4,16 @@ require('_cli.php');
 
 $options = getopt('', array(
 		'user:',
-		'password::',
-		'api-password::',
-		'language::',
-		'email::',
-		'token::',
+		'password:',
+		'api-password:',
+		'language:',
+		'email:',
+		'token:',
 	));
 
 if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user=username --password='password' --api-password='api_password'" .
-		" --language=en --email=user@example.net --token='longRandomString'");
+	fail('Usage: ' . basename(__FILE__) . " --user username --password 'password' --api-password 'api_password'" .
+		" --language en --email user@example.net --token 'longRandomString'");
 }
 $username = $options['user'];
 if (!ctype_alnum($username)) {
diff --git a/cli/delete-user.php b/cli/delete-user.php
index da48103f7..6f0e86e17 100755
--- a/cli/delete-user.php
+++ b/cli/delete-user.php
@@ -7,7 +7,7 @@ $options = getopt('', array(
 	));
 
 if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user=username");
+	fail('Usage: ' . basename(__FILE__) . " --user username");
 }
 $username = $options['user'];
 if (!ctype_alnum($username)) {
diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php
new file mode 100644
index 000000000..bce4efd63
--- /dev/null
+++ b/cli/export-opml-for-user.php
@@ -0,0 +1,24 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$options = getopt('', array(
+		'user:',
+	));
+
+if (empty($options['user'])) {
+	fail('Usage: ' . basename(__FILE__) . " --user username > /path/to/file.opml.xml'");
+}
+
+$username = cliInitUser($options['user']);
+
+fwrite(STDERR, 'FreshRSS exporting OPML for user “' . $username . "”…\n");
+
+$importController = new FreshRSS_importExport_Controller();
+
+$ok = false;
+$ok = $importController->exportFile(true, false, array(), 0, $username);
+
+invalidateHttpCache($username);
+
+done($ok);
diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php
new file mode 100644
index 000000000..f8d24238b
--- /dev/null
+++ b/cli/export-zip-for-user.php
@@ -0,0 +1,30 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$options = getopt('', array(
+		'user:',
+		'max-feed-entries:',
+	));
+
+if (empty($options['user'])) {
+	fail('Usage: ' . basename(__FILE__) . " --user username --max-feed-entries 100 > /path/to/file.zip'");
+}
+
+$username = cliInitUser($options['user']);
+
+fwrite(STDERR, 'FreshRSS exporting ZIP for user “' . $username . "”…\n");
+
+$importController = new FreshRSS_importExport_Controller();
+
+$ok = false;
+try {
+	$ok = $importController->exportFile(true, true, true,
+	empty($options['max-feed-entries']) ? 100 : intval($options['max-feed-entries']),
+	$username);
+} catch (FreshRSS_ZipMissing_Exception $zme) {
+	fail('FreshRSS error: Lacking php-zip extension!');
+}
+invalidateHttpCache($username);
+
+done($ok);
diff --git a/cli/import-for-user.php b/cli/import-for-user.php
index 308786599..29084f062 100755
--- a/cli/import-for-user.php
+++ b/cli/import-for-user.php
@@ -5,11 +5,10 @@ require('_cli.php');
 $options = getopt('', array(
 		'user:',
 		'filename:',
-		'clear-existing',
 	));
 
 if (empty($options['user']) || empty($options['filename'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user=username --filename='/path/to/file.ext' --clear-existing");
+	fail('Usage: ' . basename(__FILE__) . " --user username --filename /path/to/file.ext");
 }
 
 $username = cliInitUser($options['user']);
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 5e46a63ca..abe808eab 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -48,9 +48,6 @@ input, select, textarea {
 	vertical-align: middle;
 }
 
-select{
-	height:29px;
-}
 option {
 	padding: 0 .5em;
 }
-- 
cgit v1.2.3


From 6d55a4f6b4e0ede12f1da495f9266bcd4ed89785 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 23 Oct 2016 13:41:12 +0200
Subject: +x execution rights export

---
 cli/export-opml-for-user.php | 0
 cli/export-zip-for-user.php  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cli/export-opml-for-user.php
 mode change 100644 => 100755 cli/export-zip-for-user.php

diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php
old mode 100644
new mode 100755
diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 1f03e8a3aec8ff4b7bbba45bc3fd14a0552c2bc4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 23 Oct 2016 13:44:14 +0200
Subject: CLI typo in usage example

---
 cli/export-opml-for-user.php | 2 +-
 cli/export-zip-for-user.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php
index bce4efd63..95b12281f 100755
--- a/cli/export-opml-for-user.php
+++ b/cli/export-opml-for-user.php
@@ -7,7 +7,7 @@ $options = getopt('', array(
 	));
 
 if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user username > /path/to/file.opml.xml'");
+	fail('Usage: ' . basename(__FILE__) . " --user username > /path/to/file.opml.xml");
 }
 
 $username = cliInitUser($options['user']);
diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php
index f8d24238b..3004569cc 100755
--- a/cli/export-zip-for-user.php
+++ b/cli/export-zip-for-user.php
@@ -8,7 +8,7 @@ $options = getopt('', array(
 	));
 
 if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user username --max-feed-entries 100 > /path/to/file.zip'");
+	fail('Usage: ' . basename(__FILE__) . " --user username --max-feed-entries 100 > /path/to/file.zip");
 }
 
 $username = cliInitUser($options['user']);
-- 
cgit v1.2.3


From ab4ece6780cf841f6ce4e89f7b81a1ff1661f615 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 01:41:09 +0200
Subject: CLI do-install

https://github.com/FreshRSS/FreshRSS/issues/1095
https://github.com/FreshRSS/FreshRSS/issues/1090
---
 app/Controllers/userController.php |   5 +-
 app/install.php                    | 161 +++++++------------------------------
 cli/_cli.php                       |   7 +-
 cli/create-user.php                |  10 ++-
 cli/do-install.php                 | 102 +++++++++++++++++++++++
 lib/lib_install.php                | 115 ++++++++++++++++++++++++++
 6 files changed, 260 insertions(+), 140 deletions(-)
 create mode 100644 cli/do-install.php
 create mode 100644 lib/lib_install.php

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 2f04c7a1d..9dee16e8c 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -24,7 +24,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		}
 	}
 
-	private static function hashPassword($passwordPlain) {
+	public static function hashPassword($passwordPlain) {
 		if (!function_exists('password_hash')) {
 			include_once(LIB_PATH . '/password_compat.php');
 		}
@@ -112,9 +112,6 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$userConfig['language'] = 'en';
 			}
 
-			$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
 
 			$configPath = join_path(DATA_PATH, 'users', $new_user_name, 'config.php');
diff --git a/app/install.php b/app/install.php
index 1972379e5..6956761c7 100644
--- a/app/install.php
+++ b/app/install.php
@@ -4,15 +4,12 @@ if (function_exists('opcache_reset')) {
 }
 header("Content-Security-Policy: default-src 'self'");
 
-define('BCRYPT_COST', 9);
+require(LIB_PATH . '/lib_install.php');
 
 session_name('FreshRSS');
 session_set_cookie_params(0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true);
 session_start();
 
-Minz_Configuration::register('default_system', join_path(DATA_PATH, 'config.default.php'));
-Minz_Configuration::register('default_user', join_path(USERS_PATH, '_', 'config.default.php'));
-
 if (isset($_GET['step'])) {
 	define('STEP',(int)$_GET['step']);
 } else {
@@ -26,13 +23,13 @@ if (STEP === 3 && isset($_POST['type'])) {
 if (isset($_SESSION['bd_type'])) {
 	switch ($_SESSION['bd_type']) {
 	case 'mysql':
-		include(APP_PATH . '/SQL/install.sql.mysql.php');
+		include_once(APP_PATH . '/SQL/install.sql.mysql.php');
 		break;
 	case 'sqlite':
-		include(APP_PATH . '/SQL/install.sql.sqlite.php');
+		include_once(APP_PATH . '/SQL/install.sql.sqlite.php');
 		break;
 	case 'pgsql':
-		include(APP_PATH . '/SQL/install.sql.pgsql.php');
+		include_once(APP_PATH . '/SQL/install.sql.pgsql.php');
 		break;
 	}
 }
@@ -131,12 +128,7 @@ function saveStep2() {
 
 		$password_plain = param('passwordPlain', false);
 		if ($password_plain !== false && cryptAvailable()) {
-			if (!function_exists('password_hash')) {
-				include_once(LIB_PATH . '/password_compat.php');
-			}
-			$passwordHash = password_hash($password_plain, PASSWORD_BCRYPT, array('cost' => BCRYPT_COST));
-			$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
-			$_SESSION['passwordHash'] = $passwordHash;
+			$_SESSION['passwordHash'] = FreshRSS_user_Controller::hashPassword($password_plain);
 		}
 
 		if (empty($_SESSION['old_entries']) ||
@@ -149,7 +141,7 @@ function saveStep2() {
 			return false;
 		}
 
-		$_SESSION['salt'] = sha1(uniqid(mt_rand(), true).implode('', stat(__FILE__)));
+		$_SESSION['salt'] = generateSalt();
 		if ((!ctype_digit($_SESSION['old_entries'])) ||($_SESSION['old_entries'] < 1)) {
 			$_SESSION['old_entries'] = $user_default_config->old_entries;
 		}
@@ -171,7 +163,7 @@ function saveStep2() {
 
 		recursive_unlink($user_dir);
 		mkdir($user_dir);
-		file_put_contents($user_config_path, "<?php\n return " . var_export($config_array, true) . ';');
+		file_put_contents($user_config_path, "<?php\n return " . var_export($config_array, true) . ";\n");
 
 		header('Location: index.php?step=3');
 	}
@@ -225,35 +217,29 @@ 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($config_array, true) . ';');
+		file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($config_array, true) . ";\n");
 
-		$res = checkBD();
+		$config_array['db']['default_user'] = $config_array['default_user'];
+		$ok = checkDb($config_array['db']) && checkDbUser($config_array['db']);
+		if (!$ok) {
+			@unlink(join_path(DATA_PATH, 'config.php'));
+		}
 
-		if ($res) {
+		if ($ok) {
 			$_SESSION['bd_error'] = '';
 			header('Location: index.php?step=4');
-		} elseif (empty($_SESSION['bd_error'])) {
-			$_SESSION['bd_error'] = 'Unknown error!';
+		} else {
+			$_SESSION['bd_error'] = empty(config_array['db']['bd_error']) ? 'Unknown error!' : config_array['db']['bd_error'];
 		}
 	}
 	invalidateHttpCache();
 }
 
-function deleteInstall() {
-	$res = unlink(join_path(DATA_PATH, 'do-install.txt'));
-
-	if (!$res) {
-		return false;
-	}
-
-	header('Location: index.php');
-}
-
 
 /*** VÉRIFICATIONS ***/
 function checkStep() {
 	$s0 = checkStep0();
-	$s1 = checkStep1();
+	$s1 = checkRequirements();
 	$s2 = checkStep2();
 	$s3 = checkStep3();
 	if (STEP > 0 && $s0['all'] != 'ok') {
@@ -279,49 +265,6 @@ function checkStep0() {
 	);
 }
 
-function checkStep1() {
-	$php = version_compare(PHP_VERSION, '5.3.3') >= 0;
-	$minz = file_exists(join_path(LIB_PATH, 'Minz'));
-	$curl = extension_loaded('curl');
-	$pdo_mysql = extension_loaded('pdo_mysql');
-	$pdo_sqlite = extension_loaded('pdo_sqlite');
-	$pdo_pgsql = extension_loaded('pdo_pgsql');
-	$pdo = $pdo_mysql || $pdo_sqlite || $pdo_pgsql;
-	$pcre = extension_loaded('pcre');
-	$ctype = extension_loaded('ctype');
-	$dom = class_exists('DOMDocument');
-	$xml = function_exists('xml_parser_create');
-	$json = function_exists('json_encode');
-	$data = DATA_PATH && is_writable(DATA_PATH);
-	$cache = CACHE_PATH && is_writable(CACHE_PATH);
-	$users = USERS_PATH && is_writable(USERS_PATH);
-	$favicons = is_writable(join_path(DATA_PATH, 'favicons'));
-	$http_referer = is_referer_from_same_domain();
-
-	return array(
-		'php' => $php ? 'ok' : 'ko',
-		'minz' => $minz ? 'ok' : 'ko',
-		'curl' => $curl ? 'ok' : 'ko',
-		'pdo-mysql' => $pdo_mysql ? 'ok' : 'ko',
-		'pdo-sqlite' => $pdo_sqlite ? 'ok' : 'ko',
-		'pdo-pgsql' => $pdo_pgsql ? 'ok' : 'ko',
-		'pdo' => $pdo ? 'ok' : 'ko',
-		'pcre' => $pcre ? 'ok' : 'ko',
-		'ctype' => $ctype ? 'ok' : 'ko',
-		'dom' => $dom ? 'ok' : 'ko',
-		'xml' => $xml ? 'ok' : 'ko',
-		'json' => $json ? 'ok' : 'ko',
-		'data' => $data ? 'ok' : 'ko',
-		'cache' => $cache ? 'ok' : 'ko',
-		'users' => $users ? 'ok' : 'ko',
-		'favicons' => $favicons ? 'ok' : 'ko',
-		'http_referer' => $http_referer ? 'ok' : 'ko',
-		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
-		         $data && $cache && $users && $favicons && $http_referer ?
-		         'ok' : 'ko'
-	);
-}
-
 function freshrss_already_installed() {
 	$conf_path = join_path(DATA_PATH, 'config.php');
 	if (!file_exists($conf_path)) {
@@ -392,60 +335,15 @@ function checkStep3() {
 	);
 }
 
-function checkBD() {
+function checkDbUser(&$dbOptions) {
 	$ok = false;
-
+	$str = $dbOptions['bd_dsn'];
+	$driver_options = $dbOptions['bd_options'];
 	try {
-		$str = '';
-		$driver_options = null;
-		switch ($_SESSION['bd_type']) {
-		case 'mysql':
-			$driver_options = array(
-				PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'
-			);
-
-			try {	// on ouvre une connexion juste pour créer la base si elle n'existe pas
-				$str = 'mysql:host=' . $_SESSION['bd_host'] . ';';
-				$c = new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
-				$sql = sprintf(SQL_CREATE_DB, $_SESSION['bd_base']);
-				$res = $c->query($sql);
-			} catch (PDOException $e) {
-			}
-
-			// on écrase la précédente connexion en sélectionnant la nouvelle BDD
-			$str = 'mysql:host=' . $_SESSION['bd_host'] . ';dbname=' . $_SESSION['bd_base'];
-			break;
-		case 'sqlite':
-			$str = 'sqlite:' . join_path(USERS_PATH, $_SESSION['default_user'], 'db.sqlite');
-			$driver_options = array(
-				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-			);
-			break;
-		case 'pgsql':
-			$driver_options = array(
-				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-			);
-
-			try {	// on ouvre une connexion juste pour créer la base si elle n'existe pas
-				$str = 'pgsql:host=' . $_SESSION['bd_host'] . ';dbname=postgres';
-				$c = new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
-				$sql = sprintf(SQL_CREATE_DB, $_SESSION['bd_base']);
-				$res = $c->query($sql);
-			} catch (PDOException $e) {
-				syslog(LOG_DEBUG, 'pgsql ' . $e->getMessage());
-			}
-
-			// on écrase la précédente connexion en sélectionnant la nouvelle BDD
-			$str = 'pgsql:host=' . $_SESSION['bd_host'] . ';dbname=' . $_SESSION['bd_base'];
-			break;
-		default:
-			return false;
-		}
-
-		$c = new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
+		$c = new PDO($str, $dbOptions['bd_user'], $dbOptions['bd_password'], $driver_options);
 
 		if (defined('SQL_CREATE_TABLES')) {
-			$sql = sprintf(SQL_CREATE_TABLES, $_SESSION['bd_prefix_user'], _t('gen.short.default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $dbOptions['bd_prefix_user'], _t('gen.short.default_category'));
 			$stm = $c->prepare($sql);
 			$ok = $stm->execute();
 		} else {
@@ -453,7 +351,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('gen.short.default_category'));
+					$sql = sprintf($instruction, $dbOptions['bd_prefix_user'], _t('gen.short.default_category'));
 					$stm = $c->prepare($sql);
 					$ok &= $stm->execute();
 				}
@@ -461,13 +359,8 @@ function checkBD() {
 		}
 	} catch (PDOException $e) {
 		$ok = false;
-		$_SESSION['bd_error'] = $e->getMessage();
+		$dbOptions['bd_error'] = $e->getMessage();
 	}
-
-	if (!$ok) {
-		@unlink(join_path(DATA_PATH, 'config.php'));
-	}
-
 	return $ok;
 }
 
@@ -510,7 +403,7 @@ function printStep0() {
 
 // @todo refactor this view with the check_install action
 function printStep1() {
-	$res = checkStep1();
+	$res = checkRequirements();
 ?>
 	<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>
 
@@ -805,7 +698,9 @@ case 3:
 case 4:
 	break;
 case 5:
-	deleteInstall();
+	if (deleteInstall()) {
+		header('Location: index.php');
+	}
 	break;
 }
 ?>
diff --git a/cli/_cli.php b/cli/_cli.php
index 66506f07a..7d1a7c6b2 100644
--- a/cli/_cli.php
+++ b/cli/_cli.php
@@ -38,7 +38,12 @@ function cliInitUser($username) {
 	return $username;
 }
 
-function done($ok) {
+function accessRights() {
+	echo '• Remember to re-apply the appropriate access rights, such as:' , "\n",
+		"\t", 'sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/', "\n";
+}
+
+function done($ok = true) {
 	fwrite(STDERR, 'Result: ' . ($ok ? 'success' : 'fail') . "\n");
 	exit($ok ? 0 : 1);
 }
diff --git a/cli/create-user.php b/cli/create-user.php
index 243e65a35..5e93d4605 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -12,8 +12,8 @@ $options = getopt('', array(
 	));
 
 if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user username --password 'password' --api-password 'api_password'" .
-		" --language en --email user@example.net --token 'longRandomString'");
+	fail('Usage: ' . basename(__FILE__) . " --user username ( --password 'password' --api-password 'api_password'" .
+		" --language en --email user@example.net --token 'longRandomString' )");
 }
 $username = $options['user'];
 if (!ctype_alnum($username)) {
@@ -35,6 +35,12 @@ $ok = FreshRSS_user_Controller::createUser($username,
 		'token' => empty($options['token']) ? '' : $options['token'],
 	));
 
+if (!$ok) {
+	fail('FreshRSS could not create user!');
+}
+
 invalidateHttpCache(FreshRSS_Context::$system_conf->default_user);
 
+accessRights();
+
 done($ok);
diff --git a/cli/do-install.php b/cli/do-install.php
new file mode 100644
index 000000000..5eeedc626
--- /dev/null
+++ b/cli/do-install.php
@@ -0,0 +1,102 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+require(LIB_PATH . '/lib_install.php');
+
+$params = array(
+		'environment:',
+		'base_url:',
+		'language:',
+		'title:',
+		'default_user:',
+		'allow_anonymous',
+		'allow_anonymous_refresh',
+		'auth_type:',
+		'api_enabled',
+		'allow_robots',
+	);
+
+$dBparams = array(
+		'db-type:',
+		'db-host:',
+		'db-user:',
+		'db-password:',
+		'db-base:',
+		'db-prefix:',
+	);
+
+$options = getopt('', array_merge($params, $dBparams));
+
+if (empty($options['default_user']) || empty($options['auth_type'])) {
+	fail('Usage: ' . basename(__FILE__) . " --default_user admin --auth_type form" .
+		" ( --environment production --base_url https://rss.example.net/" .
+		" --language en --title FreshRSS --allow_anonymous --api_enabled" .
+		" --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123" .
+		" --db-base freshrss --db-prefix freshrss )");
+}
+
+fwrite(STDERR, 'FreshRSS install…' . "\n");
+
+$requirements = checkRequirements();
+if ($requirements['all'] !== 'ok') {
+	$message = 'FreshRSS install failed requirements:' . "\n";
+	foreach ($requirements as $requirement => $check) {
+		if ($check !== 'ok' && $requirement !== 'all') {
+			$message .= '• ' . $requirement . "\n";
+		}
+	}
+	fail($message);
+}
+
+if (!ctype_alnum($options['default_user'])) {
+	fail('FreshRSS invalid default username (must be ASCII alphanumeric): ' . $options['default_user']);
+}
+
+if (!in_array($options['auth_type'], array('form', 'http_auth', 'none'))) {
+	fail('FreshRSS invalid authentication method (auth_type must be one of { form, http_auth, none }: ' . $options['auth_type']);
+}
+
+$config = array(
+		'salt' => generateSalt(),
+		'db' => FreshRSS_Context::$system_conf->db,
+	);
+
+foreach ($params as $param) {
+	$param = rtrim($param, ':');
+	if (isset($options[$param])) {
+		$config[$param] = $options[$param] === false ? true : $options[$param];
+	}
+}
+
+if ((!empty($config['base_url'])) && server_is_public($config['base_url'])) {
+	$config['pubsubhubbub_enabled'] = true;
+}
+
+foreach ($dBparams as $dBparam) {
+	$dBparam = rtrim($dBparam, ':');
+	if (!empty($options[$dBparam])) {
+		$param = substr($dBparam, strlen('db-'));
+		$config['db'][$param] = $options[$dBparam];
+	}
+}
+
+if (file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($config, true) . ";\n") === false) {
+	fail('FreshRSS could not write configuration file!: ' . join_path(DATA_PATH, 'config.php'));
+}
+
+$config['db']['default_user'] = $config['default_user'];
+if (!checkDb($config['db'])) {
+	@unlink(join_path(DATA_PATH, 'config.php'));
+	fail('FreshRSS database error: ' . (empty($config['db']['bd_error']) ? 'Unknown error' : $config['db']['bd_error']));
+}
+
+echo '• Remember to create the default user: ', $config['default_user'] , "\n",
+	"\t", './cli/create-user.php --user ', $config['default_user'] , " --password 'password' --more-options\n";
+
+accessRights();
+
+if (!deleteInstall()) {
+	fail('FreshRSS access right problem while deleting install file!');
+}
+
+done();
diff --git a/lib/lib_install.php b/lib/lib_install.php
new file mode 100644
index 000000000..0e7b7f036
--- /dev/null
+++ b/lib/lib_install.php
@@ -0,0 +1,115 @@
+<?php
+
+define('BCRYPT_COST', 9);
+
+Minz_Configuration::register('default_system', join_path(DATA_PATH, 'config.default.php'));
+Minz_Configuration::register('default_user', join_path(USERS_PATH, '_', 'config.default.php'));
+
+function checkRequirements() {
+	$php = version_compare(PHP_VERSION, '5.3.3') >= 0;
+	$minz = file_exists(join_path(LIB_PATH, 'Minz'));
+	$curl = extension_loaded('curl');
+	$pdo_mysql = extension_loaded('pdo_mysql');
+	$pdo_sqlite = extension_loaded('pdo_sqlite');
+	$pdo_pgsql = extension_loaded('pdo_pgsql');
+	$pdo = $pdo_mysql || $pdo_sqlite || $pdo_pgsql;
+	$pcre = extension_loaded('pcre');
+	$ctype = extension_loaded('ctype');
+	$dom = class_exists('DOMDocument');
+	$xml = function_exists('xml_parser_create');
+	$json = function_exists('json_encode');
+	$data = DATA_PATH && is_writable(DATA_PATH);
+	$cache = CACHE_PATH && is_writable(CACHE_PATH);
+	$users = USERS_PATH && is_writable(USERS_PATH);
+	$favicons = is_writable(join_path(DATA_PATH, 'favicons'));
+	$http_referer = is_referer_from_same_domain();
+
+	return array(
+		'php' => $php ? 'ok' : 'ko',
+		'minz' => $minz ? 'ok' : 'ko',
+		'curl' => $curl ? 'ok' : 'ko',
+		'pdo-mysql' => $pdo_mysql ? 'ok' : 'ko',
+		'pdo-sqlite' => $pdo_sqlite ? 'ok' : 'ko',
+		'pdo-pgsql' => $pdo_pgsql ? 'ok' : 'ko',
+		'pdo' => $pdo ? 'ok' : 'ko',
+		'pcre' => $pcre ? 'ok' : 'ko',
+		'ctype' => $ctype ? 'ok' : 'ko',
+		'dom' => $dom ? 'ok' : 'ko',
+		'xml' => $xml ? 'ok' : 'ko',
+		'json' => $json ? 'ok' : 'ko',
+		'data' => $data ? 'ok' : 'ko',
+		'cache' => $cache ? 'ok' : 'ko',
+		'users' => $users ? 'ok' : 'ko',
+		'favicons' => $favicons ? 'ok' : 'ko',
+		'http_referer' => $http_referer ? 'ok' : 'ko',
+		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
+		         $data && $cache && $users && $favicons && $http_referer ?
+		         'ok' : 'ko'
+	);
+}
+
+function generateSalt() {
+	return sha1(uniqid(mt_rand(), true).implode('', stat(__FILE__)));
+}
+
+function checkDb(&$dbOptions) {
+	$dsn = '';
+	try {
+		$driver_options = null;
+		switch ($dbOptions['type']) {
+		case 'mysql':
+			include_once(APP_PATH . '/SQL/install.sql.mysql.php');
+			$driver_options = array(
+				PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'
+			);
+			try {	// on ouvre une connexion juste pour créer la base si elle n'existe pas
+				$dsn = 'mysql:host=' . $dbOptions['host'] . ';';
+				$c = new PDO($dsn, $dbOptions['user'], $dbOptions['password'], $driver_options);
+				$sql = sprintf(SQL_CREATE_DB, $dbOptions['base']);
+				$res = $c->query($sql);
+			} catch (PDOException $e) {
+				syslog(LOG_DEBUG, 'FreshRSS MySQL warning: ' . $e->getMessage());
+			}
+			// on écrase la précédente connexion en sélectionnant la nouvelle BDD
+			$dsn = 'mysql:host=' . $dbOptions['host'] . ';dbname=' . $dbOptions['base'];
+			break;
+		case 'sqlite':
+			include_once(APP_PATH . '/SQL/install.sql.sqlite.php');
+			$dsn = 'sqlite:' . join_path(USERS_PATH, $dbOptions['default_user'], 'db.sqlite');
+			$driver_options = array(
+				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+			);
+			break;
+		case 'pgsql':
+			include_once(APP_PATH . '/SQL/install.sql.pgsql.php');
+			$driver_options = array(
+				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+			);
+			try {	// on ouvre une connexion juste pour créer la base si elle n'existe pas
+				$dsn = 'pgsql:host=' . $dbOptions['host'] . ';dbname=postgres';
+				$c = new PDO($dsn, $dbOptions['user'], $dbOptions['password'], $driver_options);
+				$sql = sprintf(SQL_CREATE_DB, $dbOptions['base']);
+				$res = $c->query($sql);
+			} catch (PDOException $e) {
+				syslog(LOG_DEBUG, 'FreshRSS PostgreSQL warning: ' . $e->getMessage());
+			}
+			// on écrase la précédente connexion en sélectionnant la nouvelle BDD
+			$dsn = 'pgsql:host=' . $dbOptions['host'] . ';dbname=' . $dbOptions['base'];
+			break;
+		default:
+			return false;
+		}
+	} catch (PDOException $e) {
+		$dsn = '';
+		$dbOptions['error'] = $e->getMessage();
+	}
+	$dbOptions['dsn'] = $dsn;
+	$dbOptions['options'] = $driver_options;
+	return $dsn != '';
+}
+
+function deleteInstall() {
+	$path = join_path(DATA_PATH, 'do-install.txt');
+	@unlink($path);
+	return !file_exists($path);
+}
-- 
cgit v1.2.3


From 1171461a2918d85ed16f406052b568843ca064c6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 01:50:13 +0200
Subject: +x execution rights do-install

---
 cli/do-install.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cli/do-install.php

diff --git a/cli/do-install.php b/cli/do-install.php
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From a6db495494130da044a95b57c65d944be45746ee Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 02:25:16 +0200
Subject: CLI actualize-user

https://github.com/FreshRSS/FreshRSS/issues/1095
---
 cli/actualize-user.php | 23 +++++++++++++++++++++++
 lib/Minz/ModelPdo.php  |  5 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 cli/actualize-user.php

diff --git a/cli/actualize-user.php b/cli/actualize-user.php
new file mode 100644
index 000000000..29d51753a
--- /dev/null
+++ b/cli/actualize-user.php
@@ -0,0 +1,23 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$options = getopt('', array(
+		'user:',
+	));
+
+if (empty($options['user'])) {
+	fail('Usage: ' . basename(__FILE__) . " --user username");
+}
+
+$username = cliInitUser($options['user']);
+
+fwrite(STDERR, 'FreshRSS actualizing user “' . $username . "”…\n");
+
+list($nbUpdatedFeeds, $feed) = FreshRSS_feed_Controller::actualizeFeed(0, '', true);
+
+echo "FreshRSS actualized $nbUpdatedFeeds feeds for $username\n";
+
+invalidateHttpCache($username);
+
+done($nbUpdatedFeeds > 0);
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 45139b0d6..6e8d60bc9 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -37,9 +37,10 @@ class Minz_ModelPdo {
 	 */
 	public function __construct($currentUser = null) {
 		if ($currentUser === null) {
-			$currentUser = Minz_Session::param('currentUser', '_');
+			$currentUser = Minz_Session::param('currentUser');
 		}
-		if (self::$useSharedBd && self::$sharedBd != null && $currentUser === self::$sharedCurrentUser) {
+		if (self::$useSharedBd && self::$sharedBd != null && 
+			($currentUser == null || $currentUser === self::$sharedCurrentUser)) {
 			$this->bd = self::$sharedBd;
 			$this->prefix = self::$sharedPrefix;
 			$this->current_user = self::$sharedCurrentUser;
-- 
cgit v1.2.3


From 879af85d3ce1223cc5642e9beb6ec05d1097e43a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 02:25:44 +0200
Subject: +x execution rights actualie-user

---
 cli/actualize-user.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cli/actualize-user.php

diff --git a/cli/actualize-user.php b/cli/actualize-user.php
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 1182129ce5f07892afed190ffbb2ea4c7fc28967 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 20:29:08 +0200
Subject: CLI option no-default-feeds

https://github.com/FreshRSS/FreshRSS/issues/1095
---
 app/Controllers/userController.php |  4 ++--
 app/Models/UserDAO.php             | 18 +++++++++++++++++-
 app/SQL/install.sql.mysql.php      |  3 +++
 app/SQL/install.sql.pgsql.php      |  4 ++++
 app/SQL/install.sql.sqlite.php     |  4 ++++
 app/install.php                    | 15 +++++++++++++++
 cli/create-user.php                |  7 +++++--
 7 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 9dee16e8c..9d6ae18e6 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -99,7 +99,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		$this->view->size_user = $entryDAO->size();
 	}
 
-	public static function createUser($new_user_name, $passwordPlain, $apiPasswordPlain, $userConfig = array()) {
+	public static function createUser($new_user_name, $passwordPlain, $apiPasswordPlain, $userConfig = array(), $insertDefaultFeeds = true) {
 		if (!is_array($userConfig)) {
 			$userConfig = array();
 		}
@@ -138,7 +138,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		}
 		if ($ok) {
 			$userDAO = new FreshRSS_UserDAO();
-			$ok &= $userDAO->createUser($new_user_name, $userConfig['language']);
+			$ok &= $userDAO->createUser($new_user_name, $userConfig['language'], $insertDefaultFeeds);
 		}
 		return $ok;
 	}
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 597182693..a95ee6bc4 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -1,7 +1,7 @@
 <?php
 
 class FreshRSS_UserDAO extends Minz_ModelPdo {
-	public function createUser($username, $new_user_language) {
+	public function createUser($username, $new_user_language, $insertDefaultFeeds = true) {
 		$db = FreshRSS_Context::$system_conf->db;
 		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
@@ -28,6 +28,22 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 					}
 				}
 			}
+			if ($insertDefaultFeeds) {
+				if (defined('SQL_INSERT_FEEDS')) {	//E.g. MySQL
+					$sql = sprintf(SQL_INSERT_FEEDS, $bd_prefix_user);
+					$stm = $userPDO->bd->prepare($sql);
+					$ok &= $stm && $stm->execute();
+				} else {	//E.g. SQLite
+					global $SQL_INSERT_FEEDS;
+					if (is_array($SQL_INSERT_FEEDS)) {
+						foreach ($SQL_INSERT_FEEDS as $instruction) {
+							$sql = sprintf($instruction, $bd_prefix_user);
+							$stm = $userPDO->bd->prepare($sql);
+							$ok &= ($stm && $stm->execute());
+						}
+					}
+				}
+			}
 		} catch (Exception $e) {
 			Minz_Log::error('Error while creating user: ' . $e->getMessage());
 		}
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index ca181303e..a454829d5 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -59,6 +59,9 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 ENGINE = INNODB;
 
 INSERT IGNORE INTO `%1$scategory` (id, name) VALUES(1, "%2$s");
+');
+
+define('SQL_INSERT_FEEDS', '
 INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);
 INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS @ GitHub", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);
 ');
diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php
index b343bda86..9f4240b98 100644
--- a/app/SQL/install.sql.pgsql.php
+++ b/app/SQL/install.sql.pgsql.php
@@ -52,6 +52,10 @@ $SQL_CREATE_TABLES = array(
 'CREATE INDEX %1$sentry_lastSeen_index ON "%1$sentry" ("lastSeen");',
 
 'INSERT INTO "%1$scategory" (name) SELECT \'%2$s\' WHERE NOT EXISTS (SELECT id FROM "%1$scategory" WHERE id = 1);',
+);
+
+global $SQL_INSERT_FEEDS;
+$SQL_INSERT_FEEDS = array(
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) SELECT \'http://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'http://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400 WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'http://freshrss.org/feeds/all.atom.xml\');',
 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) SELECT \'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400 WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'https://github.com/FreshRSS/FreshRSS/releases.atom\');',
 );
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 1d3a5d92f..68d93ba92 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -55,6 +55,10 @@ $SQL_CREATE_TABLES = array(
 'CREATE INDEX IF NOT EXISTS entry_lastSeen_index ON `entry`(`lastSeen`);',	//v1.1.1
 
 'INSERT OR IGNORE INTO `category` (id, name) VALUES(1, "%2$s");',
+);
+
+global $SQL_INSERT_FEEDS;
+$SQL_INSERT_FEEDS = array(
 'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) VALUES("http://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "http://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);',
 'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS releases", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);',
 );
diff --git a/app/install.php b/app/install.php
index 6956761c7..0daa02b1b 100644
--- a/app/install.php
+++ b/app/install.php
@@ -357,6 +357,21 @@ function checkDbUser(&$dbOptions) {
 				}
 			}
 		}
+
+		if (defined('SQL_INSERT_FEEDS')) {
+			$sql = sprintf(SQL_INSERT_FEEDS, $dbOptions['bd_prefix_user']);
+			$stm = $c->prepare($sql);
+			$ok &= $stm->execute();
+		} else {
+			global $SQL_INSERT_FEEDS;
+			if (is_array($SQL_INSERT_FEEDS)) {
+				foreach ($SQL_INSERT_FEEDS as $instruction) {
+					$sql = sprintf($instruction, $dbOptions['bd_prefix_user']);
+					$stm = $c->prepare($sql);
+					$ok &= $stm->execute();
+				}
+			}
+		}
 	} catch (PDOException $e) {
 		$ok = false;
 		$dbOptions['bd_error'] = $e->getMessage();
diff --git a/cli/create-user.php b/cli/create-user.php
index 5e93d4605..c790acb59 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -9,11 +9,12 @@ $options = getopt('', array(
 		'language:',
 		'email:',
 		'token:',
+		'no-default-feeds',
 	));
 
 if (empty($options['user'])) {
 	fail('Usage: ' . basename(__FILE__) . " --user username ( --password 'password' --api-password 'api_password'" .
-		" --language en --email user@example.net --token 'longRandomString' )");
+		" --language en --email user@example.net --token 'longRandomString --no-default-feeds' )");
 }
 $username = $options['user'];
 if (!ctype_alnum($username)) {
@@ -33,7 +34,9 @@ $ok = FreshRSS_user_Controller::createUser($username,
 	array(
 		'language' => empty($options['language']) ? '' : $options['language'],
 		'token' => empty($options['token']) ? '' : $options['token'],
-	));
+	),
+	!isset($options['no-default-feeds'])
+	);
 
 if (!$ok) {
 	fail('FreshRSS could not create user!');
-- 
cgit v1.2.3


From fac6c9881644160d168355af865b25285f27df82 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 20:33:21 +0200
Subject: CLI minor usage update

---
 cli/export-zip-for-user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php
index 3004569cc..9183a1c14 100755
--- a/cli/export-zip-for-user.php
+++ b/cli/export-zip-for-user.php
@@ -8,7 +8,7 @@ $options = getopt('', array(
 	));
 
 if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user username --max-feed-entries 100 > /path/to/file.zip");
+	fail('Usage: ' . basename(__FILE__) . " --user username ( --max-feed-entries 100 ) > /path/to/file.zip");
 }
 
 $username = cliInitUser($options['user']);
-- 
cgit v1.2.3


From 1e4348732dc8b58247b05d272f6f20c785165278 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 21:21:26 +0200
Subject: Readme CLI

https://github.com/FreshRSS/FreshRSS/issues/1095
---
 CHANGELOG.md  |  2 ++
 README.fr.md  |  2 ++
 README.md     |  6 ++++--
 cli/README.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 cli/README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d24ec0739..acec03f39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## 2016-10-XX FreshRSS 1.6.0-dev
 
 * API
+	* New Command-Line Interface (CLI) [#1095](https://github.com/FreshRSS/FreshRSS/issues/1095)
+		* Install, add/delete users, actualize, import/export. See [CLI documentation](./cli/README.md).
 	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
 * Compatibility:
 	* Support for PostgreSQL [#416](https://github.com/FreshRSS/FreshRSS/issues/416)
diff --git a/README.fr.md b/README.fr.md
index 2a2da256d..d672b5069 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -87,6 +87,7 @@ sudo chmod -R g+w ./data/
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Naviguez vers http://example.net/FreshRSS pour terminer l’installation.
 # (Si vous le faite depuis localhost, vous pourrez avoir à ajuster le réglage de votre adresse publique)
+# ou utilisez [l’interface en ligne de commande](./cli/README.md)
 
 # Mettre à jour FreshRSS vers une nouvelle version
 cd /usr/share/FreshRSS
@@ -132,6 +133,7 @@ Créer `/etc/cron.d/FreshRSS` avec :
 # Sauvegarde
 * Il faut conserver vos fichiers `./data/config.php` ainsi que `./data/*_user.php`
 * Vous pouvez exporter votre liste de flux depuis FreshRSS au format OPML
+	* soit depuis l’interface Web, soit [en ligne de commande](./cli/README.md)
 * Pour sauvegarder les articles eux-mêmes, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
 
 ```bash
diff --git a/README.md b/README.md
index a541d6dea..fef4aeef5 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ sudo chmod -R g+w ./data/
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Navigate to http://example.net/FreshRSS to complete the installation.
 # (If you do it from localhost, you may have to adjust the setting of your public address later)
+# or use the [Command-Line Interface](./cli/README.md)
 
 # Update to a newer version of FreshRSS
 cd /usr/share/FreshRSS
@@ -107,8 +108,8 @@ It is needed for the multi-user mode to limit access to FreshRSS. You can:
 ## Automatic feed update
 * You can add a Cron job to launch the update script.
 Check the Cron documentation related to your distribution ([Debian/Ubuntu](https://help.ubuntu.com/community/CronHowto), [Red Hat/Fedora](https://fedoraproject.org/wiki/Administration_Guide_Draft/Cron), [Slackware](http://docs.slackware.com/fr:slackbook:process_control?#cron), [Gentoo](https://wiki.gentoo.org/wiki/Cron), [Arch Linux](https://wiki.archlinux.org/index.php/Cron)…).
-It’s a good idea to use the Web server user.
-For example, if you want to run the script every hour:
+It is a good idea to use the Web server user.
+For instance, if you want to run the script every hour:
 
 ```
 9 * * * * php /usr/share/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
@@ -132,6 +133,7 @@ Create `/etc/cron.d/FreshRSS` with:
 # Backup
 * You need to keep `./data/config.php`, and `./data/*_user.php` files
 * You can export your feed list in OPML format from FreshRSS
+	* either from the Web interface, or from the [Command-Line Interface](./cli/README.md)
 * To save articles, you can use [phpMyAdmin](http://www.phpmyadmin.net) or MySQL tools:
 
 ```bash
diff --git a/cli/README.md b/cli/README.md
new file mode 100644
index 000000000..7202d5809
--- /dev/null
+++ b/cli/README.md
@@ -0,0 +1,54 @@
+* Back to [main read-me](../README.md)
+
+# FreshRSS Command-Line Interface (CLI)
+
+## Note on access rights
+
+When using the command-line interface, remember that your user might not be the same as the one used by your Web server.
+This might create some access right problems.
+
+It is recommended to invoke commands using the same user as your Web server:
+
+```sh
+cd /usr/share/FreshRSS
+sudo -u www-data sh -c './cli/list-users.php'
+```
+
+In any case, when you are done with a series of commands, you should re-apply the access rights:
+
+```sh
+cd /usr/share/FreshRSS
+sudo chown -R :www-data .
+sudo chmod -R g+r .
+sudo chmod -R g+w ./data/
+```
+
+
+## Commands
+
+Options in parenthesis are optional.
+
+
+```sh
+cd /usr/share/FreshRSS
+
+./cli/do-install.php --default_user admin --auth_type form  ( --environment production --base_url https://rss.example.net/ --language en --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
+# The default database is SQLite
+# Does not create the default user. Do that with ./cli/create-user.php
+
+./cli/create-user.php --user username ( --password 'password' --api-password 'api_password' --language en --email user@example.net --token 'longRandomString' --no-default-feeds )
+
+./cli/delete-user.php --user username
+
+./cli/list-users.php
+# Return a list of users, with the default/admin user first
+
+./cli/actualize-user.php --user username
+
+./cli/import-for-user.php --user username --filename /path/to/file.ext
+
+./cli/export-opml-for-user.php --user username > /path/to/file.opml.xml
+
+./cli/export-zip-for-user.php --user username ( --max-feed-entries 100 ) > /path/to/file.zip
+
+```
-- 
cgit v1.2.3


From 78c2b85d1645ce2f3889bae71e971fc66b6bf554 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 21:28:47 +0200
Subject: More CLI readme

https://github.com/FreshRSS/FreshRSS/issues/1095
---
 README.fr.md | 5 +++--
 README.md    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index d672b5069..95489976d 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -46,7 +46,8 @@ Nous sommes une communauté amicale.
 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
-5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à me contacter.
+	* ou utilisez l’interface en ligne de commande](./cli/README.md)
+5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à [nous contacter](https://github.com/FreshRSS/FreshRSS/issues).
 6. Des paramètres de configuration avancée peuvent être accédés depuis [config.php](./data/config.default.php).
 
 ## Installation automatisée
@@ -87,7 +88,7 @@ sudo chmod -R g+w ./data/
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Naviguez vers http://example.net/FreshRSS pour terminer l’installation.
 # (Si vous le faite depuis localhost, vous pourrez avoir à ajuster le réglage de votre adresse publique)
-# ou utilisez [l’interface en ligne de commande](./cli/README.md)
+# ou utilisez l’interface en ligne de commande
 
 # Mettre à jour FreshRSS vers une nouvelle version
 cd /usr/share/FreshRSS
diff --git a/README.md b/README.md
index fef4aeef5..f8bf5da1f 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,8 @@ We are a friendly community.
 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
-5. Everything should be working :) If you encounter any problem, feel free to contact me.
+	* or use the [Command-Line Interface](./cli/README.md)
+5. Everything should be working :) If you encounter any problem, feel free [contact us](https://github.com/FreshRSS/FreshRSS/issues).
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
 ## Automated install
@@ -87,7 +88,7 @@ sudo chmod -R g+w ./data/
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Navigate to http://example.net/FreshRSS to complete the installation.
 # (If you do it from localhost, you may have to adjust the setting of your public address later)
-# or use the [Command-Line Interface](./cli/README.md)
+# or use the Command-Line Interface
 
 # Update to a newer version of FreshRSS
 cd /usr/share/FreshRSS
-- 
cgit v1.2.3


From 835f3d746cc4fb867b65c8c3593870ce826c42f3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 21:31:09 +0200
Subject: CLI readme typo

---
 README.fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.fr.md b/README.fr.md
index 95489976d..1d6a4cce2 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -46,7 +46,7 @@ Nous sommes une communauté amicale.
 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
-	* ou utilisez l’interface en ligne de commande](./cli/README.md)
+	* ou utilisez [l’interface en ligne de commande](./cli/README.md)
 5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à [nous contacter](https://github.com/FreshRSS/FreshRSS/issues).
 6. Des paramètres de configuration avancée peuvent être accédés depuis [config.php](./data/config.default.php).
 
-- 
cgit v1.2.3


From c8e5292ab7a4670ff67e587f18d7973eee2f00e6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 21:58:22 +0200
Subject: CLI minor formatting

https://github.com/FreshRSS/FreshRSS/issues/1095
---
 cli/create-user.php         | 3 +--
 cli/export-zip-for-user.php | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cli/create-user.php b/cli/create-user.php
index c790acb59..008b82ce3 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -35,8 +35,7 @@ $ok = FreshRSS_user_Controller::createUser($username,
 		'language' => empty($options['language']) ? '' : $options['language'],
 		'token' => empty($options['token']) ? '' : $options['token'],
 	),
-	!isset($options['no-default-feeds'])
-	);
+	!isset($options['no-default-feeds']));
 
 if (!$ok) {
 	fail('FreshRSS could not create user!');
diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php
index 9183a1c14..92fe9bf9a 100755
--- a/cli/export-zip-for-user.php
+++ b/cli/export-zip-for-user.php
@@ -20,8 +20,8 @@ $importController = new FreshRSS_importExport_Controller();
 $ok = false;
 try {
 	$ok = $importController->exportFile(true, true, true,
-	empty($options['max-feed-entries']) ? 100 : intval($options['max-feed-entries']),
-	$username);
+		empty($options['max-feed-entries']) ? 100 : intval($options['max-feed-entries']),
+		$username);
 } catch (FreshRSS_ZipMissing_Exception $zme) {
 	fail('FreshRSS error: Lacking php-zip extension!');
 }
-- 
cgit v1.2.3


From 811145863237cfdd0d2d453a27143625ba5b617c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 23:32:58 +0200
Subject: Fix bugs in install

---
 app/install.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/install.php b/app/install.php
index 0daa02b1b..dbc2a8908 100644
--- a/app/install.php
+++ b/app/install.php
@@ -220,6 +220,7 @@ function saveStep3() {
 		file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($config_array, true) . ";\n");
 
 		$config_array['db']['default_user'] = $config_array['default_user'];
+		$config_array['db']['prefix_user'] = $_SESSION['bd_prefix_user'];
 		$ok = checkDb($config_array['db']) && checkDbUser($config_array['db']);
 		if (!$ok) {
 			@unlink(join_path(DATA_PATH, 'config.php'));
@@ -229,7 +230,7 @@ function saveStep3() {
 			$_SESSION['bd_error'] = '';
 			header('Location: index.php?step=4');
 		} else {
-			$_SESSION['bd_error'] = empty(config_array['db']['bd_error']) ? 'Unknown error!' : config_array['db']['bd_error'];
+			$_SESSION['bd_error'] = empty($config_array['db']['bd_error']) ? 'Unknown error!' : $config_array['db']['bd_error'];
 		}
 	}
 	invalidateHttpCache();
@@ -337,13 +338,13 @@ function checkStep3() {
 
 function checkDbUser(&$dbOptions) {
 	$ok = false;
-	$str = $dbOptions['bd_dsn'];
-	$driver_options = $dbOptions['bd_options'];
+	$str = $dbOptions['dsn'];
+	$driver_options = $dbOptions['options'];
 	try {
 		$c = new PDO($str, $dbOptions['bd_user'], $dbOptions['bd_password'], $driver_options);
 
 		if (defined('SQL_CREATE_TABLES')) {
-			$sql = sprintf(SQL_CREATE_TABLES, $dbOptions['bd_prefix_user'], _t('gen.short.default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $dbOptions['prefix_user'], _t('gen.short.default_category'));
 			$stm = $c->prepare($sql);
 			$ok = $stm->execute();
 		} else {
@@ -351,7 +352,7 @@ function checkDbUser(&$dbOptions) {
 			if (is_array($SQL_CREATE_TABLES)) {
 				$ok = true;
 				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, $dbOptions['bd_prefix_user'], _t('gen.short.default_category'));
+					$sql = sprintf($instruction, $dbOptions['prefix_user'], _t('gen.short.default_category'));
 					$stm = $c->prepare($sql);
 					$ok &= $stm->execute();
 				}
@@ -359,14 +360,14 @@ function checkDbUser(&$dbOptions) {
 		}
 
 		if (defined('SQL_INSERT_FEEDS')) {
-			$sql = sprintf(SQL_INSERT_FEEDS, $dbOptions['bd_prefix_user']);
+			$sql = sprintf(SQL_INSERT_FEEDS, $dbOptions['prefix_user']);
 			$stm = $c->prepare($sql);
 			$ok &= $stm->execute();
 		} else {
 			global $SQL_INSERT_FEEDS;
 			if (is_array($SQL_INSERT_FEEDS)) {
 				foreach ($SQL_INSERT_FEEDS as $instruction) {
-					$sql = sprintf($instruction, $dbOptions['bd_prefix_user']);
+					$sql = sprintf($instruction, $dbOptions['prefix_user']);
 					$stm = $c->prepare($sql);
 					$ok &= $stm->execute();
 				}
-- 
cgit v1.2.3


From 7dc9862596d9b598c4b1146b29cfb3548dafce40 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 25 Oct 2016 00:10:49 +0200
Subject: Fix OPML import bug

---
 app/Controllers/importExportController.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index bb22ac739..3ba91a243 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -84,6 +84,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				$ok = false;
 				if (FreshRSS_Context::$isCli) {
 					fwrite(STDERR, 'FreshRSS error during OPML import' . "\n");
+				} else {
+					Minz_Log::warning('Error during OPML import');
 				}
 			}
 		}
@@ -92,6 +94,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				$ok = false;
 				if (FreshRSS_Context::$isCli) {
 					fwrite(STDERR, 'FreshRSS error during JSON stars import' . "\n");
+				} else {
+					Minz_Log::warning('Error during JSON stars import');
 				}
 			}
 		}
@@ -100,6 +104,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				$ok = false;
 				if (FreshRSS_Context::$isCli) {
 					fwrite(STDERR, 'FreshRSS error during JSON feeds import' . "\n");
+				} else {
+					Minz_Log::warning('Error during JSON feeds import');
 				}
 			}
 		}
@@ -214,13 +220,11 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		foreach ($opml_elements as $elt) {
 			if (isset($elt['xmlUrl'])) {
 				// If xmlUrl exists, it means it is a feed
-				if (!FreshRSS_Context::$isCli) {
-					if ($nb_feeds >= $limits['max_feeds']) {
-						Minz_Log::warning(_t('feedback.sub.feed.over_max',
-										  $limits['max_feeds']));
-						$ok = false;
-						continue;
-					}
+				if (FreshRSS_Context::$isCli && $nb_feeds >= $limits['max_feeds']) {
+					Minz_Log::warning(_t('feedback.sub.feed.over_max',
+									  $limits['max_feeds']));
+					$ok = false;
+					continue;
 				}
 
 				if ($this->addFeedOpml($elt, $parent_cat)) {
@@ -231,11 +235,9 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			} else {
 				// No xmlUrl? It should be a category!
 				$limit_reached = ($nb_cats >= $limits['max_categories']);
-				if (!FreshRSS_Context::$isCli) {
-					if ($limit_reached) {
-						Minz_Log::warning(_t('feedback.sub.category.over_max',
-										  $limits['max_categories']));
-					}
+				if (!FreshRSS_Context::$isCli && $limit_reached) {
+					Minz_Log::warning(_t('feedback.sub.category.over_max',
+									  $limits['max_categories']));
 					$ok = false;
 					continue;
 				}
-- 
cgit v1.2.3


From 2cbf307963c72c4f5cf18732bb581a88a46d668b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 25 Oct 2016 00:32:12 +0200
Subject: Fix install bug 2

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

diff --git a/app/install.php b/app/install.php
index dbc2a8908..fcc901713 100644
--- a/app/install.php
+++ b/app/install.php
@@ -341,7 +341,7 @@ function checkDbUser(&$dbOptions) {
 	$str = $dbOptions['dsn'];
 	$driver_options = $dbOptions['options'];
 	try {
-		$c = new PDO($str, $dbOptions['bd_user'], $dbOptions['bd_password'], $driver_options);
+		$c = new PDO($str, $dbOptions['user'], $dbOptions['password'], $driver_options);
 
 		if (defined('SQL_CREATE_TABLES')) {
 			$sql = sprintf(SQL_CREATE_TABLES, $dbOptions['prefix_user'], _t('gen.short.default_category'));
-- 
cgit v1.2.3


From 24a0fabfc89f11f3b1a9e48a0231a9fabd9ee72f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 25 Oct 2016 21:38:41 +0200
Subject: Readme git checkout dev

https://github.com/FreshRSS/FreshRSS/issues/1328#issuecomment-256134406
---
 README.fr.md | 14 +++++++-------
 README.md    | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 1d6a4cce2..721bb3a5f 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -79,11 +79,13 @@ sudo service apache2 restart
 cd /usr/share/
 sudo apt-get install git
 sudo git clone https://github.com/FreshRSS/FreshRSS.git
-# Mettre les droits d’accès pour le serveur Web
 cd FreshRSS
-sudo chown -R :www-data .
-sudo chmod -R g+r .
-sudo chmod -R g+w ./data/
+
+# Si vous souhaitez utiliser la branche développement de FreshRSS
+sudo git checkout -b dev origin/dev
+
+# Mettre les droits d’accès pour le serveur Web
+sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 # Publier FreshRSS dans votre répertoire HTML public
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Naviguez vers http://example.net/FreshRSS pour terminer l’installation.
@@ -94,9 +96,7 @@ sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 cd /usr/share/FreshRSS
 sudo git reset --hard
 sudo git pull
-sudo chown -R :www-data .
-sudo chmod -R g+r .
-sudo chmod -R g+w ./data/
+sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 ```
 
 ## Contrôle d’accès
diff --git a/README.md b/README.md
index f8bf5da1f..c6360c470 100644
--- a/README.md
+++ b/README.md
@@ -79,11 +79,13 @@ sudo service apache2 restart
 cd /usr/share/
 sudo apt-get install git
 sudo git clone https://github.com/FreshRSS/FreshRSS.git
-# Set the rights so that your Web server can access the files
 cd FreshRSS
-sudo chown -R :www-data .
-sudo chmod -R g+r .
-sudo chmod -R g+w ./data/
+
+# If you want to use the development version of FreshRSS
+sudo git checkout -b dev origin/dev
+
+# Set the rights so that your Web server can access the files
+sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 # Publish FreshRSS in your public HTML directory
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Navigate to http://example.net/FreshRSS to complete the installation.
@@ -94,9 +96,7 @@ sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 cd /usr/share/FreshRSS
 sudo git reset --hard
 sudo git pull
-sudo chown -R :www-data .
-sudo chmod -R g+r .
-sudo chmod -R g+w ./data/
+sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 ```
 
 ## Access control
-- 
cgit v1.2.3


From 4f785865baa193fd7c9e9581232ee00ec214f056 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 25 Oct 2016 21:45:13 +0200
Subject: Readme import-for-user

https://github.com/FreshRSS/FreshRSS/pull/1338
https://github.com/FreshRSS/FreshRSS/issues/1095
---
 cli/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cli/README.md b/cli/README.md
index 7202d5809..3f6cbfe1f 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -46,6 +46,7 @@ cd /usr/share/FreshRSS
 ./cli/actualize-user.php --user username
 
 ./cli/import-for-user.php --user username --filename /path/to/file.ext
+# The extension of the file { .json, .opml, .xml, .zip } is used to detect the type of import
 
 ./cli/export-opml-for-user.php --user username > /path/to/file.opml.xml
 
-- 
cgit v1.2.3


From b487eba5997e40427fecb1f7982918be13a7fc2b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 25 Oct 2016 22:09:19 +0200
Subject: Readme slight update

---
 README.fr.md | 10 ++++------
 README.md    | 12 +++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 721bb3a5f..cd1fef6b4 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -7,6 +7,7 @@ Il se veut léger et facile à prendre en main tout en étant un outil puissant
 
 Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture anonyme.
 Il supporte [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) pour des notifications instantanées depuis les sites compatibles.
+Il y a une API pour les clients (mobiles), ainsi qu’une [interface en ligne de commande](./cli/README.md).
 
 * Site officiel : http://freshrss.org
 * Démo : http://demo.freshrss.org/
@@ -17,11 +18,9 @@ Il supporte [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) pour des not
 # Téléchargement
 Voir la [liste des versions](../../releases).
 
-## Note sur les branches
-**Ce logiciel est en développement permanent !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
-
+## À propos des branches
 * Utilisez [la branche master](https://github.com/FreshRSS/FreshRSS/tree/master/) si vous visez la stabilité.
-* Pour les développeurs et ceux qui veulent aider à tester les toutes dernières fonctionnalités, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
+* Pour ceux qui veulent bien aider à tester ou déveloper les dernières fonctionnalités, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
 
 # Avertissements
 Cette application a été développée pour s’adapter principalement à des besoins personnels, et aucune garantie n'est fournie.
@@ -88,13 +87,12 @@ sudo git checkout -b dev origin/dev
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 # Publier FreshRSS dans votre répertoire HTML public
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
-# Naviguez vers http://example.net/FreshRSS pour terminer l’installation.
+# Naviguez vers http://example.net/FreshRSS pour terminer l’installation
 # (Si vous le faite depuis localhost, vous pourrez avoir à ajuster le réglage de votre adresse publique)
 # ou utilisez l’interface en ligne de commande
 
 # Mettre à jour FreshRSS vers une nouvelle version
 cd /usr/share/FreshRSS
-sudo git reset --hard
 sudo git pull
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 ```
diff --git a/README.md b/README.md
index c6360c470..4ce6a5566 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ It is at the same time lightweight, easy to work with, powerful and customizable
 
 It is a multi-user application with an anonymous reading mode.
 It supports [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) for instant notifications from compatible Web sites.
+There is an API for (mobile) clients, and a [Command-Line Interface](./cli/README.md).
 
 * Official website: http://freshrss.org
 * Demo: http://demo.freshrss.org/
@@ -17,15 +18,13 @@ It supports [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) for instant
 # Releases
 See the [list of releases](../../releases).
 
-## Note on branches
-**This application is under continuous development!** Please use the branch that suits your needs:
-
+## About branches
 * Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version.
-* For developers and tech savvy persons willing to help testing the latest features, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
+* For those willing to help testing or developing the latest features, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
 
 # Disclaimer
 This application was developed to fulfil personal needs primarily, and comes with absolutely no warranty.
-Feature requests, bug reports, and other contributions are welcome. The best way is to [open issues on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
+Feature requests, bug reports, and other contributions are welcome. The best way is to [open an issue on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 We are a friendly community.
 
 # Requirements
@@ -88,13 +87,12 @@ sudo git checkout -b dev origin/dev
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 # Publish FreshRSS in your public HTML directory
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
-# Navigate to http://example.net/FreshRSS to complete the installation.
+# Navigate to http://example.net/FreshRSS to complete the installation
 # (If you do it from localhost, you may have to adjust the setting of your public address later)
 # or use the Command-Line Interface
 
 # Update to a newer version of FreshRSS
 cd /usr/share/FreshRSS
-sudo git reset --hard
 sudo git pull
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
 ```
-- 
cgit v1.2.3


From a7301a43faeb391138478cb462493c3e025296ea Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 25 Oct 2016 22:35:45 +0200
Subject: A bit more readme

---
 README.fr.md       |  2 +-
 README.md          |  2 +-
 cli/README.md      | 11 +++++++----
 cli/do-install.php |  3 +--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index cd1fef6b4..8efa983e3 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -32,7 +32,7 @@ Nous sommes une communauté amicale.
 	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.3.3+ (PHP 5.4+ recommandé, et PHP 5.5+ pour les performances, et PHP 7+ pour d’encore meilleures performances)
-	* Requis : [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite) ou [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
+	* Requis : [cURL](http://php.net/curl), [DOM](http://php.net/dom), [XML](http://php.net/xml), et [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite) ou [PDO_PGSQL](http://php.net/pdo-pgsql)
 	* Recommandés : [JSON](http://php.net/json), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](http://php.net/mbstring) et/ou [iconv](http://php.net/iconv) (pour conversion d’encodages), [ZIP](http://php.net/zip) (pour import/export), [zlib](http://php.net/zlib) (pour les flux compressés)
 * MySQL 5.5.3+ (recommandé), ou SQLite 3.7.4+, ou PostgreSQL (experimental)
 * Un navigateur Web récent tel Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
diff --git a/README.md b/README.md
index 4ce6a5566..ecdd19376 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ We are a friendly community.
 	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
 * PHP 5.3.3+ (PHP 5.4+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance)
-	* Required extensions: [DOM](http://php.net/dom), [XML](http://php.net/xml), [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite) or [PDO_PGSQL](http://php.net/pdo-pgsql), [cURL](http://php.net/curl)
+	* Required extensions: [cURL](http://php.net/curl), [DOM](http://php.net/dom), [XML](http://php.net/xml), and [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite) or [PDO_PGSQL](http://php.net/pdo-pgsql)
 	* Recommended extensions: [JSON](http://php.net/json), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names), [mbstring](http://php.net/mbstring) and/or [iconv](http://php.net/iconv) (for charset conversion), [ZIP](http://php.net/zip) (for import/export), [zlib](http://php.net/zlib) (for compressed feeds)
 * MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL (experimental)
 * A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari.
diff --git a/cli/README.md b/cli/README.md
index 3f6cbfe1f..444606b50 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -32,11 +32,15 @@ Options in parenthesis are optional.
 ```sh
 cd /usr/share/FreshRSS
 
-./cli/do-install.php --default_user admin --auth_type form  ( --environment production --base_url https://rss.example.net/ --language en --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
-# The default database is SQLite
-# Does not create the default user. Do that with ./cli/create-user.php
+./cli/do-install.php --default_user admin --auth_type form  ( --environment production --base_url https://rss.example.net/ --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
+# --auth_type can be: 'form' (recommended), 'http_auth' (using the Web server access control), 'none' (dangerous)
+# --db-type can be: 'sqlite' (default), 'mysql' (MySQL or MariaDB), 'pgsql' (PostgreSQL)
+# --environment can be: 'production' (default), 'development' (for additional log messages)
+# --db-prefix is an optional prefix in front of the names of the tables
+# This command does not create the default user. Do that with ./cli/create-user.php
 
 ./cli/create-user.php --user username ( --password 'password' --api-password 'api_password' --language en --email user@example.net --token 'longRandomString' --no-default-feeds )
+# --language can be: 'en' (default), 'fr', or one of the [supported languages](../app/i18n/)
 
 ./cli/delete-user.php --user username
 
@@ -51,5 +55,4 @@ cd /usr/share/FreshRSS
 ./cli/export-opml-for-user.php --user username > /path/to/file.opml.xml
 
 ./cli/export-zip-for-user.php --user username ( --max-feed-entries 100 ) > /path/to/file.zip
-
 ```
diff --git a/cli/do-install.php b/cli/do-install.php
index 5eeedc626..667191680 100755
--- a/cli/do-install.php
+++ b/cli/do-install.php
@@ -6,7 +6,6 @@ require(LIB_PATH . '/lib_install.php');
 $params = array(
 		'environment:',
 		'base_url:',
-		'language:',
 		'title:',
 		'default_user:',
 		'allow_anonymous',
@@ -30,7 +29,7 @@ $options = getopt('', array_merge($params, $dBparams));
 if (empty($options['default_user']) || empty($options['auth_type'])) {
 	fail('Usage: ' . basename(__FILE__) . " --default_user admin --auth_type form" .
 		" ( --environment production --base_url https://rss.example.net/" .
-		" --language en --title FreshRSS --allow_anonymous --api_enabled" .
+		" --title FreshRSS --allow_anonymous --api_enabled" .
 		" --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123" .
 		" --db-base freshrss --db-prefix freshrss )");
 }
-- 
cgit v1.2.3


From 00f446d1557165cba90d0d3ec17404d3fdce84cd Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 29 Oct 2016 13:11:37 +0200
Subject: Disable "mark all as read" before confirmation script is loaded

https://github.com/FreshRSS/FreshRSS/issues/1342
---
 CHANGELOG.md                       | 1 +
 app/layout/aside_feed.phtml        | 2 +-
 app/layout/nav_menu.phtml          | 2 +-
 app/views/helpers/pagination.phtml | 2 +-
 p/scripts/main.js                  | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acec03f39..6873530f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@
 	* Fix some messages during installation [#1339](https://github.com/FreshRSS/FreshRSS/pull/1339)
 * UI
 	* Fix CSS line-height bug with `<sup>` in dates (English, Russian, Turkish) [#1340](https://github.com/FreshRSS/FreshRSS/pull/1340)
+	* Disable *Mark all as read* before confirmation script is loaded [#1342](https://github.com/FreshRSS/FreshRSS/issues/1342)
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * SimplePie
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 94c281b7f..3e1ee44dd 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -85,7 +85,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::$user_conf->reading_confirm ? 'confirm' : ''; ?>
+			<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
 			<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/nav_menu.phtml b/app/layout/nav_menu.phtml
index c02232242..f6d824d55 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -83,7 +83,7 @@
 
 	<div class="stick" id="nav_menu_read_all">
 		<form id="mark-read-menu" method="post">
-		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
+		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
 		        formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index eb3114fcd..893451af9 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -27,7 +27,7 @@
 		</a>
 	<?php } elseif ($url_mark_read) { ?>
 		<button id="bigMarkAsRead"
-		        class="as-link <?php echo FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>"
+		        class="as-link <?php echo FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>"
 		        form="mark-read-pagination"
 		        formaction="<?php echo Minz_Url::display($url_mark_read); ?>"
 		        type="submit">
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 51323a969..078bec682 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1126,6 +1126,7 @@ function init_confirm_action() {
 
 		return confirm(str_confirmation);
 	});
+	$('button.confirm').removeAttr('disabled');
 }
 
 function init_print_action() {
-- 
cgit v1.2.3


From 86f86d3825ffff5fc1d466d4524b90ee983511ee Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 29 Oct 2016 14:36:01 +0200
Subject: Minor readme change

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6873530f4..7e89daf76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
 
 ## 2016-10-XX FreshRSS 1.6.0-dev
 
-* API
+* CLI
 	* New Command-Line Interface (CLI) [#1095](https://github.com/FreshRSS/FreshRSS/issues/1095)
 		* Install, add/delete users, actualize, import/export. See [CLI documentation](./cli/README.md).
+* API
 	* Support for editing feeds and categories from client applications [#1254](https://github.com/FreshRSS/FreshRSS/issues/1254)
 * Compatibility:
 	* Support for PostgreSQL [#416](https://github.com/FreshRSS/FreshRSS/issues/416)
-- 
cgit v1.2.3


From 29e1f048159b7a580bdf1bab184e928f11d104b4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 30 Oct 2016 20:13:37 +0100
Subject: Prepare master 1.6.0 release

https://github.com/FreshRSS/FreshRSS/issues/1328
---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e89daf76..461949128 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-10-XX FreshRSS 1.6.0-dev
+## 2016-10-30 FreshRSS 1.6.0
 
 * CLI
 	* New Command-Line Interface (CLI) [#1095](https://github.com/FreshRSS/FreshRSS/issues/1095)
diff --git a/constants.php b/constants.php
index 2a8486ad1..08268fdc3 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.6.0-dev');
+define('FRESHRSS_VERSION', '1.6.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 8a410969ddb45ef28589957a0b334e76abf3060c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 2 Nov 2016 21:29:21 +0100
Subject: Use bindValue instead of bindParam

https://github.com/FreshRSS/FreshRSS/issues/1349
We should later replace all bindParam by bindValue
---
 CHANGELOG.md            | 6 ++++++
 app/Models/EntryDAO.php | 2 +-
 constants.php           | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 461949128..4be6d74bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2016-11-02 FreshRSS 1.6.1
+
+* Bug fixing
+	* Fix regression introduced in 1.6.0 when refreshing articles with *Mark updated articles as unread* [#1349](https://github.com/FreshRSS/FreshRSS/issues/1349)
+
+
 ## 2016-10-30 FreshRSS 1.6.0
 
 * CLI
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 4c6a9ea20..58f2c1a79 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -198,7 +198,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$valuesTmp['lastSeen'] = time();
 		$this->updateEntryPrepared->bindParam(':last_seen', $valuesTmp['lastSeen'], PDO::PARAM_INT);
 		if ($valuesTmp['is_read'] !== null) {
-			$this->updateEntryPrepared->bindParam(':is_read', $valuesTmp['is_read'] ? 1 : 0, PDO::PARAM_INT);
+			$this->updateEntryPrepared->bindValue(':is_read', $valuesTmp['is_read'] ? 1 : 0, PDO::PARAM_INT);
 		}
 		$this->updateEntryPrepared->bindParam(':id_feed', $valuesTmp['id_feed'], PDO::PARAM_INT);
 		$valuesTmp['tags'] = substr($valuesTmp['tags'], 0, 1023);
diff --git a/constants.php b/constants.php
index 08268fdc3..e5ae3ff00 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.6.0');
+define('FRESHRSS_VERSION', '1.6.1');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 6fe45f1541e154e8dc02346b3ea85a44d9a50ebe Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 3 Nov 2016 22:43:46 +0100
Subject: Start 1.7.0-dev

---
 CHANGELOG.md  | 4 ++++
 constants.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4be6d74bd..77ec29aed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2016-xx-xx FreshRSS 1.7.0-dev
+
+
+
 ## 2016-11-02 FreshRSS 1.6.1
 
 * Bug fixing
diff --git a/constants.php b/constants.php
index e5ae3ff00..87cfb030b 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.6.1');
+define('FRESHRSS_VERSION', '1.7.0-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 0fd107638d64416cb613c61133c3bb8b8a32515d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 4 Nov 2016 18:05:27 +0100
Subject: Document access-rights for Web updates

https://github.com/FreshRSS/FreshRSS/issues/1355
---
 README.fr.md | 5 ++++-
 README.md    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.fr.md b/README.fr.md
index 8efa983e3..2587c2d8f 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -85,13 +85,16 @@ sudo git checkout -b dev origin/dev
 
 # Mettre les droits d’accès pour le serveur Web
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
+# Si vous souhaitez permettre les mises à jour par l'interface Web (inutile pour les mises à jour par git)
+sudo chmod -R g+w .
+
 # Publier FreshRSS dans votre répertoire HTML public
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Naviguez vers http://example.net/FreshRSS pour terminer l’installation
 # (Si vous le faite depuis localhost, vous pourrez avoir à ajuster le réglage de votre adresse publique)
 # ou utilisez l’interface en ligne de commande
 
-# Mettre à jour FreshRSS vers une nouvelle version
+# Mettre à jour FreshRSS vers une nouvelle version par git
 cd /usr/share/FreshRSS
 sudo git pull
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
diff --git a/README.md b/README.md
index ecdd19376..cfb7b6769 100644
--- a/README.md
+++ b/README.md
@@ -85,13 +85,16 @@ sudo git checkout -b dev origin/dev
 
 # Set the rights so that your Web server can access the files
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
+# If you would like to allow Web updates (not needed for updates with git)
+sudo chmod -R g+w .
+
 # Publish FreshRSS in your public HTML directory
 sudo ln -s /usr/share/FreshRSS/p /var/www/html/FreshRSS
 # Navigate to http://example.net/FreshRSS to complete the installation
 # (If you do it from localhost, you may have to adjust the setting of your public address later)
 # or use the Command-Line Interface
 
-# Update to a newer version of FreshRSS
+# Update to a newer version of FreshRSS with git
 cd /usr/share/FreshRSS
 sudo git pull
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
-- 
cgit v1.2.3


From 21e63595083d556bd4a6ff56c4ccaab5cd318dd4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 5 Nov 2016 15:08:10 +0100
Subject: Add compatibility with git in Web update

https://github.com/FreshRSS/FreshRSS/issues/907
https://github.com/FreshRSS/FreshRSS/issues/1355
---
 CHANGELOG.md                         |   3 +
 README.fr.md                         |   4 +-
 README.md                            |   2 +-
 app/Controllers/updateController.php | 159 ++++++++++++++++++++++++-----------
 4 files changed, 118 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77ec29aed..140c8cfaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 2016-xx-xx FreshRSS 1.7.0-dev
 
+* Features
+	* Add git compatibility in Web update system [#1357](https://github.com/FreshRSS/FreshRSS/issues/1357)
+		* Requires that the initial installation is done with git
 
 
 ## 2016-11-02 FreshRSS 1.6.1
diff --git a/README.fr.md b/README.fr.md
index 2587c2d8f..afa8fa1ce 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -23,7 +23,7 @@ Voir la [liste des versions](../../releases).
 * Pour ceux qui veulent bien aider à tester ou déveloper les dernières fonctionnalités, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
 
 # Avertissements
-Cette application a été développée pour s’adapter principalement à des besoins personnels, et aucune garantie n'est fournie.
+Cette application a été développée pour s’adapter principalement à des besoins personnels, et aucune garantie n’est fournie.
 Les demandes de fonctionnalités, rapports de bugs, et autres contributions sont les bienvenues. Privilégiez pour cela des [demandes sur GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 Nous sommes une communauté amicale.
 
@@ -85,7 +85,7 @@ sudo git checkout -b dev origin/dev
 
 # Mettre les droits d’accès pour le serveur Web
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
-# Si vous souhaitez permettre les mises à jour par l'interface Web (inutile pour les mises à jour par git)
+# Si vous souhaitez permettre les mises à jour par l’interface Web
 sudo chmod -R g+w .
 
 # Publier FreshRSS dans votre répertoire HTML public
diff --git a/README.md b/README.md
index cfb7b6769..ebf1e3c5f 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ sudo git checkout -b dev origin/dev
 
 # Set the rights so that your Web server can access the files
 sudo chown -R :www-data . && sudo chmod -R g+r . && sudo chmod -R g+w ./data/
-# If you would like to allow Web updates (not needed for updates with git)
+# If you would like to allow updates from the Web interface
 sudo chmod -R g+w .
 
 # Publish FreshRSS in your public HTML directory
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 64c984b04..8f939dbdb 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -2,6 +2,45 @@
 
 class FreshRSS_update_Controller extends Minz_ActionController {
 
+	public static function isGit() {
+		return is_dir(FRESHRSS_PATH . '/.git/');
+	}
+
+	public static function hasGitUpdate() {
+		$cwd = getcwd();
+		chdir(FRESHRSS_PATH);
+		$output = array();
+		try {
+			exec('git fetch', $output, $return);
+			if ($return == 0) {
+				exec('git status -sb --porcelain remote', $output, $return);
+			} else {
+				$line = is_array($output) ? implode('; ', $output) : '' . $output;
+				Minz_Log::warning('git fetch warning:' . $line);
+			}
+		} catch (Exception $e) {
+			Minz_Log::warning('git fetch error:' . $e->getMessage());
+		}
+		chdir($cwd);
+		$line = is_array($output) ? implode('; ', $output) : '' . $output;
+		return strpos($line, '[behind') !== false;
+	}
+
+	public static function gitPull() {
+		$cwd = getcwd();
+		chdir(FRESHRSS_PATH);
+		$output = array();
+		$return = 1;
+		try {
+			exec('git pull --ff-only', $output, $return);
+		} catch (Exception $e) {
+			Minz_Log::warning('git pull error:' . $e->getMessage());
+		}
+		chdir($cwd);
+		$line = is_array($output) ? implode('; ', $output) : '' . $output;
+		return $return == 0 ? true : 'Git error: ' . $line;
+	}
+
 	public function firstAction() {
 		if (!FreshRSS_Auth::hasAccess('admin')) {
 			Minz_Error::error(403);
@@ -20,7 +59,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	public function indexAction() {
 		Minz_View::prependTitle(_t('admin.update.title') . ' · ');
 
-		if (file_exists(UPDATE_FILENAME) && !is_writable(FRESHRSS_PATH)) {
+		if (!is_writable(FRESHRSS_PATH)) {
 			$this->view->message = array(
 				'status' => 'bad',
 				'title' => _t('gen.short.damn'),
@@ -53,49 +92,65 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			return;
 		}
 
-		$auto_update_url = FreshRSS_Context::$system_conf->auto_update_url . '?v=' . FRESHRSS_VERSION;
-		$c = curl_init($auto_update_url);
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($c, CURLOPT_SSL_VERIFYPEER, true);
-		curl_setopt($c, CURLOPT_SSL_VERIFYHOST, 2);
-		$result = curl_exec($c);
-		$c_status = curl_getinfo($c, CURLINFO_HTTP_CODE);
-		$c_error = curl_error($c);
-		curl_close($c);
-
-		if ($c_status !== 200) {
-			Minz_Log::warning(
-				'Error during update (HTTP code ' . $c_status . '): ' . $c_error
-			);
+		$script = '';
+		$version = '';
 
-			$this->view->message = array(
-				'status' => 'bad',
-				'title' => _t('gen.short.damn'),
-				'body' => _t('feedback.update.server_not_found', $auto_update_url)
-			);
-			return;
-		}
-
-		$res_array = explode("\n", $result, 2);
-		$status = $res_array[0];
-		if (strpos($status, 'UPDATE') !== 0) {
-			$this->view->message = array(
-				'status' => 'bad',
-				'title' => _t('gen.short.damn'),
-				'body' => _t('feedback.update.none')
-			);
+		if (self::isGit()) {
+			if (self::hasGitUpdate()) {
+				$version = 'git';
+			} else {
+				$this->view->message = array(
+					'status' => 'bad',
+					'title' => _t('gen.short.damn'),
+					'body' => _t('feedback.update.none')
+				);
+				@touch(join_path(DATA_PATH, 'last_update.txt'));
+				return;
+			}
+		} else {
+			$auto_update_url = FreshRSS_Context::$system_conf->auto_update_url . '?v=' . FRESHRSS_VERSION;
+			Minz_Log::debug('HTTP GET ' . $auto_update_url);
+			$c = curl_init($auto_update_url);
+			curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($c, CURLOPT_SSL_VERIFYPEER, true);
+			curl_setopt($c, CURLOPT_SSL_VERIFYHOST, 2);
+			$result = curl_exec($c);
+			$c_status = curl_getinfo($c, CURLINFO_HTTP_CODE);
+			$c_error = curl_error($c);
+			curl_close($c);
+
+			if ($c_status !== 200) {
+				Minz_Log::warning(
+					'Error during update (HTTP code ' . $c_status . '): ' . $c_error
+				);
+
+				$this->view->message = array(
+					'status' => 'bad',
+					'title' => _t('gen.short.damn'),
+					'body' => _t('feedback.update.server_not_found', $auto_update_url)
+				);
+				return;
+			}
 
-			@touch(join_path(DATA_PATH, 'last_update.txt'));
+			$res_array = explode("\n", $result, 2);
+			$status = $res_array[0];
+			if (strpos($status, 'UPDATE') !== 0) {
+				$this->view->message = array(
+					'status' => 'bad',
+					'title' => _t('gen.short.damn'),
+					'body' => _t('feedback.update.none')
+				);
+				@touch(join_path(DATA_PATH, 'last_update.txt'));
+				return;
+			}
 
-			return;
+			$script = $res_array[1];
+			$version = explode(' ', $status, 2);
+			$version = $version[1];
 		}
 
-		$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'), true);
 		} else {
 			$this->view->message = array(
@@ -111,10 +166,13 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			Minz_Request::forward(array('c' => 'update'), true);
 		}
 
-		require(UPDATE_FILENAME);
-
 		if (Minz_Request::param('post_conf', false)) {
-			$res = do_post_update();
+			if (self::isGit()) {
+				$res = !self::hasGitUpdate();
+			} else {
+				require(UPDATE_FILENAME);
+				$res = do_post_update();
+			}
 
 			Minz_ExtensionManager::callHook('post_update');
 
@@ -126,14 +184,21 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 				Minz_Request::bad(_t('feedback.update.error', $res),
 				                  array('c' => 'update', 'a' => 'index'));
 			}
-		}
-
-		if (Minz_Request::isPost()) {
-			save_info_update();
-		}
+		} else {
+			$res = false;
 
-		if (!need_info_update()) {
-			$res = apply_update();
+			if (self::isGit()) {
+				$res = self::gitPull();
+			} else {
+				if (Minz_Request::isPost()) {
+					save_info_update();
+				}
+				if (!need_info_update()) {
+					$res = apply_update();
+				} else {
+					return;
+				}
+			}
 
 			if ($res === true) {
 				Minz_Request::forward(array(
-- 
cgit v1.2.3


From aeda49a7d271c2196fcba0d3b2b15d31ad0b33b5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 5 Nov 2016 20:48:46 +0100
Subject: Add CLI for user information + Fix last user activity

https://github.com/FreshRSS/FreshRSS/issues/1345
---
 CHANGELOG.md                       |  4 ++++
 app/Controllers/feedController.php |  4 ++++
 app/Models/Auth.php                |  2 +-
 app/Models/EntryDAO.php            |  5 +++++
 app/Models/UserDAO.php             |  6 +++++-
 cli/README.md                      | 16 ++++++++++++++
 cli/user-info.php                  | 43 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 cli/user-info.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77ec29aed..92220f1f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 2016-xx-xx FreshRSS 1.7.0-dev
 
+* CLI
+	* New command `./cli/user-info.php` to get some user information [#1345](https://github.com/FreshRSS/FreshRSS/issues/1345)
+* Bug fixing
+	* Fix bug in estimating last user activity [#1358](https://github.com/FreshRSS/FreshRSS/issues/1358)
 
 
 ## 2016-11-02 FreshRSS 1.6.1
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c4115584a..f71f26a4e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -27,6 +27,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	}
 
 	public static function addFeed($url, $title = '', $cat_id = 0, $new_cat_name = '', $http_auth = '') {
+		FreshRSS_UserDAO::touch();
 		@set_time_limit(300);
 
 		$catDAO = new FreshRSS_CategoryDAO();
@@ -484,6 +485,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		if ($feed_id <= 0 || $feed_name == '') {
 			return false;
 		}
+		FreshRSS_UserDAO::touch();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		return $feedDAO->updateFeed($feed_id, array('name' => $feed_name));
 	}
@@ -492,6 +494,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		if ($feed_id <= 0 || ($cat_id <= 0 && $new_cat_name == '')) {
 			return false;
 		}
+		FreshRSS_UserDAO::touch();
 
 		$catDAO = new FreshRSS_CategoryDAO();
 		if ($cat_id > 0) {
@@ -540,6 +543,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	}
 
 	public static function deleteFeed($feed_id) {
+		FreshRSS_UserDAO::touch();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		if ($feedDAO->deleteFeed($feed_id)) {
 			// TODO: Delete old favicon
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index b93942e19..3313fdf3f 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -25,7 +25,7 @@ class FreshRSS_Auth {
 			self::giveAccess();
 		} elseif (self::accessControl()) {
 			self::giveAccess();
-			FreshRSS_UserDAO::touch($current_user);
+			FreshRSS_UserDAO::touch();
 		} else {
 			// Be sure all accesses are removed!
 			self::removeAccess();
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 58f2c1a79..d8a4a486d 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -241,6 +241,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		if (count($ids) < 1) {
 			return 0;
 		}
+		FreshRSS_UserDAO::touch();
 		$sql = 'UPDATE `' . $this->prefix . 'entry` '
 		     . 'SET is_favorite=? '
 		     . 'WHERE id IN (' . str_repeat('?,', count($ids) - 1). '?)';
@@ -315,6 +316,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 * @return integer affected rows
 	 */
 	public function markRead($ids, $is_read = true) {
+		FreshRSS_UserDAO::touch();
 		if (is_array($ids)) {	//Many IDs at once (used by API)
 			if (count($ids) < 6) {	//Speed heuristics
 				$affected = 0;
@@ -379,6 +381,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 * @return integer affected rows
 	 */
 	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0, $filter = null, $state = 0) {
+		FreshRSS_UserDAO::touch();
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadEntries(0) is deprecated!');
@@ -421,6 +424,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 * @return integer affected rows
 	 */
 	public function markReadCat($id, $idMax = 0, $filter = null, $state = 0) {
+		FreshRSS_UserDAO::touch();
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadCat(0) is deprecated!');
@@ -458,6 +462,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	 * @return integer affected rows
 	 */
 	public function markReadFeed($id_feed, $idMax = 0, $filter = null, $state = 0) {
+		FreshRSS_UserDAO::touch();
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
 			Minz_Log::debug('Calling markReadFeed(0) is deprecated!');
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index a95ee6bc4..190954b1a 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -84,7 +84,11 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 		return is_dir(join_path(DATA_PATH , 'users', $username));
 	}
 
-	public static function touch($username) {
+	public static function touch($username = '') {
+		if (($username == '') || (!ctype_alnum($username))) {
+			$username = Minz_Session::param('currentUser', '_');
+		}
+		Minz_Log::debug('touch ' . $username);
 		return touch(join_path(DATA_PATH , 'users', $username, 'config.php'));
 	}
 
diff --git a/cli/README.md b/cli/README.md
index 444606b50..09dcbd27e 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -55,4 +55,20 @@ cd /usr/share/FreshRSS
 ./cli/export-opml-for-user.php --user username > /path/to/file.opml.xml
 
 ./cli/export-zip-for-user.php --user username ( --max-feed-entries 100 ) > /path/to/file.zip
+
+./cli/user-info.php -h --user username
+# -h is to use a human-readable format
+# --user can be a username, or '*' to loop on all users
+# Returns a * if the user is admin, the name of the user, the date/time of last action, and the size occupied
+```
+
+
+## Unix piping
+
+It is possible to invoke a command multiple times, e.g. with different usernames, thanks to the `xargs -n1` command.
+
+Example showing user information for all users which username starts with 'a':
+
+```sh
+./cli/list-users.php | grep '^a' | xargs -n1 ./cli/user-info.php -h --user
 ```
diff --git a/cli/user-info.php b/cli/user-info.php
new file mode 100644
index 000000000..5b26ecb15
--- /dev/null
+++ b/cli/user-info.php
@@ -0,0 +1,43 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+function formatSize($bytes)
+{//http://www.php.net/manual/function.disk-free-space.php#103382
+	$si_prefix = array('', 'k', 'M', 'G', 'T', 'P');
+	$i = min((int)log($bytes, 1024), count($si_prefix) - 1);
+	return ($i <= 0) ? $bytes.'B' :
+		round($bytes / pow(1024, $i), 2).' '.$si_prefix[$i].'B';
+}
+
+$options = getopt('h', array(
+		'user:',
+	));
+
+if (empty($options['user'])) {
+	fail('Usage: ' . basename(__FILE__) . " -h --user username");
+}
+
+$users = $options['user'] === '*' ? listUsers() : array($options['user']);
+
+foreach ($users as $username) {
+	$username = cliInitUser($username);
+
+	$entryDAO = FreshRSS_Factory::createEntryDao($username);
+
+	echo $username === FreshRSS_Context::$system_conf->default_user ? '*' : ' ', "\t";
+
+	if (isset($options['h'])) {	//Human format
+		echo
+			$username, "\t",
+			date('c', FreshRSS_UserDAO::mtime($username)), "\t",
+			formatSize($entryDAO->size()), "\t",
+			"\n";
+	} else {
+		echo
+			$username, "\t",
+			FreshRSS_UserDAO::mtime($username), "\t",
+			$entryDAO->size(), "\t",
+			"\n";
+	}
+}
-- 
cgit v1.2.3


From 6b85f8cf12f7d83bc7a6a599b48abe779dc263f0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 5 Nov 2016 21:32:08 +0100
Subject: CLI: IEC prefix (binary) for units

Updated according to https://wiki.ubuntu.com/UnitsPolicy
(I got confused due `ls`, which is still using 1024 but is listed as an
exception)
And use the formatting function already included in FreshRSS
---
 cli/user-info.php | 10 +---------
 lib/lib_rss.php   |  2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cli/user-info.php b/cli/user-info.php
index 5b26ecb15..dd38e6c7f 100644
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -2,14 +2,6 @@
 <?php
 require('_cli.php');
 
-function formatSize($bytes)
-{//http://www.php.net/manual/function.disk-free-space.php#103382
-	$si_prefix = array('', 'k', 'M', 'G', 'T', 'P');
-	$i = min((int)log($bytes, 1024), count($si_prefix) - 1);
-	return ($i <= 0) ? $bytes.'B' :
-		round($bytes / pow(1024, $i), 2).' '.$si_prefix[$i].'B';
-}
-
 $options = getopt('h', array(
 		'user:',
 	));
@@ -31,7 +23,7 @@ foreach ($users as $username) {
 		echo
 			$username, "\t",
 			date('c', FreshRSS_UserDAO::mtime($username)), "\t",
-			formatSize($entryDAO->size()), "\t",
+			format_bytes($entryDAO->size()), "\t",
 			"\n";
 	} else {
 		echo
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 143b55bee..fc68a96d3 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -127,6 +127,8 @@ function format_bytes($bytes, $precision = 2, $system = 'IEC') {
 	} elseif ($system === 'SI') {
 		$base = 1000;
 		$units = array('B', 'KB', 'MB', 'GB', 'TB');
+	} else {
+		return format_number($bytes, $precision);
 	}
 	$bytes = max(intval($bytes), 0);
 	$pow = $bytes === 0 ? 0 : floor(log($bytes) / log($base));
-- 
cgit v1.2.3


From 1f37424c09a2b0e6769f8250b65f3652f4e80f14 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 5 Nov 2016 21:37:57 +0100
Subject: +x execution rights user-info

---
 cli/user-info.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cli/user-info.php

diff --git a/cli/user-info.php b/cli/user-info.php
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From dde719060afeb23f9092702f538eda16079d8ce3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 5 Nov 2016 22:09:39 +0100
Subject: CLI another example: users ranked by activity date

https://github.com/FreshRSS/FreshRSS/issues/1345
https://github.com/FreshRSS/FreshRSS/issues/1358
---
 cli/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cli/README.md b/cli/README.md
index 09dcbd27e..35c0033a4 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -72,3 +72,9 @@ Example showing user information for all users which username starts with 'a':
 ```sh
 ./cli/list-users.php | grep '^a' | xargs -n1 ./cli/user-info.php -h --user
 ```
+
+Example showing all users ranked by date of last activity:
+
+```sh
+./cli/user-info.php -h --user '*' | sort -k2 -r
+```
-- 
cgit v1.2.3


From 5aeaed897119ff1af4555ec93662d68c2252ba71 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Nov 2016 11:24:51 +0100
Subject: PostgreSQL fix updateCachedValues

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

diff --git a/app/Models/Factory.php b/app/Models/Factory.php
index 764987c46..b12f0cef9 100644
--- a/app/Models/Factory.php
+++ b/app/Models/Factory.php
@@ -7,6 +7,8 @@ class FreshRSS_Factory {
 		switch ($conf->db['type']) {
 			case 'sqlite':
 				return new FreshRSS_FeedDAOSQLite($username);
+			case 'pgsql':
+				return new FreshRSS_FeedDAOSQLite($username);
 			default:
 				return new FreshRSS_FeedDAO($username);
 		}
-- 
cgit v1.2.3


From 34868cd2911523163c6732d58efa00d3fe322d4f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Nov 2016 11:33:45 +0100
Subject: Switch simplify syntax

---
 app/Models/Factory.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Models/Factory.php b/app/Models/Factory.php
index b12f0cef9..6502c38b7 100644
--- a/app/Models/Factory.php
+++ b/app/Models/Factory.php
@@ -6,7 +6,6 @@ class FreshRSS_Factory {
 		$conf = Minz_Configuration::get('system');
 		switch ($conf->db['type']) {
 			case 'sqlite':
-				return new FreshRSS_FeedDAOSQLite($username);
 			case 'pgsql':
 				return new FreshRSS_FeedDAOSQLite($username);
 			default:
-- 
cgit v1.2.3


From 92910c212b4d2796c222c7891ea319fde3149525 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Nov 2016 11:47:55 +0100
Subject: Changelog: PostgreSQL: fix bug when updating cached values

https://github.com/FreshRSS/FreshRSS/issues/1360
https://github.com/FreshRSS/FreshRSS/pull/1361
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92220f1f7..52d95d7bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 	* New command `./cli/user-info.php` to get some user information [#1345](https://github.com/FreshRSS/FreshRSS/issues/1345)
 * Bug fixing
 	* Fix bug in estimating last user activity [#1358](https://github.com/FreshRSS/FreshRSS/issues/1358)
+	* PostgreSQL: fix bug when updating cached values [#1360](https://github.com/FreshRSS/FreshRSS/issues/1360)
 
 
 ## 2016-11-02 FreshRSS 1.6.1
-- 
cgit v1.2.3


From 829d9997d31929b45384808f7cca343edb00b0d2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Nov 2016 14:04:06 +0100
Subject: Fix small bugs in install

Small fixes in install (e.g. better check that DB password works)
---
 CHANGELOG.md            |  1 +
 app/Models/UserDAO.php  |  1 -
 app/install.php         |  4 ++--
 cli/README.md           |  4 ++--
 cli/create-user.php     |  3 +++
 cli/do-install.php      | 12 ++++++------
 data/config.default.php |  2 +-
 lib/lib_install.php     |  6 +++++-
 8 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52d95d7bd..9410ac339 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Bug fixing
 	* Fix bug in estimating last user activity [#1358](https://github.com/FreshRSS/FreshRSS/issues/1358)
 	* PostgreSQL: fix bug when updating cached values [#1360](https://github.com/FreshRSS/FreshRSS/issues/1360)
+	* Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363)
 
 
 ## 2016-11-02 FreshRSS 1.6.1
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 190954b1a..32bc6de2f 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -88,7 +88,6 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 		if (($username == '') || (!ctype_alnum($username))) {
 			$username = Minz_Session::param('currentUser', '_');
 		}
-		Minz_Log::debug('touch ' . $username);
 		return touch(join_path(DATA_PATH , 'users', $username, 'config.php'));
 	}
 
diff --git a/app/install.php b/app/install.php
index fcc901713..5c8a6e0e8 100644
--- a/app/install.php
+++ b/app/install.php
@@ -230,7 +230,7 @@ function saveStep3() {
 			$_SESSION['bd_error'] = '';
 			header('Location: index.php?step=4');
 		} else {
-			$_SESSION['bd_error'] = empty($config_array['db']['bd_error']) ? 'Unknown error!' : $config_array['db']['bd_error'];
+			$_SESSION['bd_error'] = empty($config_array['db']['error']) ? 'Unknown error!' : $config_array['db']['error'];
 		}
 	}
 	invalidateHttpCache();
@@ -375,7 +375,7 @@ function checkDbUser(&$dbOptions) {
 		}
 	} catch (PDOException $e) {
 		$ok = false;
-		$dbOptions['bd_error'] = $e->getMessage();
+		$dbOptions['error'] = $e->getMessage();
 	}
 	return $ok;
 }
diff --git a/cli/README.md b/cli/README.md
index 35c0033a4..25b12234c 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -32,8 +32,8 @@ Options in parenthesis are optional.
 ```sh
 cd /usr/share/FreshRSS
 
-./cli/do-install.php --default_user admin --auth_type form  ( --environment production --base_url https://rss.example.net/ --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
-# --auth_type can be: 'form' (recommended), 'http_auth' (using the Web server access control), 'none' (dangerous)
+./cli/do-install.php --default_user admin ( --auth_type form --environment production --base_url https://rss.example.net/ --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
+# --auth_type can be: 'form' (default), 'http_auth' (using the Web server access control), 'none' (dangerous)
 # --db-type can be: 'sqlite' (default), 'mysql' (MySQL or MariaDB), 'pgsql' (PostgreSQL)
 # --environment can be: 'production' (default), 'development' (for additional log messages)
 # --db-prefix is an optional prefix in front of the names of the tables
diff --git a/cli/create-user.php b/cli/create-user.php
index 008b82ce3..444264cc7 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -43,6 +43,9 @@ if (!$ok) {
 
 invalidateHttpCache(FreshRSS_Context::$system_conf->default_user);
 
+echo '• Remember to refresh the feeds of the user: ', $username , "\n",
+	"\t", './cli/actualize-user.php --user ', $username, "\n";
+
 accessRights();
 
 done($ok);
diff --git a/cli/do-install.php b/cli/do-install.php
index 667191680..b687b86cb 100755
--- a/cli/do-install.php
+++ b/cli/do-install.php
@@ -26,9 +26,9 @@ $dBparams = array(
 
 $options = getopt('', array_merge($params, $dBparams));
 
-if (empty($options['default_user']) || empty($options['auth_type'])) {
-	fail('Usage: ' . basename(__FILE__) . " --default_user admin --auth_type form" .
-		" ( --environment production --base_url https://rss.example.net/" .
+if (empty($options['default_user'])) {
+	fail('Usage: ' . basename(__FILE__) . " --default_user admin ( --auth_type form" .
+		" --environment production --base_url https://rss.example.net/" .
 		" --title FreshRSS --allow_anonymous --api_enabled" .
 		" --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123" .
 		" --db-base freshrss --db-prefix freshrss )");
@@ -51,7 +51,7 @@ if (!ctype_alnum($options['default_user'])) {
 	fail('FreshRSS invalid default username (must be ASCII alphanumeric): ' . $options['default_user']);
 }
 
-if (!in_array($options['auth_type'], array('form', 'http_auth', 'none'))) {
+if (isset($options['auth_type']) && !in_array($options['auth_type'], array('form', 'http_auth', 'none'))) {
 	fail('FreshRSS invalid authentication method (auth_type must be one of { form, http_auth, none }: ' . $options['auth_type']);
 }
 
@@ -86,11 +86,11 @@ if (file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . va
 $config['db']['default_user'] = $config['default_user'];
 if (!checkDb($config['db'])) {
 	@unlink(join_path(DATA_PATH, 'config.php'));
-	fail('FreshRSS database error: ' . (empty($config['db']['bd_error']) ? 'Unknown error' : $config['db']['bd_error']));
+	fail('FreshRSS database error: ' . (empty($config['db']['error']) ? 'Unknown error' : $config['db']['error']));
 }
 
 echo '• Remember to create the default user: ', $config['default_user'] , "\n",
-	"\t", './cli/create-user.php --user ', $config['default_user'] , " --password 'password' --more-options\n";
+	"\t", './cli/create-user.php --user ', $config['default_user'], " --password 'password' --more-options\n";
 
 accessRights();
 
diff --git a/data/config.default.php b/data/config.default.php
index d3cd3bf22..8b07b85cd 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -46,7 +46,7 @@ return array(
 	#	`http_auth` is an access controled by the HTTP Web server (e.g. `/FreshRSS/p/i/.htaccess` for Apache)
 	#		if you use `http_auth`, remember to protect only `/FreshRSS/p/i/`,
 	#		and in particular not protect `/FreshRSS/p/api/` if you would like to use the API (different login system).
-	'auth_type' => 'none',
+	'auth_type' => 'form',
 
 	# Allow or not the use of the API, used for mobile apps.
 	#	End-point is http://example.net/FreshRSS/p/api/greader.php
diff --git a/lib/lib_install.php b/lib/lib_install.php
index 0e7b7f036..dd8090bcd 100644
--- a/lib/lib_install.php
+++ b/lib/lib_install.php
@@ -54,8 +54,8 @@ function generateSalt() {
 
 function checkDb(&$dbOptions) {
 	$dsn = '';
+	$driver_options = null;
 	try {
-		$driver_options = null;
 		switch ($dbOptions['type']) {
 		case 'mysql':
 			include_once(APP_PATH . '/SQL/install.sql.mysql.php');
@@ -99,8 +99,12 @@ function checkDb(&$dbOptions) {
 		default:
 			return false;
 		}
+
+		$c = new PDO($dsn, $dbOptions['user'], $dbOptions['password'], $driver_options);
+		$res = $c->query('SELECT 1');
 	} catch (PDOException $e) {
 		$dsn = '';
+		syslog(LOG_DEBUG, 'FreshRSS SQL warning: ' . $e->getMessage());
 		$dbOptions['error'] = $e->getMessage();
 	}
 	$dbOptions['dsn'] = $dsn;
-- 
cgit v1.2.3


From f3d5cbd7da78b9dff18104c539b140128ec98af2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Nov 2016 14:23:41 +0100
Subject: Underscore missing in documentation

https://github.com/FreshRSS/FreshRSS/pull/1363
---
 cli/README.md      | 2 +-
 cli/do-install.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/README.md b/cli/README.md
index 25b12234c..e4d3409a2 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -36,7 +36,7 @@ cd /usr/share/FreshRSS
 # --auth_type can be: 'form' (default), 'http_auth' (using the Web server access control), 'none' (dangerous)
 # --db-type can be: 'sqlite' (default), 'mysql' (MySQL or MariaDB), 'pgsql' (PostgreSQL)
 # --environment can be: 'production' (default), 'development' (for additional log messages)
-# --db-prefix is an optional prefix in front of the names of the tables
+# --db-prefix is an optional prefix in front of the names of the tables. We suggest using 'freshrss_'
 # This command does not create the default user. Do that with ./cli/create-user.php
 
 ./cli/create-user.php --user username ( --password 'password' --api-password 'api_password' --language en --email user@example.net --token 'longRandomString' --no-default-feeds )
diff --git a/cli/do-install.php b/cli/do-install.php
index b687b86cb..100d4947f 100755
--- a/cli/do-install.php
+++ b/cli/do-install.php
@@ -31,7 +31,7 @@ if (empty($options['default_user'])) {
 		" --environment production --base_url https://rss.example.net/" .
 		" --title FreshRSS --allow_anonymous --api_enabled" .
 		" --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123" .
-		" --db-base freshrss --db-prefix freshrss )");
+		" --db-base freshrss --db-prefix freshrss_ )");
 }
 
 fwrite(STDERR, 'FreshRSS install…' . "\n");
-- 
cgit v1.2.3


From cbe778f62c6d99026b7cd61b1ca28ed2ea88030e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 7 Nov 2016 18:26:28 +0100
Subject: Allow slash in database hostname

https://github.com/FreshRSS/FreshRSS/issues/1364
---
 app/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/install.php b/app/install.php
index 5c8a6e0e8..869bf076f 100644
--- a/app/install.php
+++ b/app/install.php
@@ -634,7 +634,7 @@ function printStep3() {
 		<div class="form-group">
 			<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}(:[0-9]{2,5})?" value="<?php echo isset($_SESSION['bd_host']) ? $_SESSION['bd_host'] : $system_default_config->db['host']; ?>" tabindex="2" />
+				<input type="text" id="host" name="host" pattern="[0-9A-Z/a-z_.-]{1,64}(:[0-9]{2,5})?" value="<?php echo isset($_SESSION['bd_host']) ? $_SESSION['bd_host'] : $system_default_config->db['host']; ?>" tabindex="2" />
 			</div>
 		</div>
 
-- 
cgit v1.2.3


From f59de4e2b679efb1ba4bbfd576a5ea07422cc169 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 15 Nov 2016 20:43:06 +0100
Subject: Stream JSON export

Avoid large in-memory copies
https://github.com/FreshRSS/FreshRSS/issues/1372
---
 app/Controllers/importExportController.php |  4 +-
 app/Models/EntryDAO.php                    | 42 ++++++++------
 app/views/helpers/export/articles.phtml    | 92 +++++++++++++++++-------------
 3 files changed, 78 insertions(+), 60 deletions(-)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 3ba91a243..d86587ea9 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -641,13 +641,13 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$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(
+			$this->view->entriesRaw = $this->entryDAO->listWhereRaw(
 				's', '', FreshRSS_Entry::STATE_ALL, 'ASC', $unread_fav['all']
 			);
 		} elseif ($type === 'feed' && $feed != null) {
 			$this->view->list_title = _t('sub.import_export.feed_list', $feed->name());
 			$this->view->type = 'feed/' . $feed->id();
-			$this->view->entries = $this->entryDAO->listWhere(
+			$this->view->entriesRaw = $this->entryDAO->listWhereRaw(
 				'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
 				$maxFeedEntries
 			);
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index d8a4a486d..397471baa 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -518,7 +518,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 		$stm->execute($values);
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$entries = self::daoToEntry($res);
+		$entries = self::daoToEntries($res);
 		return isset($entries[0]) ? $entries[0] : null;
 	}
 
@@ -533,7 +533,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 		$stm->execute($values);
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$entries = self::daoToEntry($res);
+		$entries = self::daoToEntries($res);
 		return isset($entries[0]) ? $entries[0] : null;
 	}
 
@@ -666,7 +666,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			. ($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) {
+	public function listWhereRaw($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 e0.id, e0.guid, e0.title, e0.author, '
@@ -680,8 +680,12 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 
 		$stm = $this->bd->prepare($sql);
 		$stm->execute($values);
+		return $stm;
+	}
 
-		return self::daoToEntry($stm->fetchAll(PDO::FETCH_ASSOC));
+	public function listWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {
+		$stm = $this->listWhereRaw($type, $id, $state, $order, $limit, $firstId, $filter, $date_min);
+		return self::daoToEntries($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) {	//For API
@@ -810,15 +814,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		return $res[0];
 	}
 
-	public static function daoToEntry($listDAO) {
-		$list = array();
-
-		if (!is_array($listDAO)) {
-			$listDAO = array($listDAO);
-		}
-
-		foreach ($listDAO as $key => $dao) {
-			$entry = new FreshRSS_Entry(
+	public static function daoToEntry($dao) {
+		$entry = new FreshRSS_Entry(
 				$dao['id_feed'],
 				$dao['guid'],
 				$dao['title'],
@@ -830,10 +827,21 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				$dao['is_favorite'],
 				$dao['tags']
 			);
-			if (isset($dao['id'])) {
-				$entry->_id($dao['id']);
-			}
-			$list[] = $entry;
+		if (isset($dao['id'])) {
+			$entry->_id($dao['id']);
+		}
+		return $entry;
+	}
+
+	private static function daoToEntries($listDAO) {
+		$list = array();
+
+		if (!is_array($listDAO)) {
+			$listDAO = array($listDAO);
+		}
+
+		foreach ($listDAO as $key => $dao) {
+			$list[] = self::daoToEntry($dao);
 		}
 
 		unset($listDAO);
diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml
index ffdca1daa..2ad4a3abf 100644
--- a/app/views/helpers/export/articles.phtml
+++ b/app/views/helpers/export/articles.phtml
@@ -1,47 +1,57 @@
 <?php
-    $username = Minz_Session::param('currentUser', '_');
+	$username = Minz_Session::param('currentUser', '_');
 
-    $articles = array(
-        'id' => 'user/' . str_replace('/', '', $username) . '/state/org.freshrss/' . $this->type,
-        'title' => $this->list_title,
-        'author' => $username,
-        'items' => array()
-    );
+	$options = 0;
+	if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+		$options = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+	}
 
-    foreach ($this->entries as $entry) {
-        if (!isset($this->feed)) {
-            $feed = FreshRSS_CategoryDAO::findFeed($this->categories, $entry->feed ());
-        } else {
-            $feed = $this->feed;
-        }
+	$articles = array(
+		'id' => 'user/' . str_replace('/', '', $username) . '/state/org.freshrss/' . $this->type,
+		'title' => $this->list_title,
+		'author' => $username,
+		'items' => array(),
+	);
 
-        $articles['items'][] = array(
-            'id' => $entry->guid(),
-            'categories' => array_values($entry->tags()),
-            'title' => $entry->title(),
-            'author' => $entry->author(),
-            'published' => $entry->date(true),
-            'updated' => $entry->date(true),
-            'alternate' => array(array(
-                'href' => $entry->link(),
-                'type' => 'text/html'
-            )),
-            'content' => array(
-                'content' => $entry->content()
-            ),
-            'origin' => array(
-                'streamId' => $feed->id(),
-                'title' => $feed->name(),
-                'htmlUrl' => $feed->website(),
-                'feedUrl' => $feed->url()
-            )
-        );
-    }
+	echo rtrim(json_encode($articles, $options), " ]}\n\r\t");
+	$first = true;
 
-    $options = 0;
-    if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-        $options = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
-    }
+	foreach ($this->entriesRaw as $entryRaw) {
+		$entry = FreshRSS_EntryDAO::daoToEntry($entryRaw);
+		if (!isset($this->feed)) {
+			$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $entry->feed ());
+		} else {
+			$feed = $this->feed;
+		}
 
-    echo json_encode($articles, $options);
-?>
+		$article = array(
+			'id' => $entry->guid(),
+			'categories' => array_values($entry->tags()),
+			'title' => $entry->title(),
+			'author' => $entry->author(),
+			'published' => $entry->date(true),
+			'updated' => $entry->date(true),
+			'alternate' => array(array(
+				'href' => $entry->link(),
+				'type' => 'text/html',
+			)),
+			'content' => array(
+				'content' => $entry->content(),
+			),
+			'origin' => array(
+				'streamId' => $feed->id(),
+				'title' => $feed->name(),
+				'htmlUrl' => $feed->website(),
+				'feedUrl' => $feed->url(),
+			)
+		);
+
+		if ($first) {
+			$first = false;
+		} else {
+			echo ",\n";
+		}
+		echo json_encode($article, $options);
+	}
+
+	echo "\n]}\n";
-- 
cgit v1.2.3


From 8d3d2a7d7fc7d623e998b6dd97b7f4419cf0d60c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 15 Nov 2016 20:54:56 +0100
Subject: Minor code formatting of export helper

---
 app/views/helpers/export/articles.phtml | 96 ++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml
index 2ad4a3abf..9acf3cc83 100644
--- a/app/views/helpers/export/articles.phtml
+++ b/app/views/helpers/export/articles.phtml
@@ -1,57 +1,57 @@
 <?php
-	$username = Minz_Session::param('currentUser', '_');
+$username = Minz_Session::param('currentUser', '_');
 
-	$options = 0;
-	if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-		$options = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
-	}
+$options = 0;
+if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+	$options = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+}
 
-	$articles = array(
-		'id' => 'user/' . str_replace('/', '', $username) . '/state/org.freshrss/' . $this->type,
-		'title' => $this->list_title,
-		'author' => $username,
-		'items' => array(),
-	);
+$articles = array(
+	'id' => 'user/' . str_replace('/', '', $username) . '/state/org.freshrss/' . $this->type,
+	'title' => $this->list_title,
+	'author' => $username,
+	'items' => array(),
+);
 
-	echo rtrim(json_encode($articles, $options), " ]}\n\r\t");
-	$first = true;
+echo rtrim(json_encode($articles, $options), " ]}\n\r\t"), "\n";
+$first = true;
 
-	foreach ($this->entriesRaw as $entryRaw) {
-		$entry = FreshRSS_EntryDAO::daoToEntry($entryRaw);
-		if (!isset($this->feed)) {
-			$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $entry->feed ());
-		} else {
-			$feed = $this->feed;
-		}
+foreach ($this->entriesRaw as $entryRaw) {
+	$entry = FreshRSS_EntryDAO::daoToEntry($entryRaw);
+	if (!isset($this->feed)) {
+		$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $entry->feed());
+	} else {
+		$feed = $this->feed;
+	}
 
-		$article = array(
-			'id' => $entry->guid(),
-			'categories' => array_values($entry->tags()),
-			'title' => $entry->title(),
-			'author' => $entry->author(),
-			'published' => $entry->date(true),
-			'updated' => $entry->date(true),
-			'alternate' => array(array(
-				'href' => $entry->link(),
-				'type' => 'text/html',
-			)),
-			'content' => array(
-				'content' => $entry->content(),
-			),
-			'origin' => array(
-				'streamId' => $feed->id(),
-				'title' => $feed->name(),
-				'htmlUrl' => $feed->website(),
-				'feedUrl' => $feed->url(),
-			)
-		);
+	$article = array(
+		'id' => $entry->guid(),
+		'categories' => array_values($entry->tags()),
+		'title' => $entry->title(),
+		'author' => $entry->author(),
+		'published' => $entry->date(true),
+		'updated' => $entry->date(true),
+		'alternate' => array(array(
+			'href' => $entry->link(),
+			'type' => 'text/html',
+		)),
+		'content' => array(
+			'content' => $entry->content(),
+		),
+		'origin' => array(
+			'streamId' => $feed->id(),
+			'title' => $feed->name(),
+			'htmlUrl' => $feed->website(),
+			'feedUrl' => $feed->url(),
+		)
+	);
 
-		if ($first) {
-			$first = false;
-		} else {
-			echo ",\n";
-		}
-		echo json_encode($article, $options);
+	if ($first) {
+		$first = false;
+	} else {
+		echo ",\n";
 	}
+	echo json_encode($article, $options);
+}
 
-	echo "\n]}\n";
+echo "\n]}\n";
-- 
cgit v1.2.3


From 568b737b6c62ace5aaa6b3f6c968e2595ea70f55 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 15 Nov 2016 21:38:18 +0100
Subject: Function to disable MySQL buffering for large exports

---
 app/Controllers/importExportController.php | 2 ++
 lib/Minz/ModelPdo.php                      | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index d86587ea9..6ae89defb 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -531,6 +531,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$this->entryDAO = FreshRSS_Factory::createEntryDao($username);
 		$this->feedDAO = FreshRSS_Factory::createFeedDao($username);
 
+		$this->entryDAO->disableBuffering();
+
 		if ($export_feeds === true) {
 			//All feeds
 			$export_feeds = $this->feedDAO->listFeedsIds();
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 6e8d60bc9..caab1d114 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -116,6 +116,12 @@ class Minz_ModelPdo {
 		self::$sharedBd = null;
 		self::$sharedPrefix = '';
 	}
+
+	public function disableBuffering() {
+		if ((self::$sharedDbType === 'mysql') && defined('PDO::MYSQL_ATTR_USE_BUFFERED_QUERY')) {
+			$this->bd->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false);
+		}
+	}
 }
 
 class MinzPDO extends PDO {
-- 
cgit v1.2.3


From 8e68ee54e03ab6618545f2315f76e0e421b3ee34 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 15 Nov 2016 22:15:54 +0100
Subject: init confirm after DOM load

https://github.com/FreshRSS/FreshRSS/issues/1348
---
 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 078bec682..14e0c5be5 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1354,7 +1354,6 @@ function init_beforeDOM() {
 		window.setTimeout(init_beforeDOM, 100);
 		return;
 	}
-	init_confirm_action();
 	if (['normal', 'reader', 'global'].indexOf(context.current_view) >= 0) {
 		inject_script('jquery.sticky-kit.min.js');
 		init_normal();
@@ -1372,6 +1371,7 @@ function init_afterDOM() {
 	init_notifications();
 	$stream = $('#stream');
 	if ($stream.length > 0) {
+		init_confirm_action();
 		init_load_more($stream);
 		init_posts();
 		init_nav_entries();
-- 
cgit v1.2.3


From 1d5006d83fc84a0c653d8e2db42a4cfbdebdc5bb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 16 Nov 2016 17:49:20 +0100
Subject: Error edge cases for JSON export

---
 app/views/helpers/export/articles.phtml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml
index 9acf3cc83..49c370023 100644
--- a/app/views/helpers/export/articles.phtml
+++ b/app/views/helpers/export/articles.phtml
@@ -17,9 +17,15 @@ echo rtrim(json_encode($articles, $options), " ]}\n\r\t"), "\n";
 $first = true;
 
 foreach ($this->entriesRaw as $entryRaw) {
+	if (empty($entryRaw)) {
+		continue;
+	}
 	$entry = FreshRSS_EntryDAO::daoToEntry($entryRaw);
 	if (!isset($this->feed)) {
 		$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $entry->feed());
+		if ($feed == null) {
+			$feed = $entry->feed(true);
+		}
 	} else {
 		$feed = $this->feed;
 	}
@@ -39,19 +45,22 @@ foreach ($this->entriesRaw as $entryRaw) {
 			'content' => $entry->content(),
 		),
 		'origin' => array(
-			'streamId' => $feed->id(),
-			'title' => $feed->name(),
-			'htmlUrl' => $feed->website(),
-			'feedUrl' => $feed->url(),
+			'streamId' => $feed == null ? '' : $feed->id(),
+			'title' => $feed == null ? '' : $feed->name(),
+			'htmlUrl' => $feed == null ? '' : $feed->website(),
+			'feedUrl' => $feed == null ? '' : $feed->url(),
 		)
 	);
 
-	if ($first) {
-		$first = false;
-	} else {
-		echo ",\n";
+	$line = json_encode($article, $options);
+	if ($line != '') {
+		if ($first) {
+			$first = false;
+		} else {
+			echo ",\n";
+		}
+		echo $line;
 	}
-	echo json_encode($article, $options);
 }
 
 echo "\n]}\n";
-- 
cgit v1.2.3


From c08984cbfa01bc6712fbceaef2148834ec639a38 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 16 Nov 2016 20:01:40 +0100
Subject: Changelog Fix bug in confirmation before marking as read

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dcb1bfec..874fbe7ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Bug fixing
 	* Fix bug in estimating last user activity [#1358](https://github.com/FreshRSS/FreshRSS/issues/1358)
 	* PostgreSQL: fix bug when updating cached values [#1360](https://github.com/FreshRSS/FreshRSS/issues/1360)
+	* Fix bug in confirmation before marking as read [#1348](https://github.com/FreshRSS/FreshRSS/issues/1348)
 	* Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363)
 
 
-- 
cgit v1.2.3


From 801e23044c223d56d63a62a0b351b11f6d71796c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 17 Nov 2016 21:34:31 +0100
Subject: Changelog More robust export function in the case of large datasets

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dcb1bfec..d24434169 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 	* Fix bug in estimating last user activity [#1358](https://github.com/FreshRSS/FreshRSS/issues/1358)
 	* PostgreSQL: fix bug when updating cached values [#1360](https://github.com/FreshRSS/FreshRSS/issues/1360)
 	* Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363)
+* Misc.
+	* More robust export function in the case of large datasets [#1372](https://github.com/FreshRSS/FreshRSS/issues/1372)
 
 
 ## 2016-11-02 FreshRSS 1.6.1
@@ -66,7 +68,7 @@
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * SimplePie
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
-* Mics.
+* Misc.
 	* Removed *resource-priorities* attributes (`defer`, `lazyload`), deprecated by W3C [#1222](https://github.com/FreshRSS/FreshRSS/pull/1222)
 
 
-- 
cgit v1.2.3


From b28b6a4bf273253d1bb57b99a80fa7ae77a48397 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 20 Nov 2016 16:52:07 +0100
Subject: extension_loaded fileinfo

https://github.com/FreshRSS/FreshRSS/issues/1375
---
 app/i18n/cz/admin.php   | 4 ++++
 app/i18n/cz/install.php | 4 ++++
 app/i18n/de/admin.php   | 4 ++++
 app/i18n/de/install.php | 4 ++++
 app/i18n/en/admin.php   | 4 ++++
 app/i18n/en/install.php | 4 ++++
 app/i18n/fr/admin.php   | 4 ++++
 app/i18n/fr/install.php | 4 ++++
 app/i18n/it/admin.php   | 4 ++++
 app/i18n/it/install.php | 4 ++++
 app/i18n/nl/admin.php   | 4 ++++
 app/i18n/nl/install.php | 4 ++++
 app/i18n/ru/admin.php   | 4 ++++
 app/i18n/ru/install.php | 4 ++++
 app/i18n/tr/admin.php   | 4 ++++
 app/i18n/tr/install.php | 4 ++++
 app/install.php         | 6 ++++++
 lib/lib_install.php     | 4 +++-
 lib/lib_rss.php         | 1 +
 19 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 84bc58a17..63cee3cca 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'Tabulka kanálů je nastavena špatně.',
 			'ok' => 'Tabulka kanálů je v pořádku.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Nemáte PHP fileinfo (balíček fileinfo).',
+			'ok' => 'Máte rozšíření fileinfo.',
+		),
 		'files' => 'Instalace souborů',
 		'json' => array(
 			'nok' => 'Nemáte JSON (balíček php5-json).',
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index c40ae46e2..ea4812ea5 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -56,6 +56,10 @@ return array(
 			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/favicons</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
 			'ok' => 'Oprávnění adresáře favicons jsou v pořádku.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Nemáte PHP fileinfo (balíček fileinfo).',
+			'ok' => 'Máte rozšíření fileinfo.',
+		),
 		'http_referer' => array(
 			'nok' => 'Zkontrolujte prosím že neměníte HTTP REFERER.',
 			'ok' => 'Váš HTTP REFERER je znám a odpovídá Vašemu serveru.',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index c12f32bc8..8fc43a7bb 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'Die Tabelle <em>feed</em> ist schlecht konfiguriert.',
 			'ok' => 'Die Tabelle <em>feed</em> ist korrekt konfiguriert.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Ihnen fehlt PHP fileinfo (Paket fileinfo).',
+			'ok' => 'Sie haben die fileinfo-Erweiterung.',
+		),
 		'files' => 'Datei-Installation',
 		'json' => array(
 			'nok' => 'Ihnen fehlt die JSON-Erweiterung (Paket php5-json).',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 178e8ea4c..b747d1551 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -56,6 +56,10 @@ return array(
 			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/favicons</em>. Der HTTP-Server muss Schreibrechte besitzen.',
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/favicons</em> sind in Ordnung.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Ihnen fehlt PHP fileinfo (Paket fileinfo).',
+			'ok' => 'Sie haben die fileinfo-Erweiterung.',
+		),
 		'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.',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index e5286d948..e94d9fa80 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'Feed table is bad configured.',
 			'ok' => 'Feed table is ok.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',
+			'ok' => 'You have the fileinfo library.',
+		),
 		'files' => 'File installation',
 		'json' => array(
 			'nok' => 'Cannot find JSON (php5-json package).',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 63d31fe53..40fff37dd 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -56,6 +56,10 @@ return 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.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',
+			'ok' => 'You have the fileinfo library.',
+		),
 		'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.',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index e9263a5e2..9a13ecc21 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'La table feed est mal configurée.',
 			'ok' => 'La table feed est bien configurée.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Impossible de trouver la librairie PHP fileinfo (paquet fileinfo).',
+			'ok' => 'Vous disposez de la librairie fileinfo.',
+		),
 		'files' => 'Installation des fichiers',
 		'json' => array(
 			'nok' => 'Vous ne disposez pas de JSON (paquet php5-json).',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index c50807107..09625de78 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -56,6 +56,10 @@ return 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.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Vous ne disposez pas de PHP fileinfo (paquet fileinfo).',
+			'ok' => 'Vous disposez de fileinfo.',
+		),
 		'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.',
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index c399bc8c8..ae46818ae 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'La tabella Feed ha una configurazione errata.',
 			'ok' => 'Tabella Feed OK.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Manca il supporto per PHP fileinfo (pacchetto fileinfo).',
+			'ok' => 'Estensione fileinfo presente.',
+		),
 		'files' => 'Installazione files',
 		'json' => array(
 			'nok' => 'Manca il supoorto a JSON (pacchetto php5-json).',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index 2fa298508..18f8cc337 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -56,6 +56,10 @@ return array(
 			'nok' => 'Verifica i permessi sulla cartella <em>./data/favicons</em>. Il server HTTP deve avere i permessi per scriverci dentro',
 			'ok' => 'I permessi sulla cartella favicons sono corretti.',
 		),
+		'fileinfo' => array(
+			'nok' => 'Manca il supporto per PHP fileinfo (pacchetto fileinfo).',
+			'ok' => 'Estensione fileinfo presente.',
+		),
 		'http_referer' => array(
 			'nok' => 'Per favore verifica che non stai alterando il tuo HTTP REFERER.',
 			'ok' => 'Il tuo HTTP REFERER riconosciuto corrisponde al tuo server.',
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index 59637bfef..607fb1892 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'Feed tabel is slecht geconfigureerd.',
 			'ok' => 'Feed tabel is ok.',
 		),
+		'fileinfo' => array(
+			'nok' => 'U mist de PHP fileinfo (fileinfo package).',
+			'ok' => 'U hebt de fileinfo uitbreiding.',
+		),
 		'files' => 'Bestanden installatie',
 		'json' => array(
 			'nok' => 'U mist JSON (php5-json package).',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index bd2ba0cce..79db9c794 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -56,6 +56,10 @@ return array(
 			'nok' => 'Controleer permissies van de <em>./data/favicons</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
 			'ok' => 'Permissies van de favicons map zijn goed.',
 		),
+		'fileinfo' => array(
+			'nok' => 'U mist PHP fileinfo (fileinfo package).',
+			'ok' => 'U hebt de fileinfo uitbreiding.',
+		),
 		'http_referer' => array(
 			'nok' => 'Controleer a.u.b. dat u niet uw HTTP REFERER wijzigd.',
 			'ok' => 'Uw HTTP REFERER is bekend en komt overeen met uw server.',
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index 355100689..f5da97371 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'Таблица подписок (feed) неправильно настроена.',
 			'ok' => 'Таблица подписок (feed) настроена правильно.',
 		),
+		'fileinfo' => array(
+			'nok' => 'У вас не установлено расширение PHP fileinfo (пакет fileinfo).',
+			'ok' => 'У вас установлено расширение fileinfo.',
+		),
 		'files' => 'Установка файлов',
 		'json' => array(
 			'nok' => 'У вас не установлена библиотека для работы с JSON (пакет php5-json).',
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index bad59bbb3..1dea2cd66 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -56,6 +56,10 @@ return array(
 			'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
 			'ok' => 'Права на папку значков в порядке.',
 		),
+		'fileinfo' => array(
+			'nok' => 'У вас нет расширения PHP fileinfo (пакет fileinfo).',
+			'ok' => 'У вас установлено расширение fileinfo.',
+		),
 		'http_referer' => array(
 			'nok' => 'Убедитесь, что вы не изменяете ваш HTTP REFERER.',
 			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index e0dbd288d..9d10ef9dd 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -57,6 +57,10 @@ return array(
 			'nok' => 'Akış tablosu kötü yapılandırılmış.',
 			'ok' => 'Akış tablosu sorunsuz.',
 		),
+		'fileinfo' => array(
+			'nok' => 'PHP fileinfo eksik (fileinfo package).',
+			'ok' => 'fileinfo eklentisi sorunsuz.',
+		),
 		'files' => 'Dosya kurulumu',
 		'json' => array(
 			'nok' => 'JSON eklentisi eksik (php5-json package).',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 4daa45099..d5564297b 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -56,6 +56,10 @@ return array(
 			'nok' => '<em>./data/favicons</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
 			'ok' => 'Site ikonu klasörü yetkileri sorunsuz.',
 		),
+		'fileinfo' => array(
+			'nok' => 'PHP fileinfo eksik (fileinfo package).',
+			'ok' => 'fileinfo eklentisi sorunsuz.',
+		),
 		'http_referer' => array(
 			'nok' => 'Lütfen HTTP REFERER değiştirmediğinize emin olun.',
 			'ok' => 'HTTP REFERER ve sunucunuz arası iletişim sorunsuz.',
diff --git a/app/install.php b/app/install.php
index 869bf076f..986a7dc60 100644
--- a/app/install.php
+++ b/app/install.php
@@ -478,6 +478,12 @@ function printStep1() {
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.xml.nok'); ?></p>
 	<?php } ?>
 
+	<?php if ($res['fileinfo'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.fileinfo.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.fileinfo.nok'); ?></p>
+	<?php } ?>
+
 	<?php if ($res['data'] == 'ok') { ?>
 	<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 { ?>
diff --git a/lib/lib_install.php b/lib/lib_install.php
index dd8090bcd..c5cae4293 100644
--- a/lib/lib_install.php
+++ b/lib/lib_install.php
@@ -15,6 +15,7 @@ function checkRequirements() {
 	$pdo = $pdo_mysql || $pdo_sqlite || $pdo_pgsql;
 	$pcre = extension_loaded('pcre');
 	$ctype = extension_loaded('ctype');
+	$fileinfo = extension_loaded('fileinfo');
 	$dom = class_exists('DOMDocument');
 	$xml = function_exists('xml_parser_create');
 	$json = function_exists('json_encode');
@@ -34,6 +35,7 @@ function checkRequirements() {
 		'pdo' => $pdo ? 'ok' : 'ko',
 		'pcre' => $pcre ? 'ok' : 'ko',
 		'ctype' => $ctype ? 'ok' : 'ko',
+		'fileinfo' => $fileinfo ? 'ok' : 'ko',
 		'dom' => $dom ? 'ok' : 'ko',
 		'xml' => $xml ? 'ok' : 'ko',
 		'json' => $json ? 'ok' : 'ko',
@@ -42,7 +44,7 @@ function checkRequirements() {
 		'users' => $users ? 'ok' : 'ko',
 		'favicons' => $favicons ? 'ok' : 'ko',
 		'http_referer' => $http_referer ? 'ok' : 'ko',
-		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
+		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $fileinfo && $dom && $xml &&
 		         $data && $cache && $users && $favicons && $http_referer ?
 		         'ok' : 'ko'
 	);
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index fc68a96d3..560e5b256 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -398,6 +398,7 @@ function check_install_php() {
 		'pdo' => $pdo_mysql || $pdo_sqlite,
 		'pcre' => extension_loaded('pcre'),
 		'ctype' => extension_loaded('ctype'),
+		'fileinfo' => extension_loaded('fileinfo'),
 		'dom' => class_exists('DOMDocument'),
 		'json' => extension_loaded('json'),
 		'zip' => extension_loaded('zip'),
-- 
cgit v1.2.3


From 3a253e6a1ea5e117a33cbb25ba2a1f17cc319a9a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 20 Nov 2016 18:13:06 +0100
Subject: Credits for documentation

https://github.com/FreshRSS/documentation/pull/14
---
 CREDITS.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CREDITS.md b/CREDITS.md
index 65c1318b3..4adc3ed54 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,5 +1,5 @@
 This is a credit file of people who have [contributed to FreshRSS](https://github.com/FreshRSS/FreshRSS/graphs/contributors) with, at least,
-one commit on the FreshRSS repository (at https://github.com/FreshRSS/FreshRSS).
+one commit one of the FreshRSS repositories (at https://github.com/FreshRSS).
 Please note a commit on THIS specific file is not considered as a contribution
 (too easy!). Its purpose is to show that even the smallest contribution is important.
 People are sorted by name so please keep this order.
@@ -25,9 +25,12 @@ People are sorted by name so please keep this order.
 * [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/)
 * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek), [Web](http://x2a.yt/)
 * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
+* [Nicolas Lœuillet](https://github.com/nicosomb): [contributions](https://github.com/FreshRSS/documentation/commits?author=nicosomb), [Web](http://www.loeuillet.org/)
 * [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
 * [purexo](https://github.com/purexo): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:purexo), [Web](https://purexo.mom/)
+* [Quentin Dufour](https://github.com/superboum): [contributions](https://github.com/FreshRSS/documentation/commits?author=superboum), [Web](http://quentin.dufour.io/)
 * [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi)
+* [subic](https://github.com/subic): [contributions](https://github.com/FreshRSS/documentation/commits?author=subic)
 * [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
 * [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
 * [Wanabo](https://github.com/Wanabo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Wanabo)
-- 
cgit v1.2.3


From d8fb9129d3f0b930df2d5cb4e5af203474b71c82 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 20 Nov 2016 18:15:47 +0100
Subject: Credits typo

---
 CREDITS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CREDITS.md b/CREDITS.md
index 4adc3ed54..550ff29f7 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,5 +1,5 @@
 This is a credit file of people who have [contributed to FreshRSS](https://github.com/FreshRSS/FreshRSS/graphs/contributors) with, at least,
-one commit one of the FreshRSS repositories (at https://github.com/FreshRSS).
+one commit on one of the FreshRSS repositories (at https://github.com/FreshRSS).
 Please note a commit on THIS specific file is not considered as a contribution
 (too easy!). Its purpose is to show that even the smallest contribution is important.
 People are sorted by name so please keep this order.
-- 
cgit v1.2.3


From 40044876b8eeb3419bbae04093905f4202c9872f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 28 Nov 2016 21:49:36 +0100
Subject: Add curl user-agent to retrive favicon

https://github.com/FreshRSS/FreshRSS/issues/1380
---
 lib/favicons.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/favicons.php b/lib/favicons.php
index 6709f6745..d8c97964e 100644
--- a/lib/favicons.php
+++ b/lib/favicons.php
@@ -9,7 +9,7 @@ $default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.ico';
 function download_favicon($website, $dest) {
 	global $favicons_dir, $default_favicon;
 
-	syslog(LOG_DEBUG, 'FreshRSS Favicon discovery GET ' . $website);
+	syslog(LOG_INFO, 'FreshRSS Favicon discovery GET ' . $website);
 	$favicon_getter = new \Favicon\Favicon();
 	$favicon_getter->setCacheDir($favicons_dir);
 	$favicon_url = $favicon_getter->get($website);
@@ -18,11 +18,12 @@ function download_favicon($website, $dest) {
 		return @copy($default_favicon, $dest);
 	}
 
-	syslog(LOG_DEBUG, 'FreshRSS Favicon GET ' . $favicon_url);
+	syslog(LOG_INFO, 'FreshRSS Favicon GET ' . $favicon_url);
 	$c = curl_init($favicon_url);
 	curl_setopt($c, CURLOPT_HEADER, false);
 	curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($c, CURLOPT_BINARYTRANSFER, true);
+	curl_setopt($c, CURLOPT_USERAGENT, 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
 	$img_raw = curl_exec($c);
 	$status_code = curl_getinfo($c, CURLINFO_HTTP_CODE);
 	curl_close($c);
@@ -34,6 +35,8 @@ function download_favicon($website, $dest) {
 			fclose($file);
 			return true;
 		}
+	} else {
+		syslog(LOG_WARNING, 'FreshRSS Favicon GET ' . $favicon_url . ' error ' . $status_code);
 	}
 
 	return false;
-- 
cgit v1.2.3


From 74cc2f4664e9fec6c85b3dfaa94764db483b72d4 Mon Sep 17 00:00:00 2001
From: Kevin Papst <kpapst@gmx.net>
Date: Mon, 5 Dec 2016 21:13:34 +0100
Subject: added links to extension repository

---
 README.md            | 6 +++++-
 extensions/README.md | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ebf1e3c5f..8055711e2 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 # FreshRSS
 FreshRSS is a self-hosted RSS feed aggregator such as [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
 
-It is at the same time lightweight, easy to work with, powerful and customizable.
+It is at the same time lightweight, easy to work with, powerful, customizable and supports [extensions](#extensions).
 
 It is a multi-user application with an anonymous reading mode.
 It supports [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) for instant notifications from compatible Web sites.
@@ -22,6 +22,10 @@ See the [list of releases](../../releases).
 * Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version.
 * For those willing to help testing or developing the latest features, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
 
+# Extensions 
+FreshRSS supports further customizations by adding extensions on top of its core functionality.
+There is a repository dedicated to those extensions [here on GitHub](https://github.com/FreshRSS/Extensions). 
+
 # Disclaimer
 This application was developed to fulfil personal needs primarily, and comes with absolutely no warranty.
 Feature requests, bug reports, and other contributions are welcome. The best way is to [open an issue on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
diff --git a/extensions/README.md b/extensions/README.md
index 4c1a81f5c..62766d6f2 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -1,3 +1,5 @@
 # FreshRSS extensions
 
-You may place in this directory some custom extensions for FreshRSS.
+You may place custom extensions for FreshRSS in this directory.
+
+You can find some extensions in our [GitHub repository](https://github.com/FreshRSS/Extensions).
-- 
cgit v1.2.3


From 17d402da672494f4996ee26912e94cb9d7ec8385 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 21 Dec 2016 16:47:20 +0100
Subject: Small changes readme extensions

https://github.com/FreshRSS/FreshRSS/pull/1389
@kevinpapst
---
 CREDITS.md   |  1 +
 README.fr.md |  6 ++++++
 README.md    | 12 +++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index 550ff29f7..827a8cfd3 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -19,6 +19,7 @@ People are sorted by name so please keep this order.
 * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)
 * [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/)
 * [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/)
+* [Kevin Papst](https://github.com/kevinpapst): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=kevinpapst), [Web](http://www.kevinpapst.de/)
 * [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry), [Web](https://www.fiat-tux.fr/)
 * [marcomrc](https://github.com/marcomrc): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marcomrc)
 * [Marcus Rohrmoser](https://github.com/mro): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=mro), [Web](http://mro.name/~me)
diff --git a/README.fr.md b/README.fr.md
index afa8fa1ce..b0b46bf65 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -8,6 +8,7 @@ Il se veut léger et facile à prendre en main tout en étant un outil puissant
 Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture anonyme.
 Il supporte [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) pour des notifications instantanées depuis les sites compatibles.
 Il y a une API pour les clients (mobiles), ainsi qu’une [interface en ligne de commande](./cli/README.md).
+Enfin, il permet l’ajout d’[extensions](#extensions) pour encore plus de personnalisation.
 
 * Site officiel : http://freshrss.org
 * Démo : http://demo.freshrss.org/
@@ -143,6 +144,11 @@ mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
 ```
 
 
+# Extensions 
+FreshRSS permet l’ajout d’extensions en plus des fonctionnalités natives.
+Voir le [dépôt dédié à ces extensions](https://github.com/FreshRSS/Extensions).
+
+
 # Bibliothèques incluses
 * [SimplePie](http://simplepie.org/)
 * [MINZ](https://github.com/marienfressinaud/MINZ)
diff --git a/README.md b/README.md
index 8055711e2..64ced52c9 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,12 @@
 # FreshRSS
 FreshRSS is a self-hosted RSS feed aggregator such as [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
 
-It is at the same time lightweight, easy to work with, powerful, customizable and supports [extensions](#extensions).
+It is at the same time lightweight, easy to work with, powerful and customizable.
 
 It is a multi-user application with an anonymous reading mode.
 It supports [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) for instant notifications from compatible Web sites.
 There is an API for (mobile) clients, and a [Command-Line Interface](./cli/README.md).
+Finally, it supports [extensions](#extensions) for further tuning.
 
 * Official website: http://freshrss.org
 * Demo: http://demo.freshrss.org/
@@ -22,10 +23,6 @@ See the [list of releases](../../releases).
 * Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version.
 * For those willing to help testing or developing the latest features, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
 
-# Extensions 
-FreshRSS supports further customizations by adding extensions on top of its core functionality.
-There is a repository dedicated to those extensions [here on GitHub](https://github.com/FreshRSS/Extensions). 
-
 # Disclaimer
 This application was developed to fulfil personal needs primarily, and comes with absolutely no warranty.
 Feature requests, bug reports, and other contributions are welcome. The best way is to [open an issue on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
@@ -147,6 +144,11 @@ mysqldump -u user -p --databases freshrss > freshrss.sql
 ```
 
 
+# Extensions 
+FreshRSS supports further customizations by adding extensions on top of its core functionality.
+See the [repository dedicated to those extensions](https://github.com/FreshRSS/Extensions). 
+
+
 # Included libraries
 * [SimplePie](http://simplepie.org/)
 * [MINZ](https://github.com/marienfressinaud/MINZ)
-- 
cgit v1.2.3


From 25aa4fba7e45a57c08886996e7cc6619c70e148d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 21 Dec 2016 17:06:44 +0100
Subject: Prepare intermediate version 1.6.2

Mostly some bug fixes since 1.6.1
---
 CHANGELOG.md  | 4 +++-
 constants.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6acb964e2..e812d70be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-xx-xx FreshRSS 1.7.0-dev
+## 2016-12-xx FreshRSS 1.6.2-dev
 
 * Features
 	* Add git compatibility in Web update system [#1357](https://github.com/FreshRSS/FreshRSS/issues/1357)
@@ -12,8 +12,10 @@
 	* PostgreSQL: fix bug when updating cached values [#1360](https://github.com/FreshRSS/FreshRSS/issues/1360)
 	* Fix bug in confirmation before marking as read [#1348](https://github.com/FreshRSS/FreshRSS/issues/1348)
 	* Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363)
+	* Allow slash in database hostname, when using sockets [#1364](https://github.com/FreshRSS/FreshRSS/issues/1364)
 * Misc.
 	* More robust export function in the case of large datasets [#1372](https://github.com/FreshRSS/FreshRSS/issues/1372)
+	* Add a check for PHP extension fileinfo [#1375](https://github.com/FreshRSS/FreshRSS/issues/1375)
 
 
 ## 2016-11-02 FreshRSS 1.6.1
diff --git a/constants.php b/constants.php
index 87cfb030b..2d934ec7c 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.7.0-dev');
+define('FRESHRSS_VERSION', '1.6.2-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 2ff950bda31448443d1784cc323fae63aae71018 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 21 Dec 2016 17:13:35 +0100
Subject: Changelog curl user-agent for favicons

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e812d70be..ff2312c6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * Features
 	* Add git compatibility in Web update system [#1357](https://github.com/FreshRSS/FreshRSS/issues/1357)
 		* Requires that the initial installation is done with git
+* SQL
+	* More robust export function in the case of large datasets [#1372](https://github.com/FreshRSS/FreshRSS/issues/1372)
 * CLI
 	* New command `./cli/user-info.php` to get some user information [#1345](https://github.com/FreshRSS/FreshRSS/issues/1345)
 * Bug fixing
@@ -13,8 +15,7 @@
 	* Fix bug in confirmation before marking as read [#1348](https://github.com/FreshRSS/FreshRSS/issues/1348)
 	* Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363)
 	* Allow slash in database hostname, when using sockets [#1364](https://github.com/FreshRSS/FreshRSS/issues/1364)
-* Misc.
-	* More robust export function in the case of large datasets [#1372](https://github.com/FreshRSS/FreshRSS/issues/1372)
+	* Add curl user-agent to retrieve favicons [#1380](https://github.com/FreshRSS/FreshRSS/issues/1380)
 	* Add a check for PHP extension fileinfo [#1375](https://github.com/FreshRSS/FreshRSS/issues/1375)
 
 
-- 
cgit v1.2.3


From 332a4dec8690b658bcb878a20056aea33c673f69 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 24 Dec 2016 16:33:28 +0100
Subject: Option for cookie duration

https://github.com/FreshRSS/FreshRSS/issues/1384
---
 app/Controllers/authController.php |  4 ++++
 app/Models/Auth.php                | 11 ++++++++---
 app/i18n/cz/gen.php                |  2 +-
 app/i18n/de/gen.php                |  2 +-
 app/i18n/en/gen.php                |  2 +-
 app/i18n/fr/gen.php                |  2 +-
 app/i18n/it/gen.php                |  2 +-
 app/i18n/nl/gen.php                |  2 +-
 app/i18n/ru/gen.php                |  2 +-
 app/i18n/tr/gen.php                |  2 +-
 app/views/auth/formLogin.phtml     |  2 +-
 data/config.default.php            |  3 +++
 12 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 9decba431..1398e4e49 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -113,6 +113,10 @@ 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');
+		$limits = $conf->limits;
+		$this->view->cookie_days = round($limits['cookie_duration'] / 86400, 1);
+
 		if (Minz_Request::isPost()) {
 			$nonce = Minz_Session::param('nonce');
 			$username = Minz_Request::param('username', '');
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 3313fdf3f..042210eaf 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -219,8 +219,8 @@ class FreshRSS_FormAuth {
 	}
 
 	public static function makeCookie($username, $password_hash) {
+		$conf = Minz_Configuration::get('system');
 		do {
-			$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));
@@ -229,7 +229,9 @@ class FreshRSS_FormAuth {
 			return false;
 		}
 
-		$expire = time() + 2629744;	//1 month	//TODO: Use a configuration instead
+		$limits = $conf->limits;
+		$cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $limits['cookie_duration'];
+		$expire = time() + $cookie_duration;
 		Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire);
 		return $token;
 	}
@@ -247,7 +249,10 @@ class FreshRSS_FormAuth {
 	}
 
 	public static function purgeTokens() {
-		$oldest = time() - 2629744;	// 1 month	// TODO: Use a configuration instead
+		$conf = Minz_Configuration::get('system');
+		$limits = $conf->limits;
+		$cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $limits['cookie_duration'];
+		$oldest = time() - $cookie_duration;
 		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);
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index e73325c55..6722a02e5 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email',
-		'keep_logged_in' => 'Zapamatovat přihlášení <small>(1 měsíc)</small>',
+		'keep_logged_in' => 'Zapamatovat přihlášení <small>(%s dny)</small>',
 		'login' => 'Login',
 		'logout' => 'Odhlášení',
 		'password' =>  array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index c6e7f1ef3..3f1238edc 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'E-Mail-Adresse',
-		'keep_logged_in' => 'Eingeloggt bleiben <small>(1 Monat)</small>',
+		'keep_logged_in' => 'Eingeloggt bleiben <small>(%s Tage)</small>',
 		'login' => 'Anmelden',
 		'logout' => 'Abmelden',
 		'password' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 17b47ba2f..c68a0f07b 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email address',
-		'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
+		'keep_logged_in' => 'Keep me logged in <small>(%s days)</small>',
 		'login' => 'Login',
 		'logout' => 'Logout',
 		'password' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index d61a716a7..b5dc098ae 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Adresse courriel',
-		'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
+		'keep_logged_in' => 'Rester connecté <small>(%s jours)</small>',
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
 		'password' => array(
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index c02ddd13a..01c0afba8 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Indirizzo email',
-		'keep_logged_in' => 'Ricorda i dati <small>(1 mese)</small>',
+		'keep_logged_in' => 'Ricorda i dati <small>(%s giorni)</small>',
 		'login' => 'Accedi',
 		'logout' => 'Esci',
 		'password' => array(
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 7e03229c9..a156697d5 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email adres',
-		'keep_logged_in' => 'Ingelogd blijven voor <small>(1 maand)</small>',
+		'keep_logged_in' => 'Ingelogd blijven voor <small>(%s dagen)</small>',
 		'login' => 'Log in',
 		'logout' => 'Log uit',
 		'password' => array(
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index eecd72749..130fac4ed 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email address',
-		'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
+		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',
 		'login' => 'Login',
 		'logout' => 'Logout',
 		'password' => array(
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 865dbd4e2..7f9d3d8e0 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email adresleri',
-		'keep_logged_in' => '<small>(1 ay)</small> oturumu açık tut',
+		'keep_logged_in' => '<small>(%s günler)</small> oturumu açık tut',
 		'login' => 'Giriş',
 		'logout' => 'Çıkış',
 		'password' => array(
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 4bbc8ed55..a8213b7ae 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -20,7 +20,7 @@
 		<div>
 			<label class="checkbox" for="keep_logged_in">
 				<input type="checkbox" name="keep_logged_in" id="keep_logged_in" value="1" />
-				<?php echo _t('gen.auth.keep_logged_in'); ?>
+				<?php echo _t('gen.auth.keep_logged_in', $this->cookie_days); ?>
 			</label>
 			<br />
 		</div>
diff --git a/data/config.default.php b/data/config.default.php
index 8b07b85cd..433207a9c 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -74,6 +74,9 @@ return array(
 
 	'limits' => array(
 
+		# Duration in seconds of the login cookie.
+		'cookie_duration' => 2592000,
+
 		# Duration in seconds of the SimplePie cache,
 		#	during which a query to the RSS feed will return the local cached version.
 		# Especially important for multi-user setups.
-- 
cgit v1.2.3


From 0d6a5048badea8b208ac21a0a5cdcde9ead2b894 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 24 Dec 2016 16:37:46 +0100
Subject: Non-breaking space format

---
 app/i18n/cz/gen.php | 2 +-
 app/i18n/de/gen.php | 2 +-
 app/i18n/en/gen.php | 2 +-
 app/i18n/it/gen.php | 2 +-
 app/i18n/nl/gen.php | 2 +-
 app/i18n/ru/gen.php | 2 +-
 app/i18n/tr/gen.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 6722a02e5..3db3a31da 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email',
-		'keep_logged_in' => 'Zapamatovat přihlášení <small>(%s dny)</small>',
+		'keep_logged_in' => 'Zapamatovat přihlášení <small>(%s dny)</small>',
 		'login' => 'Login',
 		'logout' => 'Odhlášení',
 		'password' =>  array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 3f1238edc..c73aedbfe 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'E-Mail-Adresse',
-		'keep_logged_in' => 'Eingeloggt bleiben <small>(%s Tage)</small>',
+		'keep_logged_in' => 'Eingeloggt bleiben <small>(%s Tage)</small>',
 		'login' => 'Anmelden',
 		'logout' => 'Abmelden',
 		'password' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index c68a0f07b..3f86cfd19 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email address',
-		'keep_logged_in' => 'Keep me logged in <small>(%s days)</small>',
+		'keep_logged_in' => 'Keep me logged in <small>(%s days)</small>',
 		'login' => 'Login',
 		'logout' => 'Logout',
 		'password' => array(
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 01c0afba8..a9a8709d3 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Indirizzo email',
-		'keep_logged_in' => 'Ricorda i dati <small>(%s giorni)</small>',
+		'keep_logged_in' => 'Ricorda i dati <small>(%s giorni)</small>',
 		'login' => 'Accedi',
 		'logout' => 'Esci',
 		'password' => array(
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index a156697d5..83811ce68 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email adres',
-		'keep_logged_in' => 'Ingelogd blijven voor <small>(%s dagen)</small>',
+		'keep_logged_in' => 'Ingelogd blijven voor <small>(%s dagen)</small>',
 		'login' => 'Log in',
 		'logout' => 'Log uit',
 		'password' => array(
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 130fac4ed..bc42afaa8 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email address',
-		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',
+		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',
 		'login' => 'Login',
 		'logout' => 'Logout',
 		'password' => array(
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 7f9d3d8e0..bcc839daf 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -22,7 +22,7 @@ return array(
 	),
 	'auth' => array(
 		'email' => 'Email adresleri',
-		'keep_logged_in' => '<small>(%s günler)</small> oturumu açık tut',
+		'keep_logged_in' => '<small>(%s günler)</small> oturumu açık tut',
 		'login' => 'Giriş',
 		'logout' => 'Çıkış',
 		'password' => array(
-- 
cgit v1.2.3


From 0150aec07eadd823a271f7e4c7371a4a8b26f085 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 24 Dec 2016 17:22:41 +0100
Subject: Send cookie FreshRSS_login only once

Prior to this patch, two cookies with the same name were sent, the first
one was to destroy the cookie, and the second one to create it
---
 app/Models/Auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 3313fdf3f..e517e9b2c 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -236,8 +236,8 @@ class FreshRSS_FormAuth {
 
 	public static function deleteCookie() {
 		$token = Minz_Session::getLongTermCookie('FreshRSS_login');
-		Minz_Session::deleteLongTermCookie('FreshRSS_login');
 		if (ctype_alnum($token)) {
+			Minz_Session::deleteLongTermCookie('FreshRSS_login');
 			@unlink(DATA_PATH . '/tokens/' . $token . '.txt');
 		}
 
-- 
cgit v1.2.3


From f25e2ba41217632121f5226751b5430f487fcdf9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 24 Dec 2016 17:25:36 +0100
Subject: Readme Send login cookie only once

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff2312c6b..13a220118 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 	* Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363)
 	* Allow slash in database hostname, when using sockets [#1364](https://github.com/FreshRSS/FreshRSS/issues/1364)
 	* Add curl user-agent to retrieve favicons [#1380](https://github.com/FreshRSS/FreshRSS/issues/1380)
+	* Send login cookie only once [#1398](https://github.com/FreshRSS/FreshRSS/pull/1398)
 	* Add a check for PHP extension fileinfo [#1375](https://github.com/FreshRSS/FreshRSS/issues/1375)
 
 
-- 
cgit v1.2.3


From e99a6b815290da614fe39658b6c76de8a9d16641 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 24 Dec 2016 17:31:19 +0100
Subject: Readme New option `limits.cookie_duration` in `data/config.php` to
 set the login cookie duration

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff2312c6b..fa883a7fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Features
 	* Add git compatibility in Web update system [#1357](https://github.com/FreshRSS/FreshRSS/issues/1357)
 		* Requires that the initial installation is done with git
+	* New option `limits.cookie_duration` in `data/config.php` to set the login cookie duration [#1384](https://github.com/FreshRSS/FreshRSS/issues/1384)
 * SQL
 	* More robust export function in the case of large datasets [#1372](https://github.com/FreshRSS/FreshRSS/issues/1372)
 * CLI
-- 
cgit v1.2.3


From 109f63be2620cf108efdfebd43f491e2720c824a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Mon, 26 Dec 2016 16:31:55 +0100
Subject: Version 1.6.2

---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d13912ae1..da73c285e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-12-xx FreshRSS 1.6.2-dev
+## 2016-12-26 FreshRSS 1.6.2
 
 * Features
 	* Add git compatibility in Web update system [#1357](https://github.com/FreshRSS/FreshRSS/issues/1357)
diff --git a/constants.php b/constants.php
index 2d934ec7c..cb00839e2 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.6.2-dev');
+define('FRESHRSS_VERSION', '1.6.2');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3