Commit 7499ea17 authored by dj3c1t's avatar dj3c1t

importMediaFromLocalFile

parent 06047001
......@@ -1088,7 +1088,7 @@ class UploadHandler
$file_path = $this->get_upload_path($file->name);
$append_file = $content_range && is_file($file_path) &&
$file->size > $this->get_file_size($file_path);
if ($uploaded_file && is_uploaded_file($uploaded_file)) {
if ($uploaded_file/* && is_uploaded_file($uploaded_file)*/) {
// multipart/formdata uploads (POST method uploads)
if ($append_file) {
file_put_contents(
......@@ -1097,7 +1097,8 @@ class UploadHandler
FILE_APPEND
);
} else {
move_uploaded_file($uploaded_file, $file_path);
// move_uploaded_file($uploaded_file, $file_path);
copy($uploaded_file, $file_path);
}
} else {
// Non-multipart uploads (PUT method support)
......
......@@ -354,7 +354,7 @@ class UploadManager {
}
public function getMedia($file) {
$fileName = $file->name;
$fileName = urldecode($file->name);
$media_dir = $this->rootDir."/".$this->mediaRootDir."/".$this->mediaDir."/";
if(!file_exists($media_dir.$fileName)) {
throw new \Exception("unable to read file on disk");
......@@ -424,6 +424,25 @@ class UploadManager {
return $media;
}
public function importMediaFromLocalFile($fileName) {
$this->makeUploadDir();
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$mime_type = finfo_file($finfo, $fileName);
finfo_close($finfo);
$fileSize = filesize($fileName);
$_FILES = array(
"local" => array(
"name" => basename($fileName),
"type" => $mime_type ? $mime_type : "",
"tmp_name" => $fileName,
"error" => 0,
"size" => $fileSize
)
);
$_SERVER['CONTENT_LENGTH'] = $fileSize;
return $this->makeMediaFromFiles("local");
}
public function delete_file($file_name) {
if($res = $this->jQUploadHandler->delete_file($file_name)) {
$this->cleanUploadDir();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment