(no commit message)

diff --git a/inc/ws/Controlleur/_common.php b/inc/ws/Controlleur/_common.php
index 551049511d73624e77cb91ed4c67995126f66101..43fe49fd3146986af5bf411e9faf69743e6f0a42 100644 (file)
--- a/inc/ws/Controlleur/_common.php
+++ b/inc/ws/Controlleur/_common.php
@@ -10,5 +10,6 @@ $__autoload['wsStats'] = dirname(__FILE__) . '/class.ws.stats.php';
 $__autoload['wsServices'] = dirname(__FILE__) . '/class.ws.services.php';\r
 $__autoload['wsUsersTree'] = dirname(__FILE__) . '/class.ws.users.tree.php';\r
 $__autoload['wsSecureSWF'] = dirname(__FILE__) . '/class.ws.secure.swf.php';\r
+$__autoload['wsMaintenance'] = dirname(__FILE__) . '/class.ws.maintenance.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
new file mode 100644 (file)
index 0000000..ccb6669
--- /dev/null
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -0,0 +1,40 @@
+<?php\r
+\r
+class wsMaintenance {\r
+       public static function in($args)\r
+       {\r
+               $args = cubePage::getArgs($args);\r
+               $f = array_shift($args);\r
+               $callback = array('wsMaintenance', $f);\r
+               if (is_callable($callback)) {\r
+                       return call_user_func($callback, $args);\r
+               }\r
+       }\r
+\r
+       public static function importFromOldWS($args)\r
+       {\r
+               global $core;\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
+               $lastImported = $r->book_id;\r
+               // On recherche maintenant les fluidbook dans la vieille base\r
+               $r = $core->con->select('SELECT bid FROM ws.book WHERE bid>' . $r->book_id);\r
+               $oldBooks = array();\r
+               while ($r->fetch()) {\r
+                       $oldBooks[] = $r->bid;\r
+               }\r
+               // On cherche maintenant à savoir si l'on doit importer de nouveaux documents associés\r
+               $oldDocuments = array();\r
+               $r = $core->con->select('SELECT DISTINCT did FROM ws.book_pages WHERE bid IN(' . implode(',', $oldBooks) . ')');\r
+               while ($r->fetch()) {\r
+                       $oldDocument[] = $r->did;\r
+               }\r
+       }\r
+\r
+       public function importOldBook($r)\r
+       {\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 2284f7e096539a09d315d45d44e08014e28b8648..9b2bf4c4f1ed798ba80061d19f3e254cd482cd95 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -259,6 +259,9 @@ class wsDAODocument extends commonDAO {
        public function getNextId()\r
        {\r
                $r = $this->con->select('SELECT MAX(document_id) AS document_id FROM documents');\r
+               if ($r->document_id < 100000) {\r
+                       return 100000;\r
+               }\r
                return $r->document_id + 1;\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 5180e1f4579ff1145186f6185e095ce4b6038169..ab336a0256ff75c4d8a7f448dd0b4dcf6c960559 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -29,6 +29,9 @@ class wsDAOTheme extends commonDAO {
        public function selectById($theme_id, $table = 'themes_vue')\r
        {\r
                $r = $this->con->select('SELECT * FROM ' . $table . ' WHERE theme_id=\'' . $this->con->escape($theme_id) . '\' LIMIT 1');\r
+               if ($r->theme_id < 1000) {\r
+                       return 1000;\r
+               }\r
                return $this->singleton($r);\r
        }\r
 \r

diff --git a/inc/ws/_common.php b/inc/ws/_common.php
index da8679da753e3ac545723a381109499877634b36..c8c7ba4350b5c8e8c8e069c799de883f71c250ce 100644 (file)
--- a/inc/ws/_common.php
+++ b/inc/ws/_common.php
@@ -8,6 +8,7 @@ $GLOBALS['ajaxClasses'][] = 'wsAjax';
 \r
 $core->url->register('flash', 'flash', '^flash(.*)$', array('wsFlash', 'in'));\r
 $core->url->register('services', 'services', '^services(.*)$', array('wsServices', 'in'));\r
+$core->url->register('maintenance', 'maintenance', '^maintenance(.*)$', array('wsMaintenance', 'in'));\r
 $core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor'));\r
 $core->url->register('viewer', 'viewer', '^viewer/(.*)$', array('wsUrl', 'viewer'));\r
 $core->url->register('vieweru', 'vieweru', '^vieweru/(.*)$', array('wsUrl', 'vieweru'));\r