From 45348609f8d22384ad306d1d6148937c87d6c44d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 1 Feb 2020 22:48:15 +0100
Subject: [PATCH] fix upload

---
 Admin/Routes/Web/Api.php | 2 +-
 Controller.js            | 2 +-
 Models/Upload.js         | 3 +--
 Models/UploadFile.php    | 8 +-------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 12b044d..55317fb 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -23,7 +23,7 @@ return [
         ],
         [
             'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpdate',
-            'verb' => RouteVerb::PUT,
+            'verb' => RouteVerb::POST,
             'permission' => [
                 'module' => ApiController::MODULE_NAME,
                 'type'  => PermissionType::CREATE,
diff --git a/Controller.js b/Controller.js
index 2a7335c..e7ec6a3 100644
--- a/Controller.js
+++ b/Controller.js
@@ -74,7 +74,7 @@ jsOMS.Modules.Media = class {
                         + 'input[form="' + e.id + '"][type="file"]'
                     );
 
-                    if (uploadData.hasAttribute('data-uri') !== null) {
+                    if (uploadData.hasAttribute('data-uri')) {
                         uploader.setUri(uploadData.getAttribute('data-uri'));
                     } else {
                         uploader.setUri('api/media');
diff --git a/Models/Upload.js b/Models/Upload.js
index ed91fea..90b07a7 100644
--- a/Models/Upload.js
+++ b/Models/Upload.js
@@ -171,10 +171,9 @@ export class Upload {
         });
 
         request.setData(formData);
-        request.setType(RequestType.FILE);
+        request.setType(RequestType.FORM_DATA);
         request.setUri(this.uri);
         request.setMethod(RequestMethod.PUT);
-        request.setRequestHeader('HTTP_X_REQUESTED_WITH', 'XMLHttpRequest');
         request.setSuccess(function (xhr)
         {
             try {
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index 5660ac9..8e61f59 100644
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -166,13 +166,7 @@ class UploadFile
                 Directory::create($path, 0755, true);
             }
 
-            if (!\is_uploaded_file($f['tmp_name'])) {
-                $result[$key]['status'] = UploadStatus::NOT_UPLOADED;
-
-                return $result;
-            }
-
-            if (!\move_uploaded_file($f['tmp_name'], $dest = $path . '/' . $this->fileName)) {
+            if (!\rename($f['tmp_name'], $dest = $path . '/' . $this->fileName)) {
                 $result[$key]['status'] = UploadStatus::NOT_MOVABLE;
 
                 return $result;