From ba378791c2f36251a22e8a98351ab9b23a640c17 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 19 Sep 2014 13:52:50 +0200
Subject: Fix blank page for invalid user queries

Add a "deprecated" information

See https://github.com/marienfressinaud/FreshRSS/issues/625
---
 app/Controllers/configureController.php | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index b1cd45014..f72683e34 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -328,6 +328,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Request::forward(array('c' => 'configure', 'a' => 'queries'), true);
 		} else {
 			$this->view->query_get = array();
+			$cat_dao = new FreshRSS_CategoryDAO();
+			$feed_dao = FreshRSS_Factory::createFeedDao();
 			foreach ($this->view->conf->queries as $key => $query) {
 				if (!isset($query['get'])) {
 					continue;
@@ -335,31 +337,49 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 				switch ($query['get'][0]) {
 				case 'c':
-					$dao = new FreshRSS_CategoryDAO();
-					$category = $dao->searchById(substr($query['get'], 2));
+					$category = $cat_dao->searchById(substr($query['get'], 2));
+
+					$deprecated = true;
+					$cat_name = '';
+					if ($category) {
+						$cat_name = $category->name();
+						$deprecated = false;
+					}
+
 					$this->view->query_get[$key] = array(
 						'type' => 'category',
-						'name' => $category->name(),
+						'name' => $cat_name,
+						'deprecated' => $deprecated,
 					);
 					break;
 				case 'f':
-					$dao = FreshRSS_Factory::createFeedDao();
-					$feed = $dao->searchById(substr($query['get'], 2));
+					$feed = $feed_dao->searchById(substr($query['get'], 2));
+
+					$deprecated = true;
+					$feed_name = '';
+					if ($feed) {
+						$feed_name = $feed->name();
+						$deprecated = false;
+					}
+
 					$this->view->query_get[$key] = array(
 						'type' => 'feed',
-						'name' => $feed->name(),
+						'name' => $feed_name,
+						'deprecated' => $deprecated,
 					);
 					break;
 				case 's':
 					$this->view->query_get[$key] = array(
 						'type' => 'favorite',
 						'name' => 'favorite',
+						'deprecated' => false,
 					);
 					break;
 				case 'a':
 					$this->view->query_get[$key] = array(
 						'type' => 'all',
 						'name' => 'all',
+						'deprecated' => false,
 					);
 					break;
 				}
-- 
cgit v1.2.3


From ae4ecd8e099b23d38e761dec6de68da801816734 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 19 Sep 2014 15:44:33 +0200
Subject: Coding style (user queries)

---
 app/Controllers/configureController.php | 17 ++++++-----------
 app/i18n/en.php                         |  1 +
 app/i18n/fr.php                         |  1 +
 app/layout/nav_menu.phtml               |  5 ++++-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index f72683e34..91b74aa29 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -313,19 +313,14 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 			foreach ($queries as $key => $query) {
 				if (!$query['name']) {
-					$query['name'] = Minz_Translate::t('query_number', $key + 1);
+					$query['name'] = _t('query_number', $key + 1);
 				}
 			}
 			$this->view->conf->_queries($queries);
 			$this->view->conf->save();
 
-			$notif = array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('configuration_updated')
-			);
-			Minz_Session::_param('notification', $notif);
-
-			Minz_Request::forward(array('c' => 'configure', 'a' => 'queries'), true);
+			Minz_Request::good(_t('configuration_updated'),
+			                   array('c' => 'configure', 'a' => 'queries'));
 		} else {
 			$this->view->query_get = array();
 			$cat_dao = new FreshRSS_CategoryDAO();
@@ -392,14 +387,14 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	public function addQueryAction() {
 		$queries = $this->view->conf->queries;
 		$query = Minz_Request::params();
-		$query['name'] = Minz_Translate::t('query_number', count($queries) + 1);
+		$query['name'] = _t('query_number', count($queries) + 1);
 		unset($query['output']);
 		unset($query['token']);
 		$queries[] = $query;
 		$this->view->conf->_queries($queries);
 		$this->view->conf->save();
 
-		// Minz_Request::forward(array('params' => $query), true);
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'queries'), true);
+		Minz_Request::good(_t('query_created', $query['name']),
+		                   array('c' => 'configure', 'a' => 'queries'));
 	}
 }
diff --git a/app/i18n/en.php b/app/i18n/en.php
index e2bd21623..e84787508 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -43,6 +43,7 @@ return array (
 	'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',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index e06bba487..fab5c3470 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -43,6 +43,7 @@ return array (
 	'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é',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 2a09b0c12..03f496d1f 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -93,7 +93,10 @@
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 
-				<li class="dropdown-header"><?php echo _t('queries'); ?> <a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a></li>
+				<li class="dropdown-header">
+					<?php echo _t('queries'); ?>
+					<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
+				</li>
 
 				<?php foreach ($this->conf->queries as $query) { ?>
 				<li class="item query">
-- 
cgit v1.2.3


From ea7f21ba7f4049b51c2978b7ebaad00e17fa5af5 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 11:21:51 -0400
Subject: Add some comments

It is a work in progress. I only did that for a single class so you can tell me if this is a good idea, if the content is missing something.
Any comments are welcome.
---
 app/Controllers/configureController.php | 172 +++++++++++++++++++++++++++++++-
 1 file changed, 170 insertions(+), 2 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 91b74aa29..8fae29ea2 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -1,6 +1,17 @@
 <?php
 
+/**
+ * Controller to handle every configuration options.
+ */
 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) {
 			Minz_Error::error(
@@ -13,6 +24,17 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		$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.
+	 * If a category name is changed, it is updated.
+	 */
 	public function categorizeAction() {
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$catDAO = new FreshRSS_CategoryDAO();
@@ -66,6 +88,28 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(Minz_Translate::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.
+	 *
+	 * @todo change the notification code
+	 */
 	public function feedAction() {
 		$catDAO = new FreshRSS_CategoryDAO();
 		$this->view->categories = $catDAO->listCategories(false);
@@ -138,6 +182,33 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This action handles the display configuration page.
+	 *
+	 * It displays the display configuration page.
+	 * If this action is reached through a POST request, it stores all new
+	 * configuration values then sends a notification to the user.
+	 *
+	 * The options available on the page are:
+	 *   - language (default: en)
+	 *   - theme (default: Origin)
+	 *   - content width (default: thin)
+	 *   - display of read action in header
+	 *   - display of favorite action in header
+	 *   - display of date in header
+	 *   - display of open action in header
+	 *   - display of read action in footer
+	 *   - display of favorite action in footer
+	 *   - display of sharing action in footer
+	 *   - display of tags in footer
+	 *   - display of date in footer
+	 *   - display of open action in footer
+	 *   - html5 notification timeout (default: 0)
+	 * Default values are false unless specified.
+	 *
+	 * @todo refactor to theme section to use the same syntax everywhere
+	 * @todo change the notification code
+	 */
 	public function displayAction() {
 		if (Minz_Request::isPost()) {
 			$this->view->conf->_language(Minz_Request::param('language', 'en'));
@@ -178,6 +249,35 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(Minz_Translate::t('display_configuration') . ' · ');
 	}
 
+	/**
+	 * This action handles the reading configuration page.
+	 *
+	 * It displays the reading configuration page.
+	 * If this action is reached through a POST request, it stores all new
+	 * configuration values then sends a notification to the user.
+	 *
+	 * The options available on the page are:
+	 *   - number of posts per page (default: 10)
+	 *   - view mode (default: normal)
+	 *   - default article view (default: all)
+	 *   - load automatically articles
+	 *   - display expanded articles
+	 *   - display expanded categories
+	 *   - hide categories and feeds without unread articles
+	 *   - jump on next category or feed when marked as read
+	 *   - image lazy loading
+	 *   - stick open articles to the top
+	 *   - display a confirmation when reading all articles
+	 *   - article order (default: DESC)
+	 *   - mark articles as read when:
+	 *       - displayed
+	 *       - opened on site
+	 *       - scrolled
+	 *       - received
+	 * Default values are false unless specified.
+	 *
+	 * @todo change the notification code
+	 */
 	public function readingAction() {
 		if (Minz_Request::isPost()) {
 			$this->view->conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
@@ -216,6 +316,15 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(Minz_Translate::t('reading_configuration') . ' · ');
 	}
 
+	/**
+	 * This action handles the sharing configuration page.
+	 *
+	 * It displays the sharing configuration page.
+	 * If this action is reached through a POST request, it stores all
+	 * configuration values then sends a notification to the user.
+	 *
+	 * @todo change the notification code
+	 */
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
 			$params = Minz_Request::params();
@@ -235,6 +344,22 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(Minz_Translate::t('sharing') . ' · ');
 	}
 
+	/**
+	 * This action handles the shortcut configuration page.
+	 *
+	 * It displays the shortcut configuration page.
+	 * If this action is reached through a POST request, it stores all new
+	 * configuration values then sends a notification to the user.
+	 *
+	 * The authorized values for shortcuts are letters (a to z), numbers (0
+	 * to 9), function keys (f1 to f12), backspace, delete, down, end, enter,
+	 * escape, home, insert, left, page down, page up, return, right, space,
+	 * tab and up.
+	 *
+	 * @todo remove numbers from the list of authorized shortcuts since they
+	 * are used to access shortcuts and user queries
+	 * @todo change the notification code
+	 */
 	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',
@@ -271,10 +396,31 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(Minz_Translate::t('shortcuts') . ' · ');
 	}
 
+	/**
+	 * This action display the user configuration page
+	 *
+	 * @todo move that action in the user controller
+	 */
 	public function usersAction() {
 		Minz_View::prependTitle(Minz_Translate::t('users') . ' · ');
 	}
 
+	/**
+	 * This action handles the archive configuration page.
+	 *
+	 * It displays the archive configuration page.
+	 * If this action is reached through a POST request, it stores all new
+	 * configuration values then sends a notification to the user.
+	 *
+	 * The options available on that page are:
+	 *   - duration to retain old article (default: 3)
+	 *   - number of article to retain per feed (default: 0)
+	 *   - refresh frequency (default: -2)
+	 *
+	 * @todo explain why the default value is -2 but this value does not
+	 * exist in the drop-down list
+	 * @todo change the notification code
+	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
 			$old = Minz_Request::param('old_entries', 3);
@@ -306,7 +452,17 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->size_total = $entryDAO->size(true);
 		}
 	}
-	
+
+	/**
+	 * This action handles the user queries configuration page.
+	 *
+	 * If this action is reached through a POST request, it stores all new
+	 * configuration values then sends a notification to the user then
+	 * redirect to the same page.
+	 * If this action is not reached through a POST request, it displays the
+	 * configuration page and verifies that every user query is runable by
+	 * checking if categories and feeds are still in use.
+	 */
 	public function queriesAction() {
 		if (Minz_Request::isPost()) {
 			$queries = Minz_Request::param('queries', array());
@@ -383,7 +539,19 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 		Minz_View::prependTitle(Minz_Translate::t('queries') . ' · ');
 	}
-	
+
+	/**
+	 * This action handles the creation of a user query.
+	 *
+	 * It gets the GET parameters and stores them in the configuration query
+	 * storage. Before it is saved, the unwanted parameters are unset to keep
+	 * lean data.
+	 *
+	 * @todo change the way of keeping lean data to have a more defensive
+	 * code. At the moment, the code accepts any parameters and discard those
+	 * on the black list. I think it is safer if we maintain a whitelist
+	 * instead.
+	 */
 	public function addQueryAction() {
 		$queries = $this->view->conf->queries;
 		$query = Minz_Request::params();
-- 
cgit v1.2.3


From cf01508fa58b5bdd85606fb766a79643a04ca6b7 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 11:25:53 -0400
Subject: Fix typo

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

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 8fae29ea2..7340ca17a 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -206,7 +206,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *   - html5 notification timeout (default: 0)
 	 * Default values are false unless specified.
 	 *
-	 * @todo refactor to theme section to use the same syntax everywhere
+	 * @todo refactor theme section to use the same syntax everywhere
 	 * @todo change the notification code
 	 */
 	public function displayAction() {
-- 
cgit v1.2.3


From bad165b0c424c9c650e22fec11ceecf1748d98e7 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 11:28:46 -0400
Subject: Add a todo

---
 app/Controllers/configureController.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 7340ca17a..99c72d869 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -420,6 +420,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * @todo explain why the default value is -2 but this value does not
 	 * exist in the drop-down list
 	 * @todo change the notification code
+	 * @todo refactor configuration setting syntax to be consistent with the
+	 * other methods
 	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
-- 
cgit v1.2.3


From 5889ef35c8ecbbae948420af9f2b05e7010593ae Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 12:01:36 -0400
Subject: Change todo align

---
 app/Controllers/configureController.php | 14 +++++++-------
 app/Controllers/statsController.php     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 99c72d869..7b8dd672f 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -10,7 +10,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * underlying framework.
 	 *
 	 * @todo see if the category default configuration is needed here or if
-	 * we can move it to the categorize action
+	 *       we can move it to the categorize action
 	 */
 	public function firstAction() {
 		if (!$this->view->loginOk) {
@@ -357,7 +357,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * tab and up.
 	 *
 	 * @todo remove numbers from the list of authorized shortcuts since they
-	 * are used to access shortcuts and user queries
+	 *       are used to access shortcuts and user queries
 	 * @todo change the notification code
 	 */
 	public function shortcutAction() {
@@ -418,10 +418,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *   - refresh frequency (default: -2)
 	 *
 	 * @todo explain why the default value is -2 but this value does not
-	 * exist in the drop-down list
+	 *       exist in the drop-down list
 	 * @todo change the notification code
 	 * @todo refactor configuration setting syntax to be consistent with the
-	 * other methods
+	 *       other methods
 	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
@@ -550,9 +550,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * lean data.
 	 *
 	 * @todo change the way of keeping lean data to have a more defensive
-	 * code. At the moment, the code accepts any parameters and discard those
-	 * on the black list. I think it is safer if we maintain a whitelist
-	 * instead.
+	 *       code. At the moment, the code accepts any parameters and discard
+	 *       those on the black list. I think it is safer if we maintain a
+	 *       whitelist instead.
 	 */
 	public function addQueryAction() {
 		$queries = $this->view->conf->queries;
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 64f66f2fa..256543f37 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -91,7 +91,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 	 *   - month
 	 *
 	 * @todo verify that the metrics used here make some sense. Especially
-	 * for the average.
+	 *       for the average.
 	 */
 	public function repartitionAction() {
 		$statsDAO = FreshRSS_Factory::createStatsDAO();
-- 
cgit v1.2.3


From f87dfbc528f4fa451a2a213fdbd3fcaf27308de8 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 18:09:10 -0400
Subject: Change notification code

Before, it was using the old way to display notifications to the user.
Now, it uses the encapsulated method to do that.
---
 app/Controllers/configureController.php | 63 +++++++--------------------------
 1 file changed, 12 insertions(+), 51 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 7b8dd672f..1e341b412 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -72,13 +72,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			}
 			invalidateHttpCache();
 
-			$notif = array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('categories_updated')
-			);
-			Minz_Session::_param('notification', $notif);
-
-			Minz_Request::forward(array('c' => 'configure', 'a' => 'categorize'), true);
+			Minz_Request::good(_t('categories_updated'),
+		                   array('c' => 'configure', 'a' => 'categorize'));
 		}
 
 		$this->view->categories = $catDAO->listCategories(false);
@@ -107,8 +102,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *   - number of article to retain (default: -2)
 	 *   - refresh frequency (default: -2)
 	 * Default values are empty strings unless specified.
-	 *
-	 * @todo change the notification code
 	 */
 	public function feedAction() {
 		$catDAO = new FreshRSS_CategoryDAO();
@@ -207,7 +200,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * Default values are false unless specified.
 	 *
 	 * @todo refactor theme section to use the same syntax everywhere
-	 * @todo change the notification code
 	 */
 	public function displayAction() {
 		if (Minz_Request::isPost()) {
@@ -235,13 +227,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
-			$notif = array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('configuration_updated')
-			);
-			Minz_Session::_param('notification', $notif);
-
-			Minz_Request::forward(array('c' => 'configure', 'a' => 'display'), true);
+			Minz_Request::good(_t('configuration_updated'),
+				array('c' => 'configure', 'a' => 'display'));
 		}
 
 		$this->view->themes = FreshRSS_Themes::get();
@@ -275,8 +262,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *       - scrolled
 	 *       - received
 	 * Default values are false unless specified.
-	 *
-	 * @todo change the notification code
 	 */
 	public function readingAction() {
 		if (Minz_Request::isPost()) {
@@ -304,13 +289,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Translate::reset();
 			invalidateHttpCache();
 
-			$notif = array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('configuration_updated')
-			);
-			Minz_Session::_param('notification', $notif);
-
-			Minz_Request::forward(array('c' => 'configure', 'a' => 'reading'), true);
+			Minz_Request::good(_t('configuration_updated'),
+				array('c' => 'configure', 'a' => 'reading'));
 		}
 
 		Minz_View::prependTitle(Minz_Translate::t('reading_configuration') . ' · ');
@@ -322,8 +302,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * It displays the sharing configuration page.
 	 * If this action is reached through a POST request, it stores all
 	 * configuration values then sends a notification to the user.
-	 *
-	 * @todo change the notification code
 	 */
 	public function sharingAction() {
 		if (Minz_Request::isPost()) {
@@ -332,13 +310,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->save();
 			invalidateHttpCache();
 
-			$notif = array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('configuration_updated')
-			);
-			Minz_Session::_param('notification', $notif);
-
-			Minz_Request::forward(array('c' => 'configure', 'a' => 'sharing'), true);
+			Minz_Request::good(_t('configuration_updated'),
+				array('c' => 'configure', 'a' => 'sharing'));
 		}
 
 		Minz_View::prependTitle(Minz_Translate::t('sharing') . ' · ');
@@ -358,7 +331,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *
 	 * @todo remove numbers from the list of authorized shortcuts since they
 	 *       are used to access shortcuts and user queries
-	 * @todo change the notification code
 	 */
 	public function shortcutAction() {
 		$list_keys = array('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter',
@@ -384,13 +356,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->save();
 			invalidateHttpCache();
 
-			$notif = array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('shortcuts_updated')
-			);
-			Minz_Session::_param('notification', $notif);
-
-			Minz_Request::forward(array('c' => 'configure', 'a' => 'shortcut'), true);
+			Minz_Request::good(_t('shortcuts_updated'),
+				array('c' => 'configure', 'a' => 'shortcut'));
 		}
 
 		Minz_View::prependTitle(Minz_Translate::t('shortcuts') . ' · ');
@@ -419,7 +386,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *
 	 * @todo explain why the default value is -2 but this value does not
 	 *       exist in the drop-down list
-	 * @todo change the notification code
 	 * @todo refactor configuration setting syntax to be consistent with the
 	 *       other methods
 	 */
@@ -435,13 +401,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$this->view->conf->save();
 			invalidateHttpCache();
 
-			$notif = array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('configuration_updated')
-			);
-			Minz_Session::_param('notification', $notif);
-
-			Minz_Request::forward(array('c' => 'configure', 'a' => 'archiving'), true);
+			Minz_Request::good(_t('configuration_updated'),
+				array('c' => 'configure', 'a' => 'archiving'));
 		}
 
 		Minz_View::prependTitle(Minz_Translate::t('archiving_configuration') . ' · ');
-- 
cgit v1.2.3


From 3753ea8fd673feb16a2bfb323fea2b5ff964d77e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 18:23:25 -0400
Subject: Change parameter settings to be consistent through out the file

---
 app/Controllers/configureController.php | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 1e341b412..0e4c0be52 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -198,17 +198,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *   - display of open action in footer
 	 *   - html5 notification timeout (default: 0)
 	 * Default values are false unless specified.
-	 *
-	 * @todo refactor theme section to use the same syntax everywhere
 	 */
 	public function displayAction() {
 		if (Minz_Request::isPost()) {
 			$this->view->conf->_language(Minz_Request::param('language', 'en'));
-			$themeId = Minz_Request::param('theme', '');
-			if ($themeId == '') {
-				$themeId = FreshRSS_Themes::defaultTheme;
-			}
-			$this->view->conf->_theme($themeId);
+			$this->view->conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
 			$this->view->conf->_content_width(Minz_Request::param('content_width', 'thin'));
 			$this->view->conf->_topline_read(Minz_Request::param('topline_read', false));
 			$this->view->conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
@@ -386,18 +380,12 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 *
 	 * @todo explain why the default value is -2 but this value does not
 	 *       exist in the drop-down list
-	 * @todo refactor configuration setting syntax to be consistent with the
-	 *       other methods
 	 */
 	public function archivingAction() {
 		if (Minz_Request::isPost()) {
-			$old = Minz_Request::param('old_entries', 3);
-			$keepHistoryDefault = Minz_Request::param('keep_history_default', 0);
-			$ttlDefault = Minz_Request::param('ttl_default', -2);
-
-			$this->view->conf->_old_entries($old);
-			$this->view->conf->_keep_history_default($keepHistoryDefault);
-			$this->view->conf->_ttl_default($ttlDefault);
+			$this->view->conf->_old_entries(Minz_Request::param('old_entries', 3));
+			$this->view->conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
+			$this->view->conf->_ttl_default(Minz_Request::param('ttl_default', -2));
 			$this->view->conf->save();
 			invalidateHttpCache();
 
-- 
cgit v1.2.3


From 04403c5dfae2db051416ccf0b41559d02bb0d287 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 18:26:27 -0400
Subject: Remove number values for shortcuts as they are used in the default
 configuration

---
 app/Controllers/configureController.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 0e4c0be52..a44ef3104 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -322,17 +322,13 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * to 9), function keys (f1 to f12), backspace, delete, down, end, enter,
 	 * escape, home, insert, left, page down, page up, return, right, space,
 	 * tab and up.
-	 *
-	 * @todo remove numbers from the list of authorized shortcuts since they
-	 *       are used to access shortcuts and user queries
 	 */
 	public function shortcutAction() {
 		$list_keys = array('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter',
 		                    'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
 		                    'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
 		                    's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
-		                    'z', '0', '1', '2', '3', '4', '5', '6', '7', '8',
-		                    '9', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
+		                    'z', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
 		                    'f10', 'f11', 'f12');
 		$this->view->list_keys = $list_keys;
 
-- 
cgit v1.2.3


From 23e4577e02944567b8ac15581d9c0a0561d82046 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 18:40:08 -0400
Subject: Change param filter for user queries

Before, the filter was based on a blacklist so the user could add something and have unwanted behavior.
Now, the filter is based on a whilelist so the user can use only predetermined parameters.
---
 app/Controllers/configureController.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index a44ef3104..2bd13997f 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -493,18 +493,17 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * It gets the GET parameters and stores them in the configuration query
 	 * storage. Before it is saved, the unwanted parameters are unset to keep
 	 * lean data.
-	 *
-	 * @todo change the way of keeping lean data to have a more defensive
-	 *       code. At the moment, the code accepts any parameters and discard
-	 *       those on the black list. I think it is safer if we maintain a
-	 *       whitelist instead.
 	 */
 	public function addQueryAction() {
+		$whitelist = array('get', 'order', 'name', 'search', 'state');
 		$queries = $this->view->conf->queries;
 		$query = Minz_Request::params();
 		$query['name'] = _t('query_number', count($queries) + 1);
-		unset($query['output']);
-		unset($query['token']);
+		foreach ($query as $key => $value) {
+			if (!in_array($key, $whitelist)) {
+				unset($query[$key]);
+			}
+		}
 		$queries[] = $query;
 		$this->view->conf->_queries($queries);
 		$this->view->conf->save();
-- 
cgit v1.2.3


From c791d84ded1eeb1b32fe81918ac1bcfa520c6bda Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 21 Sep 2014 18:49:34 -0400
Subject: Fix user queries

Before, when adding a user query where the state contains the strict filter, the label applied to the query was wrong.
Now, the strict filter is always removed so the label applied is correct.
---
 app/Controllers/configureController.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 2bd13997f..426cad34d 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -504,6 +504,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				unset($query[$key]);
 			}
 		}
+		if ($query['state'] & FreshRSS_Entry::STATE_STRICT) {
+			$query['state'] -= FreshRSS_Entry::STATE_STRICT;
+		}
 		$queries[] = $query;
 		$this->view->conf->_queries($queries);
 		$this->view->conf->save();
-- 
cgit v1.2.3


From 0ea3a5a3943b30eb6a5d8763b698a939fe1a98ae Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Sep 2014 11:49:32 +0200
Subject: Coding style configureController.php

---
 app/Controllers/configureController.php | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 426cad34d..4422f33af 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -16,7 +16,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		if (!$this->view->loginOk) {
 			Minz_Error::error(
 				403,
-				array('error' => array(Minz_Translate::t('access_denied')))
+				array('error' => array(_t('access_denied')))
 			);
 		}
 
@@ -73,14 +73,14 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('categories_updated'),
-		                   array('c' => 'configure', 'a' => 'categorize'));
+			                   array('c' => 'configure', 'a' => 'categorize'));
 		}
 
 		$this->view->categories = $catDAO->listCategories(false);
 		$this->view->defaultCategory = $catDAO->getDefault();
 		$this->view->feeds = $feedDAO->listFeeds();
 
-		Minz_View::prependTitle(Minz_Translate::t('categories_management') . ' · ');
+		Minz_View::prependTitle(_t('categories_management') . ' · ');
 	}
 
 	/**
@@ -122,7 +122,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			if (!$this->view->flux) {
 				Minz_Error::error(
 					404,
-					array('error' => array(Minz_Translate::t('page_not_found')))
+					array('error' => array(_t('page_not_found')))
 				);
 			} else {
 				if (Minz_Request::isPost() && $this->view->flux) {
@@ -154,12 +154,12 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 						$this->view->flux->faviconPrepare();
 						$notif = array(
 							'type' => 'good',
-							'content' => Minz_Translate::t('feed_updated')
+							'content' => _t('feed_updated')
 						);
 					} else {
 						$notif = array(
 							'type' => 'bad',
-							'content' => Minz_Translate::t('error_occurred_update')
+							'content' => _t('error_occurred_update')
 						);
 					}
 					invalidateHttpCache();
@@ -168,10 +168,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					Minz_Request::forward(array('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true);
 				}
 
-				Minz_View::prependTitle(Minz_Translate::t('rss_feed_management') . ' — ' . $this->view->flux->name() . ' · ');
+				Minz_View::prependTitle(_t('rss_feed_management') . ' — ' . $this->view->flux->name() . ' · ');
 			}
 		} else {
-			Minz_View::prependTitle(Minz_Translate::t('rss_feed_management') . ' · ');
+			Minz_View::prependTitle(_t('rss_feed_management') . ' · ');
 		}
 	}
 
@@ -222,12 +222,12 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('configuration_updated'),
-				array('c' => 'configure', 'a' => 'display'));
+			                   array('c' => 'configure', 'a' => 'display'));
 		}
 
 		$this->view->themes = FreshRSS_Themes::get();
 
-		Minz_View::prependTitle(Minz_Translate::t('display_configuration') . ' · ');
+		Minz_View::prependTitle(_t('display_configuration') . ' · ');
 	}
 
 	/**
@@ -284,10 +284,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('configuration_updated'),
-				array('c' => 'configure', 'a' => 'reading'));
+			                   array('c' => 'configure', 'a' => 'reading'));
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('reading_configuration') . ' · ');
+		Minz_View::prependTitle(_t('reading_configuration') . ' · ');
 	}
 
 	/**
@@ -305,10 +305,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('configuration_updated'),
-				array('c' => 'configure', 'a' => 'sharing'));
+			                   array('c' => 'configure', 'a' => 'sharing'));
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('sharing') . ' · ');
+		Minz_View::prependTitle(_t('sharing') . ' · ');
 	}
 
 	/**
@@ -347,10 +347,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('shortcuts_updated'),
-				array('c' => 'configure', 'a' => 'shortcut'));
+			                   array('c' => 'configure', 'a' => 'shortcut'));
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('shortcuts') . ' · ');
+		Minz_View::prependTitle(_t('shortcuts') . ' · ');
 	}
 
 	/**
@@ -359,7 +359,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * @todo move that action in the user controller
 	 */
 	public function usersAction() {
-		Minz_View::prependTitle(Minz_Translate::t('users') . ' · ');
+		Minz_View::prependTitle(_t('users') . ' · ');
 	}
 
 	/**
@@ -386,10 +386,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			Minz_Request::good(_t('configuration_updated'),
-				array('c' => 'configure', 'a' => 'archiving'));
+			                   array('c' => 'configure', 'a' => 'archiving'));
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('archiving_configuration') . ' · ');
+		Minz_View::prependTitle(_t('archiving_configuration') . ' · ');
 
 		$entryDAO = FreshRSS_Factory::createEntryDao();
 		$this->view->nb_total = $entryDAO->count();
@@ -484,7 +484,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			}
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('queries') . ' · ');
+		Minz_View::prependTitle(_t('queries') . ' · ');
 	}
 
 	/**
-- 
cgit v1.2.3


From a80e12cbf7a38d5a745b8ce980e9c662f9c64dfb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Sep 2014 12:32:49 +0200
Subject: Remove queries at the same time as categories

See https://github.com/marienfressinaud/FreshRSS/issues/625
---
 app/Controllers/configureController.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 4422f33af..d2ca0777f 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -32,7 +32,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * 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 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() {
@@ -56,6 +57,18 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				} elseif ($ids[$key] != $defaultId) {
 					$feedDAO->changeCategory($ids[$key], $defaultId);
 					$catDAO->deleteCategory($ids[$key]);
+
+					// Remove related queries.
+					$final_queries = array();
+					$id_cat_in_query = 'c_' . $ids[$key];
+					foreach ($this->view->conf->queries as $key => $query) {
+						if (empty($query['get']) ||
+								$query['get'] !== $id_cat_in_query) {
+							$final_queries[$key] = $query;
+						}
+					}
+					$this->view->conf->_queries($final_queries);
+					$this->view->conf->save();
 				}
 			}
 
-- 
cgit v1.2.3


From 666162ae56c2df8ae6a7ed6602b69f6caad10c7c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Sep 2014 12:34:44 +0200
Subject: Fix a bug when $query['state'] doesn't exist

Add a test in addQueryAction().
---
 app/Controllers/configureController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index d2ca0777f..e6e9172e6 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -517,7 +517,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 				unset($query[$key]);
 			}
 		}
-		if ($query['state'] & FreshRSS_Entry::STATE_STRICT) {
+		if (!empty($query['state']) && $query['state'] & FreshRSS_Entry::STATE_STRICT) {
 			$query['state'] -= FreshRSS_Entry::STATE_STRICT;
 		}
 		$queries[] = $query;
-- 
cgit v1.2.3


From 5a1baff9be7cf9fe3f59fe2a7dc34fbadacc1a99 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Sep 2014 13:28:09 +0200
Subject: Refactor removing query by get param

See https://github.com/marienfressinaud/FreshRSS/issues/625
---
 app/Controllers/configureController.php | 10 +---------
 app/Models/Configuration.php            | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'app/Controllers/configureController.php')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index e6e9172e6..231865bd7 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -59,15 +59,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					$catDAO->deleteCategory($ids[$key]);
 
 					// Remove related queries.
-					$final_queries = array();
-					$id_cat_in_query = 'c_' . $ids[$key];
-					foreach ($this->view->conf->queries as $key => $query) {
-						if (empty($query['get']) ||
-								$query['get'] !== $id_cat_in_query) {
-							$final_queries[$key] = $query;
-						}
-					}
-					$this->view->conf->_queries($final_queries);
+					$this->view->conf->remove_query_by_get('c_' . $ids[$key]);
 					$this->view->conf->save();
 				}
 			}
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index ea1556cbb..91d2ab846 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -124,6 +124,16 @@ class FreshRSS_Configuration {
 		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';
-- 
cgit v1.2.3