ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10776 from snipe/added_trim_to_email_and_username

Browse Source 
Added trim to email and username
This commit is contained in:
snipe
2022-03-04 11:57:33 -08:00
committed by GitHub
parent 1dabd6cc71 b6a1d245e8
commit 2d7a8b5e15
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Users/UsersController.php
+5 -5
View File
@@ -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) {