(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 7fea96e8c75b51a44640ca4e0a1044514263d3b5..82096b7e16efda7f53a4fb4b9bc824f614481977 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -35,7 +35,8 @@ class wsDAODocument extends commonDAO {
 \r
        public function restoreLinksVersion($book_id, $update)\r
        {\r
-               $core->con->execute('INSERT INTO document_links_version SELECT document_id,links,rulers,' . TIME . ' FROM document_links_version WHERE `update`=' . $update . ' AND document_id IN (SELECT document_id FROM book_pages WHERE book_id=' . $book_id . ')');\r
+               $sql = 'INSERT INTO document_links_versions SELECT document_id,links,rulers,' . TIME . ' FROM document_links_versions WHERE `update`=' . $update . ' AND document_id IN (SELECT document_id FROM book_pages WHERE book_id=' . $book_id . ')';\r
+               $this->con->execute($sql);\r
        }\r
 \r
        public function putLinksFromCSV($document_id)\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 80baf83273e21e889c82bdd1b60af7a930f279c0..88119da14659538a13f816ec322f62cc21284865 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -78,10 +78,11 @@ class wsBookParametres extends wsParametres {
                $this->forms['general_settings'] = array('label' => __('Paramètres généraux'),\r
                        'fieldsnames' => array('preload'));\r
                // .\r
-               $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Export PDF'));\r
-               $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Export PDF avancé'), 'grade' => 3);\r
-               $this->forms['pdf'] = array('label' => __('Fonction Export PDF'),\r
-                       'fieldsnames' => array('pdf', 'pdfComplex'));\r
+               $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les fonctions de téléchargement"));\r
+               $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téchargement de PDF avancé'), 'grade' => 3);\r
+               $this->fields['offlineExport'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téléchargement des versions offline'), 'grade' => 3);\r
+               $this->forms['pdf'] = array('label' => __('Fonction de téléchargement'),\r
+                       'fieldsnames' => array('pdf', 'pdfComplex', 'offlineExport'));\r
                // .\r
                $this->fields['zoomMode'] = array('type' => 'combo', 'default' => '0', 'editable' => true, 'label' => __("Mode de zoom"), 'grade' => 5,\r
                        'datas' => array(__('Normal') => '0',\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 290dd16baad97c0e4d40db9e1326942666d71e14..b937dd3fe998a90d358d667d09e0219c4e069ccf 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -12,6 +12,14 @@ class wsPackagerHTML extends wsPackager {
        {\r
                parent::preparePackage();\r
 \r
+               if ($this->book->parametres->offlineExport) {\r
+                       $versions = array('win-ins' => 'exe', 'mac-exe' => 'zip');\r
+                       foreach($versions as $v => $ext) {\r
+                               $a = wsPackager::package($this->book_id, $v);\r
+                               rename(ROOT . $a, $this->vdir . '/data/document.' . $ext);\r
+                       }\r
+               }\r
+\r
                $this->copyFluidbookFiles();\r
                $this->mergeJavascript();\r
 \r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 965fa3cb44c6ab9883c424ac0e3fd52226d58c92..7bd07a24b832529df16c6e00326b67b559044b7d 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -6,6 +6,7 @@ class wsPackager {
        protected $pages;\r
        protected $theme;\r
        protected $version;\r
+       protected $book_id;\r
 \r
        public static function package($book_id, $version)\r
        {\r
@@ -30,6 +31,8 @@ class wsPackager {
        {\r
                global $core;\r
 \r
+               $this->book_id = $book_id;\r
+\r
                $this->dir = WS_FILES . '/packager/' . $book_id . '/';\r
 \r
                if (!file_exists($this->dir)) {\r
@@ -147,7 +150,7 @@ class wsPackager {
        {\r
                $this->vdir = $this->dir . $this->version . '/';\r
                $this->cleanVdir();\r
-               mkdir($this->vdir, 0777, true);\r
+               mkdir($this->vdir . '/data', 0777, true);\r
        }\r
 \r
        protected function cleanVdir()\r