X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplupload.php;h=ea192f0eb77ec5b827922e41f82f91bc5cd80acd;hb=660ca64ac15ba544868e52f89a4c16f270eee107;hp=1911ab9d4cbcd96978a14d5797b9b6ea70e5e767;hpb=fa3300aa65242318a4874992da0747bfb3a50c77;p=platal.git

diff --git a/classes/plupload.php b/classes/plupload.php
index 1911ab9..ea192f0 100644
--- a/classes/plupload.php
+++ b/classes/plupload.php
@@ -49,7 +49,7 @@ class PlUpload
     private function makeFilename($file_id)
     {
         global $globals;
-        $filename = $globals->spoolroot . '/spool/uploads/temp/';
+        $filename = $globals->spoolroot . '/spool/tmp/';
         if (!file_exists($filename)) {
             if (!mkdir($filename)) {
                 trigger_error('can\'t create upload directory: ' . $filename, E_USER_ERROR);
@@ -67,7 +67,7 @@ class PlUpload
         if ($this->exists()) {
             $this->type = trim(mime_content_type($this->filename));
             if ($this->type == 'text/plain') { // Workaround a bug of php 5.2.0+etch10 (mime_content_type fallback is 'text/plain')
-                $this->type = trim(exec("file -bi " . escapeshellarg($this->filename)));
+                $this->type = preg_replace('/;.*/', '', trim(shell_exec('file -bi ' . escapeshellarg($this->filename))));
             }
         }
     }
@@ -162,7 +162,7 @@ class PlUpload
     static public function listRawFiles($forlife = '*', $category = '*', $uniq = false, $basename = false)
     {
         global $globals;
-        $filename = $globals->spoolroot . '/spool/uploads/temp/';
+        $filename = $globals->spoolroot . '/spool/tmp/';
         $filename .= $forlife . '--' . $category;
         if (!$uniq) {
             $filename .= '--*';