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

Minz_Translate::t\s? replaces by _t

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

(limited to 'lib')

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 31c9cdbc1..4f6beb9fd 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -77,11 +77,11 @@ function formatBytes($bytes, $precision = 2, $system = 'IEC') {
 }
 
 function timestamptodate ($t, $hour = true) {
-	$month = Minz_Translate::t (date('M', $t));
+	$month = _t(date('M', $t));
 	if ($hour) {
-		$date = Minz_Translate::t ('format_date_hour', $month);
+		$date = _t('format_date_hour', $month);
 	} else {
-		$date = Minz_Translate::t ('format_date', $month);
+		$date = _t('format_date', $month);
 	}
 
 	return @date ($date, $t);
@@ -107,7 +107,7 @@ function html_only_entity_decode($text) {
 
 function customSimplePie() {
 	$simplePie = new SimplePie();
-	$simplePie->set_useragent(Minz_Translate::t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
+	$simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration(800);
 	$simplePie->strip_htmltags(array(
-- 
cgit v1.2.3


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

Please not use Minz_Log::record anymore!

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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

(limited to 'lib')

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

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(+)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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

(limited to 'lib')

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 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

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(+)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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

(limited to 'lib')

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 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

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(+)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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 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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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(+)

(limited to 'lib')

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(-)

(limited to 'lib')

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(-)

(limited to 'lib')

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