Update new mail queue function to use the proper mail from name and mail from email

This commit is contained in:
johnnyq
2023-12-21 01:37:21 -05:00
parent cdaca0e06b
commit e8a53cbd6a
10 changed files with 60 additions and 4 deletions

View File

@@ -680,6 +680,8 @@ if (isset($_POST['add_payment'])) {
// Queue Mail
$email = [
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
'recipient' => $contact_email_escaped,
'recipient_name' => $contact_name_escaped,
'subject' => $subject,
@@ -711,6 +713,8 @@ if (isset($_POST['add_payment'])) {
// Queue Mail
$email = [
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
'recipient' => $contact_email_escaped,
'recipient_name' => $contact_name_escaped,
'subject' => $subject,
@@ -1002,6 +1006,8 @@ if (isset($_GET['email_invoice'])) {
// Queue Mail
$data = [
[
'from' => $config_invoice_from_email_escaped,
'from_name' => $config_invoice_from_name_escaped,
'recipient' => $contact_email_escaped,
'recipient_name' => $contact_name_escaped,
'subject' => $subject,
@@ -1043,6 +1049,8 @@ if (isset($_GET['email_invoice'])) {
$data = [
[
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
'recipient' => $billing_contact_email,
'recipient_name' => $billing_contact_name,
'subject' => $subject,
@@ -1172,6 +1180,8 @@ if (isset($_GET['force_recurring'])) {
$data = [
[
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
'recipient' => $contact_email,
'recipient_name' => $contact_name,
'subject' => $subject,

View File

@@ -397,6 +397,8 @@ if (isset($_GET['email_quote'])) {
// Queue Mail
$data = [
[
'from' => $config_quote_from_email,
'from_name' => $config_quote_from_name,
'recipient' => $contact_email_escaped,
'recipient_name' => $contact_name_escaped,
'subject' => $subject,

View File

@@ -158,6 +158,8 @@ if (isset($_POST['test_email_smtp'])) {
$data = [
[
'from' => $email_from,
'from_name' => $email_from,
'recipient' => $email_to,
'recipient_name' => 'Chap',
'subject' => $subject,

View File

@@ -121,6 +121,8 @@ if (isset($_POST['add_ticket'])) {
// Queue Mail
$data = [
[
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,
'recipient' => $contact_email_escaped,
'recipient_name' => $contact_name_escaped,
'subject' => $subject_escaped,
@@ -137,6 +139,8 @@ if (isset($_POST['add_ticket'])) {
// Queue Mail
$data = [
[
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,
'recipient' => $watcher_email_escaped,
'recipient_name' => $watcher_email_escaped,
'subject' => $subject_escaped,
@@ -424,6 +428,8 @@ if (isset($_POST['assign_ticket'])) {
// Queue Mail
$data = [
[
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,
'recipient' => $agent_email_escaped,
'recipient_name' => $agent_name_escaped,
'subject' => $subject_escaped,
@@ -576,6 +582,8 @@ if (isset($_POST['add_ticket_reply'])) {
// Email Ticket Contact
// Queue Mail
$data[] = [
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,
'recipient' => $contact_email_escaped,
'recipient_name' => $contact_name_escaped,
'subject' => $subject_escaped,
@@ -590,6 +598,8 @@ if (isset($_POST['add_ticket_reply'])) {
// Queue Mail
$data[] = [
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,
'recipient' => $watcher_email_escaped,
'recipient_name' => $watcher_email_escaped,
'subject' => $subject_escaped,
@@ -798,6 +808,8 @@ if (isset($_GET['close_ticket'])) {
// Queue Mail
$data[] = [
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,
'recipient' => $contact_email_escaped,
'recipient_name' => $contact_name_escaped,
'subject' => $subject_escaped,
@@ -812,6 +824,8 @@ if (isset($_GET['close_ticket'])) {
// Queue Mail
$data[] = [
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,
'recipient' => $watcher_email_escaped,
'recipient_name' => $watcher_email_escaped,
'subject' => $subject_escaped,