Merge pull request #2 from UniSharp/master

Merge dev-master

Author: welcoMattic

LICENSE

@@ -1,5 +1,7 @@
 The MIT License (MIT)
 
+Copyright (c) 2015 Trevor Sawler <https://github.com/tsawler>
+Copyright (c) 2015 All contributors from GitHub
 Copyright (c) 2015 UniSharp
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -10,7 +10,7 @@
 ## Requirements
 
  * php >= 5.5
- * Laravel 5 (working to support Laravel 4)
+ * Laravel 5
  * requires [intervention/image](https://github.com/Intervention/image)(to make thumbs, crop and resize images).
 
 ## Installation
@@ -48,8 +48,10 @@
     ```javascript
         <script>
             CKEDITOR.replace( 'editor', {
-                filebrowserImageBrowseUrl: '/laravel-filemanager?type=Images'
-                filebrowserBrowseUrl: '/laravel-filemanager?type=Files'
+                filebrowserImageBrowseUrl: '/laravel-filemanager?type=Images',
+                filebrowserImageUploadUrl: '/laravel-filemanager/upload?type=Images&_token={{csrf_token()}}',
+                filebrowserBrowseUrl: '/laravel-filemanager?type=Files',
+                filebrowserUploadUrl: '/laravel-filemanager/upload?type=Files&_token={{csrf_token()}}'
             });
         </script>
     ```

src/controllers/CropController.php

@@ -19,13 +19,11 @@ class CropController extends LfmController {
      */
     public function getCrop()
     {
-        $dir = Input::get('dir');
-        $image = Input::get('img');
+        $working_dir = Input::get('working_dir');
+        $img = parent::getUrl() . Input::get('img');
 
         return View::make('laravel-filemanager::crop')
-            ->with('img', Config::get('lfm.images_url') . $dir . "/" . $image)
-            ->with('dir', $dir)
-            ->with('image', $image);
+            ->with(compact('working_dir', 'img'));
     }
 
 
@@ -34,22 +32,21 @@ public function getCrop()
      */
     public function getCropimage()
     {
-        $dir = Input::get('dir');
-        $img = Input::get('img');
+        $image = Input::get('img');
         $dataX = Input::get('dataX');
         $dataY = Input::get('dataY');
         $dataHeight = Input::get('dataHeight');
         $dataWidth = Input::get('dataWidth');
 
         // crop image
-        $image = Image::make(public_path() . $img);
-        $image->crop($dataWidth, $dataHeight, $dataX, $dataY)
-            ->save(public_path() . $img);
+        $tmp_img = Image::make(public_path() . $image);
+        $tmp_img->crop($dataWidth, $dataHeight, $dataX, $dataY)
+            ->save(public_path() . $image);
 
         // make new thumbnail
-        $thumb_img = Image::make(public_path() . $img);
+        $thumb_img = Image::make(public_path() . $image);
         $thumb_img->fit(200, 200)
-            ->save(base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/thumbs/" . basename($img));
+            ->save(parent::getPath('thumb') . parent::getFileName($image));
     }
 
 }

src/controllers/DeleteController.php

@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Session;
+use Lang;
 
 /**
  * Class CropController
@@ -20,24 +21,19 @@ class DeleteController extends LfmController {
     public function getDelete()
     {
         $name_to_delete = Input::get('items');
-        $base = Input::get('base');
 
-        $file_path = base_path() . '/' . $this->file_location;
-
-        if ($base !== '/') {
-            $file_path = $file_path . $base . '/';
-        }
+        $file_path = parent::getPath();
 
         $file_to_delete = $file_path . $name_to_delete;
-        $thumb_to_delete = $file_path . 'thumbs/' . $name_to_delete;
+        $thumb_to_delete = parent::getPath('thumb') . $name_to_delete;
 
         if (!File::exists($file_to_delete)) {
             return $file_to_delete . ' not found!';
         }
 
         if (File::isDirectory($file_to_delete)) {
             if (sizeof(File::files($file_to_delete)) != 0) {
-                return 'You cannot delete this folder because it is not empty!';
+                return Lang::get('laravel-filemanager::lfm.error-delete');
             }
 
             File::deleteDirectory($file_to_delete);

src/controllers/DownloadController.php

@@ -19,14 +19,7 @@ class DownloadController extends LfmController {
      */
     public function getDownload()
     {
-        $file_to_download = Input::get('file');
-        $dir = Input::get('dir');
-        return Response::download(base_path()
-            .  "/"
-            . $this->file_location
-            .  $dir
-            . "/"
-            . $file_to_download);
+        return Response::download(parent::getPath() . Input::get('file'));
     }
 
 }

src/controllers/FolderController.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Str;
+use Lang;
 
 /**
  * Class FolderController
@@ -27,7 +28,7 @@ public function getFolders()
         $share_path = $this->file_location . Config::get('lfm.shared_folder_name');
         $shared_folders = parent::getDirectories($share_path);
 
-        return View::make("laravel-filemanager::tree")
+        return View::make('laravel-filemanager::tree')
             ->with('dirs', $directories)
             ->with('shares', $shared_folders);
     }
@@ -42,15 +43,15 @@ public function getAddfolder()
     {
         $folder_name = Input::get('name');
 
-        $path = base_path($this->file_location . Input::get('base')) . "/" . $folder_name;
+        $path = parent::getPath() . $folder_name;
 
         if (!File::exists($path)) {
             File::makeDirectory($path, $mode = 0777, true, true);
-            return "OK";
+            return 'OK';
         } else if (empty($folder_name)) {
-            return 'Folder name cannot be empty!';
+            return Lang::get('laravel-filemanager::lfm.error-folder-name');
         } else {
-            return "A folder with this name already exists!";
+            return Lang::get('laravel-filemanager::lfm.error-folder-exist');
         }
     }
 

src/controllers/ItemsController.php

@@ -24,32 +24,17 @@ class ItemsController extends LfmController {
      */
     public function getItems()
     {
-        $path = $this->file_location;
-
-        $base = Input::get('base');
-
-        $path .= Input::get('base');
-
         $type = Input::get('type');
+        $view = $this->getView($type);
+        $path = $this->file_location . Input::get('working_dir');
 
-        $files = File::files(base_path($path));
-        $file_info = $this->getFileInfos($files, $type);
+        $files       = File::files(base_path($path));
+        $file_info   = $this->getFileInfos($files, $type);
         $directories = parent::getDirectories($path);
-
-        $dir_location = $this->dir_location;
-        $view = 'laravel-filemanager::images';
-
-        if ($type !== 'Images') {
-            $dir_location = $this->file_location;
-            $view = 'laravel-filemanager::files';
-        }
-
-        if (Input::get('show_list') == 1) {
-            $view .= '-list';
-        }
+        $thumb_url   = parent::getUrl('thumb');
 
         return View::make($view)
-            ->with(compact('files', 'file_info', 'directories', 'base', 'dir_location'));
+            ->with(compact('files', 'file_info', 'directories', 'thumb_url'));
     }
 
 
@@ -58,8 +43,7 @@ private function getFileInfos($files, $type = 'Images')
         $file_info = [];
 
         foreach ($files as $key => $file) {
-            $path_parts = explode('/', $file);
-            $file_name = end($path_parts);
+            $file_name = parent::getFileName($file);
             $file_created = filemtime($file);
 
             $file_size = number_format((File::size($file) / 1024), 2, ".", "");
@@ -99,4 +83,19 @@ private function getFileInfos($files, $type = 'Images')
         return $file_info;
     }
 
+
+    private function getView($type = 'Images')
+    {
+        $view = 'laravel-filemanager::images';
+
+        if ($type !== 'Images') {
+            $view = 'laravel-filemanager::files';
+        }
+
+        if (Input::get('show_list') == 1) {
+            $view .= '-list';
+        }
+
+        return $view;
+    }
 }

src/controllers/LfmController.php

@@ -36,6 +36,11 @@ public function __construct()
     }
 
 
+    /*****************************
+     ***   Private Functions   ***
+     *****************************/
+
+
     private function setFilePath()
     {
         if ((Session::has('lfm_type')) && (Session::get('lfm_type') == 'Files')) {
@@ -59,7 +64,7 @@ private function setDirPath()
     private function checkMyFolderExists()
     {
         if (\Config::get('lfm.allow_multi_user') === true) {
-            $path = base_path($this->file_location . Input::get('base'));
+            $path = base_path($this->file_location . Input::get('working_dir'));
 
             if (!File::exists($path)) {
                 File::makeDirectory($path, $mode = 0777, true, true);
@@ -78,6 +83,47 @@ private function checkSharedFolderExists()
     }
 
 
+    private function formatLocation($location, $type = null)
+    {
+        $working_dir = Input::get('working_dir');
+
+        if ($working_dir !== '/') {
+            $location .= $working_dir . '/';
+        }
+
+        if ($type === 'thumb') {
+            $location = $location . Config::get('lfm.thumb_folder_name') . '/';
+        }
+
+        return $location;
+    }
+
+
+    /****************************
+     ***   Shared Functions   ***
+     ****************************/
+
+
+    public function getPath($type = null)
+    {
+        $path = base_path() . '/' . $this->file_location;
+
+        $path = $this->formatLocation($path, $type);
+
+        return $path;
+    }
+
+
+    public function getUrl($type = null)
+    {
+        $url = $this->dir_location;
+
+        $url = $this->formatLocation($url, $type);
+
+        return $url;
+    }
+
+
     public function getDirectories($path)
     {
         $thumb_folder_name = Config::get('lfm.thumb_folder_name');
@@ -86,8 +132,7 @@ public function getDirectories($path)
         $arr_dir = [];
 
         foreach ($all_directories as $directory) {
-            $path_parts = explode('/', $directory);
-            $dir_name = end($path_parts);
+            $dir_name = $this->getFileName($directory);
 
             if ($dir_name !== $thumb_folder_name) {
                 $arr_dir[] = $dir_name;
@@ -98,6 +143,16 @@ public function getDirectories($path)
     }
 
 
+    public function getFileName($file)
+    {
+        $path_parts = explode('/', $file);
+
+        $filename = end($path_parts);
+
+        return $filename;
+    }
+
+
     /**
      * Show the filemanager
      *
@@ -111,16 +166,13 @@ public function show()
             Session::put('lfm_type', 'Images');
         }
 
-        if (Input::has('base')) {
-            $working_dir = Input::get('base');
-            $base = $this->file_location . Input::get('base') . "/";
+        if (Input::has('working_dir')) {
+            $working_dir = Input::get('working_dir');
         } else {
-            $working_dir = "/";
-            $base = $this->file_location;
+            $working_dir = '/';
         }
 
         return View::make('laravel-filemanager::index')
-            ->with('base', $base)
             ->with('working_dir', $working_dir);
     }