From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 4 Jul 2011 19:12:08 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a0b4b63ec242d6a722bc99b76f13842008338651;p=cubeextranet.git

---

diff --git a/inc/commons/DAO/class.common.dao.fichier.php b/inc/commons/DAO/class.common.dao.fichier.php
index d5f6f6a66..e3a39d134 100644
--- a/inc/commons/DAO/class.common.dao.fichier.php
+++ b/inc/commons/DAO/class.common.dao.fichier.php
@@ -125,21 +125,7 @@ class commonDAOFichier extends commonDAO {
 
 	public function deleteOldFiles()
 	{
-		$root = FTPROOT;
-		cubeFiles::scanRecursiveDir($root, $files);
-
-		$limit = TIME-3600 * 24 * 60; // 60 days
-
-		$size = 0;
-
-		foreach($files as $f) {
-			if (filemtime($f) < $limit) {
-				fb(date('Y-m-d', filemtime($f)), $f);
-				$size += filesize($f);
-				unlink($f);
-			}
-		}
-		fb(files::size($size), 'Size of files deleted');
+		cubeFiles::deleteFilesOlderThan(FTPROOT, 60);
 	}
 }
 
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 3c4d928e3..6a5fc513a 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -78,7 +78,7 @@ class commonCore extends cubeCore {
 		if (!isset($_SESSION['user_email']) || !isset($_SESSION['user_password'])) {
 			// Ce n'est pas le cas, on place la variable connected à false
 			// Et on s'arrête là
-			$this->user = false;
+			$this->user = null;
 			return;
 		}
 		// Les variables sont présentes on vérifie la validité des informations
diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 793aab1d2..d6fc05d08 100644
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -547,8 +547,13 @@ class commonUrl {
 	public static function deleteOldFilesFromFTP($args)
 	{
 		global $core;
+		cubePHP::neverStop();
+		
 		$dao = new commonDAOFichier($core->con);
 		$dao->deleteOldFiles();
+		
+		cubeFiles::deleteFilesOlderThan('/home/ws/ftp', 60);
+		cubeFiles::deleteFilesOlderThan('/home/ws/www/getpdf', 60);
 	}
 
 	public static function adresse($utilisateur_id = null, $projet_id = null, $display = 'devis', $adresse = '')
diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index ef430b79d..20eb4ab00 100644
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -72,7 +72,13 @@ class wsDroits {
 	{
 		global $core;
 
-		$mySignatures = explode(',', $core->user->ws_signatures);
+		if(is_null($core->user)){
+			$s='';
+		}else{
+			$s=$core->user->getWSSignatures();
+		}
+		
+		$mySignatures = explode(',', $s);
 		$mySignatures[] = 1;
 
 		$admin = wsDroits::admin(false);
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 2b8801ed2..2f115dc0e 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -607,7 +607,7 @@ class wsDocument extends cubeMetier {
 		// Then make HD background shots
 		$resolutions = array(36 => 80, 72 => 70, 150 => 50);
 		foreach ($resolutions as $r => $q) {
-			$texts=true;
+			$texts=false;
 			$this->makeShotPNM($page, 'html/h' . $r . '-', $r, $q, 4, null, $texts);
 		}
 	}
diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php
index 198035adc..09fdc3b0e 100644
--- a/inc/ws/Util/packager/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/class.ws.packager.html5.php
@@ -94,7 +94,7 @@ class wsPackagerHTML5 extends wsPackager {
 			mkdir($this->vdir . '/images/' . $r, 0777);
 		}
 		foreach ($this->pages as $page => $infos) {
-			foreach ($self::$resolutions as $r) {
+			foreach (self::$resolutions as $r) {
 				copy(WS_DOCS . '/' . $infos['document_id'] . '/html/h' . $r . '-' . $infos['document_page'] . '.jpg', $this->vdir . '/images/' . $r . '/p' . $page . '.jpg');
 			}
 		}