add upload validation error messages

Author: streamtw

src/controllers/UploadController.php

@@ -15,6 +15,9 @@
  */
 class UploadController extends LfmController {
 
+    private $default_file_types = ['application/pdf'];
+    private $default_image_types = ['image/jpeg', 'image/png', 'image/gif'];
+
     /**
      * Upload an image/file and (for images) create thumbnail
      *
@@ -26,21 +29,17 @@ public function upload()
         try {
             $res = $this->uploadValidator();
             if (true !== $res) {
-                return "Invalid upload request";
+                return Lang::get('laravel-filemanager::lfm.error-invalid');
             }
         } catch (\Exception $e) {
             return $e->getMessage();
         }
 
-        if (!Input::hasFile('upload')) {
-            return Lang::get('laravel-filemanager::lfm.error-file-empty');
-        }
-
         $file = Input::file('upload');
 
         $new_filename = $this->getNewName($file);
 
-        $dest_path = parent::getPath();
+        $dest_path = parent::getPath('directory');
 
         if (File::exists($dest_path . $new_filename)) {
             return Lang::get('laravel-filemanager::lfm.error-file-exist');
@@ -64,55 +63,37 @@ private function uploadValidator()
     {
         // when uploading a file with the POST named "upload"
 
-        $file_array = Input::file();
         $expected_file_type = $this->file_type;
         $is_valid = false;
 
-        if (!is_array($file_array)) {
-            throw new \Exception('Incorrect file_array');
-        }
-
-        if (!array_key_exists('upload', $file_array)) {
-            throw new \Exception('name: "upload" not exists');
-        }
-
-        $file = $file_array['upload'];
+        $file = Input::file('upload');
         if (!$file) {
-            throw new \Exception('Unexpected, nothing in "upload"');
+            throw new \Exception(Lang::get('laravel-filemanager::lfm.error-file-empty'));
         }
         if (!$file instanceof UploadedFile) {
-            throw new \Exception('The uploaded file should be an instance of UploadedFile');
+            throw new \Exception(Lang::get('laravel-filemanager::lfm.error-instance'));
         }
 
         $mimetype = $file->getMimeType();
 
-        // File MimeTypes Check
-        $valid_file_mimetypes = Config::get(
-            'lfm.valid_file_mimetypes',
-            ['application/pdf']
-        );
-        if (!is_array($valid_file_mimetypes)) {
-            throw new \Exception('valid_file_mimetypes is not set correctly');
+        if ($expected_file_type === 'Files') {
+            $config_name = 'lfm.valid_file_mimetypes';
+            $valid_mimetypes = Config::get($config_name, $this->default_file_types);
+        } else {
+            $config_name = 'lfm.valid_image_mimetypes';
+            $valid_mimetypes = Config::get($config_name, $this->default_image_types);
         }
 
-        if (in_array($mimetype, $valid_file_mimetypes) && $expected_file_type === 'Files') {
-            $is_valid = true;
+        if (!is_array($valid_mimetypes)) {
+            throw new \Exception('Config : ' . $config_name . ' is not set correctly');
         }
 
-        // Image MimeTypes Check
-        $valid_image_mimetypes = Config::get(
-            'lfm.valid_image_mimetypes',
-            ['image/jpeg', 'image/png', 'image/gif']
-        );
-        if (!is_array($valid_image_mimetypes)) {
-            throw new \Exception('valid_image_mimetypes is not set correctly');
-        }
-        if (in_array($mimetype, $valid_image_mimetypes)) {
+        if (in_array($mimetype, $valid_mimetypes)) {
             $is_valid = true;
         }
 
         if (false === $is_valid) {
-            throw new \Exception('Unexpected MimeType: ' . $mimetype);
+            throw new \Exception(Lang::get('laravel-filemanager::lfm.error-mime') . $mimetype);
         }
         return $is_valid;
     }

src/lang/en/lfm.php

@@ -40,6 +40,9 @@
     'error-delete'      => 'You cannot delete this folder because it is not empty!',
     'error-folder-name' => 'Folder name cannot be empty!',
     'error-folder-exist'=> 'A folder with this name already exists!',
+    'error-mime'        => 'Unexpected MimeType: ',
+    'error-instance'    => 'The uploaded file should be an instance of UploadedFile',
+    'error-invalid'     => 'Invalid upload request',
 
     'btn-upload'        => 'Upload File',
     'btn-uploading'     => 'Uploading...',

src/lang/fr/lfm.php

@@ -40,6 +40,9 @@
     'error-delete'      => "Vous ne pouvez pas supprimer ce dossier car il n'est pas vide",
     'error-folder-name' => 'Le nom du dossier ne peut pas être vide',
     'error-folder-exist'=> 'Un dossier avec ce nom existe déjà !',
+    'error-mime'        => 'Unexpected MimeType: ',
+    'error-instance'    => 'The uploaded file should be an instance of UploadedFile',
+    'error-invalid'     => 'Invalid upload request',
 
     'btn-upload'        => 'Envoyer le fichier',
     'btn-uploading'     => 'Envoi...',

src/lang/pt-BR/lfm.php

@@ -40,6 +40,9 @@
     'error-delete'      => 'Você não pode deletar esta pasta, pois ela não está vazia!',
     'error-folder-name' => 'Nome da pasta não pode ser vazio!',
     'error-folder-exist'=> 'Uma pasta com este nome já existe!',
+    'error-mime'        => 'Unexpected MimeType: ',
+    'error-instance'    => 'The uploaded file should be an instance of UploadedFile',
+    'error-invalid'     => 'Invalid upload request',
 
     'btn-upload'        => 'Enviar Arquivo',
     'btn-uploading'     => 'Enviando...',

src/lang/tr/lfm.php

@@ -40,6 +40,9 @@
     'error-delete'      => 'Klasör boş olmadığından, klasörü silemezsiniz!',
     'error-folder-name' => 'Klasör adı yazılmalıdır!',
     'error-folder-exist'=> 'Bu adda bir klasör zaten var!',
+    'error-mime'        => 'Unexpected MimeType: ',
+    'error-instance'    => 'The uploaded file should be an instance of UploadedFile',
+    'error-invalid'     => 'Invalid upload request',
 
     'btn-upload'        => 'Yükle',
     'btn-uploading'     => 'Yükleniyor...',

src/lang/zh-CN/lfm.php

@@ -34,12 +34,15 @@
     'message-name'      => '文件夹名称:',
     'message-rename'    => '重命名为:',
 
-    'error-rename'      => '名稱重複，請重新輸入！',
-    'error-file-empty'  => '請選擇檔案！',
-    'error-file-exist'  => '相同檔名的檔案已存在！',
-    'error-delete'      => '資料夾未清空，無法刪除！',
-    'error-folder-name' => '請輸入資料夾名稱！',
-    'error-folder-exist'=> '相同名稱的資料夾已存在！',
+    'error-rename'      => '名称重复，请重新输入！',
+    'error-file-empty'  => '请选择档案！',
+    'error-file-exist'  => '相同档名的档案已存在！',
+    'error-delete'      => '资料夹未清空，无法删除！',
+    'error-folder-name' => '请输入资料夹名称！',
+    'error-folder-exist'=> '相同名称的资料夹已存在！',
+    'error-mime'        => 'Mime 格式错误 : ',
+    'error-instance'    => '上传档案的 instance 应为 UploadedFile',
+    'error-invalid'     => '验证失败，上传未成功',
 
     'btn-upload'        => '上传',
     'btn-uploading'     => '上传中...',

src/lang/zh-TW/lfm.php

@@ -40,6 +40,9 @@
     'error-delete'      => '資料夾未清空，無法刪除！',
     'error-folder-name' => '請輸入資料夾名稱！',
     'error-folder-exist'=> '相同名稱的資料夾已存在！',
+    'error-mime'        => 'Mime 格式錯誤 : ',
+    'error-instance'    => '上傳檔案的 instance 應為 UploadedFile',
+    'error-invalid'     => '驗證失敗，上傳未成功',
 
     'btn-upload'        => '上傳',
     'btn-uploading'     => '上傳中...',