From 113d97978adc38ec4ff5175071036abf0c8f98f9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 5 Jan 2024 17:21:29 -0700 Subject: [PATCH] Set the email from address and name --- resources/classes/email.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/classes/email.php b/resources/classes/email.php index 9b3b2c5b45..7ccc995b00 100644 --- a/resources/classes/email.php +++ b/resources/classes/email.php @@ -231,12 +231,18 @@ if (!class_exists('email')) { //add the email_queue_uuid $email_queue_uuid = uuid(); + //set the email from address and name + $email_from = $this->from_address; + if (!empty($this->from_name)) { + $email_from = $this->from_name.'<'.$email_from.'>'; + } + //prepare the array $array['email_queue'][0]['email_queue_uuid'] = $email_queue_uuid; $array['email_queue'][0]['domain_uuid'] = $this->domain_uuid; $array['email_queue'][0]['hostname'] = gethostname(); $array['email_queue'][0]['email_date'] = 'now()'; - $array['email_queue'][0]['email_from'] = $this->from_address; + $array['email_queue'][0]['email_from'] = $email_from; $array['email_queue'][0]['email_to'] = $this->recipients; $array['email_queue'][0]['email_subject'] = $this->subject; $array['email_queue'][0]['email_body'] = $this->body;