From 015ef13c559f3b7be39c6d4b8952b93f32ec05f7 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 26 Feb 2024 15:51:44 -0500
Subject: [PATCH] Show the From name from System, Billing, Sales and Support
 Email in Bulk Email from section

---
 admin_bulk_mail.php  | 14 +++++++++-----
 client_bulk_mail.php |  8 ++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/admin_bulk_mail.php b/admin_bulk_mail.php
index bf95b930..a61ead5c 100644
--- a/admin_bulk_mail.php
+++ b/admin_bulk_mail.php
@@ -38,11 +38,15 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts
                     <hr>
                     
                     <div class="form-group">
-                        <select type="text" class="form-control select2" name="mail_from" >
-                            <option value="<?php echo $config_mail_from_email; ?>"><?php echo $config_mail_from_email; ?></option>
-                            <option value="<?php echo $config_invoice_from_email; ?>"><?php echo $config_invoice_from_email; ?></option>
-                            <option value="<?php echo $config_quote_from_email; ?>"><?php echo $config_quote_from_email; ?></option>
-                            <option value="<?php echo $config_ticket_from_email; ?>"><?php echo $config_ticket_from_email; ?></option>
+                        <select type="text" class="form-control select2" name="mail_from">
+                            <option value="<?php echo $config_mail_from_email; ?>">
+                                <?php echo "$config_mail_from_name - $config_mail_from_email"; ?></option>
+                            <option value="<?php echo $config_invoice_from_email; ?>">
+                                <?php echo "$config_invoice_from_name - $config_invoice_from_email"; ?></option>
+                            <option value="<?php echo $config_quote_from_email; ?>">
+                                <?php echo "$config_quote_from_name - $config_quote_from_email"; ?></option>
+                            <option value="<?php echo $config_ticket_from_email; ?>">
+                                <?php echo "$config_ticket_from_name - $config_ticket_from_email"; ?></option>
                         </select>
                     </div>
 
diff --git a/client_bulk_mail.php b/client_bulk_mail.php
index 2931d239..ccf9dd7b 100644
--- a/client_bulk_mail.php
+++ b/client_bulk_mail.php
@@ -35,13 +35,13 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts
                         <div class="form-group">
                             <select type="text" class="form-control select2" name="mail_from">
                                 <option value="<?php echo $config_mail_from_email; ?>">
-                                    <?php echo $config_mail_from_email; ?></option>
+                                    <?php echo "$config_mail_from_name - $config_mail_from_email"; ?></option>
                                 <option value="<?php echo $config_invoice_from_email; ?>">
-                                    <?php echo $config_invoice_from_email; ?></option>
+                                    <?php echo "$config_invoice_from_name - $config_invoice_from_email"; ?></option>
                                 <option value="<?php echo $config_quote_from_email; ?>">
-                                    <?php echo $config_quote_from_email; ?></option>
+                                    <?php echo "$config_quote_from_name - $config_quote_from_email"; ?></option>
                                 <option value="<?php echo $config_ticket_from_email; ?>">
-                                    <?php echo $config_ticket_from_email; ?></option>
+                                    <?php echo "$config_ticket_from_name - $config_ticket_from_email"; ?></option>
                             </select>
                         </div>