fix folder path, change namespace, modify readme

streamtw · streamtw · commit 7fbf6ee6818d · 2015-08-18T08:18:54.000Z
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-Fork from [tsawler/laravel-filemanager](http://packalyst.com/packages/package/tsawler/laravel-filemanager), add restriction that users can see only their own folders.
+Fork from [tsawler/laravel-filemanager](http://packalyst.com/packages/package/tsawler/laravel-filemanager), add mechanism to restrict users to see only their own folders.
 The original functions support image and file upload, this package only modifies the image functions.
 
 ## Requirements
@@ -13,50 +13,19 @@ This package requires `"intervention/image": "2.*"`, in order to make thumbs, cr
 
 1. Run `composer require intervention/image`
 
-1. Edit `composer.json` file :
-
-    ```json
-        "require": {
-            "unisharp/laravel-filemanager": "dev-demo"
-        },
-        "repositories": [
-            {
-                "type": "git",
-                "url": "git@github.com:UniSharp/laravel-filemanager.git"
-            }
-        ],
-    ```
-
-1. Run `composer update`
+1. Run `composer require unisharp/laravel-filemanager`
 
 1. Edit `config/app.php` :
 
     Add this in service providers
 
-    - Laravel 5.0
-
-    ```php
-        'Tsawler\Laravelfilemanager\LaravelFilemanagerServiceProvider',
-        'Intervention\Image\ImageServiceProvider',
-    ```
-
-    - Laravel 5.1
-
     ```php
-        Tsawler\Laravelfilemanager\LaravelFilemanagerServiceProvider::class,
+        Unisharp\Laravelfilemanager\LaravelFilemanagerServiceProvider::class,
         Intervention\Image\ImageServiceProvider::class,
     ```
 
     And add this in class aliases
 
-    - Laravel 5.0
-
-    ```php
-        'Image' => 'Intervention\Image\Facades\Image',
-    ```
-
-    - Laravel 5.1
-
     ```php
         'Image' => Intervention\Image\Facades\Image::class,
     ```
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "tsawler/laravel-filemanager",
+  "name": "unisharp/laravel-filemanager",
   "description": "A file upload/editor intended for use with Laravel 5 and CKEditor",
   "license": "MIT",
   "authors": [
@@ -15,7 +15,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Tsawler\\Laravelfilemanager\\": "src/"
+      "Unisharp\\Laravelfilemanager\\": "src/"
     }
   }
 }
diff --git a/src/LaravelFilemanagerServiceProvider.php b/src/LaravelFilemanagerServiceProvider.php
@@ -1,12 +1,12 @@
-<?php namespace Tsawler\Laravelfilemanager;
+<?php namespace Unisharp\Laravelfilemanager;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Config;
 
 
 /**
  * Class LaravelFilemanagerServiceProvider
- * @package Tsawler\Laravelfilemanager
+ * @package Unisharp\Laravelfilemanager
  */
 class LaravelFilemanagerServiceProvider extends ServiceProvider {
 
diff --git a/src/config/lfm.php b/src/config/lfm.php
@@ -13,7 +13,7 @@
 
     'user_field'         => "\Auth::user()->name",
 
-    'middlewares'        => ['auth', '\Tsawler\Laravelfilemanager\middleware\MultiUser'],
+    'middlewares'        => ['auth', '\Unisharp\Laravelfilemanager\middleware\MultiUser'],
 
     'file_type_array'         => [
         "pdf"  => "Adobe Acrobat",
diff --git a/src/controllers/CropController.php b/src/controllers/CropController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -8,7 +8,7 @@
 
 /**
  * Class CropController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class CropController extends Controller {
 
diff --git a/src/controllers/DeleteController.php b/src/controllers/DeleteController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -8,7 +8,7 @@
 
 /**
  * Class CropController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class DeleteController extends Controller {
 
diff --git a/src/controllers/DownloadController.php b/src/controllers/DownloadController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -8,7 +8,7 @@
 
 /**
  * Class DownloadController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class DownloadController extends Controller {
 
diff --git a/src/controllers/FolderController.php b/src/controllers/FolderController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -10,7 +10,7 @@
 
 /**
  * Class FolderController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class FolderController extends Controller {
 
diff --git a/src/controllers/ItemsController.php b/src/controllers/ItemsController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -12,7 +12,7 @@
 
 /**
  * Class ItemsController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class ItemsController extends Controller {
 
diff --git a/src/controllers/LfmController.php b/src/controllers/LfmController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -10,7 +10,7 @@
 
 /**
  * Class LfmController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class LfmController extends Controller {
 
diff --git a/src/controllers/RenameController.php b/src/controllers/RenameController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -9,7 +9,7 @@
 
 /**
  * Class RenameController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class RenameController extends Controller {
 
diff --git a/src/controllers/ResizeController.php b/src/controllers/ResizeController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -8,7 +8,7 @@
 
 /**
  * Class ResizeController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class ResizeController extends Controller {
 
diff --git a/src/controllers/UploadController.php b/src/controllers/UploadController.php
@@ -1,4 +1,4 @@
-<?php namespace Tsawler\Laravelfilemanager\controllers;
+<?php namespace Unisharp\Laravelfilemanager\controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Config;
@@ -10,7 +10,7 @@
 
 /**
  * Class UploadController
- * @package Tsawler\Laravelfilemanager\controllers
+ * @package Unisharp\Laravelfilemanager\controllers
  */
 class UploadController extends Controller {
 
diff --git a/src/middleware/MultiUser.php b/src/middleware/MultiUser.php
@@ -1,6 +1,6 @@
 <?php 
 
-namespace Tsawler\Laravelfilemanager\middleware;
+namespace Unisharp\Laravelfilemanager\middleware;
 
 use Closure;
 
diff --git a/src/routes.php b/src/routes.php
@@ -1,42 +1,43 @@
 <?php
-Route::group(array('middleware' => \Config::get('lfm.middlewares')), function () // make sure authenticated
+// make sure authenticated
+Route::group(array('middleware' => \Config::get('lfm.middlewares')), function ()
 {
 
     Route::get('sample-ckeditor-integration', function () {
         return \Illuminate\Support\Facades\View::make('editor');
     });
 
     // Show LFM
-    Route::get('/laravel-filemanager', 'Tsawler\Laravelfilemanager\controllers\LfmController@show');
+    Route::get('/laravel-filemanager', 'Unisharp\Laravelfilemanager\controllers\LfmController@show');
 
 
     // upload
-    Route::any('/laravel-filemanager/upload', 'Tsawler\Laravelfilemanager\controllers\UploadController@upload');
+    Route::any('/laravel-filemanager/upload', 'Unisharp\Laravelfilemanager\controllers\UploadController@upload');
 
     // list images & files
-    Route::get('/laravel-filemanager/jsonimages', 'Tsawler\Laravelfilemanager\controllers\ItemsController@getImages');
-    Route::get('/laravel-filemanager/jsonfiles', 'Tsawler\Laravelfilemanager\controllers\ItemsController@getFiles');
+    Route::get('/laravel-filemanager/jsonimages', 'Unisharp\Laravelfilemanager\controllers\ItemsController@getImages');
+    Route::get('/laravel-filemanager/jsonfiles', 'Unisharp\Laravelfilemanager\controllers\ItemsController@getFiles');
 
     // folders
-    Route::get('/laravel-filemanager/newfolder', 'Tsawler\Laravelfilemanager\controllers\FolderController@getAddfolder');
-    Route::get('/laravel-filemanager/deletefolder', 'Tsawler\Laravelfilemanager\controllers\FolderController@getDeletefolder');
-    Route::get('/laravel-filemanager/folders', 'Tsawler\Laravelfilemanager\controllers\FolderController@getFolders');
+    Route::get('/laravel-filemanager/newfolder', 'Unisharp\Laravelfilemanager\controllers\FolderController@getAddfolder');
+    Route::get('/laravel-filemanager/deletefolder', 'Unisharp\Laravelfilemanager\controllers\FolderController@getDeletefolder');
+    Route::get('/laravel-filemanager/folders', 'Unisharp\Laravelfilemanager\controllers\FolderController@getFolders');
 
     // crop
-    Route::get('/laravel-filemanager/crop', 'Tsawler\Laravelfilemanager\controllers\CropController@getCrop');
-    Route::get('/laravel-filemanager/cropimage', 'Tsawler\Laravelfilemanager\controllers\CropController@getCropimage');
+    Route::get('/laravel-filemanager/crop', 'Unisharp\Laravelfilemanager\controllers\CropController@getCrop');
+    Route::get('/laravel-filemanager/cropimage', 'Unisharp\Laravelfilemanager\controllers\CropController@getCropimage');
 
     // rename
-    Route::get('/laravel-filemanager/rename', 'Tsawler\Laravelfilemanager\controllers\RenameController@getRename');
+    Route::get('/laravel-filemanager/rename', 'Unisharp\Laravelfilemanager\controllers\RenameController@getRename');
 
     // scale/resize
-    Route::get('/laravel-filemanager/resize', 'Tsawler\Laravelfilemanager\controllers\ResizeController@getResize');
-    Route::get('/laravel-filemanager/doresize', 'Tsawler\Laravelfilemanager\controllers\ResizeController@performResize');
+    Route::get('/laravel-filemanager/resize', 'Unisharp\Laravelfilemanager\controllers\ResizeController@getResize');
+    Route::get('/laravel-filemanager/doresize', 'Unisharp\Laravelfilemanager\controllers\ResizeController@performResize');
 
     // download
-    Route::get('/laravel-filemanager/download', 'Tsawler\Laravelfilemanager\controllers\DownloadController@getDownload');
+    Route::get('/laravel-filemanager/download', 'Unisharp\Laravelfilemanager\controllers\DownloadController@getDownload');
 
     // delete
-    Route::get('/laravel-filemanager/delete', 'Tsawler\Laravelfilemanager\controllers\DeleteController@getDelete');
+    Route::get('/laravel-filemanager/delete', 'Unisharp\Laravelfilemanager\controllers\DeleteController@getDelete');
 
 });
diff --git a/src/views/index.blade.php b/src/views/index.blade.php
@@ -197,7 +197,7 @@ function clickFolder(x, y) {
                 $('#' + x + ' > i').addClass('fa-folder');
             }
         }
-        $("#working_dir").val("{{Auth::user()->user_field}}" + '\\/' + $('#' + x).data('id'));
+        $("#working_dir").val("{{Auth::user()->user_field}}" + '/' + $('#' + x).data('id'));
         loadImages();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "tsawler/laravel-filemanager",`
	`2`	`+ "name": "unisharp/laravel-filemanager",`
`3`	`3`	`"description": "A file upload/editor intended for use with Laravel 5 and CKEditor",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"authors": [`
`@@ -15,7 +15,7 @@`
`15`	`15`	`},`
`16`	`16`	`"autoload": {`
`17`	`17`	`"psr-4": {`
`18`		`- "Tsawler\\Laravelfilemanager\\": "src/"`
	`18`	`+ "Unisharp\\Laravelfilemanager\\": "src/"`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`