Merge pull request #93 from atzeteppema/master

Added error handler to file upload and Corrected double file extensions in config

Author: youchenlee

src/config/lfm.php

@@ -52,10 +52,10 @@
     // file extensions array, only for showing file information, it won't affect the upload process.
     'file_type_array'         => [
         'pdf'  => 'Adobe Acrobat',
+        'doc'  => 'Microsoft Word',
         'docx' => 'Microsoft Word',
-        'docx' => 'Microsoft Word',
-        'xls'  => 'Microsoft Excel',
         'xls'  => 'Microsoft Excel',
+        'xlsx' => 'Microsoft Excel',
         'zip'  => 'Archive',
         'gif'  => 'GIF Image',
         'jpg'  => 'JPEG Image',
@@ -68,10 +68,10 @@
     // file extensions array, only for showing icons, it won't affect the upload process.
     'file_icon_array'         => [
         'pdf'  => 'fa-file-pdf-o',
+        'doc'  => 'fa-file-word-o',
         'docx' => 'fa-file-word-o',
-        'docx' => 'fa-file-word-o',
-        'xls'  => 'fa-file-excel-o',
         'xls'  => 'fa-file-excel-o',
+        'xlsx' => 'fa-file-excel-o',
         'zip'  => 'fa-file-archive-o',
         'gif'  => 'fa-file-image-o',
         'jpg'  => 'fa-file-image-o',

src/lang/en/lfm.php

@@ -44,6 +44,8 @@
     'error-mime'        => 'Unexpected MimeType: ',
     'error-instance'    => 'The uploaded file should be an instance of UploadedFile',
     'error-invalid'     => 'Invalid upload request',
+    'error-other'       => 'An error has occured: ',
+    'error-too-large'   => 'Request entity too large!',
 
     'btn-upload'        => 'Upload File',
     'btn-uploading'     => 'Uploading...',

src/views/script.blade.php

@@ -41,7 +41,8 @@
 $('#upload-btn').click(function () {
   var options = {
     beforeSubmit:  showRequest,
-    success:       showResponse
+    success:       showResponse,
+    error:         showError
   };
 
   function showRequest(formData, jqForm, options) {
@@ -59,6 +60,17 @@ function showResponse(responseText, statusText, xhr, $form)  {
     loadItems();
   }
 
+  function showError(jqXHR, textStatus, errorThrown) {
+    $('#upload-btn').html('{{ Lang::get("laravel-filemanager::lfm.btn-upload") }}');
+    if (jqXHR.status == 413) {
+      notify('{{ Lang::get("laravel-filemanager::lfm.error-too-large") }}');
+    } else if (textStatus == 'error') {
+      notify('{{ Lang::get("laravel-filemanager::lfm.error-other") }}' + errorThrown);
+    } else {
+      notify('{{ Lang::get("laravel-filemanager::lfm.error-other") }}' + textStatus + '<br>' + errorThrown);
+    }
+  }
+
   $('#uploadForm').ajaxSubmit(options);
   return false;
 });