From e86b8ef782c784b578740660078c3907a23a9da6 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 3 Jan 2019 20:42:29 -0500
Subject: [PATCH] Use nickname instead of email for Login Name

---
 mod/admin.php      | 2 +-
 mod/lostpass.php   | 8 ++++----
 src/Model/User.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index c0ad281d3b..1cbe24e71d 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1752,7 +1752,7 @@ function admin_page_users_post(App $a)
 			Thank you and welcome to %4$s.'));
 
 		$preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename'));
-		$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], Config::get('config', 'sitename'));
+		$body = sprintf($body, System::baseUrl(), $user['nickname'], $result['password'], Config::get('config', 'sitename'));
 
 		notification([
 			'type'     => SYSTEM_EMAIL,
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 39209af951..d36d32963d 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -21,7 +21,7 @@ function lostpass_post(App $a)
 	}
 
 	$condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame];
-	$user = DBA::selectFirst('user', ['uid', 'username', 'email', 'language'], $condition);
+	$user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'language'], $condition);
 	if (!DBA::isResult($user)) {
 		notice(L10n::t('No valid account found.') . EOL);
 		$a->internalRedirect();
@@ -63,7 +63,7 @@ function lostpass_post(App $a)
 		The login details are as follows:
 
 		Site Location:	%2$s
-		Login Name:	%3$s', $resetlink, System::baseUrl(), $user['email']));
+		Login Name:	%3$s', $resetlink, System::baseUrl(), $user['nickname']));
 
 	notification([
 		'type'     => SYSTEM_EMAIL,
@@ -85,7 +85,7 @@ function lostpass_content(App $a)
 	if ($a->argc > 1) {
 		$pwdreset_token = $a->argv[1];
 
-		$user = DBA::selectFirst('user', ['uid', 'username', 'email', 'pwdreset_time', 'language'], ['pwdreset' => $pwdreset_token]);
+		$user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'pwdreset_time', 'language'], ['pwdreset' => $pwdreset_token]);
 		if (!DBA::isResult($user)) {
 			notice(L10n::t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."));
 
@@ -161,7 +161,7 @@ function lostpass_generate_password($user)
 			Password:	%3$s
 
 			You may change that password from your account settings page after logging in.
-		', System::baseUrl(), $user['email'], $new_password));
+		', System::baseUrl(), $user['nickname'], $new_password));
 
 		notification([
 			'type'     => SYSTEM_EMAIL,
diff --git a/src/Model/User.php b/src/Model/User.php
index c71ae475e9..a1a722f4cc 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -771,7 +771,7 @@ class User
 			If you ever want to delete your account, you can do so at %3$s/removeme
 
 			Thank you and welcome to %2$s.',
-			$user['email'], $sitename, $siteurl, $user['username'], $password
+			$user['nickname'], $sitename, $siteurl, $user['username'], $password
 		));
 
 		return notification([