Permalink
Browse files

Tidy up some of the dox

  • Loading branch information...
1 parent 466558e commit 92710226a594bcb2c3b31790d433fbf026d839e7 moodler committed Nov 22, 2002
Showing with 5 additions and 1 deletion.
  1. +5 −1 lib/moodlelib.php
View
@@ -1443,19 +1443,23 @@ function authenticate_user_login($username, $password) {
}
// If this is the admin, then just use internal methods
+ // Doing this first (even though it's less efficient) because
+ // the chosen authentication method might hang and lock the
+ // admin out.
if ($user = get_record_sql("SELECT u.id FROM user u, user_admins a
WHERE u.id = a.user
AND u.username = '$username'
AND u.password = '$md5password'")) {
return get_user_info_from_db("username", $username);
}
+ // OK, the user is a normal user, so try and authenticate them
require_once("$CFG->dirroot/auth/$CFG->auth/lib.php");
if (auth_user_login($username, $password)) { // Successful authentication
if ($user = get_user_info_from_db("username", $username)) {
- if ($md5password <> $user->password) {
+ if ($md5password <> $user->password) { // Update local copy of password for reference
set_field("user", "password", $md5password, "username", $username);
}
return $user;

0 comments on commit 9271022

Please sign in to comment.