From 7b38fe3c10d3e8cea17d78055063648d9c87aa78 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 28 Oct 2015 22:01:34 -0400
Subject: [PATCH] #378 Parent/Child tickets are now Linked tickets

---
 admin/admin_ticket.php | 57 +++++++++++++++++++++---------------------
 language/en/text.php   | 17 ++++++-------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 270fcbc0..941121e2 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -429,7 +429,7 @@ if (($can_reply || $can_edit) && isset($_POST['childTrackingId'])) {
     $mergedTickets = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` WHERE `trackid` =
         \'' . hesk_dbEscape($trackingID) . '\' AND `merged` LIKE \'%#' . hesk_dbEscape($_POST['childTrackingId']) . '#%\'');
     if ($_POST['childTrackingId'] == $trackingID || $mergedTickets->num_rows > 0) {
-        hesk_process_messages($hesklang['child_is_itself'], 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999));
+        hesk_process_messages($hesklang['cannot_link_ticket_to_itself'], 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999));
     }
 
     //-- Does the child exist?
@@ -442,30 +442,30 @@ if (($can_reply || $can_edit) && isset($_POST['childTrackingId'])) {
             $exist = $existRs->fetch_assoc();
             $_POST['childTrackingId'] = $exist['trackid'];
         } else {
-            hesk_process_messages(sprintf($hesklang['child_does_not_exist'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999));
+            hesk_process_messages(sprintf($hesklang['linked_ticket_does_not_exist'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999));
         }
     }
 
     //-- Check if the ticket is already a child.
     $childRs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` WHERE `parent` = ' . $ticket['id'] . ' AND `trackid` = \'' . $_POST['childTrackingId'] . '\'');
     if ($childRs->num_rows > 0) {
-        hesk_process_messages(sprintf($hesklang['is_child_already'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'NOTICE');
+        hesk_process_messages(sprintf($hesklang['is_already_linked'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'NOTICE');
     }
 
     hesk_dbQuery('UPDATE `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` SET `parent` = ' . $ticket['id'] . ' WHERE `trackid` = \'' . $_POST['childTrackingId'] . '\'');
-    hesk_process_messages(sprintf($hesklang['child_added'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'SUCCESS');
+    hesk_process_messages(sprintf($hesklang['link_added'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'SUCCESS');
 }
 
 /* Delete child action */
 if (($can_reply || $can_edit) && isset($_GET['deleteChild'])) {
     //-- Delete the relationship
     hesk_dbQuery('UPDATE `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` SET `parent` = NULL WHERE `ID` = ' . hesk_dbEscape($_GET['deleteChild']));
-    hesk_process_messages($hesklang['relationship_deleted'], 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'SUCCESS');
+    hesk_process_messages($hesklang['ticket_no_longer_linked'], 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'SUCCESS');
 
 } elseif (($can_reply || $can_edit) && isset($_GET['deleteParent'])) {
     //-- Delete the relationship
     hesk_dbQuery('UPDATE `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` SET `parent` = NULL WHERE `ID` = ' . hesk_dbEscape($ticket['id']));
-    hesk_process_messages($hesklang['relationship_deleted'], 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'SUCCESS');
+    hesk_process_messages($hesklang['ticket_no_longer_linked'], 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'SUCCESS');
 }
 
 /* Delete attachment action */
@@ -728,7 +728,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     </li>
                 <?php } // End if time_worked ?>
                 <li class="list-group-item">
-                    <strong><?php echo $hesklang['parent']; ?></strong>
+                    <strong><?php echo $hesklang['linked_tickets']; ?></strong>
 
                     <p><?php
                         if ($ticket['parent'] != null) {
@@ -738,15 +738,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             echo '<a href="admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999) . '&deleteParent=true">
                                 <i class="fa fa-times-circle" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete_relationship'] . '"></i></a>';
                             echo '&nbsp;<a href="admin_ticket.php?track=' . $parent['trackid'] . '&Refresh=' . mt_rand(10000, 99999) . '">' . $parent['trackid'] . '</a>';
-                        } else {
-                            echo $hesklang['none'];
                         }
-                        ?></p>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['children']; ?></strong>
-
-                    <p><?php
                         //-- Check if any tickets have a parent set to this tracking ID
                         $hasRows = false;
                         $childrenRS = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets`
@@ -754,11 +746,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         while ($row = $childrenRS->fetch_assoc()) {
                             $hasRows = true;
                             echo '<a href="admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999) . '&deleteChild=' . $row['id'] . '">
-                            <i class="fa fa-times-circle" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete_relationship'] . '"></i></a>';
+                            <i class="fa fa-times-circle font-icon red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['unlink'] . '"></i></a>';
                             echo '&nbsp;<a href="admin_ticket.php?track=' . $row['trackid'] . '&Refresh=' . mt_rand(10000, 99999) . '">' . $row['trackid'] . '</a>';
                             echo '<br>';
                         }
-                        if (!$hasRows) {
+                        if (!$hasRows && $ticket['parent'] == null) {
                             echo $hesklang['none'];
                         }
                         ?></p>
@@ -766,19 +758,28 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     if ($can_reply || $can_edit) {
                         ?>
                         <div id="addChildText">
-                            <p><?php echo '<a class="btn btn-default btn-sm" href="javascript:void(0)" onclick="toggleChildrenForm(true)">' . $hesklang['add_child'] . '</a>'; ?></p>
+                            <p><?php echo '<a class="btn btn-default btn-sm" href="javascript:void(0)" onclick="toggleChildrenForm(true)">' . $hesklang['add_ticket'] . '</a>'; ?></p>
                         </div>
                         <div id="childrenForm" style="display: none">
-                            <form action="admin_ticket.php" method="post">
-                                <div class="form-group"><label for="childTrackingId" class="control-label">Tracking
-                                        ID</label>
-                                    <input type="text" name="childTrackingId" class="form-control input-sm"></div>
-                                <input type="submit" class="btn btn-primary btn-sm"
-                                       value="<?php echo $hesklang['save']; ?>">
-                                <a class="btn btn-default btn-sm" href="javascript:void(0)"
-                                   onclick="toggleChildrenForm(false)">
-                                    <?php echo $hesklang['cancel']; ?>
-                                </a>
+                            <form action="admin_ticket.php" method="post" data-toggle="validator">
+                                <div class="form-group">
+                                    <label for="childTrackingId" class="control-label">
+                                        <?php echo $hesklang['trackID']; ?>
+                                    </label>
+                                    <input type="text" name="childTrackingId" class="form-control input-sm"
+                                           placeholder="<?php echo htmlspecialchars($hesklang['trackID']); ?>"
+                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                           required>
+                                    <div class="help-block with-errors"></div>
+                                </div>
+                                <div class="btn-group">
+                                    <input type="submit" class="btn btn-primary btn-sm"
+                                           value="<?php echo $hesklang['save']; ?>">
+                                    <a class="btn btn-default btn-sm" href="javascript:void(0)"
+                                       onclick="toggleChildrenForm(false)">
+                                        <?php echo $hesklang['cancel']; ?>
+                                    </a>
+                                </div>
                                 <input type="hidden" name="track" value="<?php echo $trackingID; ?>"/>
                                 <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
                             </form>
diff --git a/language/en/text.php b/language/en/text.php
index 3404ca51..8d8ad803 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -27,6 +27,14 @@ $hesklang['manage_service_messages'] = 'Manage Service Messages';
 $hesklang['manage_banned_ips'] = 'Manage Banned IPs';
 $hesklang['manage_banned_emails'] = 'Manage Banned Emails';
 $hesklang['manage_email_templates'] = 'Manage Email Templates';
+$hesklang['linked_tickets'] = 'Linked tickets';
+$hesklang['add_ticket'] = 'Add Ticket';
+$hesklang['cannot_link_ticket_to_itself'] = 'You cannot link a ticket to itself!';
+$hesklang['linked_ticket_does_not_exist'] = '<strong>%s</strong> is not a valid Tracking ID!'; //%s: the child tracking ID
+$hesklang['is_already_linked'] = '<strong>%s</strong> is already linked to this ticket.'; //%s: the child tracking ID
+$hesklang['link_added'] = 'Successfully linked <strong>%s</strong> to this ticket.'; //%s: the child tracking ID
+$hesklang['ticket_no_longer_linked'] = 'Ticket is no longer linked.';
+$hesklang['unlink'] = 'Unlink';
 
 // ADDED OR MODIFIED IN Mods for HESK 2.5.0
 $hesklang['ticket_message_no_attachments'] = 'Ticket/Reply message, however attachments will not be included in the email';
@@ -351,15 +359,6 @@ $hesklang['showIconsHelp'] = 'Check this box to show icons next to navigation ba
 $hesklang['maintenanceMode'] = 'Maintenance Mode';
 $hesklang['maintenanceModeHelp'] = 'Check this box to put the Help Desk in maintenance mode. Staff can still log into the backend, but the front end will be inaccessible.';
 $hesklang['none'] = 'None';
-$hesklang['parent'] = 'Parent';
-$hesklang['children'] = 'Children';
-$hesklang['add_child'] = 'Add Child';
-$hesklang['child_added'] = 'Successfully added <strong>%s</strong> as a child to this ticket.'; //%s: the child tracking ID
-$hesklang['is_child_already'] = '<strong>%s</strong> is already a child of this ticket.'; //%s: the child tracking ID
-$hesklang['child_does_not_exist'] = '<strong>%s</strong> is not a valid Tracking ID!'; //%s: the child tracking ID
-$hesklang['child_is_itself'] = 'You cannot set a ticket as a child of itself.';
-$hesklang['delete_relationship'] = 'Delete Relationship';
-$hesklang['relationship_deleted'] = 'Parent/Child relationship deleted.';
 $hesklang['autorefresh'] = 'Autorefresh:';
 $hesklang['autorefresh_restrictions'] = 'Enter value in milliseconds. Value must be greater than 1000 to use this feature. No fractional values.';