Making sure MyISAM is set for the tables that need it for new installtions that are...

[bookstack] / app / Http / Controllers / UserController.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 55ca5be19899bbdbc93927a7354548478a973ec9..053d9ebd57345017cb9f8faf22986de52335cf63 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -31,13 +31,21 @@ class UserController extends Controller
 
     /**
      * Display a listing of the users.
 
     /**
      * Display a listing of the users.

+     * @param Request $request

      * @return Response
      */
      * @return Response
      */

-    public function index()
+    public function index(Request $request)

     {
     {

-        $users = $this->user->all();
+        $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',
+        ];
+        $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);

         $this->setPageTitle('Users');
         $this->setPageTitle('Users');

-        return view('users/index', ['users' => $users]);
+        $users->appends($listDetails);
+        return view('users/index', ['users' => $users, 'listDetails' => $listDetails]);

     }
 
     /**
     }
 
     /**


@@ -46,9 +54,10 @@ class UserController extends Controller
      */
     public function create()
     {
      */
     public function create()
     {

-        $this->checkPermission('user-create');
+        $this->checkPermission('users-manage');

         $authMethod = config('auth.method');
         $authMethod = config('auth.method');

-        return view('users/create', ['authMethod' => $authMethod]);
+        $roles = $this->userRepo->getAssignableRoles();
+        return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);

     }
 
     /**
     }
 
     /**


@@ -58,11 +67,10 @@ class UserController extends Controller
      */
     public function store(Request $request)
     {
      */
     public function store(Request $request)
     {

-        $this->checkPermission('user-create');
+        $this->checkPermission('users-manage');

         $validationRules = [
             'name'             => 'required',
         $validationRules = [
             'name'             => 'required',

-            'email'            => 'required|email|unique:users,email',
-            'role'             => 'required|exists:roles,id'
+            'email'            => 'required|email|unique:users,email'

         ];
 
         $authMethod = config('auth.method');
         ];
 
         $authMethod = config('auth.method');


@@ -84,7 +92,11 @@ class UserController extends Controller
         }
 
         $user->save();
         }
 
         $user->save();

-        $user->attachRoleId($request->get('role'));
+
+        if ($request->has('roles')) {
+            $roles = $request->get('roles');
+            $user->roles()->sync($roles);
+        }

 
         // Get avatar from gravatar and save
         if (!config('services.disable_services')) {
 
         // Get avatar from gravatar and save
         if (!config('services.disable_services')) {


@@ -104,7 +116,7 @@ class UserController extends Controller
      */
     public function edit($id, SocialAuthService $socialAuthService)
     {
      */
     public function edit($id, SocialAuthService $socialAuthService)
     {

-        $this->checkPermissionOr('user-update', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
             return $this->currentUser->id == $id;
         });
 


@@ -113,7 +125,8 @@ class UserController extends Controller
         $user = $this->user->findOrFail($id);
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $this->setPageTitle('User Profile');
         $user = $this->user->findOrFail($id);
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $this->setPageTitle('User Profile');

-        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod]);
+        $roles = $this->userRepo->getAssignableRoles();
+        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);

     }
 
     /**
     }
 
     /**


@@ -125,7 +138,7 @@ class UserController extends Controller
     public function update(Request $request, $id)
     {
         $this->preventAccessForDemoUsers();
     public function update(Request $request, $id)
     {
         $this->preventAccessForDemoUsers();

-        $this->checkPermissionOr('user-update', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
             return $this->currentUser->id == $id;
         });
 


@@ -133,8 +146,7 @@ class UserController extends Controller
             'name'             => 'min:2',
             'email'            => 'min:2|email|unique:users,email,' . $id,
             'password'         => 'min:5|required_with:password_confirm',
             'name'             => 'min:2',
             'email'            => 'min:2|email|unique:users,email,' . $id,
             'password'         => 'min:5|required_with:password_confirm',

-            'password-confirm' => 'same:password|required_with:password',
-            'role'             => 'exists:roles,id'
+            'password-confirm' => 'same:password|required_with:password'

         ], [
             'password-confirm.required_with' => 'Password confirmation required'
         ]);
         ], [
             'password-confirm.required_with' => 'Password confirmation required'
         ]);


@@ -143,8 +155,9 @@ class UserController extends Controller
         $user->fill($request->all());
 
         // Role updates
         $user->fill($request->all());
 
         // Role updates

-        if ($this->currentUser->can('user-update') && $request->has('role')) {
-            $user->attachRoleId($request->get('role'));
+        if (userCan('users-manage') && $request->has('roles')) {
+            $roles = $request->get('roles');
+            $user->roles()->sync($roles);

         }
 
         // Password updates
         }
 
         // Password updates


@@ -154,12 +167,15 @@ class UserController extends Controller
         }
 
         // External auth id updates
         }
 
         // External auth id updates

-        if ($this->currentUser->can('user-update') && $request->has('external_auth_id')) {
+        if ($this->currentUser->can('users-manage') && $request->has('external_auth_id')) {

             $user->external_auth_id = $request->get('external_auth_id');
         }
 
         $user->save();
             $user->external_auth_id = $request->get('external_auth_id');
         }
 
         $user->save();

-        return redirect('/settings/users');
+        session()->flash('success', 'User successfully updated');
+
+        $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
+        return redirect($redirectUrl);

     }
 
     /**
     }
 
     /**


@@ -169,7 +185,7 @@ class UserController extends Controller
      */
     public function delete($id)
     {
      */
     public function delete($id)
     {

-        $this->checkPermissionOr('user-delete', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
             return $this->currentUser->id == $id;
         });
 


@@ -186,16 +202,19 @@ class UserController extends Controller
     public function destroy($id)
     {
         $this->preventAccessForDemoUsers();
     public function destroy($id)
     {
         $this->preventAccessForDemoUsers();

-        $this->checkPermissionOr('user-delete', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
         $user = $this->userRepo->getById($id);
             return $this->currentUser->id == $id;
         });
 
         $user = $this->userRepo->getById($id);

+

         if ($this->userRepo->isOnlyAdmin($user)) {
             session()->flash('error', 'You cannot delete the only admin');
             return redirect($user->getEditUrl());
         }
         if ($this->userRepo->isOnlyAdmin($user)) {
             session()->flash('error', 'You cannot delete the only admin');
             return redirect($user->getEditUrl());
         }

+

         $this->userRepo->destroy($user);
         $this->userRepo->destroy($user);

+        session()->flash('success', 'User successfully removed');

 
         return redirect('/settings/users');
     }
 
         return redirect('/settings/users');
     }