From abb52c6644c532dbb52459e724335fa2ec1c8b63 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 2 Mar 2012 17:08:35 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.maintenance.php   | 80 +++++++++----------
 inc/ws/Metier/class.ws.document.php           | 10 +--
 inc/ws/Util/packager/class.ws.packager.v1.php |  5 +-
 3 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 62b58f01f..5f0c3b90f 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -480,51 +480,28 @@ class wsMaintenance {
 
 	public static function cleanPackages() {
 		$limit = TIME - (4 * 3600); // 4 heures avant maintenant*
+		//
+		$dirs = array(ROOT . '/cache/download',
+			WS_FILES . '/packager/download/',
+			WS_FILES . '/packager/',
+			'/home/ws/www/download');
 		// Clean downloads
-		$dir = ROOT . '/cache/download/';
-		$dr = opendir($dir);
-		while ($file = readdir($dr)) {
-			if ($file == '.' || $file == '..') {
-				continue;
-			}
-			$f = $dir . $file;
-			if (!is_dir($f)) {
-				continue;
-			}
-			if (filemtime($f) > $limit) {
-				continue;
-			}
-			`rm -rf $f`;
-		}
 
-		// Clean downloaded packages
-		$dir = WS_FILES . '/packager/download/';
-		$dr = opendir($dir);
-		while ($file = readdir($dr)) {
-			if ($file == '.' || $file == '..') {
-				continue;
-			}
-			$f = $dir . $file;
-			if (filemtime($f) > $limit) {
-				continue;
-			}
-			unlink($f);
-		}
-		// Clean tempdir of packager
-		$dir = WS_FILES . '/packager/';
-		$dr = opendir($dir);
-		while ($file = readdir($dr)) {
-			if ($file == 'download' || $file == '.' || $file == '..') {
-				continue;
-			}
-			$f = $dir . $file;
-			if (!is_dir($f)) {
-				continue;
-			}
-			if (filemtime($f) > $limit) {
-				continue;
+		foreach ($dirs as $dir) {
+			$dr = opendir($dir);
+			while ($file = readdir($dr)) {
+				if ($file == '.' || $file == '..') {
+					continue;
+				}
+				$f = $dir . $file;
+				if (!is_dir($f)) {
+					continue;
+				}
+				if (filemtime($f) > $limit) {
+					continue;
+				}
+				`rm -rf $f`;
 			}
-			`rm -rf $f`;
 		}
 	}
 
@@ -545,6 +522,23 @@ class wsMaintenance {
 		}
 	}
 
+	public static function cleanUnusedDocs() {
+		global $core;
+		cubePHP::neverStop();
+		$r = $core->con->select('SELECT document_id FROM documents WHERE document_id NOT IN (SELECT document_id FROM book_pages)');
+		while ($r->fetch()) {
+			if (file_exists(WS_DOCS . '/' . $r->document_id)) {
+				$rm = new cubeCommandLine('rm');
+				$rm->setPath(CONVERTER_PATH);
+				$rm->setArg('r');
+				$rm->setArg('f');
+				$rm->setArg(null, WS_DOCS . '/' . $r->document_id . '/');
+				$rm->execute();
+				echo $rm->commande . "<br />";
+			}
+		}
+	}
+
 	public static function moveFluidbookDatas() {
 		$dir = WS_BOOKS . '/final/';
 		$dr = opendir($dir);
@@ -654,7 +648,7 @@ class wsMaintenance {
 				continue;
 			}
 
-			$file=$dir . '/' . $link['to'];
+			$file = $dir . '/' . $link['to'];
 			if (!file_exists($file)) {
 				continue;
 			}
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 7a7c1e1dd..fd1713f8a 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -849,29 +849,29 @@ class wsDocument extends cubeMetier {
 
 		if (is_null($page)) {
 			if (!isset($this->common_log_pointer)) {
-				$this->common_log_pointer = fopen($this->log . '/commons.log', 'ab');
+				$this->common_log_pointer = gzopen($this->log . '/commons.log.gz', 'ab');
 			}
 			$pointer = $this->common_log_pointer;
 		} else {
 			if (isset($this->pages_log_pointers[$page]) && is_resource($this->pages_log_pointers[$page])) {
 				$pointer = $this->pages_log_pointers[$page];
 			} else {
-				$pointer = fopen($this->log . '/p' . $page . '.log', 'wb');
+				$pointer = gzopen($this->log . '/p' . $page . '.log.gz', 'wb');
 				$this->pages_log_pointers[$page] = $pointer;
 			}
 		}
 
-		fwrite($pointer, $c);
+		gzwrite($pointer, $c);
 	}
 
 	public function __destruct() {
 		if (isset($this->common_log_pointer) && is_resource($this->common_log_pointer)) {
-			fclose($this->common_log_pointer);
+			gzclose($this->common_log_pointer);
 		}
 
 		foreach ($this->pages_log_pointers as $p) {
 			if (!is_null($p) && is_resource($p)) {
-				fclose($p);
+				gzclose($p);
 			}
 		}
 	}
diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index 30cb258f6..8bba7151d 100644
--- 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']);
-- 
2.39.5