Merge branch 'multi-user' into demo

Author: streamtw

src/middleware/MultiUser.php

@@ -9,10 +9,12 @@ class MultiUser
     public function handle($request, Closure $next)
     {
     	if (\Config::get('lfm.allow_multi_user') === true) {
+	        \Auth::user()->user_field = eval('return '.config('lfm.user_field').';');
+
 	        if ($request->input('base') == null) {
-	            $request->merge(['base' => config('lfm.user_field')]);
-	        } elseif (strpos($request->input('base'), config('lfm.user_field')) === false) {
-	            $request->replace(['base' => config('lfm.user_field')]);
+	            $request->merge(['base' => \Auth::user()->user_field]);
+	        } elseif (strpos($request->input('base'), \Auth::user()->user_field) === false) {
+	            $request->replace(['base' => \Auth::user()->user_field]);
 	        }
 	    }
 

src/views/index.blade.php

@@ -181,7 +181,7 @@ function showResponse(responseText, statusText, xhr, $form)  {
 
     function clickRoot() {
         $('.folder-item').removeClass('fa-folder-open').addClass('fa-folder');
-        $("#working_dir").val("{{config('lfm.user_field')}}");
+        $("#working_dir").val("{{Auth::user()->user_field}}");
         loadImages();
     }
 
@@ -197,7 +197,7 @@ function clickFolder(x, y) {
                 $('#' + x + ' > i').addClass('fa-folder');
             }
         }
-        $("#working_dir").val("{{config('lfm.user_field')}}" + '\\/' + $('#' + x).data('id'));
+        $("#working_dir").val("{{Auth::user()->user_field}}" + '\\/' + $('#' + x).data('id'));
         loadImages();
     }
 
@@ -263,7 +263,7 @@ function trash(x) {
                     if (data != "OK") {
                         notify(data);
                     } else {
-                        if ($("#working_dir").val() == "{{config('lfm.user_field')}}") {
+                        if ($("#working_dir").val() == "{{Auth::user()->user_field}}") {
                             loadFiles();
                         }
                         loadImages();