(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 62b58f01f25168e42b40ab373a5cd0d1b35b92aa..5f0c3b90f5bb74ab6204b56719e0d5ead10444a6 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -480,51 +480,28 @@ class wsMaintenance {
 \r
        public static function cleanPackages() {\r
                $limit = TIME - (4 * 3600); // 4 heures avant maintenant*\r
+               //\r
+               $dirs = array(ROOT . '/cache/download',\r
+                       WS_FILES . '/packager/download/',\r
+                       WS_FILES . '/packager/',\r
+                       '/home/ws/www/download');\r
                // Clean downloads\r
-               $dir = ROOT . '/cache/download/';\r
-               $dr = opendir($dir);\r
-               while ($file = readdir($dr)) {\r
-                       if ($file == '.' || $file == '..') {\r
-                               continue;\r
-                       }\r
-                       $f = $dir . $file;\r
-                       if (!is_dir($f)) {\r
-                               continue;\r
-                       }\r
-                       if (filemtime($f) > $limit) {\r
-                               continue;\r
-                       }\r
-                       `rm -rf $f`;\r
-               }\r
 \r
-               // Clean downloaded packages\r
-               $dir = WS_FILES . '/packager/download/';\r
-               $dr = opendir($dir);\r
-               while ($file = readdir($dr)) {\r
-                       if ($file == '.' || $file == '..') {\r
-                               continue;\r
-                       }\r
-                       $f = $dir . $file;\r
-                       if (filemtime($f) > $limit) {\r
-                               continue;\r
-                       }\r
-                       unlink($f);\r
-               }\r
-               // Clean tempdir of packager\r
-               $dir = WS_FILES . '/packager/';\r
-               $dr = opendir($dir);\r
-               while ($file = readdir($dr)) {\r
-                       if ($file == 'download' || $file == '.' || $file == '..') {\r
-                               continue;\r
-                       }\r
-                       $f = $dir . $file;\r
-                       if (!is_dir($f)) {\r
-                               continue;\r
-                       }\r
-                       if (filemtime($f) > $limit) {\r
-                               continue;\r
+               foreach ($dirs as $dir) {\r
+                       $dr = opendir($dir);\r
+                       while ($file = readdir($dr)) {\r
+                               if ($file == '.' || $file == '..') {\r
+                                       continue;\r
+                               }\r
+                               $f = $dir . $file;\r
+                               if (!is_dir($f)) {\r
+                                       continue;\r
+                               }\r
+                               if (filemtime($f) > $limit) {\r
+                                       continue;\r
+                               }\r
+                               `rm -rf $f`;\r
                        }\r
-                       `rm -rf $f`;\r
                }\r
        }\r
 \r
@@ -545,6 +522,23 @@ class wsMaintenance {
                }\r
        }\r
 \r
+       public static function cleanUnusedDocs() {\r
+               global $core;\r
+               cubePHP::neverStop();\r
+               $r = $core->con->select('SELECT document_id FROM documents WHERE document_id NOT IN (SELECT document_id FROM book_pages)');\r
+               while ($r->fetch()) {\r
+                       if (file_exists(WS_DOCS . '/' . $r->document_id)) {\r
+                               $rm = new cubeCommandLine('rm');\r
+                               $rm->setPath(CONVERTER_PATH);\r
+                               $rm->setArg('r');\r
+                               $rm->setArg('f');\r
+                               $rm->setArg(null, WS_DOCS . '/' . $r->document_id . '/');\r
+                               $rm->execute();\r
+                               echo $rm->commande . "<br />";\r
+                       }\r
+               }\r
+       }\r
+\r
        public static function moveFluidbookDatas() {\r
                $dir = WS_BOOKS . '/final/';\r
                $dr = opendir($dir);\r
@@ -654,7 +648,7 @@ class wsMaintenance {
                                continue;\r
                        }\r
 \r
-                       $file=$dir . '/' . $link['to'];\r
+                       $file = $dir . '/' . $link['to'];\r
                        if (!file_exists($file)) {\r
                                continue;\r
                        }\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 7a7c1e1dd7480a2c23e6d018be43de0de0c5a844..fd1713f8a144c1ace8e6df764a7b300e94da470d 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -849,29 +849,29 @@ class wsDocument extends cubeMetier {
 \r
                if (is_null($page)) {\r
                        if (!isset($this->common_log_pointer)) {\r
-                               $this->common_log_pointer = fopen($this->log . '/commons.log', 'ab');\r
+                               $this->common_log_pointer = gzopen($this->log . '/commons.log.gz', 'ab');\r
                        }\r
                        $pointer = $this->common_log_pointer;\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 = fopen($this->log . '/p' . $page . '.log', 'wb');\r
+                               $pointer = gzopen($this->log . '/p' . $page . '.log.gz', 'wb');\r
                                $this->pages_log_pointers[$page] = $pointer;\r
                        }\r
                }\r
 \r
-               fwrite($pointer, $c);\r
+               gzwrite($pointer, $c);\r
        }\r
 \r
        public function __destruct() {\r
                if (isset($this->common_log_pointer) && is_resource($this->common_log_pointer)) {\r
-                       fclose($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
-                               fclose($p);\r
+                               gzclose($p);\r
                        }\r
                }\r
        }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index 30cb258f6bcd04fab343da5bc954ad37f03f4232..8bba7151d7390c23d9ac0c839b78436c4a7c0521 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -83,6 +83,7 @@ class wsPackagerV1 extends wsPackagerHTML {
 
                foreach ($links as $link) {
                        $one = $xml->addChild('oneLink');
+                       $link['type']=intval($link['type']);
 
                        if ($link['page'] % 2 == 1) {
                                $link['page']--;
@@ -101,8 +102,8 @@ class wsPackagerV1 extends wsPackagerHTML {
                                $link['to'] = $this->__virtualToPhysical($link['to']);
                        }
 
-                       if ($this->_copyWorkingFile($link['to']) && !in_array($link->type, array(4, 6))) {
-                               //$link['to'] = 'data/' . $link['to'];
+                       if ($this->_copyWorkingFile($link['to']) && !in_array($link['type'], array(4, 6))) {
+                               $link['to'] = 'data/' . $link['to'];
                        }
 
                        $one->addChild('page', $link['page']);