From 67134ca38704c35c472b874623a86b75ad994163 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 4 Mar 2022 06:18:52 -0800 Subject: [PATCH 1/2] Do a trim() before inserting/updating Signed-off-by: snipe --- app/Http/Controllers/Users/UsersController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index e0a355facd..41825bf066 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -93,8 +93,8 @@ class UsersController extends Controller $this->authorize('create', User::class); $user = new User; //Username, email, and password need to be handled specially because the need to respect config values on an edit. - $user->email = e($request->input('email')); - $user->username = e($request->input('username')); + $user->email = trim($request->input('email')); + $user->username = trim($request->input('username')); if ($request->filled('password')) { $user->password = bcrypt($request->input('password')); } @@ -243,9 +243,9 @@ class UsersController extends Controller // Update the user if ($request->filled('username')) { - $user->username = $request->input('username'); + $user->username = trim($request->input('username')); } - $user->email = $request->input('email'); + $user->email = trim($request->input('email')); $user->first_name = $request->input('first_name'); $user->last_name = $request->input('last_name'); $user->two_factor_optin = $request->input('two_factor_optin') ?: 0; @@ -622,7 +622,7 @@ class UsersController extends Controller public function sendPasswordReset($id) { if (($user = User::find($id)) && ($user->activated == '1') && ($user->email != '') && ($user->ldap_import == '0')) { - $credentials = ['email' => $user->email]; + $credentials = ['email' => trim($user->email)]; try { \Password::sendResetLink($credentials, function (Message $message) use ($user) { From b6a1d245e8476e17735411569c8bfce2773a6e25 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 4 Mar 2022 06:20:34 -0800 Subject: [PATCH 2/2] Added trim to CC email as well Signed-off-by: snipe --- app/Models/Recipients/AdminRecipient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Recipients/AdminRecipient.php b/app/Models/Recipients/AdminRecipient.php index 0a15557caf..433bd00209 100644 --- a/app/Models/Recipients/AdminRecipient.php +++ b/app/Models/Recipients/AdminRecipient.php @@ -9,6 +9,6 @@ class AdminRecipient extends Recipient public function __construct() { $settings = Setting::getSettings(); - $this->email = $settings->admin_cc_email; + $this->email = trim($settings->admin_cc_email); } }