From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 11 Feb 2011 16:57:00 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2fe63fc4e9fefa3392f2525521d0c3006f58a4a9;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index 97161ea67..8ef292a01 100644
--- a/importWs.php
+++ b/importWs.php
@@ -18,8 +18,8 @@ try {
 	define('MYSQL_BIN', '/usr/local/mysql/bin/');
 	// Copie de la base extranet vers extranet_dev
 	cubeDb::truncateDatabase('extranet_dev');
-	cubeDb::mysqlDump(DB_HOST, 'extranet' , DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false, 0);
-	cubeDb::mysqlRestore(DB_HOST, DB_NAME, DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false);
+	cubeDb::mysqlDump('localhost', 'extranet' , DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false, 0);
+	cubeDb::mysqlRestore('localhost', DB_NAME, DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false);
 	unlink(dirname(__FILE__) . '/dump.sql');
 
 	touch(ROOT . '/cache/DB_TODO');
diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index da93e3228..d8e372eb2 100644
--- a/inc/ws/Controlleur/class.ws.users.tree.php
+++ b/inc/ws/Controlleur/class.ws.users.tree.php
@@ -65,15 +65,16 @@ class wsUsersTree {
 			$evu[$c->entreprise_id] = true;
 		}
 		// Fabrication de la liste des droits à partir de l'arbre
-		for($i = 1;$i <= 4;$i++) {
+		$j=0;
+		for($i = 1;$i <=5;$i++) {
 			foreach($this->admins as $admin_id => $list) {
-				$newlist = array_merge(array(), $list);
+				$newlist = $list;
 				foreach($list as $uid) {
 					if ($uid != $admin_id && isset($this->admins[$uid])) {
 						$newlist = array_merge($this->admins[$uid], $newlist);
 					}
 				}
-				$this->admins[$admin_id] = $newlist;
+				$this->admins[$admin_id] = array_unique($newlist);
 			}
 		}
 		// Ajout des droits personnels
@@ -100,7 +101,7 @@ class wsUsersTree {
 			sort($this->admins[$admin]);
 		}
 
-		$c = $core->con->openCursor('utilisateurs');
+		$c = $this->con->openCursor('utilisateurs');
 		foreach($this->admins as $admin => $list) {
 			$c->ws_rights = implode(',', $list);
 			$c->update('WHERE utilisateur_id=\'' . $this->con->escape($admin) . '\'');