fix file upload

Author: streamtw

src/controllers/FolderController.php

@@ -22,10 +22,10 @@ class FolderController extends LfmController {
      */
     public function getFolders()
     {
-        $dir_path = $this->file_location . \Auth::user()->user_field;
+        $dir_path = parent::getPath();
         $directories = parent::getDirectories($dir_path);
 
-        $share_path = $this->file_location . Config::get('lfm.shared_folder_name');
+        $share_path = parent::getPath('share');
         $shared_folders = parent::getDirectories($share_path);
 
         return View::make('laravel-filemanager::tree')

src/controllers/ItemsController.php

@@ -26,9 +26,9 @@ public function getItems()
     {
         $type = Input::get('type');
         $view = $this->getView($type);
-        $path = $this->file_location . Input::get('working_dir');
+        $path = parent::getPath();
 
-        $files       = File::files(base_path($path));
+        $files       = File::files($path);
         $file_info   = $this->getFileInfos($files, $type);
         $directories = parent::getDirectories($path);
         $thumb_url   = parent::getUrl('thumb');
@@ -45,8 +45,8 @@ private function getFileInfos($files, $type = 'Images')
         foreach ($files as $key => $file) {
             $file_name = parent::getFileName($file);
             $file_created = filemtime($file);
-
             $file_size = number_format((File::size($file) / 1024), 2, ".", "");
+            
             if ($file_size > 1024) {
                 $file_size = number_format(($file_size / 1024), 2, ".", "") . " Mb";
             } else {

src/controllers/LfmController.php

@@ -58,23 +58,25 @@ public function show()
 
 
     private function setPathAndType()
-    {   
+    {
+        // dd('type:'.Input::get('type'));
+        
         if (Input::has('type') && Input::get('type') === 'Files') {
             Session::put('lfm_type', 'Files');
-            $this->file_location = Config::get('lfm.files_dir');
-            $this->dir_location = Config::get('lfm.files_url');
-        } else {
+            Session::put('lfm.file_location', Config::get('lfm.files_dir'));
+            Session::put('lfm.dir_location', Config::get('lfm.files_url'));
+        } else if (Input::has('type') && Input::get('type') === 'Images') {
             Session::put('lfm_type', 'Images');
-            $this->file_location = Config::get('lfm.images_dir');
-            $this->dir_location = Config::get('lfm.images_url');
+            Session::put('lfm.file_location', Config::get('lfm.images_dir'));
+            Session::put('lfm.dir_location', Config::get('lfm.images_url'));
         }
     }
 
 
     private function checkMyFolderExists()
     {
         if (\Config::get('lfm.allow_multi_user') === true) {
-            $path = base_path($this->file_location . Input::get('working_dir'));
+            $path = $this->getPath();
 
             if (!File::exists($path)) {
                 File::makeDirectory($path, $mode = 0777, true, true);
@@ -85,7 +87,7 @@ private function checkMyFolderExists()
 
     private function checkSharedFolderExists()
     {
-        $path = base_path($this->file_location . Config::get('lfm.shared_folder_name'));
+        $path = $this->getPath('share');
 
         if (!File::exists($path)) {
             File::makeDirectory($path, $mode = 0777, true, true);
@@ -95,6 +97,10 @@ private function checkSharedFolderExists()
 
     private function formatLocation($location, $type = null)
     {
+        if ($type === 'share') {
+            return $location . Config::get('lfm.shared_folder_name') . '/';
+        }
+
         $working_dir = Input::get('working_dir');
 
         if ($working_dir !== '/') {
@@ -116,7 +122,7 @@ private function formatLocation($location, $type = null)
 
     public function getPath($type = null)
     {
-        $path = base_path() . '/' . $this->file_location;
+        $path = base_path() . '/' . Session::get('lfm.file_location');
 
         $path = $this->formatLocation($path, $type);
 
@@ -126,7 +132,7 @@ public function getPath($type = null)
 
     public function getUrl($type = null)
     {
-        $url = $this->dir_location;
+        $url = Session::get('lfm.dir_location');
 
         $url = $this->formatLocation($url, $type);
 
@@ -137,7 +143,7 @@ public function getUrl($type = null)
     public function getDirectories($path)
     {
         $thumb_folder_name = Config::get('lfm.thumb_folder_name');
-        $all_directories = File::directories(base_path($path));
+        $all_directories = File::directories($path);
 
         $arr_dir = [];
 

src/views/files.blade.php

@@ -35,8 +35,8 @@
 
                 <div class="col-sm-6 col-md-2 img-row">
 
-                    <div class="thumbnail thumbnail-img text-center" style="border: none;" data-id="{{ $file_name }}" id="img_thumbnail_{{ $key }}">
-                        <i class="fa {{ $file['icon'] }} fa-5x" style="cursor:pointer;" onclick="useFile('{{ $file_name }}')"></i>
+                    <div class="thumbnail thumbnail-img text-center" data-id="{{ $file_name }}" id="img_thumbnail_{{ $key }}">
+                        <i class="fa {{ $file['icon'] }} fa-5x" style="height:200px;cursor:pointer;padding-top:60px;" onclick="useFile('{{ $file_name }}')"></i>
                     </div>
 
                     <div class="caption text-center">