Merge branch 'master' into master

Author: streamtw

docs/integration.md

@@ -34,8 +34,54 @@ Check `vendor/unisharp/laravel-filemanager/src/views/demo.blade.php`, which alre
   $('textarea.my-editor').ckeditor(options);
   </script>
   ```
+  
+### Option 2: TinyMCE5
 
-### Option 2: TinyMCE4
+```html
+<script src="/path-to-your-tinymce/tinymce.min.js"></script>
+<textarea name="content" class="form-control my-editor">{!! old('content', $content) !!}</textarea>
+<script>
+  var editor_config = {
+    path_absolute : "/",
+    selector: 'textarea.my-editor',
+    relative_urls: false,
+    plugins: [
+      "advlist autolink lists link image charmap print preview hr anchor pagebreak",
+      "searchreplace wordcount visualblocks visualchars code fullscreen",
+      "insertdatetime media nonbreaking save table directionality",
+      "emoticons template paste textpattern"
+    ],
+    toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media",
+    file_picker_callback : function(callback, value, meta) {
+      var x = window.innerWidth || document.documentElement.clientWidth || document.getElementsByTagName('body')[0].clientWidth;
+      var y = window.innerHeight|| document.documentElement.clientHeight|| document.getElementsByTagName('body')[0].clientHeight;
+
+      var cmsURL = editor_config.path_absolute + 'laravel-filemanager?editor=' + meta.fieldname;
+      if (meta.filetype == 'image') {
+        cmsURL = cmsURL + "&type=Images";
+      } else {
+        cmsURL = cmsURL + "&type=Files";
+      }
+
+      tinyMCE.activeEditor.windowManager.openUrl({
+        url : cmsURL,
+        title : 'Filemanager',
+        width : x * 0.8,
+        height : y * 0.8,
+        resizable : "yes",
+        close_previous : "no",
+        onMessage: (api, message) => {
+          callback(message.content);
+        }
+      });
+    }
+  };
+
+  tinymce.init(editor_config);
+</script>
+```
+
+### Option 3: TinyMCE4
 
 ```html
 <script src="//cdn.tinymce.com/4/tinymce.min.js"></script>
@@ -78,7 +124,7 @@ Check `vendor/unisharp/laravel-filemanager/src/views/demo.blade.php`, which alre
 </script>
 ```
 
-### Option 3: Summernote
+### Option 4: Summernote
 
 ```html
 <!-- dependencies (Summernote depends on Bootstrap & jQuery) -->

public/js/filemanager.js

@@ -0,0 +1,22 @@
+/**
+ * Open file manager and return selected files.
+ * Promise is never resolved if window is closed.
+ *
+ * @returns Promise<array> Array of selected files with properties:
+ *      icon        string
+ *      is_file     bool
+ *      is_image    bool
+ *      name        string
+ *      thumb_url   string|null
+ *      time        int
+ *      url         string
+ */
+window.filemanager = function filemanager() {
+    var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/filemanager';
+    var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'FileManager';
+    var features = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'width=900,height=600';
+    return new Promise(function (resolve) {
+        window.open(url, target, features);
+        window.SetUrl = resolve;
+    });
+};

public/js/filemanager.min.js

@@ -83,7 +83,8 @@ public function error($error_type, $variables = [])
      */
     public function applyIniOverrides()
     {
-        $overrides = config('lfm.php_ini_overrides');
+        $overrides = config('lfm.php_ini_overrides', []);
+        
         if ($overrides && is_array($overrides) && count($overrides) === 0) {
             return;
         }

src/Controllers/LfmController.php

@@ -51,6 +51,8 @@ public function boot()
      */
     public function register()
     {
+        $this->mergeConfigFrom(__DIR__ . '/config/lfm.php', 'lfm-config');
+
         $this->app->singleton('laravel-filemanager', function () {
             return true;
         });

src/LaravelFilemanagerServiceProvider.php

@@ -108,11 +108,7 @@ public function size()
 
     public function time()
     {
-        if (!$this->isDirectory()) {
-            return $this->lfm->lastModified();
-        }
-
-        return false;
+        return $this->lfm->lastModified();
     }
 
     public function thumbUrl()

src/LfmItem.php

@@ -273,19 +273,37 @@ private function getNewName($file)
         $new_file_name = $this->helper
             ->translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
 
+        $extension = $file->getClientOriginalExtension();
+
         if (config('lfm.rename_file') === true) {
             $new_file_name = uniqid();
         } elseif (config('lfm.alphanumeric_filename') === true) {
             $new_file_name = preg_replace('/[^A-Za-z0-9\-\']/', '_', $new_file_name);
         }
 
-        $extension = $file->getClientOriginalExtension();
-
         if ($extension) {
-            $new_file_name .= '.' . $extension;
+            $new_file_name_with_extention = $new_file_name . '.' . $extension;
         }
 
-        return $new_file_name;
+        if (config('lfm.rename_duplicates') === true) {
+            $counter = 1;
+            $file_name_without_extentions = $new_file_name;
+            while ($this->setName(($extension) ? $new_file_name_with_extention : $new_file_name)->exists()) {
+                if (config('lfm.alphanumeric_filename') === true) {
+                    $suffix = '_'.$counter;
+                } else {
+                    $suffix = " ({$counter})";
+                }
+                $new_file_name = $file_name_without_extentions.$suffix;
+
+                if ($extension) {
+                    $new_file_name_with_extention = $new_file_name . '.' . $extension;
+                }
+                $counter++;
+            }
+        }
+
+        return ($extension) ? $new_file_name_with_extention : $new_file_name;
     }
 
     private function saveFile($file, $new_file_name)

src/LfmPath.php

@@ -45,7 +45,7 @@ public function save($file)
         $nameint = strripos($this->path, "/");
         $nameclean = substr($this->path, $nameint + 1);
         $pathclean = substr_replace($this->path, "", $nameint);
-        $this->disk->putFileAs($pathclean, $file, $nameclean, 'public');
+        $this->disk->putFileAs($pathclean, $file, $nameclean);
     }
 
     public function url($path)

src/LfmStorageRepository.php

@@ -48,28 +48,28 @@
     'folder_categories'        => [
         'file'  => [
             'folder_name'  => 'files',
-            'startup_view' => 'grid',
+            'startup_view' => 'list',
             'max_size'     => 50000, // size in KB
             'valid_mime'   => [
                 'image/jpeg',
                 'image/pjpeg',
                 'image/png',
                 'image/gif',
                 'image/svg+xml',
+                'application/pdf',
+                'text/plain',
             ],
         ],
         'image' => [
             'folder_name'  => 'photos',
-            'startup_view' => 'list',
+            'startup_view' => 'grid',
             'max_size'     => 50000, // size in KB
             'valid_mime'   => [
                 'image/jpeg',
                 'image/pjpeg',
                 'image/png',
                 'image/gif',
                 'image/svg+xml',
-                'application/pdf',
-                'text/plain',
             ],
         ],
     ],
@@ -94,6 +94,8 @@
 
     'rename_file'              => false,
 
+    'rename_duplicates'        => false,
+
     'alphanumeric_filename'    => false,
 
     'alphanumeric_directory'   => false,

src/config/lfm.php

@@ -62,6 +62,8 @@
     'btn-copy-crop'     => 'Másolás és vágás',
     'btn-cancel'        => 'Mégse',
     'btn-resize'        => 'Átméretezés',
+    'btn-confirm'       => 'Ok',
+    'btn-crop-free'     => 'Szabad arány',
 
     'resize-ratio'      => 'Arány:',
     'resize-scaled'     => 'Kép méretarány:',