(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 630e541a9d3c90f8feeeee87e4c7f9b75cfc936d..f01e7d1b4284bef0764ec1867d85496298bcadd7 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -975,7 +975,7 @@ class wsDAOBook extends commonDAO {
 \r
        public function copy($source, $dest) {\r
                copy($source, $dest);\r
-               touch($dest, filemtime($dest));\r
+               touch($dest, filemtime($source));\r
        }\r
 \r
        public function compileAir($book_id) {\r
@@ -1427,6 +1427,8 @@ class wsDAOBook extends commonDAO {
                                $invalid = true;\r
                        }\r
 \r
+                       fb($invalid, 'invalid ?');\r
+\r
                        if ($invalid) {\r
                                $pdfList = array();\r
                                $pagesList = array();\r
@@ -1457,6 +1459,7 @@ class wsDAOBook extends commonDAO {
                                }\r
 \r
                                if ($original) {\r
+                                       fb($normalPDF, 'original');\r
                                        $this->copy(WS_DOCS . '/' . $firstDoc . '/crop.pdf', $normalPDF);\r
                                } else {\r
                                        $args = '';\r
@@ -1520,6 +1523,9 @@ class wsDAOBook extends commonDAO {
                                        $args .= ' output ' . $normalPDF;\r
 \r
                                        $cached = WS_BOOKS . '/pdf/' . $hash . '.pdf';\r
+\r
+                                       fb($cached);\r
+\r
                                        if (file_exists($cached)) {\r
                                                $this->copy($cached, $normalPDF);\r
                                        } else {\r
@@ -1551,6 +1557,9 @@ class wsDAOBook extends commonDAO {
                                $gs->setArg('-dAutoRotatePages=/None');\r
                                $gs->setArg(null, $normalPDF);\r
                                $gs->execute();\r
+\r
+                               fb($gs->commande);\r
+                               fb($gs->output);\r
                        }\r
                        copy($compressedPDF, $finalPDF);\r
                } else {\r

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index cdda4fde62ffa6509b636daf89a14df96f3bf2df..9cbb2fb03cdba117422d9eec424185b2c7e15f77 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -113,7 +113,7 @@ class wsExporter {
 
        protected function _transfertPhonegap($os, $package, $destination) {
                if ($os == 'android') {
-                       $this->_lftp($package, 'ftp://android:DlSa1LGw@paris.cubedesigners.com:22122/' . $destination, false, true);
+                       $this->_rsync($package, '/home/dev/Works/Phonegap/Projects/' . $destination, true);
                } else if ($os == 'ios') {
                        $this->_rsync($package, '/mnt/macbook/Phonegap/Projects/' . $destination, true);
                }
@@ -163,14 +163,19 @@ class wsExporter {
                $lftp->execute();
        }
 
-       protected function _rsync($src, $dest, $erase = false) {
-
+       protected function _rsync($src, $dest, $erase = false, $chown = null) {
+               if (!is_null($chown)) {
+                       
+               }
                if (is_file($src)) {
                        $dir = dirname($dest);
                        if (!file_exists($dir)) {
                                mkdir($dir, 0777, true);
                        }
                        copy($src, $dest);
+                       if (!is_null($chown)) {
+                               `chown $chown $dest`;
+                       }
                        return;
                }
 
@@ -190,6 +195,10 @@ class wsExporter {
                $cp->setArg(null, $src . '*');
                $cp->setArg(null, $dest);
                $cp->execute();
+
+               if (!is_null($chown)) {
+                       `chown -R $chown $dest`;
+               }
        }
 
        protected function _download() {

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 777911c81c7ab2c7abc8ce88f7115b928fbc1717..50b04f0316bda78fd43bd5e52d5c0e510385e69c 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -1045,11 +1045,11 @@ class wsHTML5Compiler {
                $border = $menuMultiply2->setAlpha(0.5)->toCSS();
 
                $chapters = "ul.chapters a.level-1,ul.chapters a.level0,ul.chapters a.level1,ul.chapters a.level2,ul.chapters a.level3{
-       background: -moz-linear-gradient(top, $top 0%, $bottom 100%); /* FF3.6+ */
-       background: -webkit-linear-gradient(top, $top 0%,$bottom 100%); /* Chrome10+,Safari5.1+ */
-       background: -o-linear-gradient(top, $top 0%,rgba(0,0,0,0.5) 100%); /* Opera 11.10+ */
-       background: -ms-linear-gradient(top, $top 0%,$bottom 100%); /* IE10+ */
-       background: linear-gradient(top bottom, $top 0%,$bottom 100%); /* W3C */
+       background-image: -moz-linear-gradient(top, $top 0%, $bottom 100%); /* FF3.6+ */
+       background-image: -webkit-linear-gradient(top, $top 0%,$bottom 100%); /* Chrome10+,Safari5.1+ */
+       background-image: -o-linear-gradient(top, $top 0%,rgba(0,0,0,0.5) 100%); /* Opera 11.10+ */
+       background-image: -ms-linear-gradient(top, $top 0%,$bottom 100%); /* IE10+ */
+       background-image: linear-gradient(top bottom, $top 0%,$bottom 100%); /* W3C */
        border-bottom:1px solid $border;
 }";
                $res[] = $chapters;