X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/2f6ff0734773c4ac009de699a2661971fd585b22..refs/pull/2416/head:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 97ec31dcc..8d688ed84 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -1,5 +1,6 @@ userRepo = $userRepo; $this->inviteService = $inviteService; $this->imageRepo = $imageRepo; - parent::__construct(); } /** @@ -66,8 +66,8 @@ class UserController extends Controller { $this->checkPermission('users-manage'); $validationRules = [ - 'name' => 'required', - 'email' => 'required|email|unique:users,email' + 'name' => 'required', + 'email' => 'required|email|unique:users,email' ]; $authMethod = config('auth.method'); @@ -102,6 +102,7 @@ class UserController extends Controller $this->userRepo->downloadAndAssignUserAvatar($user); + $this->logActivity(ActivityType::USER_CREATE, $user); return redirect('/settings/users'); } @@ -187,13 +188,14 @@ class UserController extends Controller $user->image_id = $image->id; } - // Delete the profile image if set to + // Delete the profile image if reset option is in request if ($request->has('profile_image_reset')) { $this->imageRepo->destroyImage($user->avatar); } $user->save(); $this->showSuccessNotification(trans('settings.users_edit_success')); + $this->logActivity(ActivityType::USER_UPDATE, $user); $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id); return redirect($redirectUrl); @@ -234,6 +236,7 @@ class UserController extends Controller $this->userRepo->destroy($user); $this->showSuccessNotification(trans('settings.users_delete_success')); + $this->logActivity(ActivityType::USER_DELETE, $user); return redirect('/settings/users'); }