From: vincent@cubedesigners.com Date: Thu, 9 Aug 2012 14:37:18 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5c831e8e5e1d72a91e54e66b69a266198ddcf022;p=cubeextranet.git --- diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index c74f8155a..cce95328f 100644 --- 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 { $daoLang = new wsDAOLang($this->con); $lang = $daoLang->selectById($book->lang); + + fb($lang); + $langs = $daoLang->selectAll(); $daoTheme = new wsDAOTheme($this->con); @@ -1039,8 +1042,8 @@ class wsDAOBook extends commonDAO { $traductions = (!count($book->traductions)) ? $lang->traductions : $book->traductions; $allTraductions = array(); - foreach ($langs as $lang) { - $allTraductions[$lang->lang_id] = $lang->traductions; + foreach ($langs as $l) { + $allTraductions[$l->lang_id] = $l->traductions; } $flex->addVariable('traductions', $traductions, false, true, 'JSONObject', false); diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 0c0b7fcfc..fd5955fe9 100644 --- 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'); $pdfinfo->setArg('f', 1); $pdfinfo->setArg('l', 100000); - $pdfinfo->setArg(null,$in); + $pdfinfo->setArg(null, $in); $pdfinfo->execute(); $this->addToLog($pdfinfo); $out.="\n"; @@ -879,32 +879,17 @@ class wsDocument extends cubeMetier { } if (is_null($page)) { - if (!isset($this->common_log_pointer)) { - $this->common_log_pointer = gzopen($this->log . '/commons.log.gz', 'ab'); - } - $pointer = $this->common_log_pointer; + $pointer = gzopen($this->log . '/commons.log.gz', 'ab'); } else { - if (isset($this->pages_log_pointers[$page]) && is_resource($this->pages_log_pointers[$page])) { - $pointer = $this->pages_log_pointers[$page]; - } else { - $pointer = gzopen($this->log . '/p' . $page . '.log.gz', 'wb'); - $this->pages_log_pointers[$page] = $pointer; - } + $pointer = gzopen($this->log . '/p' . $page . '.log.gz', 'ab'); } gzwrite($pointer, $c); + gzclose($pointer); } public function __destruct() { - if (isset($this->common_log_pointer) && is_resource($this->common_log_pointer)) { - gzclose($this->common_log_pointer); - } - - foreach ($this->pages_log_pointers as $p) { - if (!is_null($p) && is_resource($p)) { - gzclose($p); - } - } + } } diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php index c8c15a8a8..c6be5fc57 100644 --- 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'); $zip->setArg(null, '.'); $zip->execute(); + + if(!file_exists(WS_FILES.'/packager/download')){ + mkdir(WS_FILES.'/packager/download',0777,true); + } + + fb($zip->commande); + fb($zip->output); if ($rename) { rename($zipfile, $final);