Merge branch 'upload-limit'

# Conflicts:
#	app/Http/Helpers/helpers.php
#	config/vuefilemanager.php
#	public/chunks/app-others.js
#	public/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemList.vue
#	resources/js/components/FilesView/FilePreview.vue
#	resources/js/helpers.js
#	resources/js/store/modules/fileFunctions.js

app/Http/Helpers/helpers.php

@@ -355,6 +355,25 @@ function format_gigabytes($gigabytes)
     }
 }
 
+/**
+ * Format string to formated megabytes string
+ *
+ * @param $megabytes
+ * @return string
+ */
+function format_megabytes($megabytes)
+{
+    if ($megabytes >= 1000) {
+        return $megabytes / 1000 . 'GB';
+    }
+
+    if ($megabytes >= 1000000) {
+        return $megabytes / 1000000 . 'TB';
+    }
+
+    return $megabytes . 'MB';
+}
+
 /**
  * Convert megabytes to bytes
  *
@@ -495,6 +514,7 @@ function get_file_type($file_mimetype)
     }
 }
 
+
 /**
  * Get file type from mimetype
  *

app/Http/Tools/Editor.php

@@ -328,9 +328,21 @@ class Editor
         $disk_file_name = basename('chunks/' . $file->getClientOriginalName(), '.part');
         $temp_filename = $file->getClientOriginalName();
 
-        // Generate file
-        File::append(config('filesystems.disks.local.root') . '/chunks/' . $temp_filename, $file->get());
+        // File Path
+        $file_path = config('filesystems.disks.local.root') . '/chunks/' . $temp_filename;\
 
+        // Generate file
+        File::append($file_path, $file->get());
+
+        // Size of file
+        $file_size = File::size($file_path);
+
+        // Size of limit
+        $limit = get_setting('upload_limit');
+
+        // File size handling
+        if( $limit && $file_size > format_bytes($limit)) abort(413);
+    
         // If last then process file
         if ($request->boolean('is_last')) {