modify controllers for new working_dir format

Author: streamtw

src/LaravelFilemanagerServiceProvider.php

@@ -17,7 +17,7 @@ class LaravelFilemanagerServiceProvider extends ServiceProvider {
      */
     public function boot()
     {
-        if (Config::get('lfm.use_package_routes'))
+        if (Config::get('lfm.use_package_routes', true))
             include __DIR__ . '/routes.php';
 
         $this->loadTranslationsFrom(__DIR__.'/lang', 'laravel-filemanager');

src/controllers/CropController.php

@@ -20,7 +20,7 @@ class CropController extends LfmController {
     public function getCrop()
     {
         $working_dir = Input::get('working_dir');
-        $img = parent::getUrl() . Input::get('img');
+        $img = parent::getUrl('directory') . Input::get('img');
 
         return View::make('laravel-filemanager::crop')
             ->with(compact('working_dir', 'img'));
@@ -46,7 +46,7 @@ public function getCropimage()
         // make new thumbnail
         $thumb_img = Image::make(public_path() . $image);
         $thumb_img->fit(200, 200)
-            ->save(parent::getPath('thumb') . parent::getFileName($image));
+            ->save(parent::getPath('thumb') . parent::getFileName($image)['short']);
     }
 
 }

src/controllers/DeleteController.php

@@ -21,7 +21,7 @@ public function getDelete()
     {
         $name_to_delete = Input::get('items');
 
-        $file_path = parent::getPath();
+        $file_path = parent::getPath('directory');
 
         $file_to_delete = $file_path . $name_to_delete;
         $thumb_to_delete = parent::getPath('thumb') . $name_to_delete;

src/controllers/DownloadController.php

@@ -18,7 +18,7 @@ class DownloadController extends LfmController {
      */
     public function getDownload()
     {
-        return Response::download(parent::getPath() . Input::get('file'));
+        return Response::download(parent::getPath('directory') . Input::get('file'));
     }
 
 }

src/controllers/FolderController.php

@@ -1,11 +1,8 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use Unisharp\Laravelfilemanager\controllers\Controller;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\View;
-use Illuminate\Support\Str;
 use Lang;
 
 /**
@@ -29,7 +26,7 @@ public function getFolders()
         $lfm_share_path = parent::getFileName($share_path);
         $shared_folders = parent::getDirectories($share_path);
 
-        return View::make('laravel-filemanager::tree')
+        return view('laravel-filemanager::tree')
             ->with('user_dir', $lfm_user_path['long'])
             ->with('dirs', $user_folders)
             ->with('share_dir', $lfm_share_path['long'])
@@ -46,7 +43,7 @@ public function getAddfolder()
     {
         $folder_name = Input::get('name');
 
-        $path = parent::getPath() . DIRECTORY_SEPARATOR . $folder_name;
+        $path = parent::getPath('directory') . $folder_name;
 
         if (!File::exists($path)) {
             File::makeDirectory($path, $mode = 0777, true, true);

src/controllers/ItemsController.php

@@ -4,10 +4,6 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Redirect;
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\View;
-use Intervention\Image\Facades\Image;
 
 /**
  * Class ItemsController
@@ -32,7 +28,7 @@ public function getItems()
         $directories = parent::getDirectories($path);
         $thumb_url   = parent::getUrl('thumb');
 
-        return View::make($view)
+        return view($view)
             ->with(compact('files', 'file_info', 'directories', 'thumb_url'));
     }
 

src/controllers/LfmController.php

@@ -4,9 +4,6 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\View;
-use Intervention\Image\Facades\Image;
 
 /**
  * Class LfmController
@@ -54,7 +51,7 @@ public function show()
         $working_dir = DIRECTORY_SEPARATOR;
         $working_dir .= (Config::get('lfm.allow_multi_user')) ? \Auth::user()->user_field : Config::get('lfm.shared_folder_name');
 
-        return View::make('laravel-filemanager::index')
+        return view('laravel-filemanager::index')
             ->with('working_dir', $working_dir)
             ->with('file_type', $this->file_type);
     }
@@ -89,12 +86,17 @@ private function formatLocation($location, $type = null, $get_thumb = false)
 
         $working_dir = Input::get('working_dir');
 
+        // remove first slash
         if (substr($working_dir, 0, 1) === DIRECTORY_SEPARATOR) {
             $working_dir = substr($working_dir, 1);
         }
 
         $location .= $working_dir;
 
+        if ($type === 'directory' || $type === 'thumb') {
+            $location .= DIRECTORY_SEPARATOR;
+        }
+
         if ($type === 'thumb') {
             $location .= Config::get('lfm.thumb_folder_name') . DIRECTORY_SEPARATOR;
         }
@@ -138,7 +140,7 @@ public function getDirectories($path)
         foreach ($all_directories as $directory) {
             $dir_name = $this->getFileName($directory);
 
-            if ($dir_name !== $thumb_folder_name) {
+            if ($dir_name['short'] !== $thumb_folder_name) {
                 $arr_dir[] = $dir_name;
             }
         }

src/controllers/RenameController.php

@@ -21,7 +21,7 @@ public function getRename()
         $old_name = Input::get('file');
         $new_name = Input::get('new_name');
 
-        $file_path  = parent::getPath();
+        $file_path  = parent::getPath('directory');
         $thumb_path = parent::getPath('thumb');
 
         $old_file = $file_path . $old_name;

src/controllers/ResizeController.php

@@ -22,7 +22,7 @@ public function getResize()
         $ratio = 1.0;
         $image = Input::get('img');
 
-        $path_to_image   = parent::getPath() . $image;
+        $path_to_image   = parent::getPath('directory') . $image;
         $original_width  = Image::make($path_to_image)->width();
         $original_height = Image::make($path_to_image)->height();
 
@@ -46,7 +46,7 @@ public function getResize()
         }
 
         return View::make('laravel-filemanager::resize')
-            ->with('img', parent::getUrl() . $image)
+            ->with('img', parent::getUrl('directory') . $image)
             ->with('height', number_format($height, 0))
             ->with('width', $width)
             ->with('original_height', $original_height)

src/middleware/MultiUser.php

@@ -36,10 +36,6 @@ private function validDir($previous_dir)
         	return true;
         }
 
-        // if (strpos($previous_dir, (string)\Auth::user()->user_field) === false) {
-        //     return true;
-        // }
-
         return false;
     }
 }

src/views/crop.blade.php

@@ -52,12 +52,13 @@ function performCrop() {
       dataType: "text",
       url: "/laravel-filemanager/cropimage",
       data: {
-        img: $("#img").val(),
+        img: '{{ $img }}',
         working_dir: $("#working_dir").val(),
         dataX: $("#dataX").val(),
         dataY: $("#dataY").val(),
         dataHeight: $("#dataHeight").val(),
-        dataWidth: $("#dataWidth").val()
+        dataWidth: $("#dataWidth").val(),
+        type: $('#type').val()
       },
       cache: false
     }).done(function (data) {