Ticket #5547: 2.4.0-FileUpload.diff

mysite/code/Page.php

@@ -38 +38 @@
                 Requirements::themedCSS('typography'); 
                 Requirements::themedCSS('form'); 
         }
-}
- No newline at end of file
+}

sapphire/filesystem/Folder.php

@@ -230 +230 @@
                         if($oldFile == $file && $i > 2) user_error("Couldn't fix $file$ext with $i", E_USER_ERROR);
                 }
                 
-                if (move_uploaded_file($tmpFile['tmp_name'], "$base/$file$ext")) {
+                $success = false;
+                if(!ini_get("open_basedir")) $success = move_uploaded_file($tmpFile['tmp_name'], "$base/$file$ext");
+                else $success = rename($tmpFile['tmp_name'], "$base/$file$ext");
+                
+                if ($success) {
                         // Update with the new image
+                        chmod("$base/$file$ext", Filesystem::$file_create_mask);
                         return $this->constructChild(basename($file . $ext));
                 } else {
                         if(!file_exists($tmpFile['tmp_name'])) user_error("Folder::addUploadToFolder: '$tmpFile[tmp_name]' doesn't exist", E_USER_ERROR);

sapphire/filesystem/Upload.php

@@ -461 +461 @@
                 // we don't validate for empty upload fields yet
                 if(!isset($this->tmpFile['name']) || empty($this->tmpFile['name'])) return true;
 
-                if(isset($this->tmpFile['tmp_name']) && !is_uploaded_file($this->tmpFile['tmp_name']) && !SapphireTest::is_running_test()) {
+                if(isset($this->tmpFile['tmp_name']) && !ini_get("open_basedir") && !is_uploaded_file($this->tmpFile['tmp_name']) && !SapphireTest::is_running_test()) {
                         $this->errors[] = _t('File.NOVALIDUPLOAD', 'File is not a valid upload');
                         return false;
                 }
@@ -500 +500 @@
                 return true;
         }
 
-}
- No newline at end of file
+}