(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index a27186acc7a9fdcf67211bae365f0cfafff9a7cf..05d23aebeae822de5aaf21b6006d9c5168879e52 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1,8 +1,8 @@
 <?php\r
 \r
 class wsMaintenance {\r
-       public static function in($args)\r
-       {\r
+\r
+       public static function in($args) {\r
                $args = cubePage::getArgs($args);\r
                $f = array_shift($args);\r
                $callback = array('wsMaintenance', $f);\r
@@ -11,8 +11,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       public static function resetLinks($args)\r
-       {\r
+       public static function resetLinks($args) {\r
                global $core;\r
                $book_id = $args[0];\r
                $dao = new wsDAODocument($core->con);\r
@@ -23,8 +22,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       public static function compactLinks()\r
-       {\r
+       public static function compactLinks() {\r
                global $core;\r
                $r = $core->con->select('SELECT * FROM `document_links_versions` GROUP BY document_id,links,rulers');\r
                $keep = array();\r
@@ -35,13 +33,12 @@ class wsMaintenance {
                        $keep[$r->document_id][] = $r->update;\r
                }\r
 \r
-               foreach($keep as $document_id => $dates) {\r
+               foreach ($keep as $document_id => $dates) {\r
                        $core->con->execute('DELETE FROM document_links_versions WHERE document_id=' . $document_id . ' AND `update` NOT IN(' . implode(',', $dates) . ')');\r
                }\r
        }\r
 \r
-       public static function checkSerializeLinks()\r
-       {\r
+       public static function checkSerializeLinks() {\r
                global $core;\r
                $r = $core->con->select('SELECT * FROM document_links_versions');\r
                while ($r->fetch()) {\r
@@ -56,8 +53,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       public static function moveLinksToVersionDB()\r
-       {\r
+       public static function moveLinksToVersionDB() {\r
                global $core;\r
                $r = $core->con->select('SELECT * FROM document_links');\r
                $d = array();\r
@@ -75,24 +71,22 @@ class wsMaintenance {
                }\r
 \r
                $c = $core->con->openCursor('document_links_versions');\r
-               foreach($d as $document_id => $updates) {\r
+               foreach ($d as $document_id => $updates) {\r
                        $c->document_id = $document_id;\r
-                       foreach($updates as $date => $dummy) {\r
+                       foreach ($updates as $date => $dummy) {\r
                                $c->update = $date;\r
                                $c->links = json_encode($d[$document_id][$date]['links']);\r
                                $c->rulers = json_encode($d[$document_id][$date]['rulers']);\r
                                try {\r
                                        $c->insert();\r
-                               }\r
-                               catch(Exception $e) {\r
+                               } catch (Exception $e) {\r
                                        // fb($e);\r
                                }\r
                        }\r
                }\r
        }\r
 \r
-       public static function importFromOldWS($args)\r
-       {\r
+       public static function importFromOldWS($args) {\r
                global $core;\r
                // Import des fluidbooks\r
                // Donc le dernier importé est le max dont le numéro est inférieur à 10000\r
@@ -114,8 +108,7 @@ class wsMaintenance {
                $core->refreshWSUsersTree();\r
        }\r
 \r
-       public static function importLangs($oldBooks)\r
-       {\r
+       public static function importLangs($oldBooks) {\r
                global $core, $allTrads, $trads;\r
                // On regarde d'abord les langues que nous avons déjà\r
                $r = $core->con->select('SELECT lang_id FROM langues');\r
@@ -148,7 +141,7 @@ class wsMaintenance {
                        $trad[$idl][$r->ord] = $r->text;\r
                }\r
 \r
-               foreach($trad as $idl => $t) {\r
+               foreach ($trad as $idl => $t) {\r
                        $traductions = wsLang::getTraductionWithId($trad[$idl]);\r
                        $allTrads[$idl] = $traductions;\r
                }\r
@@ -157,7 +150,7 @@ class wsMaintenance {
                        return;\r
                }\r
 \r
-               foreach($toImport as $idl) {\r
+               foreach ($toImport as $idl) {\r
                        $idl = self::_getLangCode($idl);\r
 \r
                        $c = $core->con->openCursor('langues');\r
@@ -169,8 +162,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       public static function importThemes($oldBooks)\r
-       {\r
+       public static function importThemes($oldBooks) {\r
                global $core, $signatures;\r
 \r
                $r = $core->con->select('SELECT tid,sigid FROM ws.theme');\r
@@ -207,8 +199,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       public static function importDocs($oldBooks)\r
-       {\r
+       public static function importDocs($oldBooks) {\r
                global $core;\r
                // On cherche maintenant à savoir si l'on doit importer de nouveaux documents associés\r
                $oldDocuments = array();\r
@@ -229,15 +220,13 @@ class wsMaintenance {
                        $c->version = 1;\r
                        try {\r
                                $c->insert();\r
-                       }\r
-                       catch(Exception $e) {\r
+                       } catch (Exception $e) {\r
                                fb($e);\r
                        }\r
                }\r
        }\r
 \r
-       public static function importBooks($oldBooks)\r
-       {\r
+       public static function importBooks($oldBooks) {\r
                global $core, $allTrads, $signatures;\r
                // Importe les fluidbooks\r
                $r = $core->con->select('SELECT * FROM ws.book WHERE bid ' . self::_sqlIn($oldBooks) . ' ORDER BY bid');\r
@@ -270,16 +259,17 @@ class wsMaintenance {
                        if ($xml !== false) {\r
                                $parametres->fromXML($xml);\r
                        } else {\r
+                               \r
                        }\r
 \r
                        $n = array();\r
                        // Pages sans numéro\r
-                       $offset = $r->first_page_nr-1;\r
-                       for($i = 0;$i < $offset;$i++) {\r
+                       $offset = $r->first_page_nr - 1;\r
+                       for ($i = 0; $i < $offset; $i++) {\r
                                $n[] = '';\r
                        }\r
                        // Pages avec numero\r
-                       for($j = 1;$j + $offset <= $r->pages;$j++) {\r
+                       for ($j = 1; $j + $offset <= $r->pages; $j++) {\r
                                $n[] = $j;\r
                        }\r
                        $c->numerotation = implode(',', $n);\r
@@ -294,8 +284,7 @@ class wsMaintenance {
                $core->con->execute('INSERT INTO book_pages (book_id,book_page,document_id,document_page) SELECT bid,bpid,did,dpid FROM ws.book_pages WHERE bid ' . self::_sqlIn($oldBooks));\r
        }\r
 \r
-       protected static function _oldIconesToColor($iid, &$parametres)\r
-       {\r
+       protected static function _oldIconesToColor($iid, &$parametres) {\r
                global $oldIconesColors;\r
                if (!isset($oldIconesColors)) {\r
                        $oldIconesColors = array();\r
@@ -309,7 +298,7 @@ class wsMaintenance {
                $line = $oldIconesColors[$iid];\r
                if ($line['iid'] != '') {\r
                        $parametres->iconSet = $line['iid'];\r
-                       $parametres->iconsHMargin = $line['iid'] == 1?20:0;\r
+                       $parametres->iconsHMargin = $line['iid'] == 1 ? 20 : 0;\r
                        $parametres->menuHeight = 39;\r
                        $parametres->colorizeIcons = false;\r
                        $parametres->couleurI = 'ffffff';\r
@@ -322,8 +311,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       protected static function _getWsUser($oldid)\r
-       {\r
+       protected static function _getWsUser($oldid) {\r
                global $ws2ext;\r
                if (!isset($ws2ext)) {\r
                        self::_getAllUsers();\r
@@ -337,8 +325,7 @@ class wsMaintenance {
                return $ws2ext[$oldid];\r
        }\r
 \r
-       protected static function _getAllUsers()\r
-       {\r
+       protected static function _getAllUsers() {\r
                global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades, $utilisateurs;\r
                $grades = array(0 => 1, 0.4 => 1, '0.4' => 1, 0.5 => 1, '0.5' => 1, 1 => 1, 2 => 2, 3 => 3, 4 => 5);\r
                // Contrôle des entreprises déjà dans la base extranet\r
@@ -376,8 +363,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       protected static function _importOldUser($oldid)\r
-       {\r
+       protected static function _importOldUser($oldid) {\r
                global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades, $utilisateurs;\r
                // Get user from old\r
                $r = $core->con->select('SELECT * FROM ws.user WHERE uid=\'' . $core->con->escape($oldid) . '\'');\r
@@ -459,13 +445,11 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       protected static function _sqlIn($tab)\r
-       {\r
+       protected static function _sqlIn($tab) {\r
                return ' IN(\'' . implode('\',\'', $tab) . '\') ';\r
        }\r
 \r
-       protected static function _getLangCode($lang)\r
-       {\r
+       protected static function _getLangCode($lang) {\r
                $lang = strtolower($lang);\r
                if ($lang == 'cz') {\r
                        $lang = 'cs';\r
@@ -473,15 +457,12 @@ class wsMaintenance {
                return $lang;\r
        }\r
 \r
-       public static function dumpDatabase()\r
-       {\r
-               cubeDb::mysqlDump('localhost', DB_NAME , DB_USER , DB_PASSWORD , ROOT . '/backups/dump-' . date('Y-m-d-H-i-s') . '.sql', true, 8);\r
+       public static function dumpDatabase() {\r
+               cubeDb::mysqlDump('localhost', DB_NAME, DB_USER, DB_PASSWORD, ROOT . '/backups/dump-' . date('Y-m-d-H-i-s') . '.sql', true, 8);\r
        }\r
 \r
-       public static function cleanPackages()\r
-       {\r
+       public static function cleanPackages() {\r
                $limit = TIME - (4 * 3600); // 4 heures avant maintenant*\r
-\r
                // Clean downloaded packages\r
                $dir = WS_FILES . '/packager/download/';\r
                $dr = opendir($dir);\r
@@ -513,8 +494,7 @@ class wsMaintenance {
                }\r
        }\r
 \r
-       public static function cleanConversionSessions()\r
-       {\r
+       public static function cleanConversionSessions() {\r
                $limit = TIME - (4 * 3600); // 4 heures avant maintenant*\r
 \r
                $dir = ROOT . '/cache/conversionSessions/';\r
@@ -530,6 +510,19 @@ class wsMaintenance {
                        unlink($f);\r
                }\r
        }\r
+\r
+       public static function moveFluidbookDatas() {\r
+               $dir = WS_BOOKS . '/final/';\r
+               $dr = opendir($dir);\r
+               while ($d = readdir($dr)) {\r
+                       if ($d == '.' || $d == '..' || !is_dir($dir . $d)) {\r
+                               continue;\r
+                       }\r
+                       rename($dir . $d . '/FluidbookDatas.swf', $dir . $d . '/data/fd.swf');\r
+                       rename($dir . $d . '/FluidbookDatasLight.swf', $dir . $d . '/data/fdl.swf');\r
+               }\r
+       }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 825256f780e67d1530eb82b7d8a4fa857454a588..14d14cf1bbc5488ce14fcfc691c497b37e722036 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -761,8 +761,8 @@ class wsDAOBook extends commonDAO {
                $res .= $flexLight->compile();\r
 \r
 \r
-               $filesToCopy['FluidbookDatas.swf'] = $compilerDir . '/FluidbookDatas.swf';\r
-               $filesToCopy['FluidbookDatasLight.swf'] = $compilerDir . '/FluidbookDatasLight.swf';\r
+               $filesToCopy['data/fd.swf'] = $compilerDir . '/FluidbookDatas.swf';\r
+               $filesToCopy['data/fdl.swf'] = $compilerDir . '/FluidbookDatasLight.swf';\r
                // Copy of files\r
                // Check if dest dir exists\r
                if (!file_exists($finalDir . 'data')) {\r

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
index 69d112f11000993ddaa7a6ac723d6e07fd50baf9..6374f6a34fbf0616f8ab2467088611baaf317b6d 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
@@ -16,7 +16,6 @@ class wsPackagerMacEXE extends wsPackager {
 \r
                $this->copyFluidbookFiles();\r
                $this->copyOtherFiles(array('Fluidbook.app.zip'));\r
-               $this->moveDatasSWF();\r
        }\r
 \r
        public function makePackage()\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.cd.php b/inc/ws/Util/packager/class.ws.packager.win.cd.php
index d3707f6c385427020bed2b5a6d8d213fe5f9bce3..16843462c09f661dea91b916e28b43587d2abb6c 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.cd.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.cd.php
@@ -16,7 +16,6 @@ class wsPackagerWinCD extends wsPackagerMacEXE {
                        'Fluidbook.exe' => 'Windows-PC-' . $this->exeName . '.exe',\r
                        'Fluidbook.app.zip'));\r
                $this->replaceAutorun();\r
-               $this->moveDatasSWF();\r
        }\r
 \r
        public function replaceAutorun() {\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.php b/inc/ws/Util/packager/class.ws.packager.win.exe.php
index f8efed8c0a364672e4e47a00268ed61c6afafa39..3c8515e7465cc4b6330874e9b3ef7b51b6e13393 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.php
@@ -16,7 +16,6 @@ class wsPackagerWinEXE extends wsPackager {
 \r
                $this->copyFluidbookFiles();\r
                $this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName));\r
-               $this->moveDatasSWF();\r
        }\r
 \r
        public function makePackage() {\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.php b/inc/ws/Util/packager/class.ws.packager.win.inst.php
index d03b6879ffe342f53b0f5fce58b969aac022577a..d5f9b872025973d9e99d50a9c29fb20a0fdbadeb 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -14,7 +14,6 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 \r
                $this->copyFluidbookFiles();\r
                $this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName));\r
-               $this->moveDatasSWF();\r
 \r
                $this->makeNSI();\r
        }\r