Merge branch 'release/v2.4.7'

alexusmai · Nov 20, 2019 · 4d649d2 · 4d649d2
2 parents a19070b + 1e2b938
commit 4d649d2
Show file tree

Hide file tree

Showing 16 changed files with 393 additions and 277 deletions.
diff --git a/README.md b/README.md
@@ -65,14 +65,6 @@
 * Dynamic configuration (v2.4)
 * Supported locales : ru, en, ar, sr, cs, de, es, nl, zh_CN
 
-## Laravel 6
-
-#### For Laravel 6 - You need to install - String & Array Helpers Package
-
-```php
-composer require laravel/helpers
-```
-
 ## In a new version 2.4
 
 Now you can create your own config repositories, it will allow to change your configuration dynamically.

diff --git a/config/file-manager.php b/config/file-manager.php
@@ -86,6 +86,11 @@
      */
     'allowFileTypes' => [],
 
+    /**
+     * Show / Hide system files and folders
+     */
+    'hiddenFiles' => true,
+
     /***************************************************************************
      * Middleware
      *

diff --git a/resources/assets/css/file-manager.css b/resources/assets/css/file-manager.css
diff --git a/resources/assets/js/file-manager.js b/resources/assets/js/file-manager.js
diff --git a/resources/assets/js/file-manager.js.map b/resources/assets/js/file-manager.js.map
diff --git a/resources/views/ckeditor.blade.php b/resources/views/ckeditor.blade.php
@@ -10,14 +10,14 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>
 <div class="container-fluid">
     <div class="row">
-        <div class="col-md-12" style="height: 800px;">
+        <div class="col-md-12" id="fm-main-block">
             <div id="fm"></div>
         </div>
     </div>
@@ -27,6 +27,9 @@
 <script src="{{ asset('vendor/file-manager/js/file-manager.js') }}"></script>
 <script>
   document.addEventListener('DOMContentLoaded', function() {
+    // set fm height
+    document.getElementById('fm-main-block').setAttribute('style', 'height:' + window.innerHeight + 'px');
+
     // Helper function to get parameters from the query string.
     function getUrlParam(paramName) {
       const reParam = new RegExp('(?:[\?&]|&)' + paramName + '=([^&]+)', 'i');

diff --git a/resources/views/fmButton.blade.php b/resources/views/fmButton.blade.php
@@ -10,14 +10,14 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>
 <div class="container-fluid">
     <div class="row">
-        <div class="col-md-12" style="height: 800px;">
+        <div class="col-md-12" id="fm-main-block">
             <div id="fm"></div>
         </div>
     </div>
@@ -27,6 +27,9 @@
 <script src="{{ asset('vendor/file-manager/js/file-manager.js') }}"></script>
 <script>
   document.addEventListener('DOMContentLoaded', function() {
+    // set fm height
+    document.getElementById('fm-main-block').setAttribute('style', 'height:' + window.innerHeight + 'px');
+
     // Add callback to file manager
     fm.$store.commit('fm/setFileCallBack', function(fileUrl) {
       window.opener.fmSetLink(fileUrl);

diff --git a/resources/views/summernote.blade.php b/resources/views/summernote.blade.php
@@ -10,14 +10,14 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>
 <div class="container-fluid">
     <div class="row">
-        <div class="col-md-12" style="height: 800px;">
+        <div class="col-md-12" id="fm-main-block">
             <div id="fm"></div>
         </div>
     </div>
@@ -27,6 +27,9 @@
 <script src="{{ asset('vendor/file-manager/js/file-manager.js') }}"></script>
 <script>
   document.addEventListener('DOMContentLoaded', function() {
+    // set fm height
+    document.getElementById('fm-main-block').setAttribute('style', 'height:' + window.innerHeight + 'px');
+
     // Add callback to file manager
     fm.$store.commit('fm/setFileCallBack', function(fileUrl) {
       window.opener.fmSetLink(fileUrl);

diff --git a/resources/views/tinymce.blade.php b/resources/views/tinymce.blade.php
@@ -10,8 +10,8 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>

diff --git a/resources/views/tinymce5.blade.php b/resources/views/tinymce5.blade.php
@@ -10,8 +10,8 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>
@@ -53,4 +53,4 @@
   });
 </script>
 </body>
-</html>
+</html>
diff --git a/src/FileManager.php b/src/FileManager.php
@@ -9,6 +9,7 @@
 use Alexusmai\LaravelFileManager\Services\TransferService\TransferFactory;
 use Alexusmai\LaravelFileManager\Services\ConfigService\ConfigRepository;
 use Illuminate\Support\Str;
+use Illuminate\Support\Arr;
 use Storage;
 use Image;
 
@@ -55,12 +56,13 @@ public function initialize()
             'leftPath'      => $this->configRepository->getLeftPath(),
             'rightPath'     => $this->configRepository->getRightPath(),
             'windowsConfig' => $this->configRepository->getWindowsConfig(),
+            'hiddenFiles'   => $this->configRepository->getHiddenFiles(),
         ];
 
         // disk list
         foreach ($this->configRepository->getDiskList() as $disk) {
             if (array_key_exists($disk, config('filesystems.disks'))) {
-                $config['disks'][$disk] = array_only(
+                $config['disks'][$disk] = Arr::only(
                     config('filesystems.disks')[$disk], ['driver']
                 );
             }