Merge pull request #733 from wrongecho/ticket-update-type-email-match

Ticket updates - Default to internal update if contact is agent

ticket.php

@@ -326,7 +326,8 @@ if (isset($_GET['ticket_id'])) {
                                 </div>
                             </div>
 
-                            <?php if(!empty($contact_email)){ ?>
+
+                            <?php if(!empty($contact_email && $contact_email !== $session_email)){ ?>
 
                             <div class="col-md-2">
                                 <div class="form-group">
@@ -335,7 +336,6 @@ if (isset($_GET['ticket_id'])) {
                                         <label class="custom-control-label" for="ticket_reply_type_checkbox">Email contact<br><small class="text-secondary">(Public Update)</small></label>
                                     </div>
                                 </div>
-                                </div>
 
                             <?php } ?>
 
@@ -538,15 +538,10 @@ if (isset($_GET['ticket_id'])) {
                             </div>
                             <div class="mt-1">
                                 <i class="fa fa-fw fa-hourglass-start text-secondary ml-1 mr-2"></i><strong>Status:</strong>
-                                <?php if ($prev_ticket_status == 'Open') { ?>
-                                    <span class="text-danger"><?php echo $prev_ticket_status; ?></span>
-                                <?php } else { ?>
                                 <span class="text-success"><?php echo $prev_ticket_status; ?></span>
                             <?php } ?>
                         </div>
 
-                        <?php } ?> <!-- End previous ticket IF statement -->
-
                     <?php } else { ?>
                         <div>
                             <a href="#" data-toggle="modal" data-target="#editTicketContactModal<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-plus mr-2"></i>Add a Contact</a>
@@ -598,6 +593,7 @@ if (isset($_GET['ticket_id'])) {
                         $ticket_closed_by_display = nullable_htmlentities($row['user_name']);
                     ?>
 
+
                         <div class="mt-1">
                             <i class="fa fa-fw fa-user text-secondary ml-1 mr-2"></i>Closed by: <?php echo ucwords($ticket_closed_by_display); ?>
                         </div>