Revert "Initial work on the rewriting of the profile/edit page"

[platal.git] / classes / plupload.php

diff --git a/classes/plupload.php b/classes/plupload.php
index ea84ca1..8844bc4 100644 (file)
--- a/classes/plupload.php
+++ b/classes/plupload.php
@@ -53,9 +53,9 @@ class PlUpload
                 trigger_error('can\'t create upload directory: ' . $filename, E_USER_ERROR);
             }
         }
-        $filename .= $this->forlife . '-' . $this->category;
+        $filename .= $this->forlife . '--' . $this->category;
         if ($file_id) {
-            $filename .= '-' . $file_id;
+            $filename .= '--' . $file_id;
         }
         return $filename;
     }
@@ -143,9 +143,9 @@ class PlUpload
     {
         global $globals;
         $filename = $globals->spoolroot . '/spool/uploads/temp/';
-        $filename .= $forlife . '-' . $category;
+        $filename .= $forlife . '--' . $category;
         if (!$uniq) {
-            $filename .= '-*';
+            $filename .= '--*';
         }
         $files = glob($filename);
         if ($basename) {
@@ -158,7 +158,7 @@ class PlUpload
     {
         $files = PlUpload::listRawFiles($forlife, $category, false, true);
         foreach ($files as &$name) {
-            list($forlife, $cat, $fn) = explode('-', $name, 3);
+            list($forlife, $cat, $fn) = explode('--', $name, 3);
             $name = $fn;
         }
         return $files;
@@ -169,7 +169,7 @@ class PlUpload
         $res   = array();
         $files = PlUpload::listRawFiles($forlife, $category, $uniq, true);
         foreach ($files as $name) {
-            list($forlife, $cat, $fn) = explode('-', $name, 3);
+            list($forlife, $cat, $fn) = explode('--', $name, 3);
             $res[$fn] = new PlUpload($forlife, $cat, $fn);
         }
         return $res;
@@ -199,7 +199,14 @@ class PlUpload
     {
         static $map;
         if (!isset($map)) {
-            $map = array (1 => 'gif', 2 => 'jpeg', 3 => 'png');
+            $tmpmap = array (IMG_GIF => 'gif', IMG_JPG => 'jpeg', IMG_PNG => 'png', IMG_WBMP => 'bmp', IMG_XPM => 'xpm');
+            $map = array();
+            $supported = imagetypes();
+            foreach ($tmpmap as $type=>$mime) {
+                if ($supported & $type) {
+                    $map[$type] = $mime;
+                }
+            }
         }
         $array = getimagesize($this->filename);
         $array[2] = @$map[$array[2]];