From b6ea0ef7ee05d5e1452db87cbfedbf97b2b6c522 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 27 Mar 2020 20:09:32 +0000 Subject: [PATCH] MDL-68280 user: fix PHP notice for unknown user invalid login token. --- lib/moodlelib.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index c068e0e1d98..9b4212fb1d2 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -4424,10 +4424,15 @@ function authenticate_user_login($username, $password, $ignorelockout=false, &$f if (!\core\session\manager::validate_login_token($logintoken)) { $failurereason = AUTH_LOGIN_FAILED; - // Trigger login failed event. - $event = \core\event\user_login_failed::create(array('userid' => $user->id, - 'other' => array('username' => $username, 'reason' => $failurereason))); - $event->trigger(); + // Trigger login failed event (specifying the ID of the found user, if available). + \core\event\user_login_failed::create([ + 'userid' => ($user->id ?? 0), + 'other' => [ + 'username' => $username, + 'reason' => $failurereason, + ], + ])->trigger(); + error_log('[client '.getremoteaddr()."] $CFG->wwwroot Invalid Login Token: $username ".$_SERVER['HTTP_USER_AGENT']); return false; }