(no commit message)

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index 91c854568da1334d0d85495f6db651874526a357..a5ab3431e91d54b90b6eb66a2f063212ea569382 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -10,9 +10,14 @@ function getWmode(){
 function getLocation(){\r
        return window.location.toString();\r
 }\r
-function getFlashvars(junk){\r
+function getFlashvars(junk,fv){\r
+       \r
+       var res={};\r
+       if(fv!=undefined){\r
+               res=fv;\r
+       }\r
+       \r
        var couples=window.location.search.substr(1).split('&');\r
-       var res=new Array();\r
        var couple=new Array();\r
        for (var i=0;i<couples.length;i++){\r
                couple=couples[i].split('=');\r

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index f5df8db3f8800bfe5b2b7b9b89cd93c56f5f5d89..da2c19e2eeb91415b106e34970196b5bade733ff 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -7,7 +7,7 @@
                <meta http-equiv="Expires" content="0" />\r
                <meta http-equiv="Expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />\r
                <meta http-equiv="Pragma" content="no-cache" />\r
-               <meta http-equiv="X-UA-Compatible" content="IE=9" />\r
+               <meta http-equiv="X-UA-Compatible" content="IE=Edge" />\r
                $favicon\r
                $robots\r
                $facebook\r
@@ -23,7 +23,7 @@
                        }else if(isBadMobile()){\r
                                $redirectPDF\r
                        }else{\r
-                               swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","", getFlashvars($junk),     {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
+                               swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","",getFlashvars($junk,$fv),{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
                        }\r
                </script>\r
        </head>\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index ac06a442d591e5b244720a6e743a1aa5cae36f69..95a9842d59953f12035ea0e6a17ed06f0c41d4b7 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -245,8 +245,13 @@ class wsAjax extends cubeAjax {
                        $x->addOpenPopup($popup);\r
                        return;\r
                }\r
+               \r
+               $version='html';\r
+               if($book->parametres->version==1){\r
+                       $version='v1';\r
+               }\r
 \r
-               $package = wsPackager::package($book_id, 'html', false);\r
+               $package = wsPackager::package($book_id, $version, false);\r
 \r
                if ($server == 'references') {\r
                        $root = '/home/fluidbook/dev/references';\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 7fb481a7fddf67802eec9ee930a4adf34c546a1a..ffb344e719b2def3b0192b9253ae4a2cf2cb1032 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -40,7 +40,7 @@ class wsPackagerHTML extends wsPackager {
 \r
                $ga = '';\r
                if ($this->book->parametres->googleAnalyticsCustom) {\r
-                       $ga=$this->book->parametres->googleAnalyticsCustom;\r
+                       $ga = $this->book->parametres->googleAnalyticsCustom;\r
                } elseif ($this->book->parametres->googleAnalytics != '') {\r
                        $variables = array('Language' => array('value' => 'getLang()', 'valueAsJS' => true, 'scope' => 2));\r
                        $ga = cubePage::googleAnalytics(explode(',', $this->book->parametres->googleAnalytics), true, $variables);\r
@@ -99,7 +99,8 @@ class wsPackagerHTML extends wsPackager {
                        'junk' => TIME,\r
                        'robots' => $robots,\r
                        'favicon' => $favicon,\r
-                       'flashversion' => $this->getMinFlashVersion());\r
+                       'flashversion' => $this->getMinFlashVersion(),\r
+                       'fv' => json_encode($this->getFlashvars()));\r
 \r
                $this->origHTML = file_get_contents($this->vdir . '/index.html');\r
                $this->origHTML = $this->replaceHTML($toReplace);\r
@@ -152,6 +153,10 @@ class wsPackagerHTML extends wsPackager {
                }\r
        }\r
 \r
+       protected function getFlashvars() {\r
+               return array();\r
+       }\r
+\r
        public function prepareHTML5() {\r
                if (!$this->whole) {\r
                        return;\r

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index ac5f5b483429aa41f827787cd880bf8dcd710eff..30cb258f6bcd04fab343da5bc954ad37f03f4232 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -57,6 +57,13 @@ class wsPackagerV1 extends wsPackagerHTML {
                file_put_contents($this->vdir . '/data/texts.xml', $xml->asXML());
        }
 
+       protected function getFlashvars() {
+               return array('id' => $this->book_id,
+                       'mail' => '0',
+                       'onlineFlag' => '1',
+                       'loaderColor' => $this->theme->parametres->loadingBackColor);
+       }
+
        protected function copyLinks() {
                global $core;
 
@@ -95,7 +102,7 @@ class wsPackagerV1 extends wsPackagerHTML {
                        }
 
                        if ($this->_copyWorkingFile($link['to']) && !in_array($link->type, array(4, 6))) {
-                               $link['to'] = 'data/' . $link['to'];
+                               //$link['to'] = 'data/' . $link['to'];
                        }
 
                        $one->addChild('page', $link['page']);
@@ -106,10 +113,10 @@ class wsPackagerV1 extends wsPackagerHTML {
                        $one->addChild('startY', $link['top']);
                        $one->addChild('endY', $link['top'] + $link['height']);
                        $one->addChild('tooltip', $link['infobulle']);
-                       if($link['type']==4){
-                               $one->addChild('soundOn',$link['video_sound_on']);
-                               $one->addChild('loopFlag',$link['video_loop']);
-                               $one->addChild('playerActive',$link['video_auto_start']);
+                       if ($link['type'] == 4) {
+                               $one->addChild('soundOn', $link['video_sound_on']);
+                               $one->addChild('loopFlag', $link['video_loop']);
+                               $one->addChild('playerActive', $link['video_auto_start']);
                        }
                }