From a7e833280954a537e12d5a3f4fa12a5b9e8412da Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 14 Jun 2014 08:58:33 +0200
Subject: Improve system of queries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Coding style
- More checks server side
- Default query name is "Query n°X"
- List of queries is moved into nav_menu, in a dropdown
- Better system to remove fields in JS (to a.remove elements, give an
  attibute data-remove="id_to_remove")
- Fix a bug in lib/Mine/Request.php (htmlspecialchars_utf8 can be applied on
  arrays now)
- Few theme improvements
- Add an element .no-mobile to apply to elements which should not appear on
  mobiles

See https://github.com/marienfressinaud/FreshRSS/pull/498
---
 app/Controllers/configureController.php | 66 ++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 22 deletions(-)

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

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 14cd65647..89130cae4 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -302,8 +302,14 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	
 	public function queriesAction () {
 		if (Minz_Request::isPost ()) {
-			$params = Minz_Request::params();
-			$this->view->conf->_queries (isset($params['queries']) ? $params['queries'] : array());
+			$queries = Minz_Request::param('queries', array());
+
+			foreach ($queries as $key => $query) {
+				if (!$query['name']) {
+					$query['name'] = Minz_Translate::t('query_number', $key + 1);
+				}
+			}
+			$this->view->conf->_queries($queries);
 			$this->view->conf->save();
 
 			$notif = array (
@@ -316,25 +322,39 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		} else {
 			$this->view->query_get = array();
 			foreach ($this->view->conf->queries as $key => $query) {
-				if (isset($query['get'])) {
-					switch ($query['get'][0]) {
-						case 'c':
-							$dao = new FreshRSS_CategoryDAO();
-							$category = $dao->searchById(substr($query['get'], 2));
-							$this->view->query_get[$key] = array(
-								'type' => 'category',
-								'name' => $category->name(),
-							);
-							break;
-						case 'f':
-							$dao = new FreshRSS_FeedDAO();
-							$feed = $dao->searchById(substr($query['get'], 2));
-							$this->view->query_get[$key] = array(
-								'type' => 'feed',
-								'name' => $feed->name(),
-							);
-							break;
-					}
+				if (!isset($query['get'])) {
+					continue;
+				}
+
+				switch ($query['get'][0]) {
+				case 'c':
+					$dao = new FreshRSS_CategoryDAO();
+					$category = $dao->searchById(substr($query['get'], 2));
+					$this->view->query_get[$key] = array(
+						'type' => 'category',
+						'name' => $category->name(),
+					);
+					break;
+				case 'f':
+					$dao = new FreshRSS_FeedDAO();
+					$feed = $dao->searchById(substr($query['get'], 2));
+					$this->view->query_get[$key] = array(
+						'type' => 'feed',
+						'name' => $feed->name(),
+					);
+					break;
+				case 's':
+					$this->view->query_get[$key] = array(
+						'type' => 'favorite',
+						'name' => 'favorite',
+					);
+					break;
+				case 'a':
+					$this->view->query_get[$key] = array(
+						'type' => 'all',
+						'name' => 'all',
+					);
+					break;
 				}
 			}
 		}
@@ -345,12 +365,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);
 		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);
 	}
 }
-- 
cgit v1.2.3