From a31195793c023906ab5da62f06ab84aefed445c3 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 8 Jan 2019 23:41:40 +0100
Subject: [PATCH] Password reset mail could take several hours. After fix only
 a couple of seconds. Using From: email in header.

---
 includes/current_user.inc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/includes/current_user.inc b/includes/current_user.inc
index edfae0a9..c3d162e0 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -158,8 +158,14 @@ class current_user
 			$hash = md5($password);
 
 			update_user_password($user['id'], $user['user_id'], $hash);
-
-			mail($email, _("New password for")." ".$SysPrefs->app_title, $password);
+			
+			$sender = get_company_pref('email');
+			if (empty($sender))
+				$header = "";
+			else
+				$header = "From: $sender";
+
+			mail($email, _("New password for")." ".$SysPrefs->app_title, $password, $header);
 
 			return true;
 		}
-- 
2.30.2