(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index ae0d6467233666e01de4c4a6367d218e1ffa5e15..514d1c9d4c81e3b46caee08a80d013866ab81b17 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -249,17 +249,19 @@ class wsAjax extends cubeAjax {
                        return;\r
                }\r
 \r
+               fb(time(), 'start making package');\r
                $version = 'html';\r
                if ($book->parametres->version == 1) {\r
                        $version = 'v1';\r
                }\r
                if (stristr($server, 'phonegap')) {\r
                        $version = 'phonegap';\r
+                       $packager = new wsPackagerPhonegap($book_id, null, true, false);\r
+                       $package = $packager->makePackage(false);\r
+               } else {\r
+                       $package = wsPackager::package($book_id, $version, false);\r
                }\r
 \r
-               fb(time(), 'start making package');\r
-               $package = wsPackager::package($book_id, $version, false);\r
-\r
                fb(time(), 'start transfert');\r
                if ($server == 'references') {\r
                        $root = '/home/fluidbook/dev/references';\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 91e33f46b8bd83755d51824cfd0b7fef79a8a583..76d07a189d02ccea8c9bc06f53c7a671a37fff8c 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -334,7 +334,7 @@ class wsUrl {
                $res .= commonPage::bf();\r
 \r
                $res .= commonPage::bh();\r
-               $res .= cubeLang::translationForm(array(PLAYER_SOURCES, WS_COMPILE_ASSETS . '/_html5/js'), $lang_id, null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
+               $res .= cubeLang::translationForm(array(PLAYER_SOURCES, WS_COMPILE_ASSETS . '/_html5'), $lang_id, null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
                $res .= commonPage::bf();\r
                $res .= '</form>';\r
                return $res;\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 7b6b3b7f293f187e6decfb82404b69a3931cbd68..aed944343a07b8f35bf868b70f8ec83ee0417b76 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -894,7 +894,7 @@ class wsDAOBook extends commonDAO {
                                if (is_dir($source)) {\r
                                        continue;\r
                                }\r
-                               copy($source, $localPath);\r
+                               $this->copy($source, $localPath);\r
                        }\r
                }\r
 \r
@@ -903,6 +903,7 @@ class wsDAOBook extends commonDAO {
                        $cp = new cubeCommandLine('cp');\r
                        $cp->setPath(CONVERTER_PATH);\r
                        $cp->setArg('r');\r
+                       $cp->setArg('p');\r
                        $cp->setArg(null, $workingDir . 'media');\r
                        $cp->setArg(null, $finalDir . 'data');\r
                        $cp->execute();\r
@@ -911,6 +912,11 @@ class wsDAOBook extends commonDAO {
                return $res;\r
        }\r
 \r
+       public function copy($source, $dest) {\r
+               copy($source, $dest);\r
+               touch($dest, filemtime($dest));\r
+       }\r
+\r
        public function compileAir($book_id) {\r
                $compilerDir = WS_BOOKS . '/air/' . $book_id . '/compiler';\r
                $finalDir = WS_BOOKS . '/air/' . $book_id . '/';\r
@@ -1331,7 +1337,7 @@ class wsDAOBook extends commonDAO {
                        $replace = WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfReplace;\r
                        if (file_exists($replace)) {\r
                                if (!file_exists($finalPDF) || filemtime($finalPDF) < filemtime($replace) || filesize($finalPDF) != filesize($replace)) {\r
-                                       copy($replace, $finalPDF);\r
+                                       $this->copy($replace, $finalPDF);\r
                                }\r
                                return;\r
                        }\r
@@ -1382,7 +1388,7 @@ class wsDAOBook extends commonDAO {
                }\r
 \r
                if ($original) {\r
-                       copy(WS_DOCS . '/' . $firstDoc . '/crop.pdf', $finalPDF);\r
+                       $this->copy(WS_DOCS . '/' . $firstDoc . '/crop.pdf', $finalPDF);\r
                        return;\r
                }\r
 \r
@@ -1429,7 +1435,7 @@ class wsDAOBook extends commonDAO {
                        $alldocs = array_keys($pdfList);\r
                        $doc = array_pop($alldocs);\r
                        if ($nb_pages[$doc] == $ranges[0]['end']) {\r
-                               copy($doc, $finalPDF);\r
+                               $this->copy($doc, $finalPDF);\r
                                return;\r
                        }\r
                }\r
@@ -1448,13 +1454,13 @@ class wsDAOBook extends commonDAO {
 \r
                $cached = WS_BOOKS . '/pdf/' . $hash . '.pdf';\r
                if (file_exists($cached)) {\r
-                       copy($cached, $finalPDF);\r
+                       $this->copy($cached, $finalPDF);\r
                } else {\r
                        $pdftk = new cubeCommandLine('pdftk');\r
                        $pdftk->setPath(CONVERTER_PATH);\r
                        $pdftk->setManualArg($args);\r
                        $pdftk->execute();\r
-                       copy($finalPDF, $cached);\r
+                       $this->copy($finalPDF, $cached);\r
                }\r
        }\r
 \r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 20a60aecc8534353d62e34dbb1520bcc433d0878..f333abff5fe94230001a6a9e8edaf7904f0e1382 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -256,8 +256,10 @@ class wsBookParametres extends wsParametres {
 \r
                $this->fields['mobilePlugins'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Plugin'), 'grade' => 5);\r
 \r
+               $this->fields['mobileVideosPath'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Chemin vers les vidéos'), 'grade' => 5);\r
+\r
                $this->forms['mobile'] = array('label' => __('Version mobile'),\r
-                       'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'mobileIconVector', 'mobilePlugins'));\r
+                       'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'mobileIconVector', 'mobilePlugins', '|', 'mobileVideosPath'));\r
 \r
                $this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');\r
                $this->fields['phonegapVersion'] = array('type' => 'text', 'default' => '1.0.0', 'editable' => true, 'label' => __("Version de l'application"), 'grade' => 5, 'hint' => __('De la forme') . ' 1.2.3');\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 44e7dabd17d231c1dbfd401011a1bbc2350fdc93..d9b5fec8a6ce053f23f7c0218d2b3a5997c2e48f 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -17,7 +17,7 @@ class wsHTML5Compiler {
                }
        }
 
-       protected static $resolutions = array(150, 36);
+       protected static $resolutions = array(150);
        protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', '');
        public $jsFiles = array(
                'js/libs/fix/ios-orientation.js',
@@ -123,6 +123,8 @@ class wsHTML5Compiler {
        function __construct($book_id, $version = 'stable', $phonegap = false, $dir = null) {
                global $core;
 
+               $this->videoPath = $videoPath;
+               $this->makeResources = $resources;
                if ($version == 'stable') {
                        $this->assets = WS_COMPILE_ASSETS . '/_html5prod';
                        wsMaintenance::updateHTML5Sources(array(), false);
@@ -458,6 +460,9 @@ class wsHTML5Compiler {
                foreach ($this->jsFiles as $js) {
                        $scripts[] = '<script type="text/javascript" src="' . $js . '"></script>';
                }
+               foreach ($this->pluginJs as $js) {
+                       $scripts[] = '<script type="text/javascript" src="' . $js . '"></script>';
+               }
 
                $scripts[] = '<script type="text/javascript" src="data/datas.js"></script>';
                $script = implode("\n\t\t", $scripts);
@@ -933,6 +938,10 @@ class wsHTML5Compiler {
        }
 
        public function copyLinkFile($source, $dest, $video = false) {
+               if ($video && $this->book->parametres->mobileVideosPath != '') {
+                       return;
+               }
+
                $origDir = WS_BOOKS . '/working/' . $this->book_id . '/';
                $types = $this->getVideosFormats();
                if ($video) {
@@ -946,6 +955,7 @@ class wsHTML5Compiler {
                        }
                }
 
+
                if (!is_array($source)) {
                        $source = array($source);
                }

diff --git a/inc/ws/Util/packager/class.ws.packager.phonegap.php b/inc/ws/Util/packager/class.ws.packager.phonegap.php
index 03415cd2aadd66cda44cf4fe2263021d1ad01aed..b7a5b2293ac962535afa28555e6de3be5f286657 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.phonegap.php
+++ b/inc/ws/Util/packager/class.ws.packager.phonegap.php
@@ -3,8 +3,10 @@
 class wsPackagerPhonegap extends wsPackager {
 
        protected $resources = '';
+       protected $makeResources = true;
 
-       public function __construct($book_id, $vdir = null, $whole = true) {
+       public function __construct($book_id, $vdir = null, $whole = true, $makeResources = true) {
+               $this->makeResources = $makeResources;
                parent::__construct($book_id, $vdir, $whole);
                $this->version = 'phonegap';
        }
@@ -20,9 +22,11 @@ class wsPackagerPhonegap extends wsPackager {
                unlink($this->vdir . '/widget.html');
                unlink($this->vdir . '/cache.appcache');
 
-               $this->resources = $this->vdir . '/Resources';
 
-               $this->makeResources();
+               if ($this->makeResources) {
+                       $this->resources = $this->vdir . '/Resources';
+                       $this->makeResources();
+               }
        }
 
        protected function makeResources() {