From 73fded2b6f21d72edab914d806dd9b3741338332 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 19 Jan 2011 10:43:08 +0000 Subject: [PATCH] --- inc/commons/DAO/class.common.dao.utilisateur.php | 2 +- inc/commons/class.common.url.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php index d565ada13..4ce39df16 100644 --- a/inc/commons/DAO/class.common.dao.utilisateur.php +++ b/inc/commons/DAO/class.common.dao.utilisateur.php @@ -131,7 +131,7 @@ class commonDAOUtilisateur extends commonDAO { $wherec = $where; $where = '('; if (!is_null($this->q)) { - $where = ''; + if ($this->search_id) { $where .= 'utilisateur_id=\'' . $this->con->escape($this->q) . '\' OR '; diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php index 9d61c3654..1f3168cfc 100644 --- a/inc/commons/class.common.url.php +++ b/inc/commons/class.common.url.php @@ -188,16 +188,16 @@ class commonUrl { $suggestions[] = $book->book_id . ' - ' . $book->nom; } } elseif ($args[1] == 'wsuser') { - $dao = new commonDAOClient($core->con); + $dao = new commonDAOUtilisateur($core->con); $dao->setSearch($q, true); - $clients = $dao->getListe('utilisateur_id','ASC',null,null,' AND ws_grade>0',$core->user); + $clients = $dao->getListe('utilisateur_id','ASC', null, ' AND ws_grade>0', $core->user); foreach($clients as $client) { $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; } } elseif ($args[1] == 'wsadmin') { $dao = new commonDAOUtilisateur($core->con); $dao->setSearch($q, true); - $clients = $dao->getListe('utilisateur_id', 'ASC', null, null, 'AND ws_grade>2',$core->user); + $clients = $dao->getListe('utilisateur_id', 'ASC', null, 'AND ws_grade>2', $core->user); foreach($clients as $client) { $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'; } -- 2.39.5