Merge branch 'dev'

* dev:
  set default storage as local
  v1.4.2 update

app/Http/Controllers/FileAccessController.php

@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 use Illuminate\Http\Request;
 use App\FileManagerFile;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Response;
 
@@ -26,19 +27,13 @@ class FileAccessController extends Controller
     public function get_avatar($basename)
     {
         // Get file path
-        $path = storage_path() . '/app/avatars/' . $basename;
+        $path = '/avatars/' . $basename;
 
         // Check if file exist
-        if (!File::exists($path)) abort(404);
+        if (!Storage::exists($path)) abort(404);
 
-        $file = File::get($path);
-        $type = File::mimeType($path);
-
-        // Create response
-        $response = Response::make($file, 200);
-        $response->header("Content-Type", $type);
-
-        return $response;
+        // Return avatar
+        return Storage::download($path, $basename);
     }
 
     /**
@@ -61,7 +56,7 @@ class FileAccessController extends Controller
             ->firstOrFail();
 
         // Check user permission
-        if ( ! $request->user()->tokenCan('master') ) {
+        if (!$request->user()->tokenCan('master')) {
 
             // Get shared token
             $shared = get_shared($request->cookie('shared_token'));
@@ -119,7 +114,7 @@ class FileAccessController extends Controller
             ->firstOrFail();
 
         // Check user permission
-        if ( ! $request->user()->tokenCan('master') ) {
+        if (!$request->user()->tokenCan('master')) {
             $this->check_file_access($request, $file);
         }
 
@@ -187,24 +182,20 @@ class FileAccessController extends Controller
         $file_pretty_name = $file->name . '.' . $file->mimetype;
 
         // Get file path
-        $path = storage_path() . '/app/file-manager/' . $file->basename;
+        $path = '/file-manager/' . $file->basename;
 
         // Check if file exist
-        if (!File::exists($path)) abort(404);
+        if (!Storage::exists($path)) abort(404);
 
-        $file = File::get($path);
-        $type = File::mimeType($path);
-        $size = File::size($path);
+        $header = [
+            "Content-Type"   => Storage::mimeType($path),
+            "Content-Length" => Storage::size($path),
+            "Accept-Ranges"  => "bytes",
+            "Content-Range"  => "bytes 0-600/" . Storage::size($path),
+        ];
 
-        // Create response
-        $response = Response::make($file, 200);
-        $response->header("Content-Type", $type);
-        $response->header("Content-Disposition", 'attachment; filename=' . $file_pretty_name);
-        $response->header("Content-Length", $size);
-        $response->header("Accept-Ranges", "bytes");
-        $response->header("Content-Range", "bytes 0-" . $size . "/" . $size);
-
-        return $response;
+        // Get file
+        return Storage::download($path, $file_pretty_name, $header);
     }
 
     /**
@@ -215,18 +206,12 @@ class FileAccessController extends Controller
     private function thumbnail_file($file)
     {
         // Get file path
-        $path = storage_path() . '/app/file-manager/' . $file->getOriginal('thumbnail');
+        $path = '/file-manager/' . $file->getOriginal('thumbnail');
 
         // Check if file exist
-        if (!File::exists($path)) abort(404);
+        if (!Storage::exists($path)) abort(404);
 
-        $file = File::get($path);
-        $type = File::mimeType($path);
-
-        // Create response
-        $response = Response::make($file, 200);
-        $response->header("Content-Type", $type);
-
-        return $response;
+        // Return image thumbnail
+        return Storage::download($path, $file->getOriginal('thumbnail'));
     }
 }

app/Http/Controllers/FileFunctions/TrashController.php

@@ -39,10 +39,10 @@ class TrashController extends Controller
         foreach ($files as $file) {
 
             // Delete file
-            Storage::disk('local')->delete('/file-manager/' . $file->basename);
+            Storage::delete('/file-manager/' . $file->basename);
 
             // Delete thumbnail if exist
-            if ($file->thumbnail) Storage::disk('local')->delete('/file-manager/' . $file->getOriginal('thumbnail'));
+            if ($file->thumbnail) Storage::delete('/file-manager/' . $file->getOriginal('thumbnail'));
 
             // Delete file permanently
             $file->forceDelete();

app/Http/Tools/Editor.php

@@ -121,10 +121,10 @@ class Editor
                 foreach ($files as $file) {
 
                     // Delete file
-                    Storage::disk('local')->delete('/file-manager/' . $file->basename);
+                    Storage::delete('/file-manager/' . $file->basename);
 
                     // Delete thumbnail if exist
-                    if (!is_null($file->thumbnail)) Storage::disk('local')->delete('/file-manager/' . $file->getOriginal('thumbnail'));
+                    if (!is_null($file->thumbnail)) Storage::delete('/file-manager/' . $file->getOriginal('thumbnail'));
 
                     // Delete file permanently
                     $file->forceDelete();
@@ -169,10 +169,10 @@ class Editor
             if ($request->force_delete) {
 
                 // Delete file
-                Storage::disk('local')->delete('/file-manager/' . $file->basename);
+                Storage::delete('/file-manager/' . $file->basename);
 
                 // Delete thumbnail if exist
-                if ($file->thumbnail) Storage::disk('local')->delete('/file-manager/' . $file->getOriginal('thumbnail'));
+                if ($file->thumbnail) Storage::delete('/file-manager/' . $file->getOriginal('thumbnail'));
 
                 // Delete file permanently
                 $file->forceDelete();
@@ -213,12 +213,12 @@ class Editor
         $thumbnail = null;
 
         // create directory if not exist
-        if (!Storage::disk('local')->exists($directory)) {
-            Storage::disk('local')->makeDirectory($directory);
+        if (!Storage::exists($directory)) {
+            Storage::makeDirectory($directory);
         }
 
         // Store to disk
-        Storage::disk('local')->putFileAs($directory, $file, $filename, 'public');
+        Storage::putFileAs($directory, $file, $filename, 'private');
 
         // Create image thumbnail
         if ($filetype == 'image') {
@@ -235,7 +235,7 @@ class Editor
             })->stream();
 
             // Store thumbnail to disk
-            Storage::disk('local')->put($directory . '/' . $thumbnail, $image);
+            Storage::put($directory . '/' . $thumbnail, $image);
         }
 
         // Store file

app/Http/helpers.php

@@ -11,6 +11,29 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
 
+/**
+ * Get app version from config
+ *
+ * @return \Illuminate\Config\Repository|mixed
+ */
+function get_storage() {
+    return env('FILESYSTEM_DRIVER');
+}
+
+/**
+ * Check if is running AWS s3 as storage
+ *
+ * @return bool
+ */
+function is_storage_driver($driver) {
+
+    if (is_array($driver)) {
+        return in_array(env('FILESYSTEM_DRIVER'), $driver);
+    }
+
+    return env('FILESYSTEM_DRIVER') === $driver;
+}
+
 /**
  * Get app version from config
  *
@@ -111,16 +134,19 @@ function store_avatar($image, $path)
     $path = check_directory($path);
 
     // Store avatar
-    $image_path = $path . '/' . Str::random(8) . '-' . $image->getClientOriginalName();
+    $image_path = Str::random(8) . '-' . $image->getClientOriginalName();
 
     // Create intervention image
     $img = Image::make($image->getRealPath());
 
     // Generate thumbnail
-    $img->fit('150', '150')->save(storage_path() . "/app/" . $image_path, 90);
+    $img->fit('150', '150')->stream();
+
+    // Store thumbnail to disk
+    Storage::put($path . '/' . $image_path, $img);
 
     // Return path to image
-    return $image_path;
+    return $path . '/' . $image_path;
 }
 
 /**