(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index c9b93a0cb23e0bd4589fc1f5424626103e01b630..b25c6c677b4f7abb6c173675d031545ca1804fbc 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -290,13 +290,6 @@ class commonCore extends cubeCore {
                $db->themes->index('index_themes_date', 'BTREE', 'date');\r
                $db->themes->reference('fk_themes_icones', 'icones', 'icones', 'icone_id');\r
                $db->themes->reference('fk_themes_proprietaires', 'proprietaire', 'utilisateurs', 'utilisateur_id');\r
-               // Table des droits des themes\r
-               // $db->themes_droits->theme_id('integer', 0, false);\r
-               // $db->themes_droits->utilisateur_id('integer', 0, false);\r
-               // Clés\r
-               // $db->themes_droits->primary('pk_themes_droits', 'theme_id', 'utilisateur_id');\r
-               // $db->themes_droits->reference('fk_themes_droits_theme_id', 'theme_id', 'themes', 'theme_id');\r
-               // $db->themes_droits->reference('fk_themes_droits_utilisateur_id', 'utilisateur_id', 'utilisateurs', 'utilisateur_id');\r
                // Table des langues\r
                $db->langues->lang_id('varchar', 20, false);\r
                $db->langues->font('varchar', 64, false);\r

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 6cedf57fe867a15c4ccfc9b476d8d9575b0446ad..c8b736afa55a01e31029b0edfe19b35dd4808f43 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -14,11 +14,6 @@ class wsMaintenance {
        public static function importFromOldWS($args)\r
        {\r
                global $core;\r
-\r
-               self::importLangs();\r
-               self::importThemes();\r
-               self::importDocs();\r
-               self::importBooks();\r
                // Import des fluidbooks\r
                // Donc le dernier importé est le max dont le numéro est inférieur à 10000\r
                $r = $core->con->select('SELECT MAX(book_id) FROM books WHERE book<10000');\r
@@ -29,20 +24,13 @@ class wsMaintenance {
                while ($r->fetch()) {\r
                        $oldBooks[] = $r->bid;\r
                }\r
-       }\r
 \r
-       protected static function _sqlIn($tab)\r
-       {\r
-               return ' IN(\'' . implode('\',\'', $tab) . '\') ';\r
-       }\r
+               self::importLangs($oldBooks);\r
+               self::importThemes($oldBooks);\r
+               self::importDocs($oldBooks);\r
+               self::importBooks($oldBooks);\r
 \r
-       protected static function _getLangCode($lang)\r
-       {\r
-               $lang = strtolower($lang);\r
-               if ($lang == 'cz') {\r
-                       $lang = 'cs';\r
-               }\r
-               return $lang;\r
+                       $core->refreshWSUsersTree();\r
        }\r
 \r
        public static function importLangs($oldBooks)\r
@@ -116,17 +104,6 @@ class wsMaintenance {
                        $c->parametres = serialize($parametres);\r
                        $c->insert();\r
                }\r
-               $r = $core->con->select('SELECT * FROM ws.theme_user');\r
-               $c = $core->con->openCursor('themes_droits');\r
-               while ($r->fetch()) {\r
-                       $c->utilisateur_id = $r->uid;\r
-                       $c->theme_id = $r->tid;\r
-                       try {\r
-                               $c->insert();\r
-                       }\r
-                       catch(Exception $e) {\r
-                       }\r
-               }\r
        }\r
 \r
        public static function importDocs($oldBooks)\r
@@ -153,7 +130,6 @@ class wsMaintenance {
                        }\r
                        catch(Exception $e) {\r
                        }\r
-                       $docs[$r->did] = true;\r
                }\r
        }\r
 \r
@@ -161,7 +137,7 @@ class wsMaintenance {
        {\r
        }\r
 \r
-       public static function _oldIconesToColor($iid, &$parametres)\r
+       protected static function _oldIconesToColor($iid, &$parametres)\r
        {\r
                global $oldIconesColors;\r
                if (!isset($oldIconesColors)) {\r
@@ -191,7 +167,7 @@ class wsMaintenance {
                return 1;\r
        }\r
 \r
-       public static function _getWsUser($oldid)\r
+       protected static function _getWsUser($oldid)\r
        {\r
                global $ws2ext;\r
                if (!isset($ws2ext[$oldid])) {\r
@@ -199,6 +175,20 @@ class wsMaintenance {
                }\r
                return $ws2ext[$oldid];\r
        }\r
+\r
+       protected static function _sqlIn($tab)\r
+       {\r
+               return ' IN(\'' . implode('\',\'', $tab) . '\') ';\r
+       }\r
+\r
+       protected static function _getLangCode($lang)\r
+       {\r
+               $lang = strtolower($lang);\r
+               if ($lang == 'cz') {\r
+                       $lang = 'cs';\r
+               }\r
+               return $lang;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file