Merge pull request #70 from amin101/add_filesize

Add filesize to upload validation

Author: streamtw

src/config/lfm.php

@@ -2,7 +2,7 @@
 
 return [
     // If true, the uploaded file will be renamed to uniqid() + file extension.
-    'rename_file'           => true,
+    'rename_file'           => false,
 
     // If rename_file set to false and this set to true, then non-alphanumeric characters in filename will be replaced.
     'alphanumeric_filename' => true,
@@ -12,7 +12,7 @@
     'use_package_routes'    => true,
 
     // For laravel 5.2, please set to ['web', 'auth']
-    'middlewares'           => ['auth'],
+    'middlewares'           => ['web','auth'],
 
     // Add prefix for routes
     'prefix'           => 'laravel-filemanager',
@@ -35,6 +35,9 @@
     'files_dir'             => 'public/files/',
     'files_url'             => '/files/',
 
+    'max_image_size' => 500,
+    'max_file_size' => 1000,
+
     // available since v1.3.0
     'valid_image_mimetypes' => [
         'image/jpeg',

src/controllers/LfmController.php

@@ -17,7 +17,7 @@ class LfmController extends Controller {
     public $file_location = null;
     public $dir_location = null;
     public $file_type = null;
-
+    protected $user;
 
     /**
      * Constructor
@@ -38,6 +38,7 @@ public function __construct()
 
         $this->checkDefaultFolderExists('user');
         $this->checkDefaultFolderExists('share');
+        $this->user  = \Auth::user();
     }
 
 
@@ -83,8 +84,10 @@ private function formatLocation($location, $type = null, $get_thumb = false)
     {
         if ($type === 'share') {
             return $location . Config::get('lfm.shared_folder_name');
+
         } elseif ($type === 'user') {
             return $location . $this->getUserSlug();
+
         }
 
         $working_dir = Input::get('working_dir');

src/controllers/UploadController.php

@@ -19,6 +19,9 @@ class UploadController extends LfmController {
 
     private $default_file_types = ['application/pdf'];
     private $default_image_types = ['image/jpeg', 'image/png', 'image/gif'];
+    // unit is assumed to be kb
+    private $default_max_file_size = 1000;
+    private $default_max_image_size = 500;
 
     /**
      * Upload an image/file and (for images) create thumbnail
@@ -73,7 +76,6 @@ public function upload()
     private function uploadValidator()
     {
         // when uploading a file with the POST named "upload"
-
         $expected_file_type = $this->file_type;
         $is_valid = false;
         $force_invalid = false;
@@ -95,43 +97,43 @@ private function uploadValidator()
 
             $mimetype = $file->getMimeType();
 
+            // size to kb unit is needed
+            $size = $file->getSize() / 1000;
+
             if ($expected_file_type === 'Files') {
-                $config_name = 'lfm.valid_file_mimetypes';
-                $valid_mimetypes = Config::get($config_name, $this->default_file_types);
+                $mine_config = 'lfm.valid_file_mimetypes';
+                $valid_mimetypes = Config::get($mine_config, $this->default_file_types);
+                $max_size = Config::get('lfm.max_file_size', $this->default_max_file_size);
             } else {
-                $config_name = 'lfm.valid_image_mimetypes';
-                $valid_mimetypes = Config::get($config_name, $this->default_image_types);
+                $mine_config = 'lfm.valid_image_mimetypes';
+                $valid_mimetypes = Config::get($mine_config, $this->default_image_types);
+                $max_size = Config::get('lfm.max_image_size', $this->default_max_image_size);
             }
 
             if (!is_array($valid_mimetypes)) {
-                $force_invalid = true;
-                throw new \Exception('Config : ' . $config_name . ' is not set correctly');
-            }
-
-            $is_valid = false;
-
-            if (in_array($mimetype, $valid_mimetypes)) {
-                $is_valid = true;
+                throw new \Exception('Config : ' . $mine_config . ' is not set correctly');
             }
 
-            if (false === $is_valid) {
-                $force_invalid = true;
+            if (false === in_array($mimetype, $valid_mimetypes)) {
                 throw new \Exception(Lang::get('laravel-filemanager::lfm.error-mime') . $mimetype);
             }
-        }
 
-        if($force_invalid)
-        {
-            return false;
+            if ($size > $max_size) {
+                throw new \Exception(Lang::get('laravel-filemanager::lfm.error-size') . $mimetype);
+            }
         }
 
-        return $is_valid;
+        return true;
     }
 
     private function getNewName($file)
     {
         $new_filename = trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME));
 
+        // $file_full_name =  $file->getClientOriginalName();
+
+        // $new_filename = substr($file_full_name,0,strrpos($file_full_name,'.'));
+
         if (Config::get('lfm.rename_file') === true) {
             $new_filename = uniqid();
         } elseif (Config::get('lfm.alphanumeric_filename') === true) {

src/lang/en/lfm.php

@@ -44,6 +44,7 @@
     'error-folder-exist'=> 'A folder with this name already exists!',
     'error-folder-alnum'=> 'Only alphanumeric folder names are allowed!',
     'error-mime'        => 'Unexpected MimeType: ',
+	'error-size'		=> 'Over limit size:',
     'error-instance'    => 'The uploaded file should be an instance of UploadedFile',
     'error-invalid'     => 'Invalid upload request',
     'error-other'       => 'An error has occured: ',

src/lang/fa/lfm.php

@@ -44,6 +44,7 @@
     'error-folder-exist'=> 'یک پوشه با این نام قبلا ایجاد شده است!',
     'error-folder-alnum'=> 'Only alphanumeric folder names are allowed!',
     'error-mime'        => 'پسوند غیرمجاز: ',
+	'error-size'		=> 'سایز بیش از حد:',
     'error-instance'    => 'فایل آپلود شده باید نمونه ای از UploadedFile باشد',
     'error-invalid'     => 'درخواست آپلود غیرمعتبر',