Skip to content

Commit 773dd68

Browse files
committed
fix user field
1 parent 9c72204 commit 773dd68

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/middleware/MultiUser.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ class MultiUser
99
public function handle($request, Closure $next)
1010
{
1111
if (\Config::get('lfm.allow_multi_user') === true) {
12+
\Auth::user()->user_field = eval('return '.config('lfm.user_field').';');
13+
1214
if ($request->input('base') == null) {
13-
$request->merge(['base' => config('lfm.user_field')]);
14-
} elseif (strpos($request->input('base'), config('lfm.user_field')) === false) {
15-
$request->replace(['base' => config('lfm.user_field')]);
15+
$request->merge(['base' => \Auth::user()->user_field]);
16+
} elseif (strpos($request->input('base'), \Auth::user()->user_field) === false) {
17+
$request->replace(['base' => \Auth::user()->user_field]);
1618
}
1719
}
1820

src/views/index.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ function showResponse(responseText, statusText, xhr, $form) {
180180
181181
function clickRoot() {
182182
$('.folder-item').removeClass('fa-folder-open').addClass('fa-folder');
183-
$("#working_dir").val("{{config('lfm.user_field')}}");
183+
$("#working_dir").val("{{Auth::user()->user_field}}");
184184
loadImages();
185185
}
186186
@@ -196,7 +196,7 @@ function clickFolder(x, y) {
196196
$('#' + x + ' > i').addClass('fa-folder');
197197
}
198198
}
199-
$("#working_dir").val("{{config('lfm.user_field')}}" + '\\/' + $('#' + x).data('id'));
199+
$("#working_dir").val("{{Auth::user()->user_field}}" + '\\/' + $('#' + x).data('id'));
200200
loadImages();
201201
}
202202
@@ -262,7 +262,7 @@ function trash(x) {
262262
if (data != "OK") {
263263
notify(data);
264264
} else {
265-
if ($("#working_dir").val() == "{{config('lfm.user_field')}}") {
265+
if ($("#working_dir").val() == "{{Auth::user()->user_field}}") {
266266
loadFiles();
267267
}
268268
loadImages();

0 commit comments

Comments
 (0)