[enh] Update to 1.0

README.md

@@ -3,8 +3,10 @@ FreshRSS for YunoHost
 
 * Site officiel : http://freshrss.org
 
-
+Changelog:
+* Update to FreshRSS 1.0
+* Admin user no more mandatory
+* Only the data directory belongs to www-data
 
 TODO:
 * Finish Yunohost theme
-* update scripts

conf/config.php

@@ -1,18 +1,10 @@
 <?php
- return array (
+return array (
-  'general' =>
+  'environment' => 'production',
-  array (
+  'salt' => 'yunosalt',
-    'environment' => 'production',
+  'title' => 'FreshRSS',
-    'salt' => 'yunosalt',
+  'default_user' => 'yunoadminuser',
-    'base_url' => 'yunopath',
+  'auth_type' => 'http_auth',
-    'title' => 'FreshRSS',
-    'default_user' => 'yunoadminuser',
-    'allow_anonymous' => false,
-    'allow_anonymous_refresh' => false,
-    'auth_type' => 'http_auth',
-    'api_enabled' => true,
-    'unsafe_autologin_enabled' => false,
-  ),
   'db' => 
   array (
     'type' => 'mysql',
@@ -22,4 +14,8 @@
     'base' => 'yunobase',
     'prefix' => false,
   ),
+  'allow_anonymous' => false,
+  'allow_anonymous_refresh' => false,
+  'unsafe_autologin_enabled' => false,
+  'api_enabled' => true,
 );

conf/dist_user.conf

@@ -57,5 +57,6 @@
   'queries' =>
   array (
   ),
+  'html5_notif_timeout' => 0,
   'user' => 'YnoUser',
 );

hooks/post_app_addaccess

@@ -31,11 +31,13 @@ then
 		#remove temp sql
 		sudo rm /tmp/$myuser-install.sql
 		#copy default conf
-		sudo cp $app_path/data/user.php.dist $app_path/data/$myuser\_user.php
+		sudo mkdir $app_path/data/$myuser/
+		sudo cp $app_path/data/user.php.dist $app_path/data/$myuser/config.php
 		#change username
-		sudo sed -i "s/YnoUser/$myuser/g" $app_path/data/$myuser\_user.php
+		sudo sed -i "s/YnoUser/$myuser/g" $app_path/data/$myuser/config.php
 		#add wallabag sharing	
-		sudo sed -i "s@sharingArrayYnh@$sharingWallabag@g" $app_path/data/$myuser\_user.php
+		sudo sed -i "s@sharingArrayYnh@$sharingWallabag@g" $app_path/data/$myuser/config.php
-		
+		touch $app_path/data/$myuser/log.txt
+		chown www-data: $app_path/data/$myuser -R
 	done
 fi

hooks/post_user_create

@@ -25,8 +25,12 @@ mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql
 #remove temp sql
 sudo rm /tmp/$myuser-install.sql
 #copy default conf
-sudo cp $app_path/data/user.php.dist $app_path/data/$myuser\_user.php
+#copy default conf
+sudo mkdir $app_path/data/$myuser/
+sudo cp $app_path/data/user.php.dist $app_path/data/$myuser/config.php
 #change username
-sudo sed -i "s/YnoUser/$myuser/g" $app_path/data/$myuser\_user.php
+sudo sed -i "s/YnoUser/$myuser/g" $app_path/data/$myuser/config.php
 #add wallabag sharing
-sudo sed -i "s/sharingArrayYnh/$sharingWallabag/g" $final_path/data/$myuser\_user.php
+sudo sed -i "s/sharingArrayYnh/$sharingWallabag/g" $app_path/data/$myuser/config.php
+touch $app_path/data/$myuser/log.txt
+chown www-data: $app_path/data/$myuser -R

manifest.json

@@ -32,8 +32,8 @@
 			{
 				"name": "admin",
 				"ask": {
-					"en": "Choose the default user (must be an existing YunoHost user)",
+					"en": "Choose the default user (leave empty if none)",
-					"fr": "Choisissez l'utilisateur par defaut (doit être un utiliser YunoHost existant)"
+					"fr": "Choisissez l'utilisateur par defaut (laissez vide si aucun)"
 				},
 				"example": "homer"
 			}

scripts/install

@@ -6,13 +6,15 @@ path=$2
 admin_user=$3
 
 
-# Check user parameter
+# Check user parameter if not empty
-sudo yunohost user list --json | grep -qi "\"username\": \"$admin_user\""
+if [[ $admin_user -ne '' ]]; then
-if [[ ! $? -eq 0 ]]; then
+	sudo yunohost user list --json | grep -qi "\"username\": \"$admin_user\""
-    echo "Wrong user"
+	if [[ ! $? -eq 0 ]]; then
-    exit 1
+		echo "Wrong user"
+		exit 1
+	fi
+	sudo yunohost app setting freshrss admin_user -v $admin_user
 fi
-sudo yunohost app setting freshrss admin_user -v $admin_user
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a freshrss
@@ -43,7 +45,11 @@ sudo sed -i "s/yunopass/$db_pwd/g" $final_path/data/config.php
 sudo sed -i "s/yunobase/$db_user/g" $final_path/data/config.php
 sudo sed -i "s/yunosalt/$app_salt/g" $final_path/data/config.php
 sudo sed -i "s@yunopath@$path@g" $final_path/data/config.php
-sudo sed -i "s/yunoadminuser/$admin_user/g" $final_path/data/config.php
+if [[ $admin_user -ne '' ]]; then
+	sudo sed -i "s/yunoadminuser/$admin_user/g" $final_path/data/config.php
+else
+	sudo sed '/yunoadminuser/d' $final_path/data/config.php
+fi
 
 # Add users
 
@@ -66,11 +72,10 @@ do
 	mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql
 	#remove temp sql
 	sudo rm /tmp/$myuser-install.sql
+	sudo mkdir $final_path/data/$myuser/
 	#copy default conf
-	sudo cp ../conf/dist_user.conf $final_path/data/$myuser\_user.php
+	sudo cp ../conf/dist_user.conf $final_path/data/$myuser/config.php
-	#change email - utilise seulement par persona - non necessaire pour ynh
+	touch $final_path/data/$myuser/log.txt
-	#user_email=$(ldapsearch -h localhost -b uid=$myuser,ou=users,dc=yunohost,dc=org -x objectClass=mailAccount mail | grep mail: | head -n 1| sed 's/mail: //')
-	#sudo sed -i "s/ynoUserEmail/$user_email/g" $final_path/data/$myuser\_user.php
 	#change username
 	sudo sed -i "s/YnoUser/$myuser/g" $final_path/data/$myuser\_user.php
 	sudo sed -i "s@sharingArrayYnh@$sharingWallabag@g" $final_path/data/$myuser\_user.php
@@ -95,7 +100,7 @@ sudo mv /tmp/cronfreshrss /etc/cron.d/freshrss
 sudo chown root /etc/cron.d/freshrss
 
 # Set permissions to freshrss directory
-sudo chown -R www-data: $final_path
+sudo chown -R www-data: $final_path/data/
 #skip api directory 
 sudo yunohost app setting freshrss skipped_uris -v /api/greader.php
 

scripts/update-ynh.php

@@ -0,0 +1,21 @@
+<?php
+require('constants.php');
+require(LIB_PATH . '/lib_rss.php');
+require('app/Models/Configuration.php');
+require('app/Models/Entry.php');
+
+$ch = curl_init(FRESHRSS_UPDATE_WEBSITE);
+$fp = fopen("update.php", "w");
+
+curl_setopt($ch, CURLOPT_FILE, $fp);
+curl_setopt($ch, CURLOPT_HEADER, 0);
+
+curl_exec($ch);
+curl_close($ch);
+fclose($fp);
+
+
+require('update.php');
+
+apply_update();
+?>

scripts/upgrade

@@ -1,16 +1,15 @@
 #!/bin/bash
-
 #backup data folder
 final_path=/var/www/freshrss
-sudo cp -a $final_path/data /tmp/freshrss-data.bak
+#
-#delete old folder
+if [[ -f $final_path/data/dist_user.conf ]]; then
-sudo rm -r $final_path
+	rm $final_path/data/dist_user.conf
-# Copy files to the right place
+fi
-sudo mkdir -p $final_path
+#copy update script into freshrss path
-sudo cp -a ../sources/* $final_path
+cp update-ynh.php $final_path/
-#remove data folder
+#execute update
-sudo rm -r $final_path/data
+sudo php $final_path/update-ynh.php
-#copy back data folder
+
-sudo mv /tmp/freshrss-data.bak $final_path/data
+cp ../conf/dist_user.conf $final_path/data
 # Set permissions to freshrss directory
-sudo chown -R www-data: $final_path
+sudo chown -R www-data: $final_path/data

sources/CHANGELOG

@@ -1,4 +1,90 @@
-# Journal des modifications
+# Changelog
+
+## 2015-01-31 FreshRSS 1.0.0 / 1.1.0 (beta)
+
+* UI
+	* Slider math with Dark theme
+	* Add a message if request failed for mark as read / favourite
+* I18n
+	* Fix some sentences
+	* Add German as a supported language
+	* Add some indications on password format
+* Bug fixing
+	* Some shortcuts was never saved
+	* Global view didn't work if set by default
+	* Minz_Error was badly raised
+	* Feed update failed if nothing had changed (MySQL only)
+	* CRON task failed with multiple users
+	* Tricky bug caused by cookie path
+	* Email sharing was badly supported (no urlencode())
+* Misc.
+	* Add a CREDIT file with contributor names
+	* Update lib_opml
+	* Default favicon is now served by HTTP code 200
+	* Change calls to syslog by Minz_Log::notice
+	* HTTP credentials are no longer logged
+
+
+## 2015-01-15 FreshRSS 0.9.4 (beta)
+
+* Feature
+	* Extension system (!!): some extensions are available at https://github.com/FreshRSS/Extensions
+* Refactoring
+	* Front controller (FreshRSS class)
+	* Configuration system
+	* Sharing system
+	* New data files organization
+* Updates
+	* Remove restriction of 1h for updates
+	* Show the current version of FreshRSS and the next one
+* UI
+	* Remove the "sticky position" of the feed aside (moved into an extension)
+	* "Show password" shows the password only while the user is pressing the mouse.
+
+
+## 2014-12-12 FreshRSS 0.9.3 (beta)
+
+* SimplePie
+	* Support for content-type application/x-rss+xml
+	* New force_feed option (for feeds sent with the wrong content-type / MIME) by adding #force_feed at the end of the feed URL
+	* Improved error messages
+* Statistics
+	* Add information on feed repartition pages
+	* Add percent repartition for the bigger feeds
+* UI
+	* New theme selector
+	* Update Screwdriver theme
+	* Add BlueLagoon theme by Mister aiR
+* Misc.
+	* Add option to remove articles after reading them
+	* Add comments
+	* Refactor i18n system to not load unnecessary strings
+	* Fix security issue in Minz_Error::error() method
+	* Fix redirection after refreshing a given feed
+
+
+## 2014-10-31 FreshRSS 0.9.2 (beta)
+
+* UI
+	* New subscription page (introduce .box items)
+	* Change feed category by drag and drop
+	* New feed aside on the main page
+	* New configuration / administration organization
+* Configuration
+	* New options in config.php for cache duration, timeout, max inactivity, max number of feeds and categories per user.
+* Refactoring
+	* Refactor authentication system (introduce FreshRSS_Auth model)
+	* Refactor indexController (introduce FreshRSS_Context model)
+	* Use ```_t()```, ```_i()```, ```_url()```, ```Minz_Request::good()``` and ```Minz_Request::bad()``` as much as possible
+	* Refactor javascript_vars.phtml
+	* Better coding style
+* I18n
+	* Introduce a new system for i18n keys (not finished yet)
+* Misc.
+	* Fix global view (didn't work anymore)
+	* Add do_post_update for update system
+	* Introduce ```checkInstallAction``` to test if FreshRSS installation is ok
+
 
 ## 2014-10-09 FreshRSS 0.8.1 / 0.9.1 (beta)
 

sources/CREDITS

@@ -0,0 +1,39 @@
+This is a credit file of people who have contributed to FreshRSS with, at least,
+one commit on the FreshRSS repository (at https://github.com/FreshRSS/FreshRSS).
+Please note a commit on THIS specific file is not considered as a contribution
+(too easy!). It's purpose is to show even the smallest contribution is important.
+People are sorted by name so please keep this order.
+
+---
+
+Alexandre Alapetite
+https://github.com/Alkarex
+
+Alexis Degrugillier
+https://github.com/aledeg
+
+Alwaysin
+https://github.com/Alwaysin
+
+Amaury Carrade
+https://github.com/AmauryCarrade
+
+ealdraed
+https://github.com/ealdraed
+
+Luc Didry
+https://github.com/ldidry
+
+Marien Fressinaud
+dev@marienfressinaud.fr
+http://marienfressinaud.fr
+https://github.com/marienfressinaud
+
+Nicolas Elie
+https://github.com/nicolaselie
+
+plopoyop
+https://github.com/plopoyop
+
+tomgue
+https://github.com/tomgue

sources/README.fr.md

@@ -9,26 +9,23 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an
 
 * Site officiel : http://freshrss.org
 * Démo : http://demo.freshrss.org/
-* Développeur : Marien Fressinaud <dev@marienfressinaud.fr>
+* Licence : [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
-* Version actuelle : 0.8.1
-* Date de publication : 2014-10-09
-* License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
 # Note sur les branches
 **Ce logiciel est encore en développement !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
 
-* Utilisez [la branche master](https://github.com/marienfressinaud/FreshRSS/tree/master/) si vous visez la stabilité.
+* Utilisez [la branche master](https://github.com/FreshRSS/FreshRSS/tree/master/) si vous visez la stabilité.
-* [La branche beta](https://github.com/marienfressinaud/FreshRSS/tree/beta) est celle par défaut : les nouveautés y sont ajoutées environ tous les mois.
+* [La branche beta](https://github.com/FreshRSS/FreshRSS/tree/beta) est celle par défaut : les nouveautés y sont ajoutées environ tous les mois.
-* Pour les développeurs et ceux qui savent ce qu'ils font, [la branche dev](https://github.com/marienfressinaud/FreshRSS/tree/dev) vous ouvre les bras !
+* Pour les développeurs et ceux qui savent ce qu'ils font, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
 
 # Disclaimer
 Cette application a été développée pour s’adapter à des besoins personnels et non professionnels.
 Je ne garantis en aucun cas la sécurité de celle-ci, ni son bon fonctionnement.
 Je m’engage néanmoins à répondre dans la mesure du possible aux demandes d’évolution si celles-ci me semblent justifiées.
 Privilégiez pour cela des demandes sur GitHub
-(https://github.com/marienfressinaud/FreshRSS/issues) ou par mail (dev@marienfressinaud.fr)
+(https://github.com/FreshRSS/FreshRSS/issues).
 
 # Pré-requis
 * Serveur modeste, par exemple sous Linux ou Windows
@@ -44,7 +41,7 @@ Privilégiez pour cela des demandes sur GitHub
 ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
 
 # Installation
-1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](https://github.com/marienfressinaud/FreshRSS/archive/master.zip)
+1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip)
 2. Placez l’application sur votre serveur (la partie à exposer au Web est le répertoire `./p/`)
 3. Le serveur Web doit avoir les droits d’écriture dans le répertoire `./data/`
 4. Accédez à FreshRSS à travers votre navigateur Web et suivez les instructions d’installation

sources/README.md

@@ -9,26 +9,23 @@ It is a multi-user application with an anonymous reading mode.
 
 * Official website: http://freshrss.org
 * Demo: http://demo.freshrss.org/
-* Developer: Marien Fressinaud <dev@marienfressinaud.fr>
+* License: [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
-* Current version: 0.8.1
-* Publication date: 2014-10-09
-* License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
 # Note on branches
 **This application is still in development!** Please use the branch that suits your needs:
 
-* Use [the master branch](https://github.com/marienfressinaud/FreshRSS/tree/master/) if you need a stable version.
+* Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version.
-* [The beta branch](https://github.com/marienfressinaud/FreshRSS/tree/beta) is the default branch: new features are added on a monthly basis.
+* [The beta branch](https://github.com/FreshRSS/FreshRSS/tree/beta) is the default branch: new features are added on a monthly basis.
-* For developers and tech savvy persons, [the dev branch](https://github.com/marienfressinaud/FreshRSS/tree/dev) is waiting for you!
+* For developers and tech savvy persons, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
 
 # Disclaimer
 This application was developed to fulfill personal needs not professional needs.
 There is no guarantee neither on its security nor its proper functioning.
 If there is feature requests which I think are good for the project, I'll do my best to include them.
 The best way is to open issues on GitHub
-(https://github.com/marienfressinaud/FreshRSS/issues) or by email (dev@marienfressinaud.fr)
+(https://github.com/FreshRSS/FreshRSS/issues).
 
 # Requirements
 * Light server running Linux or Windows
@@ -37,14 +34,14 @@ The best way is to open issues on GitHub
 * PHP 5.2.1+ (PHP 5.3.7+ recommanded)
 	* Required extensions: [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (only for API access on platforms under 64 bits)
 	* Recommanded extensions : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
-* MySQL 5.0.3+ (recommanded) ou SQLite 3.7.4+
+* MySQL 5.0.3+ (recommanded) or SQLite 3.7.4+
 * A recent browser like Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
 	* Works on mobile
 
 ![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
 
 # Installation
-1. Get FreshRSS with git or [by downloading the archive](https://github.com/marienfressinaud/FreshRSS/archive/master.zip)
+1. Get FreshRSS with git or [by downloading the archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip)
 2. Dump the application on your server (expose only the `./p/` folder)
 3. Add write access on `./data/` folder to the webserver user
 4. Access FreshRSS with your browser and follow the installation process
@@ -70,9 +67,9 @@ For example, if you want to run the script every hour:
 
 # Advices
 * For a better security, expose only the `./p/` folder on the web.
-	* Be aware that the `./data/` folder contain all personal data, so it is a bad idea to expose it.
+	* Be aware that the `./data/` folder contains all personal data, so it is a bad idea to expose it.
-* The `./constants.php` file define access to application folder. If you want to customize your installation, every thing happens here.
+* The `./constants.php` file defines access to application folder. If you want to customize your installation, every thing happens here.
-* If you encounter some problem, logs are accessibles from the interface or manually in `./data/log/*.log` files.
+* If you encounter any problem, logs are accessibles from the interface or manually in `./data/log/*.log` files.
 
 # Backup
 * You need to keep `./data/config.php`, `./data/*_user.php` and `./data/persona/` files

sources/app/Controllers/authController.php

@@ -0,0 +1,349 @@
+<?php
+
+/**
+ * This controller handles action about authentication.
+ */
+class FreshRSS_auth_Controller extends Minz_ActionController {
+	/**
+	 * This action handles authentication management page.
+	 *
+	 * Parameters are:
+	 *   - token (default: current token)
+	 *   - anon_access (default: false)
+	 *   - anon_refresh (default: false)
+	 *   - auth_type (default: none)
+	 *   - unsafe_autologin (default: false)
+	 *   - api_enabled (default: false)
+	 *
+	 * @todo move unsafe_autologin in an extension.
+	 */
+	public function indexAction() {
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+
+		Minz_View::prependTitle(_t('admin.auth.title') . ' · ');
+
+		if (Minz_Request::isPost()) {
+			$ok = true;
+
+			$current_token = FreshRSS_Context::$user_conf->token;
+			$token = Minz_Request::param('token', $current_token);
+			FreshRSS_Context::$user_conf->token = $token;
+			$ok &= FreshRSS_Context::$user_conf->save();
+
+			$anon = Minz_Request::param('anon_access', false);
+			$anon = ((bool)$anon) && ($anon !== 'no');
+			$anon_refresh = Minz_Request::param('anon_refresh', false);
+			$anon_refresh = ((bool)$anon_refresh) && ($anon_refresh !== 'no');
+			$auth_type = Minz_Request::param('auth_type', 'none');
+			$unsafe_autologin = Minz_Request::param('unsafe_autologin', false);
+			$api_enabled = Minz_Request::param('api_enabled', false);
+			if ($anon != 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
+				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;
+
+				$ok &= FreshRSS_Context::$system_conf->save();
+			}
+
+			invalidateHttpCache();
+
+			if ($ok) {
+				Minz_Request::good(_t('feedback.conf.updated'),
+				                   array('c' => 'auth', 'a' => 'index'));
+			} else {
+				Minz_Request::bad(_t('feedback.conf.error'),
+				                  array('c' => 'auth', 'a' => 'index'));
+			}
+		}
+	}
+
+	/**
+	 * This action handles the login page.
+	 *
+	 * It forwards to the correct login page (form or Persona) or main page if
+	 * the user is already connected.
+	 */
+	public function loginAction() {
+		if (FreshRSS_Auth::hasAccess()) {
+			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
+		}
+
+		$auth_type = FreshRSS_Context::$system_conf->auth_type;
+		switch ($auth_type) {
+		case 'form':
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'formLogin'));
+			break;
+		case 'persona':
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'personaLogin'));
+			break;
+		case 'http_auth':
+		case 'none':
+			// It should not happened!
+			Minz_Error::error(404);
+		default:
+			// TODO load plugin instead
+			Minz_Error::error(404);
+		}
+	}
+
+	/**
+	 * This action handles form login page.
+	 *
+	 * If this action is reached through a POST request, username and password
+	 * are compared to login the current user.
+	 *
+	 * Parameters are:
+	 *   - nonce (default: false)
+	 *   - username (default: '')
+	 *   - challenge (default: '')
+	 *   - keep_logged_in (default: false)
+	 *
+	 * @todo move unsafe autologin in an extension.
+	 */
+	public function formLoginAction() {
+		invalidateHttpCache();
+
+		$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js');
+		Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . $file_mtime));
+
+		if (Minz_Request::isPost()) {
+			$nonce = Minz_Session::param('nonce');
+			$username = Minz_Request::param('username', '');
+			$challenge = Minz_Request::param('challenge', '');
+
+			$conf = get_user_configuration($username);
+			if (is_null($conf)) {
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
+				                  array('c' => 'auth', 'a' => 'login'));
+			}
+
+			$ok = FreshRSS_FormAuth::checkCredentials(
+				$username, $conf->passwordHash, $nonce, $challenge
+			);
+			if ($ok) {
+				// Set session parameter to give access to the user.
+				Minz_Session::_param('currentUser', $username);
+				Minz_Session::_param('passwordHash', $conf->passwordHash);
+				FreshRSS_Auth::giveAccess();
+
+				// Set cookie parameter if nedded.
+				if (Minz_Request::param('keep_logged_in')) {
+					FreshRSS_FormAuth::makeCookie($username, $conf->passwordHash);
+				} else {
+					FreshRSS_FormAuth::deleteCookie();
+				}
+
+				// All is good, go back to the index.
+				Minz_Request::good(_t('feedback.auth.login.success'),
+				                   array('c' => 'index', 'a' => 'index'));
+			} else {
+				Minz_Log::warning('Password mismatch for' .
+				                  ' user=' . $username .
+				                  ', nonce=' . $nonce .
+				                  ', c=' . $challenge);
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
+				                  array('c' => 'auth', 'a' => 'login'));
+			}
+		} elseif (FreshRSS_Context::$system_conf->unsafe_autologin_enabled) {
+			$username = Minz_Request::param('u', '');
+			$password = Minz_Request::param('p', '');
+			Minz_Request::_param('p');
+
+			if (!$username) {
+				return;
+			}
+
+			$conf = get_user_configuration($username);
+			if (is_null($conf)) {
+				return;
+			}
+
+			if (!function_exists('password_verify')) {
+				include_once(LIB_PATH . '/password_compat.php');
+			}
+
+			$s = $conf->passwordHash;
+			$ok = password_verify($password, $s);
+			unset($password);
+			if ($ok) {
+				Minz_Session::_param('currentUser', $username);
+				Minz_Session::_param('passwordHash', $s);
+				FreshRSS_Auth::giveAccess();
+
+				Minz_Request::good(_t('feedback.auth.login.success'),
+				                   array('c' => 'index', 'a' => 'index'));
+			} else {
+				Minz_Log::warning('Unsafe password mismatch for user ' . $username);
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
+				                  array('c' => 'auth', 'a' => 'login'));
+			}
+		}
+	}
+
+	/**
+	 * This action handles Persona login page.
+	 *
+	 * If this action is reached through a POST request, assertion from Persona
+	 * is verificated and user connected if all is ok.
+	 *
+	 * Parameter is:
+	 *   - assertion (default: false)
+	 *
+	 * @todo: Persona system should be moved to a plugin
+	 */
+	public function personaLoginAction() {
+		$this->view->res = false;
+
+		if (Minz_Request::isPost()) {
+			$this->view->_useLayout(false);
+
+			$assert = Minz_Request::param('assertion');
+			$url = 'https://verifier.login.persona.org/verify';
+			$params = 'assertion=' . $assert . '&audience=' .
+			          urlencode(Minz_Url::display(null, 'php', true));
+			$ch = curl_init();
+			$options = array(
+				CURLOPT_URL => $url,
+				CURLOPT_RETURNTRANSFER => TRUE,
+				CURLOPT_POST => 2,
+				CURLOPT_POSTFIELDS => $params
+			);
+			curl_setopt_array($ch, $options);
+			$result = curl_exec($ch);
+			curl_close($ch);
+
+			$res = json_decode($result, true);
+
+			$login_ok = false;
+			$reason = '';
+			if ($res['status'] === 'okay') {
+				$email = filter_var($res['email'], FILTER_VALIDATE_EMAIL);
+				if ($email != '') {
+					$persona_file = DATA_PATH . '/persona/' . $email . '.txt';
+					if (($current_user = @file_get_contents($persona_file)) !== false) {
+						$current_user = trim($current_user);
+						$conf = get_user_configuration($current_user);
+						if (!is_null($conf)) {
+							$login_ok = strcasecmp($email, $conf->mail_login) === 0;
+						} else {
+							$reason = 'Invalid configuration for user ' .
+							          '[' . $current_user . ']';
+						}
+					}
+				} else {
+					$reason = 'Invalid email format [' . $res['email'] . ']';
+				}
+			} else {
+				$reason = $res['reason'];
+			}
+
+			if ($login_ok) {
+				Minz_Session::_param('currentUser', $current_user);
+				Minz_Session::_param('mail', $email);
+				FreshRSS_Auth::giveAccess();
+				invalidateHttpCache();
+			} else {
+				Minz_Log::error($reason);
+
+				$res = array();
+				$res['status'] = 'failure';
+				$res['reason'] = _t('feedback.auth.login.invalid');
+			}
+
+			header('Content-Type: application/json; charset=UTF-8');
+			$this->view->res = $res;
+		}
+	}
+
+	/**
+	 * This action removes all accesses of the current user.
+	 */
+	public function logoutAction() {
+		invalidateHttpCache();
+		FreshRSS_Auth::removeAccess();
+		Minz_Request::good(_t('feedback.auth.logout.success'),
+		                   array('c' => 'index', 'a' => 'index'));
+	}
+
+	/**
+	 * This action resets the authentication system.
+	 *
+	 * After reseting, form auth is set by default.
+	 */
+	public function resetAction() {
+		Minz_View::prependTitle(_t('admin.auth.title_reset') . ' · ');
+
+		Minz_View::appendScript(Minz_Url::display(
+			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
+		));
+
+		$this->view->no_form = false;
+		// Enable changement of auth only if Persona!
+		if (FreshRSS_Context::$system_conf->auth_type != 'persona') {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.auth.not_persona')
+			);
+			$this->view->no_form = true;
+			return;
+		}
+
+		$conf = get_user_configuration(FreshRSS_Context::$system_conf->default_user);
+		if (is_null($conf)) {
+			return;
+		}
+
+		// Admin user must have set its master password.
+		if (!$conf->passwordHash) {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('gen.short.damn'),
+				'body' => _t('feedback.auth.no_password_set')
+			);
+			$this->view->no_form = true;
+			return;
+		}
+
+		invalidateHttpCache();
+
+		if (Minz_Request::isPost()) {
+			$nonce = Minz_Session::param('nonce');
+			$username = Minz_Request::param('username', '');
+			$challenge = Minz_Request::param('challenge', '');
+
+			$ok = FreshRSS_FormAuth::checkCredentials(
+				$username, $conf->passwordHash, $nonce, $challenge
+			);
+
+			if ($ok) {
+				FreshRSS_Context::$system_conf->auth_type = 'form';
+				$ok = FreshRSS_Context::$system_conf->save();
+
+				if ($ok) {
+					Minz_Request::good(_t('feedback.auth.form.set'));
+				} else {
+					Minz_Request::bad(_t('feedback.auth.form.not_set'),
+				                      array('c' => 'auth', 'a' => 'reset'));
+				}
+			} else {
+				Minz_Log::warning('Password mismatch for' .
+				                  ' user=' . $username .
+				                  ', nonce=' . $nonce .
+				                  ', c=' . $challenge);
+				Minz_Request::bad(_t('feedback.auth.login.invalid'),
+				                  array('c' => 'auth', 'a' => 'reset'));
+			}
+		}
+	}
+}

sources/app/Controllers/categoryController.php

@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * Controller to handle actions relative to categories.
+ * User needs to be connected.
+ */
+class FreshRSS_category_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 *
+	 */
+	public function firstAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
+		}
+
+		$catDAO = new FreshRSS_CategoryDAO();
+		$catDAO->checkDefault();
+	}
+
+	/**
+	 * This action creates a new category.
+	 *
+	 * Request parameter is:
+	 *   - new-category
+	 */
+	public function createAction() {
+		$catDAO = new FreshRSS_CategoryDAO();
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
+
+		$limits = FreshRSS_Context::$system_conf->limits;
+		$this->view->categories = $catDAO->listCategories(false);
+
+		if (count($this->view->categories) >= $limits['max_categories']) {
+			Minz_Request::bad(_t('feedback.sub.category.over_max', $limits['max_categories']),
+			                  $url_redirect);
+		}
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$cat_name = Minz_Request::param('new-category');
+			if (!$cat_name) {
+				Minz_Request::bad(_t('feedback.sub.category.no_name'), $url_redirect);
+			}
+
+			$cat = new FreshRSS_Category($cat_name);
+
+			if ($catDAO->searchByName($cat->name()) != null) {
+				Minz_Request::bad(_t('feedback.sub.category.name_exists'), $url_redirect);
+			}
+
+			$values = array(
+				'id' => $cat->id(),
+				'name' => $cat->name(),
+			);
+
+			if ($catDAO->addCategory($values)) {
+				Minz_Request::good(_t('feedback.sub.category.created', $cat->name()), $url_redirect);
+			} else {
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+
+	/**
+	 * This action updates the given category.
+	 *
+	 * Request parameters are:
+	 *   - id
+	 *   - name
+	 */
+	public function updateAction() {
+		$catDAO = new FreshRSS_CategoryDAO();
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$id = Minz_Request::param('id');
+			$name = Minz_Request::param('name', '');
+			if (strlen($name) <= 0) {
+				Minz_Request::bad(_t('feedback.sub.category.no_name'), $url_redirect);
+			}
+
+			if ($catDAO->searchById($id) == null) {
+				Minz_Request::bad(_t('feedback.sub.category.not_exist'), $url_redirect);
+			}
+
+			$cat = new FreshRSS_Category($name);
+			$values = array(
+				'name' => $cat->name(),
+			);
+
+			if ($catDAO->updateCategory($id, $values)) {
+				Minz_Request::good(_t('feedback.sub.category.updated'), $url_redirect);
+			} else {
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+
+	/**
+	 * This action deletes a category.
+	 * Feeds in the given category are moved in the default category.
+	 * Related user queries are deleted too.
+	 *
+	 * Request parameter is:
+	 *   - id (of a category)
+	 */
+	public function deleteAction() {
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$catDAO = new FreshRSS_CategoryDAO();
+		$default_category = $catDAO->getDefault();
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$id = Minz_Request::param('id');
+			if (!$id) {
+				Minz_Request::bad(_t('feedback.sub.category.no_id'), $url_redirect);
+			}
+
+			if ($id === $default_category->id()) {
+				Minz_Request::bad(_t('feedback.sub.category.not_delete_default'), $url_redirect);
+			}
+
+			if ($feedDAO->changeCategory($id, $default_category->id()) === false) {
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
+			}
+
+			if ($catDAO->deleteCategory($id) === false) {
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
+			}
+
+			// Remove related queries.
+			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);
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+
+	/**
+	 * This action deletes all the feeds relative to a given category.
+	 * Feed-related queries are deleted.
+	 *
+	 * Request parameter is:
+	 *   - id (of a category)
+	 */
+	public function emptyAction() {
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			invalidateHttpCache();
+
+			$id = Minz_Request::param('id');
+			if (!$id) {
+				Minz_Request::bad(_t('feedback.sub.category.no_id'), $url_redirect);
+			}
+
+			// List feeds to remove then related user queries.
+			$feeds = $feedDAO->listByCategory($id);
+
+			if ($feedDAO->deleteFeedByCategory($id)) {
+				// TODO: Delete old favicons
+
+				// Remove related queries
+				foreach ($feeds as $feed) {
+					FreshRSS_Context::$user_conf->queries = remove_query_by_get(
+						'f_' . $feed->id(), FreshRSS_Context::$user_conf->queries);
+				}
+				FreshRSS_Context::$user_conf->save();
+
+				Minz_Request::good(_t('feedback.sub.category.emptied'), $url_redirect);
+			} else {
+				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
+	}
+}

sources/app/Controllers/configureController.php

@@ -8,175 +8,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * This action is called before every other action in that class. It is
 	 * the common boiler plate for every action. It is triggered by the
 	 * underlying framework.
-	 *
-	 * @todo see if the category default configuration is needed here or if
-	 *       we can move it to the categorize action
 	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
+			Minz_Error::error(403);
-				403,
-				array('error' => array(_t('access_denied')))
-			);
-		}
-
-		$catDAO = new FreshRSS_CategoryDAO();
-		$catDAO->checkDefault();
-	}
-
-	/**
-	 * This action handles the category configuration page
-	 *
-	 * It displays the category configuration page.
-	 * If this action is reached through a POST request, it loops through
-	 * every category to check for modification then add a new category if
-	 * needed then sends a notification to the user.
-	 * If a category name is emptied, the category is deleted and all
-	 * related feeds are moved to the default category. Related user queries
-	 * are deleted too.
-	 * If a category name is changed, it is updated.
-	 */
-	public function categorizeAction() {
-		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$catDAO = new FreshRSS_CategoryDAO();
-		$defaultCategory = $catDAO->getDefault();
-		$defaultId = $defaultCategory->id();
-
-		if (Minz_Request::isPost()) {
-			$cats = Minz_Request::param('categories', array());
-			$ids = Minz_Request::param('ids', array());
-			$newCat = trim(Minz_Request::param('new_category', ''));
-
-			foreach ($cats as $key => $name) {
-				if (strlen($name) > 0) {
-					$cat = new FreshRSS_Category($name);
-					$values = array(
-						'name' => $cat->name(),
-					);
-					$catDAO->updateCategory($ids[$key], $values);
-				} elseif ($ids[$key] != $defaultId) {
-					$feedDAO->changeCategory($ids[$key], $defaultId);
-					$catDAO->deleteCategory($ids[$key]);
-
-					// Remove related queries.
-					$this->view->conf->remove_query_by_get('c_' . $ids[$key]);
-					$this->view->conf->save();
-				}
-			}
-
-			if ($newCat != '') {
-				$cat = new FreshRSS_Category($newCat);
-				$values = array(
-					'id' => $cat->id(),
-					'name' => $cat->name(),
-				);
-
-				if ($catDAO->searchByName($newCat) == null) {
-					$catDAO->addCategory($values);
-				}
-			}
-			invalidateHttpCache();
-
-			Minz_Request::good(_t('categories_updated'),
-			                   array('c' => 'configure', 'a' => 'categorize'));
-		}
-
-		$this->view->categories = $catDAO->listCategories(false);
-		$this->view->defaultCategory = $catDAO->getDefault();
-		$this->view->feeds = $feedDAO->listFeeds();
-
-		Minz_View::prependTitle(_t('categories_management') . ' · ');
-	}
-
-	/**
-	 * This action handles the feed configuration page.
-	 *
-	 * It displays the feed configuration page.
-	 * If this action is reached through a POST request, it stores all new
-	 * configuraiton values then sends a notification to the user.
-	 *
-	 * The options available on the page are:
-	 *   - name
-	 *   - description
-	 *   - website URL
-	 *   - feed URL
-	 *   - category id (default: default category id)
-	 *   - CSS path to article on website
-	 *   - display in main stream (default: 0)
-	 *   - HTTP authentication
-	 *   - number of article to retain (default: -2)
-	 *   - refresh frequency (default: -2)
-	 * Default values are empty strings unless specified.
-	 */
-	public function feedAction() {
-		$catDAO = new FreshRSS_CategoryDAO();
-		$this->view->categories = $catDAO->listCategories(false);
-
-		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->view->feeds = $feedDAO->listFeeds();
-
-		$id = Minz_Request::param('id');
-		if ($id == false && !empty($this->view->feeds)) {
-			$id = current($this->view->feeds)->id();
-		}
-
-		$this->view->flux = false;
-		if ($id != false) {
-			$this->view->flux = $this->view->feeds[$id];
-
-			if (!$this->view->flux) {
-				Minz_Error::error(
-					404,
-					array('error' => array(_t('page_not_found')))
-				);
-			} else {
-				if (Minz_Request::isPost() && $this->view->flux) {
-					$user = Minz_Request::param('http_user', '');
-					$pass = Minz_Request::param('http_pass', '');
-
-					$httpAuth = '';
-					if ($user != '' || $pass != '') {
-						$httpAuth = $user . ':' . $pass;
-					}
-
-					$cat = intval(Minz_Request::param('category', 0));
-
-					$values = array(
-						'name' => Minz_Request::param('name', ''),
-						'description' => sanitizeHTML(Minz_Request::param('description', '', true)),
-						'website' => Minz_Request::param('website', ''),
-						'url' => Minz_Request::param('url', ''),
-						'category' => $cat,
-						'pathEntries' => Minz_Request::param('path_entries', ''),
-						'priority' => intval(Minz_Request::param('priority', 0)),
-						'httpAuth' => $httpAuth,
-						'keep_history' => intval(Minz_Request::param('keep_history', -2)),
-						'ttl' => intval(Minz_Request::param('ttl', -2)),
-					);
-
-					if ($feedDAO->updateFeed($id, $values)) {
-						$this->view->flux->_category($cat);
-						$this->view->flux->faviconPrepare();
-						$notif = array(
-							'type' => 'good',
-							'content' => _t('feed_updated')
-						);
-					} else {
-						$notif = array(
-							'type' => 'bad',
-							'content' => _t('error_occurred_update')
-						);
-					}
-					invalidateHttpCache();
-
-					Minz_Session::_param('notification', $notif);
-					Minz_Request::forward(array('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true);
-				}
-
-				Minz_View::prependTitle(_t('rss_feed_management') . ' — ' . $this->view->flux->name() . ' · ');
-			}
-		} else {
-			Minz_View::prependTitle(_t('rss_feed_management') . ' · ');
 		}
 	}
 
@@ -206,33 +41,33 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function displayAction() {
 		if (Minz_Request::isPost()) {
-			$this->view->conf->_language(Minz_Request::param('language', 'en'));
+			FreshRSS_Context::$user_conf->language = Minz_Request::param('language', 'en');
-			$this->view->conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
+			FreshRSS_Context::$user_conf->theme = Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme);
-			$this->view->conf->_content_width(Minz_Request::param('content_width', 'thin'));
+			FreshRSS_Context::$user_conf->content_width = Minz_Request::param('content_width', 'thin');
-			$this->view->conf->_topline_read(Minz_Request::param('topline_read', false));
+			FreshRSS_Context::$user_conf->topline_read = Minz_Request::param('topline_read', false);
-			$this->view->conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
+			FreshRSS_Context::$user_conf->topline_favorite = Minz_Request::param('topline_favorite', false);
-			$this->view->conf->_topline_date(Minz_Request::param('topline_date', false));
+			FreshRSS_Context::$user_conf->topline_date = Minz_Request::param('topline_date', false);
-			$this->view->conf->_topline_link(Minz_Request::param('topline_link', false));
+			FreshRSS_Context::$user_conf->topline_link = Minz_Request::param('topline_link', false);
-			$this->view->conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
+			FreshRSS_Context::$user_conf->bottomline_read = Minz_Request::param('bottomline_read', false);
-			$this->view->conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
+			FreshRSS_Context::$user_conf->bottomline_favorite = Minz_Request::param('bottomline_favorite', false);
-			$this->view->conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
+			FreshRSS_Context::$user_conf->bottomline_sharing = Minz_Request::param('bottomline_sharing', false);
-			$this->view->conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
+			FreshRSS_Context::$user_conf->bottomline_tags = Minz_Request::param('bottomline_tags', false);
-			$this->view->conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
+			FreshRSS_Context::$user_conf->bottomline_date = Minz_Request::param('bottomline_date', false);
-			$this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
+			FreshRSS_Context::$user_conf->bottomline_link = Minz_Request::param('bottomline_link', false);
-			$this->view->conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
+			FreshRSS_Context::$user_conf->html5_notif_timeout = Minz_Request::param('html5_notif_timeout', 0);
-			$this->view->conf->save();
+			FreshRSS_Context::$user_conf->save();
 
-			Minz_Session::_param('language', $this->view->conf->language);
+			Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
-			Minz_Translate::reset();
+			Minz_Translate::reset(FreshRSS_Context::$user_conf->language);
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'display'));
 		}
 
 		$this->view->themes = FreshRSS_Themes::get();
 
-		Minz_View::prependTitle(_t('display_configuration') . ' · ');
+		Minz_View::prependTitle(_t('conf.display.title') . ' · ');
 	}
 
 	/**
@@ -254,6 +89,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *   - image lazy loading
 	 *   - stick open articles to the top
 	 *   - display a confirmation when reading all articles
+	 *   - auto remove article after reading
 	 *   - article order (default: DESC)
 	 *   - mark articles as read when:
 	 *       - displayed
@@ -264,35 +100,33 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function readingAction() {
 		if (Minz_Request::isPost()) {
-			$this->view->conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
+			FreshRSS_Context::$user_conf->posts_per_page = Minz_Request::param('posts_per_page', 10);
-			$this->view->conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
+			FreshRSS_Context::$user_conf->view_mode = Minz_Request::param('view_mode', 'normal');
-			$this->view->conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
+			FreshRSS_Context::$user_conf->default_view = Minz_Request::param('default_view', 'adaptive');
-			$this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
+			FreshRSS_Context::$user_conf->auto_load_more = Minz_Request::param('auto_load_more', false);
-			$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
+			FreshRSS_Context::$user_conf->display_posts = Minz_Request::param('display_posts', false);
-			$this->view->conf->_display_categories(Minz_Request::param('display_categories', false));
+			FreshRSS_Context::$user_conf->display_categories = Minz_Request::param('display_categories', false);
-			$this->view->conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
+			FreshRSS_Context::$user_conf->hide_read_feeds = Minz_Request::param('hide_read_feeds', false);
-			$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
+			FreshRSS_Context::$user_conf->onread_jump_next = Minz_Request::param('onread_jump_next', false);
-			$this->view->conf->_lazyload(Minz_Request::param('lazyload', false));
+			FreshRSS_Context::$user_conf->lazyload = Minz_Request::param('lazyload', false);
-			$this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false));
+			FreshRSS_Context::$user_conf->sticky_post = Minz_Request::param('sticky_post', false);
-			$this->view->conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
+			FreshRSS_Context::$user_conf->reading_confirm = Minz_Request::param('reading_confirm', false);
-			$this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
+			FreshRSS_Context::$user_conf->auto_remove_article = Minz_Request::param('auto_remove_article', false);
-			$this->view->conf->_mark_when(array(
+			FreshRSS_Context::$user_conf->sort_order = Minz_Request::param('sort_order', 'DESC');
+			FreshRSS_Context::$user_conf->mark_when = array(
 				'article' => Minz_Request::param('mark_open_article', false),
 				'site' => Minz_Request::param('mark_open_site', false),
 				'scroll' => Minz_Request::param('mark_scroll', false),
 				'reception' => Minz_Request::param('mark_upon_reception', false),
-			));
+			);
-			$this->view->conf->save();
+			FreshRSS_Context::$user_conf->save();
-
-			Minz_Session::_param('language', $this->view->conf->language);
-			Minz_Translate::reset();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'reading'));
 		}
 
-		Minz_View::prependTitle(_t('reading_configuration') . ' · ');
+		Minz_View::prependTitle(_t('conf.reading.title') . ' · ');
 	}
 
 	/**
@@ -305,15 +139,15 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
 			$params = Minz_Request::params();
-			$this->view->conf->_sharing($params['share']);
+			FreshRSS_Context::$user_conf->sharing = $params['share'];
-			$this->view->conf->save();
+			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'sharing'));
 		}
 
-		Minz_View::prependTitle(_t('sharing') . ' · ');
+		Minz_View::prependTitle(_t('conf.sharing.title') . ' · ');
 	}
 
 	/**
@@ -330,11 +164,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function shortcutAction() {
 		$list_keys = array('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter',
-		                    'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
+		                   'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
-		                    'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
+		                   'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
-		                    's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
+		                   's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
-		                    'z', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
+		                   'z', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
-		                    'f10', 'f11', 'f12');
+		                   'f10', 'f11', 'f12');
 		$this->view->list_keys = $list_keys;
 
 		if (Minz_Request::isPost()) {
@@ -347,24 +181,15 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				}
 			}
 
-			$this->view->conf->_shortcuts($shortcuts_ok);
+			FreshRSS_Context::$user_conf->shortcuts = $shortcuts_ok;
-			$this->view->conf->save();
+			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('shortcuts_updated'),
+			Minz_Request::good(_t('feedback.conf.shortcuts_updated'),
 			                   array('c' => 'configure', 'a' => 'shortcut'));
 		}
 
-		Minz_View::prependTitle(_t('shortcuts') . ' · ');
+		Minz_View::prependTitle(_t('conf.shortcut.title') . ' · ');
-	}
-
-	/**
-	 * This action display the user configuration page
-	 *
-	 * @todo move that action in the user controller
-	 */
-	public function usersAction() {
-		Minz_View::prependTitle(_t('users') . ' · ');
 	}
 
 	/**
@@ -384,23 +209,23 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
-			$this->view->conf->_old_entries(Minz_Request::param('old_entries', 3));
+			FreshRSS_Context::$user_conf->old_entries = Minz_Request::param('old_entries', 3);
-			$this->view->conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
+			FreshRSS_Context::$user_conf->keep_history_default = Minz_Request::param('keep_history_default', 0);
-			$this->view->conf->_ttl_default(Minz_Request::param('ttl_default', -2));
+			FreshRSS_Context::$user_conf->ttl_default = Minz_Request::param('ttl_default', -2);
-			$this->view->conf->save();
+			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'archiving'));
 		}
 
-		Minz_View::prependTitle(_t('archiving_configuration') . ' · ');
+		Minz_View::prependTitle(_t('conf.archiving.title') . ' · ');
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 		$this->view->nb_total = $entryDAO->count();
 		$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);
 		}
 	}
@@ -421,19 +246,19 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 			foreach ($queries as $key => $query) {
 				if (!$query['name']) {
-					$query['name'] = _t('query_number', $key + 1);
+					$query['name'] = _t('conf.query.number', $key + 1);
 				}
 			}
-			$this->view->conf->_queries($queries);
+			FreshRSS_Context::$user_conf->queries = $queries;
-			$this->view->conf->save();
+			FreshRSS_Context::$user_conf->save();
 
-			Minz_Request::good(_t('configuration_updated'),
+			Minz_Request::good(_t('feedback.conf.updated'),
 			                   array('c' => 'configure', 'a' => 'queries'));
 		} else {
 			$this->view->query_get = array();
 			$cat_dao = new FreshRSS_CategoryDAO();
 			$feed_dao = FreshRSS_Factory::createFeedDao();
-			foreach ($this->view->conf->queries as $key => $query) {
+			foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
 				if (!isset($query['get'])) {
 					continue;
 				}
@@ -489,7 +314,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			}
 		}
 
-		Minz_View::prependTitle(_t('queries') . ' · ');
+		Minz_View::prependTitle(_t('conf.query.title') . ' · ');
 	}
 
 	/**
@@ -501,22 +326,19 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function addQueryAction() {
 		$whitelist = array('get', 'order', 'name', 'search', 'state');
-		$queries = $this->view->conf->queries;
+		$queries = FreshRSS_Context::$user_conf->queries;
 		$query = Minz_Request::params();
-		$query['name'] = _t('query_number', count($queries) + 1);
+		$query['name'] = _t('conf.query.number', count($queries) + 1);
 		foreach ($query as $key => $value) {
 			if (!in_array($key, $whitelist)) {
 				unset($query[$key]);
 			}
 		}
-		if (!empty($query['state']) && $query['state'] & FreshRSS_Entry::STATE_STRICT) {
-			$query['state'] -= FreshRSS_Entry::STATE_STRICT;
-		}
 		$queries[] = $query;
-		$this->view->conf->_queries($queries);
+		FreshRSS_Context::$user_conf->queries = $queries;
-		$this->view->conf->save();
+		FreshRSS_Context::$user_conf->save();
 
-		Minz_Request::good(_t('query_created', $query['name']),
+		Minz_Request::good(_t('feedback.conf.query_created', $query['name']),
 		                   array('c' => 'configure', 'a' => 'queries'));
 	}
 }

sources/app/Controllers/entryController.php

@@ -1,150 +1,181 @@
 <?php
 
+/**
+ * Controller to handle every entry actions.
+ */
 class FreshRSS_entry_Controller extends Minz_ActionController {
-	public function firstAction () {
+	/**
-		if (!$this->view->loginOk) {
+	 * This action is called before every other action in that class. It is
-			Minz_Error::error (
+	 * the common boiler plate for every action. It is triggered by the
-				403,
+	 * underlying framework.
-				array ('error' => array (Minz_Translate::t ('access_denied')))
+	 */
-			);
+	public function firstAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
 		}
 
-		$this->params = array ();
+		// If ajax request, we do not print layout
-		$output = Minz_Request::param('output', '');
+		$this->ajax = Minz_Request::param('ajax');
-		if (($output != '') && ($this->view->conf->view_mode !== $output)) {
+		if ($this->ajax) {
-			$this->params['output'] = $output;
+			$this->view->_useLayout(false);
-		}
+			Minz_Request::_param('ajax');
-
-		$this->redirect = false;
-		$ajax = Minz_Request::param ('ajax');
-		if ($ajax) {
-			$this->view->_useLayout (false);
 		}
 	}
 
-	public function lastAction () {
+	/**
-		$ajax = Minz_Request::param ('ajax');
+	 * Mark one or several entries as read (or not!).
-		if (!$ajax && $this->redirect) {
+	 *
-			Minz_Request::forward (array (
+	 * If request concerns several entries, it MUST be a POST request.
-				'c' => 'index',
+	 * If request concerns several entries, only mark them as read is available.
-				'a' => 'index',
+	 *
-				'params' => $this->params
+	 * Parameters are:
-			), true);
+	 *   - id (default: false)
-		} else {
+	 *   - get (default: false) /(c_\d+|f_\d+|s|a)/
-			Minz_Request::_param ('ajax');
+	 *   - nextGet (default: $get)
-		}
+	 *   - idMax (default: 0)
-	}
+	 *   - is_read (default: true)
-
+	 */
-	public function readAction () {
+	public function readAction() {
-		$this->redirect = true;
+		$id = Minz_Request::param('id');
-
+		$get = Minz_Request::param('get');
-		$id = Minz_Request::param ('id');
+		$next_get = Minz_Request::param('nextGet', $get);
-		$get = Minz_Request::param ('get');
+		$id_max = Minz_Request::param('idMax', 0);
-		$nextGet = Minz_Request::param ('nextGet', $get); 
+		$params = array();
-		$idMax = Minz_Request::param ('idMax', 0);
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
-		if ($id == false) {
+		if ($id === false) {
+			// id is false? It MUST be a POST request!
 			if (!Minz_Request::isPost()) {
 				return;
 			}
 
 			if (!$get) {
-				$entryDAO->markReadEntries ($idMax);
+				// No get? Mark all entries as read (from $id_max)
+				$entryDAO->markReadEntries($id_max);
 			} else {
-				$typeGet = $get[0];
+				$type_get = $get[0];
-				$get = substr ($get, 2);
+				$get = substr($get, 2);
-				switch ($typeGet) {
+				switch($type_get) {
-					case 'c':
+				case 'c':
-						$entryDAO->markReadCat ($get, $idMax);
+					$entryDAO->markReadCat($get, $id_max);
-						break;
+					break;
-					case 'f':
+				case 'f':
-						$entryDAO->markReadFeed ($get, $idMax);
+					$entryDAO->markReadFeed($get, $id_max);
-						break;
+					break;
-					case 's':
+				case 's':
-						$entryDAO->markReadEntries ($idMax, true);
+					$entryDAO->markReadEntries($id_max, true);
-						break;
+					break;
-					case 'a':
+				case 'a':
-						$entryDAO->markReadEntries ($idMax);
+					$entryDAO->markReadEntries($id_max);
-						break;
+					break;
 				}
-				if ($nextGet !== 'a') {
+
-					$this->params['get'] = $nextGet;
+				if ($next_get !== 'a') {
+					// Redirect to the correct page (category, feed or starred)
+					// Not "a" because it is the default value if nothing is
+					// given.
+					$params['get'] = $next_get;
 				}
 			}
-
-			$notif = array (
-				'type' => 'good',
-				'content' => Minz_Translate::t ('feeds_marked_read')
-			);
-			Minz_Session::_param ('notification', $notif);
 		} else {
-			$is_read = (bool)(Minz_Request::param ('is_read', true));
+			$is_read = (bool)(Minz_Request::param('is_read', true));
-			$entryDAO->markRead ($id, $is_read);
+			$entryDAO->markRead($id, $is_read);
+		}
+
+		if (!$this->ajax) {
+			Minz_Request::good(_t('feedback.sub.feed.marked_read'), array(
+				'c' => 'index',
+				'a' => 'index',
+				'params' => $params,
+			), true);
 		}
 	}
 
-	public function bookmarkAction () {
+	/**
-		$this->redirect = true;
+	 * This action marks an entry as favourite (bookmark) or not.
-
+	 *
-		$id = Minz_Request::param ('id');
+	 * Parameter is:
-		if ($id) {
+	 *   - id (default: false)
+	 *   - is_favorite (default: true)
+	 * If id is false, nothing happened.
+	 */
+	public function bookmarkAction() {
+		$id = Minz_Request::param('id');
+		$is_favourite = (bool)Minz_Request::param('is_favorite', true);
+		if ($id !== false) {
 			$entryDAO = FreshRSS_Factory::createEntryDao();
-			$entryDAO->markFavorite ($id, (bool)(Minz_Request::param ('is_favorite', true)));
+			$entryDAO->markFavorite($id, $is_favourite);
+		}
+
+		if (!$this->ajax) {
+			Minz_Request::forward(array(
+				'c' => 'index',
+				'a' => 'index',
+			), true);
 		}
 	}
 
+	/**
+	 * This action optimizes database to reduce its size.
+	 *
+	 * This action shouldbe reached by a POST request.
+	 *
+	 * @todo move this action in configure controller.
+	 * @todo call this action through web-cron when available
+	 */
 	public function optimizeAction() {
-		if (Minz_Request::isPost()) {
+		$url_redirect = array(
-			@set_time_limit(300);
+			'c' => 'configure',
+			'a' => 'archiving',
+		);
 
-			// La table des entrées a tendance à grossir énormément
+		if (!Minz_Request::isPost()) {
-			// Cette action permet d'optimiser cette table permettant de grapiller un peu de place
+			Minz_Request::forward($url_redirect, true);
-			// Cette fonctionnalité n'est à appeler qu'occasionnellement
-			$entryDAO = FreshRSS_Factory::createEntryDao();
-			$entryDAO->optimizeTable();
-
-			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$feedDAO->updateCachedValues();
-
-			invalidateHttpCache();
-
-			$notif = array (
-				'type' => 'good',
-				'content' => Minz_Translate::t ('optimization_complete')
-			);
-			Minz_Session::_param ('notification', $notif);
 		}
 
-		Minz_Request::forward(array(
+		@set_time_limit(300);
-			'c' => 'configure',
+
-			'a' => 'archiving'
+		$entryDAO = FreshRSS_Factory::createEntryDao();
-		), true);
+		$entryDAO->optimizeTable();
+
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$feedDAO->updateCachedValues();
+
+		invalidateHttpCache();
+		Minz_Request::good(_t('feedback.admin.optimization_complete'), $url_redirect);
 	}
 
+	/**
+	 * This action purges old entries from feeds.
+	 *
+	 * @todo should be a POST request
+	 * @todo should be in feedController
+	 */
 	public function purgeAction() {
 		@set_time_limit(300);
 
-		$nb_month_old = max($this->view->conf->old_entries, 1);
+		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$feeds = $feedDAO->listFeeds();
-		$nbTotal = 0;
+		$nb_total = 0;
 
 		invalidateHttpCache();
 
 		foreach ($feeds as $feed) {
-			$feedHistory = $feed->keepHistory();
+			$feed_history = $feed->keepHistory();
-			if ($feedHistory == -2) {	//default
+			if ($feed_history == -2) {
-				$feedHistory = $this->view->conf->keep_history_default;
+				// TODO: -2 must be a constant!
+				// -2 means we take the default value from configuration
+				$feed_history = FreshRSS_Context::$user_conf->keep_history_default;
 			}
-			if ($feedHistory >= 0) {
+
-				$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feedHistory);
+			if ($feed_history >= 0) {
+				$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feed_history);
 				if ($nb > 0) {
-					$nbTotal += $nb;
+					$nb_total += $nb;
-					Minz_Log::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());
 				}
 			}
 		}
@@ -152,16 +183,9 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$feedDAO->updateCachedValues();
 
 		invalidateHttpCache();
-
+		Minz_Request::good(_t('feedback.sub.purge_completed', $nb_total), array(
-		$notif = array(
-			'type' => 'good',
-			'content' => Minz_Translate::t('purge_completed', $nbTotal)
-		);
-		Minz_Session::_param('notification', $notif);
-
-		Minz_Request::forward(array(
 			'c' => 'configure',
 			'a' => 'archiving'
-		), true);
+		));
 	}
 }

sources/app/Controllers/errorController.php

@@ -1,36 +1,51 @@
 <?php
 
+/**
+ * Controller to handle error page.
+ */
 class FreshRSS_error_Controller extends Minz_ActionController {
+	/**
+	 * This action is the default one for the controller.
+	 *
+	 * It is called by Minz_Error::error() method.
+	 *
+	 * Parameters are passed by Minz_Session to have a proper url:
+	 *   - error_code (default: 404)
+	 *   - error_logs (default: array())
+	 */
 	public function indexAction() {
-		switch (Minz_Request::param('code')) {
+		$code_int = Minz_Session::param('error_code', 404);
-			case 403:
+		$error_logs = Minz_Session::param('error_logs', array());
-				$this->view->code = 'Error 403 - Forbidden';
+		Minz_Session::_param('error_code');
-				break;
+		Minz_Session::_param('error_logs');
-			case 404:
+
-				$this->view->code = 'Error 404 - Not found';
+		switch ($code_int) {
-				break;
+		case 200 :
-			case 500:
+			header('HTTP/1.1 200 OK');
-				$this->view->code = 'Error 500 - Internal Server Error';
+			break;
-				break;
+		case 403:
-			case 503:
+			header('HTTP/1.1 403 Forbidden');
-				$this->view->code = 'Error 503 - Service Unavailable';
+			$this->view->code = 'Error 403 - Forbidden';
-				break;
+			$this->view->errorMessage = _t('feedback.access.denied');
-			default:
+			break;
-				$this->view->code = 'Error 404 - Not found';
+		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());
+		$error_message = trim(implode($error_logs));
-		$this->view->errorMessage = trim(implode($errors));
+		if ($error_message !== '') {
-		if ($this->view->errorMessage == '') {
+			$this->view->errorMessage = $error_message;
-			switch(Minz_Request::param('code')) {
-				case 403:
-					$this->view->errorMessage = Minz_Translate::t('forbidden_access');
-					break;
-				case 404:
-				default:
-					$this->view->errorMessage = Minz_Translate::t('page_not_found');
-					break;
-			}
 		}
 
 		Minz_View::prependTitle($this->view->code . ' · ');

sources/app/Controllers/extensionController.php

@@ -0,0 +1,215 @@
+<?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 = array(
+			'system' => array(),
+			'user' => array(),
+		);
+
+		$extensions = Minz_ExtensionManager::listExtensions();
+		foreach ($extensions as $ext) {
+			$this->view->extension_list[$ext->getType()][] = $ext;
+		}
+	}
+
+	/**
+	 * This action handles configuration of a given extension.
+	 *
+	 * Only administrator can configure a system extension.
+	 *
+	 * Parameters are:
+	 * - e: the extension name (urlencoded)
+	 * - additional parameters which should be handle by the extension
+	 *   handleConfigureAction() method (POST request).
+	 */
+	public function configureAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		} else {
+			$this->indexAction();
+			$this->view->change_view('extension', 'index');
+		}
+
+		$ext_name = urldecode(Minz_Request::param('e'));
+		$ext = Minz_ExtensionManager::findExtension($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;
+		$this->view->extension->handleConfigureAction();
+	}
+
+	/**
+	 * This action enables a disabled extension for the current user.
+	 *
+	 * System extensions can only be enabled by an administrator.
+	 * This action must be reached by a POST request.
+	 *
+	 * Parameter is:
+	 * - e: the extension name (urlencoded).
+	 */
+	public function enableAction() {
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
+			}
+
+			if ($ext->isEnabled()) {
+				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name),
+				                  $url_redirect);
+			}
+
+			$conf = null;
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$conf = FreshRSS_Context::$system_conf;
+			} elseif ($ext->getType() === 'user') {
+				$conf = FreshRSS_Context::$user_conf;
+			} else {
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+				                  $url_redirect);
+			}
+
+			$res = $ext->install();
+
+			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.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);
+	}
+
+	/**
+	 * This action disables an enabled extension for the current user.
+	 *
+	 * System extensions can only be disabled by an administrator.
+	 * This action must be reached by a POST request.
+	 *
+	 * Parameter is:
+	 * - e: the extension name (urlencoded).
+	 */
+	public function disableAction() {
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
+			}
+
+			if (!$ext->isEnabled()) {
+				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name),
+				                  $url_redirect);
+			}
+
+			$conf = null;
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$conf = FreshRSS_Context::$system_conf;
+			} elseif ($ext->getType() === 'user') {
+				$conf = FreshRSS_Context::$user_conf;
+			} else {
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+				                  $url_redirect);
+			}
+
+			$res = $ext->uninstall();
+
+			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.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);
+	}
+
+	/**
+	 * This action handles deletion of an extension.
+	 *
+	 * Only administrator can remove an extension.
+	 * This action must be reached by a POST request.
+	 *
+	 * Parameter is:
+	 * -e: extension name (urlencoded)
+	 */
+	public function removeAction() {
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::findExtension($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);
+	}
+}

sources/app/Controllers/feedController.php

@@ -1,180 +1,217 @@
 <?php
 
+/**
+ * Controller to handle every feed actions.
+ */
 class FreshRSS_feed_Controller extends Minz_ActionController {
-	public function firstAction () {
+	/**
-		if (!$this->view->loginOk) {
+	 * 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()) {
 			// Token is useful in the case that anonymous refresh is forbidden
 			// and CRON task cannot be used with php command so the user can
 			// set a CRON task to refresh his feeds by using token inside url
-			$token = $this->view->conf->token;
+			$token = FreshRSS_Context::$user_conf->token;
-			$token_param = Minz_Request::param ('token', '');
+			$token_param = Minz_Request::param('token', '');
 			$token_is_ok = ($token != '' && $token == $token_param);
-			$action = Minz_Request::actionName ();
+			$action = Minz_Request::actionName();
-			if (!(($token_is_ok || Minz_Configuration::allowAnonymousRefresh()) &&
+			$allow_anonymous_refresh = FreshRSS_Context::$system_conf->allow_anonymous_refresh;
-				$action === 'actualize')
+			if ($action !== 'actualize' ||
-			) {
+					!($allow_anonymous_refresh || $token_is_ok)) {
-				Minz_Error::error (
+				Minz_Error::error(403);
-					403,
-					array ('error' => array (Minz_Translate::t ('access_denied')))
-				);
 			}
 		}
 	}
 
-	public function addAction () {
+	/**
-		$url = Minz_Request::param('url_rss', false);
+	 * 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');
 
 		if ($url === false) {
+			// No url, do nothing
 			Minz_Request::forward(array(
-				'c' => 'configure',
+				'c' => 'subscription',
-				'a' => 'feed'
+				'a' => 'index'
 			), true);
 		}
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->catDAO = new FreshRSS_CategoryDAO ();
+		$this->catDAO = new FreshRSS_CategoryDAO();
-		$this->catDAO->checkDefault ();
+		$url_redirect = array(
+			'c' => 'subscription',
+			'a' => 'index',
+			'params' => array(),
+		);
+
+		$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']),
+			                  $url_redirect);
+		}
 
 		if (Minz_Request::isPost()) {
 			@set_time_limit(300);
 
-
+			$cat = Minz_Request::param('category');
-			$cat = Minz_Request::param ('category', false);
 			if ($cat === 'nc') {
-				$new_cat = Minz_Request::param ('new_category');
+				// User want to create a new category, new_category parameter
+				// must exist
+				$new_cat = Minz_Request::param('new_category');
 				if (empty($new_cat['name'])) {
 					$cat = false;
 				} else {
 					$cat = $this->catDAO->addCategory($new_cat);
 				}
 			}
+
 			if ($cat === false) {
-				$def_cat = $this->catDAO->getDefault ();
+				// If category was not given or if creating new category failed,
-				$cat = $def_cat->id ();
+				// get the default category
+				$this->catDAO->checkDefault();
+				$def_cat = $this->catDAO->getDefault();
+				$cat = $def_cat->id();
 			}
 
-			$user = Minz_Request::param ('http_user');
+			// HTTP information are useful if feed is protected behind a
-			$pass = Minz_Request::param ('http_pass');
+			// HTTP authentication
-			$params = array ();
+			$user = Minz_Request::param('http_user');
+			$pass = Minz_Request::param('http_pass');
+			$http_auth = '';
+			if ($user != '' || $pass != '') {
+				$http_auth = $user . ':' . $pass;
+			}
 
-			$transactionStarted = false;
+			$transaction_started = false;
 			try {
-				$feed = new FreshRSS_Feed ($url);
+				$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' => Minz_Translate::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' => Minz_Translate::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' => Minz_Translate::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) {
-				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
+				// Given url was not a valid url!
-				$notif = array (
+				Minz_Log::warning($e->getMessage());
-					'type' => 'bad',
+				Minz_Request::bad(_t('feedback.sub.feed.invalid_url', $url), $url_redirect);
-					'content' => Minz_Translate::t ('invalid_url', $url)
+			}
-				);
+
-				Minz_Session::_param ('notification', $notif);
+			try {
+				$feed->load(true);
 			} catch (FreshRSS_Feed_Exception $e) {
-				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
+				// Something went bad (timeout, server not found, etc.)
-				$notif = array (
+				Minz_Log::warning($e->getMessage());
-					'type' => 'bad',
+				Minz_Request::bad(
-					'content' => Minz_Translate::t ('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					_t('feedback.sub.feed.internal_problem', _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::record ($e->getMessage (), Minz_Log::ERROR);
+				Minz_Log::error($e->getMessage());
-				$notif = array (
+				Minz_Request::bad(
-					'type' => 'bad',
+					_t('feedback.sub.feed.internal_problem', _url('index', 'logs')),
-					'content' => Minz_Translate::t ('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					$url_redirect
 				);
-				Minz_Session::_param ('notification', $notif);
-			}
-			if ($transactionStarted) {
-				$feedDAO->rollBack ();
 			}
 
-			Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => $params), true);
+			if ($feedDAO->searchByUrl($feed->url())) {
+				Minz_Request::bad(
+					_t('feedback.sub.feed.already_subscribed', $feed->name()),
+					$url_redirect
+				);
+			}
+
+			$feed->_category($cat);
+			$feed->_httpAuth($http_auth);
+
+			// Call the extension hook
+			$name = $feed->name();
+			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
+			if (is_null($feed)) {
+				Minz_Request::bad(_t('feed_not_added', $name), $url_redirect);
+			}
+
+			$values = array(
+				'url' => $feed->url(),
+				'category' => $feed->category(),
+				'name' => $feed->name(),
+				'website' => $feed->website(),
+				'description' => $feed->description(),
+				'lastUpdate' => time(),
+				'httpAuth' => $feed->httpAuth(),
+			);
+
+			$id = $feedDAO->addFeed($values);
+			if (!$id) {
+				// There was an error in database... we cannot say what here.
+				Minz_Request::bad(_t('feedback.sub.feed.not_added', $feed->name()), $url_redirect);
+			}
+
+			// Ok, feed has been added in database. Now we have to refresh entries.
+			$feed->_id($id);
+			$feed->faviconPrepare();
+
+			$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
+
+			$entryDAO = FreshRSS_Factory::createEntryDao();
+			// We want chronological order and SimplePie uses reverse order.
+			$entries = array_reverse($feed->entries());
+
+			// Calculate date of oldest entries we accept in DB.
+			$nb_month_old = FreshRSS_Context::$user_conf->old_entries;
+			$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
+
+			// Use a shared statement and a transaction to improve a LOT the
+			// performances.
+			$prepared_statement = $entryDAO->addEntryPrepare();
+			$feedDAO->beginTransaction();
+			foreach ($entries as $entry) {
+				// Entries are added without any verification.
+				$entry->_feed($feed->id());
+				$entry->_id(min(time(), $entry->date(true)) . uSecString());
+				$entry->_isRead($is_read);
+
+				$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+				if (is_null($entry)) {
+					// An extension has returned a null value, there is nothing to insert.
+					continue;
+				}
+
+				$values = $entry->toArray();
+				$entryDAO->addEntry($values, $prepared_statement);
+			}
+			$feedDAO->updateLastUpdate($feed->id());
+			$feedDAO->commit();
+
+			// Entries are in DB, we redirect to feed configuration page.
+			$url_redirect['params']['id'] = $feed->id();
+			Minz_Request::good(_t('feedback.sub.feed.added', $feed->name()), $url_redirect);
 		} else {
+			// GET request: we must ask confirmation to user before adding feed.
+			Minz_View::prependTitle(_t('sub.feed.title_add') . ' · ');
 
-			// GET request so we must ask confirmation to user
-			Minz_View::prependTitle(Minz_Translate::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) {
@@ -183,256 +220,291 @@ 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
+				// Already subscribe so we redirect to the feed configuration page.
-				$notif = array(
+				$url_redirect['params']['id'] = $feed->id();
-					'type' => 'bad',
+				Minz_Request::good(_t('feedback.sub.feed.already_subscribed', $feed->name()), $url_redirect);
-					'content' => Minz_Translate::t(
-						'already_subscribed', $feed->name()
-					)
-				);
-				Minz_Session::_param('notification', $notif);
-
-				Minz_Request::forward(array(
-					'c' => 'configure',
-					'a' => 'feed',
-					'params' => array(
-						'id' => $feed->id()
-					)
-				), true);
 			}
 		}
 	}
 
-	public function truncateAction () {
+	/**
-		if (Minz_Request::isPost ()) {
+	 * This action remove entries from a given feed.
-			$id = Minz_Request::param ('id');
+	 *
-			$feedDAO = FreshRSS_Factory::createFeedDao();
+	 * It should be reached by a POST action.
-			$n = $feedDAO->truncate($id);
+	 *
-			$notif = array(
+	 * Parameter is:
-				'type' => $n === false ? 'bad' : 'good',
+	 *   - id (default: false)
-				'content' => Minz_Translate::t ('n_entries_deleted', $n)
+	 */
-			);
+	public function truncateAction() {
-			Minz_Session::_param ('notification', $notif);
+		$id = Minz_Request::param('id');
-			invalidateHttpCache();
+		$url_redirect = array(
-			Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true);
+			'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('feedback.sub.feed.error'), $url_redirect);
+		} else {
+			Minz_Request::good(_t('feedback.sub.feed.n_entries_deleted', $n), $url_redirect);
 		}
 	}
 
-	public function actualizeAction () {
+	/**
+	 * 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);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 
 		Minz_Session::_param('actualize_feeds', false);
-		$id = Minz_Request::param ('id');
+		$id = Minz_Request::param('id');
-		$force = Minz_Request::param ('force', false);
+		$force = Minz_Request::param('force');
 
-		// on créé la liste des flux à mettre à actualiser
+		// Create a list of feeds to actualize.
-		// si on veut mettre un flux à jour spécifiquement, on le met
+		// If id is set and valid, corresponding feed is added to the list but
-		// dans la liste, mais seul (permet d'automatiser le traitement)
+		// alone in order to automatize further process.
-		$feeds = array ();
+		$feeds = array();
 		if ($id) {
-			$feed = $feedDAO->searchById ($id);
+			$feed = $feedDAO->searchById($id);
 			if ($feed) {
-				$feeds = array ($feed);
+				$feeds[] = $feed;
 			}
 		} else {
-			$feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
+			$feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_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);
+		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
-		$date_min = time () - (3600 * 24 * 30 * $nb_month_old);
+		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
 
-		$i = 0;
+		$updated_feeds = 0;
-		$flux_update = 0;
+		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
-		$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 {
-				$url = $feed->url();
+				// Load entries
-				$feedHistory = $feed->keepHistory();
-
 				$feed->load(false);
-				$entries = array_reverse($feed->entries());	//We want chronological order and SimplePie uses reverse order
-				$hasTransaction = false;
-
-				if (count($entries) > 0) {
-					//For this feed, check last n entry GUIDs already in database
-					$existingGuids = array_fill_keys ($entryDAO->listLastGuidsByFeed ($feed->id (), count($entries) + 10), 1);
-					$useDeclaredDate = empty($existingGuids);
-
-					if ($feedHistory == -2) {	//default
-						$feedHistory = $this->view->conf->keep_history_default;
-					}
-
-					$preparedStatement = $entryDAO->addEntryPrepare();
-					$hasTransaction = true;
-					$feedDAO->beginTransaction();
-
-					// On ne vérifie pas strictement que l'article n'est pas déjà en BDD
-					// La BDD refusera l'ajout car (id_feed, guid) doit être unique
-					foreach ($entries as $entry) {
-						$eDate = $entry->date(true);
-						if ((!isset($existingGuids[$entry->guid()])) &&
-							(($feedHistory != 0) || ($eDate  >= $date_min))) {
-							$values = $entry->toArray();
-							//Use declared date at first import, otherwise use discovery date
-							$values['id'] = ($useDeclaredDate || $eDate < $date_min) ?
-								min(time(), $eDate) . uSecString() :
-								uTimeString();
-							$values['is_read'] = $is_read;
-							$entryDAO->addEntry($values, $preparedStatement);
-						}
-					}
-				}
-
-				if (($feedHistory >= 0) && (rand(0, 30) === 1)) {
-					if (!$hasTransaction) {
-						$feedDAO->beginTransaction();
-					}
-					$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, max($feedHistory, count($entries) + 10));
-					if ($nb > 0) {
-						Minz_Log::record ($nb . ' old entries cleaned in feed [' . $feed->url() . ']', Minz_Log::DEBUG);
-					}
-				}
-
-				// on indique que le flux vient d'être mis à jour en BDD
-				$feedDAO->updateLastUpdate ($feed->id (), 0, $hasTransaction);
-				if ($hasTransaction) {
-					$feedDAO->commit();
-				}
-				$flux_update++;
-				if (($feed->url() !== $url)) {	//HTTP 301 Moved Permanently
-					Minz_Log::record('Feed ' . $url . ' moved permanently to ' . $feed->url(), Minz_Log::NOTICE);
-					$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);
+				$feedDAO->updateLastUpdate($feed->id(), 1);
+				$feed->unlock();
+				continue;
+			}
+
+			$url = $feed->url();
+			$feed_history = $feed->keepHistory();
+			if ($feed_history == -2) {
+				// TODO: -2 must be a constant!
+				// -2 means we take the default value from configuration
+				$feed_history = FreshRSS_Context::$user_conf->keep_history_default;
+			}
+
+			// We want chronological order and SimplePie uses reverse order.
+			$entries = array_reverse($feed->entries());
+			if (count($entries) > 0) {
+				// For this feed, check last n entry GUIDs already in database.
+				$existing_guids = array_fill_keys($entryDAO->listLastGuidsByFeed(
+					$feed->id(), count($entries) + 10
+				), 1);
+				$use_declared_date = empty($existing_guids);
+
+				// Add entries in database if possible.
+				$prepared_statement = $entryDAO->addEntryPrepare();
+				$feedDAO->beginTransaction();
+				foreach ($entries as $entry) {
+					$entry_date = $entry->date(true);
+					if (isset($existing_guids[$entry->guid()]) ||
+							($feed_history == 0 && $entry_date < $date_min)) {
+						// This entry already exists in DB or should not be added
+						// considering configuration and date.
+						continue;
+					}
+
+					$id = uTimeString();
+					if ($use_declared_date || $entry_date < $date_min) {
+						// Use declared date at first import.
+						$id = min(time(), $entry_date) . uSecString();
+					}
+
+					$entry->_id($id);
+					$entry->_isRead($is_read);
+
+					$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+					if (is_null($entry)) {
+						// An extension has returned a null value, there is nothing to insert.
+						continue;
+					}
+
+					$values = $entry->toArray();
+					$entryDAO->addEntry($values, $prepared_statement);
+				}
+			}
+
+			if ($feed_history >= 0 && rand(0, 30) === 1) {
+				// TODO: move this function in web cron when available (see entry::purge)
+				// Remove old entries once in 30.
+				if (!$feedDAO->hasTransaction()) {
+					$feedDAO->beginTransaction();
+				}
+
+				$nb = $feedDAO->cleanOldEntries($feed->id(),
+				                                $date_min,
+				                                max($feed_history, count($entries) + 10));
+				if ($nb > 0) {
+					Minz_Log::debug($nb . ' old entries cleaned in feed [' .
+					                $feed->url() . ']');
+				}
+			}
+
+			$feedDAO->updateLastUpdate($feed->id(), 0, $feedDAO->hasTransaction());
+			if ($feedDAO->hasTransaction()) {
+				$feedDAO->commit();
+			}
+
+			if ($feed->url() !== $url) {
+				// HTTP 301 Moved Permanently
+				Minz_Log::notice('Feed ' . $url . ' moved permanently to ' . $feed->url());
+				$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 			}
 
 			$feed->faviconPrepare();
 			$feed->unlock();
+			$updated_feeds++;
 			unset($feed);
 
-			// On arrête à 10 flux pour ne pas surcharger le serveur
+			// No more than 10 feeds unless $force is true to avoid overloading
-			// sauf si le paramètre $force est à vrai
+			// the server.
-			$i++;
+			if ($updated_feeds >= 10 && !$force) {
-			if ($i >= 10 && !$force) {
 				break;
 			}
 		}
 
-		$url = array ();
+		if (Minz_Request::param('ajax')) {
-		if ($flux_update === 1) {
+			// Most of the time, ajax request is for only one feed. But since
-			// on a mis un seul flux à jour
+			// there are several parallel requests, we should return that there
-			$feed = reset ($feeds);
+			// are several updated feeds.
-			$notif = array (
+			$notif = array(
 				'type' => 'good',
-				'content' => Minz_Translate::t ('feed_actualized', $feed->name ())
+				'content' => _t('feedback.sub.feed.actualizeds')
-			);
-		} elseif ($flux_update > 1) {
-			// plusieurs flux on été mis à jour
-			$notif = array (
-				'type' => 'good',
-				'content' => Minz_Translate::t ('n_feeds_actualized', $flux_update)
-			);
-		} else {
-			// aucun flux n'a été mis à jour, oups
-			$notif = array (
-				'type' => 'good',
-				'content' => Minz_Translate::t ('no_feed_to_refresh')
 			);
+			Minz_Session::_param('notification', $notif);
+			// No layout in ajax request.
+			$this->view->_useLayout(false);
+			return;
 		}
 
-		if ($i === 1) {
+		// Redirect to the main page with correct notification.
-			// Si on a voulu mettre à jour qu'un flux
+		if ($updated_feeds === 1) {
-			// on filtre l'affichage par ce flux
+			$feed = reset($feeds);
-			$feed = reset ($feeds);
+			Minz_Request::good(_t('feedback.sub.feed.actualized', $feed->name()), array(
-			$url['params'] = array ('get' => 'f_' . $feed->id ());
+				'params' => array('get' => 'f_' . $feed->id())
-		}
+			));
-
+		} elseif ($updated_feeds > 1) {
-		if (Minz_Request::param ('ajax', 0) === 0) {
+			Minz_Request::good(_t('feedback.sub.feed.n_actualized', $updated_feeds), array());
-			Minz_Session::_param ('notification', $notif);
-			Minz_Request::forward ($url, true);
 		} else {
-			// Une requête Ajax met un seul flux à jour.
+			Minz_Request::good(_t('feedback.sub.feed.no_refresh'), array());
-			// 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' => Minz_Translate::t ('feeds_actualized')
-			);
-			Minz_Session::_param ('notification', $notif);
-			// et on désactive le layout car ne sert à rien
-			$this->view->_useLayout (false);
 		}
 	}
 
-	public function deleteAction () {
+	/**
-		if (Minz_Request::isPost ()) {
+	 * This action changes the category of a feed.
-			$type = Minz_Request::param ('type', 'feed');
+	 *
-			$id = Minz_Request::param ('id');
+	 * 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()) {
+			Minz_Request::forward(array('c' => 'subscription'), true);
+		}
 
-			$feedDAO = FreshRSS_Factory::createFeedDao();
+		$feed_id = Minz_Request::param('f_id');
-			if ($type == 'category') {
+		$cat_id = Minz_Request::param('c_id');
-				// List feeds to remove then related user queries.
-				$feeds = $feedDAO->listByCategory($id);
 
-				if ($feedDAO->deleteFeedByCategory ($id)) {
+		if ($cat_id === false) {
-					// Remove related queries
+			// If category was not given get the default one.
-					foreach ($feeds as $feed) {
+			$catDAO = new FreshRSS_CategoryDAO();
-						$this->view->conf->remove_query_by_get('f_' . $feed->id());
+			$catDAO->checkDefault();
-					}
+			$def_cat = $catDAO->getDefault();
-					$this->view->conf->save();
+			$cat_id = $def_cat->id();
+		}
 
-					$notif = array (
+		$feedDAO = FreshRSS_Factory::createFeedDao();
-						'type' => 'good',
+		$values = array('category' => $cat_id);
-						'content' => Minz_Translate::t ('category_emptied')
-					);
-					//TODO: Delete old favicons
-				} else {
-					$notif = array (
-						'type' => 'bad',
-						'content' => Minz_Translate::t ('error_occured')
-					);
-				}
-			} else {
-				if ($feedDAO->deleteFeed ($id)) {
-					// Remove related queries
-					$this->view->conf->remove_query_by_get('f_' . $id);
-					$this->view->conf->save();
 
-					$notif = array (
+		$feed = $feedDAO->searchById($feed_id);
-						'type' => 'good',
+		if ($feed && ($feed->category() == $cat_id ||
-						'content' => Minz_Translate::t ('feed_deleted')
+		              $feedDAO->updateFeed($feed_id, $values))) {
-					);
+			// TODO: return something useful
-					//TODO: Delete old favicon
+		} else {
-				} else {
+			Minz_Log::warning('Cannot move feed `' . $feed_id . '` ' .
-					$notif = array (
+			                  'in the category `' . $cat_id . '`');
-						'type' => 'bad',
+			Minz_Error::error(404);
-						'content' => Minz_Translate::t ('error_occured')
+		}
-					);
+	}
-				}
-			}
 
-			Minz_Session::_param ('notification', $notif);
+	/**
+	 * 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() {
+		$redirect_url = Minz_Request::param('r', false, true);
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'subscription', 'a' => 'index');
+		}
 
-			$redirect_url = Minz_Request::param('r', false, true);
+		if (!Minz_Request::isPost()) {
-			if ($redirect_url) {
+			Minz_Request::forward($redirect_url, true);
-				Minz_Request::forward($redirect_url);
+		}
-			} elseif ($type == 'category') {
+
-				Minz_Request::forward(array ('c' => 'configure', 'a' => 'categorize'), true);
+		$id = Minz_Request::param('id');
-			} else {
+		$feedDAO = FreshRSS_Factory::createFeedDao();
-				Minz_Request::forward(array ('c' => 'configure', 'a' => 'feed'), true);
+		if ($feedDAO->deleteFeed($id)) {
-			}
+			// TODO: Delete old favicon
+
+			// Remove related queries
+			FreshRSS_Context::$user_conf->queries = remove_query_by_get(
+				'f_' . $id, FreshRSS_Context::$user_conf->queries);
+			FreshRSS_Context::$user_conf->save();
+
+			Minz_Request::good(_t('feedback.sub.feed.deleted'), $redirect_url);
+		} else {
+			Minz_Request::bad(_t('feedback.sub.feed.error'), $redirect_url);
 		}
 	}
 }

sources/app/Controllers/importExportController.php

@@ -1,12 +1,17 @@
 <?php
 
+/**
+ * Controller to handle every import and export actions.
+ */
 class FreshRSS_importExport_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
+			Minz_Error::error(403);
-				403,
-				array('error' => array(_t('access_denied')))
-			);
 		}
 
 		require_once(LIB_PATH . '/lib_opml.php');
@@ -16,13 +21,23 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$this->feedDAO = FreshRSS_Factory::createFeedDao();
 	}
 
+	/**
+	 * This action displays the main page for import / export system.
+	 */
 	public function indexAction() {
-		$this->view->categories = $this->catDAO->listCategories();
 		$this->view->feeds = $this->feedDAO->listFeeds();
-
+		Minz_View::prependTitle(_t('sub.import_export.title') . ' · ');
-		Minz_View::prependTitle(_t('import_export') . ' · ');
 	}
 
+	/**
+	 * This action handles import action.
+	 *
+	 * It must be reached by a POST request.
+	 *
+	 * Parameter is:
+	 *   - file (default: nothing!)
+	 * Available file types are: zip, json or xml.
+	 */
 	public function importAction() {
 		if (!Minz_Request::isPost()) {
 			Minz_Request::forward(array('c' => 'importExport', 'a' => 'index'), true);
@@ -33,7 +48,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		if ($status_file !== 0) {
 			Minz_Log::error('File cannot be uploaded. Error code: ' . $status_file);
-			Minz_Request::bad(_t('file_cannot_be_uploaded'),
+			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'),
 			                  array('c' => 'importExport', 'a' => 'index'));
 		}
 
@@ -55,7 +70,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			if (!is_resource($zip)) {
 				// zip_open cannot open file: something is wrong
 				Minz_Log::error('Zip archive cannot be imported. Error code: ' . $zip);
-				Minz_Request::bad(_t('zip_error'),
+				Minz_Request::bad(_t('feedback.import_export.zip_error'),
 				                  array('c' => 'importExport', 'a' => 'index'));
 			}
 
@@ -77,7 +92,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			zip_close($zip);
 		} elseif ($type_file === 'zip') {
 			// Zip extension is not loaded
-			Minz_Request::bad(_t('no_zip_extension'),
+			Minz_Request::bad(_t('feedback.import_export.no_zip_extension'),
 			                  array('c' => 'importExport', 'a' => 'index'));
 		} elseif ($type_file !== 'unknown') {
 			$list_files[$type_file][] = file_get_contents($file['tmp_name']);
@@ -92,24 +107,26 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$error = $this->importOpml($opml_file);
 		}
 		foreach ($list_files['json_starred'] as $article_file) {
-			$error = $this->importArticles($article_file, true);
+			$error = $this->importJson($article_file, true);
 		}
 		foreach ($list_files['json_feed'] as $article_file) {
-			$error = $this->importArticles($article_file);
+			$error = $this->importJson($article_file);
 		}
 
 		// And finally, we get import status and redirect to the home page
 		Minz_Session::_param('actualize_feeds', true);
-		$content_notif = $error === true ? _t('feeds_imported_with_errors') :
+		$content_notif = $error === true ? _t('feedback.import_export.feeds_imported_with_errors') :
-		                                   _t('feeds_imported');
+		                                   _t('feedback.import_export.feeds_imported');
 		Minz_Request::good($content_notif);
 	}
 
+	/**
+	 * This method tries to guess the file type based on its name.
+	 *
+	 * Itis a *very* basic guess file type function. Only based on filename.
+	 * That's could be improved but should be enough for what we have to do.
+	 */
 	private function guessFileType($filename) {
-		// A *very* basic guess file type function. Only based on filename
-		// That's could be improved but should be enough, at least for a first
-		// implementation.
-
 		if (substr_compare($filename, '.zip', -4) === 0) {
 			return 'zip';
 		} elseif (substr_compare($filename, '.opml', -5) === 0 ||
@@ -125,10 +142,16 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This method parses and imports an OPML file.
+	 *
+	 * @param string $opml_file the OPML file content.
+	 * @return boolean true if an error occured, false else.
+	 */
 	private function importOpml($opml_file) {
 		$opml_array = array();
 		try {
-			$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;
@@ -139,35 +162,78 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $this->addOpmlElements($opml_array['body']);
 	}
 
+	/**
+	 * This method imports an OPML file based on its body.
+	 *
+	 * @param array $opml_elements an OPML element (body or outline).
+	 * @param string $parent_cat the name of the parent category.
+	 * @return boolean true if an error occured, false else.
+	 */
 	private function addOpmlElements($opml_elements, $parent_cat = null) {
 		$error = false;
+
+		$nb_feeds = count($this->feedDAO->listFeeds());
+		$nb_cats = count($this->catDAO->listCategories(false));
+		$limits = FreshRSS_Context::$system_conf->limits;
+
 		foreach ($opml_elements as $elt) {
-			$res = false;
+			$is_error = false;
 			if (isset($elt['xmlUrl'])) {
-				$res = $this->addFeedOpml($elt, $parent_cat);
+				// If xmlUrl exists, it means it is a feed
+				if ($nb_feeds >= $limits['max_feeds']) {
+					Minz_Log::warning(_t('feedback.sub.feed.over_max',
+					                  $limits['max_feeds']));
+					$is_error = true;
+					continue;
+				}
+
+				$is_error = $this->addFeedOpml($elt, $parent_cat);
+				if (!$is_error) {
+					$nb_feeds += 1;
+				}
 			} else {
-				$res = $this->addCategoryOpml($elt, $parent_cat);
+				// No xmlUrl? It should be a category!
+				$limit_reached = ($nb_cats >= $limits['max_categories']);
+				if ($limit_reached) {
+					Minz_Log::warning(_t('feedback.sub.category.over_max',
+					                  $limits['max_categories']));
+				}
+
+				$is_error = $this->addCategoryOpml($elt, $parent_cat, $limit_reached);
+				if (!$is_error) {
+					$nb_cats += 1;
+				}
 			}
 
-			if (!$error && $res) {
+			if (!$error && $is_error) {
 				// oops: there is at least one error!
-				$error = $res;
+				$error = $is_error;
 			}
 		}
 
 		return $error;
 	}
 
+	/**
+	 * This method imports an OPML feed element.
+	 *
+	 * @param array $feed_elt an OPML element (must be a feed element).
+	 * @param string $parent_cat the name of the parent category.
+	 * @return boolean true if an error occured, false else.
+	 */
 	private function addFeedOpml($feed_elt, $parent_cat) {
+		$default_cat = $this->catDAO->getDefault();
 		if (is_null($parent_cat)) {
 			// This feed has no parent category so we get the default one
-			$parent_cat = $this->catDAO->getDefault()->name();
+			$parent_cat = $default_cat->name();
 		}
 
 		$cat = $this->catDAO->searchByName($parent_cat);
-
+		if (is_null($cat)) {
-		if (!$cat) {
+			// If there is not $cat, it means parent category does not exist in
-			return true;
+			// database.
+			// If it happens, take the default category.
+			$cat = $default_cat;
 		}
 
 		// We get different useful information
@@ -191,10 +257,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
+			// Call the extension hook
-			// check here
+			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
-			$id = $this->feedDAO->addFeedObject($feed);
+			if (!is_null($feed)) {
-			$error = ($id === false);
+				// 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;
@@ -203,12 +275,24 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $error;
 	}
 
-	private function addCategoryOpml($cat_elt, $parent_cat) {
+	/**
+	 * This method imports an OPML category element.
+	 *
+	 * @param array $cat_elt an OPML element (must be a category element).
+	 * @param string $parent_cat the name of the parent category.
+	 * @param boolean $cat_limit_reached indicates if category limit has been reached.
+	 *                if yes, category is not added (but we try for feeds!)
+	 * @return boolean true if an error occured, false else.
+	 */
+	private function addCategoryOpml($cat_elt, $parent_cat, $cat_limit_reached) {
 		// Create a new Category object
 		$cat = new FreshRSS_Category(Minz_Helper::htmlspecialchars_utf8($cat_elt['text']));
 
-		$id = $this->catDAO->addCategoryObject($cat);
+		$error = true;
-		$error = ($id === false);
+		if (!$cat_limit_reached) {
+			$id = $this->catDAO->addCategoryObject($cat);
+			$error = ($id === false);
+		}
 
 		if (isset($cat_elt['@outlines'])) {
 			// Our cat_elt contains more categories or more feeds, so we
@@ -223,28 +307,55 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $error;
 	}
 
-	private function importArticles($article_file, $starred = false) {
+	/**
+	 * This method import a JSON-based file (Google Reader format).
+	 *
+	 * @param string $article_file the JSON file content.
+	 * @param boolean $starred true if articles from the file must be starred.
+	 * @return boolean true if an error occured, false else.
+	 */
+	private function importJson($article_file, $starred = false) {
 		$article_object = json_decode($article_file, true);
 		if (is_null($article_object)) {
 			Minz_Log::warning('Try to import a non-JSON file');
 			return true;
 		}
 
-		$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
+		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 
-		$google_compliant = (
+		$google_compliant = strpos($article_object['id'], 'com.google') !== false;
-			strpos($article_object['id'], 'com.google') !== false
-		);
 
 		$error = false;
 		$article_to_feed = array();
 
+		$nb_feeds = count($this->feedDAO->listFeeds());
+		$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) {
-			$feed = $this->addFeedArticles($item['origin'], $google_compliant);
+			$key = $google_compliant ? 'htmlUrl' : 'feedUrl';
+			$feed = new FreshRSS_Feed($item['origin'][$key]);
+			$feed = $this->feedDAO->searchByUrl($feed->url());
+
 			if (is_null($feed)) {
-				$error = true;
+				// Feed does not exist in DB,we should to try to add it.
-			} else {
+				if ($nb_feeds >= $limits['max_feeds']) {
+					// Oops, no more place!
+					Minz_Log::warning(_t('feedback.sub.feed.over_max', $limits['max_feeds']));
+				} else {
+					$feed = $this->addFeedJson($item['origin'], $google_compliant);
+				}
+
+				if (is_null($feed)) {
+					// Still null? It means something went wrong.
+					$error = true;
+				} else {
+					// Nice! Increase the counter.
+					$nb_feeds += 1;
+				}
+			}
+
+			if (!is_null($feed)) {
 				$article_to_feed[$item['id']] = $feed->id();
 			}
 		}
@@ -254,6 +365,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$this->entryDAO->beginTransaction();
 		foreach ($article_object['items'] as $item) {
 			if (!isset($article_to_feed[$item['id']])) {
+				// Related feed does not exist for this entry, do nothing.
 				continue;
 			}
 
@@ -263,6 +375,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			               'summary' : 'content';
 			$tags = $item['categories'];
 			if ($google_compliant) {
+				// Remove tags containing "/state/com.google" which are useless.
 				$tags = array_filter($tags, function($var) {
 					return strpos($var, '/state/com.google') === false;
 				});
@@ -276,6 +389,12 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$entry->_id(min(time(), $entry->date(true)) . uSecString());
 			$entry->_tags($tags);
 
+			$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+			if (is_null($entry)) {
+				// An extension has returned a null value, there is nothing to insert.
+				continue;
+			}
+
 			$values = $entry->toArray();
 			$id = $this->entryDAO->addEntry($values, $prepared_statement);
 
@@ -288,7 +407,15 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $error;
 	}
 
-	private function addFeedArticles($origin, $google_compliant) {
+	/**
+	 * This method import a JSON-based feed (Google Reader format).
+	 *
+	 * @param array $origin represents a feed.
+	 * @param boolean $google_compliant takes care of some specific values if true.
+	 * @return FreshRSS_Feed if feed is in database at the end of the process,
+	 *         else null.
+	 */
+	private function addFeedJson($origin, $google_compliant) {
 		$default_cat = $this->catDAO->getDefault();
 
 		$return = null;
@@ -298,19 +425,23 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$website = $origin['htmlUrl'];
 
 		try {
-			// Create a Feed object and add it in DB
+			// Create a Feed object and add it in database.
 			$feed = new FreshRSS_Feed($url);
 			$feed->_category($default_cat->id());
 			$feed->_name($name);
 			$feed->_website($website);
 
-			// addFeedObject checks if feed is already in DB so nothing else to
+			// Call the extension hook
-			// check here
+			$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
-			$id = $this->feedDAO->addFeedObject($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) {
+				if ($id !== false) {
-				$feed->_id($id);
+					$feed->_id($id);
-				$return = $feed;
+					$return = $feed;
+				}
 			}
 		} catch (FreshRSS_Feed_Exception $e) {
 			Minz_Log::warning($e->getMessage());
@@ -319,6 +450,16 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $return;
 	}
 
+	/**
+	 * This action handles export action.
+	 *
+	 * This action must be reached by a POST request.
+	 *
+	 * Parameters are:
+	 *   - export_opml (default: false)
+	 *   - export_starred (default: false)
+	 *   - export_feeds (default: array()) a list of feed ids
+	 */
 	public function exportAction() {
 		if (!Minz_Request::isPost()) {
 			Minz_Request::forward(array('c' => 'importExport', 'a' => 'index'), true);
@@ -336,7 +477,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		}
 
 		if ($export_starred) {
-			$export_files['starred.json'] = $this->generateArticles('starred');
+			$export_files['starred.json'] = $this->generateEntries('starred');
 		}
 
 		foreach ($export_feeds as $feed_id) {
@@ -344,9 +485,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			if ($feed) {
 				$filename = 'feed_' . $feed->category() . '_'
 				          . $feed->id() . '.json';
-				$export_files[$filename] = $this->generateArticles(
+				$export_files[$filename] = $this->generateEntries('feed', $feed);
-					'feed', $feed
-				);
 			}
 		}
 
@@ -357,7 +496,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 				$this->exportZip($export_files);
 			} catch (Exception $e) {
 				# Oops, there is no Zip extension!
-				Minz_Request::bad(_t('export_no_zip_extension'),
+				Minz_Request::bad(_t('feedback.import_export.export_no_zip_extension'),
 				                  array('c' => 'importExport', 'a' => 'index'));
 			}
 		} elseif ($nb_files === 1) {
@@ -366,10 +505,16 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			$type = $this->guessFileType($filename);
 			$this->exportFile('freshrss_' . $filename, $export_files[$filename], $type);
 		} else {
+			// Nothing to do...
 			Minz_Request::forward(array('c' => 'importExport', 'a' => 'index'), true);
 		}
 	}
 
+	/**
+	 * This method returns the OPML file based on user subscriptions.
+	 *
+	 * @return string the OPML file content.
+	 */
 	private function generateOpml() {
 		$list = array();
 		foreach ($this->catDAO->listCategories() as $key => $cat) {
@@ -381,23 +526,29 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $this->view->helperToString('export/opml');
 	}
 
-	private function generateArticles($type, $feed = NULL) {
+	/**
+	 * This method returns a JSON file content.
+	 *
+	 * @param string $type must be "starred" or "feed"
+	 * @param FreshRSS_Feed $feed feed of which we want to get entries.
+	 * @return string the JSON file content.
+	 */
+	private function generateEntries($type, $feed = NULL) {
 		$this->view->categories = $this->catDAO->listCategories();
 
 		if ($type == 'starred') {
-			$this->view->list_title = _t('starred_list');
+			$this->view->list_title = _t('sub.import_export.starred_list');
 			$this->view->type = 'starred';
 			$unread_fav = $this->entryDAO->countUnreadReadFavorites();
 			$this->view->entries = $this->entryDAO->listWhere(
-				's', '', FreshRSS_Entry::STATE_ALL, 'ASC',
+				's', '', FreshRSS_Entry::STATE_ALL, 'ASC', $unread_fav['all']
-				$unread_fav['all']
 			);
 		} elseif ($type == 'feed' && !is_null($feed)) {
-			$this->view->list_title = _t('feed_list', $feed->name());
+			$this->view->list_title = _t('sub.import_export.feed_list', $feed->name());
 			$this->view->type = 'feed/' . $feed->id();
 			$this->view->entries = $this->entryDAO->listWhere(
 				'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
-				$this->view->conf->posts_per_page
+				FreshRSS_Context::$user_conf->posts_per_page
 			);
 			$this->view->feed = $feed;
 		}
@@ -405,6 +556,12 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		return $this->view->helperToString('export/articles');
 	}
 
+	/**
+	 * This method zips a list of files and returns it by HTTP.
+	 *
+	 * @param array $files list of files where key is filename and value the content.
+	 * @throws Exception if Zip extension is not loaded.
+	 */
 	private function exportZip($files) {
 		if (!extension_loaded('zip')) {
 			throw new Exception();
@@ -428,6 +585,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		unlink($zip_file);
 	}
 
+	/**
+	 * This method returns a single file (OPML or JSON) by HTTP.
+	 *
+	 * @param string $filename
+	 * @param string $content
+	 * @param string $type the file type (opml, json_feed or json_starred).
+	 *                     If equals to unknown, nothing happens.
+	 */
 	private function exportFile($filename, $content, $type) {
 		if ($type === 'unknown') {
 			return;

sources/app/Controllers/indexController.php

@@ -1,499 +1,236 @@
 <?php
 
+/**
+ * This class handles main actions of FreshRSS.
+ */
 class FreshRSS_index_Controller extends Minz_ActionController {
-	private $nb_not_read_cat = 0;
 
-	public function indexAction () {
+	/**
-		$output = Minz_Request::param ('output');
+	 * This action only redirect on the default view mode (normal or global)
-		$token = $this->view->conf->token;
+	 */
-
+	public function indexAction() {
-		// check if user is logged in
+		$prefered_output = FreshRSS_Context::$user_conf->view_mode;
-		if (!$this->view->loginOk && !Minz_Configuration::allowAnonymous()) {
+		Minz_Request::forward(array(
-			$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 (Minz_Translate::t ('access_denied')))
-				);
-				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' => 'index', 'a' => 'formLogin'));
-				return;
-			}
-		}
-
-		$params = Minz_Request::params ();
-		if (isset ($params['search'])) {
-			$params['search'] = urlencode ($params['search']);
-		}
-
-		$this->view->url = array (
 			'c' => 'index',
-			'a' => 'index',
+			'a' => $prefered_output
-			'params' => $params
+		));
-		);
+	}
 
-		if ($output === 'rss') {
+	/**
-			// no layout for RSS output
+	 * This action displays the normal view of FreshRSS.
-			$this->view->_useLayout (false);
+	 */
-			header('Content-Type: application/rss+xml; charset=utf-8');
+	public function normalAction() {
-		} elseif ($output === 'global') {
+		$allow_anonymous = FreshRSS_Context::$system_conf->allow_anonymous;
-			Minz_View::appendScript (Minz_Url::display ('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
+		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
-		}
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
-
-		$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 = '';
-
-		$this->view->get_c = '';
-		$this->view->get_f = '';
-
-		$get = Minz_Request::param ('get', 'a');
-		$getType = $get[0];
-		$getId = substr ($get, 2);
-		if (!$this->checkAndProcessType ($getType, $getId)) {
-			Minz_Log::record ('Not found [' . $getType . '][' . $getId . ']', Minz_Log::DEBUG);
-			Minz_Error::error (
-				404,
-				array ('error' => array (Minz_Translate::t ('page_not_found')))
-			);
 			return;
 		}
 
-		// mise à jour des titres
+		try {
-		$this->view->rss_title = $this->view->currentName . ' | ' . Minz_View::title();
+			$this->updateContext();
-		Minz_View::prependTitle(
+		} catch (FreshRSS_Context_Exception $e) {
-			($this->nb_not_read_cat > 0 ? '(' . formatNumber($this->nb_not_read_cat) . ') ' : '') .
+			Minz_Error::error(404);
-			$this->view->currentName .
-			' · '
-		);
-
-		// On récupère les différents éléments de filtrage
-		$this->view->state = Minz_Request::param('state', $this->view->conf->default_view);
-		$state_param = Minz_Request::param ('state', null);
-		$filter = Minz_Request::param ('search', '');
-		$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
-		$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
-		$first = Minz_Request::param ('next', '');
-
-		$ajax_request = Minz_Request::param('ajax', false);
-		if ($output === 'reader') {
-			$nb = max(1, round($nb / 2));
 		}
 
-		if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ) {	//Any unread article in this category at all?
-			switch ($getType) {
-				case 'a':
-					$hasUnread = $this->view->nb_not_read > 0;
-					break;
-				case 's':
-					// This is deprecated. The favorite button does not exist anymore
-					$hasUnread = $this->view->nb_favorites['unread'] > 0;
-					break;
-				case 'c':
-					$hasUnread = (!isset($this->view->cat_aside[$getId])) || ($this->view->cat_aside[$getId]->nbNotRead() > 0);
-					break;
-				case 'f':
-					$myFeed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
-					$hasUnread = ($myFeed === null) || ($myFeed->nbNotRead() > 0);
-					break;
-				default:
-					$hasUnread = true;
-					break;
-			}
-			if (!$hasUnread && ($state_param === null)) {
-				$this->view->state = FreshRSS_Entry::STATE_ALL;
-			}
-		}
-
-		$today = @strtotime('today');
-		$this->view->today = $today;
-
-		// on calcule la date des articles les plus anciens qu'on affiche
-		$nb_month_old = $this->view->conf->old_entries;
-		$date_min = $today - (3600 * 24 * 30 * $nb_month_old);	//Do not use a fast changing value such as time() to allow SQL caching
-		$keepHistoryDefault = $this->view->conf->keep_history_default;
-
 		try {
-			$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb + 1, $first, $filter, $date_min, true, $keepHistoryDefault);
+			$entries = $this->listEntriesByContext();
 
-			// Si on a récupéré aucun article "non lus"
+			$nb_entries = count($entries);
-			// on essaye de récupérer tous les articles
+			if ($nb_entries > FreshRSS_Context::$number) {
-			if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ && empty($entries) && ($state_param === null) && ($filter == '')) {
+				// We have more elements for pagination
-				Minz_Log::record('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
+				$last_entry = array_pop($entries);
-				$feedDAO = FreshRSS_Factory::createFeedDao();
+				FreshRSS_Context::$next_id = $last_entry->id();
-				try {
-					$feedDAO->updateCachedValues();
-				} catch (Exception $ex) {
-					Minz_Log::record('Failed to automatically correct nbNotRead! ' + $ex->getMessage(), Minz_Log::NOTICE);
-				}
-				$this->view->state = FreshRSS_Entry::STATE_ALL;
-				$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
 			}
-			Minz_Request::_param('state', $this->view->state);
 
-			if (count($entries) <= $nb) {
+			$first_entry = $nb_entries > 0 ? $entries[0] : null;
-				$this->view->nextId  = '';
+			FreshRSS_Context::$id_max = $first_entry === null ?
-			} else {	//We have more elements for pagination
+			                            (time() - 1) . '000000' :
-				$lastEntry = array_pop($entries);
+			                            $first_entry->id();
-				$this->view->nextId  = $lastEntry->id();
+			if (FreshRSS_Context::$order === 'ASC') {
+				// In this case we do not know but we guess id_max
+				$id_max = (time() - 1) . '000000';
+				if (strcmp($id_max, FreshRSS_Context::$id_max) > 0) {
+					FreshRSS_Context::$id_max = $id_max;
+				}
 			}
 
 			$this->view->entries = $entries;
 		} catch (FreshRSS_EntriesGetter_Exception $e) {
-			Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE);
+			Minz_Log::notice($e->getMessage());
-			Minz_Error::error (
+			Minz_Error::error(404);
-				404,
-				array ('error' => array (Minz_Translate::t ('page_not_found')))
-			);
 		}
+
+		$this->view->categories = FreshRSS_Context::$categories;
+
+		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
+		$title = FreshRSS_Context::$name;
+		if (FreshRSS_Context::$get_unread > 0) {
+			$title = '(' . FreshRSS_Context::$get_unread . ') ' . $title;
+		}
+		Minz_View::prependTitle($title . ' · ');
 	}
 
-	/*
+	/**
-	 * Vérifie que la catégorie / flux sélectionné existe
+	 * This action displays the reader view of FreshRSS.
-	 * + Initialise correctement les variables de vue get_c et get_f
+	 *
-	 * + Met à jour la variable $this->nb_not_read_cat
+	 * @todo: change this view into specific CSS rules?
 	 */
-	private function checkAndProcessType ($getType, $getId) {
+	public function readerAction() {
-		switch ($getType) {
+		$this->normalAction();
-			case 'a':
-				$this->view->currentName = Minz_Translate::t ('your_rss_feeds');
-				$this->nb_not_read_cat = $this->view->nb_not_read;
-				$this->view->get_c = $getType;
-				return true;
-			case 's':
-				$this->view->currentName = Minz_Translate::t ('your_favorites');
-				$this->nb_not_read_cat = $this->view->nb_favorites['unread'];
-				$this->view->get_c = $getType;
-				return true;
-			case 'c':
-				$cat = isset($this->view->cat_aside[$getId]) ? $this->view->cat_aside[$getId] : null;
-				if ($cat === null) {
-					$catDAO = new FreshRSS_CategoryDAO();
-					$cat = $catDAO->searchById($getId);
-				}
-				if ($cat) {
-					$this->view->currentName = $cat->name ();
-					$this->nb_not_read_cat = $cat->nbNotRead ();
-					$this->view->get_c = $getId;
-					return true;
-				} else {
-					return false;
-				}
-			case 'f':
-				$feed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
-				if (empty($feed)) {
-					$feedDAO = FreshRSS_Factory::createFeedDao();
-					$feed = $feedDAO->searchById($getId);
-				}
-				if ($feed) {
-					$this->view->currentName = $feed->name ();
-					$this->nb_not_read_cat = $feed->nbNotRead ();
-					$this->view->get_f = $getId;
-					$this->view->get_c = $feed->category ();
-					return true;
-				} else {
-					return false;
-				}
-			default:
-				return false;
-		}
 	}
 
-	public function aboutAction () {
+	/**
-		Minz_View::prependTitle (Minz_Translate::t ('about') . ' · ');
+	 * This action displays the global view of FreshRSS.
-	}
+	 */
-
+	public function globalAction() {
-	public function logsAction () {
+		$allow_anonymous = FreshRSS_Context::$system_conf->allow_anonymous;
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
-			Minz_Error::error (
+			Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
-				403,
+			return;
-				array ('error' => array (Minz_Translate::t ('access_denied')))
-			);
 		}
 
-		Minz_View::prependTitle (Minz_Translate::t ('logs') . ' · ');
+		Minz_View::appendScript(Minz_Url::display('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js')));
 
-		if (Minz_Request::isPost ()) {
+		try {
+			$this->updateContext();
+		} catch (FreshRSS_Context_Exception $e) {
+			Minz_Error::error(404);
+		}
+
+		$this->view->categories = FreshRSS_Context::$categories;
+
+		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
+		$title = _t('index.feed.title_global');
+		if (FreshRSS_Context::$get_unread > 0) {
+			$title = '(' . FreshRSS_Context::$get_unread . ') ' . $title;
+		}
+		Minz_View::prependTitle($title . ' · ');
+	}
+
+	/**
+	 * This action displays the RSS feed of FreshRSS.
+	 */
+	public function rssAction() {
+		$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);
+
+		// Check if user has access.
+		if (!FreshRSS_Auth::hasAccess() &&
+				!$allow_anonymous &&
+				!$token_is_ok) {
+			Minz_Error::error(403);
+		}
+
+		try {
+			$this->updateContext();
+		} catch (FreshRSS_Context_Exception $e) {
+			Minz_Error::error(404);
+		}
+
+		try {
+			$this->view->entries = $this->listEntriesByContext();
+		} catch (FreshRSS_EntriesGetter_Exception $e) {
+			Minz_Log::notice($e->getMessage());
+			Minz_Error::error(404);
+		}
+
+		// No layout for RSS output.
+		$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
+		$this->view->_useLayout(false);
+		header('Content-Type: application/rss+xml; charset=utf-8');
+	}
+
+	/**
+	 * This action updates the Context object by using request parameters.
+	 *
+	 * Parameters are:
+	 *   - state (default: conf->default_view)
+	 *   - search (default: empty string)
+	 *   - order (default: conf->sort_order)
+	 *   - nb (default: conf->posts_per_page)
+	 *   - next (default: empty string)
+	 */
+	private function updateContext() {
+		// Update number of read / unread variables.
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		FreshRSS_Context::$total_starred = $entryDAO->countUnreadReadFavorites();
+		FreshRSS_Context::$total_unread = FreshRSS_CategoryDAO::CountUnreads(
+			FreshRSS_Context::$categories, 1
+		);
+
+		FreshRSS_Context::_get(Minz_Request::param('get', 'a'));
+		FreshRSS_Context::$state = Minz_Request::param(
+			'state', FreshRSS_Context::$user_conf->default_state
+		);
+		$state_forced_by_user = Minz_Request::param('state', false) !== false;
+		if (FreshRSS_Context::$user_conf->default_view === 'adaptive' &&
+				FreshRSS_Context::$get_unread <= 0 &&
+				!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ) &&
+				!$state_forced_by_user) {
+			FreshRSS_Context::$state |= FreshRSS_Entry::STATE_READ;
+		}
+
+		FreshRSS_Context::$search = Minz_Request::param('search', '');
+		FreshRSS_Context::$order = Minz_Request::param(
+			'order', FreshRSS_Context::$user_conf->sort_order
+		);
+		FreshRSS_Context::$number = Minz_Request::param(
+			'nb', FreshRSS_Context::$user_conf->posts_per_page
+		);
+		FreshRSS_Context::$first_id = Minz_Request::param('next', '');
+	}
+
+	/**
+	 * This method returns a list of entries based on the Context object.
+	 */
+	private function listEntriesByContext() {
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+
+		$get = FreshRSS_Context::currentGet(true);
+		if (count($get) > 1) {
+			$type = $get[0];
+			$id = $get[1];
+		} else {
+			$type = $get;
+			$id = '';
+		}
+
+		return $entryDAO->listWhere(
+			$type, $id, FreshRSS_Context::$state, FreshRSS_Context::$order,
+			FreshRSS_Context::$number + 1, FreshRSS_Context::$first_id,
+			FreshRSS_Context::$search
+		);
+	}
+
+	/**
+	 * This action displays the about page of FreshRSS.
+	 */
+	public function aboutAction() {
+		Minz_View::prependTitle(_t('index.about.title') . ' · ');
+	}
+
+	/**
+	 * This action displays logs of FreshRSS for the current user.
+	 */
+	public function logsAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
+		}
+
+		Minz_View::prependTitle(_t('index.log.title') . ' · ');
+
+		if (Minz_Request::isPost()) {
 			FreshRSS_LogDAO::truncate();
 		}
 
 		$logs = FreshRSS_LogDAO::lines();	//TODO: ask only the necessary lines
 
 		//gestion pagination
-		$page = Minz_Request::param ('page', 1);
+		$page = Minz_Request::param('page', 1);
-		$this->view->logsPaginator = new Minz_Paginator ($logs);
+		$this->view->logsPaginator = new Minz_Paginator($logs);
-		$this->view->logsPaginator->_nbItemsPerPage (50);
+		$this->view->logsPaginator->_nbItemsPerPage(50);
-		$this->view->logsPaginator->_currentPage ($page);
+		$this->view->logsPaginator->_currentPage($page);
-	}
-
-	public function loginAction () {
-		$this->view->_useLayout (false);
-
-		$url = 'https://verifier.login.persona.org/verify';
-		$assert = Minz_Request::param ('assertion');
-		$params = 'assertion=' . $assert . '&audience=' .
-			  urlencode (Minz_Url::display (null, 'php', true));
-		$ch = curl_init ();
-		$options = array (
-			CURLOPT_URL => $url,
-			CURLOPT_RETURNTRANSFER => TRUE,
-			CURLOPT_POST => 2,
-			CURLOPT_POSTFIELDS => $params
-		);
-		curl_setopt_array ($ch, $options);
-		$result = curl_exec ($ch);
-		curl_close ($ch);
-
-		$res = json_decode ($result, true);
-
-		$loginOk = false;
-		$reason = '';
-		if ($res['status'] === 'okay') {
-			$email = filter_var($res['email'], FILTER_VALIDATE_EMAIL);
-			if ($email != '') {
-				$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
-				if (($currentUser = @file_get_contents($personaFile)) !== false) {
-					$currentUser = trim($currentUser);
-					if (ctype_alnum($currentUser)) {
-						try {
-							$this->conf = new FreshRSS_Configuration($currentUser);
-							$loginOk = strcasecmp($email, $this->conf->mail_login) === 0;
-						} catch (Minz_Exception $e) {
-							$reason = 'Invalid configuration for user [' . $currentUser . ']! ' . $e->getMessage();	//Permission denied or conf file does not exist
-						}
-					} else {
-						$reason = 'Invalid username format [' . $currentUser . ']!';
-					}
-				}
-			} else {
-				$reason = 'Invalid email format [' . $res['email'] . ']!';
-			}
-		}
-		if ($loginOk) {
-			Minz_Session::_param('currentUser', $currentUser);
-			Minz_Session::_param ('mail', $email);
-			$this->view->loginOk = true;
-			invalidateHttpCache();
-		} else {
-			$res = array ();
-			$res['status'] = 'failure';
-			$res['reason'] = $reason == '' ? Minz_Translate::t ('invalid_login') : $reason;
-			Minz_Log::record ('Persona: ' . $res['reason'], Minz_Log::WARNING);
-		}
-
-		header('Content-Type: application/json; charset=UTF-8');
-		$this->view->res = json_encode ($res);
-	}
-
-	public function logoutAction () {
-		$this->view->_useLayout(false);
-		invalidateHttpCache();
-		Minz_Session::_param('currentUser');
-		Minz_Session::_param('mail');
-		Minz_Session::_param('passwordHash');
-	}
-
-	private static function makeLongTermCookie($username, $passwordHash) {
-		do {
-			$token = sha1(Minz_Configuration::salt() . $username . uniqid(mt_rand(), true));
-			$tokenFile = DATA_PATH . '/tokens/' . $token . '.txt';
-		} while (file_exists($tokenFile));
-		if (@file_put_contents($tokenFile, $username . "\t" . $passwordHash) === false) {
-			return false;
-		}
-		$expire = time() + 2629744;	//1 month	//TODO: Use a configuration instead
-		Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire);
-		Minz_Session::_param('token', $token);
-		return $token;
-	}
-
-	private static function deleteLongTermCookie() {
-		Minz_Session::deleteLongTermCookie('FreshRSS_login');
-		$token = Minz_Session::param('token', null);
-		if (ctype_alnum($token)) {
-			@unlink(DATA_PATH . '/tokens/' . $token . '.txt');
-		}
-		Minz_Session::_param('token');
-		if (rand(0, 10) === 1) {
-			self::purgeTokens();
-		}
-	}
-
-	private static function purgeTokens() {
-		$oldest = time() - 2629744;	//1 month	//TODO: Use a configuration instead
-		foreach (new DirectoryIterator(DATA_PATH . '/tokens/') as $fileInfo) {
-			$extension = pathinfo($fileInfo->getFilename(), PATHINFO_EXTENSION);
-			if ($extension === 'txt' && $fileInfo->getMTime() < $oldest) {
-				@unlink($fileInfo->getPathname());
-			}
-		}
-	}
-
-	public function formLoginAction () {
-		if ($this->view->loginOk) {
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		}
-
-		if (Minz_Request::isPost()) {
-			$ok = false;
-			$nonce = Minz_Session::param('nonce');
-			$username = Minz_Request::param('username', '');
-			$c = Minz_Request::param('challenge', '');
-			if (ctype_alnum($username) && ctype_graph($c) && ctype_alnum($nonce)) {
-				if (!function_exists('password_verify')) {
-					include_once(LIB_PATH . '/password_compat.php');
-				}
-				try {
-					$conf = new FreshRSS_Configuration($username);
-					$s = $conf->passwordHash;
-					$ok = password_verify($nonce . $s, $c);
-					if ($ok) {
-						Minz_Session::_param('currentUser', $username);
-						Minz_Session::_param('passwordHash', $s);
-						if (Minz_Request::param('keep_logged_in', false)) {
-							self::makeLongTermCookie($username, $s);
-						} else {
-							self::deleteLongTermCookie();
-						}
-					} else {
-						Minz_Log::record('Password mismatch for user ' . $username . ', nonce=' . $nonce . ', c=' . $c, Minz_Log::WARNING);
-					}
-				} catch (Minz_Exception $me) {
-					Minz_Log::record('Login failure: ' . $me->getMessage(), Minz_Log::WARNING);
-				}
-			} else {
-				Minz_Log::record('Invalid credential parameters: user=' . $username . ' challenge=' . $c . ' nonce=' . $nonce, Minz_Log::DEBUG);
-			}
-			if (!$ok) {
-				$notif = array(
-					'type' => 'bad',
-					'content' => Minz_Translate::t('invalid_login')
-				);
-				Minz_Session::_param('notification', $notif);
-			}
-			$this->view->_useLayout(false);
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		} elseif (Minz_Configuration::unsafeAutologinEnabled() && isset($_GET['u']) && isset($_GET['p'])) {
-			Minz_Session::_param('currentUser');
-			Minz_Session::_param('mail');
-			Minz_Session::_param('passwordHash');
-			$username = ctype_alnum($_GET['u']) ? $_GET['u'] : '';
-			$passwordPlain = $_GET['p'];
-			Minz_Request::_param('p');	//Discard plain-text password ASAP
-			$_GET['p'] = '';
-			if (!function_exists('password_verify')) {
-				include_once(LIB_PATH . '/password_compat.php');
-			}
-			try {
-				$conf = new FreshRSS_Configuration($username);
-				$s = $conf->passwordHash;
-				$ok = password_verify($passwordPlain, $s);
-				unset($passwordPlain);
-				if ($ok) {
-					Minz_Session::_param('currentUser', $username);
-					Minz_Session::_param('passwordHash', $s);
-				} else {
-					Minz_Log::record('Unsafe password mismatch for user ' . $username, Minz_Log::WARNING);
-				}
-			} catch (Minz_Exception $me) {
-				Minz_Log::record('Unsafe login failure: ' . $me->getMessage(), Minz_Log::WARNING);
-			}
-			Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-		} elseif (!Minz_Configuration::canLogIn()) {
-			Minz_Error::error (
-				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
-			);
-		}
-		invalidateHttpCache();
-	}
-
-	public function formLogoutAction () {
-		$this->view->_useLayout(false);
-		invalidateHttpCache();
-		Minz_Session::_param('currentUser');
-		Minz_Session::_param('mail');
-		Minz_Session::_param('passwordHash');
-		self::deleteLongTermCookie();
-		Minz_Request::forward(array('c' => 'index', 'a' => 'index'), true);
-	}
-
-	public function resetAuthAction() {
-		Minz_View::prependTitle(_t('auth_reset') . ' · ');
-		Minz_View::appendScript(Minz_Url::display(
-			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
-		));
-
-		$this->view->no_form = false;
-		// Enable changement of auth only if Persona!
-		if (Minz_Configuration::authType() != 'persona') {
-			$this->view->message = array(
-				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('auth_not_persona')
-			);
-			$this->view->no_form = true;
-			return;
-		}
-
-		$conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
-		// Admin user must have set its master password.
-		if (!$conf->passwordHash) {
-			$this->view->message = array(
-				'status' => 'bad',
-				'title' => _t('damn'),
-				'body' => _t('auth_no_password_set')
-			);
-			$this->view->no_form = true;
-			return;
-		}
-
-		invalidateHttpCache();
-
-		if (Minz_Request::isPost()) {
-			$nonce = Minz_Session::param('nonce');
-			$username = Minz_Request::param('username', '');
-			$c = Minz_Request::param('challenge', '');
-			if (!(ctype_alnum($username) && ctype_graph($c) && ctype_alnum($nonce))) {
-				Minz_Log::debug('Invalid credential parameters:' .
-				                ' user=' . $username .
-				                ' challenge=' . $c .
-				                ' nonce=' . $nonce);
-				Minz_Request::bad(_t('invalid_login'),
-				                  array('c' => 'index', 'a' => 'resetAuth'));
-			}
-
-			if (!function_exists('password_verify')) {
-				include_once(LIB_PATH . '/password_compat.php');
-			}
-
-			$s = $conf->passwordHash;
-			$ok = password_verify($nonce . $s, $c);
-			if ($ok) {
-				Minz_Configuration::_authType('form');
-				$ok = Minz_Configuration::writeFile();
-
-				if ($ok) {
-					Minz_Request::good(_t('auth_form_set'));
-				} else {
-					Minz_Request::bad(_t('auth_form_not_set'),
-				                      array('c' => 'index', 'a' => 'resetAuth'));
-				}
-			} else {
-				Minz_Log::debug('Password mismatch for user ' . $username .
-				                ', nonce=' . $nonce . ', c=' . $c);
-
-				Minz_Request::bad(_t('invalid_login'),
-				                  array('c' => 'index', 'a' => 'resetAuth'));
-			}
-		}
 	}
 }

sources/app/Controllers/javascriptController.php

@@ -1,14 +1,14 @@
 <?php
 
 class FreshRSS_javascript_Controller extends Minz_ActionController {
-	public function firstAction () {
+	public function firstAction() {
-		$this->view->_useLayout (false);
+		$this->view->_useLayout(false);
 	}
 
-	public function actualizeAction () {
+	public function actualizeAction() {
 		header('Content-Type: text/javascript; charset=UTF-8');
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$this->view->feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
+		$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
 	}
 
 	public function nbUnreadsPerFeedAction() {
@@ -28,17 +28,20 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 		$user = isset($_GET['user']) ? $_GET['user'] : '';
 		if (ctype_alnum($user)) {
 			try {
-				$conf = new FreshRSS_Configuration($user);
+				$salt = FreshRSS_Context::$system_conf->salt;
+				$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".
-					$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
 				}
 			} catch (Minz_Exception $me) {
-				Minz_Log::record('Nonce failure: ' . $me->getMessage(), Minz_Log::WARNING);
+				Minz_Log::warning('Nonce failure: ' . $me->getMessage());
 			}
+		} else {
+			Minz_Log::notice('Nonce failure due to invalid username!');
 		}
 		$this->view->nonce = '';	//Failure
 		$this->view->salt1 = '';

sources/app/Controllers/statsController.php

@@ -5,6 +5,19 @@
  */
 class FreshRSS_stats_Controller extends Minz_ActionController {
 
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
+	public function firstAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
+		}
+
+		Minz_View::prependTitle(_t('admin.stats.title') . ' · ');
+	}
+
 	/**
 	 * This action handles the statistic main page.
 	 *
@@ -99,11 +112,12 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$categoryDAO = new FreshRSS_CategoryDAO();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		Minz_View::appendScript(Minz_Url::display('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js')));
-		$id = Minz_Request::param ('id', null);
+		$id = Minz_Request::param('id', null);
 		$this->view->categories = $categoryDAO->listCategories();
 		$this->view->feed = $feedDAO->searchById($id);
 		$this->view->days = $statsDAO->getDays();
 		$this->view->months = $statsDAO->getMonths();
+		$this->view->repartition = $statsDAO->calculateEntryRepartitionPerFeed($id);
 		$this->view->repartitionHour = $statsDAO->calculateEntryRepartitionPerFeedPerHour($id);
 		$this->view->averageHour = $statsDAO->calculateEntryAveragePerFeedPerHour($id);
 		$this->view->repartitionDayOfWeek = $statsDAO->calculateEntryRepartitionPerFeedPerDayOfWeek($id);
@@ -111,20 +125,4 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$this->view->repartitionMonth = $statsDAO->calculateEntryRepartitionPerFeedPerMonth($id);
 		$this->view->averageMonth = $statsDAO->calculateEntryAveragePerFeedPerMonth($id);
 	}
-
-	/**
-	 * This action is called before every other action in that class. It is
-	 * the common boiler plate for every action. It is triggered by the
-	 * underlying framework.
-	 */
-	public function firstAction() {
-		if (!$this->view->loginOk) {
-			Minz_Error::error(
-			    403, array('error' => array(Minz_Translate::t('access_denied')))
-			);
-		}
-
-		Minz_View::prependTitle(Minz_Translate::t('stats') . ' · ');
-	}
-
 }

sources/app/Controllers/subscriptionController.php

@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Controller to handle subscription actions.
+ */
+class FreshRSS_subscription_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
+	public function firstAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
+		}
+
+		$catDAO = new FreshRSS_CategoryDAO();
+
+		$catDAO->checkDefault();
+		$this->view->categories = $catDAO->listCategories(false);
+		$this->view->default_category = $catDAO->getDefault();
+	}
+
+	/**
+	 * This action handles the main subscription page
+	 *
+	 * It displays categories and associated feeds.
+	 */
+	public function indexAction() {
+		Minz_View::appendScript(Minz_Url::display('/scripts/category.js?' .
+		                        @filemtime(PUBLIC_PATH . '/scripts/category.js')));
+		Minz_View::prependTitle(_t('sub.title') . ' · ');
+
+		$id = Minz_Request::param('id');
+		if ($id !== false) {
+			$feedDAO = FreshRSS_Factory::createFeedDao();
+			$this->view->feed = $feedDAO->searchById($id);
+		}
+	}
+
+	/**
+	 * This action handles the feed configuration page.
+	 *
+	 * It displays the feed configuration page.
+	 * If this action is reached through a POST request, it stores all new
+	 * configuraiton values then sends a notification to the user.
+	 *
+	 * The options available on the page are:
+	 *   - name
+	 *   - description
+	 *   - website URL
+	 *   - feed URL
+	 *   - category id (default: default category id)
+	 *   - CSS path to article on website
+	 *   - display in main stream (default: 0)
+	 *   - HTTP authentication
+	 *   - number of article to retain (default: -2)
+	 *   - refresh frequency (default: -2)
+	 * Default values are empty strings unless specified.
+	 */
+	public function feedAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		}
+
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$this->view->feeds = $feedDAO->listFeeds();
+
+		$id = Minz_Request::param('id');
+		if ($id === false || !isset($this->view->feeds[$id])) {
+			Minz_Error::error(404);
+			return;
+		}
+
+		$this->view->feed = $this->view->feeds[$id];
+
+		Minz_View::prependTitle(_t('sub.title.feed_management') . ' · ' . $this->view->feed->name() . ' · ');
+
+		if (Minz_Request::isPost()) {
+			$user = Minz_Request::param('http_user', '');
+			$pass = Minz_Request::param('http_pass', '');
+
+			$httpAuth = '';
+			if ($user != '' || $pass != '') {
+				$httpAuth = $user . ':' . $pass;
+			}
+
+			$cat = intval(Minz_Request::param('category', 0));
+
+			$values = array(
+				'name' => Minz_Request::param('name', ''),
+				'description' => sanitizeHTML(Minz_Request::param('description', '', true)),
+				'website' => Minz_Request::param('website', ''),
+				'url' => Minz_Request::param('url', ''),
+				'category' => $cat,
+				'pathEntries' => Minz_Request::param('path_entries', ''),
+				'priority' => intval(Minz_Request::param('priority', 0)),
+				'httpAuth' => $httpAuth,
+				'keep_history' => intval(Minz_Request::param('keep_history', -2)),
+				'ttl' => intval(Minz_Request::param('ttl', -2)),
+			);
+
+			invalidateHttpCache();
+
+			$url_redirect = array('c' => 'subscription', 'params' => array('id' => $id));
+			if ($feedDAO->updateFeed($id, $values) !== false) {
+				$this->view->feed->_category($cat);
+				$this->view->feed->faviconPrepare();
+
+				Minz_Request::good(_t('feedback.sub.feed.updated'), $url_redirect);
+			} else {
+				Minz_Request::bad(_t('feedback.sub.feed.error'), $url_redirect);
+			}
+		}
+	}
+}

sources/app/Controllers/updateController.php

@@ -1,42 +1,42 @@
 <?php
 
 class FreshRSS_update_Controller extends Minz_ActionController {
+
 	public function firstAction() {
-		$current_user = Minz_Session::param('currentUser', '');
+		if (!FreshRSS_Auth::hasAccess('admin')) {
-		if (!$this->view->loginOk && Minz_Configuration::isAdmin($current_user)) {
+			Minz_Error::error(403);
-			Minz_Error::error(
-				403,
-				array('error' => array(_t('access_denied')))
-			);
 		}
 
 		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;
+		$timestamp = @filemtime(join_path(DATA_PATH, 'last_update.txt'));
-		$timestamp = (int)@file_get_contents(DATA_PATH . '/last_update.txt');
+		if ($timestamp !== false) {
-		if (is_numeric($timestamp) && $timestamp > 0) {
 			$this->view->last_update_time = timestamptodate($timestamp);
-			$this->view->check_last_hour = (time() - 3600) <= $timestamp;
 		}
 	}
 
 	public function indexAction() {
+		Minz_View::prependTitle(_t('admin.update.title') . ' · ');
+
 		if (file_exists(UPDATE_FILENAME) && !is_writable(FRESHRSS_PATH)) {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
+				'title' => _t('gen.short.damn'),
-				'body' => _t('file_is_nok', FRESHRSS_PATH)
+				'body' => _t('feedback.update.file_is_nok', FRESHRSS_PATH)
 			);
 		} elseif (file_exists(UPDATE_FILENAME)) {
 			// There is an update file to apply!
+			$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',
-				'title' => _t('ok'),
+				'title' => _t('gen.short.ok'),
-				'body' => _t('update_can_apply')
+				'body' => _t('feedback.update.can_apply', $version)
 			);
 		}
 	}
@@ -44,11 +44,11 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	public function checkAction() {
 		$this->view->change_view('update', 'index');
 
-		if (file_exists(UPDATE_FILENAME) || $this->view->check_last_hour) {
+		if (file_exists(UPDATE_FILENAME)) {
 			// There is already an update file to apply: we don't need to check
 			// the webserver!
 			// Or if already check during the last hour, do nothing.
-			Minz_Request::forward(array('c' => 'update'));
+			Minz_Request::forward(array('c' => 'update'), true);
 
 			return;
 		}
@@ -69,8 +69,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
+				'title' => _t('gen.short.damn'),
-				'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
+				'body' => _t('feedback.update.server_not_found', FRESHRSS_UPDATE_WEBSITE)
 			);
 			return;
 		}
@@ -80,23 +80,27 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		if (strpos($status, 'UPDATE') !== 0) {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
+				'title' => _t('gen.short.damn'),
-				'body' => _t('no_update')
+				'body' => _t('feedback.update.none')
 			);
 
-			@file_put_contents(DATA_PATH . '/last_update.txt', time());
+			@touch(join_path(DATA_PATH, 'last_update.txt'));
 
 			return;
 		}
 
 		$script = $res_array[1];
 		if (file_put_contents(UPDATE_FILENAME, $script) !== false) {
-			Minz_Request::forward(array('c' => 'update'));
+			$version = explode(' ', $status, 2);
+			$version = $version[1];
+			@file_put_contents(join_path(DATA_PATH, 'last_update.txt'), $version);
+
+			Minz_Request::forward(array('c' => 'update'), true);
 		} else {
 			$this->view->message = array(
 				'status' => 'bad',
-				'title' => _t('damn'),
+				'title' => _t('gen.short.damn'),
-				'body' => _t('update_problem', 'Cannot save the update script')
+				'body' => _t('feedback.update.error', 'Cannot save the update script')
 			);
 		}
 	}
@@ -108,6 +112,21 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 		require(UPDATE_FILENAME);
 
+		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'), '');
+				Minz_Request::good(_t('feedback.update.finished'));
+			} else {
+				Minz_Request::bad(_t('feedback.update.error', $res),
+				                  array('c' => 'update', 'a' => 'index'));
+			}
+		}
+
 		if (Minz_Request::isPost()) {
 			save_info_update();
 		}
@@ -116,14 +135,26 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			$res = apply_update();
 
 			if ($res === true) {
-				@unlink(UPDATE_FILENAME);
+				Minz_Request::forward(array(
-				@file_put_contents(DATA_PATH . '/last_update.txt', time());
+					'c' => 'update',
-
+					'a' => 'apply',
-				Minz_Request::good(_t('update_finished'));
+					'params' => array('post_conf' => true)
+				), true);
 			} else {
-				Minz_Request::bad(_t('update_problem', $res),
+				Minz_Request::bad(_t('feedback.update.error', $res),
 				                  array('c' => 'update', 'a' => 'index'));
 			}
 		}
 	}
+
+	/**
+	 * This action displays information about installation.
+	 */
+	public function checkInstallAction() {
+		Minz_View::prependTitle(_t('admin.check_install.title') . ' · ');
+
+		$this->view->status_php = check_install_php();
+		$this->view->status_files = check_install_files();
+		$this->view->status_database = check_install_database();
+	}
 }

sources/app/Controllers/userController.php

@@ -1,19 +1,30 @@
 <?php
 
-class FreshRSS_users_Controller extends Minz_ActionController {
+/**
-
+ * Controller to handle user actions.
-	const BCRYPT_COST = 9;	//Will also have to be computed client side on mobile devices, so do not use a too high cost
+ */
+class FreshRSS_user_Controller extends Minz_ActionController {
+	// Will also have to be computed client side on mobile devices,
+	// so do not use a too high cost
+	const BCRYPT_COST = 9;
 
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
 	public function firstAction() {
-		if (!$this->view->loginOk) {
+		if (!FreshRSS_Auth::hasAccess()) {
-			Minz_Error::error(
+			Minz_Error::error(403);
-				403,
-				array('error' => array(Minz_Translate::t('access_denied')))
-			);
 		}
 	}
 
-	public function authAction() {
+	/**
+	 * This action displays the user profile page.
+	 */
+	public function profileAction() {
+		Minz_View::prependTitle(_t('conf.profile.title') . ' · ');
+
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
@@ -28,9 +39,9 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				$this->view->conf->_passwordHash($passwordHash);
+				FreshRSS_Context::$user_conf->passwordHash = $passwordHash;
 			}
-			Minz_Session::_param('passwordHash', $this->view->conf->passwordHash);
+			Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash);
 
 			$passwordPlain = Minz_Request::param('apiPasswordPlain', '', true);
 			if ($passwordPlain != '') {
@@ -41,16 +52,17 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 				$passwordPlain = '';
 				$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash);	//Compatibility with bcrypt.js
 				$ok &= ($passwordHash != '');
-				$this->view->conf->_apiPasswordHash($passwordHash);
+				FreshRSS_Context::$user_conf->apiPasswordHash = $passwordHash;
 			}
 
-			if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
+			// TODO: why do we need of hasAccess here?
-				$this->view->conf->_mail_login(Minz_Request::param('mail_login', '', true));
+			if (FreshRSS_Auth::hasAccess('admin')) {
+				FreshRSS_Context::$user_conf->mail_login = Minz_Request::param('mail_login', '', true);
 			}
-			$email = $this->view->conf->mail_login;
+			$email = FreshRSS_Context::$user_conf->mail_login;
 			Minz_Session::_param('mail', $email);
 
-			$ok &= $this->view->conf->save();
+			$ok &= FreshRSS_Context::$user_conf->save();
 
 			if ($email != '') {
 				$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
@@ -58,68 +70,63 @@ 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 ($ok) {
-				$current_token = $this->view->conf->token;
+				Minz_Request::good(_t('feedback.profile.updated'),
-				$token = Minz_Request::param('token', $current_token);
+				                   array('c' => 'user', 'a' => 'profile'));
-				$this->view->conf->_token($token);
+			} else {
-				$ok &= $this->view->conf->save();
+				Minz_Request::bad(_t('feedback.profile.error'),
-
+				                  array('c' => 'user', 'a' => 'profile'));
-				$anon = Minz_Request::param('anon_access', false);
-				$anon = ((bool)$anon) && ($anon !== 'no');
-				$anon_refresh = Minz_Request::param('anon_refresh', false);
-				$anon_refresh = ((bool)$anon_refresh) && ($anon_refresh !== 'no');
-				$auth_type = Minz_Request::param('auth_type', 'none');
-				$unsafe_autologin = Minz_Request::param('unsafe_autologin', false);
-				$api_enabled = Minz_Request::param('api_enabled', false);
-				if ($anon != Minz_Configuration::allowAnonymous() ||
-					$auth_type != Minz_Configuration::authType() ||
-					$anon_refresh != Minz_Configuration::allowAnonymousRefresh() ||
-					$unsafe_autologin != Minz_Configuration::unsafeAutologinEnabled() ||
-					$api_enabled != Minz_Configuration::apiEnabled()) {
-
-					Minz_Configuration::_authType($auth_type);
-					Minz_Configuration::_allowAnonymous($anon);
-					Minz_Configuration::_allowAnonymousRefresh($anon_refresh);
-					Minz_Configuration::_enableAutologin($unsafe_autologin);
-					Minz_Configuration::_enableApi($api_enabled);
-					$ok &= Minz_Configuration::writeFile();
-				}
 			}
-
-			invalidateHttpCache();
-
-			$notif = array(
-				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'configuration_updated' : 'error_occurred')
-			);
-			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+	}
+
+	/**
+	 * This action displays the user management page.
+	 */
+	public function manageAction() {
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+
+		Minz_View::prependTitle(_t('admin.user.title') . ' · ');
+
+		// Get the correct current user.
+		$username = Minz_Request::param('u', Minz_Session::param('currentUser'));
+		if (!FreshRSS_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();
 	}
 
 	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();
+			$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', $this->view->conf->language);
+			$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$user_conf->language);
-			if (!in_array($new_user_language, $this->view->conf->availableLanguages())) {
+			$languages = Minz_Translate::availableLanguages();
-				$new_user_language = $this->view->conf->language;
+			if (!isset($languages[$new_user_language])) {
+				$new_user_language = FreshRSS_Context::$user_conf->language;
 			}
 
 			$new_user_name = Minz_Request::param('new_user_name');
 			$ok = ($new_user_name != '') && ctype_alnum($new_user_name);
 
 			if ($ok) {
-				$ok &= (strcasecmp($new_user_name, Minz_Configuration::defaultUser()) !== 0);	//It is forbidden to alter the 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
 
-				$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 != '') {
@@ -141,12 +148,13 @@ class FreshRSS_users_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,
@@ -162,42 +170,45 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'user_created' : 'error_occurred', $new_user_name)
+				'content' => _t('feedback.user.created' . (!$ok ? '.error' : ''), $new_user_name)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+
+		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
 
 	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();
+			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 			$username = Minz_Request::param('username');
 			$ok = ctype_alnum($username);
+			$user_data = join_path(DATA_PATH, 'users', $username);
 
 			if ($ok) {
-				$ok &= (strcasecmp($username, Minz_Configuration::defaultUser()) !== 0);	//It is forbidden to delete the 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) {
-				$configPath = DATA_PATH . '/' . $username . '_user.php';
+				$ok &= is_dir($user_data);
-				$ok &= file_exists($configPath);
 			}
 			if ($ok) {
 				$userDAO = new FreshRSS_UserDAO();
 				$ok &= $userDAO->deleteUser($username);
-				$ok &= unlink($configPath);
+				$ok &= recursive_unlink($user_data);
 				//TODO: delete Persona file
 			}
 			invalidateHttpCache();
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'user_deleted' : 'error_occurred', $username)
+				'content' => _t('feedback.user.deleted' . (!$ok ? '.error' : ''), $username)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+
+		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
 }

sources/app/Exceptions/BadUrlException.php

@@ -1,6 +1,6 @@
 <?php
 class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
-	public function __construct ($url) {
+	public function __construct($url) {
-		parent::__construct ('`' . $url . '` is not a valid URL');
+		parent::__construct('`' . $url . '` is not a valid URL');
 	}
 }

sources/app/Exceptions/ContextException.php

@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * An exception raised when a context is invalid
+ */
+class FreshRSS_Context_Exception extends Exception {
+	public function __construct($message) {
+		parent::__construct($message);
+	}
+}

sources/app/Exceptions/EntriesGetterException.php

@@ -1,7 +1,7 @@
 <?php
 
 class FreshRSS_EntriesGetter_Exception extends Exception {
-	public function __construct ($message) {
+	public function __construct($message) {
-		parent::__construct ($message);
+		parent::__construct($message);
 	}
 }

sources/app/Exceptions/FeedException.php

@@ -1,6 +1,6 @@
 <?php
 class FreshRSS_Feed_Exception extends Exception {
-	public function __construct ($message) {
+	public function __construct($message) {
-		parent::__construct ($message);
+		parent::__construct($message);
 	}
 }

sources/app/FreshRSS.php

@@ -1,146 +1,85 @@
 <?php
+
 class FreshRSS extends Minz_FrontController {
+	/**
+	 * Initialize the different FreshRSS / Minz components.
+	 *
+	 * PLEASE DON'T CHANGE THE ORDER OF INITIALIZATIONS UNLESS YOU KNOW WHAT
+	 * YOU DO!!
+	 *
+	 * Here is the list of components:
+	 * - Create a configuration setter and register it to system conf
+	 * - Init extension manager and enable system extensions (has to be done asap)
+	 * - Init authentication system
+	 * - Init user configuration (need auth system)
+	 * - Init FreshRSS context (need user conf)
+	 * - Init i18n (need context)
+	 * - Init sharing system (need user conf and i18n)
+	 * - Init generic styles and scripts (need user conf)
+	 * - Init notifications
+	 * - Enable user extensions (need all the other initializations)
+	 */
 	public function init() {
 		if (!isset($_SESSION)) {
 			Minz_Session::init('FreshRSS');
 		}
-		$loginOk = $this->accessControl(Minz_Session::param('currentUser', ''));
+
-		$this->loadParamsView();
+		// Register the configuration setter for the system configuration
+		$configuration_setter = new FreshRSS_ConfigurationSetter();
+		$system_conf = Minz_Configuration::get('system');
+		$system_conf->_configurationSetter($configuration_setter);
+
+		// Load list of extensions and enable the "system" ones.
+		Minz_ExtensionManager::init();
+
+		// Auth has to be initialized before using currentUser session parameter
+		// because it's this part which create this parameter.
+		$this->initAuth();
+
+		// Then, register the user configuration and use the configuration setter
+		// created above.
+		$current_user = Minz_Session::param('currentUser', '_');
+		Minz_Configuration::register('user',
+		                             join_path(USERS_PATH, $current_user, 'config.php'),
+		                             join_path(USERS_PATH, '_', 'config.default.php'),
+		                             $configuration_setter);
+
+		// Finish to initialize the other FreshRSS / Minz components.
+		FreshRSS_Context::init();
+		$this->initI18n();
+		FreshRSS_Share::load(join_path(DATA_PATH, 'shares.php'));
+		$this->loadStylesAndScripts();
+		$this->loadNotifications();
+		// Enable extensions for the current (logged) user.
+		if (FreshRSS_Auth::hasAccess()) {
+			$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
+			Minz_ExtensionManager::enableByList($ext_list);
+		}
+	}
+
+	private function initAuth() {
+		FreshRSS_Auth::init();
 		if (Minz_Request::isPost() && !is_referer_from_same_domain()) {
-			$loginOk = false;	//Basic protection against XSRF attacks
+			// Basic protection against XSRF attacks
+			FreshRSS_Auth::removeAccess();
+			$http_referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 			Minz_Error::error(
 				403,
-				array('error' => array(Minz_Translate::t('access_denied') . ' [HTTP_REFERER=' .
+				array('error' => array(
-					htmlspecialchars(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']) . ']'))
+					_t('access_denied'),
+					' [HTTP_REFERER=' . htmlspecialchars($http_referer) . ']'
+				))
 			);
 		}
-		Minz_View::_param('loginOk', $loginOk);
-		$this->loadStylesAndScripts($loginOk);	//TODO: Do not load that when not needed, e.g. some Ajax requests
-		$this->loadNotifications();
 	}
 
-	private static function getCredentialsFromLongTermCookie() {
+	private function initI18n() {
-		$token = Minz_Session::getLongTermCookie('FreshRSS_login');
+		Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
-		if (!ctype_alnum($token)) {
+		Minz_Translate::init(FreshRSS_Context::$user_conf->language);
-			return array();
-		}
-		$tokenFile = DATA_PATH . '/tokens/' . $token . '.txt';
-		$mtime = @filemtime($tokenFile);
-		if ($mtime + 2629744 < time()) {	//1 month	//TODO: Use a configuration instead
-			@unlink($tokenFile);
-			return array(); 	//Expired or token does not exist
-		}
-		$credentials = @file_get_contents($tokenFile);
-		return $credentials === false ? array() : explode("\t", $credentials, 2);
 	}
 
-	private function accessControl($currentUser) {
+	private function loadStylesAndScripts() {
-		if ($currentUser == '') {
+		$theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme);
-			switch (Minz_Configuration::authType()) {
-				case 'form':
-					$credentials = self::getCredentialsFromLongTermCookie();
-					if (isset($credentials[1])) {
-						$currentUser = trim($credentials[0]);
-						Minz_Session::_param('passwordHash', trim($credentials[1]));
-					}
-					$loginOk = $currentUser != '';
-					if (!$loginOk) {
-						$currentUser = Minz_Configuration::defaultUser();
-						Minz_Session::_param('passwordHash');
-					}
-					break;
-				case 'http_auth':
-					$currentUser = httpAuthUser();
-					$loginOk = $currentUser != '';
-					break;
-				case 'persona':
-					$loginOk = false;
-					$email = filter_var(Minz_Session::param('mail'), FILTER_VALIDATE_EMAIL);
-					if ($email != '') {	//TODO: Remove redundancy with indexController
-						$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
-						if (($currentUser = @file_get_contents($personaFile)) !== false) {
-							$currentUser = trim($currentUser);
-							$loginOk = true;
-						}
-					}
-					if (!$loginOk) {
-						$currentUser = Minz_Configuration::defaultUser();
-					}
-					break;
-				case 'none':
-					$currentUser = Minz_Configuration::defaultUser();
-					$loginOk = true;
-					break;
-				default:
-					$currentUser = Minz_Configuration::defaultUser();
-					$loginOk = false;
-					break;
-			}
-		} else {
-			$loginOk = true;
-		}
-
-		if (!ctype_alnum($currentUser)) {
-			Minz_Session::_param('currentUser', '');
-			die('Invalid username [' . $currentUser . ']!');
-		}
-
-		try {
-			$this->conf = new FreshRSS_Configuration($currentUser);
-			Minz_View::_param ('conf', $this->conf);
-			Minz_Session::_param('currentUser', $currentUser);
-		} catch (Minz_Exception $me) {
-			$loginOk = false;
-			try {
-				$this->conf = new FreshRSS_Configuration(Minz_Configuration::defaultUser());
-				Minz_Session::_param('currentUser', Minz_Configuration::defaultUser());
-				Minz_View::_param('conf', $this->conf);
-				$notif = array(
-					'type' => 'bad',
-					'content' => 'Invalid configuration for user [' . $currentUser . ']!',
-				);
-				Minz_Session::_param ('notification', $notif);
-				Minz_Log::record ($notif['content'] . ' ' . $me->getMessage(), Minz_Log::WARNING);
-				Minz_Session::_param('currentUser', '');
-			} catch (Exception $e) {
-				die($e->getMessage());
-			}
-		}
-
-		if ($loginOk) {
-			switch (Minz_Configuration::authType()) {
-				case 'form':
-					$loginOk = Minz_Session::param('passwordHash') === $this->conf->passwordHash;
-					break;
-				case 'http_auth':
-					$loginOk = strcasecmp($currentUser, httpAuthUser()) === 0;
-					break;
-				case 'persona':
-					$loginOk = strcasecmp(Minz_Session::param('mail'), $this->conf->mail_login) === 0;
-					break;
-				case 'none':
-					$loginOk = true;
-					break;
-				default:
-					$loginOk = false;
-					break;
-			}
-		}
-		return $loginOk;
-	}
-
-	private function loadParamsView () {
-		Minz_Session::_param ('language', $this->conf->language);
-		Minz_Translate::init();
-		$output = Minz_Request::param ('output', '');
-		if (($output === '') || ($output !== 'normal' && $output !== 'rss' && $output !== 'reader' && $output !== 'global')) {
-			$output = $this->conf->view_mode;
-			Minz_Request::_param ('output', $output);
-		}
-	}
-
-	private function loadStylesAndScripts($loginOk) {
-		$theme = FreshRSS_Themes::load($this->conf->theme);
 		if ($theme) {
 			foreach($theme['files'] as $file) {
 				if ($file[0] === '_') {
@@ -157,26 +96,24 @@ class FreshRSS extends Minz_FrontController {
 			}
 		}
 
-		switch (Minz_Configuration::authType()) {
-			case 'form':
-				if (!$loginOk) {
-					Minz_View::appendScript(Minz_Url::display ('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')));
-				}
-				break;
-			case 'persona':
-				Minz_View::appendScript('https://login.persona.org/include.js');
-				break;
-		}
 		Minz_View::appendScript(Minz_Url::display('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js')));
 		Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
+
+		if (FreshRSS_Context::$system_conf->auth_type === 'persona') {
+			// TODO move it in a plugin
+			// Needed for login AND logout with Persona.
+			Minz_View::appendScript('https://login.persona.org/include.js');
+			$file_mtime = @filemtime(PUBLIC_PATH . '/scripts/persona.js');
+			Minz_View::appendScript(Minz_Url::display('/scripts/persona.js?' . $file_mtime));
+		}
 	}
 
-	private function loadNotifications () {
+	private function loadNotifications() {
-		$notif = Minz_Session::param ('notification');
+		$notif = Minz_Session::param('notification');
 		if ($notif) {
-			Minz_View::_param ('notification', $notif);
+			Minz_View::_param('notification', $notif);
-			Minz_Session::_param ('notification');
+			Minz_Session::_param('notification');
 		}
 	}
 }

sources/app/Models/Auth.php

@@ -0,0 +1,254 @@
+<?php
+
+/**
+ * This class handles all authentication process.
+ */
+class FreshRSS_Auth {
+	/**
+	 * Determines if user is connected.
+	 */
+	private static $login_ok = false;
+
+	/**
+	 * This method initializes authentication system.
+	 */
+	public static function init() {
+		self::$login_ok = Minz_Session::param('loginOk', false);
+		$current_user = Minz_Session::param('currentUser', '');
+		if ($current_user === '') {
+			$conf = Minz_Configuration::get('system');
+			$current_user = $conf->default_user;
+			Minz_Session::_param('currentUser', $current_user);
+		}
+
+		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();
+		}
+	}
+
+	/**
+	 * This method checks if user is allowed to connect.
+	 *
+	 * Required session parameters are also set in this method (such as
+	 * currentUser).
+	 *
+	 * @return boolean true if user can be connected, false else.
+	 */
+	private static function accessControl() {
+		$conf = Minz_Configuration::get('system');
+		$auth_type = $conf->auth_type;
+		switch ($auth_type) {
+		case 'form':
+			$credentials = FreshRSS_FormAuth::getCredentialsFromCookie();
+			$current_user = '';
+			if (isset($credentials[1])) {
+				$current_user = trim($credentials[0]);
+				Minz_Session::_param('currentUser', $current_user);
+				Minz_Session::_param('passwordHash', trim($credentials[1]));
+			}
+			return $current_user != '';
+		case 'http_auth':
+			$current_user = httpAuthUser();
+			$login_ok = $current_user != '';
+			if ($login_ok) {
+				Minz_Session::_param('currentUser', $current_user);
+			}
+			return $login_ok;
+		case 'persona':
+			$email = filter_var(Minz_Session::param('mail'), FILTER_VALIDATE_EMAIL);
+			$persona_file = DATA_PATH . '/persona/' . $email . '.txt';
+			if (($current_user = @file_get_contents($persona_file)) !== false) {
+				$current_user = trim($current_user);
+				Minz_Session::_param('currentUser', $current_user);
+				Minz_Session::_param('mail', $email);
+				return true;
+			}
+			return false;
+		case 'none':
+			return true;
+		default:
+			// TODO load extension
+			return false;
+		}
+	}
+
+	/**
+	 * Gives access to the current user.
+	 */
+	public static function giveAccess() {
+		$current_user = Minz_Session::param('currentUser');
+		$user_conf = get_user_configuration($current_user);
+		$system_conf = Minz_Configuration::get('system');
+
+		switch ($system_conf->auth_type) {
+		case 'form':
+			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'), $user_conf->mail_login) === 0;
+			break;
+		case 'none':
+			self::$login_ok = true;
+			break;
+		default:
+			// TODO: extensions
+			self::$login_ok = false;
+		}
+
+		Minz_Session::_param('loginOk', self::$login_ok);
+	}
+
+	/**
+	 * Returns if current user has access to the given scope.
+	 *
+	 * @param string $scope general (default) or admin
+	 * @return boolean true if user has corresponding access, false else.
+	 */
+	public static function hasAccess($scope = 'general') {
+		$conf = Minz_Configuration::get('system');
+		$default_user = $conf->default_user;
+		$ok = self::$login_ok;
+		switch ($scope) {
+		case 'general':
+			break;
+		case 'admin':
+			$ok &= Minz_Session::param('currentUser') === $default_user;
+			break;
+		default:
+			$ok = false;
+		}
+		return $ok;
+	}
+
+	/**
+	 * Removes all accesses for the current user.
+	 */
+	public static function removeAccess() {
+		Minz_Session::_param('loginOk');
+		self::$login_ok = false;
+		$conf = Minz_Configuration::get('system');
+		Minz_Session::_param('currentUser', $conf->default_user);
+
+		switch ($conf->auth_type) {
+		case 'form':
+			Minz_Session::_param('passwordHash');
+			FreshRSS_FormAuth::deleteCookie();
+			break;
+		case 'persona':
+			Minz_Session::_param('mail');
+			break;
+		case 'http_auth':
+		case 'none':
+			// Nothing to do...
+			break;
+		default:
+			// TODO: extensions
+		}
+	}
+
+	/**
+	 * Return if authentication is enabled on this instance of FRSS.
+	 */
+	public static function accessNeedsLogin() {
+		$conf = Minz_Configuration::get('system');
+		$auth_type = $conf->auth_type;
+		return $auth_type !== 'none';
+	}
+
+	/**
+	 * Return if authentication requires a PHP action.
+	 */
+	public static function accessNeedsAction() {
+		$conf = Minz_Configuration::get('system');
+		$auth_type = $conf->auth_type;
+		return $auth_type === 'form' || $auth_type === 'persona';
+	}
+}
+
+
+class FreshRSS_FormAuth {
+	public static function checkCredentials($username, $hash, $nonce, $challenge) {
+		if (!ctype_alnum($username) ||
+				!ctype_graph($challenge) ||
+				!ctype_alnum($nonce)) {
+			Minz_Log::debug('Invalid credential parameters:' .
+			                ' user=' . $username .
+			                ' challenge=' . $challenge .
+			                ' nonce=' . $nonce);
+			return false;
+		}
+
+		if (!function_exists('password_verify')) {
+			include_once(LIB_PATH . '/password_compat.php');
+		}
+
+		return password_verify($nonce . $hash, $challenge);
+	}
+
+	public static function getCredentialsFromCookie() {
+		$token = Minz_Session::getLongTermCookie('FreshRSS_login');
+		if (!ctype_alnum($token)) {
+			return array();
+		}
+
+		$token_file = DATA_PATH . '/tokens/' . $token . '.txt';
+		$mtime = @filemtime($token_file);
+		if ($mtime + 2629744 < time()) {
+			// Token has expired (> 1 month) or does not exist.
+			// TODO: 1 month -> use a configuration instead
+			@unlink($token_file);
+			return array(); 	
+		}
+
+		$credentials = @file_get_contents($token_file);
+		return $credentials === false ? array() : explode("\t", $credentials, 2);
+	}
+
+	public static function makeCookie($username, $password_hash) {
+		do {
+			$conf = Minz_Configuration::get('system');
+			$token = sha1($conf->salt . $username . uniqid(mt_rand(), true));
+			$token_file = DATA_PATH . '/tokens/' . $token . '.txt';
+		} while (file_exists($token_file));
+
+		if (@file_put_contents($token_file, $username . "\t" . $password_hash) === false) {
+			return false;
+		}
+
+		$expire = time() + 2629744;	//1 month	//TODO: Use a configuration instead
+		Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire);
+		return $token;
+	}
+
+	public static function deleteCookie() {
+		$token = Minz_Session::getLongTermCookie('FreshRSS_login');
+		Minz_Session::deleteLongTermCookie('FreshRSS_login');
+		if (ctype_alnum($token)) {
+			@unlink(DATA_PATH . '/tokens/' . $token . '.txt');
+		}
+
+		if (rand(0, 10) === 1) {
+			self::purgeTokens();
+		}
+	}
+
+	public static function purgeTokens() {
+		$oldest = time() - 2629744;	// 1 month	// TODO: Use a configuration instead
+		foreach (new DirectoryIterator(DATA_PATH . '/tokens/') as $file_info) {
+			// $extension = $file_info->getExtension(); doesn't work in PHP < 5.3.7
+			$extension = pathinfo($file_info->getFilename(), PATHINFO_EXTENSION);
+			if ($extension === 'txt' && $file_info->getMTime() < $oldest) {
+				@unlink($file_info->getPathname());
+			}
+		}
+	}
+}

sources/app/Models/Category.php

@@ -7,65 +7,65 @@ class FreshRSS_Category extends Minz_Model {
 	private $nbNotRead = -1;
 	private $feeds = null;
 
-	public function __construct ($name = '', $feeds = null) {
+	public function __construct($name = '', $feeds = null) {
-		$this->_name ($name);
+		$this->_name($name);
-		if (isset ($feeds)) {
+		if (isset($feeds)) {
-			$this->_feeds ($feeds);
+			$this->_feeds($feeds);
 			$this->nbFeed = 0;
 			$this->nbNotRead = 0;
 			foreach ($feeds as $feed) {
 				$this->nbFeed++;
-				$this->nbNotRead += $feed->nbNotRead ();
+				$this->nbNotRead += $feed->nbNotRead();
 			}
 		}
 	}
 
-	public function id () {
+	public function id() {
 		return $this->id;
 	}
-	public function name () {
+	public function name() {
 		return $this->name;
 	}
-	public function nbFeed () {
+	public function nbFeed() {
 		if ($this->nbFeed < 0) {
-			$catDAO = new FreshRSS_CategoryDAO ();
+			$catDAO = new FreshRSS_CategoryDAO();
-			$this->nbFeed = $catDAO->countFeed ($this->id ());
+			$this->nbFeed = $catDAO->countFeed($this->id());
 		}
 
 		return $this->nbFeed;
 	}
-	public function nbNotRead () {
+	public function nbNotRead() {
 		if ($this->nbNotRead < 0) {
-			$catDAO = new FreshRSS_CategoryDAO ();
+			$catDAO = new FreshRSS_CategoryDAO();
-			$this->nbNotRead = $catDAO->countNotRead ($this->id ());
+			$this->nbNotRead = $catDAO->countNotRead($this->id());
 		}
 
 		return $this->nbNotRead;
 	}
-	public function feeds () {
+	public function feeds() {
 		if ($this->feeds === null) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$this->feeds = $feedDAO->listByCategory ($this->id ());
+			$this->feeds = $feedDAO->listByCategory($this->id());
 			$this->nbFeed = 0;
 			$this->nbNotRead = 0;
 			foreach ($this->feeds as $feed) {
 				$this->nbFeed++;
-				$this->nbNotRead += $feed->nbNotRead ();
+				$this->nbNotRead += $feed->nbNotRead();
 			}
 		}
 
 		return $this->feeds;
 	}
 
-	public function _id ($value) {
+	public function _id($value) {
 		$this->id = $value;
 	}
-	public function _name ($value) {
+	public function _name($value) {
-		$this->name = $value;
+		$this->name = substr(trim($value), 0, 255);
 	}
-	public function _feeds ($values) {
+	public function _feeds($values) {
-		if (!is_array ($values)) {
+		if (!is_array($values)) {
-			$values = array ($values);
+			$values = array($values);
 		}
 
 		$this->feeds = $values;

sources/app/Models/CategoryDAO.php

@@ -1,19 +1,19 @@
 <?php
 
 class FreshRSS_CategoryDAO extends Minz_ModelPdo {
-	public function addCategory ($valuesTmp) {
+	public function addCategory($valuesTmp) {
-		$sql = 'INSERT INTO `' . $this->prefix . 'category` (name) VALUES(?)';
+		$sql = 'INSERT INTO `' . $this->prefix . 'category`(name) VALUES(?)';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array (
+		$values = array(
 			substr($valuesTmp['name'], 0, 255),
 		);
 
-		if ($stm && $stm->execute ($values)) {
+		if ($stm && $stm->execute($values)) {
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error addCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error addCategory: ' . $info[2]	);
 			return false;
 		}
 	}
@@ -31,73 +31,73 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		return $cat->id();
 	}
 
-	public function updateCategory ($id, $valuesTmp) {
+	public function updateCategory($id, $valuesTmp) {
 		$sql = 'UPDATE `' . $this->prefix . 'category` SET name=? WHERE id=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array (
+		$values = array(
 			$valuesTmp['name'],
 			$id
 		);
 
-		if ($stm && $stm->execute ($values)) {
+		if ($stm && $stm->execute($values)) {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error updateCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error updateCategory: ' . $info[2]);
 			return false;
 		}
 	}
 
-	public function deleteCategory ($id) {
+	public function deleteCategory($id) {
 		$sql = 'DELETE FROM `' . $this->prefix . 'category` WHERE id=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array ($id);
+		$values = array($id);
 
-		if ($stm && $stm->execute ($values)) {
+		if ($stm && $stm->execute($values)) {
 			return $stm->rowCount();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::record('SQL error deleteCategory: ' . $info[2], Minz_Log::ERROR);
+			Minz_Log::error('SQL error deleteCategory: ' . $info[2]);
 			return false;
 		}
 	}
 
-	public function searchById ($id) {
+	public function searchById($id) {
 		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array ($id);
+		$values = array($id);
 
-		$stm->execute ($values);
+		$stm->execute($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$cat = self::daoToCategory ($res);
+		$cat = self::daoToCategory($res);
 
-		if (isset ($cat[0])) {
+		if (isset($cat[0])) {
 			return $cat[0];
 		} else {
 			return null;
 		}
 	}
-	public function searchByName ($name) {
+	public function searchByName($name) {
 		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE name=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$values = array ($name);
+		$values = array($name);
 
-		$stm->execute ($values);
+		$stm->execute($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$cat = self::daoToCategory ($res);
+		$cat = self::daoToCategory($res);
 
-		if (isset ($cat[0])) {
+		if (isset($cat[0])) {
 			return $cat[0];
 		} else {
 			return null;
 		}
 	}
 
-	public function listCategories ($prePopulateFeeds = true, $details = false) {
+	public function listCategories($prePopulateFeeds = true, $details = false) {
 		if ($prePopulateFeeds) {
 			$sql = 'SELECT c.id AS c_id, c.name AS c_name, '
 			     . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.website, f.priority, f.error, f.cache_nbEntries, f.cache_nbUnreads ')
@@ -105,80 +105,80 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 			     . 'LEFT OUTER JOIN `' . $this->prefix . 'feed` f ON f.category=c.id '
 			     . 'GROUP BY f.id '
 			     . 'ORDER BY c.name, f.name';
-			$stm = $this->bd->prepare ($sql);
+			$stm = $this->bd->prepare($sql);
-			$stm->execute ();
+			$stm->execute();
-			return self::daoToCategoryPrepopulated ($stm->fetchAll (PDO::FETCH_ASSOC));
+			return self::daoToCategoryPrepopulated($stm->fetchAll(PDO::FETCH_ASSOC));
 		} else {
 			$sql = 'SELECT * FROM `' . $this->prefix . 'category` ORDER BY name';
-			$stm = $this->bd->prepare ($sql);
+			$stm = $this->bd->prepare($sql);
-			$stm->execute ();
+			$stm->execute();
-			return self::daoToCategory ($stm->fetchAll (PDO::FETCH_ASSOC));
+			return self::daoToCategory($stm->fetchAll(PDO::FETCH_ASSOC));
 		}
 	}
 
-	public function getDefault () {
+	public function getDefault() {
 		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=1';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
 
-		$stm->execute ();
+		$stm->execute();
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$cat = self::daoToCategory ($res);
+		$cat = self::daoToCategory($res);
 
-		if (isset ($cat[0])) {
+		if (isset($cat[0])) {
 			return $cat[0];
 		} else {
 			return false;
 		}
 	}
-	public function checkDefault () {
+	public function checkDefault() {
-		$def_cat = $this->searchById (1);
+		$def_cat = $this->searchById(1);
 
 		if ($def_cat == null) {
-			$cat = new FreshRSS_Category (Minz_Translate::t ('default_category'));
+			$cat = new FreshRSS_Category(_t('gen.short.default_category'));
-			$cat->_id (1);
+			$cat->_id(1);
 
-			$values = array (
+			$values = array(
-				'id' => $cat->id (),
+				'id' => $cat->id(),
-				'name' => $cat->name (),
+				'name' => $cat->name(),
 			);
 
-			$this->addCategory ($values);
+			$this->addCategory($values);
 		}
 	}
 
-	public function count () {
+	public function count() {
 		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'category`';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
-		$stm->execute ();
+		$stm->execute();
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
 		return $res[0]['count'];
 	}
 
-	public function countFeed ($id) {
+	public function countFeed($id) {
 		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'feed` WHERE category=?';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
-		$values = array ($id);
+		$values = array($id);
-		$stm->execute ($values);
+		$stm->execute($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
 		return $res[0]['count'];
 	}
 
-	public function countNotRead ($id) {
+	public function countNotRead($id) {
 		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id WHERE category=? AND e.is_read=0';
-		$stm = $this->bd->prepare ($sql);
+		$stm = $this->bd->prepare($sql);
-		$values = array ($id);
+		$values = array($id);
-		$stm->execute ($values);
+		$stm->execute($values);
-		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 
 		return $res[0]['count'];
 	}
 
 	public static function findFeed($categories, $feed_id) {
 		foreach ($categories as $category) {
-			foreach ($category->feeds () as $feed) {
+			foreach ($category->feeds() as $feed) {
-				if ($feed->id () === $feed_id) {
+				if ($feed->id() === $feed_id) {
 					return $feed;
 				}
 			}
@@ -189,8 +189,8 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 	public static function CountUnreads($categories, $minPriority = 0) {
 		$n = 0;
 		foreach ($categories as $category) {
-			foreach ($category->feeds () as $feed) {
+			foreach ($category->feeds() as $feed) {
-				if ($feed->priority () >= $minPriority) {
+				if ($feed->priority() >= $minPriority) {
 					$n += $feed->nbNotRead();
 				}
 			}
@@ -198,11 +198,11 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		return $n;
 	}
 
-	public static function daoToCategoryPrepopulated ($listDAO) {
+	public static function daoToCategoryPrepopulated($listDAO) {
-		$list = array ();
+		$list = array();
 
-		if (!is_array ($listDAO)) {
+		if (!is_array($listDAO)) {
-			$listDAO = array ($listDAO);
+			$listDAO = array($listDAO);
 		}
 
 		$previousLine = null;
@@ -210,11 +210,11 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		foreach ($listDAO as $line) {
 			if ($previousLine['c_id'] != null && $line['c_id'] !== $previousLine['c_id']) {
 				// End of the current category, we add it to the $list
-				$cat = new FreshRSS_Category (
+				$cat = new FreshRSS_Category(
 					$previousLine['c_name'],
-					FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
+					FreshRSS_FeedDAO::daoToFeed($feedsDao, $previousLine['c_id'])
 				);
-				$cat->_id ($previousLine['c_id']);
+				$cat->_id($previousLine['c_id']);
 				$list[$previousLine['c_id']] = $cat;
 
 				$feedsDao = array();	//Prepare for next category
@@ -226,29 +226,29 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 
 		// add the last category
 		if ($previousLine != null) {
-			$cat = new FreshRSS_Category (
+			$cat = new FreshRSS_Category(
 				$previousLine['c_name'],
-				FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
+				FreshRSS_FeedDAO::daoToFeed($feedsDao, $previousLine['c_id'])
 			);
-			$cat->_id ($previousLine['c_id']);
+			$cat->_id($previousLine['c_id']);
 			$list[$previousLine['c_id']] = $cat;
 		}
 
 		return $list;
 	}
 
-	public static function daoToCategory ($listDAO) {
+	public static function daoToCategory($listDAO) {
-		$list = array ();
+		$list = array();
 
-		if (!is_array ($listDAO)) {
+		if (!is_array($listDAO)) {
-			$listDAO = array ($listDAO);
+			$listDAO = array($listDAO);
 		}
 
 		foreach ($listDAO as $key => $dao) {
-			$cat = new FreshRSS_Category (
+			$cat = new FreshRSS_Category(
 				$dao['name']
 			);
-			$cat->_id ($dao['id']);
+			$cat->_id($dao['id']);
 			$list[$key] = $cat;
 		}
 

sources/app/Models/Configuration.php

@@ -1,335 +0,0 @@
-<?php
-
-class FreshRSS_Configuration {
-	private $filename;
-
-	private $data = array(
-		'language' => 'en',
-		'old_entries' => 3,
-		'keep_history_default' => 0,
-		'ttl_default' => 3600,
-		'mail_login' => '',
-		'token' => '',
-		'passwordHash' => '',	//CRYPT_BLOWFISH
-		'apiPasswordHash' => '',	//CRYPT_BLOWFISH
-		'posts_per_page' => 20,
-		'view_mode' => 'normal',
-		'default_view' => 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,
-		'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',
-		),
-		'topline_read' => true,
-		'topline_favorite' => true,
-		'topline_date' => true,
-		'topline_link' => true,
-		'bottomline_read' => true,
-		'bottomline_favorite' => true,
-		'bottomline_sharing' => true,
-		'bottomline_tags' => true,
-		'bottomline_date' => true,
-		'bottomline_link' => true,
-		'sharing' => array(),
-		'queries' => array(),
-		'html5_notif_timeout' => 0,
-	);
-
-	private $available_languages = array(
-		'en' => 'English',
-		'fr' => 'Français',
-	);
-
-	private $shares;
-
-	public function __construct($user) {
-		$this->filename = DATA_PATH . DIRECTORY_SEPARATOR . $user . '_user.php';
-
-		$data = @include($this->filename);
-		if (!is_array($data)) {
-			throw new Minz_PermissionDeniedException($this->filename);
-		}
-
-		foreach ($data as $key => $value) {
-			if (isset($this->data[$key])) {
-				$function = '_' . $key;
-				$this->$function($value);
-			}
-		}
-		$this->data['user'] = $user;
-
-		$this->shares = DATA_PATH . DIRECTORY_SEPARATOR . 'shares.php';
-
-		$shares = @include($this->shares);
-		if (!is_array($shares)) {
-			throw new Minz_PermissionDeniedException($this->shares);
-		}
-
-		$this->data['shares'] = $shares;
-	}
-
-	public function save() {
-		@rename($this->filename, $this->filename . '.bak.php');
-		unset($this->data['shares']); // Remove shares because it is not intended to be stored in user configuration
-		if (file_put_contents($this->filename, "<?php\n return " . var_export($this->data, true) . ';', LOCK_EX) === false) {
-			throw new Minz_PermissionDeniedException($this->filename);
-		}
-		if (function_exists('opcache_invalidate')) {
-			opcache_invalidate($this->filename);	//Clear PHP 5.5+ cache for include
-		}
-		invalidateHttpCache();
-		return true;
-	}
-
-	public function __get($name) {
-		if (array_key_exists($name, $this->data)) {
-			return $this->data[$name];
-		} else {
-			$trace = debug_backtrace();
-			trigger_error('Undefined FreshRSS_Configuration->' . $name . 'in ' . $trace[0]['file'] . ' line ' . $trace[0]['line'], E_USER_NOTICE);	//TODO: Use Minz exceptions
-			return null;
-		}
-	}
-
-	public function availableLanguages() {
-		return $this->available_languages;
-	}
-
-	public function remove_query_by_get($get) {
-		$final_queries = array();
-		foreach ($this->queries as $key => $query) {
-			if (empty($query['get']) || $query['get'] !== $get) {
-				$final_queries[$key] = $query;
-			}
-		}
-		$this->_queries($final_queries);
-	}
-
-	public function _language($value) {
-		if (!isset($this->available_languages[$value])) {
-			$value = 'en';
-		}
-		$this->data['language'] = $value;
-	}
-	public function _posts_per_page ($value) {
-		$value = intval($value);
-		$this->data['posts_per_page'] = $value > 0 ? $value : 10;
-	}
-	public function _view_mode ($value) {
-		if ($value === 'global' || $value === 'reader') {
-			$this->data['view_mode'] = $value;
-		} else {
-			$this->data['view_mode'] = 'normal';
-		}
-	}
-	public function _default_view ($value) {
-		switch ($value) {
-		case FreshRSS_Entry::STATE_ALL:
-			// left blank on purpose
-		case FreshRSS_Entry::STATE_NOT_READ:
-			// left blank on purpose
-		case FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ:
-			$this->data['default_view'] = $value;
-			break;
-		default:
-			$this->data['default_view'] = FreshRSS_Entry::STATE_ALL;
-			break;
-		}
-	}
-	public function _display_posts ($value) {
-		$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _display_categories ($value) {
-		$this->data['display_categories'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _hide_read_feeds($value) {
-		$this->data['hide_read_feeds'] = (bool)$value;
-	}
-	public function _onread_jump_next ($value) {
-		$this->data['onread_jump_next'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _lazyload ($value) {
-		$this->data['lazyload'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _sticky_post($value) {
-		$this->data['sticky_post'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _reading_confirm($value) {
-		$this->data['reading_confirm'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _sort_order ($value) {
-		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
-	}
-	public function _old_entries($value) {
-		$value = intval($value);
-		$this->data['old_entries'] = $value > 0 ? $value : 3;
-	}
-	public function _keep_history_default($value) {
-		$value = intval($value);
-		$this->data['keep_history_default'] = $value >= -1 ? $value : 0;
-	}
-	public function _ttl_default($value) {
-		$value = intval($value);
-		$this->data['ttl_default'] = $value >= -1 ? $value : 3600;
-	}
-	public function _shortcuts ($values) {
-		foreach ($values as $key => $value) {
-			if (isset($this->data['shortcuts'][$key])) {
-				$this->data['shortcuts'][$key] = $value;
-			}
-		}
-	}
-	public function _passwordHash ($value) {
-		$this->data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
-	}
-	public function _apiPasswordHash ($value) {
-		$this->data['apiPasswordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
-	}
-	public function _mail_login ($value) {
-		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
-		if ($value) {
-			$this->data['mail_login'] = $value;
-		} else {
-			$this->data['mail_login'] = '';
-		}
-	}
-	public function _anon_access ($value) {
-		$this->data['anon_access'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _mark_when ($values) {
-		foreach ($values as $key => $value) {
-			if (isset($this->data['mark_when'][$key])) {
-				$this->data['mark_when'][$key] = ((bool)$value) && $value !== 'no';
-			}
-		}
-	}
-	public function _sharing ($values) {
-		$this->data['sharing'] = array();
-		$unique = array();
-		foreach ($values as $value) {
-			if (!is_array($value)) {
-				continue;
-			}
-
-			// Verify URL and add default value when needed
-			if (isset($value['url'])) {
-				$is_url = (
-					filter_var ($value['url'], FILTER_VALIDATE_URL) ||
-					(version_compare(PHP_VERSION, '5.3.3', '<') &&
-						(strpos($value, '-') > 0) &&
-						($value === filter_var($value, FILTER_SANITIZE_URL)))
-				);  //PHP bug #51192
-				if (!$is_url) {
-					continue;
-				}
-			} else {
-				$value['url'] = null;
-			}
-
-			// Add a default name
-			if (empty($value['name'])) {
-				$value['name'] = $value['type'];
-			}
-
-			$json_value = json_encode($value);
-			if (!in_array($json_value, $unique)) {
-				$unique[] = $json_value;
-				$this->data['sharing'][] = $value;
-			}
-		}
-	}
-	public function _queries ($values) {
-		$this->data['queries'] = array();
-		foreach ($values as $value) {
-			$value = array_filter($value);
-			$params = $value;
-			unset($params['name']);
-			unset($params['url']);
-			$value['url'] = Minz_Url::display(array('params' => $params));
-
-			$this->data['queries'][] = $value;
-		}
-	}
-	public function _theme($value) {
-		$this->data['theme'] = $value;
-	}
-	public function _content_width($value) {
-		if ($value === 'medium' ||
-				$value === 'large' ||
-				$value === 'no_limit') {
-			$this->data['content_width'] = $value;
-		} else {
-			$this->data['content_width'] = 'thin';
-		}
-	}
-	
-	public function _html5_notif_timeout ($value) {
-		$value = intval($value);
-		$this->data['html5_notif_timeout'] = $value >= 0 ? $value : 0;
-	}
-	
-	public function _token($value) {
-		$this->data['token'] = $value;
-	}
-	public function _auto_load_more($value) {
-		$this->data['auto_load_more'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_read($value) {
-		$this->data['topline_read'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_favorite($value) {
-		$this->data['topline_favorite'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_date($value) {
-		$this->data['topline_date'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _topline_link($value) {
-		$this->data['topline_link'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_read($value) {
-		$this->data['bottomline_read'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_favorite($value) {
-		$this->data['bottomline_favorite'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_sharing($value) {
-		$this->data['bottomline_sharing'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_tags($value) {
-		$this->data['bottomline_tags'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_date($value) {
-		$this->data['bottomline_date'] = ((bool)$value) && $value !== 'no';
-	}
-	public function _bottomline_link($value) {
-		$this->data['bottomline_link'] = ((bool)$value) && $value !== 'no';
-	}
-}

sources/app/Models/ConfigurationSetter.php

@@ -0,0 +1,374 @@
+<?php
+
+class FreshRSS_ConfigurationSetter {
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * A helper to set boolean values.
+	 *
+	 * @param $value the tested value.
+	 * @return true if value is true and different from no, false else.
+	 */
+	private function handleBool($value) {
+		return ((bool)$value) && $value !== 'no';
+	}
+
+	/**
+	 * The (long) list of setters for user configuration.
+	 */
+	private function _apiPasswordHash(&$data, $value) {
+		$data['apiPasswordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
+	}
+
+	private function _content_width(&$data, $value) {
+		$value = strtolower($value);
+		if (!in_array($value, array('thin', 'medium', 'large', 'no_limit'))) {
+			$value = 'thin';
+		}
+
+		$data['content_width'] = $value;
+	}
+
+	private function _default_state(&$data, $value) {
+		$data['default_state'] = (int)$value;
+	}
+
+	private function _default_view(&$data, $value) {
+		switch ($value) {
+		case 'all':
+			$data['default_view'] = $value;
+			$data['default_state'] = (FreshRSS_Entry::STATE_READ +
+			                          FreshRSS_Entry::STATE_NOT_READ);
+			break;
+		case 'adaptive':
+		case 'unread':
+		default:
+			$data['default_view'] = $value;
+			$data['default_state'] = FreshRSS_Entry::STATE_NOT_READ;
+		}
+	}
+
+	// It works for system config too!
+	private function _extensions_enabled(&$data, $value) {
+		if (!is_array($value)) {
+			$value = array($value);
+		}
+		$data['extensions_enabled'] = $value;
+	}
+
+	private function _html5_notif_timeout(&$data, $value) {
+		$value = intval($value);
+		$data['html5_notif_timeout'] = $value >= 0 ? $value : 0;
+	}
+
+	private function _keep_history_default(&$data, $value) {
+		$value = intval($value);
+		$data['keep_history_default'] = $value >= -1 ? $value : 0;
+	}
+
+	// It works for system config too!
+	private function _language(&$data, $value) {
+		$value = strtolower($value);
+		$languages = Minz_Translate::availableLanguages();
+		if (!in_array($value, $languages)) {
+			$value = 'en';
+		}
+		$data['language'] = $value;
+	}
+
+	private function _mail_login(&$data, $value) {
+		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
+		$data['mail_login'] = $value ? $value : '';
+	}
+
+	private function _old_entries(&$data, $value) {
+		$value = intval($value);
+		$data['old_entries'] = $value > 0 ? $value : 3;
+	}
+
+	private function _passwordHash(&$data, $value) {
+		$data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
+	}
+
+	private function _posts_per_page(&$data, $value) {
+		$value = intval($value);
+		$data['posts_per_page'] = $value > 0 ? $value : 10;
+	}
+
+	private function _queries(&$data, $values) {
+		$data['queries'] = array();
+		foreach ($values as $value) {
+			$value = array_filter($value);
+			$params = $value;
+			unset($params['name']);
+			unset($params['url']);
+			$value['url'] = Minz_Url::display(array('params' => $params));
+			$data['queries'][] = $value;
+		}
+	}
+
+	private function _sharing(&$data, $values) {
+		$data['sharing'] = array();
+		foreach ($values as $value) {
+			if (!is_array($value)) {
+				continue;
+			}
+
+			// Verify URL and add default value when needed
+			if (isset($value['url'])) {
+				$is_url = (
+					filter_var($value['url'], FILTER_VALIDATE_URL) ||
+					(version_compare(PHP_VERSION, '5.3.3', '<') &&
+						(strpos($value, '-') > 0) &&
+						($value === filter_var($value, FILTER_SANITIZE_URL)))
+				); //PHP bug #51192
+				if (!$is_url) {
+					continue;
+				}
+			} else {
+				$value['url'] = null;
+			}
+
+			$data['sharing'][] = $value;
+		}
+	}
+
+	private function _shortcuts(&$data, $values) {
+		if (!is_array($values)) {
+			return;
+		}
+
+		$data['shortcuts'] = $values;
+	}
+
+	private function _sort_order(&$data, $value) {
+		$data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
+	}
+
+	private function _ttl_default(&$data, $value) {
+		$value = intval($value);
+		$data['ttl_default'] = $value >= -1 ? $value : 3600;
+	}
+
+	private function _view_mode(&$data, $value) {
+		$value = strtolower($value);
+		if (!in_array($value, array('global', 'normal', 'reader'))) {
+			$value = 'normal';
+		}
+		$data['view_mode'] =  $value;
+	}
+
+	/**
+	 * A list of boolean setters.
+	 */
+	private function _anon_access(&$data, $value) {
+		$data['anon_access'] = $this->handleBool($value);
+	}
+
+	private function _auto_load_more(&$data, $value) {
+		$data['auto_load_more'] = $this->handleBool($value);
+	}
+
+	private function _auto_remove_article(&$data, $value) {
+		$data['auto_remove_article'] = $this->handleBool($value);
+	}
+
+	private function _display_categories(&$data, $value) {
+		$data['display_categories'] = $this->handleBool($value);
+	}
+
+	private function _display_posts(&$data, $value) {
+		$data['display_posts'] = $this->handleBool($value);
+	}
+
+	private function _hide_read_feeds(&$data, $value) {
+		$data['hide_read_feeds'] = $this->handleBool($value);
+	}
+
+	private function _lazyload(&$data, $value) {
+		$data['lazyload'] = $this->handleBool($value);
+	}
+
+	private function _mark_when(&$data, $values) {
+		foreach ($values as $key => $value) {
+			$data['mark_when'][$key] = $this->handleBool($value);
+		}
+	}
+
+	private function _onread_jump_next(&$data, $value) {
+		$data['onread_jump_next'] = $this->handleBool($value);
+	}
+
+	private function _reading_confirm(&$data, $value) {
+		$data['reading_confirm'] = $this->handleBool($value);
+	}
+
+	private function _sticky_post(&$data, $value) {
+		$data['sticky_post'] = $this->handleBool($value);
+	}
+
+	private function _bottomline_date(&$data, $value) {
+		$data['bottomline_date'] = $this->handleBool($value);
+	}
+	private function _bottomline_favorite(&$data, $value) {
+		$data['bottomline_favorite'] = $this->handleBool($value);
+	}
+	private function _bottomline_link(&$data, $value) {
+		$data['bottomline_link'] = $this->handleBool($value);
+	}
+	private function _bottomline_read(&$data, $value) {
+		$data['bottomline_read'] = $this->handleBool($value);
+	}
+	private function _bottomline_sharing(&$data, $value) {
+		$data['bottomline_sharing'] = $this->handleBool($value);
+	}
+	private function _bottomline_tags(&$data, $value) {
+		$data['bottomline_tags'] = $this->handleBool($value);
+	}
+
+	private function _topline_date(&$data, $value) {
+		$data['topline_date'] = $this->handleBool($value);
+	}
+	private function _topline_favorite(&$data, $value) {
+		$data['topline_favorite'] = $this->handleBool($value);
+	}
+	private function _topline_link(&$data, $value) {
+		$data['topline_link'] = $this->handleBool($value);
+	}
+	private function _topline_read(&$data, $value) {
+		$data['topline_read'] = $this->handleBool($value);
+	}
+
+	/**
+	 * The (not so long) list of setters for system configuration.
+	 */
+	private function _allow_anonymous(&$data, $value) {
+		$data['allow_anonymous'] = $this->handleBool($value) && FreshRSS_Auth::accessNeedsAction();
+	}
+
+	private function _allow_anonymous_refresh(&$data, $value) {
+		$data['allow_anonymous_refresh'] = $this->handleBool($value) && $data['allow_anonymous'];
+	}
+
+	private function _api_enabled(&$data, $value) {
+		$data['api_enabled'] = $this->handleBool($value);
+	}
+
+	private function _auth_type(&$data, $value) {
+		$value = strtolower($value);
+		if (!in_array($value, array('form', 'http_auth', 'persona', 'none'))) {
+			$value = 'none';
+		}
+		$data['auth_type'] = $value;
+		$this->_allow_anonymous($data, $data['allow_anonymous']);
+	}
+
+	private function _db(&$data, $value) {
+		if (!isset($value['type'])) {
+			return;
+		}
+
+		switch ($value['type']) {
+		case 'mysql':
+			if (empty($value['host']) ||
+					empty($value['user']) ||
+					empty($value['base']) ||
+					!isset($value['password'])) {
+				return;
+			}
+
+			$data['db']['type'] = $value['type'];
+			$data['db']['host'] = $value['host'];
+			$data['db']['user'] = $value['user'];
+			$data['db']['base'] = $value['base'];
+			$data['db']['password'] = $value['password'];
+			$data['db']['prefix'] = isset($value['prefix']) ? $value['prefix'] : '';
+			break;
+		case 'sqlite':
+			$data['db']['type'] = $value['type'];
+			$data['db']['host'] = '';
+			$data['db']['user'] = '';
+			$data['db']['base'] = '';
+			$data['db']['password'] = '';
+			$data['db']['prefix'] = '';
+			break;
+		default:
+			return;
+		}
+	}
+
+	private function _default_user(&$data, $value) {
+		$user_list = listUsers();
+		if (in_array($value, $user_list)) {
+			$data['default_user'] = $value;
+		}
+	}
+
+	private function _environment(&$data, $value) {
+		$value = strtolower($value);
+		if (!in_array($value, array('silent', 'development', 'production'))) {
+			$value = 'production';
+		}
+		$data['environment'] =  $value;
+	}
+
+	private function _limits(&$data, $values) {
+		$max_small_int = 16384;
+		$limits_keys = array(
+			'cache_duration' => array(
+				'min' => 0,
+			),
+			'timeout' => array(
+				'min' => 0,
+			),
+			'max_inactivity' => array(
+				'min' => 0,
+			),
+			'max_feeds' => array(
+				'min' => 0,
+				'max' => $max_small_int,
+			),
+			'max_categories' => array(
+				'min' => 0,
+				'max' => $max_small_int,
+			),
+		);
+
+		foreach ($values as $key => $value) {
+			if (!isset($limits_keys[$key])) {
+				continue;
+			}
+
+			$limits = $limits_keys[$key];
+			if (
+				(!isset($limits['min']) || $value > $limits['min']) &&
+				(!isset($limits['max']) || $value < $limits['max'])
+			) {
+				$data['limits'][$key] = $value;
+			}
+		}
+	}
+
+	private function _unsafe_autologin_enabled(&$data, $value) {
+		$data['unsafe_autologin_enabled'] = $this->handleBool($value);
+	}
+}

sources/app/Models/Context.php

@@ -0,0 +1,304 @@
+<?php
+
+/**
+ * The context object handles the current configuration file and different
+ * useful functions associated to the current view state.
+ */
+class FreshRSS_Context {
+	public static $user_conf = null;
+	public static $system_conf = null;
+	public static $categories = array();
+
+	public static $name = '';
+
+	public static $total_unread = 0;
+	public static $total_starred = array(
+		'all' => 0,
+		'read' => 0,
+		'unread' => 0,
+	);
+
+	public static $get_unread = 0;
+	public static $current_get = array(
+		'all' => false,
+		'starred' => false,
+		'feed' => false,
+		'category' => false,
+	);
+	public static $next_get = 'a';
+
+	public static $state = 0;
+	public static $order = 'DESC';
+	public static $number = 0;
+	public static $search = '';
+	public static $first_id = '';
+	public static $next_id = '';
+	public static $id_max = '';
+
+	/**
+	 * Initialize the context.
+	 *
+	 * Set the correct configurations and $categories variables.
+	 */
+	public static function init() {
+		// Init configuration.
+		self::$system_conf = Minz_Configuration::get('system');
+		self::$user_conf = Minz_Configuration::get('user');
+
+		$catDAO = new FreshRSS_CategoryDAO();
+		self::$categories = $catDAO->listCategories();
+	}
+
+	/**
+	 * Returns if the current state includes $state parameter.
+	 */
+	public static function isStateEnabled($state) {
+		return self::$state & $state;
+	}
+
+	/**
+	 * Returns the current state with or without $state parameter.
+	 */
+	public static function getRevertState($state) {
+		if (self::$state & $state) {
+			return self::$state & ~$state;
+		} else {
+			return self::$state | $state;
+		}
+	}
+
+	/**
+	 * Return the current get as a string or an array.
+	 *
+	 * If $array is true, the first item of the returned value is 'f' or 'c' and
+	 * the second is the id.
+	 */
+	public static function currentGet($array = false) {
+		if (self::$current_get['all']) {
+			return 'a';
+		} elseif (self::$current_get['starred']) {
+			return 's';
+		} elseif (self::$current_get['feed']) {
+			if ($array) {
+				return array('f', self::$current_get['feed']);
+			} else {
+				return 'f_' . self::$current_get['feed'];
+			}
+		} elseif (self::$current_get['category']) {
+			if ($array) {
+				return array('c', self::$current_get['category']);
+			} else {
+				return 'c_' . self::$current_get['category'];
+			}
+		}
+	}
+
+	/**
+	 * Return true if $get parameter correspond to the $current_get attribute.
+	 */
+	public static function isCurrentGet($get) {
+		$type = $get[0];
+		$id = substr($get, 2);
+
+		switch($type) {
+		case 'a':
+			return self::$current_get['all'];
+		case 's':
+			return self::$current_get['starred'];
+		case 'f':
+			return self::$current_get['feed'] == $id;
+		case 'c':
+			return self::$current_get['category'] == $id;
+		default:
+			return false;
+		}
+	}
+
+	/**
+	 * Set the current $get attribute.
+	 *
+	 * Valid $get parameter are:
+	 *   - a
+	 *   - s
+	 *   - f_<feed id>
+	 *   - c_<category id>
+	 *
+	 * $name and $get_unread attributes are also updated as $next_get
+	 * Raise an exception if id or $get is invalid.
+	 */
+	public static function _get($get) {
+		$type = $get[0];
+		$id = substr($get, 2);
+		$nb_unread = 0;
+
+		switch($type) {
+		case 'a':
+			self::$current_get['all'] = true;
+			self::$name = _t('index.feed.title');
+			self::$get_unread = self::$total_unread;
+			break;
+		case 's':
+			self::$current_get['starred'] = true;
+			self::$name = _t('index.feed.title_fav');
+			self::$get_unread = self::$total_starred['unread'];
+
+			// Update state if favorite is not yet enabled.
+			self::$state = self::$state | FreshRSS_Entry::STATE_FAVORITE;
+			break;
+		case 'f':
+			// We try to find the corresponding feed.
+			$feed = FreshRSS_CategoryDAO::findFeed(self::$categories, $id);
+			if ($feed === null) {
+				$feedDAO = FreshRSS_Factory::createFeedDao();
+				$feed = $feedDAO->searchById($id);
+
+				if (!$feed) {
+					throw new FreshRSS_Context_Exception('Invalid feed: ' . $id);
+				}
+			}
+
+			self::$current_get['feed'] = $id;
+			self::$current_get['category'] = $feed->category();
+			self::$name = $feed->name();
+			self::$get_unread = $feed->nbNotRead();
+			break;
+		case 'c':
+			// We try to find the corresponding category.
+			self::$current_get['category'] = $id;
+			if (!isset(self::$categories[$id])) {
+				$catDAO = new FreshRSS_CategoryDAO();
+				$cat = $catDAO->searchById($id);
+
+				if (!$cat) {
+					throw new FreshRSS_Context_Exception('Invalid category: ' . $id);
+				}
+			} else {
+				$cat = self::$categories[$id];
+			}
+
+			self::$name = $cat->name();
+			self::$get_unread = $cat->nbNotRead();
+			break;
+		default:
+			throw new FreshRSS_Context_Exception('Invalid getter: ' . $get);
+		}
+
+		self::_nextGet();
+	}
+
+	/**
+	 * Set the value of $next_get attribute.
+	 */
+	public static function _nextGet() {
+		$get = self::currentGet();
+		// By default, $next_get == $get
+		self::$next_get = $get;
+
+		if (self::$user_conf->onread_jump_next && strlen($get) > 2) {
+			$another_unread_id = '';
+			$found_current_get = false;
+			switch ($get[0]) {
+			case 'f':
+				// We search the next feed with at least one unread article in
+				// same category as the currend feed.
+				foreach (self::$categories as $cat) {
+					if ($cat->id() != self::$current_get['category']) {
+						// We look into the category of the current feed!
+						continue;
+					}
+
+					foreach ($cat->feeds() as $feed) {
+						if ($feed->id() == self::$current_get['feed']) {
+							// Here is our current feed! Fine, the next one will
+							// be a potential candidate.
+							$found_current_get = true;
+							continue;
+						}
+
+						if ($feed->nbNotRead() > 0) {
+							$another_unread_id = $feed->id();
+							if ($found_current_get) {
+								// We have found our current feed and now we
+								// have an feed with unread articles. Leave the
+								// loop!
+								break;
+							}
+						}
+					}
+					break;
+				}
+
+				// If no feed have been found, next_get is the current category.
+				self::$next_get = empty($another_unread_id) ?
+				                  'c_' . self::$current_get['category'] :
+				                  'f_' . $another_unread_id;
+				break;
+			case 'c':
+				// We search the next category with at least one unread article.
+				foreach (self::$categories as $cat) {
+					if ($cat->id() == self::$current_get['category']) {
+						// Here is our current category! Next one could be our
+						// champion if it has unread articles.
+						$found_current_get = true;
+						continue;
+					}
+
+					if ($cat->nbNotRead() > 0) {
+						$another_unread_id = $cat->id();
+						if ($found_current_get) {
+							// Unread articles and the current category has
+							// already been found? Leave the loop!
+							break;
+						}
+					}
+				}
+
+				// No unread category? The main stream will be our destination!
+				self::$next_get = empty($another_unread_id) ?
+				                  'a' :
+				                  'c_' . $another_unread_id;
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Determine if the auto remove is available in the current context.
+	 * This feature is available if:
+	 *   - it is activated in the configuration
+	 *   - the "read" state is not enable
+	 *   - the "unread" state is enable
+	 *
+	 * @return boolean
+	 */
+	public static function isAutoRemoveAvailable() {
+		if (!self::$user_conf->auto_remove_article) {
+			return false;
+		}
+		if (self::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+			return false;
+		}
+		if (!self::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ)) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Determine if the "sticky post" option is enabled. It can be enable
+	 * by the user when it is selected in the configuration page or by the
+	 * application when the context allows to auto-remove articles when they
+	 * are read.
+	 *
+	 * @return boolean
+	 */
+	public static function isStickyPostEnabled() {
+		if (self::$user_conf->sticky_post) {
+			return true;
+		}
+		if (self::isAutoRemoveAvailable()) {
+			return true;
+		}
+		return false;
+	}
+}

sources/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;
+	}
+}

sources/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'],
+		);
+	}
+}

sources/app/Models/Entry.php

@@ -1,12 +1,11 @@
 <?php
 
 class FreshRSS_Entry extends Minz_Model {
-	const STATE_ALL = 0;
 	const STATE_READ = 1;
 	const STATE_NOT_READ = 2;
+	const STATE_ALL = 3;
 	const STATE_FAVORITE = 4;
 	const STATE_NOT_FAVORITE = 8;
-	const STATE_STRICT = 16;
 
 	private $id = 0;
 	private $guid;
@@ -20,134 +19,134 @@ class FreshRSS_Entry extends Minz_Model {
 	private $feed;
 	private $tags;
 
-	public function __construct ($feed = '', $guid = '', $title = '', $author = '', $content = '',
+	public function __construct($feed = '', $guid = '', $title = '', $author = '', $content = '',
-	                             $link = '', $pubdate = 0, $is_read = false, $is_favorite = false, $tags = '') {
+	                            $link = '', $pubdate = 0, $is_read = false, $is_favorite = false, $tags = '') {
-		$this->_guid ($guid);
+		$this->_guid($guid);
-		$this->_title ($title);
+		$this->_title($title);
-		$this->_author ($author);
+		$this->_author($author);
-		$this->_content ($content);
+		$this->_content($content);
-		$this->_link ($link);
+		$this->_link($link);
-		$this->_date ($pubdate);
+		$this->_date($pubdate);
-		$this->_isRead ($is_read);
+		$this->_isRead($is_read);
-		$this->_isFavorite ($is_favorite);
+		$this->_isFavorite($is_favorite);
-		$this->_feed ($feed);
+		$this->_feed($feed);
-		$this->_tags (preg_split('/[\s#]/', $tags));
+		$this->_tags(preg_split('/[\s#]/', $tags));
 	}
 
-	public function id () {
+	public function id() {
 		return $this->id;
 	}
-	public function guid () {
+	public function guid() {
 		return $this->guid;
 	}
-	public function title () {
+	public function title() {
 		return $this->title;
 	}
-	public function author () {
+	public function author() {
 		return $this->author === null ? '' : $this->author;
 	}
-	public function content () {
+	public function content() {
 		return $this->content;
 	}
-	public function link () {
+	public function link() {
 		return $this->link;
 	}
-	public function date ($raw = false) {
+	public function date($raw = false) {
 		if ($raw) {
 			return $this->date;
 		} else {
-			return timestamptodate ($this->date);
+			return timestamptodate($this->date);
 		}
 	}
-	public function dateAdded ($raw = false) {
+	public function dateAdded($raw = false) {
 		$date = intval(substr($this->id, 0, -6));
 		if ($raw) {
 			return $date;
 		} else {
-			return timestamptodate ($date);
+			return timestamptodate($date);
 		}
 	}
-	public function isRead () {
+	public function isRead() {
 		return $this->is_read;
 	}
-	public function isFavorite () {
+	public function isFavorite() {
 		return $this->is_favorite;
 	}
-	public function feed ($object = false) {
+	public function feed($object = false) {
 		if ($object) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-			return $feedDAO->searchById ($this->feed);
+			return $feedDAO->searchById($this->feed);
 		} else {
 			return $this->feed;
 		}
 	}
-	public function tags ($inString = false) {
+	public function tags($inString = false) {
 		if ($inString) {
-			return empty ($this->tags) ? '' : '#' . implode(' #', $this->tags);
+			return empty($this->tags) ? '' : '#' . implode(' #', $this->tags);
 		} else {
 			return $this->tags;
 		}
 	}
 
-	public function _id ($value) {
+	public function _id($value) {
 		$this->id = $value;
 	}
-	public function _guid ($value) {
+	public function _guid($value) {
 		$this->guid = $value;
 	}
-	public function _title ($value) {
+	public function _title($value) {
 		$this->title = $value;
 	}
-	public function _author ($value) {
+	public function _author($value) {
 		$this->author = $value;
 	}
-	public function _content ($value) {
+	public function _content($value) {
 		$this->content = $value;
 	}
-	public function _link ($value) {
+	public function _link($value) {
 		$this->link = $value;
 	}
-	public function _date ($value) {
+	public function _date($value) {
 		$value = intval($value);
 		$this->date = $value > 1 ? $value : time();
 	}
-	public function _isRead ($value) {
+	public function _isRead($value) {
 		$this->is_read = $value;
 	}
-	public function _isFavorite ($value) {
+	public function _isFavorite($value) {
 		$this->is_favorite = $value;
 	}
-	public function _feed ($value) {
+	public function _feed($value) {
 		$this->feed = $value;
 	}
-	public function _tags ($value) {
+	public function _tags($value) {
-		if (!is_array ($value)) {
+		if (!is_array($value)) {
-			$value = array ($value);
+			$value = array($value);
 		}
 
 		foreach ($value as $key => $t) {
 			if (!$t) {
-				unset ($value[$key]);
+				unset($value[$key]);
 			}
 		}
 
 		$this->tags = $value;
 	}
 
-	public function isDay ($day, $today) {
+	public function isDay($day, $today) {
 		$date = $this->dateAdded(true);
 		switch ($day) {
-			case FreshRSS_Days::TODAY:
+		case FreshRSS_Days::TODAY:
-				$tomorrow = $today + 86400;
+			$tomorrow = $today + 86400;
-				return $date >= $today && $date < $tomorrow;
+			return $date >= $today && $date < $tomorrow;
-			case FreshRSS_Days::YESTERDAY:
+		case FreshRSS_Days::YESTERDAY:
-				$yesterday = $today - 86400;
+			$yesterday = $today - 86400;
-				return $date >= $yesterday && $date < $today;
+			return $date >= $yesterday && $date < $today;
-			case FreshRSS_Days::BEFORE_YESTERDAY:
+		case FreshRSS_Days::BEFORE_YESTERDAY:
-				$yesterday = $today - 86400;
+			$yesterday = $today - 86400;
-				return $date < $yesterday;
+			return $date < $yesterday;
-			default:
+		default:
-				return false;
+			return false;
 		}
 	}
 
@@ -158,7 +157,7 @@ class FreshRSS_Entry extends Minz_Model {
 			$entryDAO = FreshRSS_Factory::createEntryDao();
 			$entry = $entryDAO->searchByGuid($this->feed, $this->guid);
 
-			if($entry) {
+			if ($entry) {
 				// l'article existe déjà en BDD, en se contente de recharger ce contenu
 				$this->content = $entry->content();
 			} else {
@@ -168,25 +167,25 @@ class FreshRSS_Entry extends Minz_Model {
 						htmlspecialchars_decode($this->link(), ENT_QUOTES), $pathEntries
 					);
 				} catch (Exception $e) {
-					// rien à faire, on garde l'ancien contenu (requête a échoué)
+					// rien à faire, on garde l'ancien contenu(requête a échoué)
 				}
 			}
 		}
 	}
 
-	public function toArray () {
+	public function toArray() {
-		return array (
+		return array(
-			'id' => $this->id (),
+			'id' => $this->id(),
-			'guid' => $this->guid (),
+			'guid' => $this->guid(),
-			'title' => $this->title (),
+			'title' => $this->title(),
-			'author' => $this->author (),
+			'author' => $this->author(),
-			'content' => $this->content (),
+			'content' => $this->content(),
-			'link' => $this->link (),
+			'link' => $this->link(),
-			'date' => $this->date (true),
+			'date' => $this->date(true),
-			'is_read' => $this->isRead (),
+			'is_read' => $this->isRead(),
-			'is_favorite' => $this->isFavorite (),
+			'is_favorite' => $this->isFavorite(),
-			'id_feed' => $this->feed (),
+			'id_feed' => $this->feed(),
-			'tags' => $this->tags (true),
+			'tags' => $this->tags(true),
 		);
 	}
 }

sources/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]
+				Minz_Log::error('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title'], Minz_Log::ERROR);
+				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
 			} /*else {
-				Minz_Log::record ('SQL error ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
+				Minz_Log::debug('SQL error ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title'], Minz_Log::DEBUG);
+				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
 			}*/
 			return false;
 		}
@@ -80,6 +80,16 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return -1;
 	}
 
+	/**
+	 * Toggle favorite marker on one or more article
+	 *
+	 * @todo simplify the query by removing the str_repeat. I am pretty sure
+	 * there is an other way to do that.
+	 *
+	 * @param integer|array $ids
+	 * @param boolean $is_favorite
+	 * @return false|integer
+	 */
 	public function markFavorite($ids, $is_favorite = true) {
 		if (!is_array($ids)) {
 			$ids = array($ids);
@@ -94,11 +104,22 @@ 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;
 		}
 	}
 
+	/**
+	 * Update the unread article cache held on every feed details.
+	 * Depending on the parameters, it updates the cache on one feed, on all
+	 * feeds from one category or on all feeds.
+	 *
+	 * @todo It can use the query builder refactoring to build that query
+	 *
+	 * @param false|integer $catId category ID
+	 * @param false|integer $feedId feed ID
+	 * @return boolean
+	 */
 	protected function updateCacheUnreads($catId = false, $feedId = false) {
 		$sql = 'UPDATE `' . $this->prefix . 'feed` f '
 		 . 'LEFT OUTER JOIN ('
@@ -124,11 +145,24 @@ 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;
 		}
 	}
 
+	/**
+	 * Toggle the read marker on one or more article.
+	 * Then the cache is updated.
+	 *
+	 * @todo change the way the query is build because it seems there is
+	 * unnecessary code in here. For instance, the part with the str_repeat.
+	 * @todo remove code duplication. It seems the code is basically the
+	 * same if it is an array or not.
+	 *
+	 * @param integer|array $ids
+	 * @param boolean $is_read
+	 * @return integer affected rows
+	 */
 	public function markRead($ids, $is_read = true) {
 		if (is_array($ids)) {	//Many IDs at once (used by API)
 			if (count($ids) < 6) {	//Speed heuristics
@@ -147,7 +181,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,16 +200,37 @@ 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;
 			}
 		}
 	}
 
+	/**
+	 * Mark all entries as read depending on parameters.
+	 * If $onlyFavorites is true, it is used when the user mark as read in
+	 * the favorite pseudo-category.
+	 * If $priorityMin is greater than 0, it is used when the user mark as
+	 * read in the main feed pseudo-category.
+	 * Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @todo refactor this method along with markReadCat and markReadFeed
+	 * since they are all doing the same thing. I think we need to build a
+	 * tool to generate the query instead of having queries all over the
+	 * place. It will be reused also for the filtering making every thing
+	 * separated.
+	 *
+	 * @param integer $idMax fail safe article ID
+	 * @param boolean $onlyFavorites
+	 * @param integer $priorityMin
+	 * @return integer affected rows
+	 */
 	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			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 +245,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();
@@ -200,10 +255,21 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return $affected;
 	}
 
+	/**
+	 * Mark all the articles in a category as read.
+	 * There is a fail safe to prevent to mark as read articles that are
+	 * loaded during the mark as read action. Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @param integer $id category ID
+	 * @param integer $idMax fail safe article ID
+	 * @return integer affected rows
+	 */
 	public function markReadCat($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			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 +279,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();
@@ -223,10 +289,21 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return $affected;
 	}
 
+	/**
+	 * Mark all the articles in a feed as read.
+	 * There is a fail safe to prevent to mark as read articles that are
+	 * loaded during the mark as read action. Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @param integer $id feed ID
+	 * @param integer $idMax fail safe article ID
+	 * @return integer affected rows
+	 */
 	public function markReadFeed($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			Minz_Log::record('Calling markReadFeed(0) is deprecated!', Minz_Log::DEBUG);
+			Minz_Log::debug('Calling markReadFeed(0) is deprecated!');
 		}
 		$this->bd->beginTransaction();
 
@@ -237,7 +314,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 +328,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;
 			}
@@ -299,7 +376,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return 'CONCAT(' . $s1 . ',' . $s2 . ')';	//MySQL
 	}
 
-	private function sqlListWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
+	private function sqlListWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {
 		if (!$state) {
 			$state = FreshRSS_Entry::STATE_ALL;
 		}
@@ -307,34 +384,32 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		$joinFeed = false;
 		$values = array();
 		switch ($type) {
-			case 'a':
+		case 'a':
-				$where .= 'f.priority > 0 ';
+			$where .= 'f.priority > 0 ';
-				$joinFeed = true;
+			$joinFeed = true;
-				break;
+			break;
-			case 's':	//Deprecated: use $state instead
+		case 's':	//Deprecated: use $state instead
-				$where .= 'e1.is_favorite=1 ';
+			$where .= 'e1.is_favorite=1 ';
-				break;
+			break;
-			case 'c':
+		case 'c':
-				$where .= 'f.category=? ';
+			$where .= 'f.category=? ';
-				$values[] = intval($id);
+			$values[] = intval($id);
-				$joinFeed = true;
+			$joinFeed = true;
-				break;
+			break;
-			case 'f':
+		case 'f':
-				$where .= 'e1.id_feed=? ';
+			$where .= 'e1.id_feed=? ';
-				$values[] = intval($id);
+			$values[] = intval($id);
-				break;
+			break;
-			case 'A':
+		case 'A':
-				$where .= '1 ';
+			$where .= '1 ';
-				break;
+			break;
-			default:
+		default:
-				throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!');
+			throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!');
 		}
 
 		if ($state & FreshRSS_Entry::STATE_NOT_READ) {
 			if (!($state & FreshRSS_Entry::STATE_READ)) {
 				$where .= 'AND e1.is_read=0 ';
-			} elseif ($state & FreshRSS_Entry::STATE_STRICT) {
-				$where .= 'AND e1.is_read=0 ';
 			}
 		}
 		elseif ($state & FreshRSS_Entry::STATE_READ) {
@@ -356,23 +431,14 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			default:
 				throw new FreshRSS_EntriesGetter_Exception('Bad order in Entry->listByType: [' . $order . ']!');
 		}
-		if ($firstId === '' && parent::$sharedDbType === 'mysql') {
+		/*if ($firstId === '' && parent::$sharedDbType === 'mysql') {
-			$firstId = $order === 'DESC' ? '9000000000'. '000000' : '0';	//MySQL optimization. Tested on MySQL 5.5 with 150k articles
+			$firstId = $order === 'DESC' ? '9000000000'. '000000' : '0';	//MySQL optimization. TODO: check if this is needed again, after the filtering for old articles has been removed in 0.9-dev
-		}
+		}*/
 		if ($firstId !== '') {
 			$where .= 'AND e1.id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' ';
 		}
-		if (($date_min > 0) && ($type !== 's')) {
+		if ($date_min > 0) {
-			$where .= 'AND (e1.id >= ' . $date_min . '000000';
+			$where .= 'AND e1.id >= ' . $date_min . '000000 ';
-			if ($showOlderUnreadsorFavorites) {	//Lax date constraint
-				$where .= ' OR e1.is_read=0 OR e1.is_favorite=1 OR (f.keep_history <> 0';
-				if (intval($keepHistoryDefault) === 0) {
-					$where .= ' AND f.keep_history <> -2';	//default
-				}
-				$where .= ')';
-			}
-			$where .= ') ';
-			$joinFeed = true;
 		}
 		$search = '';
 		if ($filter !== '') {
@@ -434,8 +500,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 			. ($limit > 0 ? ' LIMIT ' . $limit : ''));	//TODO: See http://explainextended.com/2009/10/23/mysql-order-by-limit-performance-late-row-lookups/
 	}
 
-	public function listWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {
+	public function listWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {
-		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min, $showOlderUnreadsorFavorites, $keepHistoryDefault);
+		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min);
 
 		$sql = 'SELECT e.id, e.guid, e.title, e.author, '
 		     . ($this->isCompressed() ? 'UNCOMPRESS(content_bin) AS content' : 'content')
@@ -452,8 +518,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		return self::daoToEntry($stm->fetchAll(PDO::FETCH_ASSOC));
 	}
 
-	public function listIdsWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) {	//For API
+	public function listIdsWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0) {	//For API
-		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min, $showOlderUnreadsorFavorites, $keepHistoryDefault);
+		list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filter, $date_min);
 
 		$stm = $this->bd->prepare($sql);
 		$stm->execute($values);
@@ -520,7 +586,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	}
 
 	public function size($all = false) {
-		$db = Minz_Configuration::dataBase();
+		$db = FreshRSS_Context::$system_conf->db;
 		$sql = 'SELECT SUM(data_length + index_length) FROM information_schema.TABLES WHERE table_schema=?';	//MySQL
 		$values = array($db['base']);
 		if (!$all) {

sources/app/Models/EntryDAOSQLite.php

@@ -26,11 +26,24 @@ 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;
 		}
 	}
 
+	/**
+	 * Toggle the read marker on one or more article.
+	 * Then the cache is updated.
+	 *
+	 * @todo change the way the query is build because it seems there is
+	 * unnecessary code in here. For instance, the part with the str_repeat.
+	 * @todo remove code duplication. It seems the code is basically the
+	 * same if it is an array or not.
+	 *
+	 * @param integer|array $ids
+	 * @param boolean $is_read
+	 * @return integer affected rows
+	 */
 	public function markRead($ids, $is_read = true) {
 		if (is_array($ids)) {	//Many IDs at once (used by API)
 			if (true) {	//Speed heuristics	//TODO: Not implemented yet for SQLite (so always call IDs one by one)
@@ -47,7 +60,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 +72,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;
 				}
@@ -69,10 +82,31 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		}
 	}
 
+	/**
+	 * Mark all entries as read depending on parameters.
+	 * If $onlyFavorites is true, it is used when the user mark as read in
+	 * the favorite pseudo-category.
+	 * If $priorityMin is greater than 0, it is used when the user mark as
+	 * read in the main feed pseudo-category.
+	 * Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @todo refactor this method along with markReadCat and markReadFeed
+	 * since they are all doing the same thing. I think we need to build a
+	 * tool to generate the query instead of having queries all over the
+	 * place. It will be reused also for the filtering making every thing
+	 * separated.
+	 *
+	 * @param integer $idMax fail safe article ID
+	 * @param boolean $onlyFavorites
+	 * @param integer $priorityMin
+	 * @return integer affected rows
+	 */
 	public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			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 +119,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();
@@ -95,10 +129,21 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 		return $affected;
 	}
 
+	/**
+	 * Mark all the articles in a category as read.
+	 * There is a fail safe to prevent to mark as read articles that are
+	 * loaded during the mark as read action. Then the cache is updated.
+	 *
+	 * If $idMax equals 0, a deprecated debug message is logged
+	 *
+	 * @param integer $id category ID
+	 * @param integer $idMax fail safe article ID
+	 * @return integer affected rows
+	 */
 	public function markReadCat($id, $idMax = 0) {
 		if ($idMax == 0) {
 			$idMax = time() . '000000';
-			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 +154,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();
@@ -124,6 +169,6 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	}
 
 	public function size($all = false) {
-		return @filesize(DATA_PATH . '/' . Minz_Session::param('currentUser', '_') . '.sqlite');
+		return @filesize(join_path(DATA_PATH, 'users', $this->current_user, 'db.sqlite'));
 	}
 }

sources/app/Models/Factory.php

@@ -2,30 +2,39 @@
 
 class FreshRSS_Factory {
 
-	public static function createFeedDao() {
+	public static function createFeedDao($username = null) {
-		$db = Minz_Configuration::dataBase();
+		$conf = Minz_Configuration::get('system');
-		if ($db['type'] === 'sqlite') {
+		if ($conf->db['type'] === 'sqlite') {
-			return new FreshRSS_FeedDAOSQLite();
+			return new FreshRSS_FeedDAOSQLite($username);
 		} else {
-			return new FreshRSS_FeedDAO();
+			return new FreshRSS_FeedDAO($username);
 		}
 	}
 
-	public static function createEntryDao() {
+	public static function createEntryDao($username = null) {
-		$db = Minz_Configuration::dataBase();
+		$conf = Minz_Configuration::get('system');
-		if ($db['type'] === 'sqlite') {
+		if ($conf->db['type'] === 'sqlite') {
-			return new FreshRSS_EntryDAOSQLite();
+			return new FreshRSS_EntryDAOSQLite($username);
 		} else {
-			return new FreshRSS_EntryDAO();
+			return new FreshRSS_EntryDAO($username);
 		}
 	}
 
-	public static function createStatsDAO() {
+	public static function createStatsDAO($username = null) {
-		$db = Minz_Configuration::dataBase();
+		$conf = Minz_Configuration::get('system');
-		if ($db['type'] === 'sqlite') {
+		if ($conf->db['type'] === 'sqlite') {
-			return new FreshRSS_StatsDAOSQLite();
+			return new FreshRSS_StatsDAOSQLite($username);
 		} else {
-			return new FreshRSS_StatsDAO();
+			return new FreshRSS_StatsDAO($username);
+		}
+	}
+
+	public static function createDatabaseDAO($username = null) {
+		$conf = Minz_Configuration::get('system');
+		if ($conf->db['type'] === 'sqlite') {
+			return new FreshRSS_DatabaseDAOSQLite($username);
+		} else {
+			return new FreshRSS_DatabaseDAO($username);
 		}
 	}
 

sources/app/Models/Feed.php

@@ -40,7 +40,8 @@ class FreshRSS_Feed extends Minz_Model {
 
 	public function hash() {
 		if ($this->hash === null) {
-			$this->hash = hash('crc32b', Minz_Configuration::salt() . $this->url);
+			$salt = FreshRSS_Context::$system_conf->salt;
+			$this->hash = hash('crc32b', $salt . $this->url);
 		}
 		return $this->hash;
 	}
@@ -210,6 +211,10 @@ class FreshRSS_Feed extends Minz_Model {
 					$url = preg_replace('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url);
 				}
 				$feed = customSimplePie();
+				if (substr($url, -11) === '#force_feed') {
+					$feed->force_feed(true);
+					$url = substr($url, 0, -11);
+				}
 				$feed->set_feed_url($url);
 				if (!$loadDetails) {	//Only activates auto-discovery when adding a new feed
 					$feed->set_autodiscovery_level(SIMPLEPIE_LOCATOR_NONE);
@@ -217,7 +222,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) {
@@ -225,7 +231,7 @@ class FreshRSS_Feed extends Minz_Model {
 					$subscribe_url = $feed->subscribe_url(false);
 
 					$title = strtr(html_only_entity_decode($feed->get_title()), array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));	//HTML to HTML-PRE	//ENT_COMPAT except &
-					$this->_name($title == '' ? $this->url : $title);
+					$this->_name($title == '' ? $url : $title);
 
 					$this->_website(html_only_entity_decode($feed->get_link()));
 					$this->_description(html_only_entity_decode($feed->get_description()));
@@ -234,19 +240,16 @@ class FreshRSS_Feed extends Minz_Model {
 					$subscribe_url = $feed->subscribe_url(true);
 				}
 
-				if ($subscribe_url !== null && $subscribe_url !== $this->url) {
+				$clean_url = url_remove_credentials($subscribe_url);
-					if ($this->httpAuth != '') {
+				if ($subscribe_url !== null && $subscribe_url !== $url) {
-						// on enlève les id si authentification HTTP
+					$this->_url($clean_url);
-						$subscribe_url = preg_replace('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url);
-					}
-					$this->_url($subscribe_url);
 				}
 
 				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 ' . $clean_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 ' . $clean_url);
 					$this->entries = array();
 				}
 

sources/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;
 		}
 	}
@@ -191,7 +191,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
 		$feed = current(self::daoToFeed($res));
 
-		if (isset($feed)) {
+		if (isset($feed) && $feed !== false) {
 			return $feed;
 		} else {
 			return null;
@@ -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;
 		}
 	}

sources/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;
 		}
 	}

sources/app/Models/Log.php

@@ -5,22 +5,22 @@ class FreshRSS_Log extends Minz_Model {
 	private $level;
 	private $information;
 
-	public function date () {
+	public function date() {
 		return $this->date;
 	}
-	public function level () {
+	public function level() {
 		return $this->level;
 	}
-	public function info () {
+	public function info() {
 		return $this->information;
 	}
-	public function _date ($date) {
+	public function _date($date) {
 		$this->date = $date;
 	}
-	public function _level ($level) {
+	public function _level($level) {
 		$this->level = $level;
 	}
-	public function _info ($information) {
+	public function _info($information) {
 		$this->information = $information;
 	}
 }

sources/app/Models/LogDAO.php

@@ -2,15 +2,15 @@
 
 class FreshRSS_LogDAO {
 	public static function lines() {
-		$logs = array ();
+		$logs = array();
-		$handle = @fopen(LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log', 'r');
+		$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)) {
+				if (preg_match('/^\[([^\[]+)\] \[([^\[]+)\] --- (.*)$/', $line, $matches)) {
 					$myLog = new FreshRSS_Log ();
-					$myLog->_date ($matches[1]);
+					$myLog->_date($matches[1]);
-					$myLog->_level ($matches[2]);
+					$myLog->_level($matches[2]);
-					$myLog->_info ($matches[3]);
+					$myLog->_info($matches[3]);
 					$logs[] = $myLog;
 				}
 			}
@@ -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'), '');
 	}
 }

sources/app/Models/Share.php

@@ -1,44 +1,240 @@
 <?php
 
+/**
+ * Manage the sharing options in FreshRSS.
+ */
 class FreshRSS_Share {
+	/**
+	 * The list of available sharing options.
+	 */
+	private static $list_sharing = array();
 
-	static public function generateUrl($options, $selected, $link, $title) {
+	/**
-		$share = $options[$selected['type']];
+	 * Register a new sharing option.
+	 * @param $share_options is an array defining the share option.
+	 */
+	public static function register($share_options) {
+		$type = $share_options['type'];
+
+		if (isset(self::$list_sharing[$type])) {
+			return;
+		}
+
+		$help_url = isset($share_options['help']) ? $share_options['help'] : '';
+		self::$list_sharing[$type] = new FreshRSS_Share(
+			$type, $share_options['url'], $share_options['transform'],
+			$share_options['form'], $help_url
+		);
+	}
+
+	/**
+	 * Register sharing options in a file.
+	 * @param $filename the name of the file to load.
+	 */
+	public static function load($filename) {
+		$shares_from_file = @include($filename);
+		if (!is_array($shares_from_file)) {
+			$shares_from_file = array();
+		}
+
+		foreach ($shares_from_file as $share_type => $share_options) {
+			$share_options['type'] = $share_type;
+			self::register($share_options);
+		}
+	}
+
+	/**
+	 * Return the list of sharing options.
+	 * @return an array of FreshRSS_Share objects.
+	 */
+	public static function enum() {
+		return self::$list_sharing;
+	}
+
+	/**
+	 * Return FreshRSS_Share object related to the given type.
+	 * @param $type the share type, null if $type is not registered.
+	 */
+	public static function get($type) {
+		if (!isset(self::$list_sharing[$type])) {
+			return null;
+		}
+
+		return self::$list_sharing[$type];
+	}
+
+	/**
+	 *
+	 */
+	private $type = '';
+	private $name = '';
+	private $url_transform = '';
+	private $transform = array();
+	private $form_type = 'simple';
+	private $help_url = '';
+	private $custom_name = null;
+	private $base_url = null;
+	private $title = null;
+	private $link = null;
+
+	/**
+	 * Create a FreshRSS_Share object.
+	 * @param $type is a unique string defining the kind of share option.
+	 * @param $url_transform defines the url format to use in order to share.
+	 * @param $transform is an array of transformations to apply on link and title.
+	 * @param $form_type defines which form we have to use to complete. "simple"
+	 *        is typically for a centralized service while "advanced" is for
+	 *        decentralized ones.
+	 * @param $help_url is an optional url to give help on this option.
+	 */
+	private function __construct($type, $url_transform, $transform = array(),
+	                             $form_type, $help_url = '') {
+		$this->type = $type;
+		$this->name = _t('gen.share.' . $type);
+		$this->url_transform = $url_transform;
+		$this->help_url = $help_url;
+
+		if (!is_array($transform)) {
+			$transform = array();
+		}
+		$this->transform = $transform;
+
+		if (!in_array($form_type, array('simple', 'advanced'))) {
+			$form_type = 'simple';
+		}
+		$this->form_type = $form_type;
+	}
+
+	/**
+	 * Update a FreshRSS_Share object with information from an array.
+	 * @param $options is a list of informations to update where keys should be
+	 *        in this list: name, url, title, link.
+	 */
+	public function update($options) {
+		$available_options = array(
+			'name' => 'custom_name',
+			'url' => 'base_url',
+			'title' => 'title',
+			'link' => 'link',
+		);
+
+		foreach ($options as $key => $value) {
+			if (!isset($available_options[$key])) {
+				continue;
+			}
+
+			$this->$available_options[$key] = $value;
+		}
+	}
+
+	/**
+	 * Return the current type of the share option.
+	 */
+	public function type() {
+		return $this->type;
+	}
+
+	/**
+	 * Return the current form type of the share option.
+	 */
+	public function formType() {
+		return $this->form_type;
+	}
+
+	/**
+	 * Return the current help url of the share option.
+	 */
+	public function help() {
+		return $this->help_url;
+	}
+
+	/**
+	 * Return the current name of the share option.
+	 */
+	public function name($real = false) {
+		if ($real || is_null($this->custom_name)) {
+			return $this->name;
+		} else {
+			return $this->custom_name;
+		}
+	}
+
+	/**
+	 * Return the current base url of the share option.
+	 */
+	public function baseUrl() {
+		return $this->base_url;
+	}
+
+	/**
+	 * Return the current url by merging url_transform and base_url.
+	 */
+	public function url() {
 		$matches = array(
 			'~URL~',
 			'~TITLE~',
 			'~LINK~',
 		);
 		$replaces = array(
-			$selected['url'],
+			$this->base_url,
-			self::transformData($title, self::getTransform($share, 'title')),
+			$this->title(),
-			self::transformData($link, self::getTransform($share, 'link')),
+			$this->link(),
 		);
-		$url = str_replace($matches, $replaces, $share['url']);
+		return str_replace($matches, $replaces, $this->url_transform);
-		return $url;
 	}
 
-	static private function transformData($data, $transform) {
+	/**
-		if (!is_array($transform)) {
+	 * Return the title.
-			return $data;
+	 * @param $raw true if we should get the title without transformations.
-		}
+	 */
-		if (count($transform) === 0) {
+	public function title($raw = false) {
+		if ($raw) {
+			return $this->title;
+		}
+
+		return $this->transform($this->title, $this->getTransform('title'));
+	}
+
+	/**
+	 * Return the link.
+	 * @param $raw true if we should get the link without transformations.
+	 */
+	public function link($raw = false) {
+		if ($raw) {
+			return $this->link;
+		}
+
+		return $this->transform($this->link, $this->getTransform('link'));
+	}
+
+	/**
+	 * Transform a data with the given functions.
+	 * @param $data the data to transform.
+	 * @param $tranform an array containing a list of functions to apply.
+	 * @return the transformed data.
+	 */
+	private static function transform($data, $transform) {
+		if (!is_array($transform) || empty($transform)) {
 			return $data;
 		}
+
 		foreach ($transform as $action) {
 			$data = call_user_func($action, $data);
 		}
+
 		return $data;
 	}
 
-	static private function getTransform($options, $type) {
+	/**
-		$transform = $options['transform'];
+	 * Get the list of transformations for the given attribute.
-
+	 * @param $attr the attribute of which we want the transformations.
-		if (array_key_exists($type, $transform)) {
+	 * @return an array containing a list of transformations to apply.
-			return $transform[$type];
+	 */
+	private function getTransform($attr) {
+		if (array_key_exists($attr, $this->transform)) {
+			return $this->transform[$attr];
 		}
 
-		return $transform;
+		return $this->transform;
 	}
-
 }

sources/app/Models/StatsDAO.php

@@ -6,18 +6,36 @@ class FreshRSS_StatsDAO extends Minz_ModelPdo {
 
 	/**
 	 * Calculates entry repartition for all feeds and for main stream.
+	 *
+	 * @return array
+	 */
+	public function calculateEntryRepartition() {
+		return array(
+		    'main_stream' => $this->calculateEntryRepartitionPerFeed(null, true),
+		    'all_feeds' => $this->calculateEntryRepartitionPerFeed(null, false),
+		);
+	}
+
+	/**
+	 * Calculates entry repartition for the selection.
 	 * The repartition includes:
 	 *   - total entries
 	 *   - read entries
 	 *   - unread entries
 	 *   - favorite entries
 	 *
-	 * @return type
+	 * @param null|integer $feed feed id
+	 * @param boolean $only_main
+	 * @return array
 	 */
-	public function calculateEntryRepartition() {
+	public function calculateEntryRepartitionPerFeed($feed = null, $only_main = false) {
-		$repartition = array();
+		$filter = '';
-
+		if ($only_main) {
-		// Generates the repartition for the main stream of entry
+			$filter .= 'AND f.priority = 10';
+		}
+		if (!is_null($feed)) {
+			$filter .= "AND e.id_feed = {$feed}";
+		}
 		$sql = <<<SQL
 SELECT COUNT(1) AS `total`,
 COUNT(1) - SUM(e.is_read) AS `unread`,
@@ -26,27 +44,13 @@ SUM(e.is_favorite) AS `favorite`
 FROM {$this->prefix}entry AS e
 , {$this->prefix}feed AS f
 WHERE e.id_feed = f.id
-AND f.priority = 10
+{$filter}
 SQL;
 		$stm = $this->bd->prepare($sql);
 		$stm->execute();
 		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$repartition['main_stream'] = $res[0];
 
-		// Generates the repartition for all entries
+		return $res[0];
-		$sql = <<<SQL
-SELECT COUNT(1) AS `total`,
-COUNT(1) - SUM(e.is_read) AS `unread`,
-SUM(e.is_read) AS `read`,
-SUM(e.is_favorite) AS `favorite`
-FROM {$this->prefix}entry AS e
-SQL;
-		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		$repartition['all_feeds'] = $res[0];
-
-		return $repartition;
 	}
 
 	/**
@@ -147,10 +151,9 @@ SQL;
 	 * @return string
 	 */
 	protected function calculateEntryRepartitionPerFeedPerPeriod($period, $feed = null) {
+		$restrict = '';
 		if ($feed) {
 			$restrict = "WHERE e.id_feed = {$feed}";
-		} else {
-			$restrict = '';
 		}
 		$sql = <<<SQL
 SELECT DATE_FORMAT(FROM_UNIXTIME(e.date), '{$period}') AS period
@@ -179,7 +182,7 @@ SQL;
 	 * @return integer
 	 */
 	public function calculateEntryAveragePerFeedPerHour($feed = null) {
-		return $this->calculateEntryAveragePerFeedPerPeriod(1/24, $feed);
+		return $this->calculateEntryAveragePerFeedPerPeriod(1 / 24, $feed);
 	}
 
 	/**
@@ -210,10 +213,9 @@ SQL;
 	 * @return integer
 	 */
 	protected function calculateEntryAveragePerFeedPerPeriod($period, $feed = null) {
+		$restrict = '';
 		if ($feed) {
 			$restrict = "WHERE e.id_feed = {$feed}";
-		} else {
-			$restrict = '';
 		}
 		$sql = <<<SQL
 SELECT COUNT(1) AS count
@@ -237,7 +239,7 @@ SQL;
 			$interval_in_days = $period;
 		}
 
-		return round($res['count'] / ($interval_in_days / $period), 2);
+		return $res['count'] / ($interval_in_days / $period);
 	}
 
 	/**
@@ -415,8 +417,8 @@ SQL;
 	 * @return string
 	 */
 	private function convertToTranslatedJson($data = array()) {
-		$translated = array_map(function ($a) {
+		$translated = array_map(function($a) {
-			return Minz_Translate::t($a);
+			return _t('gen.date.' . $a);
 		}, $data);
 
 		return json_encode($translated);

sources/app/Models/Themes.php

@@ -82,6 +82,7 @@ class FreshRSS_Themes extends Minz_Model {
 			'favorite' => '★',
 			'help' => 'ⓘ',
 			'icon' => '⊚',
+			'import' => '⤓',
 			'key' => '⚿',
 			'link' => '↗',
 			'login' => '🔒',

sources/app/Models/UserDAO.php

@@ -2,14 +2,14 @@
 
 class FreshRSS_UserDAO extends Minz_ModelPdo {
 	public function createUser($username) {
-		$db = Minz_Configuration::dataBase();
+		$db = FreshRSS_Context::$system_conf->db;
 		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 		$userPDO = new Minz_ModelPdo($username);
 
 		$ok = false;
 		if (defined('SQL_CREATE_TABLES')) {	//E.g. MySQL
-			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', Minz_Translate::t('default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('gen.short.default_category'));
 			$stm = $userPDO->bd->prepare($sql);
 			$ok = $stm && $stm->execute();
 		} else {	//E.g. SQLite
@@ -17,7 +17,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 			if (is_array($SQL_CREATE_TABLES)) {
 				$ok = true;
 				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, '', Minz_Translate::t('default_category'));
+					$sql = sprintf($instruction, '', _t('gen.short.default_category'));
 					$stm = $userPDO->bd->prepare($sql);
 					$ok &= ($stm && $stm->execute());
 				}
@@ -28,17 +28,17 @@ 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;
 		}
 	}
 
 	public function deleteUser($username) {
-		$db = Minz_Configuration::dataBase();
+		$db = FreshRSS_Context::$system_conf->db;
 		require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
 		if ($db['type'] === 'sqlite') {
-			return unlink(DATA_PATH . '/' . $username . '.sqlite');
+			return unlink(join_path(DATA_PATH, 'users', $username, 'db.sqlite'));
 		} else {
 			$userPDO = new Minz_ModelPdo($username);
 
@@ -48,9 +48,21 @@ 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;
 			}
 		}
 	}
+
+	public static function exist($username) {
+		return is_dir(join_path(DATA_PATH , 'users', $username));
+	}
+
+	public static function touch($username) {
+		return touch(join_path(DATA_PATH , 'users', $username, 'config.php'));
+	}
+
+	public static function mtime($username) {
+		return @filemtime(join_path(DATA_PATH , 'users', $username, 'config.php'));
+	}
 }

sources/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;');

sources/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"');

sources/app/actualize_script.php

@@ -7,48 +7,80 @@ ob_implicit_flush(false);
 ob_start();
 echo 'Results: ', "\n";	//Buffered
 
-Minz_Configuration::init();
+if (defined('STDOUT')) {
+	$begin_date = date_create('now');
+	fwrite(STDOUT, 'Starting feed actualization at ' . $begin_date->format('c') . "\n");	//Unbuffered
+}
 
+
+// Set the header params ($_GET) to call the FRSS application.
+$_GET['c'] = 'feed';
+$_GET['a'] = 'actualize';
+$_GET['ajax'] = 1;
+$_GET['force'] = true;
+$_SERVER['HTTP_HOST'] = '';
+
+
+$log_file = join_path(USERS_PATH, '_', 'log.txt');
+
+
+$app = new FreshRSS();
+
+$system_conf = Minz_Configuration::get('system');
+$system_conf->auth_type = 'none';  // avoid necessity to be logged in (not saved!)
+
+// Create the list of users to actualize.
+// Users are processed in a random order but always start with admin
 $users = listUsers();
-shuffle($users);	//Process users in random order
+shuffle($users);
-array_unshift($users, Minz_Configuration::defaultUser());	//But always start with admin
+if ($system_conf->default_user !== ''){
-$users = array_unique($users);
+	array_unshift($users, $system_conf->default_user);
+	$users = array_unique($users);
+}
 
-foreach ($users as $myUser) {
+
-	syslog(LOG_INFO, 'FreshRSS actualize ' . $myUser);
+$limits = $system_conf->limits;
-	if (defined('STDOUT')) {
+$min_last_activity = time() - $limits['max_inactivity'];
-		fwrite(STDOUT, 'Actualize ' . $myUser . "...\n");	//Unbuffered
+foreach ($users as $user) {
+	if (($user !== $system_conf->default_user) &&
+			(FreshRSS_UserDAO::mtime($user) < $min_last_activity)) {
+		Minz_Log::notice('FreshRSS skip inactive user ' . $user, $log_file);
+		if (defined('STDOUT')) {
+			fwrite(STDOUT, 'FreshRSS skip inactive user ' . $user . "\n");	//Unbuffered
+		}
+		continue;
 	}
-	echo $myUser, ' ';	//Buffered
+	Minz_Log::notice('FreshRSS actualize ' . $user, $log_file);
+	if (defined('STDOUT')) {
+		fwrite(STDOUT, 'Actualize ' . $user . "...\n");	//Unbuffered
+	}
+	echo $user, ' ';	//Buffered
 
-	$_GET['c'] = 'feed';
-	$_GET['a'] = 'actualize';
-	$_GET['ajax'] = 1;
-	$_GET['force'] = true;
-	$_SERVER['HTTP_HOST'] = '';
 
-	$freshRSS = new FreshRSS();
+	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();
 
-	Minz_Configuration::_authType('none');
-
-	Minz_Session::init('FreshRSS');
-	Minz_Session::_param('currentUser', $myUser);
-
-	$freshRSS->init();
-	$freshRSS->run();
 
 	if (!invalidateHttpCache()) {
-		syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . LOG_PATH . '/*.log!');
+		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 ' . LOG_PATH . '/*.log!' . "\n");
+			fwrite(STDERR, 'Write access problem in ' . join_path(USERS_PATH, $user, 'log.txt') . "\n");
 		}
 	}
-	Minz_Session::unset_session(true);
-	Minz_ModelPdo::clean();
 }
-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');
+	$duration = date_diff($end_date, $begin_date);
+	fwrite(STDOUT, 'Ending feed actualization at ' . $end_date->format('c') . "\n");	//Unbuffered
+	fwrite(STDOUT, 'Feed actualizations took ' . $duration->format('%a day(s), %h hour(s),  %i minute(s) and %s seconds') . ' for ' . count($users) . " users\n");	//Unbuffered
 }
 echo 'End.', "\n";
 ob_end_flush();

sources/app/i18n/de/admin.php

@@ -0,0 +1,170 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Anonymes Lesen der Artikel des Standardbenutzers (%s) erlauben',
+		'allow_anonymous_refresh' => 'Anonymes Aktualisieren der Artikel erlauben',
+		'api_enabled' => '<abbr>API</abbr>-Zugriff erlauben <small>(für mobile Anwendungen benötigt)</small>',
+		'form' => 'Webformular (traditionell, benötigt JavaScript)',
+		'http' => 'HTTP (HTTPS für erfahrene Benutzer)',
+		'none' => 'Keine (gefährlich)',
+		'persona' => 'Mozilla Persona (modern, benötigt JavaScript)',
+		'title' => 'Authentifizierung',
+		'title_reset' => 'Zurücksetzen der Authentifizierung',
+		'token' => 'Authentifizierungs-Token',
+		'token_help' => 'Erlaubt den Zugriff auf die RSS-Ausgabe des Standardbenutzers ohne Authentifizierung.',
+		'type' => 'Authentifizierungsmethode',
+		'unsafe_autologin' => 'Erlaube unsicheres automatisches Anmelden mit folgendem Format: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/cache</em> sind in Ordnung.',
+		),
+		'categories' => array(
+			'nok' => 'Die Tabelle <em>category</em> ist schlecht konfiguriert.',
+			'ok' => 'Die Tabelle <em>category</em> ist in Ordnung.',
+		),
+		'connection' => array(
+			'nok' => 'Verbindung zur Datenbank kann nicht aufgebaut werden.',
+			'ok' => 'Verbindung zur Datenbank ist in Ordnung.',
+		),
+		'ctype' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für die Überprüfung von Zeichentypen (php-ctype).',
+			'ok' => 'Sie haben die benötigte Bibliothek für die Überprüfung von Zeichentypen (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Ihnen fehlt cURL (Paket php5-curl).',
+			'ok' => 'Sie haben die cURL-Erweiterung.',
+		),
+		'data' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
+		),
+		'database' => 'Datenbank-Installation',
+		'dom' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern (Paket php-xml).',
+			'ok' => 'Sie haben die benötigte Bibliothek um DOM zu durchstöbern.',
+		),
+		'entries' => array(
+			'nok' => 'Die Tabelle <em>entry</em> ist schlecht konfiguriert.',
+			'ok' => 'Die Tabelle <em>entry</em> ist in Ordnung.',
+		),
+		'favicons' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/favicons</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/favicons</em> sind in Ordnung.',
+		),
+		'feeds' => array(
+			'nok' => 'Die Tabelle <em>feed</em> ist schlecht konfiguriert.',
+			'ok' => 'Die Tabelle <em>feed</em> ist in Ordnung.',
+		),
+		'files' => 'Datei-Installation',
+		'json' => array(
+			'nok' => 'Ihnen fehlt JSON (Paket php5-json).',
+			'ok' => 'Sie haben die JSON-Erweiterung.',
+		),
+		'minz' => array(
+			'nok' => 'Ihnen fehlt das Minz-Framework.',
+			'ok' => 'Sie haben das Minz-Framework.',
+		),
+		'pcre' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für reguläre Ausdrücke (php-pcre).',
+			'ok' => 'Sie haben die benötigte Bibliothek für reguläre Ausdrücke (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Ihnen fehlt PDO oder einer der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Sie haben PDO und mindestens einen der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/persona</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/persona</em> sind in Ordnung.',
+		),
+		'php' => array(
+			'_' => 'PHP-Installation',
+			'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
+			'ok' => 'Ihre PHP-Version ist %s, welche kompatibel mit FreshRSS ist.',
+		),
+		'tables' => array(
+			'nok' => 'Es fehlen eine oder mehrere Tabellen in der Datenbank.',
+			'ok' => 'Tabellen existieren in der Datenbank.',
+		),
+		'title' => 'Installationsüberprüfung',
+		'tokens' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/tokens</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/tokens</em> sind in Ordnung.',
+		),
+		'users' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/users</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
+		),
+		'zip' => array(
+			'nok' => 'Ihnen fehlt die ZIP-Erweiterung (Paket php5-zip).',
+			'ok' => 'Sie haben die ZIP-Erweiterung.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Deaktiviert',
+		'empty_list' => 'Es gibt keine installierte Erweiterung.',
+		'enabled' => 'Aktiviert',
+		'no_configure_view' => 'Diese Erweiterung kann nicht konfiguriert werden.',
+		'system' => array(
+			'_' => 'System-Erweiterungen',
+			'no_rights' => 'System-Erweiterung (Sie haben keine Berechtigung dafür)',
+		),
+		'title' => 'Erweiterungen',
+		'user' => 'Benutzer-Erweiterungen',
+	),
+	'stats' => array(
+		'_' => 'Statistiken',
+		'all_feeds' => 'Alle Feeds',
+		'category' => 'Kategorie',
+		'entry_count' => 'Anzahl der Einträge',
+		'entry_per_category' => 'Einträge pro Kategorie',
+		'entry_per_day' => 'Einträge pro Tag (letzte 30 Tage)',
+		'entry_per_day_of_week' => 'Pro Wochentag (Durchschnitt: %.2f Nachrichten)',
+		'entry_per_hour' => 'Pro Stunde (Durchschnitt: %.2f Nachrichten)',
+		'entry_per_month' => 'Pro Monat (Durchschnitt: %.2f Nachrichten)',
+		'entry_repartition' => 'Einträge-Verteilung',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds pro Kategorie',
+		'idle' => 'Untätige Feeds',
+		'main' => 'Haupt-Statistiken',
+		'main_stream' => 'Haupt-Feeds',
+		'menu' => array(
+			'idle' => 'Untätige Feeds',
+			'main' => 'Haupt-Statistiken',
+			'repartition' => 'Artikel-Verteilung',
+		),
+		'no_idle' => 'Es gibt keinen untätigen Feed!',
+		'number_entries' => '%d Artikel',
+		'percent_of_total' => '%% Gesamt',
+		'repartition' => 'Artikel-Verteilung',
+		'status_favorites' => 'Favoriten',
+		'status_read' => 'Gelesen',
+		'status_total' => 'Gesamt',
+		'status_unread' => 'Ungelesen',
+		'title' => 'Statistiken',
+		'top_feed' => 'Top 10-Feeds',
+	),
+	'update' => array(
+		'_' => 'System aktualisieren',
+		'apply' => 'Anwenden',
+		'check' => 'Auf neue Aktualisierungen prüfen',
+		'current_version' => 'Ihre aktuelle Version von FreshRSS ist %s.',
+		'last' => 'Letzte Überprüfung: %s',
+		'none' => 'Keine Aktualisierung zum Anwenden',
+		'title' => 'System aktualisieren',
+	),
+	'user' => array(
+		'articles_and_size' => '%s Artikel (%s)',
+		'create' => 'Neuen Benutzer erstellen',
+		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Sprache',
+		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
+		'title' => 'Benutzer verwalten',
+		'user_list' => 'Liste der Benutzer',
+		'username' => 'Nutzername',
+		'users' => 'Benutzer',
+	),
+);

sources/app/i18n/de/conf.php

@@ -0,0 +1,169 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archivierung',
+		'advanced' => 'Erweitert',
+		'delete_after' => 'Entferne Artikel nach',
+		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Nachrichten-Feeds vorhanden.',
+		'keep_history_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten wird',
+		'optimize' => 'Datenbank optimieren',
+		'optimize_help' => 'Sollte gelegentlich durchgeführt werden, um die Größe der Datenbank zu reduzieren.',
+		'purge_now' => 'Jetzt bereinigen',
+		'title' => 'Archivierung',
+		'ttl' => 'Aktualisiere automatisch nicht öfter als',
+	),
+	'display' => array(
+		'_' => 'Anzeige',
+		'icon' => array(
+			'bottom_line' => 'Fußzeile',
+			'entry' => 'Artikel-Symbole',
+			'publication_date' => 'Datum der Veröffentlichung',
+			'related_tags' => 'Verwandte Tags',
+			'sharing' => 'Teilen',
+			'top_line' => 'Kopfzeile',
+		),
+		'language' => 'Sprache',
+		'notif_html5' => array(
+			'seconds' => 'Sekunden (0 bedeutet keine Zeitüberschreitung)',
+			'timeout' => 'Zeitüberschreitung für HTML5-Benachrichtigung',
+		),
+		'theme' => 'Erscheinungsbild',
+		'title' => 'Anzeige',
+		'width' => array(
+			'content' => 'Inhaltsbreite',
+			'large' => 'Weit',
+			'medium' => 'Mittel',
+			'no_limit' => 'Keine Begrenzung',
+			'thin' => 'Schmal',
+		),
+	),
+	'query' => array(
+		'_' => 'Benutzerabfragen',
+		'deprecated' => 'Diese Abfrage ist nicht länger gültig. Die referenzierte Kategorie oder der Feed ist gelöscht worden.',
+		'filter' => 'Angewendeter Filter:',
+		'get_all' => 'Alle Artikel anzeigen',
+		'get_category' => 'Kategorie "%s" anzeigen',
+		'get_favorite' => 'Lieblingsartikel anzeigen',
+		'get_feed' => 'Feed "%s" anzeigen',
+		'no_filter' => 'Kein Filter',
+		'none' => 'Sie haben bisher keine Benutzerabfrage erstellt.',
+		'number' => 'Abfrage Nr. %d',
+		'order_asc' => 'Älteste Artikel zuerst anzeigen',
+		'order_desc' => 'Neueste Artikel zuerst anzeigen',
+		'search' => 'Suche nach "%s"',
+		'state_0' => 'Alle Artikel anzeigen',
+		'state_1' => 'Gelesene Artikel anzeigen',
+		'state_2' => 'Ungelesene Artikel anzeigen',
+		'state_3' => 'Alle Artikel anzeigen',
+		'state_4' => 'Lieblingsartikel anzeigen',
+		'state_5' => 'Gelesene Lieblingsartikel anzeigen',
+		'state_6' => 'Ungelesene Lieblingsartikel anzeigen',
+		'state_7' => 'Lieblingsartikel anzeigen',
+		'state_8' => 'Keine Lieblingsartikel anzeigen',
+		'state_9' => 'Gelesene ohne Lieblingsartikel anzeigen',
+		'state_10' => 'Ungelesene ohne Lieblingsartikel anzeigen',
+		'state_11' => 'Keine Lieblingsartikel anzeigen',
+		'state_12' => 'Alle Artikel anzeigen',
+		'state_13' => 'Gelesene Artikel anzeigen',
+		'state_14' => 'Ungelesene Artikel anzeigen',
+		'state_15' => 'Alle Artikel anzeigen',
+		'title' => 'Benutzerabfragen',
+	),
+	'profile' => array(
+		'_' => 'Profil-Verwaltung',
+		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Passwort-API<br /><small>(z. B. für mobile Anwendungen)</small>',
+		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
+		'title' => 'Profil',
+	),
+	'reading' => array(
+		'_' => 'Lesen',
+		'after_onread' => 'Nach „Alle als gelesen markieren“,',
+		'articles_per_page' => 'Anzahl der Artikel pro Seite',
+		'auto_load_more' => 'Die nächsten Artikel am Seitenende laden',
+		'auto_remove_article' => 'Artikel nach dem Lesen verstecken',
+		'confirm_enabled' => 'Bei der Aktion „Alle als gelesen markieren“ einen Bestätigungsdialog anzeigen',
+		'display_articles_unfolded' => 'Artikel standardmäßig ausgeklappt zeigen',
+		'display_categories_unfolded' => 'Kategorien standardmäßig eingeklappt zeigen',
+		'hide_read_feeds' => 'Kategorien & Feeds ohne ungelesene Artikel verstecken (funktioniert nicht mit der Einstellung „Alle Artikel zeigen“)',
+		'img_with_lazyload' => 'Verwende die "träges Laden"-Methode zum Laden von Bildern',
+		'jump_next' => 'springe zum nächsten ungelesenen Geschwisterelement (Feed oder Kategorie)',
+		'number_divided_when_reader' => 'Geteilt durch 2 in der Lese-Ansicht.',
+		'read' => array(
+			'article_open_on_website' => 'wenn der Artikel auf der Original-Webseite geöffnet wird',
+			'article_viewed' => 'wenn der Artikel angesehen wird',
+			'scroll' => 'beim Blättern',
+			'upon_reception' => 'beim Empfang des Artikels',
+			'when' => 'Artikel als gelesen markieren…',
+		),
+		'show' => array(
+			'_' => 	'Artikel zum Anzeigen',
+			'adaptive' => 'Anzeige anpassen',
+			'all_articles' => 'Alle Artikel zeigen',
+			'unread' => 'Nur ungelesene zeigen',
+		),
+		'sort' => array(
+			'_' => 'Sortierreihenfolge',
+			'newer_first' => 'Neuere zuerst',
+			'older_first' => 'Ältere zuerst',
+		),
+		'sticky_post' => 'Wenn geöffnet, den Artikel ganz oben anheften',
+		'title' => 'Lesen',
+		'view' => array(
+			'default' => 'Standard-Ansicht',
+			'global' => 'Globale Ansicht',
+			'normal' => 'Normale Ansicht',
+			'reader' => 'Lese-Ansicht',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Teilen',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'E-Mail',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Weitere Informationen',
+		'print' => 'Drucken',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Anzuzeigender Teilen-Name',
+		'share_url' => 'Zu verwendende Teilen-URL',
+		'title' => 'Teilen',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Tastaturkürzel',
+		'article_action' => 'Artikelaktionen',
+		'auto_share' => 'Teilen',
+		'auto_share_help' => 'Wenn es nur eine Option zum Teilen gibt, wird diese verwendet. Ansonsten sind die Optionen über ihre Nummer erreichbar.',
+		'close_dropdown' => 'Menüs schließen',
+		'collapse_article' => 'Zusammenfalten',
+		'first_article' => 'Zum ersten Artikel springen',
+		'focus_search' => 'Auf Suchfeld zugreifen',
+		'help' => 'Dokumentation anzeigen',
+		'javascript' => 'JavaScript muss aktiviert sein, um Tastaturkürzel benutzen zu können',
+		'last_article' => 'Zum letzten Artikel springen',
+		'load_more' => 'Weitere Artikel laden',
+		'mark_read' => 'Als gelesen markieren',
+		'mark_favorite' => 'Als Favorit markieren',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'Mit der "Umschalttaste" finden die Tastaturkürzel auf Feeds Anwendung.<br/>Mit der "Alt-Taste" finden die Tastaturkürzel auf Kategorien Anwendung.',
+		'next_article' => 'Zum nächsten Artikel springen',
+		'other_action' => 'Andere Aktionen',
+		'previous_article' => 'Zum vorherigen Artikel springen',
+		'see_on_website' => 'Auf der Original-Webseite ansehen',
+		'shift_for_all_read' => '+ <code>Umschalttaste</code>, um alle Artikel als gelesen zu markieren.',
+		'title' => 'Tastaturkürzel',
+		'user_filter' => 'Auf Benutzerfilter zugreifen',
+		'user_filter_help' => 'Wenn es nur einen Benutzerfilter gibt, wird dieser verwendet. Ansonsten sind die Filter über ihre Nummer erreichbar.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s Artikel (%s)',
+		'current' => 'Aktueller Benutzer',
+		'is_admin' => 'ist Administrator',
+		'users' => 'Benutzer',
+	),
+);

sources/app/i18n/de/feedback.php

@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimierung abgeschlossen',
+	),
+	'access' => array(
+		'denied' => 'Sie haben nicht die Berechtigung, diese Seite aufzurufen',
+		'not_found' => 'Sie suchen nach einer Seite, die nicht existiert',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Während der Konfiguration des Authentifikationssystems trat ein Fehler auf. Bitte versuchen Sie es später erneut.',
+			'set' => 'Formular ist ab sofort ihr Standard-Authentifikationssystem.',
+		),
+		'login' => array(
+			'invalid' => 'Anmeldung ist ungültig',
+			'success' => 'Sie sind verbunden',
+		),
+		'logout' => array(
+			'success' => 'Sie sind getrennt',
+		),
+		'no_password_set' => 'Administrator-Passwort ist nicht gesetzt worden. Dieses Feature ist nicht verfügbar.',
+		'not_persona' => 'Nur das Persona-System kann zurückgesetzt werden.',
+	),
+	'conf' => array(
+		'error' => 'Während des Speicherung der Konfiguration trat ein Fehler auf',
+		'query_created' => 'Abfrage "%s" ist erstellt worden.',
+		'shortcuts_updated' => 'Tastaturkürzel sind aktualisiert worden',
+		'updated' => 'Konfiguration ist aktualisiert worden',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s ist bereits aktiviert',
+		'disable' => array(
+			'ko' => '%s kann nicht deaktiviert werden. Für Details <a href="%s">prüfen Sie die FressRSS-Protokolle</a>.',
+			'ok' => '%s ist jetzt deaktiviert',
+		),
+		'enable' => array(
+			'ko' => '%s kann nicht aktiviert werden. Für Details <a href="%s">prüfen Sie die FressRSS-Protokolle</a>.',
+			'ok' => '%s ist jetzt aktiviert',
+		),
+		'no_access' => 'Sie haben keinen Zugang zu %s',
+		'not_enabled' => '%s ist noch nicht aktiviert',
+		'not_found' => '%s existiert nicht',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Die Zip-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie, Dateien eine nach der anderen zu exportieren.',
+		'feeds_imported' => 'Ihre Feeds sind importiert worden und werden jetzt aktualisiert',
+		'feeds_imported_with_errors' => 'Ihre Feeds sind importiert worden, aber es traten einige Fehler auf',
+		'file_cannot_be_uploaded' => 'Datei kann nicht hochgeladen werden!',
+		'no_zip_extension' => 'Die Zip-Erweiterung ist auf Ihrem Server nicht vorhanden.',
+		'zip_error' => 'Ein Fehler trat während des Zip-Imports auf.',
+	),
+	'sub' => array(
+		'actualize' => 'Aktualisieren',
+		'category' => array(
+			'created' => 'Kategorie %s ist erstellt worden.',
+			'deleted' => 'Kategorie ist gelöscht worden.',
+			'emptied' => 'Kategorie ist geleert worden.',
+			'error' => 'Kategorie kann nicht aktualisiert werden',
+			'name_exists' => 'Kategorie-Name existiert bereits.',
+			'no_id' => 'Sie müssen die ID der Kategorie präzisieren.',
+			'no_name' => 'Kategorie-Name kann nicht leer sein.',
+			'not_delete_default' => 'Sie können die Vorgabe-Kategorie nicht löschen!',
+			'not_exist' => 'Die Kategorie existiert nicht!',
+			'over_max' => 'Sie haben Ihr Kategorien-Limit erreicht (%d)',
+			'updated' => 'Kategorie ist aktualisiert worden.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> ist aktualisiert worden',
+			'actualizeds' => 'RSS-Feeds sind aktualisiert worden',
+			'added' => 'RSS-Feed <em>%s</em> ist hinzugefügt worden',
+			'already_subscribed' => 'Sie haben <em>%s</em> bereits abonniert',
+			'deleted' => 'Feed ist gelöscht worden',
+			'error' => 'Feed kann nicht aktualisiert werden',
+			'internal_problem' => 'Der RSS-Feed konnte nicht hinzugefügt werden. Für Details <a href="%s">prüfen Sie die FressRSS-Protokolle</a>.',
+			'invalid_url' => 'URL <em>%s</em> ist ungültig',
+			'marked_read' => 'Feeds sind als gelesen markiert worden',
+			'n_actualized' => '%d Feeds sind aktualisiert worden',
+			'n_entries_deleted' => '%d Artikel sind gelöscht worden',
+			'no_refresh' => 'Es gibt keinen Feed zum Aktualisieren…',
+			'not_added' => '<em>%s</em> konnte nicht hinzugefügt werden',
+			'over_max' => 'Sie haben Ihr Feeds-Limit erreicht (%d)',
+			'updated' => 'Feed ist aktualisiert worden',
+		),
+		'purge_completed' => 'Bereinigung abgeschlossen (%d Artikel gelöscht)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS wird nun auf die <strong>Version %s</strong> aktualisiert.',
+		'error' => 'Der Aktualisierungsvorgang stieß auf einen Fehler: %s',
+		'file_is_nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen',
+		'finished' => 'Aktualisierung abgeschlossen!',
+		'none' => 'Keine Aktualisierung zum Anwenden',
+		'server_not_found' => 'Aktualisierungs-Server kann nicht gefunden werden. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'Benutzer %s ist erstellt worden',
+			'error' => 'Benutzer %s kann nicht erstellt werden',
+		),
+		'deleted' => array(
+			'_' => 'Benutzer %s ist gelöscht worden',
+			'error' => 'Benutzer %s kann nicht gelöscht werden',
+		),
+	),
+	'profile' => array(
+		'error' => 'Ihr Profil kann nicht geändert werden',
+		'updated' => 'Ihr Profil ist geändert worden',
+	),
+);

sources/app/i18n/de/gen.php

@@ -0,0 +1,163 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Aktualisieren',
+		'back_to_rss_feeds' => '← Zurück zu Ihren RSS-Feeds gehen',
+		'cancel' => 'Abbrechen',
+		'create' => 'Erstellen',
+		'disable' => 'Deaktivieren',
+		'empty' => 'Leeren',
+		'enable' => 'Aktivieren',
+		'export' => 'Exportieren',
+		'filter' => 'Filtern',
+		'import' => 'Importieren',
+		'manage' => 'Verwalten',
+		'mark_read' => 'Als gelesen markieren',
+		'mark_favorite' => 'Als Favorit markieren',
+		'remove' => 'Entfernen',
+		'see_website' => 'Webseite ansehen',
+		'submit' => 'Abschicken',
+		'truncate' => 'Alle Artikel löschen',
+	),
+	'auth' => array(
+		'keep_logged_in' => 'Eingeloggt bleiben <small>(1 Monat)</small>',
+		'login' => 'Anmelden',
+		'login_persona' => 'Anmelden mit Persona',
+		'login_persona_problem' => 'Verbindungsproblem mit Persona?',
+		'logout' => 'Abmelden',
+		'password' => 'Passwort',
+		'reset' => 'Zurücksetzen der Authentifizierung',
+		'username' => 'Nutzername',
+		'username_admin' => 'Administrator-Nutzername',
+		'will_reset' => 'Authentifikationssystem wird zurückgesetzt: ein Formular wird anstelle von Persona benutzt.',
+	),
+	'date' => array(
+		'Apr' => '\\A\\p\\r\\i\\l',
+		'Aug' => '\\A\\u\\g\\u\\s\\t',
+		'Dec' => '\\D\\e\\z\\e\\m\\b\\e\\r',
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r',
+		'Jan' => '\\J\\a\\n\\u\\a\\r',
+		'Jul' => '\\J\\u\\l\\i',
+		'Jun' => '\\J\\u\\n\\i',
+		'Mar' => '\\M\\ä\\r\\z',
+		'May' => '\\M\\a\\i',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+		'Oct' => '\\O\\k\\t\\o\\b\\e\\r',
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'apr' => 'Apr',
+		'april' => 'April',
+		'aug' => 'Aug',
+		'august' => 'August',
+		'before_yesterday' => 'Vor gestern',
+		'dec' => 'Dez',
+		'december' => 'Dezember',
+		'feb' => 'Feb',
+		'february' => 'Februar',
+		'format_date' => 'd\\. %s Y',
+		'format_date_hour' => 'd\\. %s Y \\u\\m H\\:i',
+		'fri' => 'Fr',
+		'jan' => 'Jan',
+		'january' => 'Januar',
+		'jul' => 'Jul',
+		'july' => 'Juli',
+		'jun' => 'Jun',
+		'june' => 'Juni',
+		'last_3_month' => 'Letzte drei Monate',
+		'last_6_month' => 'Letzte sechs Monate',
+		'last_month' => 'Letzter Monat',
+		'last_week' => 'Letzte Woche',
+		'last_year' => 'Letztes Jahr',
+		'mar' => 'Mär',
+		'march' => 'März',
+		'may' => 'Mai',
+		'mon' => 'Mo',
+		'month' => 'Monat(en)',
+		'nov' => 'Nov',
+		'november' => 'November',
+		'oct' => 'Okt',
+		'october' => 'Oktober',
+		'sat' => 'Sa',
+		'sep' => 'Sep',
+		'september' => 'September',
+		'sun' => 'So',
+		'thu' => 'Do',
+		'today' => 'Heute',
+		'tue' => 'Di',
+		'wed' => 'Mi',
+		'yesterday' => 'Gestern',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'Über FreshRSS',
+	),
+	'js' => array(
+		'category_empty' => 'Kategorie leeren',
+		'confirm_action' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Dies kann nicht abgebrochen werden!',
+		'confirm_action_feed_cat' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Sie werden zugehörige Favoriten und Benutzerabfragen verlieren. Dies kann nicht abgebrochen werden!',
+		'feedback' => array(
+			'body_new_articles' => 'Es gibt \\d neue Artikel zum Lesen auf FreshRSS.',
+			'request_failed' => 'Eine Anfrage ist fehlgeschlagen, dies könnte durch Probleme mit der Internetverbindung verursacht worden sein.',
+			'title_new_articles' => 'FreshRSS: neue Artikel!',
+		),
+		'new_article' => 'Es gibt neue verfügbare Artikel. Klicken Sie, um die Seite zu aktualisieren.',
+		'should_be_activated' => 'JavaScript muss aktiviert sein',
+	),
+	'lang' => array(
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+	),
+	'menu' => array(
+		'about' => 'Über',
+		'admin' => 'Administration',
+		'archiving' => 'Archivierung',
+		'authentication' => 'Authentifizierung',
+		'check_install' => 'Installationsüberprüfung',
+		'configuration' => 'Konfiguration',
+		'display' => 'Anzeige',
+		'extensions' => 'Erweiterungen',
+		'logs' => 'Protokolle',
+		'queries' => 'Benutzerabfragen',
+		'reading' => 'Lesen',
+		'search' => 'Suche Worte oder #Tags',
+		'sharing' => 'Teilen',
+		'shortcuts' => 'Tastaturkürzel',
+		'stats' => 'Statistiken',
+		'update' => 'Aktualisieren',
+		'user_management' => 'Benutzer verwalten',
+		'user_profile' => 'Profil',
+	),
+	'pagination' => array(
+		'first' => 'Erste',
+		'last' => 'Letzte',
+		'load_more' => 'Weitere Artikel laden',
+		'mark_all_read' => 'Alle als gelesen markieren',
+		'next' => 'Nächste',
+		'nothing_to_load' => 'Es gibt keine weiteren Artikel',
+		'previous' => 'Vorherige',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'E-Mail',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Drucken',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Achtung!',
+		'blank_to_disable' => 'Zum Deaktivieren frei lassen',
+		'by_author' => 'Von <em>%s</em>',
+		'by_default' => 'standardmäßig',
+		'damn' => 'Verdammt!',
+		'default_category' => 'Unkategorisiert',
+		'no' => 'Nein',
+		'ok' => 'OK!',
+		'or' => 'oder',
+		'yes' => 'Ja',
+	),
+);

sources/app/i18n/de/index.php

@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'Über',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Fehlerberichte',
+		'credits' => 'Credits',
+		'credits_content' => 'Einige Designelemente stammen von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> stammen vom <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> Font wurde von <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a> erstellt. Favicons werden mit <a href="https://getfavicon.appspot.com/">getFavicon API</a> gesammelt. FreshRSS basiert auf <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, einem PHP-Framework.',
+		'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="http://projet.idleman.fr/leed/">Leed</a>. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'license' => 'Lizenz',
+		'project_website' => 'Projekt-Webseite',
+		'title' => 'Über',
+		'version' => 'Version',
+		'website' => 'Webseite',
+	),
+	'feed' => array(
+		'add' => 'Sie können Feeds hinzufügen.',
+		'empty' => 'Es gibt keinen Artikel zum Zeigen.',
+		'rss_of' => 'RSS-Feed von %s',
+		'title' => 'Ihre RSS-Feeds',
+		'title_global' => 'Globale Ansicht',
+		'title_fav' => 'Ihre Favoriten',
+	),
+	'log' => array(
+		'_' => 'Protokolle',
+		'clear' => 'Protokolle leeren',
+		'empty' => 'Protokolldatei ist leer.',
+		'title' => 'Protokolle',
+	),
+	'menu' => array(
+		'about' => 'Über FreshRSS',
+		'add_query' => 'Eine Abfrage hinzufügen',
+		'before_one_day' => 'Vor einem Tag',
+		'before_one_week' => 'Vor einer Woche',
+		'favorites' => 'Favoriten (%s)',
+		'global_view' => 'Globale Ansicht',
+		'main_stream' => 'Haupt-Feeds',
+		'mark_all_read' => 'Alle als gelesen markieren',
+		'mark_cat_read' => 'Kategorie als gelesen markieren',
+		'mark_feed_read' => 'Feed als gelesen markieren',
+		'newer_first' => 'Neuere zuerst',
+		'non-starred' => 'Alle außer Favoriten zeigen',
+		'normal_view' => 'Normale Ansicht',
+		'older_first' => 'Ältere zuerst',
+		'queries' => 'Benutzerabfragen',
+		'read' => 'Nur gelesene zeigen',
+		'reader_view' => 'Lese-Ansicht',
+		'rss_view' => 'RSS-Feed',
+		'search_short' => 'Suchen',
+		'starred' => 'Nur Favoriten zeigen',
+		'stats' => 'Statistiken',
+		'subscription' => 'Abonnementverwaltung',
+		'unread' => 'Nur ungelesene zeigen',
+	),
+	'share' => 'Teilen',
+	'tag' => array(
+		'related' => 'Verwandte Tags',
+	),
+);

sources/app/i18n/de/install.php

@@ -0,0 +1,107 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Installation fertigstellen',
+		'fix_errors_before' => 'Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
+		'next_step' => 'Zum nächsten Schritt gehen',
+	),
+	'auth' => array(
+		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Webformular (traditionell, benötigt JavaScript)',
+		'http' => 'HTTP (HTTPS für erfahrene Benutzer)',
+		'none' => 'Keine (gefährlich)',
+		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
+		'persona' => 'Mozilla Persona (modern, benötigt JavaScript)',
+		'type' => 'Authentifizierungsmethode',
+	),
+	'bdd' => array(
+		'_' => 'Datenbank',
+		'conf' => array(
+			'_' => 'Datenbank-Konfiguration',
+			'ko' => 'Überprüfen Sie Ihre Datenbank-Information.',
+			'ok' => 'Datenbank-Konfiguration ist gespeichert worden.',
+		),
+		'host' => 'Host',
+		'prefix' => 'Tabellen-Präfix',
+		'password' => 'HTTP-Password',
+		'type' => 'Datenbank-Typ',
+		'username' => 'HTTP-Nutzername',
+	),
+	'check' => array(
+		'_' => 'Überprüfungen',
+		'cache' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/cache</em> sind in Ordnung.',
+		),
+		'ctype' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für die Überprüfung von Zeichentypen (php-ctype).',
+			'ok' => 'Sie haben die benötigte Bibliothek für die Überprüfung von Zeichentypen (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Ihnen fehlt cURL (Paket php5-curl).',
+			'ok' => 'Sie haben die cURL-Erweiterung.',
+		),
+		'data' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
+		),
+		'dom' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern (Paket php-xml).',
+			'ok' => 'Sie haben die benötigte Bibliothek um DOM zu durchstöbern.',
+		),
+		'favicons' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/favicons</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/favicons</em> sind in Ordnung.',
+		),
+		'http_referer' => array(
+			'nok' => 'Bitte stellen Sie sicher, dass Sie Ihren HTTP REFERER nicht abändern.',
+			'ok' => 'Ihr HTTP REFERER ist bekannt und entspricht Ihrem Server.',
+		),
+		'minz' => array(
+			'nok' => 'Ihnen fehlt das Minz-Framework.',
+			'ok' => 'Sie haben das Minz-Framework.',
+		),
+		'pcre' => array(
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek für reguläre Ausdrücke (php-pcre).',
+			'ok' => 'Sie haben die benötigte Bibliothek für reguläre Ausdrücke (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Ihnen fehlt PDO oder einer der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Sie haben PDO und mindestens einen der unterstützten Treiber (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/persona</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/persona</em> sind in Ordnung.',
+		),
+		'php' => array(
+			'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
+			'ok' => 'Ihre PHP-Version ist %s, welche kompatibel mit FreshRSS ist.',
+		),
+		'users' => array(
+			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/users</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+			'ok' => 'Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Allgemeine Konfiguration',
+		'ok' => 'Allgemeine Konfiguration ist gespeichert worden.',
+	),
+	'congratulations' => 'Glückwunsch!',
+	'default_user' => 'Nutzername des Standardbenutzers <small>(maximal 16 alphanumerische Zeichen)</small>',
+	'delete_articles_after' => 'Entferne Artikel nach',
+	'fix_errors_before' => 'Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
+	'javascript_is_better' => 'FreshRSS ist ansprechender mit aktiviertem JavaScript',
+	'language' => array(
+		'_' => 'Sprache',
+		'choose' => 'Wählen Sie eine Sprache für FreshRSS',
+		'defined' => 'Sprache ist festgelegt worden.',
+	),
+	'not_deleted' => 'Etwas ist schiefgelaufen; Sie müssen die Datei <em>%s</em> manuell löschen.',
+	'ok' => 'Der Installationsvorgang war erfolgreich.',
+	'step' => 'Schritt %d',
+	'steps' => 'Schritte',
+	'title' => 'Installation · FreshRSS',
+	'this_is_the_end' => 'Das ist das Ende',
+);

sources/app/i18n/de/sub.php

@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Kategorie',
+		'add' => 'Eine Kategorie hinzufügen',
+		'empty' => 'Leere Kategorie',
+		'new' => 'Neue Kategorie',
+	),
+	'feed' => array(
+		'add' => 'Einen RSS-Feed hinzufügen',
+		'advanced' => 'Erweitert',
+		'archiving' => 'Archivierung',
+		'auth' => array(
+			'configuration' => 'Anmelden',
+			'help' => 'Die Verbindung erlaubt Zugriff auf HTTP-geschützte RSS-Feeds',
+			'http' => 'HTTP-Authentifizierung',
+			'password' => 'HTTP-Passwort',
+			'username' => 'HTTP-Nutzername',
+		),
+		'css_help' => 'Ruft gekürzte RSS-Feeds ab (Achtung, benötigt mehr Zeit!)',
+		'css_path' => 'Pfad zur CSS-Datei des Artikels auf der Original-Webseite',
+		'description' => 'Beschreibung',
+		'empty' => 'Dieser Feed ist leer. Bitte stellen Sie sicher, dass er noch gepflegt wird.',
+		'error' => 'Dieser Feed ist auf ein Problem gestoßen. Bitte stellen Sie sicher, dass er immer lesbar ist und aktualisieren Sie ihn dann.',
+		'in_main_stream' => 'In Haupt-Feeds zeigen',
+		'informations' => 'Information',
+		'keep_history' => 'Minimale Anzahl an Artikeln, die behalten wird',
+		'moved_category_deleted' => 'Wenn Sie eine Kategorie entfernen, werden deren Feeds automatisch in die Kategorie <em>%s</em> eingefügt.',
+		'no_selected' => 'Kein Feed ausgewählt.',
+		'number_entries' => '%d Artikel',
+		'stats' => 'Statistiken',
+		'think_to_add' => 'Sie können Feeds hinzufügen.',
+		'title' => 'Titel',
+		'title_add' => 'Einen RSS-Feed hinzufügen',
+		'ttl' => 'Aktualisiere automatisch nicht öfter als',
+		'url' => 'Feed-URL',
+		'validator' => 'Überprüfen Sie die Gültigkeit des Feeds',
+		'website' => 'Webseiten-URL',
+	),
+	'import_export' => array(
+		'export' => 'Exportieren',
+		'export_opml' => 'Liste der Feeds exportieren (OPML)',
+		'export_starred' => 'Ihre Favoriten exportieren',
+		'feed_list' => 'Liste von %s Artikeln',
+		'file_to_import' => 'Zu importierende Datei<br />(OPML, JSON oder Zip)',
+		'file_to_import_no_zip' => 'Zu importierende Datei<br />(OPML oder JSON)',
+		'import' => 'Importieren',
+		'starred_list' => 'Liste der Lieblingsartikel',
+		'title' => 'Importieren / Exportieren',
+	),
+	'menu' => array(
+		'bookmark' => 'Abonnieren (FreshRSS-Lesezeichen)',
+		'import_export' => 'Importieren / Exportieren',
+		'subscription_management' => 'Abonnementverwaltung',
+	),
+	'title' => array(
+		'_' => 'Abonnementverwaltung',
+		'feed_management' => 'Verwaltung der RSS-Feeds',
+	),
+);

sources/app/i18n/en.php

@@ -1,455 +0,0 @@
-<?php
-
-return array (
-	// LAYOUT
-	'login'				=> 'Login',
-	'keep_logged_in'		=> 'Keep me logged in <small>(1 month)</small>',
-	'login_with_persona'		=> 'Login with Persona',
-	'login_persona_problem'		=> 'Connection problem with Persona?',
-	'logout'			=> 'Logout',
-	'search'			=> 'Search words or #tags',
-	'search_short'			=> 'Search',
-
-	'configuration'			=> 'Configuration',
-	'users'				=> 'Users',
-	'categories'			=> 'Categories',
-	'category'			=> 'Category',
-	'feed'				=> 'Feed',
-	'feeds'				=> 'Feeds',
-	'shortcuts'			=> 'Shortcuts',
-	'queries'			=> 'User queries',
-	'query_search'			=> 'Search for "%s"',
-	'query_order_asc'		=> 'Display oldest articles first',
-	'query_order_desc'		=> 'Display newest articles first',
-	'query_get_category'		=> 'Display "%s" category',
-	'query_get_feed'		=> 'Display "%s" feed',
-	'query_get_all'			=> 'Display all articles',
-	'query_get_favorite'		=> 'Display favorite articles',
-	'query_state_0'			=> 'Display all articles',
-	'query_state_1'			=> 'Display read articles',
-	'query_state_2'			=> 'Display unread articles',
-	'query_state_3'			=> 'Display all articles',
-	'query_state_4'			=> 'Display favorite articles',
-	'query_state_5'			=> 'Display read favorite articles',
-	'query_state_6'			=> 'Display unread favorite articles',
-	'query_state_7'			=> 'Display favorite articles',
-	'query_state_8'			=> 'Display not favorite articles',
-	'query_state_9'			=> 'Display read not favorite articles',
-	'query_state_10'		=> 'Display unread not favorite articles',
-	'query_state_11'		=> 'Display not favorite articles',
-	'query_state_12'		=> 'Display all articles',
-	'query_state_13'		=> 'Display read articles',
-	'query_state_14'		=> 'Display unread articles',
-	'query_state_15'		=> 'Display all articles',
-	'query_number'			=> 'Query n°%d',
-	'add_query'			=> 'Add a query',
-	'query_created'			=> 'Query "%s" has been created.',
-	'no_query'			=> 'You haven’t created any user query yet.',
-	'query_filter'			=> 'Filter applied:',
-	'no_query_filter'		=> 'No filter',
-	'query_deprecated'		=> 'This query is no longer valid. The referenced category or feed has been deleted.',
-	'about'				=> 'About',
-	'stats'				=> 'Statistics',
-	'stats_idle'			=> 'Idle feeds',
-	'stats_main'			=> 'Main statistics',
-	'stats_repartition'		=> 'Articles repartition',
-	'stats_entry_per_hour'		=> 'Per hour',
-	'stats_entry_per_day_of_week'	=> 'Per day of week',
-	'stats_entry_per_month'		=> 'Per month',
-	'stats_percent_of_total'	=> '%% of total',
-    
-	'last_week'			=> 'Last week',
-	'last_month'			=> 'Last month',
-	'last_3_month'			=> 'Last three months',
-	'last_6_month'			=> 'Last six months',
-	'last_year'			=> 'Last year',
-
-	'your_rss_feeds'		=> 'Your RSS feeds',
-	'add_rss_feed'			=> 'Add a RSS feed',
-	'no_rss_feed'			=> 'No RSS feed',
-	'import_export'			=> 'Import / export',
-	'bookmark'			=> 'Subscribe (FreshRSS bookmark)',
-
-	'subscription_management'	=> 'Subscriptions management',
-	'main_stream'			=> 'Main stream',
-	'all_feeds'			=> 'All feeds',
-	'favorite_feeds'		=> 'Favourites (%s)',
-	'not_read'			=> '%d unread',
-	'not_reads'			=> '%d unread',
-
-	'filter'			=> 'Filter',
-	'see_website'			=> 'See website',
-	'administration'		=> 'Manage',
-	'actualize'			=> 'Actualize',
-
-	'mark_read'			=> 'Mark as read',
-	'mark_favorite'			=> 'Mark as favourite',
-	'mark_all_read'			=> 'Mark all as read',
-	'mark_feed_read'		=> 'Mark feed as read',
-	'mark_cat_read'			=> 'Mark category as read',
-	'before_one_day'		=> 'Before one day',
-	'before_one_week'		=> 'Before one week',
-	'display'			=> 'Display',
-	'normal_view'			=> 'Normal view',
-	'reader_view'			=> 'Reading view',
-	'global_view'			=> 'Global view',
-	'rss_view'			=> 'RSS feed',
-	'show_all_articles'		=> 'Show all articles',
-	'show_not_reads'		=> 'Show only unread',
-	'show_adaptive'			=> 'Adjust showing',
-	'show_read'			=> 'Show only read',
-	'show_favorite'			=> 'Show only favorites',
-	'show_not_favorite'		=> 'Show all but favorites',
-	'older_first'			=> 'Oldest first',
-	'newer_first'			=> 'Newer first',
-
-	// Pagination
-	'first'				=> 'First',
-	'previous'			=> 'Previous',
-	'next'				=> 'Next',
-	'last'				=> 'Last',
-
-	// CONTROLLERS
-	'article_published_on'		=> 'This article originally appeared on <a href="%s">%s</a>',
-	'article_published_on_author'	=> 'This article originally appeared on <a href="%s">%s</a> by %s',
-
-	'access_denied'			=> 'You don’t have permission to access this page',
-	'page_not_found'		=> 'You are looking for a page which doesn’t exist',
-	'error_occurred'		=> 'An error occurred',
-	'error_occurred_update'		=> 'Nothing was changed',
-
-	'default_category'		=> 'Uncategorized',
-	'categories_updated'		=> 'Categories have been updated',
-	'categories_management'		=> 'Categories management',
-	'feed_updated'			=> 'Feed has been updated',
-	'rss_feed_management'		=> 'RSS feeds management',
-	'configuration_updated'		=> 'Configuration has been updated',
-	'sharing_management'		=> 'Sharing options management',
-	'bad_opml_file'			=> 'Your OPML file is invalid',
-	'shortcuts_updated'		=> 'Shortcuts have been updated',
-	'shortcuts_navigation'		=> 'Navigation',
-	'shortcuts_navigation_help'	=> 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
-	'shortcuts_article_action'	=> 'Article actions',
-	'shortcuts_other_action'	=> 'Other actions',
-	'feeds_marked_read'		=> 'Feeds have been marked as read',
-	'updated'			=> 'Modifications have been updated',
-
-	'already_subscribed'		=> 'You have already subscribed to <em>%s</em>',
-	'feed_added'			=> 'RSS feed <em>%s</em> has been added',
-	'feed_not_added'		=> '<em>%s</em> could not be added',
-	'internal_problem_feed'		=> 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
-	'invalid_url'			=> 'URL <em>%s</em> is invalid',
-	'feed_actualized'		=> '<em>%s</em> has been updated',
-	'n_feeds_actualized'		=> '%d feeds have been updated',
-	'feeds_actualized'		=> 'RSS feeds have been updated',
-	'no_feed_actualized'		=> 'No RSS feed has been updated',
-	'n_entries_deleted'		=> '%d articles have been deleted',
-	'feeds_imported_with_errors'	=> 'Your feeds have been imported but some errors occurred',
-	'feeds_imported'		=> 'Your feeds have been imported and will now be updated',
-	'category_emptied'		=> 'Category has been emptied',
-	'feed_deleted'			=> 'Feed has been deleted',
-	'feed_validator'		=> 'Check the validity of the feed',
-
-	'optimization_complete'		=> 'Optimization complete',
-
-	'your_rss_feeds'		=> 'Your RSS feeds',
-	'your_favorites'		=> 'Your favourites',
-	'public'			=> 'Public',
-	'invalid_login'			=> 'Login is invalid',
-
-	'file_is_nok'			=> 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into.',
-
-	// VIEWS
-	'save'				=> 'Save',
-	'delete'			=> 'Delete',
-	'cancel'			=> 'Cancel',
-	'submit'			=> 'Submit',
-
-	'back_to_rss_feeds'		=> '← Go back to your RSS feeds',
-	'feeds_moved_category_deleted'	=> 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
-	'category_number'		=> 'Category n°%d',
-	'ask_empty'			=> 'Clear?',
-	'number_feeds'			=> '%d feeds',
-	'can_not_be_deleted'		=> 'Cannot be deleted',
-	'add_category'			=> 'Add a category',
-	'new_category'			=> 'New category',
-
-	'javascript_for_shortcuts'	=> 'JavaScript must be enabled in order to use shortcuts',
-	'javascript_should_be_activated'=> 'JavaScript must be enabled',
-	'shift_for_all_read'		=> '+ <code>shift</code> to mark all articles as read',
-	'see_on_website'		=> 'See on original website',
-	'next_article'			=> 'Skip to the next article',
-	'last_article'			=> 'Skip to the last article',
-	'previous_article'		=> 'Skip to the previous article',
-	'first_article'			=> 'Skip to the first article',
-	'next_page'			=> 'Skip to the next page',
-	'previous_page'			=> 'Skip to the previous page',
-	'collapse_article'		=> 'Collapse',
-	'auto_share'			=> 'Share',
-	'auto_share_help'		=> 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-	'focus_search'			=> 'Access search box',
-	'user_filter'			=> 'Access user filters',
-	'user_filter_help'		=> 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-	'help'				=> 'Display documentation',
-
-	'file_to_import'		=> 'File to import<br />(OPML, Json or Zip)',
-	'file_to_import_no_zip'		=> 'File to import<br />(OPML or Json)',
-	'import'			=> 'Import',
-	'file_cannot_be_uploaded'	=> 'File cannot be uploaded!',
-	'zip_error'			=> 'An error occured during Zip import.',
-	'no_zip_extension'		=> 'Zip extension is not present on your server.',
-	'export'			=> 'Export',
-	'export_opml'			=> 'Export list of feeds (OPML)',
-	'export_starred'		=> 'Export your favourites',
-	'export_no_zip_extension'	=> 'Zip extension is not present on your server. Please try to export files one by one.',
-	'starred_list'			=> 'List of favourite articles',
-	'feed_list'			=> 'List of %s articles',
-	'or'				=> 'or',
-
-	'informations'			=> 'Information',
-	'damn'				=> 'Damn!',
-	'ok'				=> 'Ok!',
-	'attention'			=> 'Be careful!',
-	'feed_in_error'			=> 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
-	'feed_empty'			=> 'This feed is empty. Please verify that it is still maintained.',
-	'feed_description'		=> 'Description',
-	'website_url'			=> 'Website URL',
-	'feed_url'			=> 'Feed URL',
-	'articles'			=> 'articles',
-	'number_articles'		=> '%d articles',
-	'by_feed'			=> 'by feed',
-	'by_default'			=> 'By default',
-	'keep_history'			=> 'Minimum number of articles to keep',
-	'ttl'				=> 'Do not automatically refresh more often than',
-	'categorize'			=> 'Store in a category',
-	'truncate'			=> 'Delete all articles',
-	'advanced'			=> 'Advanced',
-	'show_in_all_flux'		=> 'Show in main stream',
-	'yes'				=> 'Yes',
-	'no'				=> 'No',
-	'css_path_on_website'		=> 'Articles CSS path on original website',
-	'retrieve_truncated_feeds'	=> 'Retrieves truncated RSS feeds (attention, requires more time!)',
-	'http_authentication'		=> 'HTTP Authentication',
-	'http_username'			=> 'HTTP username',
-	'http_password'			=> 'HTTP password',
-	'blank_to_disable'		=> 'Leave blank to disable',
-	'share_name'			=> 'Share name to display',
-	'share_url'			=> 'Share URL to use',
-	'not_yet_implemented'		=> 'Not yet implemented',
-	'access_protected_feeds'	=> 'Connection allows to access HTTP protected RSS feeds',
-	'no_selected_feed'		=> 'No feed selected.',
-	'think_to_add'			=> 'You may add some feeds.',
-
-	'current_user'			=> 'Current user',
-	'default_user'			=> 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
-	'password_form'			=> 'Password<br /><small>(for the Web-form login method)</small>',
-	'password_api'			=> 'Password API<br /><small>(e.g., for mobile apps)</small>',
-	'persona_connection_email'	=> 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-	'allow_anonymous'		=> 'Allow anonymous reading of the articles of the default user (%s)',
-	'allow_anonymous_refresh'	=> 'Allow anonymous refresh of the articles',
-	'unsafe_autologin'		=> 'Allow unsafe automatic login using the format: ',
-	'api_enabled'			=> 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
-	'auth_token'			=> 'Authentication token',
-	'explain_token'			=> 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&amp;token=%s</kbd>',
-	'login_configuration'		=> 'Login',
-	'is_admin'			=> 'is administrator',
-	'auth_type'			=> 'Authentication method',
-	'auth_none'			=> 'None (dangerous)',
-	'auth_form'			=> 'Web form (traditional, requires JavaScript)',
-	'http_auth'			=> 'HTTP (for advanced users with HTTPS)',
-	'auth_persona'			=> 'Mozilla Persona (modern, requires JavaScript)',
-	'users_list'			=> 'List of users',
-	'create_user'			=> 'Create new user',
-	'username'			=> 'Username',
-	'username_admin'		=> 'Administrator username',
-	'password'			=> 'Password',
-	'create'			=> 'Create',
-	'user_created'			=> 'User %s has been created',
-	'user_deleted'			=> 'User %s has been deleted',
-
-	'language'			=> 'Language',
-	'month'				=> 'months',
-	'archiving_configuration'	=> 'Archiving',
-	'delete_articles_every'		=> 'Remove articles after',
-	'purge_now'			=> 'Purge now',
-	'purge_completed'		=> 'Purge completed (%d articles deleted)',
-	'archiving_configuration_help'	=> 'More options are available in the individual stream settings',
-	'reading_configuration'		=> 'Reading',
-	'display_configuration'		=> 'Display',
-	'articles_per_page'		=> 'Number of articles per page',
-	'number_divided_when_reader'	=> 'Divided by 2 in the reading view.',
-	'default_view'			=> 'Default view',
-	'articles_to_display'		=> 'Articles to display',
-	'sort_order'			=> 'Sort order',
-	'auto_load_more'		=> 'Load next articles at the page bottom',
-	'display_articles_unfolded'	=> 'Show articles unfolded by default',
-	'display_categories_unfolded'	=> 'Show categories folded by default',
-	'hide_read_feeds'		=> 'Hide categories &amp; feeds with no unread article (does not work with “Show all articles” configuration)',
-	'after_onread'			=> 'After “mark all as read”,',
-	'jump_next'			=> 'jump to next unread sibling (feed or category)',
-	'article_icons'			=> 'Article icons',
-	'top_line'			=> 'Top line',
-	'bottom_line'			=> 'Bottom line',
-	'html5_notif_timeout'		=> 'HTML5 notification timeout',
-	'seconds_(0_means_no_timeout)'	=> 'seconds (0 means no timeout)',
-	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
-	'sticky_post'			=> 'Stick the article to the top when opened',
-	'reading_confirm'		=> 'Display a confirmation dialog on “mark all as read” actions',
-	'auto_read_when'		=> 'Mark article as read…',
-	'article_viewed'		=> 'when article is viewed',
-	'article_open_on_website'	=> 'when article is opened on its original website',
-	'scroll'			=> 'while scrolling',
-	'upon_reception'		=> 'upon reception of the article',
-	'your_shaarli'			=> 'Your Shaarli',
-	'your_wallabag'			=> 'Your wallabag',
-	'your_diaspora_pod'		=> 'Your Diaspora* pod',
-	'sharing'			=> 'Sharing',
-	'share'				=> 'Share',
-	'by_email'			=> 'By email',
-	'optimize_bdd'			=> 'Optimize database',
-	'optimize_todo_sometimes'	=> 'To do occasionally to reduce the size of the database',
-	'theme'				=> 'Theme',
-	'content_width'			=> 'Content width',
-	'width_thin'			=> 'Thin',
-	'width_medium'			=> 'Medium',
-	'width_large'			=> 'Large',
-	'width_no_limit'		=> 'No limit',
-	'more_information'		=> 'More information',
-	'activate_sharing'		=> 'Activate sharing',
-	'shaarli'			=> 'Shaarli',
-	'blogotext'			=> 'Blogotext',
-	'wallabag'			=> 'wallabag',
-	'diaspora'			=> 'Diaspora*',
-	'twitter'			=> 'Twitter',
-	'g+'				=> 'Google+',
-	'facebook'			=> 'Facebook',
-	'email'				=> 'Email',
-	'print'				=> 'Print',
-
-	'article'			=> 'Article',
-	'title'				=> 'Title',
-	'author'			=> 'Author',
-	'publication_date'		=> 'Date of publication',
-	'by'				=> 'by',
-
-	'load_more'			=> 'Load more articles',
-	'nothing_to_load'		=> 'There are no more articles',
-
-	'rss_feeds_of'			=> 'RSS feed of %s',
-
-	'refresh'			=> 'Refresh',
-	'no_feed_to_refresh'		=> 'There is no feed to refresh…',
-
-	'today'				=> 'Today',
-	'yesterday'			=> 'Yesterday',
-	'before_yesterday'		=> 'Before yesterday',
-	'new_article'			=> 'There are new available articles, click to refresh the page.',
-	'by_author'			=> 'By <em>%s</em>',
-	'related_tags'			=> 'Related tags',
-	'no_feed_to_display'		=> 'There is no article to show.',
-
-	'about_freshrss'		=> 'About FreshRSS',
-	'project_website'		=> 'Project website',
-	'lead_developer'		=> 'Lead developer',
-	'website'			=> 'Website',
-	'bugs_reports'			=> 'Bugs reports',
-	'github_or_email'		=> '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
-	'license'			=> 'License',
-	'agpl3'				=> '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-	'freshrss_description'		=> 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
-	'credits'			=> 'Credits',
-	'credits_content'		=> 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
-	'version'			=> 'Version',
-
-	'logs'				=> 'Logs',
-	'logs_empty'			=> 'Log file is empty',
-	'clear_logs'			=> 'Clear the logs',
-
-	'forbidden_access'		=> 'Access is forbidden!',
-	'login_required'		=> 'Login required:',
-
-	'confirm_action'		=> 'Are you sure you want to perform this action? It cannot be cancelled!',
-	'confirm_action_feed_cat'	=> 'Are you sure you want to perform this action? You may lost related favorites and user queries. It cannot be cancelled!',
-	'notif_title_new_articles'	=> 'FreshRSS: new articles!',
-	'notif_body_new_articles'	=> 'There are \d new articles to read on FreshRSS.',
-
-	// DATE
-	'january'			=> 'January',
-	'february'			=> 'February',
-	'march'				=> 'March',
-	'april'				=> 'April',
-	'may'				=> 'May',
-	'june'				=> 'June',
-	'july'				=> 'July',
-	'august'			=> 'August',
-	'september'			=> 'September',
-	'october'			=> 'October',
-	'november'			=> 'November',
-	'december'			=> 'December',
-	'january'			=> 'Jan',
-	'february'			=> 'Feb',
-	'march'				=> 'Mar',
-	'april'				=> 'Apr',
-	'may'				=> 'May',
-	'june'				=> 'Jun',
-	'july'				=> 'Jul',
-	'august'			=> 'Aug',
-	'september'			=> 'Sep',
-	'october'			=> 'Oct',
-	'november'			=> 'Nov',
-	'december'			=> 'Dec',
-	'sun'				=> 'Sun',
-	'mon'				=> 'Mon',
-	'tue'				=> 'Tue',
-	'wed'				=> 'Wed',
-	'thu'				=> 'Thu',
-	'fri'				=> 'Fri',
-	'sat'				=> 'Sat',
-	// special format for date() function
-	'Jan'				=> '\J\a\n\u\a\r\y',
-	'Feb'				=> '\F\e\b\r\u\a\r\y',
-	'Mar'				=> '\M\a\r\c\h',
-	'Apr'				=> '\A\p\r\i\l',
-	'May'				=> '\M\a\y',
-	'Jun'				=> '\J\u\n\e',
-	'Jul'				=> '\J\u\l\y',
-	'Aug'				=> '\A\u\g\u\s\t',
-	'Sep'				=> '\S\e\p\t\e\m\b\e\r',
-	'Oct'				=> '\O\c\t\o\b\e\r',
-	'Nov'				=> '\N\o\v\e\m\b\e\r',
-	'Dec'				=> '\D\e\c\e\m\b\e\r',
-	// format for date() function, %s allows to indicate month in letter
-	'format_date'			=> '%s j\<\s\u\p\>S\<\/\s\u\p\> Y',
-	'format_date_hour'		=> '%s j\<\s\u\p\>S\<\/\s\u\p\> Y \a\t H\:i',
-	
-	'status_favorites'		=> 'Favourites',
-	'status_read'			=> 'Read',
-	'status_unread'			=> 'Unread',
-	'status_total'			=> 'Total',
-	
-	'stats_entry_repartition'	=> 'Entries repartition',
-	'stats_entry_per_day'		=> 'Entries per day (last 30 days)',
-	'stats_feed_per_category'	=> 'Feeds per category',
-	'stats_entry_per_category'	=> 'Entries per category',
-	'stats_top_feed'		=> 'Top ten feeds',
-	'stats_entry_count'		=> 'Entry count',
-	'stats_no_idle'			=> 'There is no idle feed!',
-
-	'update'			=> 'Update',
-	'update_system'			=> 'Update system',
-	'update_check'			=> 'Check for new updates',
-	'update_last'			=> 'Last verification: %s',
-	'update_can_apply'		=> 'An update is available.',
-	'update_apply'			=> 'Apply',
-	'update_server_not_found'	=> 'Update server cannot be found. [%s]',
-	'no_update'			=> 'No update to apply',
-	'update_problem'		=> 'The update process has encountered an error: %s',
-	'update_finished'		=> 'Update completed!',
-
-	'auth_reset'			=> 'Authentication reset',
-	'auth_will_reset'		=> 'Authentication system will be reset: a form will be used instead of Persona.',
-	'auth_not_persona'		=> 'Only Persona system can be reset.',
-	'auth_no_password_set'		=> 'Administrator password hasn’t been set. This feature isn’t available.',
-	'auth_form_set'			=> 'Form is now your default authentication system.',
-	'auth_form_not_set'		=> 'A problem occured during authentication system configuration. Please retry later.',
-);

sources/app/i18n/en/admin.php

@@ -0,0 +1,170 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
+		'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
+		'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
+		'form' => 'Web form (traditional, requires JavaScript)',
+		'http' => 'HTTP (for advanced users with HTTPS)',
+		'none' => 'None (dangerous)',
+		'persona' => 'Mozilla Persona (modern, requires JavaScript)',
+		'title' => 'Authentication',
+		'title_reset' => 'Authentication reset',
+		'token' => 'Authentication token',
+		'token_help' => 'Allows to access RSS output of the default user without authentication:',
+		'type' => 'Authentication method',
+		'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
+	),
+	'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.',
+		),
+		'minz' => array(
+			'nok' => 'You lack the Minz framework.',
+			'ok' => 'You have the Minz framework.',
+		),
+		'pcre' => array(
+			'nok' => 'You lack a required library for regular expressions (php-pcre).',
+			'ok' => 'You have the required library for regular expressions (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
+			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on Mozilla Persona directory are good.',
+		),
+		'php' => array(
+			'_' => 'PHP installation',
+			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
+			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'There is one or more lacking tables in the database.',
+			'ok' => 'Tables are existing in the database.',
+		),
+		'title' => 'Installation checking',
+		'tokens' => array(
+			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on tokens directory are good.',
+		),
+		'users' => array(
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on users directory are good.',
+		),
+		'zip' => array(
+			'nok' => 'You lack ZIP extension (php5-zip package).',
+			'ok' => 'You have ZIP extension.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Disabled',
+		'empty_list' => 'There is no installed extension',
+		'enabled' => 'Enabled',
+		'no_configure_view' => 'This extension cannot be configured.',
+		'system' => array(
+			'_' => 'System extensions',
+			'no_rights' => 'System extension (you have no rights on it)',
+		),
+		'title' => 'Extensions',
+		'user' => 'User extensions',
+	),
+	'stats' => array(
+		'_' => 'Statistics',
+		'all_feeds' => 'All feeds',
+		'category' => 'Category',
+		'entry_count' => 'Entry count',
+		'entry_per_category' => 'Entries per category',
+		'entry_per_day' => 'Entries per day (last 30 days)',
+		'entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
+		'entry_per_hour' => 'Per hour (average: %.2f messages)',
+		'entry_per_month' => 'Per month (average: %.2f messages)',
+		'entry_repartition' => 'Entries repartition',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds per category',
+		'idle' => 'Idle feeds',
+		'main' => 'Main statistics',
+		'main_stream' => 'Main stream',
+		'menu' => array(
+			'idle' => 'Idle feeds',
+			'main' => 'Main statistics',
+			'repartition' => 'Articles repartition',
+		),
+		'no_idle' => 'There is no idle feed!',
+		'number_entries' => '%d articles',
+		'percent_of_total' => '%% of total',
+		'repartition' => 'Articles repartition',
+		'status_favorites' => 'Favourites',
+		'status_read' => 'Read',
+		'status_total' => 'Total',
+		'status_unread' => 'Unread',
+		'title' => 'Statistics',
+		'top_feed' => 'Top ten feeds',
+	),
+	'update' => array(
+		'_' => 'Update system',
+		'apply' => 'Apply',
+		'check' => 'Check for new updates',
+		'current_version' => 'Your current version of FreshRSS is the %s.',
+		'last' => 'Last verification: %s',
+		'none' => 'No update to apply',
+		'title' => 'Update system',
+	),
+	'user' => array(
+		'articles_and_size' => '%s articles (%s)',
+		'create' => 'Create new user',
+		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Language',
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
+		'title' => 'Manage users',
+		'user_list' => 'List of users',
+		'username' => 'Username',
+		'users' => 'Users',
+	),
+);

sources/app/i18n/en/conf.php

@@ -0,0 +1,169 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archiving',
+		'advanced' => 'Advanced',
+		'delete_after' => 'Remove articles after',
+		'help' => 'More options are available in the individual stream settings',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'optimize' => 'Optimize database',
+		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'purge_now' => 'Purge now',
+		'title' => 'Archiving',
+		'ttl' => 'Do not automatically refresh more often than',
+	),
+	'display' => array(
+		'_' => 'Display',
+		'icon' => array(
+			'bottom_line' => 'Bottom line',
+			'entry' => 'Article icons',
+			'publication_date' => 'Date of publication',
+			'related_tags' => 'Related tags',
+			'sharing' => 'Sharing',
+			'top_line' => 'Top line',
+		),
+		'language' => 'Language',
+		'notif_html5' => array(
+			'seconds' => 'seconds (0 means no timeout)',
+			'timeout' => 'HTML5 notification timeout',
+		),
+		'theme' => 'Theme',
+		'title' => 'Display',
+		'width' => array(
+			'content' => 'Content width',
+			'large' => 'Large',
+			'medium' => 'Medium',
+			'no_limit' => 'No limit',
+			'thin' => 'Thin',
+		),
+	),
+	'query' => array(
+		'_' => 'User queries',
+		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
+		'filter' => 'Filter applied:',
+		'get_all' => 'Display all articles',
+		'get_category' => 'Display "%s" category',
+		'get_favorite' => 'Display favorite articles',
+		'get_feed' => 'Display "%s" feed',
+		'no_filter' => 'No filter',
+		'none' => 'You haven’t created any user query yet.',
+		'number' => 'Query n°%d',
+		'order_asc' => 'Display oldest articles first',
+		'order_desc' => 'Display newest articles first',
+		'search' => 'Search for "%s"',
+		'state_0' => 'Display all articles',
+		'state_1' => 'Display read articles',
+		'state_2' => 'Display unread articles',
+		'state_3' => 'Display all articles',
+		'state_4' => 'Display favorite articles',
+		'state_5' => 'Display read favorite articles',
+		'state_6' => 'Display unread favorite articles',
+		'state_7' => 'Display favorite articles',
+		'state_8' => 'Display not favorite articles',
+		'state_9' => 'Display read not favorite articles',
+		'state_10' => 'Display unread not favorite articles',
+		'state_11' => 'Display not favorite articles',
+		'state_12' => 'Display all articles',
+		'state_13' => 'Display read articles',
+		'state_14' => 'Display unread articles',
+		'state_15' => 'Display all articles',
+		'title' => 'User queries',
+	),
+	'profile' => array(
+		'_' => 'Profile management',
+		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
+		'title' => 'Profile',
+	),
+	'reading' => array(
+		'_' => 'Reading',
+		'after_onread' => 'After “mark all as read”,',
+		'articles_per_page' => 'Number of articles per page',
+		'auto_load_more' => 'Load next articles at the page bottom',
+		'auto_remove_article' => 'Hide articles after reading',
+		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
+		'display_articles_unfolded' => 'Show articles unfolded by default',
+		'display_categories_unfolded' => 'Show categories folded by default',
+		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
+		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
+		'jump_next' => 'jump to next unread sibling (feed or category)',
+		'number_divided_when_reader' => 'Divided by 2 in the reading view.',
+		'read' => array(
+			'article_open_on_website' => 'when article is opened on its original website',
+			'article_viewed' => 'when article is viewed',
+			'scroll' => 'while scrolling',
+			'upon_reception' => 'upon reception of the article',
+			'when' => 'Mark article as read…',
+		),
+		'show' => array(
+			'_' => 	'Articles to display',
+			'adaptive' => 'Adjust showing',
+			'all_articles' => 'Show all articles',
+			'unread' => 'Show only unread',
+		),
+		'sort' => array(
+			'_' => 'Sort order',
+			'newer_first' => 'Newer first',
+			'older_first' => 'Oldest first',
+		),
+		'sticky_post' => 'Stick the article to the top when opened',
+		'title' => 'Reading',
+		'view' => array(
+			'default' => 'Default view',
+			'global' => 'Global view',
+			'normal' => 'Normal view',
+			'reader' => 'Reading view',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Sharing',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'More information',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Share name to display',
+		'share_url' => 'Share URL to use',
+		'title' => 'Sharing',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Shortcuts',
+		'article_action' => 'Article actions',
+		'auto_share' => 'Share',
+		'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+		'close_dropdown' => 'Close menus',
+		'collapse_article' => 'Collapse',
+		'first_article' => 'Skip to the first article',
+		'focus_search' => 'Access search box',
+		'help' => 'Display documentation',
+		'javascript' => 'JavaScript must be enabled in order to use shortcuts',
+		'last_article' => 'Skip to the last article',
+		'load_more' => 'Load more articles',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
+		'next_article' => 'Skip to the next article',
+		'other_action' => 'Other actions',
+		'previous_article' => 'Skip to the previous article',
+		'see_on_website' => 'See on original website',
+		'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
+		'title' => 'Shortcuts',
+		'user_filter' => 'Access user filters',
+		'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s articles (%s)',
+		'current' => 'Current user',
+		'is_admin' => 'is administrator',
+		'users' => 'Users',
+	),
+);

sources/app/i18n/en/feedback.php

@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimization complete',
+	),
+	'access' => array(
+		'denied' => 'You don’t have permission to access this page',
+		'not_found' => 'You are looking for a page which doesn’t exist',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'A problem occured during authentication system configuration. Please retry later.',
+			'set' => 'Form is now your default authentication system.',
+		),
+		'login' => array(
+			'invalid' => 'Login is invalid',
+			'success' => 'You are connected',
+		),
+		'logout' => array(
+			'success' => 'You are disconnected',
+		),
+		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
+		'not_persona' => 'Only Persona system can be reset.',
+	),
+	'conf' => array(
+		'error' => 'An error occurred during configuration saving',
+		'query_created' => 'Query "%s" has been created.',
+		'shortcuts_updated' => 'Shortcuts have been updated',
+		'updated' => 'Configuration has been updated',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s is already enabled',
+		'disable' => array(
+			'ko' => '%s cannot be disabled. <a href="%s">Check FressRSS logs</a> for details.',
+			'ok' => '%s is now disabled',
+		),
+		'enable' => array(
+			'ko' => '%s cannot be enabled. <a href="%s">Check FressRSS logs</a> for details.',
+			'ok' => '%s is now enabled',
+		),
+		'no_access' => 'You have no access on %s',
+		'not_enabled' => '%s is not enabled yet',
+		'not_found' => '%s does not exist',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
+		'feeds_imported' => 'Your feeds have been imported and will now be updated',
+		'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
+		'file_cannot_be_uploaded' => 'File cannot be uploaded!',
+		'no_zip_extension' => 'Zip extension is not present on your server.',
+		'zip_error' => 'An error occured during Zip import.',
+	),
+	'sub' => array(
+		'actualize' => 'Actualize',
+		'category' => array(
+			'created' => 'Category %s has been created.',
+			'deleted' => 'Category has been deleted.',
+			'emptied' => 'Category has been emptied',
+			'error' => 'Category cannot be updated',
+			'name_exists' => 'Category name already exists.',
+			'no_id' => 'You must precise the id of the category.',
+			'no_name' => 'Category name cannot be empty.',
+			'not_delete_default' => 'You cannot delete the default category!',
+			'not_exist' => 'The category does not exist!',
+			'over_max' => 'You have reached your limit of categories (%d)',
+			'updated' => 'Category has been updated.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> has been updated',
+			'actualizeds' => 'RSS feeds have been updated',
+			'added' => 'RSS feed <em>%s</em> has been added',
+			'already_subscribed' => 'You have already subscribed to <em>%s</em>',
+			'deleted' => 'Feed has been deleted',
+			'error' => 'Feed cannot be updated',
+			'internal_problem' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
+			'invalid_url' => 'URL <em>%s</em> is invalid',
+			'marked_read' => 'Feeds have been marked as read',
+			'n_actualized' => '%d feeds have been updated',
+			'n_entries_deleted' => '%d articles have been deleted',
+			'no_refresh' => 'There is no feed to refresh…',
+			'not_added' => '<em>%s</em> could not be added',
+			'over_max' => 'You have reached your limit of feeds (%d)',
+			'updated' => 'Feed has been updated',
+		),
+		'purge_completed' => 'Purge completed (%d articles deleted)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS will be now updated to the <strong>version %s</strong>.',
+		'error' => 'The update process has encountered an error: %s',
+		'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
+		'finished' => 'Update completed!',
+		'none' => 'No update to apply',
+		'server_not_found' => 'Update server cannot be found. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'User %s has been created',
+			'error' => 'User %s cannot be created',
+		),
+		'deleted' => array(
+			'_' => 'User %s has been deleted',
+			'error' => 'User %s cannot be deleted',
+		),
+	),
+	'profile' => array(
+		'error' => 'Your profile cannot be modified',
+		'updated' => 'Your profile has been modified',
+	),
+);

sources/app/i18n/en/gen.php

@@ -0,0 +1,163 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Actualize',
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',
+		'cancel' => 'Cancel',
+		'create' => 'Create',
+		'disable' => 'Disable',
+		'empty' => 'Empty',
+		'enable' => 'Enable',
+		'export' => 'Export',
+		'filter' => 'Filtrer',
+		'import' => 'Import',
+		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'remove' => 'Remove',
+		'see_website' => 'See website',
+		'submit' => 'Submit',
+		'truncate' => 'Delete all articles',
+	),
+	'auth' => array(
+		'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
+		'login' => 'Login',
+		'login_persona' => 'Login with Persona',
+		'login_persona_problem' => 'Connection problem with Persona?',
+		'logout' => 'Logout',
+		'password' => 'Password',
+		'reset' => 'Authentication reset',
+		'username' => 'Username',
+		'username_admin' => 'Administrator username',
+		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
+	),
+	'date' => array(
+		'Apr' => '\\A\\p\\r\\i\\l',
+		'Aug' => '\\A\\u\\g\\u\\s\\t',
+		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
+		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+		'Jul' => '\\J\\u\\l\\y',
+		'Jun' => '\\J\\u\\n\\e',
+		'Mar' => '\\M\\a\\r\\c\\h',
+		'May' => '\\M\\a\\y',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'apr' => 'apr',
+		'april' => 'Apr',
+		'aug' => 'aug',
+		'august' => 'Aug',
+		'before_yesterday' => 'Before yesterday',
+		'dec' => 'dec',
+		'december' => 'Dec',
+		'feb' => 'feb',
+		'february' => 'Feb',
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'fri' => 'Fri',
+		'jan' => 'jan',
+		'january' => 'Jan',
+		'jul' => 'jul',
+		'july' => 'Jul',
+		'jun' => 'jun',
+		'june' => 'Jun',
+		'last_3_month' => 'Last three months',
+		'last_6_month' => 'Last six months',
+		'last_month' => 'Last month',
+		'last_week' => 'Last week',
+		'last_year' => 'Last year',
+		'mar' => 'mar',
+		'march' => 'Mar',
+		'may' => 'May',
+		'mon' => 'Mon',
+		'month' => 'months',
+		'nov' => 'nov',
+		'november' => 'Nov',
+		'oct' => 'oct',
+		'october' => 'Oct',
+		'sat' => 'Sat',
+		'sep' => 'sep',
+		'september' => 'Sep',
+		'sun' => 'Sun',
+		'thu' => 'Thu',
+		'today' => 'Today',
+		'tue' => 'Tue',
+		'wed' => 'Wed',
+		'yesterday' => 'Yesterday',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'About FreshRSS',
+	),
+	'js' => array(
+		'category_empty' => 'Empty category',
+		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
+		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+		'feedback' => array(
+			'body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
+			'title_new_articles' => 'FreshRSS: new articles!',
+		),
+		'new_article' => 'There are new available articles, click to refresh the page.',
+		'should_be_activated' => 'JavaScript must be enabled',
+	),
+	'lang' => array(
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+	),
+	'menu' => array(
+		'about' => 'About',
+		'admin' => 'Administration',
+		'archiving' => 'Archiving',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'configuration' => 'Configuration',
+		'display' => 'Display',
+		'extensions' => 'Extensions',
+		'logs' => 'Logs',
+		'queries' => 'User queries',
+		'reading' => 'Reading',
+		'search' => 'Search words or #tags',
+		'sharing' => 'Sharing',
+		'shortcuts' => 'Shortcuts',
+		'stats' => 'Statistics',
+		'update' => 'Update',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'pagination' => array(
+		'first' => 'First',
+		'last' => 'Last',
+		'load_more' => 'Load more articles',
+		'mark_all_read' => 'Mark all as read',
+		'next' => 'Next',
+		'nothing_to_load' => 'There are no more articles',
+		'previous' => 'Previous',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Attention!',
+		'blank_to_disable' => 'Leave blank to disable',
+		'by_author' => 'By <em>%s</em>',
+		'by_default' => 'By default',
+		'damn' => 'Damn!',
+		'default_category' => 'Uncategorized',
+		'no' => 'No',
+		'ok' => 'Ok!',
+		'or' => 'or',
+		'yes' => 'Yes',
+	),
+);

sources/app/i18n/en/index.php

@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'About',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Bugs reports',
+		'credits' => 'Credits',
+		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons are collected with <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
+		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://projet.idleman.fr/leed/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'license' => 'License',
+		'project_website' => 'Project website',
+		'title' => 'About',
+		'version' => 'Version',
+		'website' => 'Website',
+	),
+	'feed' => array(
+		'add' => 'You may add some feeds.',
+		'empty' => 'There is no article to show.',
+		'rss_of' => 'RSS feed of %s',
+		'title' => 'Your RSS feeds',
+		'title_global' => 'Global view',
+		'title_fav' => 'Your favourites',
+	),
+	'log' => array(
+		'_' => 'Logs',
+		'clear' => 'Clear the logs',
+		'empty' => 'Log file is empty',
+		'title' => 'Logs',
+	),
+	'menu' => array(
+		'about' => 'About FreshRSS',
+		'add_query' => 'Add a query',
+		'before_one_day' => 'Before one day',
+		'before_one_week' => 'Before one week',
+		'favorites' => 'Favourites (%s)',
+		'global_view' => 'Global view',
+		'main_stream' => 'Main stream',
+		'mark_all_read' => 'Mark all as read',
+		'mark_cat_read' => 'Mark category as read',
+		'mark_feed_read' => 'Mark feed as read',
+		'newer_first' => 'Newer first',
+		'non-starred' => 'Show all but favorites',
+		'normal_view' => 'Normal view',
+		'older_first' => 'Oldest first',
+		'queries' => 'User queries',
+		'read' => 'Show only read',
+		'reader_view' => 'Reading view',
+		'rss_view' => 'RSS feed',
+		'search_short' => 'Search',
+		'starred' => 'Show only favorites',
+		'stats' => 'Statistics',
+		'subscription' => 'Subscriptions management',
+		'unread' => 'Show only unread',
+	),
+	'share' => 'Share',
+	'tag' => array(
+		'related' => 'Related tags',
+	),
+);

sources/app/i18n/en/install.php

@@ -0,0 +1,107 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Complete installation',
+		'fix_errors_before' => 'Fix errors before skip to the next step.',
+		'next_step' => 'Go to the next step',
+	),
+	'auth' => array(
+		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Web form (traditional, requires JavaScript)',
+		'http' => 'HTTP (for advanced users with HTTPS)',
+		'none' => 'None (dangerous)',
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
+		'persona' => 'Mozilla Persona (modern, requires JavaScript)',
+		'type' => 'Authentication method',
+	),
+	'bdd' => array(
+		'_' => 'Database',
+		'conf' => array(
+			'_' => 'Database configuration',
+			'ko' => 'Verify your database information.',
+			'ok' => 'Database configuration has been saved.',
+		),
+		'host' => 'Host',
+		'prefix' => 'Table prefix',
+		'password' => 'HTTP password',
+		'type' => 'Type of database',
+		'username' => 'HTTP username',
+	),
+	'check' => array(
+		'_' => 'Checks',
+		'cache' => array(
+			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on cache directory are good.',
+		),
+		'ctype' => array(
+			'nok' => 'You lack a required library for character type checking (php-ctype).',
+			'ok' => 'You have the required library for character type checking (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'You lack cURL (php5-curl package).',
+			'ok' => 'You have cURL extension.',
+		),
+		'data' => array(
+			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on data directory are good.',
+		),
+		'dom' => array(
+			'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+			'ok' => 'You have the required library to browse the DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on favicons directory are good.',
+		),
+		'http_referer' => array(
+			'nok' => 'Please check that you are not altering your HTTP REFERER.',
+			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
+		),
+		'minz' => array(
+			'nok' => 'You lack the Minz framework.',
+			'ok' => 'You have the Minz framework.',
+		),
+		'pcre' => array(
+			'nok' => 'You lack a required library for regular expressions (php-pcre).',
+			'ok' => 'You have the required library for regular expressions (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
+			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on Mozilla Persona directory are good.',
+		),
+		'php' => array(
+			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
+			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',
+			'ok' => 'Permissions on users directory are good.',
+		),
+	),
+	'conf' => array(
+		'_' => 'General configuration',
+		'ok' => 'General configuration has been saved.',
+	),
+	'congratulations' => 'Congratulations!',
+	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
+	'delete_articles_after' => 'Remove articles after',
+	'fix_errors_before' => 'Fix errors before skip to the next step.',
+	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
+	'language' => array(
+		'_' => 'Language',
+		'choose' => 'Choose a language for FreshRSS',
+		'defined' => 'Language has been defined.',
+	),
+	'not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
+	'ok' => 'The installation process was successful.',
+	'step' => 'step %d',
+	'steps' => 'Steps',
+	'title' => 'Installation · FreshRSS',
+	'this_is_the_end' => 'This is the end',
+);

sources/app/i18n/en/sub.php

@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Category',
+		'add' => 'Add a category',
+		'empty' => 'Empty category',
+		'new' => 'New category',
+	),
+	'feed' => array(
+		'add' => 'Add a RSS feed',
+		'advanced' => 'Advanced',
+		'archiving' => 'Archivage',
+		'auth' => array(
+			'configuration' => 'Login',
+			'help' => 'Connection allows to access HTTP protected RSS feeds',
+			'http' => 'HTTP Authentication',
+			'password' => 'HTTP password',
+			'username' => 'HTTP username',
+		),
+		'css_help' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
+		'css_path' => 'Articles CSS path on original website',
+		'description' => 'Description',
+		'empty' => 'This feed is empty. Please verify that it is still maintained.',
+		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
+		'in_main_stream' => 'Show in main stream',
+		'informations' => 'Information',
+		'keep_history' => 'Minimum number of articles to keep',
+		'moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
+		'no_selected' => 'No feed selected.',
+		'number_entries' => '%d articles',
+		'stats' => 'Statistics',
+		'think_to_add' => 'You may add some feeds.',
+		'title' => 'Title',
+		'title_add' => 'Add a RSS feed',
+		'ttl' => 'Do not automatically refresh more often than',
+		'url' => 'Feed URL',
+		'validator' => 'Check the validity of the feed',
+		'website' => 'Website URL',
+	),
+	'import_export' => array(
+		'export' => 'Export',
+		'export_opml' => 'Export list of feeds (OPML)',
+		'export_starred' => 'Export your favourites',
+		'feed_list' => 'List of %s articles',
+		'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
+		'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
+		'import' => 'Import',
+		'starred_list' => 'List of favourite articles',
+		'title' => 'Import / export',
+	),
+	'menu' => array(
+		'bookmark' => 'Subscribe (FreshRSS bookmark)',
+		'import_export' => 'Import / export',
+		'subscription_management' => 'Subscriptions management',
+	),
+	'title' => array(
+		'_' => 'Subscriptions management',
+		'feed_management' => 'RSS feeds management',
+	),
+);

sources/app/i18n/fr.php

@@ -1,455 +0,0 @@
-<?php
-
-return array (
-	// LAYOUT
-	'login'				=> 'Connexion',
-	'keep_logged_in'		=> 'Rester connecté <small>(1 mois)</small>',
-	'login_with_persona'		=> 'Connexion avec Persona',
-	'login_persona_problem'		=> 'Problème de connexion à Persona ?',
-	'logout'			=> 'Déconnexion',
-	'search'			=> 'Rechercher des mots ou des #tags',
-	'search_short'			=> 'Rechercher',
-
-	'configuration'			=> 'Configuration',
-	'users'				=> 'Utilisateurs',
-	'categories'			=> 'Catégories',
-	'category'			=> 'Catégorie',
-	'feed'				=> 'Flux',
-	'feeds'				=> 'Flux',
-	'shortcuts'			=> 'Raccourcis',
-	'queries'			=> 'Filtres utilisateurs',
-	'query_search'			=> 'Recherche de "%s"',
-	'query_order_asc'		=> 'Afficher les articles les plus anciens en premier',
-	'query_order_desc'		=> 'Afficher les articles les plus récents en premier',
-	'query_get_category'		=> 'Afficher la catégorie "%s"',
-	'query_get_feed'		=> 'Afficher le flux "%s"',
-	'query_get_all'			=> 'Afficher tous les articles',
-	'query_get_favorite'		=> 'Afficher les articles favoris',
-	'query_state_0'			=> 'Afficher tous les articles',
-	'query_state_1'			=> 'Afficher les articles lus',
-	'query_state_2'			=> 'Afficher les articles non lus',
-	'query_state_3'			=> 'Afficher tous les articles',
-	'query_state_4'			=> 'Afficher les articles favoris',
-	'query_state_5'			=> 'Afficher les articles lus et favoris',
-	'query_state_6'			=> 'Afficher les articles non lus et favoris',
-	'query_state_7'			=> 'Afficher les articles favoris',
-	'query_state_8'			=> 'Afficher les articles non favoris',
-	'query_state_9'			=> 'Afficher les articles lus et non favoris',
-	'query_state_10'		=> 'Afficher les articles non lus et non favoris',
-	'query_state_11'		=> 'Afficher les articles non favoris',
-	'query_state_12'		=> 'Afficher tous les articles',
-	'query_state_13'		=> 'Afficher les articles lus',
-	'query_state_14'		=> 'Afficher les articles non lus',
-	'query_state_15'		=> 'Afficher tous les articles',
-	'query_number'			=> 'Filtre n°%d',
-	'add_query'			=> 'Créer un filtre',
-	'query_created'			=> 'Le filtre "%s" a bien été créé.',
-	'no_query'			=> 'Vous n’avez pas encore créé de filtre.',
-	'query_filter'			=> 'Filtres appliqués :',
-	'no_query_filter'		=> 'Aucun filtre appliqué',
-	'query_deprecated'		=> 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
-	'about'				=> 'À propos',
-	'stats'				=> 'Statistiques',
-	'stats_idle'			=> 'Flux inactifs',
-	'stats_main'			=> 'Statistiques principales',
-	'stats_repartition'		=> 'Répartition des articles',
-	'stats_entry_per_hour'		=> 'Par heure',
-	'stats_entry_per_day_of_week'	=> 'Par jour de la semaine',
-	'stats_entry_per_month'		=> 'Par mois',
-	'stats_percent_of_total'	=> '%% du total',
-
-	'last_week'			=> 'Depuis la semaine dernière',
-	'last_month'			=> 'Depuis le mois dernier',
-	'last_3_month'			=> 'Depuis les trois derniers mois',
-	'last_6_month'			=> 'Depuis les six derniers mois',
-	'last_year'			=> 'Depuis l’année dernière',
-
-	'your_rss_feeds'		=> 'Vos flux RSS',
-	'add_rss_feed'			=> 'Ajouter un flux RSS',
-	'no_rss_feed'			=> 'Aucun flux RSS',
-	'import_export'			=> 'Importer / exporter',
-	'bookmark'			=> 'S’abonner (bookmark FreshRSS)',
-
-	'subscription_management'	=> 'Gestion des abonnements',
-	'main_stream'			=> 'Flux principal',
-	'all_feeds'			=> 'Tous les flux',
-	'favorite_feeds'		=> 'Favoris (%s)',
-	'not_read'			=> '%d non lu',
-	'not_reads'			=> '%d non lus',
-
-	'filter'			=> 'Filtrer',
-	'see_website'			=> 'Voir le site',
-	'administration'		=> 'Gérer',
-	'actualize'			=> 'Actualiser',
-
-	'mark_read'			=> 'Marquer comme lu',
-	'mark_favorite'			=> 'Mettre en favori',
-	'mark_all_read'			=> 'Tout marquer comme lu',
-	'mark_feed_read'		=> 'Marquer le flux comme lu',
-	'mark_cat_read'			=> 'Marquer la catégorie comme lue',
-	'before_one_day'		=> 'Antérieurs à 1 jour',
-	'before_one_week'		=> 'Antérieurs à 1 semaine',
-	'display'			=> 'Affichage',
-	'normal_view'			=> 'Vue normale',
-	'reader_view'			=> 'Vue lecture',
-	'global_view'			=> 'Vue globale',
-	'rss_view'			=> 'Flux RSS',
-	'show_all_articles'		=> 'Afficher tous les articles',
-	'show_not_reads'		=> 'Afficher les non lus',
-	'show_adaptive'			=> 'Adapter l’affichage',
-	'show_read'			=> 'Afficher les lus',
-	'show_favorite'			=> 'Afficher les favoris',
-	'show_not_favorite'		=> 'Afficher tout sauf les favoris',
-	'older_first'			=> 'Plus anciens en premier',
-	'newer_first'			=> 'Plus récents en premier',
-
-	// Pagination
-	'first'				=> 'Début',
-	'previous'			=> 'Précédent',
-	'next'				=> 'Suivant',
-	'last'				=> 'Fin',
-
-	// CONTROLLERS
-	'article_published_on'		=> 'Article publié initialement sur <a href="%s">%s</a>',
-	'article_published_on_author'	=> 'Article publié initialement sur <a href="%s">%s</a> par %s',
-
-	'access_denied'			=> 'Vous n’avez pas le droit d’accéder à cette page !',
-	'page_not_found'		=> 'La page que vous cherchez n’existe pas !',
-	'error_occurred'		=> 'Une erreur est survenue !',
-	'error_occurred_update'		=> 'Rien n’a été modifié !',
-
-	'default_category'		=> 'Sans catégorie',
-	'categories_updated'		=> 'Les catégories ont été mises à jour.',
-	'categories_management'		=> 'Gestion des catégories',
-	'feed_updated'			=> 'Le flux a été mis à jour.',
-	'rss_feed_management'		=> 'Gestion des flux RSS',
-	'configuration_updated'		=> 'La configuration a été mise à jour.',
-	'sharing_management'		=> 'Gestion des options de partage',
-	'bad_opml_file'			=> 'Votre fichier OPML n’est pas valide.',
-	'shortcuts_updated'		=> 'Les raccourcis ont été mis à jour.',
-	'shortcuts_navigation'		=> 'Navigation',
-	'shortcuts_navigation_help'	=> 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
-	'shortcuts_article_action'	=> 'Actions associées à l’article courant',
-	'shortcuts_other_action'	=> 'Autres actions',
-	'feeds_marked_read'		=> 'Les flux ont été marqués comme lus.',
-	'updated'			=> 'Modifications enregistrées.',
-
-	'already_subscribed'		=> 'Vous êtes déjà abonné à <em>%s</em>',
-	'feed_added'			=> 'Le flux <em>%s</em> a bien été ajouté.',
-	'feed_not_added'		=> '<em>%s</em> n’a pas pu être ajouté.',
-	'internal_problem_feed'		=> 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
-	'invalid_url'			=> 'L’url <em>%s</em> est invalide.',
-	'feed_actualized'		=> '<em>%s</em> a été mis à jour.',
-	'n_feeds_actualized'		=> '%d flux ont été mis à jour.',
-	'feeds_actualized'		=> 'Les flux ont été mis à jour.',
-	'no_feed_actualized'		=> 'Aucun flux n’a pu être mis à jour.',
-	'n_entries_deleted'		=> '%d articles ont été supprimés.',
-	'feeds_imported_with_errors'	=> 'Vos flux ont été importés mais des erreurs sont survenues.',
-	'feeds_imported'		=> 'Vos flux ont été importés et vont maintenant être actualisés.',
-	'category_emptied'		=> 'La catégorie a été vidée.',
-	'feed_deleted'			=> 'Le flux a été supprimé.',
-	'feed_validator'		=> 'Vérifier la valididé du flux',
-
-	'optimization_complete'		=> 'Optimisation terminée.',
-
-	'your_rss_feeds'		=> 'Vos flux RSS',
-	'your_favorites'		=> 'Vos favoris',
-	'public'			=> 'Public',
-	'invalid_login'			=> 'L’identifiant est invalide !',
-
-	'file_is_nok'			=> 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
-
-	// VIEWS
-	'save'				=> 'Enregistrer',
-	'delete'			=> 'Supprimer',
-	'cancel'			=> 'Annuler',
-	'submit'			=> 'Valider',
-
-	'back_to_rss_feeds'		=> '← Retour à vos flux RSS',
-	'feeds_moved_category_deleted'	=> 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
-	'category_number'		=> 'Catégorie n°%d',
-	'ask_empty'			=> 'Vider ?',
-	'number_feeds'			=> '%d flux',
-	'can_not_be_deleted'		=> 'Ne peut pas être supprimée.',
-	'add_category'			=> 'Ajouter une catégorie',
-	'new_category'			=> 'Nouvelle catégorie',
-
-	'javascript_for_shortcuts'	=> 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
-	'javascript_should_be_activated'=> 'Le JavaScript doit être activé.',
-	'shift_for_all_read'		=> '+ <code>shift</code> pour marquer tous les articles comme lus',
-	'see_on_website'		=> 'Voir sur le site d’origine',
-	'next_article'			=> 'Passer à l’article suivant',
-	'last_article'			=> 'Passer au dernier article',
-	'previous_article'		=> 'Passer à l’article précédent',
-	'first_article'			=> 'Passer au premier article',
-	'next_page'			=> 'Passer à la page suivante',
-	'previous_page'			=> 'Passer à la page précédente',
-	'collapse_article'		=> 'Refermer',
-	'auto_share'			=> 'Partager',
-	'auto_share_help'		=> 'S’il n’y a qu’un mode de partage, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-	'focus_search'			=> 'Accéder à la recherche',
-	'user_filter'			=> 'Accéder aux filtres utilisateur',
-	'user_filter_help'		=> 'S’il n’y a qu’un filtre utilisateur, celui ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-	'help'				=> 'Afficher la documentation',
-
-	'file_to_import'		=> 'Fichier à importer<br />(OPML, Json ou Zip)',
-	'file_to_import_no_zip'		=> 'Fichier à importer<br />(OPML ou Json)',
-	'import'			=> 'Importer',
-	'file_cannot_be_uploaded'	=> 'Le fichier ne peut pas être téléchargé!',
-	'zip_error'			=> 'Une erreur est survenue durant l’import du fichier Zip.',
-	'no_zip_extension'		=> 'L’extension Zip n’est pas présente sur votre serveur.',
-	'export'			=> 'Exporter',
-	'export_opml'			=> 'Exporter la liste des flux (OPML)',
-	'export_starred'		=> 'Exporter les favoris',
-	'export_no_zip_extension'	=> 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
-	'starred_list'			=> 'Liste des articles favoris',
-	'feed_list'			=> 'Liste des articles de %s',
-	'or'				=> 'ou',
-
-	'informations'			=> 'Informations',
-	'damn'				=> 'Arf !',
-	'ok'				=> 'Ok !',
-	'attention'			=> 'Attention !',
-	'feed_in_error'			=> 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
-	'feed_empty'			=> 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
-	'feed_description'		=> 'Description',
-	'website_url'			=> 'URL du site',
-	'feed_url'			=> 'URL du flux',
-	'articles'			=> 'articles',
-	'number_articles'		=> '%d articles',
-	'by_feed'			=> 'par flux',
-	'by_default'			=> 'Par défaut',
-	'keep_history'			=> 'Nombre minimum d’articles à conserver',
-	'ttl'				=> 'Ne pas automatiquement rafraîchir plus souvent que',
-	'categorize'			=> 'Ranger dans une catégorie',
-	'truncate'			=> 'Supprimer tous les articles',
-	'advanced'			=> 'Avancé',
-	'show_in_all_flux'		=> 'Afficher dans le flux principal',
-	'yes'				=> 'Oui',
-	'no'				=> 'Non',
-	'css_path_on_website'		=> 'Sélecteur CSS des articles sur le site d’origine',
-	'retrieve_truncated_feeds'	=> 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
-	'http_authentication'		=> 'Authentification HTTP',
-	'http_username'			=> 'Identifiant HTTP',
-	'http_password'			=> 'Mot de passe HTTP',
-	'blank_to_disable'		=> 'Laissez vide pour désactiver',
-	'share_name'			=> 'Nom du partage à afficher',
-	'share_url'			=> 'URL du partage à utiliser',
-	'not_yet_implemented'		=> 'Pas encore implémenté',
-	'access_protected_feeds'	=> 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
-	'no_selected_feed'		=> 'Aucun flux sélectionné.',
-	'think_to_add'			=> 'Vous pouvez ajouter des flux.',
-
-	'current_user'			=> 'Utilisateur actuel',
-	'password_form'			=> 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
-	'password_api'			=> 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
-	'default_user'			=> 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
-	'persona_connection_email'	=> 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-	'allow_anonymous'		=> 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
-	'allow_anonymous_refresh'	=> 'Autoriser le rafraîchissement anonyme des flux',
-	'unsafe_autologin'		=> 'Autoriser les connexions automatiques non-sûres au format : ',
-	'api_enabled'			=> 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-	'auth_token'			=> 'Jeton d’identification',
-	'explain_token'			=> 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&amp;token=%s</kbd>',
-	'login_configuration'		=> 'Identification',
-	'is_admin'			=> 'est administrateur',
-	'auth_type'			=> 'Méthode d’authentification',
-	'auth_none'			=> 'Aucune (dangereux)',
-	'auth_form'			=> 'Formulaire (traditionnel, requiert JavaScript)',
-	'http_auth'			=> 'HTTP (pour utilisateurs avancés avec HTTPS)',
-	'auth_persona'			=> 'Mozilla Persona (moderne, requiert JavaScript)',
-	'users_list'			=> 'Liste des utilisateurs',
-	'create_user'			=> 'Créer un nouvel utilisateur',
-	'username'			=> 'Nom d’utilisateur',
-	'username_admin'		=> 'Nom d’utilisateur administrateur',
-	'password'			=> 'Mot de passe',
-	'create'			=> 'Créer',
-	'user_created'			=> 'L’utilisateur %s a été créé.',
-	'user_deleted'			=> 'L’utilisateur %s a été supprimé.',
-
-	'language'			=> 'Langue',
-	'month'				=> 'mois',
-	'archiving_configuration'	=> 'Archivage',
-	'delete_articles_every'		=> 'Supprimer les articles après',
-	'purge_now'			=> 'Purger maintenant',
-	'purge_completed'		=> 'Purge effectuée (%d articles supprimés).',
-	'archiving_configuration_help'	=> 'D’autres options sont disponibles dans la configuration individuelle des flux.',
-	'reading_configuration'		=> 'Lecture',
-	'display_configuration'		=> 'Affichage',
-	'articles_per_page'		=> 'Nombre d’articles par page',
-	'number_divided_when_reader'	=> 'Divisé par 2 dans la vue de lecture.',
-	'default_view'			=> 'Vue par défaut',
-	'articles_to_display'		=> 'Articles à afficher',
-	'sort_order'			=> 'Ordre de tri',
-	'auto_load_more'		=> 'Charger les articles suivants en bas de page',
-	'display_articles_unfolded'	=> 'Afficher les articles dépliés par défaut',
-	'display_categories_unfolded'	=> 'Afficher les catégories pliées par défaut',
-	'hide_read_feeds'		=> 'Cacher les catégories &amp; flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
-	'after_onread'			=> 'Après “marquer tout comme lu”,',
-	'jump_next'			=> 'sauter au prochain voisin non lu (flux ou catégorie)',
-	'article_icons'			=> 'Icônes d’article',
-	'top_line'			=> 'Ligne du haut',
-	'bottom_line'			=> 'Ligne du bas',
-	'html5_notif_timeout'		=> 'Temps d’affichage de la notification HTML5',
-	'seconds_(0_means_no_timeout)'	=> 'secondes (0 signifie aucun timeout ) ',
-	'img_with_lazyload'		=> 'Utiliser le mode “chargement différé” pour les images',
-	'sticky_post'			=> 'Aligner l’article en haut quand il est ouvert',
-	'reading_confirm'		=> 'Afficher une confirmation lors des actions “marquer tout comme lu”',
-	'auto_read_when'		=> 'Marquer un article comme lu…',
-	'article_viewed'		=> 'lorsque l’article est affiché',
-	'article_open_on_website'	=> 'lorsque l’article est ouvert sur le site d’origine',
-	'scroll'			=> 'au défilement de la page',
-	'upon_reception'		=> 'dès la réception du nouvel article',
-	'your_shaarli'			=> 'Votre Shaarli',
-	'your_wallabag'			=> 'Votre wallabag',
-	'your_diaspora_pod'		=> 'Votre pod Diaspora*',
-	'sharing'			=> 'Partage',
-	'share'				=> 'Partager',
-	'by_email'			=> 'Par courriel',
-	'optimize_bdd'			=> 'Optimiser la base de données',
-	'optimize_todo_sometimes'	=> 'À faire de temps en temps pour réduire la taille de la BDD',
-	'theme'				=> 'Thème',
-	'content_width'			=> 'Largeur du contenu',
-	'width_thin'			=> 'Fine',
-	'width_medium'			=> 'Moyenne',
-	'width_large'			=> 'Large',
-	'width_no_limit'		=> 'Pas de limite',
-	'more_information'		=> 'Plus d’informations',
-	'activate_sharing'		=> 'Activer le partage',
-	'shaarli'			=> 'Shaarli',
-	'blogotext'			=> 'Blogotext',
-	'wallabag'			=> 'wallabag',
-	'diaspora'			=> 'Diaspora*',
-	'twitter'			=> 'Twitter',
-	'g+'				=> 'Google+',
-	'facebook'			=> 'Facebook',
-	'email'				=> 'Courriel',
-	'print'				=> 'Imprimer',
-
-	'article'			=> 'Article',
-	'title'				=> 'Titre',
-	'author'			=> 'Auteur',
-	'publication_date'		=> 'Date de publication',
-	'by'				=> 'par',
-
-	'load_more'			=> 'Charger plus d’articles',
-	'nothing_to_load'		=> 'Fin des articles',
-
-	'rss_feeds_of'			=> 'Flux RSS de %s',
-
-	'refresh'			=> 'Actualisation',
-	'no_feed_to_refresh'		=> 'Il n’y a aucun flux à actualiser…',
-
-	'today'				=> 'Aujourd’hui',
-	'yesterday'			=> 'Hier',
-	'before_yesterday'		=> 'À partir d’avant-hier',
-	'new_article'			=> 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
-	'by_author'			=> 'Par <em>%s</em>',
-	'related_tags'			=> 'Tags associés',
-	'no_feed_to_display'		=> 'Il n’y a aucun article à afficher.',
-
-	'about_freshrss'		=> 'À propos de FreshRSS',
-	'project_website'		=> 'Site du projet',
-	'lead_developer'		=> 'Développeur principal',
-	'website'			=> 'Site Internet',
-	'bugs_reports'			=> 'Rapports de bugs',
-	'github_or_email'		=> '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
-	'license'			=> 'Licence',
-	'agpl3'				=> '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-	'freshrss_description'		=> 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
-	'credits'			=> 'Crédits',
-	'credits_content'		=> 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
-	'version'			=> 'Version',
-
-	'logs'				=> 'Logs',
-	'logs_empty'			=> 'Les logs sont vides.',
-	'clear_logs'			=> 'Effacer les logs',
-
-	'forbidden_access'		=> 'L’accès vous est interdit !',
-	'login_required'		=> 'Accès protégé par mot de passe :',
-
-	'confirm_action'		=> 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
-	'confirm_action_feed_cat'	=> 'Êtes-vous sûr(e) de vouloir continuer ? Vous pourriez perdre les favoris et les filtres associés. Cette action ne peut être annulée !',
-	'notif_title_new_articles'	=> 'FreshRSS : nouveaux articles !',
-	'notif_body_new_articles'	=> 'Il y a \d nouveaux articles à lire sur FreshRSS.',
-
-	// DATE
-	'january'			=> 'janvier',
-	'february'			=> 'février',
-	'march'				=> 'mars',
-	'april'				=> 'avril',
-	'may'				=> 'mai',
-	'june'				=> 'juin',
-	'july'				=> 'juillet',
-	'august'			=> 'août',
-	'september'			=> 'septembre',
-	'october'			=> 'octobre',
-	'november'			=> 'novembre',
-	'december'			=> 'décembre',
-	'jan'				=> 'jan.',
-	'feb'				=> 'fév.',
-	'mar'				=> 'mar.',
-	'apr'				=> 'avr.',
-	'may'				=> 'mai.',
-	'jun'				=> 'juin',
-	'jul'				=> 'jui.',
-	'aug'				=> 'août',
-	'sep'				=> 'sep.',
-	'oct'				=> 'oct.',
-	'nov'				=> 'nov.',
-	'dec'				=> 'déc.',
-	'sun'				=> 'dim.',
-	'mon'				=> 'lun.',
-	'tue'				=> 'mar.',
-	'wed'				=> 'mer.',
-	'thu'				=> 'jeu.',
-	'fri'				=> 'ven.',
-	'sat'				=> 'sam.',
-	// format spécial pour la fonction date()
-	'Jan'				=> '\j\a\n\v\i\e\r',
-	'Feb'				=> '\f\é\v\r\i\e\r',
-	'Mar'				=> '\m\a\r\s',
-	'Apr'				=> '\a\v\r\i\l',
-	'May'				=> '\m\a\i',
-	'Jun'				=> '\j\u\i\n',
-	'Jul'				=> '\j\u\i\l\l\e\t',
-	'Aug'				=> '\a\o\û\t',
-	'Sep'				=> '\s\e\p\t\e\m\b\r\e',
-	'Oct'				=> '\o\c\t\o\b\r\e',
-	'Nov'				=> '\n\o\v\e\m\b\r\e',
-	'Dec'				=> '\d\é\c\e\m\b\r\e',
-	// format pour la fonction date(), %s permet d'indiquer le mois en toutes lettres
-	'format_date'			=> 'j %s Y',
-	'format_date_hour'		=> 'j %s Y \à H\:i',
-	
-	'status_favorites'		=> 'favoris',
-	'status_read'			=> 'lus',
-	'status_unread'			=> 'non lus',
-	'status_total'			=> 'total',
-	
-	'stats_entry_repartition'	=> 'Répartition des articles',
-	'stats_entry_per_day'		=> 'Nombre d’articles par jour (30 derniers jours)',
-	'stats_feed_per_category'	=> 'Flux par catégorie',
-	'stats_entry_per_category'	=> 'Articles par catégorie',
-	'stats_top_feed'		=> 'Les dix plus gros flux',
-	'stats_entry_count'		=> 'Nombre d’articles',
-	'stats_no_idle'			=> 'Il n’y a aucun flux inactif !',
-
-	'update'			=> 'Mise à jour',
-	'update_system'			=> 'Système de mise à jour',
-	'update_check'			=> 'Vérifier les mises à jour',
-	'update_last'			=> 'Dernière vérification : %s',
-	'update_can_apply'		=> 'Une mise à jour est disponible.',
-	'update_apply'			=> 'Appliquer la mise à jour',
-	'update_server_not_found'	=> 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
-	'no_update'			=> 'Aucune mise à jour à appliquer',
-	'update_problem'		=> 'La mise à jour a rencontré un problème : %s',
-	'update_finished'		=> 'La mise à jour est terminée !',
-
-	'auth_reset'			=> 'Réinitialisation de l’authentification',
-	'auth_will_reset'		=> 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
-	'auth_not_persona'		=> 'Seul le système d’authentification Persona peut être réinitialisé.',
-	'auth_no_password_set'		=> 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
-	'auth_form_set'			=> 'Le formulaire est désormais votre système d’authentification.',
-	'auth_form_not_set'		=> 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
-);

sources/app/i18n/fr/admin.php

@@ -0,0 +1,170 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
+		'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
+		'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
+		'form' => 'Formulaire (traditionnel, requiert JavaScript)',
+		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
+		'none' => 'Aucune (dangereux)',
+		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
+		'title' => 'Authentification',
+		'title_reset' => 'Réinitialisation de l’authentification',
+		'token' => 'Jeton d’identification',
+		'token_help' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier :',
+		'type' => 'Méthode d’authentification',
+		'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
+	),
+	'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.',
+		),
+		'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.',
+		),
+		'title' => 'Vérification de l’installation',
+		'tokens' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/tokens</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des tokens sont bons.',
+		),
+		'users' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/users</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des utilisateurs sont bons.',
+		),
+		'zip' => array(
+			'nok' => 'Vous ne disposez pas de l\'extension ZIP (paquet php5-zip).',
+			'ok' => 'Vous disposez de l\'extension ZIP.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Désactivée',
+		'empty_list' => 'Il n’y a aucune extension installée.',
+		'enabled' => 'Activée',
+		'no_configure_view' => 'Cette extension ne peut pas être configurée.',
+		'system' => array(
+			'_' => 'Extensions système',
+			'no_rights' => 'Extension système (vous n’avez aucun droit dessus)',
+		),
+		'title' => 'Extensions',
+		'user' => 'Extensions utilisateur',
+	),
+	'stats' => array(
+		'_' => 'Statistiques',
+		'all_feeds' => 'Tous les flux',
+		'category' => 'Catégorie',
+		'entry_count' => 'Nombre d’articles',
+		'entry_per_category' => 'Articles par catégorie',
+		'entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
+		'entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
+		'entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
+		'entry_per_month' => 'Par mois (moyenne : %.2f messages)',
+		'entry_repartition' => 'Répartition des articles',
+		'feed' => 'Flux',
+		'feed_per_category' => 'Flux par catégorie',
+		'idle' => 'Flux inactifs',
+		'main' => 'Statistiques principales',
+		'main_stream' => 'Flux principal',
+		'menu' => array(
+			'idle' => 'Flux inactifs',
+			'main' => 'Statistiques principales',
+			'repartition' => 'Répartition des articles',
+		),
+		'no_idle' => 'Il n’y a aucun flux inactif !',
+		'number_entries' => '%d articles',
+		'percent_of_total' => '%% du total',
+		'repartition' => 'Répartition des articles',
+		'status_favorites' => 'favoris',
+		'status_read' => 'lus',
+		'status_total' => 'total',
+		'status_unread' => 'non lus',
+		'title' => 'Statistiques',
+		'top_feed' => 'Les dix plus gros flux',
+	),
+	'update' => array(
+		'_' => 'Système de mise à jour',
+		'apply' => 'Appliquer la mise à jour',
+		'check' => 'Vérifier les mises à jour',
+		'current_version' => 'Votre version actuelle de FreshRSS est la %s.',
+		'last' => 'Dernière vérification : %s',
+		'none' => 'Aucune mise à jour à appliquer',
+		'title' => 'Système de mise à jour',
+	),
+	'user' => array(
+		'articles_and_size' => '%s articles (%s)',
+		'create' => 'Créer un nouvel utilisateur',
+		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'language' => 'Langue',
+		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => '7 caractères minimum',
+		'title' => 'Gestion des utilisateurs',
+		'user_list' => 'Liste des utilisateurs',
+		'username' => 'Nom d’utilisateur',
+		'users' => 'Utilisateurs',
+	),
+);

sources/app/i18n/fr/conf.php

@@ -0,0 +1,169 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archivage',
+		'advanced' => 'Avancé',
+		'delete_after' => 'Supprimer les articles après',
+		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
+		'keep_history_by_feed' => 'Nombre minimum d’articles à conserver par flux',
+		'optimize' => 'Optimiser la base de données',
+		'optimize_help' => 'À faire de temps en temps pour réduire la taille de la BDD',
+		'purge_now' => 'Purger maintenant',
+		'title' => 'Archivage',
+		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
+	),
+	'display' => array(
+		'_' => 'Affichage',
+		'icon' => array(
+			'bottom_line' => 'Ligne du bas',
+			'entry' => 'Icônes d’article',
+			'publication_date' => 'Date de publication',
+			'related_tags' => 'Tags associés',
+			'sharing' => 'Partage',
+			'top_line' => 'Ligne du haut',
+		),
+		'language' => 'Langue',
+		'notif_html5' => array(
+			'seconds' => 'secondes (0 signifie aucun timeout)',
+			'timeout' => 'Temps d’affichage de la notification HTML5',
+		),
+		'theme' => 'Thème',
+		'title' => 'Affichage',
+		'width' => array(
+			'content' => 'Largeur du contenu',
+			'large' => 'Large',
+			'medium' => 'Moyenne',
+			'no_limit' => 'Pas de limite',
+			'thin' => 'Fine',
+		),
+	),
+	'query' => array(
+		'_' => 'Filtres utilisateurs',
+		'deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
+		'filter' => 'Filtres appliqués :',
+		'get_all' => 'Afficher tous les articles',
+		'get_category' => 'Afficher la catégorie "%s"',
+		'get_favorite' => 'Afficher les articles favoris',
+		'get_feed' => 'Afficher le flux "%s"',
+		'no_filter' => 'Aucun filtre appliqué',
+		'none' => 'Vous n’avez pas encore créé de filtre.',
+		'number' => 'Filtre n°%d',
+		'order_asc' => 'Afficher les articles les plus anciens en premier',
+		'order_desc' => 'Afficher les articles les plus récents en premier',
+		'search' => 'Recherche de "%s"',
+		'state_0' => 'Afficher tous les articles',
+		'state_1' => 'Afficher les articles lus',
+		'state_2' => 'Afficher les articles non lus',
+		'state_3' => 'Afficher tous les articles',
+		'state_4' => 'Afficher les articles favoris',
+		'state_5' => 'Afficher les articles lus et favoris',
+		'state_6' => 'Afficher les articles non lus et favoris',
+		'state_7' => 'Afficher les articles favoris',
+		'state_8' => 'Afficher les articles non favoris',
+		'state_9' => 'Afficher les articles lus et non favoris',
+		'state_10' => 'Afficher les articles non lus et non favoris',
+		'state_11' => 'Afficher les articles non favoris',
+		'state_12' => 'Afficher tous les articles',
+		'state_13' => 'Afficher les articles lus',
+		'state_14' => 'Afficher les articles non lus',
+		'state_15' => 'Afficher tous les articles',
+		'title' => 'Filtres utilisateurs',
+	),
+	'profile' => array(
+		'_' => 'Gestion du profil',
+		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
+		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => '7 caractères minimum',
+		'title' => 'Profil',
+	),
+	'reading' => array(
+		'_' => 'Lecture',
+		'after_onread' => 'Après “marquer tout comme lu”,',
+		'articles_per_page' => 'Nombre d’articles par page',
+		'auto_load_more' => 'Charger les articles suivants en bas de page',
+		'auto_remove_article' => 'Cacher les articles après lecture',
+		'confirm_enabled' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
+		'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
+		'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
+		'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
+		'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
+		'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
+		'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
+		'read' => array(
+			'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
+			'article_viewed' => 'lorsque l’article est affiché',
+			'scroll' => 'au défilement de la page',
+			'upon_reception' => 'dès la réception du nouvel article',
+			'when' => 'Marquer un article comme lu…',
+		),
+		'show' => array(
+			'_' => 'Articles à afficher',
+			'adaptive' => 'Adapter l’affichage',
+			'all_articles' => 'Afficher tous les articles',
+			'unread' => 'Afficher les non lus',
+		),
+		'sort' => array(
+			'_' => 'Ordre de tri',
+			'newer_first' => 'Plus récents en premier',
+			'older_first' => 'Plus anciens en premier',
+		),
+		'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
+		'title' => 'Lecture',
+		'view' => array(
+			'default' => 'Vue par défaut',
+			'global' => 'Vue globale',
+			'normal' => 'Vue normale',
+			'reader' => 'Vue lecture',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Partage',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Courriel',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Plus d’informations',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Nom du partage à afficher',
+		'share_url' => 'URL du partage à utiliser',
+		'title' => 'Partage',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Raccourcis',
+		'article_action' => 'Actions associées à l’article courant',
+		'auto_share' => 'Partager',
+		'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+		'close_dropdown' => 'Fermer les menus',
+		'collapse_article' => 'Refermer',
+		'first_article' => 'Passer au premier article',
+		'focus_search' => 'Accéder à la recherche',
+		'help' => 'Afficher la documentation',
+		'javascript' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
+		'last_article' => 'Passer au dernier article',
+		'load_more' => 'Charger plus d’articles',
+		'mark_read' => 'Marquer comme lu',
+		'mark_favorite' => 'Mettre en favori',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
+		'next_article' => 'Passer à l’article suivant',
+		'other_action' => 'Autres actions',
+		'previous_article' => 'Passer à l’article précédent',
+		'see_on_website' => 'Voir sur le site d’origine',
+		'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
+		'title' => 'Raccourcis',
+		'user_filter' => 'Accéder aux filtres utilisateur',
+		'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s articles (%s)',
+		'current' => 'Utilisateur actuel',
+		'is_admin' => 'est administrateur',
+		'users' => 'Utilisateurs',
+	),
+);

sources/app/i18n/fr/feedback.php

@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimisation terminée.',
+	),
+	'access' => array(
+		'denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
+		'not_found' => 'La page que vous cherchez n’existe pas !',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
+			'set' => 'Le formulaire est désormais votre système d’authentification.',
+		),
+		'login' => array(
+			'invalid' => 'L’identifiant est invalide',
+			'success' => 'Vous êtes désormais connecté',
+		),
+		'logout' => array(
+			'success' => 'Vous avez été déconnecté',
+		),
+		'no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
+		'not_persona' => 'Seul le système d’authentification Persona peut être réinitialisé.',
+	),
+	'conf' => array(
+		'error' => 'Une erreur est survenue durant la sauvegarde de la configuration',
+		'query_created' => 'Le filtre "%s" a bien été créé.',
+		'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
+		'updated' => 'La configuration a été mise à jour',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s est déjà 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',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
+		'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
+		'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.',
+		'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !',
+		'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
+		'zip_error' => 'Une erreur est survenue durant l’import du fichier Zip.',
+	),
+	'sub' => array(
+		'actualize' => 'Actualiser',
+		'category' => array(
+			'created' => 'La catégorie %s a été créée.',
+			'deleted' => 'La catégorie a été supprimée.',
+			'emptied' => 'La catégorie a été vidée.',
+			'error' => 'La catégorie n’a pas pu être modifiée',
+			'name_exists' => 'Une catégorie possède déjà ce nom.',
+			'no_id' => 'Vous devez préciser l’id de la catégorie.',
+			'no_name' => 'Vous devez préciser un nom pour la catégorie.',
+			'not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
+			'not_exist' => 'Cette catégorie n’existe pas !',
+			'over_max' => 'Vous avez atteint votre limite de catégories (%d)',
+			'updated' => 'La catégorie a été mise à jour.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> a été mis à jour.',
+			'actualizeds' => 'Les flux ont été mis à jour.',
+			'added' => 'Le flux <em>%s</em> a bien été ajouté.',
+			'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
+			'deleted' => 'Le flux a été supprimé.',
+			'error' => 'Une erreur est survenue',
+			'internal_problem' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+			'invalid_url' => 'L’url <em>%s</em> est invalide.',
+			'marked_read' => 'Les flux ont été marqués comme lus.',
+			'n_actualized' => '%d flux ont été mis à jour.',
+			'n_entries_deleted' => '%d articles ont été supprimés.',
+			'no_refresh' => 'Il n’y a aucun flux à actualiser…',
+			'not_added' => '<em>%s</em> n’a pas pu être ajouté.',
+			'over_max' => 'Vous avez atteint votre limite de flux (%d)',
+			'updated' => 'Le flux a été mis à jour',
+		),
+		'purge_completed' => 'Purge effectuée (%d articles supprimés).',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS va maintenant être mis à jour vers la <strong>version %s</strong>.',
+		'error' => 'La mise à jour a rencontré un problème : %s',
+		'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
+		'finished' => 'La mise à jour est terminée !',
+		'none' => 'Aucune mise à jour à appliquer',
+		'server_not_found' => 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'L’utilisateur %s a été créé.',
+			'error' => 'L’utilisateur %s ne peut pas être créé.',
+		),
+		'deleted' => array(
+			'_' => 'L’utilisateur %s a été supprimé.',
+			'error' => 'L’utilisateur %s ne peut pas être supprimé.',
+		),
+	),
+	'profile' => array(
+		'error' => 'Votre profil n’a pas pu être mis à jour',
+		'updated' => 'Votre profil a été mis à jour',
+	),
+);

sources/app/i18n/fr/gen.php

@@ -0,0 +1,163 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Actualiser',
+		'back_to_rss_feeds' => '← Retour à vos flux RSS',
+		'cancel' => 'Annuler',
+		'create' => 'Créer',
+		'disable' => 'Désactiver',
+		'empty' => 'Vider',
+		'enable' => 'Activer',
+		'export' => 'Exporter',
+		'filter' => 'Filtrer',
+		'import' => 'Importer',
+		'manage' => 'Gérer',
+		'mark_read' => 'Marquer comme lu',
+		'mark_favorite' => 'Mettre en favori',
+		'remove' => 'Supprimer',
+		'see_website' => 'Voir le site',
+		'submit' => 'Valider',
+		'truncate' => 'Supprimer tous les articles',
+	),
+	'auth' => array(
+		'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
+		'login' => 'Connexion',
+		'login_persona' => 'Connexion avec Persona',
+		'login_persona_problem' => 'Problème de connexion à Persona ?',
+		'logout' => 'Déconnexion',
+		'password' => 'Mot de passe',
+		'reset' => 'Réinitialisation de l’authentification',
+		'username' => 'Nom d’utilisateur',
+		'username_admin' => 'Nom d’utilisateur administrateur',
+		'will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
+	),
+	'date' => array(
+		'Apr' => '\\a\\v\\r\\i\\l',
+		'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',
+		'apr' => 'avr.',
+		'april' => 'avril',
+		'aug' => 'août',
+		'august' => 'août',
+		'before_yesterday' => 'À partir d’avant-hier',
+		'dec' => 'déc.',
+		'december' => 'décembre',
+		'feb' => 'fév.',
+		'february' => 'février',
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\à H\\:i',
+		'fri' => 'ven.',
+		'jan' => 'jan.',
+		'january' => 'janvier',
+		'jul' => 'jui.',
+		'july' => 'juillet',
+		'jun' => 'juin',
+		'june' => 'juin',
+		'last_3_month' => 'Depuis les trois derniers mois',
+		'last_6_month' => 'Depuis les six derniers mois',
+		'last_month' => 'Depuis le mois dernier',
+		'last_week' => 'Depuis la semaine dernière',
+		'last_year' => 'Depuis l’année dernière',
+		'mar' => 'mar.',
+		'march' => 'mars',
+		'may' => 'mai.',
+		'mon' => 'lun.',
+		'month' => 'mois',
+		'nov' => 'nov.',
+		'november' => 'novembre',
+		'oct' => 'oct.',
+		'october' => 'octobre',
+		'sat' => 'sam.',
+		'sep' => 'sep.',
+		'september' => 'septembre',
+		'sun' => 'dim.',
+		'thu' => 'jeu.',
+		'today' => 'Aujourd’hui',
+		'tue' => 'mar.',
+		'wed' => 'mer.',
+		'yesterday' => 'Hier',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'À propos de FreshRSS',
+	),
+	'js' => array(
+		'category_empty' => 'Catégorie vide',
+		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
+		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
+		'feedback' => array(
+			'body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+			'request_failed' => 'Une requête a échoué, cela peut être dû à des problèmes de connexion à Internet.',
+			'title_new_articles' => 'FreshRSS : nouveaux articles !',
+		),
+		'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
+		'should_be_activated' => 'Le JavaScript doit être activé.',
+	),
+	'lang' => array(
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+	),
+	'menu' => array(
+		'about' => 'À propos',
+		'admin' => 'Administration',
+		'archiving' => 'Archivage',
+		'authentication' => 'Authentification',
+		'check_install' => 'Vérification de l’installation',
+		'configuration' => 'Configuration',
+		'display' => 'Affichage',
+		'extensions' => 'Extensions',
+		'logs' => 'Logs',
+		'queries' => 'Filtres utilisateurs',
+		'reading' => 'Lecture',
+		'search' => 'Rechercher des mots ou des #tags',
+		'sharing' => 'Partage',
+		'shortcuts' => 'Raccourcis',
+		'stats' => 'Statistiques',
+		'update' => 'Mise à jour',
+		'user_management' => 'Gestion des utilisateurs',
+		'user_profile' => 'Profil',
+	),
+	'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',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Courriel',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'print' => 'Imprimer',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'short' => array(
+		'attention' => 'Attention !',
+		'blank_to_disable' => 'Laissez vide pour désactiver',
+		'by_author' => 'Par <em>%s</em>',
+		'by_default' => 'Par défaut',
+		'damn' => 'Arf !',
+		'default_category' => 'Sans catégorie',
+		'no' => 'Non',
+		'ok' => 'Ok !',
+		'or' => 'ou',
+		'yes' => 'Oui',
+	),
+);

sources/app/i18n/fr/index.php

@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'À propos',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Rapports de bugs',
+		'credits' => 'Crédits',
+		'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
+		'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sur Github</a>',
+		'license' => 'Licence',
+		'project_website' => 'Site du projet',
+		'title' => 'À propos',
+		'version' => 'Version',
+		'website' => 'Site Internet',
+	),
+	'feed' => array(
+		'add' => 'Vous pouvez ajouter des flux.',
+		'empty' => 'Il n’y a aucun article à afficher.',
+		'rss_of' => 'Flux RSS de %s',
+		'title' => 'Vos flux RSS',
+		'title_global' => 'Vue globale',
+		'title_fav' => 'Vos favoris',
+	),
+	'log' => array(
+		'_' => 'Logs',
+		'clear' => 'Effacer les logs',
+		'empty' => 'Les logs sont vides.',
+		'title' => 'Logs',
+	),
+	'menu' => array(
+		'about' => 'À propos de FreshRSS',
+		'add_query' => 'Créer un filtre',
+		'before_one_day' => 'Antérieurs à 1 jour',
+		'before_one_week' => 'Antérieurs à 1 semaine',
+		'favorites' => 'Favoris (%s)',
+		'global_view' => 'Vue globale',
+		'main_stream' => 'Flux principal',
+		'mark_all_read' => 'Tout marquer comme lu',
+		'mark_cat_read' => 'Marquer la catégorie comme lue',
+		'mark_feed_read' => 'Marquer le flux comme lu',
+		'newer_first' => 'Plus récents en premier',
+		'non-starred' => 'Afficher tout sauf les favoris',
+		'normal_view' => 'Vue normale',
+		'older_first' => 'Plus anciens en premier',
+		'queries' => 'Filtres utilisateurs',
+		'read' => 'Afficher les lus',
+		'reader_view' => 'Vue lecture',
+		'rss_view' => 'Flux RSS',
+		'search_short' => 'Rechercher',
+		'starred' => 'Afficher les favoris',
+		'stats' => 'Statistiques',
+		'subscription' => 'Gestion des abonnements',
+		'unread' => 'Afficher les non lus',
+	),
+	'share' => 'Partager',
+	'tag' => array(
+		'related' => 'Tags associés',
+	),
+);

sources/app/i18n/fr/install.php

@@ -0,0 +1,107 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Terminer l’installation',
+		'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
+		'next_step' => 'Passer à l’étape suivante',
+	),
+	'auth' => array(
+		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'form' => 'Formulaire (traditionnel, requiert JavaScript)',
+		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
+		'none' => 'Aucune (dangereux)',
+		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => '7 caractères minimum',
+		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
+		'type' => 'Méthode d’authentification',
+	),
+	'bdd' => array(
+		'_' => 'Base de données',
+		'conf' => array(
+			'_' => 'Configuration de la base de données',
+			'ko' => 'Vérifiez les informations d’accès à la base de données.',
+			'ok' => 'La configuration de la base de données a été enregistrée.',
+		),
+		'host' => 'Hôte',
+		'password' => 'Mot de passe',
+		'prefix' => 'Préfixe des tables',
+		'type' => 'Type de base de données',
+		'username' => 'Nom d’utilisateur',
+	),
+	'check' => array(
+		'_' => 'Vérifications',
+		'cache' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de cache sont bons.',
+		),
+		'ctype' => array(
+			'nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype).',
+			'ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Vous ne disposez pas de cURL (paquet php5-curl).',
+			'ok' => 'Vous disposez de cURL.',
+		),
+		'data' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de data sont bons.',
+		),
+		'dom' => array(
+			'nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml).',
+			'ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/favicons</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des favicons sont bons.',
+		),
+		'http_referer' => array(
+			'nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
+			'ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
+		),
+		'minz' => array(
+			'nok' => 'Vous ne disposez pas de la librairie Minz.',
+			'ok' => 'Vous disposez du framework Minz',
+		),
+		'pcre' => array(
+			'nok' => 'Il manque une librairie pour les expressions régulières (php-pcre).',
+			'ok' => 'Vous disposez du nécessaire pour les expressions régulières (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite).',
+			'ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/persona</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire de Mozilla Persona sont bons.',
+		),
+		'php' => array(
+			'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
+			'ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/users</em>. Le serveur HTTP doit être capable d’écrire dedans',
+			'ok' => 'Les droits sur le répertoire des utilisateurs sont bons.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Configuration générale',
+		'ok' => 'La configuration générale a été enregistrée.',
+	),
+	'congratulations' => 'Félicitations !',
+	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
+	'delete_articles_after' => 'Supprimer les articles après',
+	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
+	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
+	'language' => array(
+		'_' => 'Langue',
+		'choose' => 'Choisissez la langue pour FreshRSS',
+		'defined' => 'La langue a bien été définie.',
+	),
+	'not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
+	'ok' => 'L’installation s’est bien passée.',
+	'step' => 'étape %d',
+	'steps' => 'Étapes',
+	'title' => 'Installation · FreshRSS',
+	'this_is_the_end' => 'This is the end',
+);

sources/app/i18n/fr/sub.php

@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Catégorie',
+		'add' => 'Ajouter une catégorie',
+		'empty' => 'Catégorie vide',
+		'new' => 'Nouvelle catégorie',
+	),
+	'feed' => array(
+		'add' => 'Ajouter un flux RSS',
+		'advanced' => 'Avancé',
+		'archiving' => 'Archivage',
+		'auth' => array(
+			'configuration' => 'Identification',
+			'help' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
+			'http' => 'Authentification HTTP',
+			'password' => 'Mot de passe HTTP',
+			'username' => 'Identifiant HTTP',
+		),
+		'css_help' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
+		'css_path' => 'Sélecteur CSS des articles sur le site d’origine',
+		'description' => 'Description',
+		'empty' => 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
+		'error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
+		'in_main_stream' => 'Afficher dans le flux principal',
+		'informations' => 'Informations',
+		'keep_history' => 'Nombre minimum d’articles à conserver',
+		'moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
+		'no_selected' => 'Aucun flux sélectionné.',
+		'number_entries' => '%d articles',
+		'stats' => 'Statistiques',
+		'think_to_add' => 'Vous pouvez ajouter des flux.',
+		'title' => 'Titre',
+		'title_add' => 'Ajouter un flux RSS',
+		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
+		'url' => 'URL du flux',
+		'validator' => 'Vérifier la valididé du flux',
+		'website' => 'URL du site',
+	),
+	'import_export' => array(
+		'export' => 'Exporter',
+		'export_opml' => 'Exporter la liste des flux (OPML)',
+		'export_starred' => 'Exporter les favoris',
+		'feed_list' => 'Liste des articles de %s',
+		'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
+		'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
+		'import' => 'Importer',
+		'starred_list' => 'Liste des articles favoris',
+		'title' => 'Importer / exporter',
+	),
+	'menu' => array(
+		'bookmark' => 'S’abonner (bookmark FreshRSS)',
+		'import_export' => 'Importer / exporter',
+		'subscription_management' => 'Gestion des abonnements',
+	),
+	'title' => array(
+		'_' => 'Gestion des abonnements',
+		'feed_management' => 'Gestion des flux RSS',
+	),
+);

sources/app/i18n/install.en.php

@@ -1,69 +0,0 @@
-<?php
-return array (
-	'freshrss_installation'		=> 'Installation · FreshRSS',
-	'freshrss'			=> 'FreshRSS',
-	'installation_step'		=> 'Installation — step %d · FreshRSS',
-	'steps'				=> 'Steps',
-	'checks'			=> 'Checks',
-	'general_configuration'	=> 'General configuration',
-	'bdd_configuration'		=> 'Database configuration',
-	'bdd_type'		=> 'Type of database',
-	'version_update'		=> 'Update',
-	'this_is_the_end'		=> 'This is the end',
-
-	'ok'				=> 'Ok!',
-	'congratulations'		=> 'Congratulations!',
-	'attention'			=> 'Attention!',
-	'damn'				=> 'Damn!',
-	'oops'				=> 'Oops!',
-	'next_step'			=> 'Go to the next step',
-
-	'language_defined'		=> 'Language has been defined.',
-	'choose_language'		=> 'Choose a language for FreshRSS',
-
-	'javascript_is_better'		=> 'FreshRSS is more pleasant with JavaScript enabled',
-	'php_is_ok'			=> 'Your PHP version is %s, which is compatible with FreshRSS',
-	'php_is_nok'			=> 'Your PHP version is %s but FreshRSS requires at least version %s',
-	'minz_is_ok'			=> 'You have the Minz framework',
-	'minz_is_nok'			=> 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
-	'curl_is_ok'			=> 'You have version %s of cURL',
-	'curl_is_nok'			=> 'You lack cURL (php5-curl package)',
-	'pdo_is_ok'			=> 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite)',
-	'pdo_is_nok'			=> 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite)',
-	'dom_is_ok'			=> 'You have the required library to browse the DOM',
-	'dom_is_nok'			=> 'You lack a required library to browse the DOM (php-xml package)',
-	'pcre_is_ok'			=> 'You have the required library for regular expressions (PCRE)',
-	'pcre_is_nok'			=> 'You lack a required library for regular expressions (php-pcre)',
-	'ctype_is_ok'			=> 'You have the required library for character type checking (ctype)',
-	'ctype_is_nok'			=> 'You lack a required library for character type checking (php-ctype)',
-	'cache_is_ok'			=> 'Permissions on cache directory are good',
-	'log_is_ok'			=> 'Permissions on logs directory are good',
-	'favicons_is_ok'		=> 'Permissions on favicons directory are good',
-	'data_is_ok'			=> 'Permissions on data directory are good',
-	'persona_is_ok'			=> 'Permissions on Mozilla Persona directory are good',
-	'file_is_nok'			=> 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
-	'http_referer_is_ok'		=> 'Your HTTP REFERER is known and corresponds to your server.',
-	'http_referer_is_nok'		=> 'Please check that you are not altering your HTTP REFERER.',
-	'fix_errors_before'		=> 'Fix errors before skip to the next step.',
-
-	'general_conf_is_ok'		=> 'General configuration has been saved.',
-	'random_string'			=> 'Random string',
-	'change_value'			=> 'You should change this value by any other',
-	'base_url'			=> 'Base URL',
-	'do_not_change_if_doubt'	=> 'Don’t change if you doubt about it',
-
-	'bdd_conf_is_ok'		=> 'Database configuration has been saved.',
-	'bdd_conf_is_ko'		=> 'Verify your database information.',
-	'host'				=> 'Host',
-	'bdd'				=> 'Database',
-	'prefix'			=> 'Table prefix',
-
-	'update_start'			=> 'Start update process',
-	'update_long'			=> 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
-	'update_end'			=> 'Update process is completed, now you can go to the final step.',
-
-
-	'installation_is_ok'		=> 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
-	'finish_installation'		=> 'Complete installation',
-	'install_not_deleted'		=> 'Something went wrong; you must delete the file <em>%s</em> manually.',
-);

sources/app/i18n/install.fr.php

@@ -1,68 +0,0 @@
-<?php
-return array (
-	'freshrss_installation'		=> 'Installation · FreshRSS',
-	'freshrss'			=> 'FreshRSS',
-	'installation_step'		=> 'Installation — étape %d · FreshRSS',
-	'steps'				=> 'Étapes',
-	'checks'			=> 'Vérifications',
-	'general_configuration'	=> 'Configuration générale',
-	'bdd_configuration'		=> 'Base de données',
-	'bdd_type'		=> 'Type de base de données',
-	'version_update'		=> 'Mise à jour',
-	'this_is_the_end'		=> 'This is the end',
-
-	'ok'				=> 'Ok !',
-	'congratulations'		=> 'Félicitations !',
-	'attention'			=> 'Attention !',
-	'damn'				=> 'Arf !',
-	'oops'				=> 'Oups !',
-	'next_step'			=> 'Passer à l’étape suivante',
-
-	'language_defined'		=> 'La langue a bien été définie.',
-	'choose_language'		=> 'Choisissez la langue pour FreshRSS',
-
-	'javascript_is_better'		=> 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
-	'php_is_ok'			=> 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
-	'php_is_nok'			=> 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
-	'minz_is_ok'			=> 'Vous disposez du framework Minz',
-	'minz_is_nok'			=> 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
-	'curl_is_ok'			=> 'Vous disposez de cURL dans sa version %s',
-	'curl_is_nok'			=> 'Vous ne disposez pas de cURL (paquet php5-curl)',
-	'pdo_is_ok'			=> 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite)',
-	'pdo_is_nok'			=> 'Vous ne disposez pas de PDO ou d’un des drivers supportés (pdo_mysql, pdo_sqlite)',
-	'dom_is_ok'			=> 'Vous disposez du nécessaire pour parcourir le DOM',
-	'dom_is_nok'			=> 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
-	'pcre_is_ok'			=> 'Vous disposez du nécessaire pour les expressions régulières (PCRE)',
-	'pcre_is_nok'			=> 'Il manque une librairie pour les expressions régulières (php-pcre)',
-	'ctype_is_ok'			=> 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
-	'ctype_is_nok'			=> 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
-	'cache_is_ok'			=> 'Les droits sur le répertoire de cache sont bons',
-	'log_is_ok'			=> 'Les droits sur le répertoire des logs sont bons',
-	'favicons_is_ok'		=> 'Les droits sur le répertoire des favicons sont bons',
-	'data_is_ok'			=> 'Les droits sur le répertoire de data sont bons',
-	'persona_is_ok'			=> 'Les droits sur le répertoire de Mozilla Persona sont bons',
-	'file_is_nok'			=> 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
-	'http_referer_is_ok'		=> 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
-	'http_referer_is_nok'		=> 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
-	'fix_errors_before'		=> 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
-
-	'general_conf_is_ok'		=> 'La configuration générale a été enregistrée.',
-	'random_string'			=> 'Chaîne aléatoire',
-	'change_value'			=> 'Vous devriez changer cette valeur par n’importe quelle autre',
-	'base_url'			=> 'Base de l’URL',
-	'do_not_change_if_doubt'	=> 'Laissez tel quel dans le doute',
-
-	'bdd_conf_is_ok'		=> 'La configuration de la base de données a été enregistrée.',
-	'bdd_conf_is_ko'		=> 'Vérifiez les informations d’accès à la base de données.',
-	'host'				=> 'Hôte',
-	'bdd'				=> 'Base de données',
-	'prefix'			=> 'Préfixe des tables',
-
-	'update_start'			=> 'Lancer la mise à jour',
-	'update_long'			=> 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
-	'update_end'			=> 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
-
-	'installation_is_ok'		=> 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
-	'finish_installation'		=> 'Terminer l’installation',
-	'install_not_deleted'		=> 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
-);

sources/app/install.php

@@ -42,55 +42,24 @@ function param($key, $default = false) {
 
 
 // gestion internationalisation
-$translates = array();
-$actual = 'en';
 function initTranslate() {
-	global $translates;
+	Minz_Translate::init();
-	global $actual;
+	$available_languages = Minz_Translate::availableLanguages();
 
-	$actual = isset($_SESSION['language']) ? $_SESSION['language'] : getBetterLanguage('en');
+	if (!isset($_SESSION['language'])) {
-
+		$_SESSION['language'] = get_best_language();
-	$file = APP_PATH . '/i18n/' . $actual . '.php';
-	if (file_exists($file)) {
-		$translates = array_merge($translates, include($file));
 	}
 
-	$file = APP_PATH . '/i18n/install.' . $actual . '.php';
+	if (!in_array($_SESSION['language'], $available_languages)) {
-	if (file_exists($file)) {
+		$_SESSION['language'] = 'en';
-		$translates = array_merge($translates, include($file));
 	}
+
+	Minz_Translate::reset($_SESSION['language']);
 }
 
-function getBetterLanguage($fallback) {
+function get_best_language() {
-	$available = availableLanguages();
 	$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-	$language = strtolower(substr($accept, 0, 2));
+	return strtolower(substr($accept, 0, 2));
-
-	if (isset($available[$language])) {
-		return $language;
-	} else {
-		return $fallback;
-	}
-}
-
-function availableLanguages() {
-	return array(
-		'en' => 'English',
-		'fr' => 'Français'
-	);
-}
-
-function _t($key) {
-	global $translates;
-	$translate = $key;
-	if (isset($translates[$key])) {
-		$translate = $translates[$key];
-	}
-
-	$args = func_get_args();
-	unset($args[0]);
-
-	return vsprintf($translate, $args);
 }
 
 
@@ -109,7 +78,7 @@ function saveLanguage() {
 
 function saveStep2() {
 	if (!empty($_POST)) {
-		$_SESSION['title'] = substr(trim(param('title', _t('freshrss'))), 0, 25);
+		$_SESSION['title'] = substr(trim(param('title', _t('gen.freshrss'))), 0, 25);
 		$_SESSION['old_entries'] = param('old_entries', 3);
 		$_SESSION['auth_type'] = param('auth_type', 'form');
 		$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16);
@@ -156,12 +125,17 @@ function saveStep2() {
 			'token' => $token,
 		);
 
-		$configPath = DATA_PATH . '/' . $_SESSION['default_user'] . '_user.php';
+		// Create default user files but first, we delete previous data to
-		@unlink($configPath);	//To avoid access-rights problems
+		// avoid access right problems.
-		file_put_contents($configPath, "<?php\n return " . var_export($config_array, true) . ';');
+		$user_dir = join_path(USERS_PATH, $_SESSION['default_user']);
+		$user_config_path = join_path($user_dir, 'config.php');
+
+		recursive_unlink($user_dir);
+		mkdir($user_dir);
+		file_put_contents($user_config_path, "<?php\n return " . var_export($config_array, true) . ';');
 
 		if ($_SESSION['mail_login'] != '') {
-			$personaFile = DATA_PATH . '/persona/' . $_SESSION['mail_login'] . '.txt';
+			$personaFile = join_path(DATA_PATH, 'persona', $_SESSION['mail_login'] . '.txt');
 			@unlink($personaFile);
 			file_put_contents($personaFile, $_SESSION['default_user']);
 		}
@@ -194,19 +168,12 @@ function saveStep3() {
 			$_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] .(empty($_SESSION['default_user']) ? '' :($_SESSION['default_user'] . '_'));
 		}
 
-		$ini_array = array(
+		$config_array = array(
-			'general' => array(
+			'environment' => 'production',
-				'environment' => empty($_SESSION['environment']) ? 'production' : $_SESSION['environment'],
+			'salt' => $_SESSION['salt'],
-				'salt' => $_SESSION['salt'],
+			'title' => $_SESSION['title'],
-				'base_url' => '',
+			'default_user' => $_SESSION['default_user'],
-				'title' => $_SESSION['title'],
+			'auth_type' => $_SESSION['auth_type'],
-				'default_user' => $_SESSION['default_user'],
-				'allow_anonymous' => isset($_SESSION['allow_anonymous']) ? $_SESSION['allow_anonymous'] : false,
-				'allow_anonymous_refresh' => isset($_SESSION['allow_anonymous_refresh']) ? $_SESSION['allow_anonymous_refresh'] : false,
-				'auth_type' => $_SESSION['auth_type'],
-				'api_enabled' => isset($_SESSION['api_enabled']) ? $_SESSION['api_enabled'] : false,
-				'unsafe_autologin_enabled' => isset($_SESSION['unsafe_autologin_enabled']) ? $_SESSION['unsafe_autologin_enabled'] : false,
-			),
 			'db' => array(
 				'type' => $_SESSION['bd_type'],
 				'host' => $_SESSION['bd_host'],
@@ -217,8 +184,8 @@ function saveStep3() {
 			),
 		);
 
-		@unlink(DATA_PATH . '/config.php');	//To avoid access-rights problems
+		@unlink(join_path(DATA_PATH, 'config.php'));	//To avoid access-rights problems
-		file_put_contents(DATA_PATH . '/config.php', "<?php\n return " . var_export($ini_array, true) . ';');
+		file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($config_array, true) . ';');
 
 		$res = checkBD();
 
@@ -241,7 +208,7 @@ function newPdo() {
 		);
 		break;
 	case 'sqlite':
-		$str = 'sqlite:' . DATA_PATH . '/' . $_SESSION['default_user'] . '.sqlite';
+		$str = 'sqlite:' . join_path(USERS_PATH, $_SESSION['default_user'], 'db.sqlite');
 		$driver_options = array(
 			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
 		);
@@ -253,7 +220,7 @@ function newPdo() {
 }
 
 function deleteInstall() {
-	$res = unlink(DATA_PATH . '/do-install.txt');
+	$res = unlink(join_path(DATA_PATH, 'do-install.txt'));
 
 	if (!$res) {
 		return false;
@@ -282,9 +249,9 @@ function checkStep() {
 }
 
 function checkStep0() {
-	$languages = availableLanguages();
+	$languages = Minz_Translate::availableLanguages();
 	$language = isset($_SESSION['language']) &&
-	            isset($languages[$_SESSION['language']]);
+	            in_array($_SESSION['language'], $languages);
 
 	return array(
 		'language' => $language ? 'ok' : 'ko',
@@ -294,7 +261,7 @@ function checkStep0() {
 
 function checkStep1() {
 	$php = version_compare(PHP_VERSION, '5.2.1') >= 0;
-	$minz = file_exists(LIB_PATH . '/Minz');
+	$minz = file_exists(join_path(LIB_PATH, 'Minz'));
 	$curl = extension_loaded('curl');
 	$pdo_mysql = extension_loaded('pdo_mysql');
 	$pdo_sqlite = extension_loaded('pdo_sqlite');
@@ -304,9 +271,9 @@ function checkStep1() {
 	$dom = class_exists('DOMDocument');
 	$data = DATA_PATH && is_writable(DATA_PATH);
 	$cache = CACHE_PATH && is_writable(CACHE_PATH);
-	$log = LOG_PATH && is_writable(LOG_PATH);
+	$users = USERS_PATH && is_writable(USERS_PATH);
-	$favicons = is_writable(DATA_PATH . '/favicons');
+	$favicons = is_writable(join_path(DATA_PATH, 'favicons'));
-	$persona = is_writable(DATA_PATH . '/persona');
+	$persona = is_writable(join_path(DATA_PATH, 'persona'));
 	$http_referer = is_referer_from_same_domain();
 
 	return array(
@@ -321,12 +288,12 @@ function checkStep1() {
 		'dom' => $dom ? 'ok' : 'ko',
 		'data' => $data ? 'ok' : 'ko',
 		'cache' => $cache ? 'ok' : 'ko',
-		'log' => $log ? 'ok' : 'ko',
+		'users' => $users ? 'ok' : 'ko',
 		'favicons' => $favicons ? 'ok' : 'ko',
 		'persona' => $persona ? 'ok' : 'ko',
 		'http_referer' => $http_referer ? 'ok' : 'ko',
 		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom &&
-		         $data && $cache && $log && $favicons && $persona && $http_referer ?
+		         $data && $cache && $users && $favicons && $persona && $http_referer ?
 		         'ok' : 'ko'
 	);
 }
@@ -351,7 +318,7 @@ function checkStep2() {
 	if ($defaultUser === null) {
 		$defaultUser = empty($_SESSION['default_user']) ? '' : $_SESSION['default_user'];
 	}
-	$data = is_writable(DATA_PATH . '/' . $defaultUser . '_user.php');
+	$data = is_writable(join_path(USERS_PATH, $defaultUser, 'config.php'));
 
 	return array(
 		'conf' => $conf ? 'ok' : 'ko',
@@ -363,7 +330,7 @@ function checkStep2() {
 }
 
 function checkStep3() {
-	$conf = is_writable(DATA_PATH . '/config.php');
+	$conf = is_writable(join_path(DATA_PATH, 'config.php'));
 
 	$bd = isset($_SESSION['bd_type']) &&
 	      isset($_SESSION['bd_host']) &&
@@ -406,7 +373,7 @@ function checkBD() {
 			$str = 'mysql:host=' . $_SESSION['bd_host'] . ';dbname=' . $_SESSION['bd_base'];
 			break;
 		case 'sqlite':
-			$str = 'sqlite:' . DATA_PATH . '/' . $_SESSION['default_user'] . '.sqlite';
+			$str = 'sqlite:' . join_path(USERS_PATH, $_SESSION['default_user'], 'db.sqlite');
 			$driver_options = array(
 				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
 			);
@@ -418,7 +385,7 @@ function checkBD() {
 		$c = new PDO($str, $_SESSION['bd_user'], $_SESSION['bd_password'], $driver_options);
 
 		if (defined('SQL_CREATE_TABLES')) {
-			$sql = sprintf(SQL_CREATE_TABLES, $_SESSION['bd_prefix_user'], _t('default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $_SESSION['bd_prefix_user'], _t('gen.short.default_category'));
 			$stm = $c->prepare($sql);
 			$ok = $stm->execute();
 		} else {
@@ -426,7 +393,7 @@ function checkBD() {
 			if (is_array($SQL_CREATE_TABLES)) {
 				$ok = true;
 				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, $_SESSION['bd_prefix_user'], _t('default_category'));
+					$sql = sprintf($instruction, $_SESSION['bd_prefix_user'], _t('gen.short.default_category'));
 					$stm = $c->prepare($sql);
 					$ok &= $stm->execute();
 				}
@@ -438,7 +405,7 @@ function checkBD() {
 	}
 
 	if (!$ok) {
-		@unlink(DATA_PATH . '/config.php');
+		@unlink(join_path(DATA_PATH, 'config.php'));
 	}
 
 	return $ok;
@@ -446,21 +413,23 @@ function checkBD() {
 
 /*** AFFICHAGE ***/
 function printStep0() {
-	global $actual;
+	$actual = Minz_Translate::language();
+	$languages = Minz_Translate::availableLanguages();
 ?>
 	<?php $s0 = checkStep0(); if ($s0['all'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('language_defined'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.language.defined'); ?></p>
 	<?php } ?>
 
 	<form action="index.php?step=0" method="post">
-		<legend><?php echo _t('choose_language'); ?></legend>
+		<legend><?php echo _t('install.language.choose'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
+			<label class="group-name" for="language"><?php echo _t('install.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php $languages = availableLanguages(); ?>
+				<?php foreach ($languages as $lang) { ?>
-				<?php foreach ($languages as $short => $lib) { ?>
+				<option value="<?php echo $lang; ?>"<?php echo $actual == $lang ? ' selected="selected"' : ''; ?>>
-				<option value="<?php echo $short; ?>"<?php echo $actual == $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+					<?php echo _t('gen.lang.' . $lang); ?>
+				</option>
 				<?php } ?>
 				</select>
 			</div>
@@ -468,10 +437,10 @@ function printStep0() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 				<?php if ($s0['all'] == 'ok') { ?>
-				<a class="btn btn-important next-step" href="?step=1"><?php echo _t('next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=1"><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -479,94 +448,95 @@ function printStep0() {
 <?php
 }
 
+// @todo refactor this view with the check_install action
 function printStep1() {
 	$res = checkStep1();
 ?>
-	<noscript><p class="alert alert-warn"><span class="alert-head"><?php echo _t('attention'); ?></span> <?php echo _t('javascript_is_better'); ?></p></noscript>
+	<noscript><p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('install.javascript_is_better'); ?></p></noscript>
 
 	<?php if ($res['php'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('php_is_ok', PHP_VERSION); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.php.ok', PHP_VERSION); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('php_is_nok', PHP_VERSION, '5.2.1'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.php.nok', PHP_VERSION, '5.2.1'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['minz'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('minz_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.minz.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('minz_is_nok', LIB_PATH . '/Minz'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.minz.nok', join_path(LIB_PATH, 'Minz')); ?></p>
 	<?php } ?>
 
 	<?php if ($res['pdo'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('pdo_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.pdo.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('pdo_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.pdo.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['curl'] == 'ok') { ?>
 	<?php $version = curl_version(); ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('curl_is_ok', $version['version']); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.curl.ok', $version['version']); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('curl_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.curl.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['pcre'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('pcre_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.pcre.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('pcre_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.pcre.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['ctype'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('ctype_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.ctype.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('ctype_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.ctype.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['dom'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('dom_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.dom.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('dom_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.dom.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['data'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('data_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.data.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', DATA_PATH); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.data.nok', DATA_PATH); ?></p>
 	<?php } ?>
 
 	<?php if ($res['cache'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('cache_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.cache.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', CACHE_PATH); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.cache.nok', CACHE_PATH); ?></p>
 	<?php } ?>
 
-	<?php if ($res['log'] == 'ok') { ?>
+	<?php if ($res['users'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('log_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.users.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', LOG_PATH); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.users.nok', USERS_PATH); ?></p>
 	<?php } ?>
 
 	<?php if ($res['favicons'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('favicons_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.favicons.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', DATA_PATH . '/favicons'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.favicons.nok', DATA_PATH . '/favicons'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['persona'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('persona_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.persona.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('file_is_nok', DATA_PATH . '/persona'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.persona.nok', DATA_PATH . '/persona'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['http_referer'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('http_referer_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.http_referer.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('http_referer_is_nok'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.http_referer.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['all'] == 'ok') { ?>
-	<a class="btn btn-important next-step" href="?step=2"><?php echo _t('next_step'); ?></a>
+	<a class="btn btn-important next-step" href="?step=2"><?php echo _t('install.action.next_step'); ?></a>
 	<?php } else { ?>
-	<p class="alert alert-error"><?php echo _t('fix_errors_before'); ?></p>
+	<p class="alert alert-error"><?php echo _t('install.action.fix_errors_before'); ?></p>
 	<?php } ?>
 <?php
 }
@@ -574,37 +544,37 @@ function printStep1() {
 function printStep2() {
 ?>
 	<?php $s2 = checkStep2(); if ($s2['all'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('general_conf_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.conf.ok'); ?></p>
 	<?php } elseif (!empty($_POST)) { ?>
-	<p class="alert alert-error"><?php echo _t('fix_errors_before'); ?></p>
+	<p class="alert alert-error"><?php echo _t('install.fix_errors_before'); ?></p>
 	<?php } ?>
 
 	<form action="index.php?step=2" method="post">
-		<legend><?php echo _t('general_configuration'); ?></legend>
+		<legend><?php echo _t('install.conf'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="title"><?php echo _t('title'); ?></label>
+			<label class="group-name" for="title"><?php echo _t('install.title'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="title" name="title" value="<?php echo isset($_SESSION['title']) ? $_SESSION['title'] : _t('freshrss'); ?>" />
+				<input type="text" id="title" name="title" value="<?php echo isset($_SESSION['title']) ? $_SESSION['title'] : _t('gen.freshrss'); ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
+			<label class="group-name" for="old_entries"><?php echo _t('install.delete_articles_after'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" required="required" min="1" max="1200" value="<?php echo isset($_SESSION['old_entries']) ? $_SESSION['old_entries'] : '3'; ?>" /> <?php echo _t('month'); ?>
+				<input type="number" id="old_entries" name="old_entries" required="required" min="1" max="1200" value="<?php echo isset($_SESSION['old_entries']) ? $_SESSION['old_entries'] : '3'; ?>" /> <?php echo _t('gen.date.month'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="default_user"><?php echo _t('default_user'); ?></label>
+			<label class="group-name" for="default_user"><?php echo _t('install.default_user'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="default_user" name="default_user" required="required" size="16" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" value="<?php echo isset($_SESSION['default_user']) ? $_SESSION['default_user'] : ''; ?>" placeholder="<?php echo httpAuthUser() == '' ? 'user1' : httpAuthUser(); ?>" />
+				<input type="text" id="default_user" name="default_user" required="required" size="16" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" value="<?php echo isset($_SESSION['default_user']) ? $_SESSION['default_user'] : ''; ?>" placeholder="<?php echo httpAuthUser() == '' ? 'alice' : httpAuthUser(); ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
+			<label class="group-name" for="auth_type"><?php echo _t('install.auth.type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type" required="required" onchange="auth_type_change(true)">
 					<?php
@@ -613,51 +583,55 @@ function printStep2() {
 						}
 						$auth_type = isset($_SESSION['auth_type']) ? $_SESSION['auth_type'] : '';
 					?>
-					<option value="form"<?php echo $auth_type === 'form' || no_auth($auth_type) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
+					<option value="form"<?php echo $auth_type === 'form' || no_auth($auth_type) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
-					<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
+					<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.persona'); ?></option>
-					<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('install.auth.http'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo $auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
+					<option value="none"<?php echo $auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
+			<label class="group-name" for="passwordPlain"><?php echo _t('install.auth.password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" autocomplete="off" <?php echo $auth_type === 'form' ? ' required="required"' : ''; ?> />
 					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo FreshRSS_Themes::icon('key'); ?></a>
 				</div>
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+				<?php echo _i('help'); ?> <?php echo _t('install.auth.password_format'); ?>
+				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
+			<label class="group-name" for="mail_login"><?php echo _t('install.auth.email_persona'); ?></label>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" value="<?php echo isset($_SESSION['mail_login']) ? $_SESSION['mail_login'] : ''; ?>" placeholder="alice@example.net" <?php echo $auth_type === 'persona' ? ' required="required"' : ''; ?> />
-				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<script>
-			function toggle_password() {
+			function show_password() {
 				var button = this;
 				var passwordField = document.getElementById(button.getAttribute('data-toggle'));
-
 				passwordField.setAttribute('type', 'text');
 				button.className += ' active';
 
-				setTimeout(function() {
+				return false;
-					passwordField.setAttribute('type', 'password');
+			}
-					button.className = button.className.replace(/(?:^|\s)active(?!\S)/g , '');
+			function hide_password() {
-				}, 2000);
+				var button = this;
+				var passwordField = document.getElementById(button.getAttribute('data-toggle'));
+				passwordField.setAttribute('type', 'password');
+				button.className = button.className.replace(/(?:^|\s)active(?!\S)/g , '');
 
 				return false;
 			}
 			toggles = document.getElementsByClassName('toggle-password');
 			for (var i = 0 ; i < toggles.length ; i++) {
-				toggles[i].addEventListener('click', toggle_password);
+				toggles[i].addEventListener('mousedown', show_password);
+				toggles[i].addEventListener('mouseup', hide_password);
 			}
 
 			function auth_type_change(focus) {
@@ -687,10 +661,10 @@ function printStep2() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 				<?php if ($s2['all'] == 'ok') { ?>
-				<a class="btn btn-important next-step" href="?step=3"><?php echo _t('next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=3"><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -701,15 +675,15 @@ function printStep2() {
 function printStep3() {
 ?>
 	<?php $s3 = checkStep3(); if ($s3['all'] == 'ok') { ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('ok'); ?></span> <?php echo _t('bdd_conf_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.bdd.conf.ok'); ?></p>
 	<?php } elseif ($s3['conn'] == 'ko') { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('bdd_conf_is_ko'),(empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.bdd.conf.ko'),(empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']); ?></p>
 	<?php } ?>
 
 	<form action="index.php?step=3" method="post">
-		<legend><?php echo _t('bdd_configuration'); ?></legend>
+		<legend><?php echo _t('install.bdd.conf'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="type"><?php echo _t('bdd_type'); ?></label>
+			<label class="group-name" for="type"><?php echo _t('install.bdd.type'); ?></label>
 			<div class="group-controls">
 				<select name="type" id="type" onchange="mySqlShowHide()">
 				<?php if (extension_loaded('pdo_mysql')) {?>
@@ -730,35 +704,35 @@ function printStep3() {
 
 		<div id="mysql">
 		<div class="form-group">
-			<label class="group-name" for="host"><?php echo _t('host'); ?></label>
+			<label class="group-name" for="host"><?php echo _t('install.bdd.host'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="host" name="host" pattern="[0-9A-Za-z_.-]{1,64}" value="<?php echo isset($_SESSION['bd_host']) ? $_SESSION['bd_host'] : 'localhost'; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="user"><?php echo _t('username'); ?></label>
+			<label class="group-name" for="user"><?php echo _t('install.bdd.username'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="user" name="user" maxlength="16" pattern="[0-9A-Za-z_.-]{1,16}" value="<?php echo isset($_SESSION['bd_user']) ? $_SESSION['bd_user'] : ''; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="pass"><?php echo _t('password'); ?></label>
+			<label class="group-name" for="pass"><?php echo _t('install.bdd.password'); ?></label>
 			<div class="group-controls">
 				<input type="password" id="pass" name="pass" value="<?php echo isset($_SESSION['bd_password']) ? $_SESSION['bd_password'] : ''; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="base"><?php echo _t('bdd'); ?></label>
+			<label class="group-name" for="base"><?php echo _t('install.bdd'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="base" name="base" maxlength="64" pattern="[0-9A-Za-z_]{1,64}" value="<?php echo isset($_SESSION['bd_base']) ? $_SESSION['bd_base'] : ''; ?>" placeholder="freshrss" />
+				<input type="text" id="base" name="base" maxlength="64" pattern="[0-9A-Za-z_]{1,64}" value="<?php echo isset($_SESSION['bd_base']) ? $_SESSION['bd_base'] : ''; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="prefix"><?php echo _t('prefix'); ?></label>
+			<label class="group-name" for="prefix"><?php echo _t('install.bdd.prefix'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="prefix" name="prefix" maxlength="16" pattern="[0-9A-Za-z_]{1,16}" value="<?php echo isset($_SESSION['bd_prefix']) ? $_SESSION['bd_prefix'] : 'freshrss_'; ?>" />
 			</div>
@@ -773,10 +747,10 @@ function printStep3() {
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 				<?php if ($s3['all'] == 'ok') { ?>
-				<a class="btn btn-important next-step" href="?step=4"><?php echo _t('next_step'); ?></a>
+				<a class="btn btn-important next-step" href="?step=4"><?php echo _t('install.action.next_step'); ?></a>
 				<?php } ?>
 			</div>
 		</div>
@@ -786,21 +760,21 @@ function printStep3() {
 
 function printStep4() {
 ?>
-	<p class="alert alert-success"><span class="alert-head"><?php echo _t('congratulations'); ?></span> <?php echo _t('installation_is_ok'); ?></p>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('install.congratulations'); ?></span> <?php echo _t('install.ok'); ?></p>
-	<a class="btn btn-important next-step" href="?step=5"><?php echo _t('finish_installation'); ?></a>
+	<a class="btn btn-important next-step" href="?step=5"><?php echo _t('install.action.finish'); ?></a>
 <?php
 }
 
 function printStep5() {
 ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('oops'); ?></span> <?php echo _t('install_not_deleted', DATA_PATH . '/do-install.txt'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.not_deleted', DATA_PATH . '/do-install.txt'); ?></p>
 <?php
 }
 
-checkStep();
-
 initTranslate();
 
+checkStep();
+
 switch (STEP) {
 case 0:
 default:
@@ -826,7 +800,7 @@ case 5:
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="initial-scale=1.0">
-		<title><?php echo _t('freshrss_installation'); ?></title>
+		<title><?php echo _t('install.title'); ?></title>
 		<link rel="stylesheet" type="text/css" media="all" href="../themes/base-theme/template.css" />
 		<link rel="stylesheet" type="text/css" media="all" href="../themes/Origine/origine.css" />
 	</head>
@@ -834,19 +808,19 @@ case 5:
 
 <div class="header">
 	<div class="item title">
-		<h1><a href="index.php"><?php echo _t('freshrss'); ?></a></h1>
+		<h1><a href="index.php"><?php echo _t('install.title'); ?></a></h1>
-		<h2><?php echo _t('installation_step', STEP); ?></h2>
+		<h2><?php echo _t('install.step', STEP); ?></h2>
 	</div>
 </div>
 
 <div id="global">
 	<ul class="nav nav-list aside">
-		<li class="nav-header"><?php echo _t('steps'); ?></li>
+		<li class="nav-header"><?php echo _t('install.steps'); ?></li>
-		<li class="item<?php echo STEP == 0 ? ' active' : ''; ?>"><a href="?step=0"><?php echo _t('language'); ?></a></li>
+		<li class="item<?php echo STEP == 0 ? ' active' : ''; ?>"><a href="?step=0"><?php echo _t('install.language'); ?></a></li>
-		<li class="item<?php echo STEP == 1 ? ' active' : ''; ?>"><a href="?step=1"><?php echo _t('checks'); ?></a></li>
+		<li class="item<?php echo STEP == 1 ? ' active' : ''; ?>"><a href="?step=1"><?php echo _t('install.check'); ?></a></li>
-		<li class="item<?php echo STEP == 2 ? ' active' : ''; ?>"><a href="?step=2"><?php echo _t('general_configuration'); ?></a></li>
+		<li class="item<?php echo STEP == 2 ? ' active' : ''; ?>"><a href="?step=2"><?php echo _t('install.conf'); ?></a></li>
-		<li class="item<?php echo STEP == 3 ? ' active' : ''; ?>"><a href="?step=3"><?php echo _t('bdd_configuration'); ?></a></li>
+		<li class="item<?php echo STEP == 3 ? ' active' : ''; ?>"><a href="?step=3"><?php echo _t('install.bdd.conf'); ?></a></li>
-		<li class="item<?php echo STEP == 4 ? ' active' : ''; ?>"><a href="?step=5"><?php echo _t('this_is_the_end'); ?></a></li>
+		<li class="item<?php echo STEP == 4 ? ' active' : ''; ?>"><a href="?step=5"><?php echo _t('install.this_is_the_end'); ?></a></li>
 	</ul>
 
 	<div class="post">

sources/app/layout/aside_configure.phtml

@@ -1,33 +1,46 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo _t('configuration'); ?></li>
+	<li class="nav-header"><?php echo _t('gen.menu.configuration'); ?></li>
 	<li class="item<?php echo Minz_Request::actionName() === 'display' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'reading' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'archiving' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'sharing' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a>
+		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.sharing'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'shortcut' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a>
+		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'queries' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
+		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a>
 	</li>
-	<li class="separator"></li>
+	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
-	<li class="item<?php echo Minz_Request::actionName() === 'users' ? ' active' : ''; ?>">
+	                          Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a>
+		<a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a>
 	</li>
-	<?php
+	<li class="item<?php echo Minz_Request::controllerName() === 'extension' ? ' active' : ''; ?>">
-		$current_user = Minz_Session::param('currentUser', '');
+		<a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a>
-		if (Minz_Configuration::isAdmin($current_user)) {
+	</li>
-	?>
+	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-	<li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>">
+	<li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li>
-		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
+	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
+	                          Minz_Request::actionName() === 'manage' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a>
+	</li>
+	<li class="item<?php echo Minz_Request::controllerName() === 'auth' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a>
+	</li>
+	<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('gen.menu.update'); ?></a>
 	</li>
 	<?php } ?>
 </ul>

sources/app/layout/aside_feed.phtml

@@ -1,75 +1,95 @@
-<ul class="nav nav-list aside aside_feed">
+<?php
-	<li class="nav-header"><?php echo Minz_Translate::t ('your_rss_feeds'); ?></li>
+	$class = '';
+	if (FreshRSS_Context::$user_conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
 
-	<li class="nav-form"><form id="add_rss" method="post" action="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'add')); ?>" autocomplete="off">
+<div class="aside aside_feed<?php echo $class; ?>" id="aside_feed">
-		<div class="stick">
+	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
-			<input type="url" name="url_rss" placeholder="<?php echo Minz_Translate::t ('add_rss_feed'); ?>" />
-			<div class="dropdown">
-				<div id="dropdown-cat" class="dropdown-target"></div>
 
-				<a class="dropdown-toggle btn" href="#dropdown-cat"><?php echo FreshRSS_Themes::icon('down'); ?></a>
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
-				<ul class="dropdown-menu">
+	<div class="stick configure-feeds no-mobile">
-					<li class="dropdown-close"><a href="#close">❌</a></li>
+		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.menu.subscription'); ?></a>
+		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
+	</div>
+	<?php } elseif (FreshRSS_Auth::accessNeedsLogin()) { ?>
+	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
+	<?php } ?>
 
-					<li class="dropdown-header"><?php echo Minz_Translate::t ('category'); ?></li>
+	<form id="mark-read-aside" method="post" style="display: none"></form>
 
-					<li class="input">
+	<ul class="tree">
-						<select name="category" id="category">
+		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
-						<?php foreach ($this->categories as $cat) { ?>
+			<div class="tree-folder-title">
-						<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id () == 1 ? ' selected="selected"' : ''; ?>>
+				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('index.menu.main_stream'); ?></a>
-							<?php echo $cat->name (); ?>
-						</option>
-						<?php } ?>
-						<option value="nc"><?php echo Minz_Translate::t ('new_category'); ?></option>
-						</select>
-					</li>
-
-					<li class="input" style="display:none">
-						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('new_category'); ?>" />
-					</li>
-
-					<li class="separator"></li>
-
-					<li class="dropdown-header"><?php echo Minz_Translate::t ('http_authentication'); ?></li>
-					<li class="input">
-						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('username'); ?>" />
-					</li>
-					<li class="input">
-						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('password'); ?>" />
-					</li>
-				</ul>
 			</div>
-			<button class="btn" type="submit"><?php echo FreshRSS_Themes::icon('add'); ?></button>
+		</li>
-		</div>
-	</form></li>
 
-	<li class="item">
+		<li class="tree-folder category favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
-		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
+			<div class="tree-folder-title">
-			<?php echo Minz_Translate::t('bookmark'); ?>
+				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('index.menu.favorites', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
-		</a>
+			</div>
-	</li>
+		</li>
 
-	<li class="item<?php echo Minz_Request::controllerName () == 'importExport' ? ' active' : ''; ?>">
+		<?php
-		<a href="<?php echo _url ('importExport', 'index'); ?>"><?php echo Minz_Translate::t ('import_export'); ?></a>
+			foreach ($this->categories as $cat) {
-	</li>
+				$feeds = $cat->feeds();
+				if (!empty($feeds)) {
+					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
+					$c_show = $c_active && (!FreshRSS_Context::$user_conf->display_categories ||
+					                        FreshRSS_Context::$current_get['feed']);
+		?>
+		<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+			<div class="tree-folder-title">
+				<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
+				<a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+			</div>
 
-	<li class="item<?php echo Minz_Request::actionName () == 'categorize' ? ' active' : ''; ?>">
+			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Minz_Translate::t ('categories_management'); ?></a>
+				<?php
-	</li>
+					foreach ($feeds as $feed) {
+						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
+				?>
+				<li id="f_<?php echo $feed->id(); ?>" class="item feed<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
+					<div class="dropdown no-mobile">
+						<div class="dropdown-target"></div>
+						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
+						<?php /* feed_config_template */ ?>
+					</div>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+				</li>
+				<?php } ?>
+			</ul>
+		</li>
+		<?php
+				}
+			}
+		?>
+	</ul>
+</div>
 
-	<li class="separator"></li>
+<script id="feed_config_template" type="text/html">
-
+	<ul class="dropdown-menu">
-	<?php if (!empty ($this->feeds)) { ?>
+		<li class="dropdown-close"><a href="#close">❌</a></li>
-	<?php foreach ($this->feeds as $feed) { ?>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_------'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
-	<?php $nbEntries = $feed->nbEntries (); ?>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-	<li class="item<?php echo (isset($this->flux) && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>">
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '------'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
-		<a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>">
+		<?php } ?>
-			<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" />
+		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li>
-			<?php echo $feed->name (); ?>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		</a>
+		<li class="separator"></li>
-	</li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '------'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
-	<?php } ?>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '------'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
-	<?php } else { ?>
+		<li class="item">
-	<li class="item disable"><?php echo Minz_Translate::t ('no_rss_feed'); ?></li>
+			<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
-	<?php } ?>
+			<button class="read_all as-link <?php echo $confirm; ?>"
-</ul>
+			        form="mark-read-aside"
+			        formaction="<?php echo _url('entry', 'read', 'get', 'f_------'); ?>"
+			        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
+		</li>
+		<?php } ?>
+	</ul>
+</script>

sources/app/layout/aside_flux.phtml

@@ -1,103 +0,0 @@
-<div class="aside aside_flux<?php if ($this->conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
-	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
-
-	<ul class="categories">
-		<?php if ($this->loginOk) { ?>
-		<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('configure', 'feed'); ?>"><?php echo _t('subscription_management'); ?></a>
-				<a class="btn btn-important" href="<?php echo _url('configure', 'categorize'); ?>" title="<?php echo _t('categories_management'); ?>"><?php echo _i('category-white'); ?></a>
-			</div>
-		</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 ($this->conf->view_mode !== Minz_Request::param('output', 'normal')) {
-				$arUrl['params']['output'] = 'normal';
-			}
-		?>
-		<li>
-			<div class="category all<?php echo $this->get_c == 'a' ? ' active' : ''; ?>">
-				<a data-unread="<?php echo formatNumber($this->nb_not_read); ?>" class="btn<?php echo $this->get_c == 'a' ? ' active' : ''; ?>" href="<?php echo Minz_Url::display($arUrl); ?>">
-					<?php echo _i('all'); ?>
-					<?php echo _t('main_stream'); ?>
-				</a>
-			</div>
-		</li>
-
-		<li>
-			<div class="category favorites<?php echo $this->get_c == 's' ? ' active' : ''; ?>">
-				<a data-unread="<?php echo formatNumber($this->nb_favorites['unread']); ?>" class="btn<?php echo $this->get_c == 's' ? ' active' : ''; ?>" href="<?php $arUrl['params']['get'] = 's'; echo Minz_Url::display($arUrl); ?>">
-					<?php echo _i('bookmark'); ?>
-					<?php echo _t('favorite_feeds', formatNumber($this->nb_favorites['all'])); ?>
-				</a>
-			</div>
-		</li>
-
-		<?php
-		foreach ($this->cat_aside as $cat) {
-			$feeds = $cat->feeds();
-			if (!empty($feeds)) {
-				$c_active = false;
-				$c_show = false;
-				if ($this->get_c == $cat->id()) {
-					$c_active = true;
-					if (!$this->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">
-	<ul class="dropdown-menu">
-		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
-		<?php if ($this->loginOk) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
-		<?php } ?>
-		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
-		<?php if ($this->loginOk) { ?>
-		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('configure', 'feed', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
-		<li class="item">
-			<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
-			<button class="read_all as-link <?php echo $confirm; ?>"
-			        form="mark-read-aside"
-			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
-			        type="submit"><?php echo _t('mark_read'); ?></button>
-		</li>
-		<?php } ?>
-	</ul>
-</script>

sources/app/layout/aside_stats.phtml

@@ -1,12 +1,12 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo Minz_Translate::t ('stats'); ?></li>
+	<li class="nav-header"><?php echo _t('admin.stats'); ?></li>
-	<li class="item<?php echo Minz_Request::actionName () == 'index' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() == 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'index'); ?>"><?php echo Minz_Translate::t ('stats_main'); ?></a>
+		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('admin.stats.menu.main'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'idle' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() == 'idle' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'idle'); ?>"><?php echo Minz_Translate::t ('stats_idle'); ?></a>
+		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('admin.stats.menu.idle'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'repartition' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() == 'repartition' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'repartition'); ?>"><?php echo Minz_Translate::t ('stats_repartition'); ?></a>
+		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('admin.stats.menu.repartition'); ?></a>
 	</li>
 </ul>

sources/app/layout/aside_subscription.phtml

@@ -0,0 +1,17 @@
+<ul class="nav nav-list aside">
+	<li class="nav-header"><?php echo _t('sub.menu.subscription_management'); ?></li>
+
+	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('sub.menu.subscription_management'); ?></a>
+	</li>
+
+	<li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('sub.menu.import_export'); ?></a>
+	</li>
+
+	<li class="item">
+		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
+			<?php echo _t('sub.menu.bookmark'); ?>
+		</a>
+	</li>
+</ul>

sources/app/layout/header.phtml

@@ -1,22 +1,12 @@
 <?php
-if (Minz_Configuration::canLogIn()) {
+
+if (FreshRSS_Auth::accessNeedsAction()) {
 	?><ul class="nav nav-head nav-login"><?php
-	switch (Minz_Configuration::authType()) {
+		if (FreshRSS_Auth::hasAccess()) {
-	case 'form':
+			?><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
-		if ($this->loginOk) {
-			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('index', 'formLogout'); ?>"><?php echo _t('logout'); ?></a></li><?php
 		} else {
-			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('index', 'formLogin'); ?>"><?php echo _t('login'); ?></a></li><?php
+			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a></li><?php
 		}
-		break;
-	case 'persona':
-		if ($this->loginOk) {
-			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="#"><?php echo _t('logout'); ?></a></li><?php
-		} else {
-			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="#"><?php echo _t('login'); ?></a></li><?php
-		}
-		break;
-	}
 	?></ul><?php
 }
 ?>
@@ -26,17 +16,16 @@ 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 FreshRSS_Context::$system_conf->title; ?>
 			</a>
 		</h1>
 	</div>
 
 	<div class="item search">
-		<?php if ($this->loginOk || Minz_Configuration::allowAnonymous()) { ?>
+		<?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 FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('gen.menu.search'); ?>" />
-				<input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search'); ?>" />
 
 				<?php $get = Minz_Request::param('get', ''); ?>
 				<?php if ($get != '') { ?>
@@ -59,57 +48,45 @@ if (Minz_Configuration::canLogIn()) {
 		<?php } ?>
 	</div>
 
-	<?php if ($this->loginOk) { ?>
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
 	<div class="item configure">
 		<div class="dropdown">
 			<div id="dropdown-configure" class="dropdown-target"></div>
 			<a class="btn dropdown-toggle" href="#dropdown-configure"><?php echo _i('configure'); ?></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
-				<li class="dropdown-header"><?php echo _t('configuration'); ?></li>
+				<li class="dropdown-header"><?php echo _t('gen.menu.configuration'); ?></li>
-				<li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.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', 'shortcut'); ?>"><?php echo _t('gen.menu.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('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a></li>
+				<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="item"><a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a></li>
+				<li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
-				<?php
+				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
-					$current_user = Minz_Session::param('currentUser', '');
+				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
-					if (Minz_Configuration::isAdmin($current_user)) {
+				<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('gen.menu.update'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
 				<?php } ?>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('stats'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('gen.menu.stats'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('logs'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('gen.menu.logs'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.menu.about'); ?></a></li>
 				<?php
-				if (Minz_Configuration::canLogIn()) {
+				if (FreshRSS_Auth::accessNeedsAction()) {
-					?><li class="separator"></li><?php
+					?><li class="separator"></li>
-					switch (Minz_Configuration::authType()) {
+				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('gen.auth.logout'); ?></a></li><?php
-					case 'form':
-						?><li class="item"><a class="signout" href="<?php echo _url('index', 'formLogout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
-						break;
-					case 'persona':
-						?><li class="item"><a class="signout" href="#"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
-						break;
-					}
 				} ?>
 			</ul>
 		</div>
 	</div>
-	<?php } elseif (Minz_Configuration::canLogIn()) {
+	<?php } elseif (FreshRSS_Auth::accessNeedsAction()) { ?>
-		?><div class="item configure"><?php
+	<div class="item configure">
-		switch (Minz_Configuration::authType()) {
+		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a>
-		case 'form':
+	</div>
-			echo _i('login'); ?><a class="signin" href="<?php echo _url('index', 'formLogin'); ?>"><?php echo _t('login'); ?></a></li><?php
+	<?php } ?>
-			break;
-		case 'persona':
-			echo _i('login'); ?><a class="signin" href="#"><?php echo _t('login'); ?></a></li><?php
-			break;
-		}
-		?></div><?php
-	} ?>
 </div>

sources/app/layout/layout.phtml

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<?php echo $this->conf->language; ?>" xml:lang="<?php echo $this->conf->language; ?>">
+<html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="initial-scale=1.0" />
@@ -10,21 +10,22 @@
 <?php $this->renderHelper('javascript_vars'); ?>
 		//]]></script>
 <?php
-	if (!empty($this->nextId)) {
+	$url_base = Minz_Request::currentRequest();
-		$params = Minz_Request::params();
+	if (FreshRSS_Context::$next_id !== '') {
-		$params['next'] = $this->nextId;
+		$url_next = $url_base;
-		$params['ajax'] = 1;
+		$url_next['params']['next'] = FreshRSS_Context::$next_id;
+		$url_next['params']['ajax'] = 1;
 ?>
-		<link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display(array('c' => Minz_Request::controllerName(), 'a' => Minz_Request::actionName(), 'params' => $params)); ?>" />
+		<link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display($url_next); ?>" />
 <?php } ?>
 		<link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" />
 		<link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" />
 <?php
-	if (isset($this->url)) {
+	if (isset($this->rss_title)) {
-		$rss_url = $this->url;
+		$url_rss = $url_base;
-		$rss_url['params']['output'] = 'rss';
+		$url_rss['a'] = 'rss';
 ?>
-		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($rss_url); ?>" />
+		<link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
 <?php } ?>
 		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>">
 		<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>">
@@ -33,7 +34,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 FreshRSS_Context::$system_conf->title; ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
 		<meta name="robots" content="noindex,nofollow" />
 	</head>
@@ -56,7 +57,7 @@
 ?>
 <div id="notification" class="notification <?php echo $status; ?>">
 	<span class="msg"><?php echo $msg; ?></span>
-	<a class="close" href=""><?php echo FreshRSS_Themes::icon('close'); ?></a>
+	<a class="close" href=""><?php echo _i('close'); ?></a>
 </div>
 	</body>
 </html>

sources/app/layout/nav_entries.phtml

@@ -1,5 +1,5 @@
 <ul id="nav_entries">
-	<li class="item"><a class="previous_entry" href="#"><?php echo FreshRSS_Themes::icon('prev'); ?></a></li>
+	<li class="item"><a class="previous_entry" href="#"><?php echo _i('prev'); ?></a></li>
-	<li class="item"><a class="up" href="#"><?php echo FreshRSS_Themes::icon('up'); ?></a></li>
+	<li class="item"><a class="up" href="#"><?php echo _i('up'); ?></a></li>
-	<li class="item"><a class="next_entry" href="#"><?php echo FreshRSS_Themes::icon('next'); ?></a></li>
+	<li class="item"><a class="next_entry" href="#"><?php echo _i('next'); ?></a></li>
 </ul>

sources/app/layout/nav_menu.phtml

@@ -1,90 +1,31 @@
-<?php
+<?php $actual_view = Minz_Request::actionName(); ?>
-	$actual_view = Minz_Request::param('output', 'normal');
+
-?>
 <div class="nav_menu">
 	<?php if ($actual_view === 'normal') { ?>
-	<a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
+	<a class="btn toggle_aside" href="#aside_feed"><?php echo _i('category'); ?></a>
 	<?php } ?>
 
-	<?php if ($this->loginOk) { ?>
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
 	<div id="nav_menu_actions" class="stick">
 		<?php
-			$url_state = $this->url;
+			$states = array(
+				'read' => FreshRSS_Entry::STATE_READ,
+				'unread' => FreshRSS_Entry::STATE_NOT_READ,
+				'starred' => FreshRSS_Entry::STATE_FAVORITE,
+				'non-starred' => FreshRSS_Entry::STATE_NOT_FAVORITE,
+			);
 
-			if ($this->state & FreshRSS_Entry::STATE_READ) {
+			foreach ($states as $state_str => $state) {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_READ;
+				$state_enabled = FreshRSS_Context::isStateEnabled($state);
-				$checked = 'true';
+				$url_state = Minz_Request::currentRequest();
-				$class = 'active';
+				$url_state['params']['state'] = FreshRSS_Context::getRevertState($state);
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_READ;
-				$checked = 'false';
-				$class = '';
-			}
 		?>
-		<a id="toggle-read"
+		<a id="toggle-<?php echo $state_str; ?>"
-		   class="btn <?php echo $class; ?>"
+		   class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
-		   aria-checked="<?php echo $checked; ?>"
+		   aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
+		   title="<?php echo _t('index.menu.' . $state_str); ?>"
-		   title="<?php echo _t('show_read'); ?>">
+		   href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
-			<?php echo _i('read'); ?>
+		<?php } ?>
-		</a>
-
-		<?php
-			if ($this->state & FreshRSS_Entry::STATE_NOT_READ) {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_READ;
-				$checked = 'true';
-				$class = 'active';
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_READ;
-				$checked = 'false';
-				$class = '';
-			}
-		?>
-		<a id="toggle-unread"
-		   class="btn <?php echo $class; ?>"
-		   aria-checked="<?php echo $checked; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
-		   title="<?php echo _t('show_not_reads'); ?>">
-			<?php echo _i('unread'); ?>
-		</a>
-
-		<?php
-			if ($this->state & FreshRSS_Entry::STATE_FAVORITE || $this->get_c == 's') {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_FAVORITE;
-				$checked = 'true';
-				$class = 'active';
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_FAVORITE;
-				$checked = 'false';
-				$class = '';
-			}
-		?>
-		<a id="toggle-favorite"
-		   class="btn <?php echo $class; ?>"
-		   aria-checked="<?php echo $checked; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
-		   title="<?php echo _t('show_favorite'); ?>">
-			<?php echo _i('starred'); ?>
-		</a>
-
-		<?php
-			if ($this->state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
-				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_FAVORITE;
-				$checked = 'true';
-				$class = 'active';
-			} else {
-				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_FAVORITE;
-				$checked = 'false';
-				$class = '';
-			}
-		?>
-		<a id="toggle-not-favorite"
-		   class="btn <?php echo $class; ?>"
-		   aria-checked="<?php echo $checked; ?>"
-		   href="<?php echo Minz_Url::display($url_state); ?>"
-		   title="<?php echo _t('show_not_favorite'); ?>">
-			<?php echo _i('non-starred'); ?>
-		</a>
 
 		<div class="dropdown">
 			<div id="dropdown-query" class="dropdown-target"></div>
@@ -94,107 +35,58 @@
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 
 				<li class="dropdown-header">
-					<?php echo _t('queries'); ?>
+					<?php echo _t('index.menu.queries'); ?>
 					<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
 				</li>
 
-				<?php foreach ($this->conf->queries as $query) { ?>
+				<?php foreach (FreshRSS_Context::$user_conf->queries as $query) { ?>
 				<li class="item query">
 					<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
 				</li>
 				<?php } ?>
 
-				<?php if (count($this->conf->queries) > 0) { ?>
+				<?php if (count(FreshRSS_Context::$user_conf->queries) > 0) { ?>
 				<li class="separator no-mobile"></li>
 				<?php } ?>
 
 				<?php
-					$url_query = $this->url;
+					$url_query = Minz_Request::currentRequest();;
 					$url_query['c'] = 'configure';
 					$url_query['a'] = 'addQuery';
 				?>
-				<li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('add_query'); ?></a></li>
+				<li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('index.menu.add_query'); ?></a></li>
 			</ul>
 		</div>
 	</div>
+
 	<?php
-		$get = false;
+		$get = FreshRSS_Context::currentGet();
-		$string_mark = _t('mark_all_read');
+		$string_mark = _t('index.menu.mark_all_read');
-		if ($this->get_f) {
+		if ($get[0] == 'f') {
-			$get = 'f_' . $this->get_f;
+			$string_mark = _t('index.menu.mark_feed_read');
-			$string_mark = _t('mark_feed_read');
+		} elseif ($get[0] == 'c') {
-		} elseif ($this->get_c && $this->get_c != 'a') {
+			$string_mark = _t('index.menu.mark_cat_read');
-			if ($this->get_c === 's') {
-				$get = 's';
-			} else {
-				$get = 'c_' . $this->get_c;
-			}
-			$string_mark = _t('mark_cat_read');
-		}
-		$nextGet = $get;
-		if ($this->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;
+		$mark_read_url = array(
-		$idMax = $p === null ? (time() - 1) . '000000' : $p->id();
+			'c' => 'entry',
-
+			'a' => 'read',
-		if ($this->order === 'ASC') {	//In this case we do not know but we guess idMax
+			'params' => array(
-			$idMax2 = (time() - 1) . '000000';
+				'get' => $get,
-			if (strcmp($idMax2, $idMax) > 0) {
+				'nextGet' => FreshRSS_Context::$next_get,
-				$idMax = $idMax2;
+				'idMax' => FreshRSS_Context::$id_max,
-			}
+			)
-		}
+		);
-
-		$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('get' => $get, 'nextGet' => $nextGet, 'idMax' => $idMax));
-		$output = Minz_Request::param('output', '');
-		if ($output != '' && $this->conf->view_mode !== $output) {
-			$arUrl['params']['output'] = $output;
-		}
-		$markReadUrl = Minz_Url::display($arUrl);
-		Minz_Session::_param('markReadUrl', $markReadUrl);
 	?>
 
 	<form id="mark-read-menu" method="post" style="display: none"></form>
 
 	<div class="stick" id="nav_menu_read_all">
-		<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
+		<?php $confirm = FreshRSS_Context::$user_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>
+		        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 
 		<div class="dropdown">
 			<div id="dropdown-read" class="dropdown-target"></div>
@@ -206,65 +98,65 @@
 				<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;
+	$today = @strtotime('today');
-	$mark_before_today['params']['idMax'] = $this->today . '000000';
+	$mark_before_today = $mark_read_url;
-	$mark_before_one_week = $arUrl;
+	$mark_before_today['params']['idMax'] = $today . '000000';
-	$mark_before_one_week['params']['idMax'] = ($this->today - 604800) . '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; ?>"
 					        form="mark-read-menu"
 					        formaction="<?php echo Minz_Url::display($mark_before_today); ?>"
-					        type="submit"><?php echo _t('before_one_day'); ?></button>
+					        type="submit"><?php echo _t('index.menu.before_one_day'); ?></button>
 				</li>
 				<li class="item">
 					<button class="as-link <?php echo $confirm; ?>"
 					        form="mark-read-menu"
 					        formaction="<?php echo Minz_Url::display($mark_before_one_week); ?>"
-					        type="submit"><?php echo _t('before_one_week'); ?></button>
+					        type="submit"><?php echo _t('index.menu.before_one_week'); ?></button>
 				</li>
 			</ul>
 		</div>
 	</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); ?>">
+		<a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('index.menu.normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-normal"); ?>
 		</a>
 
-		<?php $url_output['params']['output'] = 'global'; ?>
+		<?php $url_output['a'] = 'global'; ?>
-		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('index.menu.global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-global"); ?>
 		</a>
 
-		<?php $url_output['params']['output'] = 'reader'; ?>
+		<?php $url_output['a'] = 'reader'; ?>
-		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('index.menu.reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-reader"); ?>
 		</a>
 
 		<?php
-			$url_output['params']['output'] = 'rss';
+			$url_output['a'] = 'rss';
-			if ($this->conf->token) {
+			if (FreshRSS_Context::$user_conf->token) {
-				$url_output['params']['token'] = $this->conf->token;
+				$url_output['params']['token'] = FreshRSS_Context::$user_conf->token;
 			}
 		?>
-		<a class="view_rss btn" target="_blank" title="<?php echo _t('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_rss btn" target="_blank" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
 		</a>
 	</div>
 
 	<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 FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
-			<input type="search" name="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search_short'); ?>" />
 
 			<?php $get = Minz_Request::param('get', ''); ?>
 			<?php if($get != '') { ?>
@@ -284,23 +176,23 @@
 	</div>
 	
 	<?php
-		if ($this->order === 'DESC') {
+		if (FreshRSS_Context::$order === 'DESC') {
 			$order = 'ASC';
 			$icon = 'up';
-			$title = 'older_first';
+			$title = 'index.menu.older_first';
 		} else {
 			$order = 'DESC';
 			$icon = 'down';
-			$title = 'newer_first';
+			$title = 'index.menu.newer_first';
 		}
-		$url_order = $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); ?>">
 		<?php echo _i($icon); ?>
 	</a>
 	
-	<?php if ($this->loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?>
+	<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous_refresh) { ?>
-	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>"><?php echo _i('refresh'); ?></a>
+	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('gen.action.actualize'); ?>"><?php echo _i('refresh'); ?></a>
 	<?php } ?>
 </div>

sources/app/views/auth/formLogin.phtml

@@ -0,0 +1,28 @@
+<div class="prompt">
+	<h1><?php echo _t('gen.auth.login'); ?></h1>
+
+	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
+		<div>
+			<label for="username"><?php echo _t('gen.auth.username'); ?></label>
+			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
+		</div>
+		<div>
+			<label for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+				<input type="password" id="passwordPlain" required="required" />
+				<input type="hidden" id="challenge" name="challenge" /><br />
+				<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
+		</div>
+		<div>
+			<label class="checkbox" for="keep_logged_in">
+				<input type="checkbox" name="keep_logged_in" id="keep_logged_in" value="1" />
+				<?php echo _t('gen.auth.keep_logged_in'); ?>
+			</label>
+			<br />
+		</div>
+		<div>
+			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('gen.auth.login'); ?></button>
+		</div>
+	</form>
+
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
+</div>

sources/app/views/auth/index.phtml

@@ -0,0 +1,85 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
+
+	<form method="post" action="<?php echo _url('auth', 'index'); ?>">
+		<legend><?php echo _t('admin.auth.type'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="auth_type"><?php echo _t('admin.auth.type'); ?></label>
+			<div class="group-controls">
+				<select id="auth_type" name="auth_type" required="required">
+					<?php if (!in_array(FreshRSS_Context::$system_conf->auth_type, array('form', 'persona', 'http_auth', 'none'))) { ?>
+						<option selected="selected"></option>
+					<?php } ?>
+					<option value="form"<?php echo FreshRSS_Context::$system_conf->auth_type === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('admin.auth.form'); ?></option>
+					<option value="persona"<?php echo FreshRSS_Context::$system_conf->auth_type === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$user_conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.persona'); ?></option>
+					<option value="http_auth"<?php echo FreshRSS_Context::$system_conf->auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.http'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo FreshRSS_Context::$system_conf->auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('admin.auth.none'); ?></option>
+				</select>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="anon_access">
+					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo FreshRSS_Context::$system_conf->allow_anonymous ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('admin.auth.allow_anonymous', FreshRSS_Context::$system_conf->default_user); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="anon_refresh">
+					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo FreshRSS_Context::$system_conf->allow_anonymous_refresh ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('admin.auth.allow_anonymous_refresh'); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="unsafe_autologin">
+					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo FreshRSS_Context::$system_conf->unsafe_autologin_enabled ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('admin.auth.unsafe_autologin'); ?>
+					<kbd><?php echo Minz_Url::display(array('c' => 'auth', 'a' => 'login', 'params' => array('u' => 'alice', 'p' => '1234')), 'html', true); ?></kbd>
+				</label>
+			</div>
+		</div>
+
+		<?php if (FreshRSS_Auth::accessNeedsAction()) { ?>
+		<div class="form-group">
+			<label class="group-name" for="token"><?php echo _t('admin.auth.token'); ?></label>
+			<?php $token = FreshRSS_Context::$user_conf->token; ?>
+			<div class="group-controls">
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
+					echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> />
+				<?php echo _i('help'); ?> <?php echo _t('admin.auth.token_help'); ?>
+				<kbd><?php echo Minz_Url::display(array('params' => array('output' => 'rss', 'token' => $token)), 'html', true); ?></kbd>
+			</div>
+		</div>
+		<?php } ?>
+
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="api_enabled">
+					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo FreshRSS_Context::$system_conf->api_enabled ? ' checked="checked"' : '',
+						FreshRSS_Auth::accessNeedsLogin() ? '' : ' disabled="disabled"'; ?> />
+					<?php echo _t('admin.auth.api_enabled'); ?>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
+			</div>
+		</div>
+	</form>
+</div>

sources/app/views/auth/personaLogin.phtml

@@ -0,0 +1,24 @@
+<?php if ($this->res === false) { ?>
+<div class="prompt">
+	<h1><?php echo _t('gen.auth.login'); ?></h1>
+
+	<p>
+		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
+			<?php echo _i('login'); ?> <?php echo _t('gen.auth.login_persona'); ?>
+		</a>
+
+		<br /><br />
+
+		<?php echo _i('help'); ?>
+		<small>
+			<a href="<?php echo _url('auth', 'reset'); ?>"><?php echo _t('gen.auth.login_persona_problem'); ?></a>
+		</small>
+	</p>
+
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
+</div>
+<?php
+} else {
+	echo json_encode($this->res);
+}
+?>

sources/app/views/auth/reset.phtml

@@ -1,5 +1,5 @@
 <div class="prompt">
-	<h1><?php echo _t('auth_reset'); ?></h1>
+	<h1><?php echo _t('gen.auth.reset'); ?></h1>
 
 	<?php if (!empty($this->message)) { ?>
 	<p class="alert <?php echo $this->message['status'] === 'bad' ? 'alert-error' : 'alert-warn'; ?>">
@@ -9,24 +9,24 @@
 	<?php } ?>
 
 	<?php if (!$this->no_form) { ?>
-	<form id="crypto-form" method="post" action="<?php echo _url('index', 'resetAuth'); ?>">
+	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'reset'); ?>">
 		<p class="alert alert-warn">
-			<span class="alert-head"><?php echo _t('attention'); ?></span><br />
+			<span class="alert-head"><?php echo _t('gen.short.attention'); ?></span><br />
-			<?php echo _t('auth_will_reset'); ?>
+			<?php echo _t('gen.auth.will_reset'); ?>
 		</p>
 
 		<div>
-			<label for="username"><?php echo _t('username_admin'); ?></label>
+			<label for="username"><?php echo _t('gen.auth.username_admin'); ?></label>
 			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
 		</div>
 		<div>
-			<label for="passwordPlain"><?php echo _t('password'); ?></label>
+			<label for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
 				<input type="password" id="passwordPlain" required="required" />
 				<input type="hidden" id="challenge" name="challenge" /><br />
-				<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+				<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 		</div>
 		<div>
-			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('submit'); ?></button>
+			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
 		</div>
 	</form>
 	<?php } ?>

sources/app/views/configure/archiving.phtml

@@ -1,31 +1,31 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'archiving'); ?>">
-		<legend><?php echo Minz_Translate::t('archiving_configuration'); ?></legend>
+		<legend><?php echo _t('conf.archiving'); ?></legend>
-		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('archiving_configuration_help'); ?></p>
+		<p><?php echo _i('help'); ?> <?php echo _t('conf.archiving.help'); ?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo Minz_Translate::t('delete_articles_every'); ?></label>
+			<label class="group-name" for="old_entries"><?php echo _t('conf.archiving.delete_after'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo Minz_Translate::t('month'); ?>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$user_conf->old_entries; ?>" /> <?php echo _t('gen.date.month'); ?>
-				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo Minz_Translate::t('purge_now'); ?></a>
+				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('conf.archiving.purge_now'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history_default"><?php echo Minz_Translate::t('keep_history'), ' ', Minz_Translate::t('by_feed'); ?></label>
+			<label class="group-name" for="keep_history_default"><?php echo _t('conf.archiving.keep_history_by_feed'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
 					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
+						echo '<option value="' . $v . (FreshRSS_Context::$user_conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
-				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
+				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl_default"><?php echo Minz_Translate::t('ttl'); ?></label>
+			<label class="group-name" for="ttl_default"><?php echo _t('conf.archiving.ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
 					$found = false;
@@ -34,44 +34,49 @@
 					                36000 => '10h', 43200 => '12h', 64800 => '18h',
 					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
 					                604800 => '1wk', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						echo '<option value="' . $v . (FreshRSS_Context::$user_conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-						if ($this->conf->ttl_default == $v) {
+						if (FreshRSS_Context::$user_conf->ttl_default == $v) {
 							$found = true;
 						}
 					}
 					if (!$found) {
-						echo '<option value="' . intval($this->conf->ttl_default) . '" selected="selected">' . intval($this->conf->ttl_default) . 's</option>';
+						echo '<option value="' . intval(FreshRSS_Context::$user_conf->ttl_default) . '" selected="selected">' . intval(FreshRSS_Context::$user_conf->ttl_default) . 's</option>';
 					}
-				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
+				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('save'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('entry', 'optimize'); ?>">
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
+		<legend><?php echo _t('conf.archiving.advanced'); ?></legend>
 
 		<div class="form-group">
-		<p class="group-name"><?php echo Minz_Translate::t('current_user'); ?></p>
+			<label class="group-name"><?php echo _t('conf.user.current'); ?></label>
 			<div class="group-controls">
-				<p><?php echo formatNumber($this->nb_total), ' ', Minz_Translate::t('articles'), ', ', formatBytes($this->size_user); ?></p>
+				<?php echo _t('conf.user.articles_and_size', format_number($this->nb_total), format_bytes($this->size_user)); ?>
-				<input type="hidden" name="optimiseDatabase" value="1" />
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('optimize_bdd'); ?></button>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('optimize_todo_sometimes'); ?>
 			</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 Minz_Translate::t('users'); ?></p>
+			<label class="group-name"><?php echo _t('conf.user.users'); ?></label>
 			<div class="group-controls">
-				<p><?php echo formatBytes($this->size_total); ?></p>
+				<?php echo format_bytes($this->size_total); ?>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<input type="hidden" name="optimiseDatabase" value="1" />
+				<button type="submit" class="btn btn-important"><?php echo _t('conf.archiving.optimize'); ?></button>
+				<?php echo _i('help'); ?> <?php echo _t('conf.archiving.optimize_help'); ?>
 			</div>
 		</div>
 		<?php } ?>

sources/app/views/configure/categorize.phtml

@@ -1,55 +0,0 @@
-<?php $this->partial ('aside_feed'); ?>
-
-<div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
-
-	<form method="post" action="<?php echo _url ('configure', 'categorize'); ?>">
-		<legend><?php echo Minz_Translate::t ('categories_management'); ?></legend>
-
-		<p class="alert alert-warn"><?php echo Minz_Translate::t ('feeds_moved_category_deleted', $this->defaultCategory->name ()); ?></p>
-
-		<?php $i = 0; foreach ($this->categories as $cat) { $i++; ?>
-		<div class="form-group">
-			<label class="group-name" for="cat_<?php echo $cat->id (); ?>">
-				<?php echo Minz_Translate::t ('category_number', $i); ?>
-			</label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" id="cat_<?php echo $cat->id (); ?>" name="categories[]" value="<?php echo $cat->name (); ?>" />
-
-					<?php if ($cat->nbFeed () > 0) { ?>
-					<a class="btn" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id ()); ?>">
-						<?php echo _i('link'); ?>
-					</a>
-					<button formaction="<?php echo _url('feed', 'delete', 'id', $cat->id (), 'type', 'category'); ?>"
-					        class="btn btn-attention confirm"
-					        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-					        type="submit"><?php echo _t('ask_empty'); ?></button>
-					<?php } ?>
-				</div>
-				(<?php echo Minz_Translate::t ('number_feeds', $cat->nbFeed ()); ?>)
-
-				<?php if ($cat->id () === $this->defaultCategory->id ()) { ?>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('can_not_be_deleted'); ?>
-				<?php } ?>
-
-				<input type="hidden" name="ids[]" value="<?php echo $cat->id (); ?>" />
-			</div>
-		</div>
-		<?php } ?>
-
-		<div class="form-group">
-			<label class="group-name" for="new_category"><?php echo Minz_Translate::t ('add_category'); ?></label>
-			<div class="group-controls">
-				<input type="text" id="new_category" name="new_category" placeholder="<?php echo Minz_Translate::t ('new_category'); ?>" />
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
-			</div>
-		</div>
-	</form>
-</div>

sources/app/views/configure/display.phtml

@@ -1,108 +1,122 @@
-<?php $this->partial ('aside_configure'); ?>
+<?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url ('configure', 'display'); ?>">
+	<form method="post" action="<?php echo _url('configure', 'display'); ?>">
-		<legend><?php echo Minz_Translate::t ('display_configuration'); ?></legend>
+		<legend><?php echo _t('conf.display'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="language"><?php echo Minz_Translate::t ('language'); ?></label>
+			<label class="group-name" for="language"><?php echo _t('conf.display.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
-				<?php $languages = $this->conf->availableLanguages (); ?>
+				<?php $languages = Minz_Translate::availableLanguages(); ?>
-				<?php foreach ($languages as $short => $lib) { ?>
+				<?php foreach ($languages as $lang) { ?>
-				<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+				<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>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('theme'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('conf.display.theme'); ?></label>
 			<div class="group-controls">
-				<select name="theme" id="theme" required=""><?php
+				<ul class="slides">
-					$found = false;
+					<?php $slides = count($this->themes); $i = 1; ?>
-					foreach ($this->themes as $theme) {
+					<?php foreach($this->themes as $theme) { ?>
-						?><option value="<?php echo $theme['id']; ?>"<?php if ($this->conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
+						<input type="radio" name="theme" id="img-<?php echo $i ?>" <?php if (FreshRSS_Context::$user_conf->theme === $theme['id']) {echo "checked";}?> value="<?php echo $theme['id'] ?>"/>
-							echo $theme['name'] . ' — ' . Minz_Translate::t ('by') . ' ' . $theme['author'];
+						<li class="slide-container">
-						?></option><?php
+							<div class="slide">
-					}
+								<img src="<?php echo Minz_Url::display('/themes/' . $theme['id'] . '/thumbs/original.png')?>"/>
-					if (!$found) {
+							</div>
-						?><option selected="selected"></option><?php
+							<div class="nav">
-					}
+								<?php if ($i !== 1) {?>
-				?></select>
+									<label for="img-<?php echo $i - 1 ?>" class="prev">&#x2039;</label>
+								<?php } ?>
+								<?php if ($i !== $slides) {?>
+									<label for="img-<?php echo $i + 1 ?>" class="next">&#x203a;</label>
+								<?php } ?>
+							</div>
+							<div class="properties">
+								<div><?php echo sprintf('%s — %s', $theme['name'], _t('gen.short.by_author', $theme['author'])); ?></div>
+								<div><?php echo $theme['description'] ?></div>
+								<div class="page-number"><?php echo sprintf('%d/%d', $i, $slides) ?></div>
+							</div>
+						</li>
+						<?php $i++ ?>
+					<?php } ?>
+				</ul>
 			</div>
 		</div>
 
-		<?php $width = $this->conf->content_width; ?>
+		<?php $width = FreshRSS_Context::$user_conf->content_width; ?>
 		<div class="form-group">
-			<label class="group-name" for="content_width"><?php echo Minz_Translate::t('content_width'); ?></label>
+			<label class="group-name" for="content_width"><?php echo _t('conf.display.width.content'); ?></label>
 			<div class="group-controls">
 				<select name="content_width" id="content_width" required="">
 					<option value="thin" <?php echo $width === 'thin'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_thin'); ?>
+						<?php echo _t('conf.display.width.thin'); ?>
 					</option>
 					<option value="medium" <?php echo $width === 'medium'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_medium'); ?>
+						<?php echo _t('conf.display.width.medium'); ?>
 					</option>
 					<option value="large" <?php echo $width === 'large'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_large'); ?>
+						<?php echo _t('conf.display.width.large'); ?>
 					</option>
 					<option value="no_limit" <?php echo $width === 'no_limit'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_no_limit'); ?>
+						<?php echo _t('conf.display.width.no_limit'); ?>
 					</option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('article_icons'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('conf.display.icon.entry'); ?></label>
 			<table>
 				<thead>
 					<tr>
 						<th> </th>
-						<th title="<?php echo Minz_Translate::t ('mark_read'); ?>"><?php echo FreshRSS_Themes::icon('read'); ?></th>
+						<th title="<?php echo _t('gen.action.mark_read'); ?>"><?php echo _i('read'); ?></th>
-						<th title="<?php echo Minz_Translate::t ('mark_favorite'); ?>"><?php echo FreshRSS_Themes::icon('bookmark'); ?></th>
+						<th title="<?php echo _t('gen.action.mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
-						<th><?php echo Minz_Translate::t ('sharing'); ?></th>
+						<th><?php echo _t('conf.display.icon.sharing'); ?></th>
-						<th><?php echo Minz_Translate::t ('related_tags'); ?></th>
+						<th><?php echo _t('conf.display.icon.related_tags'); ?></th>
-						<th><?php echo Minz_Translate::t ('publication_date'); ?></th>
+						<th><?php echo _t('conf.display.icon.publication_date'); ?></th>
-						<th><?php echo FreshRSS_Themes::icon('link'); ?></th>
+						<th><?php echo _i('link'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						<th><?php echo Minz_Translate::t ('top_line'); ?></th>
+						<th><?php echo _t('conf.display.icon.top_line'); ?></th>
-						<td><input type="checkbox" name="topline_read" value="1"<?php echo $this->conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_read" value="1"<?php echo FreshRSS_Context::$user_conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo $this->conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
-						<td><input type="checkbox" name="topline_date" value="1"<?php echo $this->conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$user_conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="topline_link" value="1"<?php echo $this->conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$user_conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
-						<th><?php echo Minz_Translate::t ('bottom_line'); ?></th>
+						<th><?php echo _t('conf.display.icon.bottom_line'); ?></th>
-						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo $this->conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo $this->conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo $this->conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo $this->conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo $this->conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_date" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
-						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo $this->conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
+						<td><input type="checkbox" name="bottomline_link" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr>
 				</tbody>
 			</table><br />
 		</div>
 		
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('html5_notif_timeout'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('conf.display.notif_html5.timeout'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo Minz_Translate::t ('seconds_(0_means_no_timeout)'); ?>
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$user_conf->html5_notif_timeout; ?>" /> <?php echo _t('conf.display.notif_html5.seconds'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>

sources/app/views/configure/feed.phtml

@@ -1,182 +0,0 @@
-<?php $this->partial ('aside_feed'); ?>
-
-<?php if ($this->flux) { ?>
-<div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a>
-
-	<h1><?php echo $this->flux->name (); ?></h1>
-	<?php echo $this->flux->description (); ?>
-
-	<?php $nbEntries = $this->flux->nbEntries (); ?>
-
-	<?php if ($this->flux->inError ()) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t ('damn'); ?></span> <?php echo Minz_Translate::t ('feed_in_error'); ?></p>
-	<?php } elseif ($nbEntries === 0) { ?>
-	<p class="alert alert-warn"><?php echo Minz_Translate::t ('feed_empty'); ?></p>
-	<?php } ?>
-
-	<form method="post" action="<?php echo _url ('configure', 'feed', 'id', $this->flux->id ()); ?>" autocomplete="off">
-		<legend><?php echo Minz_Translate::t ('informations'); ?></legend>
-		<div class="form-group">
-			<label class="group-name" for="name"><?php echo Minz_Translate::t ('title'); ?></label>
-			<div class="group-controls">
-				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->flux->name () ; ?>" />
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="description"><?php echo Minz_Translate::t ('feed_description'); ?></label>
-			<div class="group-controls">
-				<textarea name="description" id="description"><?php echo htmlspecialchars($this->flux->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="website"><?php echo Minz_Translate::t ('website_url'); ?></label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->flux->website (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->flux->website (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
-				</div>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="url"><?php echo Minz_Translate::t ('feed_url'); ?></label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->flux->url (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->flux->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
-				</div>
-
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->flux->url (); ?>"><?php echo Minz_Translate::t ('feed_validator'); ?></a>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="category"><?php echo Minz_Translate::t ('category'); ?></label>
-			<div class="group-controls">
-				<select name="category" id="category">
-				<?php foreach ($this->categories as $cat) { ?>
-				<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->flux->category () ? ' selected="selected"' : ''; ?>>
-					<?php echo $cat->name (); ?>
-				</option>
-				<?php } ?>
-				</select>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
-			<div class="group-controls">
-				<label class="checkbox" for="priority">
-					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->flux->priority () > 0 ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('yes'); ?>
-				</label>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="group-controls">
-				<a href="<?php echo _url('stats', 'repartition', 'id', $this->flux->id()); ?>">
-					<?php echo _i('stats'); ?> <?php echo _t('stats'); ?>
-				</a>
-			</div>
-		</div>
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button class="btn btn-attention confirm"
-				        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-				        formaction="<?php echo _url('feed', 'delete', 'id', $this->flux->id ()); ?>"
-				        formmethod="post"><?php echo _t('delete'); ?></button>
-			</div>
-		</div>
-
-		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
-
-		<div class="form-group">
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" value="<?php echo _t('number_articles', $nbEntries); ?>" disabled="disabled" />
-					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->flux->id ()); ?>">
-						<?php echo _i('refresh'); ?> <?php echo _t('actualize'); ?>
-					</a>
-				</div>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="keep_history"><?php echo Minz_Translate::t ('keep_history'); ?></label>
-			<div class="group-controls">
-				<select class="number" name="keep_history" id="keep_history" required="required"><?php
-					foreach (array('' => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->flux->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-					}
-				?></select>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="ttl"><?php echo Minz_Translate::t('ttl'); ?></label>
-			<div class="group-controls">
-				<select class="number" name="ttl" id="ttl" required="required"><?php
-					$found = false;
-					foreach (array(-2 => Minz_Translate::t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
-					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
-					                36000 => '10h', 43200 => '12h', 64800 => '18h',
-					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
-					                604800 => '1wk', 1209600 => '2wk', 1814400 => '3wk', 2419200 => '4wk', 2629744 => '1mo', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->flux->ttl() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-						if ($this->flux->ttl() == $v) {
-							$found = true;
-						}
-					}
-					if (!$found) {
-						echo '<option value="' . intval($this->flux->ttl()) . '" selected="selected">' . intval($this->flux->ttl()) . 's</option>';
-					}
-				?></select>
-			</div>
-		</div>
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->flux->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
-			</div>
-		</div>
-
-		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
-		<?php $auth = $this->flux->httpAuth (false); ?>
-		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo Minz_Translate::t ('http_username'); ?></label>
-			<div class="group-controls">
-				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('access_protected_feeds'); ?>
-			</div>
-
-			<label class="group-name" for="http_pass"><?php echo Minz_Translate::t ('http_password'); ?></label>
-			<div class="group-controls">
-				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
-			</div>
-		</div>
-
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
-		<div class="form-group">
-			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
-			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
-			</div>
-		</div>
-	</form>
-</div>
-
-<?php } else { ?>
-<div class="alert alert-warn"><span class="alert-head"><?php echo Minz_Translate::t ('no_selected_feed'); ?></span> <?php echo Minz_Translate::t ('think_to_add'); ?></div>
-<?php } ?>