Commit 660c1df8 authored by Nigel McNie's avatar Nigel McNie
Browse files

Some whitespace cleanups. Add a log_info line for when authentication using a...

Some whitespace cleanups. Add a log_info line for when authentication using a new authentication instance fails, to assist people debugging what might be wrong.
parent 6a9845f7
...@@ -1014,7 +1014,8 @@ function login_submit(Pieform $form, $values) { ...@@ -1014,7 +1014,8 @@ function login_submit(Pieform $form, $values) {
} }
if ($auth->authenticate_user_account($USER, $password)) { if ($auth->authenticate_user_account($USER, $password)) {
$authenticated = true; $authenticated = true;
} else { }
else {
continue; continue;
} }
...@@ -1033,8 +1034,10 @@ function login_submit(Pieform $form, $values) { ...@@ -1033,8 +1034,10 @@ function login_submit(Pieform $form, $values) {
empty($userdata->lastname) || empty($userdata->lastname) ||
empty($userdata->email) empty($userdata->email)
) { ) {
// TODO: eventually get_user_info won't have to return all of this information
throw new AuthUnknownUserException("\"$username\" is not known"); throw new AuthUnknownUserException("\"$username\" is not known");
} else { }
else {
// We have the data - create the user // We have the data - create the user
$USER->lastlogin = db_format_timestamp(time()); $USER->lastlogin = db_format_timestamp(time());
$USER->firstname = $userdata->firstname; $USER->firstname = $userdata->firstname;
...@@ -1070,6 +1073,10 @@ function login_submit(Pieform $form, $values) { ...@@ -1070,6 +1073,10 @@ function login_submit(Pieform $form, $values) {
} }
catch (AuthUnknownUserException $e) { catch (AuthUnknownUserException $e) {
// We weren't able to authenticate the user for some reason that
// probably isn't their fault (e.g. ldap extension not available
// when using ldap authentication)
log_info($e->getMessage());
$SESSION->add_error_msg(get_string('loginfailed')); $SESSION->add_error_msg(get_string('loginfailed'));
return; return;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment