#fluidbook-workshop : fix preview bug in editor

diff --git a/fluidbook/compile/_protect/protect-send-fluidbook.bat b/fluidbook/compile/_protect/protect-send-fluidbook.bat
index 155e5059f2292a5b0e3563142d09554e0a7838bb..c2c1b4088e55bda002927da15d804503a06039d0 100644 (file)
--- a/fluidbook/compile/_protect/protect-send-fluidbook.bat
+++ b/fluidbook/compile/_protect/protect-send-fluidbook.bat
@@ -2,5 +2,5 @@
 H:\Works\cubeExtranet\fluidbook\compile\_protect\secureSWF.exe H:\Works\cubeExtranet\fluidbook\compile\_protect\fluidbook.sspj H:\Works\cubeExtranet\fluidbook\compile\\r
 "H:\Applications\PortableApps\PuTTYPortable\App\PuTTY\pscp.exe" -agent -batch H:\Works\cubeExtranet\fluidbook\compile\player.swf extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/\r
 "H:\Applications\PortableApps\PuTTYPortable\App\PuTTY\pscp.exe" -agent -batch H:\Works\cubeExtranet\fluidbook\compile\index.swf extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/\r
-"H:\Applications\PortableApps\PuTTYPortable\App\PuTTY\pscp.exe" -agent -batch H:\Works\cubeExtranet\fluidbook\compile\_unprotected\player.swf extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/_unprotected\r
-"H:\Applications\PortableApps\PuTTYPortable\App\PuTTY\pscp.exe" -agent -batch H:\Works\cubeExtranet\fluidbook\compile\_unprotected\index.swf extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/_unprotected
\ No newline at end of file
+"H:\Applications\PortableApps\PuTTYPortable\App\PuTTY\pscp.exe" -agent -batch H:\Works\fluidbook3d\player.swf extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/_unprotected\r
+"H:\Applications\PortableApps\PuTTYPortable\App\PuTTY\pscp.exe" -agent -batch H:\Works\fluidbook3d\index.swf extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/_unprotected
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index cbdbfccdc4d1a9e97a9e2d3ec6aefdfd8ecdbaf8..bdb1f5651cdcd8aa852146dd93562be9319f9fbc 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -21,10 +21,10 @@ class wsFlash extends cubeFlashGateway {
                global $core;
                $dao = new commonDAOUtilisateur($core->con);
                $datas = array('resolution' => $this->args['resolution'],
-                       'objects' => $this->args['objects'],
-                       'method' => $this->args['method'],
-                       'quality' => $this->args['quality'],
-                       'version' => $this->args['version']);
+                              'objects' => $this->args['objects'],
+                              'method' => $this->args['method'],
+                              'quality' => $this->args['quality'],
+                              'version' => $this->args['version']);
                $dao->sauveWSSettings($core->user->utilisateur_id, $datas);
        }
 
@@ -364,7 +364,6 @@ class wsFlash extends cubeFlashGateway {
                        }
 
 
-
                        $t->addAttribute('right', $right);
                        $t->addAttribute('proprietaire', $theme->proprietaire_nom);
                        $t->addAttribute('books', max(($theme->nbBooks) - ($mine ? 1 : 0), 0));
@@ -667,7 +666,7 @@ class wsFlash extends cubeFlashGateway {
                        $book->traductions = wsLang::checkTranslations($book->traductions);
                        if ($book->traductions != array()) {
                                //$bookLang = $this->xml->addChild('book_lang', json_encode($book->traductions));
-                               $bookLang = (array) $book->traductions;
+                               $bookLang = (array)$book->traductions;
                        }
                }
 
@@ -737,7 +736,4 @@ class wsFlash extends cubeFlashGateway {
                $absoluteURL = 'https://' . $_SERVER['HTTP_HOST'] . '/' . $viewer . '/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/';
                $this->xml->addChild('compiledBook', $absoluteURL . 'index.swf?base=' . $absoluteURL);
        }
-
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file