(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 1f68c41f3f96c431230bc1198a70010416243076..64e979fd0208c8e0b61f07184a01fcc03a5017cd 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -587,6 +587,7 @@ class wsServices extends cubeFlashGateway {
                        $vroot = WS_COLLECTIONS . '/versions/' . $id . '/' . $version . '/' . $os . '/';\r
 \r
                        $publications = array();\r
+                       $langs = array();\r
 \r
                        foreach ($composition as $k => $g) {\r
                                foreach ($g->publications as $l => $p) {\r
@@ -605,10 +606,14 @@ class wsServices extends cubeFlashGateway {
                                        $couvertures[$p->id] = base64_encode(file_get_contents($couv));\r
                                        $composition[$k]->publications[$l]->width = $book->parametres->width;\r
                                        $composition[$k]->publications[$l]->height = $book->parametres->height;\r
+                                       $composition[$k]->publications[$l]->lang = $book->lang;\r
+                                       $langs[] = $book->lang;\r
                                }\r
                        }\r
 \r
-                       $d = array('id' => $id, 'time' => $version, 'datas' => $composition, 'couvertures' => $couvertures);\r
+                       $langs = array_unique($langs);\r
+\r
+                       $d = array('id' => $id, 'langs' => $langs, 'time' => $version, 'datas' => $composition, 'couvertures' => $couvertures);\r
                        $d = array_merge($d, $this->_getManifest($publications, '/fluidbook/collections/versions/' . $id . '/' . $version . '/' . $os, $books));\r
 \r
                        $dao = new wsDAOCollection($core->con);\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index cea8b7449873452d2e8c91347f5046006d36fa75..83438b1d6dcbe7cb95362ec4c4d56add5e41e5c2 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -144,13 +144,14 @@ class wsHTML5Compiler {
        protected $appcache;
        protected $home;
        protected $widget = true;
+       protected $multiApp = false;
 
        function __construct($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false) {
                global $core;
 
                $this->phonegapVersion = self::getPhonegapVersion($phonegapVersion);
                $this->appcache = $appcache;
-               $this->home = $home;
+               $this->multiApp = $this->home = $home;
 
                if ($version == 'stable') {
                        $this->assets = WS_COMPILE_ASSETS . '/_html5prod';
@@ -829,6 +830,7 @@ class wsHTML5Compiler {
                if ($this->home) {
                        $this->config->home = '%apphome%';
                }
+               $this->config->multiApp = $this->multiApp;
                foreach ($this->additionalConfig as $k => $v) {
                        $this->config->$k = $v;
                }