diff --git a/admin/admin_main.php b/admin/admin_main.php index 7b64d160..ea556516 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -49,6 +49,7 @@ hesk_isLoggedIn(); define('CALENDAR', 1); define('MAIN_PAGE', 1); +define('PAGE_TITLE', 'ADMIN_HOME'); /* Print header */ require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); diff --git a/admin/admin_settings.php b/admin/admin_settings.php index 6ca36053..7d3f1d22 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -30,7 +30,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); - +define('PAGE_TITLE', 'ADMIN_SETTINGS'); define('LOAD_TABS', 1); // Make sure the install folder is deleted 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');
  • - +

    '; echo ' ' . $parent['trackid'] . ''; - } else { - echo $hesklang['none']; } - ?>

    -
    • -
  • - - -

    fetch_assoc()) { $hasRows = true; echo ' - '; + '; echo ' ' . $row['trackid'] . ''; echo '
    '; } - if (!$hasRows) { + if (!$hasRows && $ticket['parent'] == null) { echo $hesklang['none']; } ?>

    @@ -766,19 +758,28 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); if ($can_reply || $can_edit) { ?>
    -

    ' . $hesklang['add_child'] . ''; ?>

    +

    ' . $hesklang['add_ticket'] . ''; ?>

    • - -
  • +
  • >> 
    • diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index cdbc1e7f..a7934231 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -124,7 +124,12 @@ $modsForHesk_settings = mfh_getSettings(); background-color: ; } - .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:focus, .navbar-default .navbar-nav > .open > a:hover { + .navbar-default .navbar-nav > .open > a, + .navbar-default .navbar-nav > .open > a:focus, + .navbar-default .navbar-nav > .open > a:hover, + .navbar-default .navbar-nav > .active > a, + .navbar-default .navbar-nav > .active > a:focus, + .navbar-default .navbar-nav > .active > a:hover { color: ; background-color: ; background-image: none; diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php index 3d2313a0..65456131 100644 --- a/inc/show_admin_nav.inc.php +++ b/inc/show_admin_nav.inc.php @@ -63,11 +63,21 @@ if (hesk_check_kb_only(false)) { '; + echo '
    '; break; /* Large text box */ @@ -824,7 +826,7 @@ function print_add_ticket()
    -
    '; + '; break; case 'multiselect': @@ -856,10 +858,13 @@ function print_add_ticket()
    -
    '; + + + '; break; case 'date': + $errorText = $required == 'required' ? 'data-error="'.htmlspecialchars($hesklang['this_field_is_required']).'"' : ''; //Clean up multiple dashes or whitespaces $formattedId = preg_replace("/[\s-]+/", " ", $v['name']); $formattedId = preg_replace("/[\s_]/", "-", $formattedId); @@ -875,8 +880,9 @@ function print_add_ticket()
    + value="' . $v['value'] . '" '.$errorText. ' readonly="readonly" '.$required.'> ' . $hesklang['date_format'] . ' +
    '; break; @@ -901,7 +907,7 @@ function print_add_ticket()
    -
    '; + '; break; @@ -955,7 +961,7 @@ function print_add_ticket()
    -
    '; + '; } } } @@ -1003,7 +1009,12 @@ function print_add_ticket() $value = stripslashes(hesk_input($_SESSION['c_question'])); } $cls = in_array('question', $_SESSION['iserror']) ? ' class="isError" ' : ''; - echo '
    ' . $hesk_settings['question_ask'] . '
    '; + echo '
    ' . $hesk_settings['question_ask'] . '
    + +
    +
    '; ?> %s is not a valid Tracking ID!'; //%s: the child tracking ID +$hesklang['is_already_linked'] = '%s is already linked to this ticket.'; //%s: the child tracking ID +$hesklang['link_added'] = 'Successfully linked %s 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'; $hesklang['click_for_device_information'] = 'Click for device information'; @@ -344,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 %s as a child to this ticket.'; //%s: the child tracking ID -$hesklang['is_child_already'] = '%s is already a child of this ticket.'; //%s: the child tracking ID -$hesklang['child_does_not_exist'] = '%s 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.'; diff --git a/ticket.php b/ticket.php index 29989c80..583c42dd 100644 --- a/ticket.php +++ b/ticket.php @@ -33,6 +33,7 @@ define('HESK_PATH', './'); define('HESK_NO_ROBOTS', 1); define('WYSIWYG', 1); define('VALIDATOR', 1); +define('PAGE_TITLE', 'CUSTOMER_TICKET'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php');