(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 63ace3d405b494681880dbfa2d152a21afa86348..b9b0cbc3862fbef0397d0dfff14dc403267c939c 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -395,13 +395,13 @@ class wsDAOBook extends commonDAO {
                                $w[] = 'status IN(' . implode(',', array_keys($this->filtres['status_book'])) . ')';\r
                        }\r
                        if (commonFiltre::test('revendeur_book', $this->filtres)) {\r
-                               $v=array_keys($this->filtres['revendeur_book']);\r
-                               $values=array();\r
-                               foreach($v as $r){\r
-                                       $values[]=$this->con->escape($r);\r
+                               $v = array_keys($this->filtres['revendeur_book']);\r
+                               $values = array();\r
+                               foreach ($v as $r) {\r
+                                       $values[] = $this->con->escape($r);\r
                                }\r
-                               \r
-                               \r
+\r
+\r
                                $w[] = 'facturable IN(\'' . implode('\',\'', $values) . '\')';\r
                        }\r
                        return implode(' AND ', $w);\r
@@ -773,12 +773,10 @@ class wsDAOBook extends commonDAO {
 \r
 \r
                $this->compilePDF($book, $pages);\r
-               //$this->indexPDF($book, $pages);\r
                if ($book->parametres->mobileVersion != 'pdf') {\r
                        $this->compileHTML5($book_id);\r
                }\r
                $this->compileWidget($book, $pages);\r
-\r
                $this->touchCompile($book_id);\r
 \r
                return $res;\r
@@ -1150,7 +1148,13 @@ class wsDAOBook extends commonDAO {
        }\r
 \r
        public function compilePDF($book, $pages) {\r
-               $finalPDF = WS_BOOKS . '/final/' . $book->book_id . '/data/document.pdf';\r
+               $pdfName = 'document.pdf';\r
+               if (isset($book->parametres->pdfName) && $book->parametres->pdfName != '') {\r
+                       $pdfName = $book->parametres->pdfName;\r
+               }\r
+\r
+\r
+               $finalPDF = WS_BOOKS . '/final/' . $book->book_id . '/data/' . $pdfName;\r
 \r
                if (!$book->parametres->pdf && $book->parametres->mobileVersion != 'pdf') {\r
                        // Si l'export PDF n'est pas activé on supprime le fichier si il existe\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 825ab16a8ae25b55e37a6294fc8b0d6ea7214cd2..1f71ea14379c1619ba2b1909bbaeb4fb66df1b8f 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -101,10 +101,11 @@ class wsBookParametres extends wsParametres {
                        'fieldsnames' => array('preload'));\r
                // .\r
                $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les fonctions de téléchargement"));\r
+               $this->fields['pdfName'] = array('type' => 'text', 'default' => 'document.pdf', 'editable' => true, 'label' => __("Nom du fichier PDF"));\r
                $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téchargement de PDF avancé'), "hint" => __("Permet à l'utilisateur de sélectionner les pages qu'il souhaite télécharger"), 'grade' => 3);\r
                $this->fields['offlineExport'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téléchargement des versions offline'), "hint" => __('Valable si le téléchargement avancé est activé'), 'grade' => 3);\r
                $this->forms['pdf'] = array('label' => __('Fonction de téléchargement'),\r
-                       'fieldsnames' => array('pdf', 'pdfComplex', 'offlineExport'));\r
+                       'fieldsnames' => array('pdf','pdfName', '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
@@ -120,7 +121,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10);\r
                $this->fields['googleAnalyticsCustom'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics personnalisé'));\r
                $this->forms['stats'] = array('label' => __('Statistiques'),\r
-                       'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics','googleAnalyticsCustom'));\r
+                       'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics', 'googleAnalyticsCustom'));\r
                // .\r
                $swfFilter = new stdClass();\r
                $swfFilter->name = __('Animation SWF') . ' (*.swf)';\r