X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/05666efda9a51f245d23fc33e65cd598180e97da..refs/pull/263/head:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 6956b8d18..b5184c40a 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -3,6 +3,7 @@ namespace BookStack\Http\Controllers; use BookStack\Activity; +use Exception; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -31,14 +32,21 @@ class UserController extends Controller /** * Display a listing of the users. + * @param Request $request * @return Response */ - public function index() + public function index(Request $request) { $this->checkPermission('users-manage'); - $users = $this->userRepo->getAllUsers(); - $this->setPageTitle('Users'); - return view('users/index', ['users' => $users]); + $listDetails = [ + 'order' => $request->has('order') ? $request->get('order') : 'asc', + 'search' => $request->has('search') ? $request->get('search') : '', + 'sort' => $request->has('sort') ? $request->get('sort') : 'name', + ]; + $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails); + $this->setPageTitle(trans('settings.users')); + $users->appends($listDetails); + return view('users/index', ['users' => $users, 'listDetails' => $listDetails]); } /** @@ -49,7 +57,7 @@ class UserController extends Controller { $this->checkPermission('users-manage'); $authMethod = config('auth.method'); - $roles = $this->userRepo->getAssignableRoles(); + $roles = $this->userRepo->getAllRoles(); return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]); } @@ -75,7 +83,6 @@ class UserController extends Controller } $this->validate($request, $validationRules); - $user = $this->user->fill($request->all()); if ($authMethod === 'standard') { @@ -93,9 +100,14 @@ class UserController extends Controller // Get avatar from gravatar and save if (!config('services.disable_services')) { - $avatar = \Images::saveUserGravatar($user); - $user->avatar()->associate($avatar); - $user->save(); + try { + $avatar = \Images::saveUserGravatar($user); + $user->avatar()->associate($avatar); + $user->save(); + } catch (Exception $e) { + \Log::error('Failed to save user gravatar image'); + } + } return redirect('/settings/users'); @@ -113,12 +125,13 @@ class UserController extends Controller return $this->currentUser->id == $id; }); - $authMethod = config('auth.method'); - $user = $this->user->findOrFail($id); + + $authMethod = ($user->system_name) ? 'system' : config('auth.method'); + $activeSocialDrivers = $socialAuthService->getActiveDrivers(); - $this->setPageTitle('User Profile'); - $roles = $this->userRepo->getAssignableRoles(); + $this->setPageTitle(trans('settings.user_profile')); + $roles = $this->userRepo->getAllRoles(); return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]); } @@ -140,8 +153,6 @@ class UserController extends Controller 'email' => 'min:2|email|unique:users,email,' . $id, 'password' => 'min:5|required_with:password_confirm', 'password-confirm' => 'same:password|required_with:password' - ], [ - 'password-confirm.required_with' => 'Password confirmation required' ]); $user = $this->user->findOrFail($id); @@ -165,7 +176,7 @@ class UserController extends Controller } $user->save(); - session()->flash('success', 'User successfully updated'); + session()->flash('success', trans('settings.users_edit_success')); $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id; return redirect($redirectUrl); @@ -173,7 +184,7 @@ class UserController extends Controller /** * Show the user delete page. - * @param $id + * @param int $id * @return \Illuminate\View\View */ public function delete($id) @@ -183,7 +194,7 @@ class UserController extends Controller }); $user = $this->user->findOrFail($id); - $this->setPageTitle('Delete User ' . $user->name); + $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name])); return view('users/delete', ['user' => $user]); } @@ -200,11 +211,19 @@ class UserController extends Controller }); $user = $this->userRepo->getById($id); + if ($this->userRepo->isOnlyAdmin($user)) { - session()->flash('error', 'You cannot delete the only admin'); + session()->flash('error', trans('errors.users_cannot_delete_only_admin')); + return redirect($user->getEditUrl()); + } + + if ($user->system_name === 'public') { + session()->flash('error', trans('errors.users_cannot_delete_guest')); return redirect($user->getEditUrl()); } + $this->userRepo->destroy($user); + session()->flash('success', trans('settings.users_delete_success')); return redirect('/settings/users'); }