From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 15 Mar 2011 15:53:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b27a284d9804dadbd986eb852e7e5904951b0052;p=cubeextranet.git

---

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 8515fe538..aec6d8767 100644
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -184,7 +184,7 @@ class commonDAOEntreprise extends commonDAO {
 		return true;
 	}
 
-	public function count($limitedToUserRights = false,$table='entreprise_vue')
+	public function count($limitedToUserRights = false,$table='entreprises_vue')
 	{
 		$r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $this->makeWhereFromFiltres() . ' ' . $this->limitToUserRights($limitedToUserRights));
 		return $r->nb;
diff --git a/inc/commons/DAO/class.common.dao.equipier.php b/inc/commons/DAO/class.common.dao.equipier.php
index f76cbcb85..e68773bb5 100644
--- a/inc/commons/DAO/class.common.dao.equipier.php
+++ b/inc/commons/DAO/class.common.dao.equipier.php
@@ -31,7 +31,7 @@ class commonDAOEquipier extends commonDAOUtilisateur {
 	{
 		global $core;
 
-		$sql = $this->getQueryList('equipiers', $q, $orderby, $sens, $limit, $search_id);
+		$sql = $this->getQueryList('equipiers', $q, $orderby, $sens, $limit,false);
 
 		$r = $this->con->select($sql);
 		return $this->factory($r);
diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index d2083f8bc..76d0b2b40 100644
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -163,7 +163,7 @@ class commonDAOUtilisateur extends commonDAO {
 			$where .= $this->whereSearchByName($this->q);
 			$limit = null;
 		} else {
-			$where = $this->makeWhereFromFiltres();
+			$where .= $this->makeWhereFromFiltres();
 		}
 		$where .= ' ' . $wherec . ' )';
 		$where .= $this->limitToUserRights($limitedToUserRights);
@@ -186,7 +186,6 @@ class commonDAOUtilisateur extends commonDAO {
 	public function getListe($orderby = null, $sens = null, $limit = null, $where = null, $limitedToUserRights = false)
 	{
 		$sql = $this->getQueryList('utilisateurs_entreprise', $orderby, $sens, $limit, $where, $limitedToUserRights);
-		fb($sql);
 		$r = $this->con->select($sql);
 		return $this->factory($r);
 	}