Update Mail Send Test to use the proper from name when sending a test also show the from name from the select

This commit is contained in:
johnnyq
2024-01-16 22:56:35 -05:00
parent e07fb9ce50
commit 9bd28b1c56
2 changed files with 28 additions and 11 deletions

View File

@@ -269,31 +269,33 @@ require_once "inc_all_settings.php";
<input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
<div class="input-group">
<select class="form-control select2" name="email_from" required>
<select class="form-control select2" name="test_email" required>
<option value="">- Select an Email Address to send from -</option>
<?php
if(!empty($config_mail_from_email)){
if ($config_mail_from_email) {
?>
<option><?php echo nullable_htmlentities($config_mail_from_email); ?></option>
<option value="1"><?php echo nullable_htmlentities($config_mail_from_name); ?> (<?php echo nullable_htmlentities($config_mail_from_email); ?>)</option>
<?php } ?>
<?php
if(!empty($config_ticket_from_email)){
if ($config_invoice_from_email) {
?>
<option><?php echo nullable_htmlentities($config_ticket_from_email); ?></option>
<option value="2"><?php echo nullable_htmlentities($config_invoice_from_name); ?> (<?php echo nullable_htmlentities($config_invoice_from_email); ?>)</option>
<?php } ?>
<?php
if(!empty($config_invoice_from_email)){
if ($config_quote_from_email) {
?>
<option><?php echo nullable_htmlentities($config_invoice_from_email); ?></option>
<option value="3"><?php echo nullable_htmlentities($config_quote_from_name); ?> (<?php echo nullable_htmlentities($config_quote_from_email); ?>)</option>
<?php } ?>
<?php
if(!empty($config_quote_from_email)){
if ($config_ticket_from_email) {
?>
<option><?php echo nullable_htmlentities($config_quote_from_email); ?></option>
<option value="4"><?php echo nullable_htmlentities($config_ticket_from_name); ?> (<?php echo nullable_htmlentities($config_ticket_from_email); ?>)</option>
<?php } ?>
</select>
<input type="email" class="form-control " name="email_to" placeholder="Email address to send to">
<div class="input-group-append">