X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/dabf149411c03130b870932954473dd6e7a992dc..refs/pull/716/head:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index c98d5f87e..d50baa86f 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -34,9 +34,9 @@ class UserController extends Controller { $this->checkPermission('users-manage'); $listDetails = [ - 'order' => $request->has('order') ? $request->get('order') : 'asc', - 'search' => $request->has('search') ? $request->get('search') : '', - 'sort' => $request->has('sort') ? $request->get('sort') : 'name', + 'order' => $request->get('order', 'asc'), + 'search' => $request->get('search', ''), + 'sort' => $request->get('sort', 'name'), ]; $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails); $this->setPageTitle(trans('settings.users')); @@ -88,22 +88,12 @@ class UserController extends Controller $user->save(); - if ($request->has('roles')) { + if ($request->filled('roles')) { $roles = $request->get('roles'); $user->roles()->sync($roles); } - // Get avatar from gravatar and save - if (!config('services.disable_services')) { - try { - $avatar = \Images::saveUserGravatar($user); - $user->avatar()->associate($avatar); - $user->save(); - } catch (Exception $e) { - \Log::error('Failed to save user gravatar image'); - } - - } + $this->userRepo->downloadGravatarToUserAvatar($user); return redirect('/settings/users'); } @@ -155,24 +145,24 @@ class UserController extends Controller $user->fill($request->all()); // Role updates - if (userCan('users-manage') && $request->has('roles')) { + if (userCan('users-manage') && $request->filled('roles')) { $roles = $request->get('roles'); $user->roles()->sync($roles); } // Password updates - if ($request->has('password') && $request->get('password') != '') { + if ($request->filled('password')) { $password = $request->get('password'); $user->password = bcrypt($password); } // External auth id updates - if ($this->currentUser->can('users-manage') && $request->has('external_auth_id')) { + if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) { $user->external_auth_id = $request->get('external_auth_id'); } // Save an user-specific settings - if ($request->has('setting')) { + if ($request->filled('setting')) { foreach ($request->get('setting') as $key => $value) { setting()->putUser($user, $key, $value); } @@ -249,4 +239,27 @@ class UserController extends Controller 'assetCounts' => $assetCounts ]); } + + /** + * Update the user's preferred book-list display setting. + * @param $id + * @param Request $request + * @return \Illuminate\Http\RedirectResponse + */ + public function switchBookView($id, Request $request) + { + $this->checkPermissionOr('users-manage', function () use ($id) { + return $this->currentUser->id == $id; + }); + + $viewType = $request->get('book_view_type'); + if (!in_array($viewType, ['grid', 'list'])) { + $viewType = 'list'; + } + + $user = $this->user->findOrFail($id); + setting()->putUser($user, 'books_view_type', $viewType); + + return redirect()->back(302, [], "/settings/users/$id"); + } }