(no commit message)

diff --git a/inc/commons/DAO/class.common.dao.fichier.php b/inc/commons/DAO/class.common.dao.fichier.php
index d5f6f6a6662ae80c9b3ec8a35e1b69fdaa543288..e3a39d134b610009fab403840b95e59c3ac28182 100644 (file)
--- 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 {
 \r
        public function deleteOldFiles()\r
        {\r
-               $root = FTPROOT;\r
-               cubeFiles::scanRecursiveDir($root, $files);\r
-\r
-               $limit = TIME-3600 * 24 * 60; // 60 days\r
-\r
-               $size = 0;\r
-\r
-               foreach($files as $f) {\r
-                       if (filemtime($f) < $limit) {\r
-                               fb(date('Y-m-d', filemtime($f)), $f);\r
-                               $size += filesize($f);\r
-                               unlink($f);\r
-                       }\r
-               }\r
-               fb(files::size($size), 'Size of files deleted');\r
+               cubeFiles::deleteFilesOlderThan(FTPROOT, 60);\r
        }\r
 }\r
 \r

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 3c4d928e39bf3d22337aed7a08b85ce39c5a5eab..6a5fc513ad292335c1e91a303ec0fa49e39b36b9 100644 (file)
--- 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'])) {\r
                        // Ce n'est pas le cas, on place la variable connected à false\r
                        // Et on s'arrête là\r
-                       $this->user = false;\r
+                       $this->user = null;\r
                        return;\r
                }\r
                // Les variables sont présentes on vérifie la validité des informations\r

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 793aab1d23e6641df4ec98f2d4aa2ced3169775c..d6fc05d08611e34f0a8d2f7d4f839989e2d6002b 100644 (file)
--- 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)\r
        {\r
                global $core;\r
+               cubePHP::neverStop();\r
+               \r
                $dao = new commonDAOFichier($core->con);\r
                $dao->deleteOldFiles();\r
+               \r
+               cubeFiles::deleteFilesOlderThan('/home/ws/ftp', 60);\r
+               cubeFiles::deleteFilesOlderThan('/home/ws/www/getpdf', 60);\r
        }\r
 \r
        public static function adresse($utilisateur_id = null, $projet_id = null, $display = 'devis', $adresse = '')\r

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index ef430b79da2546300d364a6b30e13f7fd3b96c2d..20eb4ab009cf42cab0d018da640700452d638d46 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -72,7 +72,13 @@ class wsDroits {
        {\r
                global $core;\r
 \r
-               $mySignatures = explode(',', $core->user->ws_signatures);\r
+               if(is_null($core->user)){\r
+                       $s='';\r
+               }else{\r
+                       $s=$core->user->getWSSignatures();\r
+               }\r
+               \r
+               $mySignatures = explode(',', $s);\r
                $mySignatures[] = 1;\r
 \r
                $admin = wsDroits::admin(false);\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 2b8801ed23af57289848ec099b8ee2eb07a92304..2f115dc0ee1e5233a4a046b5c6e7788ae4b00034 100644 (file)
--- 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\r
                $resolutions = array(36 => 80, 72 => 70, 150 => 50);\r
                foreach ($resolutions as $r => $q) {\r
-                       $texts=true;\r
+                       $texts=false;\r
                        $this->makeShotPNM($page, 'html/h' . $r . '-', $r, $q, 4, null, $texts);\r
                }\r
        }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php
index 198035adcd6603f9b7ea55555d32e158f587c993..09fdc3b0e7bd76b0196148b106238c3da8005586 100644 (file)
--- 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);\r
                }\r
                foreach ($this->pages as $page => $infos) {\r
-                       foreach ($self::$resolutions as $r) {\r
+                       foreach (self::$resolutions as $r) {\r
                                copy(WS_DOCS . '/' . $infos['document_id'] . '/html/h' . $r . '-' . $infos['document_page'] . '.jpg', $this->vdir . '/images/' . $r . '/p' . $page . '.jpg');\r
                        }\r
                }\r