(no commit message)

diff --git a/importWs.php b/importWs.php
index 97161ea67f7c2463d99bfc5ef839299c609dc814..8ef292a015ae73545ad2c27c1907ac8eeaf16c33 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -18,8 +18,8 @@ try {
        define('MYSQL_BIN', '/usr/local/mysql/bin/');\r
        // Copie de la base extranet vers extranet_dev\r
        cubeDb::truncateDatabase('extranet_dev');\r
-       cubeDb::mysqlDump(DB_HOST, 'extranet' , DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false, 0);\r
-       cubeDb::mysqlRestore(DB_HOST, DB_NAME, DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false);\r
+       cubeDb::mysqlDump('localhost', 'extranet' , DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false, 0);\r
+       cubeDb::mysqlRestore('localhost', DB_NAME, DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false);\r
        unlink(dirname(__FILE__) . '/dump.sql');\r
 \r
        touch(ROOT . '/cache/DB_TODO');\r

diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index da93e32288627dace0c934aa93a0636537bd2f61..d8e372eb214d8dc3c6fafde72eedfe1b5596bf7f 100644 (file)
--- 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;\r
                }\r
                // Fabrication de la liste des droits à partir de l'arbre\r
-               for($i = 1;$i <= 4;$i++) {\r
+               $j=0;\r
+               for($i = 1;$i <=5;$i++) {\r
                        foreach($this->admins as $admin_id => $list) {\r
-                               $newlist = array_merge(array(), $list);\r
+                               $newlist = $list;\r
                                foreach($list as $uid) {\r
                                        if ($uid != $admin_id && isset($this->admins[$uid])) {\r
                                                $newlist = array_merge($this->admins[$uid], $newlist);\r
                                        }\r
                                }\r
-                               $this->admins[$admin_id] = $newlist;\r
+                               $this->admins[$admin_id] = array_unique($newlist);\r
                        }\r
                }\r
                // Ajout des droits personnels\r
@@ -100,7 +101,7 @@ class wsUsersTree {
                        sort($this->admins[$admin]);\r
                }\r
 \r
-               $c = $core->con->openCursor('utilisateurs');\r
+               $c = $this->con->openCursor('utilisateurs');\r
                foreach($this->admins as $admin => $list) {\r
                        $c->ws_rights = implode(',', $list);\r
                        $c->update('WHERE utilisateur_id=\'' . $this->con->escape($admin) . '\'');\r