Updating to unisharp master branch

Author: gwleuverink

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+Please check the following instructions before submitting a bug :
+ * Make sure you are using the latest version.
+ * If you are new to this package, make sure you followed every step from [installation document](http://unisharp.github.io/laravel-filemanager/installation).
+ * If you have problem applying this package, please check the [integration document](http://unisharp.github.io/laravel-filemanager/integration).
+ * If anything went broken after you upgraded, please check the [upgrade document](http://unisharp.github.io/laravel-filemanager/upgrade).
+
+If your problem still remains, please do these steps :
+ * run `php ./vendor/unisharp/laravel-filemanager/bin/debug` and paste the results here.
+ * (optional) If there are errors in browser console, click on the links and you should see some PHP exceptions. Please capture screenshots and paste them here.

README.md

@@ -13,13 +13,33 @@
  * Demo : [Laravel Filemanager container](https://github.com/UniSharp/laravel-filemanager-example-5.3)
 
 ## v1.7 released
+ * Please follow the intructions in [upgrade document](https://unisharp.github.io/laravel-filemanager/upgrade).
  * Important changes :
    * All code refactored.
    * Fix Windows compatibility.
    * Fix file cannot be uploaded to "File Mode".
    * Config file is also refactored, see [config document](https://unisharp.github.io/laravel-filemanager/config).
- * Please follow the intructions in [this document](https://unisharp.github.io/laravel-filemanager/upgrade) to upgrade.
-  
+
+## Security
+
+It is important to note that if you use your own routes **you must protect your routes to Laravel-Filemanager in order to prevent unauthorized uploads to your server**. Fortunately, Laravel makes this very easy.
+
+If, for example, you want to ensure that only logged in users have the ability to access the Laravel-Filemanager, simply wrap the routes in a group, perhaps like this:
+
+```php
+Route::group(array('before' => 'auth'), function ()
+{
+    Route::get('/laravel-filemanager', '\Unisharp\Laravelfilemanager\controllers\LfmController@show');
+    Route::post('/laravel-filemanager/upload', '\Unisharp\Laravelfilemanager\controllers\LfmController@upload');
+    // list all lfm routes here...
+});
+```
+
+This approach ensures that only authenticated users have access to the Laravel-Filemanager. If you are using Middleware or some other approach to enforce security, modify as needed.
+
+**If you use the laravel-filemanager default route, make sure the `auth` middleware (set in config/lfm.php) is enabled and functional**.
+
+
 ## Credits
 Special thanks to
 

docs/_config.yml

@@ -2,7 +2,7 @@ theme: jekyll-theme-cayman
 
 # Setup
 title: Laravel File Manager
-description: File manager/gallery with CKEditor and TinyMCE support.
+description: File manager/gallery with CKEditor, TinyMCE and Summernote support.
 
 # About/contact
 author:

docs/config.md

@@ -17,6 +17,10 @@ In `config/lfm.php` :
 // The url to this package. Change it if necessary.
 'prefix' => 'laravel-filemanager',
 
+// The prefix of urls to non-public files, for exmaple if: base_directory !== 'public'
+// Without slashes
+'urls_prefix' => '',
+
 /*
 |--------------------------------------------------------------------------
 | Multi-User Mode
@@ -25,10 +29,15 @@ In `config/lfm.php` :
 
 // If true, private folders will be created for each signed-in user.
 'allow_multi_user' => true,
+// If true, share folder will be created when allow_multi_user is true.
+'allow_share_folder' => true,
 
-// The database column to identify a user. Make sure the value is unique.
-// Ex: When set to 'id', the private folder of user will be named as the user id.
-'user_field' => 'id',
+// Flexibla way to customize client folders accessibility
+// Ex: The private folder of user will be named as the user id.
+// You cant use a closure when using the optimized config file (in Laravel 5.2 anyway)
+'user_field' => function() {
+    return auth()->user()->id;
+},
 
 /*
 |--------------------------------------------------------------------------
@@ -72,15 +81,22 @@ In `config/lfm.php` :
 // If true, non-alphanumeric folder name will be rejected.
 'alphanumeric_directory' => false,
 
-'max_image_size' => 500,
-'max_file_size' => 1000,
+// If true, the uploading file's size will be verified for over than max_image_size/max_file_size.
+'should_validate_size' => false,
+
+'max_image_size' => 50000,
+'max_file_size' => 50000,
+
+// If true, the uploading file's mime type will be valid in valid_image_mimetypes/valid_file_mimetypes.
+'should_validate_mime' => false,
 
 // available since v1.3.0
 'valid_image_mimetypes' => [
     'image/jpeg',
     'image/pjpeg',
     'image/png',
-    'image/gif'
+    'image/gif',
+    'image/svg+xml',
 ],
 
 // available since v1.3.0
@@ -90,10 +106,20 @@ In `config/lfm.php` :
     'image/pjpeg',
     'image/png',
     'image/gif',
+    'image/svg+xml',
     'application/pdf',
     'text/plain',
 ],
 
+/*
+|--------------------------------------------------------------------------
+| Image / Folder Setting
+|--------------------------------------------------------------------------
+*/
+
+'thumb_img_width' => 200,
+'thumb_img_height' => 200,
+
 /*
 |--------------------------------------------------------------------------
 | File Extension Information
@@ -129,4 +155,28 @@ In `config/lfm.php` :
     'ppt'  => 'fa-file-powerpoint-o',
     'pptx' => 'fa-file-powerpoint-o',
 ],
+
+/*
+|--------------------------------------------------------------------------
+| php.ini override
+|--------------------------------------------------------------------------
+*/
+// These values override your php.ini settings before uploading files
+// Set these to false to ingnore and apply your php.ini settings
+'php_ini_overrides' => [
+    'memory_limit'        => '256M'
+],
 ```
+
+## Caveats
+### php.ini overrides
+
+The php_ini_overrides are applied on every request the filemanager does and are reset once the script has finished executing.
+This has one drawback: any ini settings that you might want to change that apply to the request itself will not work.
+
+For example, overriding these settings will not work:
+* upload_max_filesize
+* post_max_size
+
+**Why this is expected behaviour:**
+upload_max_filesize and post_max_size will get set but uploaded files are already passed to your PHP script before the settings are changed.

docs/installation.md

@@ -1,5 +1,7 @@
 ## Requirements
  * php >= 5.4
+ * exif extension
+ * gd OR imagick (choose one only)
  * Laravel 5
  * requires [intervention/image](https://github.com/Intervention/image) (to make thumbs, crop and resize images).
 
@@ -35,4 +37,8 @@
     php artisan vendor:publish --tag=lfm_public
     ```
     
-1. Ensure that the files & images directories (in `config/lfm.php`) are writable by your web server(run commands like `chown` or `chmod`).
+1. Ensure that the files & images directories (in `config/lfm.php`) are writable by your web server (run commands like `chown` or `chmod`).
+
+1. Check the [integration document](http://unisharp.github.io/laravel-filemanager/integration) to see how to apply this package.
+
+1. Check the [config document](http://unisharp.github.io/laravel-filemanager/config) to discover the flexibility of this package.

docs/integration.md

@@ -78,6 +78,63 @@ Check `vendor/unisharp/laravel-filemanager/src/views/demo.blade.php`, which alre
 </script>
 ```
 
+### Option 3: Summernote
+
+```html
+<!-- dependencies (Summernote depends on Bootstrap & jQuery) -->
+<link href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.css" rel="stylesheet">
+<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.js"></script> 
+<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.js"></script> 
+
+<link href="http://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.3/summernote.css" rel="stylesheet">
+<script src="http://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.3/summernote.js"></script>
+
+<!-- markup -->
+<textarea id="summernote-editor" name="content">{!! old('content', $content) !!}</textarea>
+
+<!-- summernote config -->
+<script>
+$(document).ready(function(){
+
+    // Define function to open filemanager window
+    var lfm = function(options, cb) {
+        var route_prefix = (options && options.prefix) ? options.prefix : '/laravel-filemanager';
+        window.open(route_prefix + '?type=' + options.type || 'file', 'FileManager', 'width=900,height=600');
+        window.SetUrl = cb;
+    };
+    
+    // Define LFM summernote button
+    var LFMButton = function(context) {
+        var ui = $.summernote.ui;
+        var button = ui.button({
+            contents: '<i class="note-icon-picture"></i> ',
+            tooltip: 'Insert image with filemanager',
+            click: function() {
+	    
+                lfm({type: 'image', prefix: '/file-manager'}, function(url, path) {
+                    context.invoke('insertImage', url);
+                });
+
+            }
+        });
+        return button.render();
+    };
+    
+    // Initialize summernote with LFM button in the popover button group
+    // Please note that you can add this button to any other button group you'd like
+    $('#summernote-editor').summernote({
+        toolbar: [
+            ['popovers', ['lfm']],
+        ],
+        buttons: {
+            lfm: LFMButton
+        }
+    })
+   
+});
+</script>
+```
+
 ## Standalone button
 If you are going to use filemanager independently, meaning set the value of an input to selected photo/file url, follow this structure:
 

public/css/lfm.css

@@ -47,10 +47,6 @@
   text-overflow: ellipsis;
 }
 
-.img-row {
-  margin-bottom: 20px;
-}
-
 .clickable {
   cursor: pointer;
 }
@@ -67,44 +63,52 @@
   display: none;
 }
 
-.thumbnail {
-  max-width: 210px;
-  max-height: 210px;
-  margin-bottom: 0 !important;
-}
-
-.thumbnail-mobile {
-  height: 60px;
-  width: 60px;
-}
-
 .square {
   width: 100%;
   padding-bottom: 100%;
   position: relative;
+  border: 1px solid rgb(221, 221, 221);
+  border-radius: 3px;
+  // max-width: 210px;
+  max-height: 210px;
 }
-.square > img, .square > .icon-container {
+.visible-xs .square {
+  width: 60px;
+}
+.square > img {
+  padding: 5px;
   position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
   max-width: 100%;
+  max-height: 100%;
+  margin: 0 auto;
+  display: inline-block;
+  vertical-align: middle;
+}
+.square > i {
+  font-size: 80px;
+  padding: 5px;
+  position: absolute;
+  top: calc(50% - 40px);
+  left: calc(50% - 40px);
+}
+.visible-xs .square > i {
+  font-size: 50px;
+  padding: 0px auto;
+  padding-top: 5px;
+  top: calc(50% - 25px);
+  left: calc(50% - 25px);
 }
 
-.icon-container {
+.caption {
+  margin-top: 10px;
+  margin-bottom: 20px;
+}
+.caption > .btn-group {
   width: 100%;
-  height: 100%;
-  text-align: center;
-  margin: 0 auto;
 }
-.icon-container:before {
-  content: '';
-  display: inline-block;
-  vertical-align: middle ;
-  height: 100%;
+.caption > .btn-group > .item_name {
+  width: calc(100% - 25px);
 }
-.icon-container > i {
-  display: inline-block;
-  vertical-align: middle;
+.caption > .btn-group > .dropdown-toggle {
+  width: 25px;
 }

public/css/mfb.css

@@ -1,13 +1,7 @@
 (function( $ ){
 
   $.fn.filemanager = function(type, options) {
-    type = type || 'image';
-
-    if (type === 'image' || type === 'images') {
-      type = 'Images';
-    } else {
-      type = 'Files';
-    }
+    type = type || 'file';
 
     this.on('click', function(e) {
       var route_prefix = (options && options.prefix) ? options.prefix : '/laravel-filemanager';