Upload images to /resources folder instead of /public folder (#115)

Author: bluehaha2

src/controllers/RedirectController.php

@@ -0,0 +1,53 @@
+<?php namespace Unisharp\Laravelfilemanager\controllers;
+
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Http\Request;
+
+/**
+ * Class RedirectController
+ * @package Unisharp\Laravelfilemanager\controllers
+ */
+class RedirectController extends LfmController
+{
+    /**
+     * Get image from custom directory by route
+     *
+     * @param string $image_path
+     * @return string
+     */
+    public function getImage($base_path, $image_name)
+    {
+        return $this->responseImageOrFile($image_name);
+    }
+
+    /**
+     * Get file from custom directory by route
+     *
+     * @param string $file_name
+     * @return string
+     */
+    public function getFile(Request $request, $base_path, $file_name)
+    {
+        $request->request->add(['type' => 'Files']);
+
+        return $this->responseImageOrFile($file_name);
+    }
+
+    private function responseImageOrFile($file_name)
+    {
+        $file_path = $this->getCurrentPath($file_name);
+
+        if (!File::exists($file_path)) {
+            abort(404);
+        }
+
+        $file = File::get($file_path);
+        $type = File::mimeType($file_path);
+
+        $response = Response::make($file);
+        $response->header("Content-Type", $type);
+
+        return $response;
+    }
+}

src/routes.php

@@ -87,4 +87,12 @@
     ]);
 
     Route::get('/demo', 'DemoController@index');
+
+    // Get file when base_directory isn't public
+    $images_url = '/' . \Config::get('lfm.images_folder_name') . '/{base_path}/{image_name}';
+    $files_url = '/' . \Config::get('lfm.files_folder_name') . '/{base_path}/{file_name}';
+    Route::get($images_url, 'RedirectController@getImage')
+        ->where('image_name', '.*');
+    Route::get($files_url, 'RedirectController@getFIle')
+        ->where('file_name', '.*');
 });

src/traits/LfmHelpers.php

@@ -60,9 +60,14 @@ public function getPathPrefix($type)
         }
 
         $prefix = config('lfm.' . $this->currentLfmType() . 's_folder_name', $default_folder_name);
+        $base_directory = config('lfm.base_directory', 'public');
 
         if ($type === 'dir') {
-            $prefix = config('lfm.base_directory', 'public') . '/' . $prefix;
+            $prefix = $base_directory . '/' . $prefix;
+        }
+
+        if ($type === 'url' && $base_directory !== 'public') {
+            $prefix = 'laravel-filemanager/' . $prefix;
         }
 
         return $prefix;
@@ -283,7 +288,7 @@ public function getFilesWithInfo($path)
             $image_path = $this->getCurrentPath($file_name);
             if (File::exists($thumb_path)) {
                 $thumb_url = $this->getThumbUrl($file_name) . '?timestamp=' . filemtime($thumb_path);
-            } elseif (File::exists($image_path)) {
+            } elseif (!$this->isImageToThumb($image_path)) {
                 $thumb_url = $this->getFileUrl($file_name);
             } else {
                 $thumb_url = null;