(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index c74f8155a1395a530ca0b025ff5339b770d9111a..cce95328ff79c4e9974d9e9ebf35941a6348f040 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -960,6 +960,9 @@ class wsDAOBook extends commonDAO {
 \r
                $daoLang = new wsDAOLang($this->con);\r
                $lang = $daoLang->selectById($book->lang);\r
+               \r
+               fb($lang);\r
+               \r
                $langs = $daoLang->selectAll();\r
 \r
                $daoTheme = new wsDAOTheme($this->con);\r
@@ -1039,8 +1042,8 @@ class wsDAOBook extends commonDAO {
 \r
                $traductions = (!count($book->traductions)) ? $lang->traductions : $book->traductions;\r
                $allTraductions = array();\r
-               foreach ($langs as $lang) {\r
-                       $allTraductions[$lang->lang_id] = $lang->traductions;\r
+               foreach ($langs as $l) {\r
+                       $allTraductions[$l->lang_id] = $l->traductions;\r
                }\r
 \r
                $flex->addVariable('traductions', $traductions, false, true, 'JSONObject', false);\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 0c0b7fcfcb75afb2ae89ecba5ddb6d5e6d2c3786..fd5955fe9fed29531c7e81d5b48325e85a0524ba 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -112,7 +112,7 @@ class wsDocument extends cubeMetier {
                $pdfinfo->setArg('-box');\r
                $pdfinfo->setArg('f', 1);\r
                $pdfinfo->setArg('l', 100000);\r
-               $pdfinfo->setArg(null,$in);\r
+               $pdfinfo->setArg(null, $in);\r
                $pdfinfo->execute();\r
                $this->addToLog($pdfinfo);\r
                $out.="\n";\r
@@ -879,32 +879,17 @@ class wsDocument extends cubeMetier {
                }\r
 \r
                if (is_null($page)) {\r
-                       if (!isset($this->common_log_pointer)) {\r
-                               $this->common_log_pointer = gzopen($this->log . '/commons.log.gz', 'ab');\r
-                       }\r
-                       $pointer = $this->common_log_pointer;\r
+                       $pointer = gzopen($this->log . '/commons.log.gz', 'ab');\r
                } else {\r
-                       if (isset($this->pages_log_pointers[$page]) && is_resource($this->pages_log_pointers[$page])) {\r
-                               $pointer = $this->pages_log_pointers[$page];\r
-                       } else {\r
-                               $pointer = gzopen($this->log . '/p' . $page . '.log.gz', 'wb');\r
-                               $this->pages_log_pointers[$page] = $pointer;\r
-                       }\r
+                       $pointer = gzopen($this->log . '/p' . $page . '.log.gz', 'ab');\r
                }\r
 \r
                gzwrite($pointer, $c);\r
+               gzclose($pointer);\r
        }\r
 \r
        public function __destruct() {\r
-               if (isset($this->common_log_pointer) && is_resource($this->common_log_pointer)) {\r
-                       gzclose($this->common_log_pointer);\r
-               }\r
-\r
-               foreach ($this->pages_log_pointers as $p) {\r
-                       if (!is_null($p) && is_resource($p)) {\r
-                               gzclose($p);\r
-                       }\r
-               }\r
+               \r
        }\r
 \r
 }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index c8c15a8a8fc75ec1d6867fb6944488a201bd994b..c6be5fc5707c9a9c510d215d329ade9e0efa5269 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -166,6 +166,13 @@ class wsPackager {
                $zip->setArg('u');\r
                $zip->setArg(null, '.');\r
                $zip->execute();\r
+               \r
+               if(!file_exists(WS_FILES.'/packager/download')){\r
+                       mkdir(WS_FILES.'/packager/download',0777,true);\r
+               }\r
+               \r
+               fb($zip->commande);\r
+               fb($zip->output);\r
 \r
                if ($rename) {\r
                        rename($zipfile, $final);\r