diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php index 0635c74117..c9445550a5 100644 --- a/app/Http/Controllers/Users/BulkUsersController.php +++ b/app/Http/Controllers/Users/BulkUsersController.php @@ -31,8 +31,12 @@ class BulkUsersController extends Controller { $this->authorize('update', User::class); + // Make sure there were users selected if (($request->filled('ids')) && (count($request->input('ids')) > 0)) { + $statuslabel_list = Helper::statusLabelList(); + + // Get the list of affected users $users = User::whereIn('id', array_keys(request('ids'))) ->with('groups', 'assets', 'licenses', 'accessories')->get(); @@ -46,7 +50,7 @@ class BulkUsersController extends Controller } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') { if ($users) { foreach ($users as $user) { - if ($user->email!='') { + if (($user->activated=='1') && ($user->email!='')) { $credentials = ['email' => $user->email]; Password::sendResetLink($credentials, function (Message $message) { $message->subject($this->getEmailSubject()); @@ -54,7 +58,7 @@ class BulkUsersController extends Controller } } } - return redirect()->back()->with('success', 'The selected users with email addresses have been sent a password reset link.'); + return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent')); } diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php index 8ee552afab..65a75b08c2 100644 --- a/resources/lang/en/admin/users/message.php +++ b/resources/lang/en/admin/users/message.php @@ -12,6 +12,7 @@ return array( 'insufficient_permissions' => 'Insufficient Permissions.', 'user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.', 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', + 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', 'success' => array(