From 3a83a701b5c1d6e59c1a537f446b913aa83093d3 Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Mon, 8 May 2023 09:43:46 +0100
Subject: [PATCH] Ticket autoclose: Clarify auto-close help wording; only show
 as ticket status option if enabled

---
 settings_ticket.php | 7 +++----
 ticket.php          | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/settings_ticket.php b/settings_ticket.php
index c73a573d..75b52d7b 100644
--- a/settings_ticket.php
+++ b/settings_ticket.php
@@ -51,22 +51,21 @@ require_once("inc_all_settings.php"); ?>
                 <div class="form-group">
                     <div class="custom-control custom-switch">
                         <input type="checkbox" class="custom-control-input" name="config_ticket_email_parse" <?php if($config_ticket_email_parse == 1){ echo "checked"; } ?> value="1" id="emailToTicketParseSwitch">
-                        <label class="custom-control-label" for="emailToTicketParseSwitch">Email-to-ticket parsing <small>(cron_ticket_email_parser.php must also be added to cron and run every few mins)</small></label>
+                        <label class="custom-control-label" for="emailToTicketParseSwitch">Email-to-ticket parsing <small class="text-secondary">(cron_ticket_email_parser.php must also be added to cron and run every few mins)</small></label>
                     </div>
                 </div>
 
                 <div class="form-group">
                     <div class="custom-control custom-switch">
                         <input type="checkbox" class="custom-control-input" name="config_ticket_client_general_notifications" <?php if($config_ticket_client_general_notifications == 1){ echo "checked"; } ?> value="1" id="ticketNotificationSwitch">
-                        <label class="custom-control-label" for="ticketNotificationSwitch">Send clients general notification emails <small>(Should clients receive automatic emails when tickets are raised/closed?)</small></label>
+                        <label class="custom-control-label" for="ticketNotificationSwitch">Send clients general notification emails <small class="text-secondary">(Should clients receive automatic emails when tickets are raised/closed?)</small></label>
                     </div>
                 </div>
 
                 <div class="form-group">
                     <div class="custom-control custom-switch">
                         <input type="checkbox" class="custom-control-input" name="config_ticket_autoclose" <?php if($config_ticket_autoclose == 1){ echo "checked"; } ?> value="1" id="ticketAutoCloseSwitch">
-                        <label class="custom-control-label" for="ticketAutoCloseSwitch">Enable Autoclose Tickets <small class="text-secondary">(If no response is received after 48 hrs, a chaser email is sent mentioning "This is an automatic friendly reminder that your ticket regarding "Test ticket" will be closed, unless you respond", including the last public technician response for reference
-If no response is received after a further 22 hrs (70 total since ticket was put in auto close), the ticket is silently closed. (Note: I chose 70 hrs to help prevent situations where the chaser email is sent twice - feel free to adjust as needed))</small></label>
+                        <label class="custom-control-label" for="ticketAutoCloseSwitch">Enable Auto close Tickets <small class="text-secondary">(If no response is received after 48 hrs, a friendly chaser email is sent. The ticket is then automatically closed after the time specified below (defaults to 72 hours). </small></label>
                     </div>
                 </div>
 
diff --git a/ticket.php b/ticket.php
index e3219143..bc896525 100644
--- a/ticket.php
+++ b/ticket.php
@@ -300,7 +300,9 @@ if (isset($_GET['ticket_id'])) {
                                             <option <?php if ($ticket_status == 'Open') { echo "selected"; } ?> >Open</option>
                                             <option <?php if ($ticket_status == 'Working') { echo "selected"; } ?> >Working</option>
                                             <option <?php if ($ticket_status == 'On Hold') { echo "selected"; } ?> >On Hold</option>
-                                            <option <?php if ($ticket_status == 'Auto Close') { echo "selected"; } ?> >Auto Close</option>
+                                            <?php if($config_ticket_autoclose) { ?>
+                                                <option <?php if ($ticket_status == 'Auto Close') { echo "selected"; } ?> >Auto Close</option>
+                                            <?php } ?>
                                             <option <?php if ($ticket_status == 'Closed') { echo "selected"; } ?> >Closed</option>
                                         </select>
                                     </div>