From: scyrma <scyrma>
Date: Fri, 5 Sep 2008 09:23:36 +0000 (+0000)
Subject: MDL-14589: strrpos is needed to check the last occurence
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=00c32c543098298f3ce92482ec139bf58defbaa9;p=moodle.git

MDL-14589: strrpos is needed to check the last occurence
MDL-15405: return the existing file in case one is found
---

diff --git a/lib/file/file_storage.php b/lib/file/file_storage.php
index 03663e11d9..dfa01a6419 100644
--- a/lib/file/file_storage.php
+++ b/lib/file/file_storage.php
@@ -394,7 +394,7 @@ class file_storage {
 
             if ($key == 'filepath') {
                 $value = clean_param($value, PARAM_PATH);
-                if (strpos($value, '/') !== 0 or strpos($value, '/') !== strlen($value)-1) {
+                if (strpos($value, '/') !== 0 or strrpos($value, '/') !== strlen($value)-1) {
                     // path must start and end with '/'
                     throw new file_exception('storedfileproblem', 'Invalid file path');
                 }
@@ -621,6 +621,7 @@ class file_storage {
                 if ($overwrite) {
                     $oldfile->delete();
                 } else {
+                    $returnfiles[] = $oldfile;
                     continue;   // Can't overwrite the existing file so skip it
                 }
             }