Merge branch 'master' of github.com:UniSharp/laravel-filemanager

Author: youchenlee

README.md

@@ -9,7 +9,7 @@ PR is welcome!
  * The project was forked from [tsawler/laravel-filemanager](http://packalyst.com/packages/package/tsawler/laravel-filemanager)
  * Support public and private folders for multi users
  * Customizable views, routes and middlewares
- * Supported locales : en, fr, zh-TW, zh-CN, pt-BR
+ * Supported locales : en, fr, pt-BR, tr, zh-CN, zh-TW
 
 
 ## Requirements
@@ -216,8 +216,9 @@ In `config/lfm.php` :
 ## Credits
  * All contibutors from GitHub. (issues / PR)
  * Special thanks to
-   * [@taswler](https://github.com/tsawler) the author.
+   * [@taswler](https://github.com/tsawler) the original author.
    * [@welcoMattic](https://github.com/welcoMattic) providing fr translations and lots of bugfixes.
    * [@fraterblack](https://github.com/fraterblack) TinyMCE 4 support and pt-BR translations.
+   * [@1dot44mb](https://github.com/1dot44mb) tr translations.
    * [@olivervogel](https://github.com/olivervogel) for the awesome [image library](https://github.com/Intervention/image)
    * [All @UniSharp members](https://github.com/UniSharp)

src/controllers/Controller.php

@@ -0,0 +1,10 @@
+<?php namespace Unisharp\Laravelfilemanager\controllers;
+
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+
+abstract class Controller extends BaseController
+{
+    use DispatchesJobs, ValidatesRequests;
+}

src/controllers/CropController.php

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;

src/controllers/DeleteController.php

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
@@ -49,5 +49,5 @@ public function getDelete()
 
         return 'OK';
     }
-    
+
 }

src/controllers/DownloadController.php

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;

src/controllers/FolderController.php

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;

src/controllers/ItemsController.php

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
@@ -36,7 +36,7 @@ public function getItems()
         return View::make($view)
             ->with(compact('files', 'file_info', 'directories', 'thumb_url'));
     }
-    
+
 
     private function getFileInfos($files, $type = 'Images')
     {
@@ -46,7 +46,7 @@ private function getFileInfos($files, $type = 'Images')
             $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

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
@@ -19,17 +19,17 @@ class LfmController extends Controller {
      */
     public $file_location;
     public $dir_location;
-    
+
 
     /**
      * Constructor
      */
     public function __construct()
     {
         $this->setPathAndType();
-        
+
         $this->checkMyFolderExists();
-        
+
         $this->checkSharedFolderExists();
     }
 
@@ -60,7 +60,7 @@ public function show()
     private function setPathAndType()
     {
         // dd('type:'.Input::get('type'));
-        
+
         if (Input::has('type') && Input::get('type') === 'Files') {
             Session::put('lfm_type', 'Files');
             Session::put('lfm.file_location', Config::get('lfm.files_dir'));

src/controllers/RenameController.php

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
@@ -42,7 +42,7 @@ public function getRename()
             File::move($old_file, $new_file);
             return 'OK';
         }
-        
+
         File::move($old_file, $new_file);
 
         if (Session::get('lfm_type') == 'Images') {

src/controllers/ResizeController.php

@@ -1,6 +1,6 @@
 <?php namespace Unisharp\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Unisharp\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;