From 9daa4c14636ca6b70031344f812ac99947b3a2b0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 16 Mar 2013 20:29:24 +0100
Subject: Ajout champs de recherche + désactivation des raccourcis quand un
 input a le focus -> fix bugs #18 et #29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/indexController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/controllers/indexController.php')

diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index 18d9d43c3..79d430f99 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -30,11 +30,13 @@ class indexController extends ActionController {
 		$this->view->get_f = false;
 		$order = $this->view->conf->sortOrder ();
 
+		$search = Request::param ('search');
+
 		$error = false;
 
 		// Récupère les flux par catégorie, favoris ou tous
 		if ($get == 'favoris') {
-			$entries = $entryDAO->listFavorites ($mode, $order);
+			$entries = $entryDAO->listFavorites ($mode, $search, $order);
 			$this->view->get_c = $get;
 			View::prependTitle ('Vos favoris - ');
 		} elseif ($get != false) {
@@ -42,7 +44,7 @@ class indexController extends ActionController {
 			$get = substr ($get, 2);
 
 			if ($typeGet == 'c') {
-				$entries = $entryDAO->listByCategory ($get, $mode, $order);
+				$entries = $entryDAO->listByCategory ($get, $mode, $search, $order);
 				$cat = $catDAO->searchById ($get);
 
 				if ($cat) {
@@ -52,7 +54,7 @@ class indexController extends ActionController {
 					$error = true;
 				}
 			} elseif ($typeGet == 'f') {
-				$entries = $entryDAO->listByFeed ($get, $mode, $order);
+				$entries = $entryDAO->listByFeed ($get, $mode, $search, $order);
 				$feed = $feedDAO->searchById ($get);
 
 				if ($feed) {
@@ -74,7 +76,7 @@ class indexController extends ActionController {
 		// Cas où on ne choisie ni catégorie ni les favoris
 		// ou si la catégorie ne correspond à aucune
 		if (!isset ($entries)) {
-			$entries = $entryDAO->listEntries ($mode, $order);
+			$entries = $entryDAO->listEntries ($mode, $search, $order);
 		}
 
 		try {
-- 
cgit v1.2.3