讓 filemanager 有錯誤訊息

Author: FreedomKnight

public/js/script.js

@@ -129,9 +129,9 @@ function performLfmRequest(url, parameter, type) {
 }
 
 var refreshFoldersAndItems = function (data) {
-  if (data == 'OK') {
-    loadFolders();
-  } else {
+  loadFolders();
+  if (data != 'OK') {
+    data = Array.isArray(data) ? data.join('<br/>') : data;
     notify(data);
   }
 };

src/controllers/UploadController.php

@@ -27,16 +27,22 @@ class UploadController extends LfmController
     public function upload()
     {
         $files = request()->file('upload');
-
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                $this->proceedSingleUpload($file);
+        $error_bag = [];
+        foreach (is_array($files) ? $files : [$files] as $file) {
+            $validation_message = $this->uploadValidator($file);
+            $new_filename = $this->proceedSingleUpload($file);
+
+            if ($validation_message !== 'pass') {
+                array_push($error_bag, $validation_message);
+            } elseif ($new_filename == 'invalid') {
+                array_push($error_bag, $response);
             }
 
-            $response = $this->success_response;
-        } else { // upload via ckeditor 'Upload' tab
-            $new_filename = $this->proceedSingleUpload($files);
+        }
 
+        if (is_array($files)) {
+            $response = count($error_bag) > 0 ? $error_bag : $this->success_response;
+        } else { // upload via ckeditor 'Upload' tab
             $response = $this->useFile($new_filename);
         }