Closes #678: Issues with filename detection in PlUpload when the username

contains one or more '-'

 ChangeLog            |    3 +++
 classes/plupload.php |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1854 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 38fba1a..8c6906b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ New:
 
 Bug/Wish:
 
+    * Core:
+        - #678: PlUpload filename detection                                -FRU
+
     * Profile:
         - #663: Link to Xnet's map from the "My groups" page               -FRU
         - Fix GoogleMaps links                                             -FRU

diff --git a/classes/plupload.php b/classes/plupload.php
index ce143a6..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;