From 80c84f32483d7f8cc60eb1b8683ada17e914d67c Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Fri, 26 Apr 2019 10:13:31 +0100
Subject: [PATCH] More detailed login logging

---
 core/user.php     | 8 ++++++++
 ext/user/main.php | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/user.php b/core/user.php
index 05ea7466..49868789 100644
--- a/core/user.php
+++ b/core/user.php
@@ -105,11 +105,19 @@ class User {
 		$user = User::by_name($name);
 		if($user) {
 			if($user->passhash == md5(strtolower($name) . $pass)) {
+				log_info("core-user", "Migrating from md5 to bcrypt for ".html_escape($name));
 				$user->set_password($pass);
 			}
 			if(password_verify($pass, $user->passhash)) {
+				log_info("core-user", "Logged in as ".html_escape($name)." ({$user->class->name})");
 				return $user;
 			}
+			else {
+				log_warning("core-user", "Failed to log in as ".html_escape($name)." (Invalid password)");
+			}
+		}
+		else {
+			log_warning("core-user", "Failed to log in as ".html_escape($name)." (Invalid username)");
 		}
 		return null;
 	}
diff --git a/ext/user/main.php b/ext/user/main.php
index 5c27e308..b998469c 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -346,7 +346,6 @@ class UserPage extends Extension {
 		if(!is_null($duser)) {
 			$user = $duser;
 			$this->set_login_cookie($duser->name, $pass);
-			log_info("user", "{$user->class->name} logged in");
 			$page->set_mode("redirect");
 
 			// Try returning to previous page
@@ -360,7 +359,6 @@ class UserPage extends Extension {
 			}
 		}
 		else {
-			log_warning("user", "Failed to log in as ".html_escape($name));
 			$this->theme->display_error(401, "Error", "No user with those details was found");
 		}
 	}