From 6721c558af9176e6bc7e74bf00091f1619b379d4 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 25 Jan 2017 20:52:20 +0000 Subject: [PATCH 01/22] Update CONTRIBUTING.md --- CONTRIBUTING.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e174429b..4dc8a711 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,8 +9,8 @@ If all you are doing is submitting an issue, please check if your "issue" qualif ## Getting Started If you have already completed any of these steps in the past (such as creating a GitHub account), you can skip the respective step. - - Make sure you have a [GitHub account](http://github.com/signup/free) - - Fork the repository on GitHub (for more help consult the [GitHub documentation](https://help.github.com/articles/fork-a-repo/)) + - Make sure you have a [GitLab account](https://gitlab.com/users/sign_in) + - Fork the repository on GitLab ## Making Changes - Create a feature branch from where to base your work off of @@ -22,7 +22,6 @@ If you have already completed any of these steps in the past (such as creating a ## Submitting Changes - Push your changes to a topic branch in your fork of the repository - - Submit a pull request to the official Mods for HESK repository (mkoch227/Mods-for-HESK) - - If necessary, sign the Contributor License Agreement by checking the "status checks" area of your pull request. + - Submit a pull request to the official Mods for HESK repository (mike-koch/Mods-for-HESK) - The owner of Mods for HESK will then inspect and test the code in the pull request. Feedback will be given via GitHub comments. - The owner of Mods for HESK expects responses within two weeks of the original comment. If there is no feedback within that time range, the pull request will be considered abandoned and subsequently will be closed. From ba0a035d88a0430342ca31afedeb551e729a3f17 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 25 Jan 2017 20:52:59 +0000 Subject: [PATCH 02/22] Update CONTRIBUTING.md --- CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4dc8a711..826743d4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,13 +2,13 @@ So you want to contribute to Mods for HESK? Awesome! However, there are a few guidelines that need to be followed so the project can be as easy to maintain as possible. ## Submitting an issue -If all you are doing is submitting an issue, please check if your "issue" qualifies as a GitHub issue: - - **Feature Requests:** Feature requests are now being recorded at the Mods for HESK [UserVoice page](https://mods-for-hesk.uservoice.com/forums/254758-general). Please do not open these types of issues on GitHub. Issues opened that are "feature requests" will be closed. - - **Translations:** Translations are now being recorded at the official Mods for HESK [website](https://mods-for-hesk.mkochcs.com/download.php). Please do not open these types of issues on GitHub. Issues opened that pertain to submitting new translations will be closed. +If all you are doing is submitting an issue, please check if your "issue" qualifies as a GitLab issue: + - **Feature Requests:** Feature requests are now being recorded at the Mods for HESK [UserVoice page](https://mods-for-hesk.uservoice.com/forums/254758-general). Please do not open these types of issues on GitLab. Issues opened that are "feature requests" will be closed. + - **Translations:** Translations are now being recorded at the official Mods for HESK [website](https://mods-for-hesk.mkochcs.com/download.php). Please do not open these types of issues on GitLab. Issues opened that pertain to submitting new translations will be closed. - **Bugs:** Yes, please open these types of issues here. :grinning: ## Getting Started -If you have already completed any of these steps in the past (such as creating a GitHub account), you can skip the respective step. +If you have already completed any of these steps in the past (such as creating a GitLab account), you can skip the respective step. - Make sure you have a [GitLab account](https://gitlab.com/users/sign_in) - Fork the repository on GitLab @@ -23,5 +23,5 @@ If you have already completed any of these steps in the past (such as creating a ## Submitting Changes - Push your changes to a topic branch in your fork of the repository - Submit a pull request to the official Mods for HESK repository (mike-koch/Mods-for-HESK) - - The owner of Mods for HESK will then inspect and test the code in the pull request. Feedback will be given via GitHub comments. + - The owner of Mods for HESK will then inspect and test the code in the pull request. Feedback will be given via GitLab comments. - The owner of Mods for HESK expects responses within two weeks of the original comment. If there is no feedback within that time range, the pull request will be considered abandoned and subsequently will be closed. From cecd302957e633d0873fa5f048b0c3f4e201f14f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 7 Feb 2017 12:39:29 -0500 Subject: [PATCH 03/22] Fixes #509 Allow customers to respond using rich text --- reply_ticket.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/reply_ticket.php b/reply_ticket.php index 8160c573..e4e96fdf 100644 --- a/reply_ticket.php +++ b/reply_ticket.php @@ -62,12 +62,14 @@ $message = hesk_input(hesk_POST('message')); // If the message was entered, further parse it $modsForHesk_settings = mfh_getSettings(); -if (strlen($message) && !$modsForHesk_settings['rich_text_for_tickets_for_customers']) { - // Make links clickable - $message = hesk_makeURL($message); +if (strlen($message)) { + if (!$modsForHesk_settings['rich_text_for_tickets_for_customers']) { + // Make links clickable + $message = hesk_makeURL($message); - // Turn newlines into
- $message = nl2br($message); + // Turn newlines into
+ $message = nl2br($message); + } } else { $hesk_error_buffer[] = $hesklang['enter_message']; } From d7a25b7c7aad22f719783c63cce68ff9881a94ee Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 7 Feb 2017 13:01:28 -0500 Subject: [PATCH 04/22] Fixes #507 Add back missing create event button --- admin/calendar.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/admin/calendar.php b/admin/calendar.php index 96c98361..281b624d 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -83,7 +83,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    • -
  • + +
    +
    + +
    +
    +
    From dd0119602b8146afd9c571cfe26e6279c896ce86 Mon Sep 17 00:00:00 2001 From: DarekTw Date: Sat, 11 Feb 2017 16:12:42 +0100 Subject: [PATCH 05/22] Fixed unclosed
    --- admin/admin_ticket.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 58014f08..820ee4b9 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -1014,13 +1014,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); { echo ''; } - echo '
    '; + echo ''; } else { echo '

    '; echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] : ($can_assign_self ? $hesklang['unas'] . ' [' . $hesklang['asss'] . ']' : $hesklang['unas']); echo '

    '; } + echo ''; echo '

    ' . $hesklang['category'] . '

    '; if (strlen($categories_options) && ($can_change_cat || $can_change_own_cat)) { echo ' From 9325d819c7cb09d6f6df7f14c1a8412a5df78dea Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 6 Mar 2017 21:58:07 -0500 Subject: [PATCH 06/22] Fixes #519 Pull from bridge table for status name --- inc/email_functions.inc.php | 10 ++++++---- language/en/emails/html/new_ticket.txt | 8 ++++---- language/en/text.php | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php index b1ed8563..f4e7d3aa 100644 --- a/inc/email_functions.inc.php +++ b/inc/email_functions.inc.php @@ -652,9 +652,10 @@ function hesk_getEmailSubject($eml_file, $ticket = '', $is_ticket = 1, $strip = } /* Set status */ - $statusRs = hesk_dbQuery("SELECT `Key` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` WHERE `ID` = " . $ticket['status']); + $statusRs = hesk_dbQuery("SELECT `text` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "text_to_status_xref` + WHERE `status_id` = " . $ticket['status'] . " AND `language` = '". hesk_dbEscape($hesklang['LANGUAGE']) ."'"); $row = hesk_dbFetchAssoc($statusRs); - $ticket['status'] = $hesklang[$row['Key']]; + $ticket['status'] = $row['text']; /* Replace all special tags */ $msg = str_replace('%%SUBJECT%%', $ticket['subject'], $msg); @@ -815,9 +816,10 @@ function hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message $ticket['owner'] = hesk_msgToPlain(hesk_getOwnerName($ticket['owner']), 1); /* Set status */ - $statusRs = hesk_dbQuery("SELECT `Key` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` WHERE `ID` = " . $ticket['status']); + $statusRs = hesk_dbQuery("SELECT `text` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "text_to_status_xref` + WHERE `status_id` = " . $ticket['status'] . " AND `language` = '". hesk_dbEscape($hesklang['LANGUAGE']) ."'"); $row = hesk_dbFetchAssoc($statusRs); - $ticket['status'] = $hesklang[$row['Key']]; + $ticket['status'] = $row['text']; /* Replace all special tags */ $msg = str_replace('%%NAME%%', $ticket['name'], $msg); diff --git a/language/en/emails/html/new_ticket.txt b/language/en/emails/html/new_ticket.txt index 4b2816a6..03ba561e 100644 --- a/language/en/emails/html/new_ticket.txt +++ b/language/en/emails/html/new_ticket.txt @@ -2,9 +2,9 @@

    Your support ticket "%%SUBJECT%%" has been submitted.

    We reply to all tickets as soon as possible, within 24 to 48 hours. If we expect your ticket will take additional time, we will update you by sending you an email.

    Ticket tracking ID: %%TRACK_ID%%

    -

    You can view the status of your ticket here: -%%TRACK_URL%%

    +

    You can view the status of your ticket here: %%TRACK_URL%%

    You will receive an email notification when our staff replies to your ticket.

    Sincerely,

    -%%SITE_TITLE%%
    -%%SITE_URL%% \ No newline at end of file +

    %%SITE_TITLE%%
    %%SITE_URL%%

    +

     

    +

    Ticket Status: %%STATUS%%

    \ No newline at end of file diff --git a/language/en/text.php b/language/en/text.php index a30dafe3..d32a2868 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -576,7 +576,7 @@ $hesklang['add_ticket_your_message']='Your Message'; // EMAIL SUBJECTS $hesklang['new_ticket_staff'] = '[#%%TRACK_ID%%] New ticket: %%SUBJECT%%'; -$hesklang['ticket_received'] = '[#%%TRACK_ID%%] Ticket received: %%SUBJECT%%'; +$hesklang['ticket_received'] = '[#%%TRACK_ID%%] Ticket received: %%SUBJECT%%; Status: %%STATUS%%'; $hesklang['ticket_assigned_to_you'] = '[#%%TRACK_ID%%] Ticket assigned: %%SUBJECT%%'; $hesklang['new_reply_by_customer'] = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%'; $hesklang['new_reply_by_staff'] = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%'; From 5a1b4552ce75ad145574ac159e57d3c8cab0d3dd Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 7 Mar 2017 12:54:20 -0500 Subject: [PATCH 07/22] Put ticket reply form in the right place --- ticket.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ticket.php b/ticket.php index ec0e67a5..b56bf073 100644 --- a/ticket.php +++ b/ticket.php @@ -319,7 +319,13 @@ if (!$show['show']) {
    + - Date: Mon, 27 Mar 2017 20:59:13 -0400 Subject: [PATCH 08/22] Fixes #508 Update category visibility after loading events --- admin/calendar.php | 3 +-- js/calendar/mods-for-hesk-calendar.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/calendar.php b/admin/calendar.php index 96c98361..27757f42 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -68,7 +68,7 @@ while ($row = hesk_dbFetchAssoc($rs)) { continue; } - $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color']; + $row['css_style'] = $row['color'] == null ? 'background: white; color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color']; $categories[] = $row; } @@ -83,7 +83,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
      • -
    • Date: Mon, 27 Mar 2017 21:43:14 -0400 Subject: [PATCH 09/22] Fixes #504 set readonly field names different to prevent incorrect values --- admin/custom_fields.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/custom_fields.php b/admin/custom_fields.php index 3b19b4ed..f23c7f35 100755 --- a/admin/custom_fields.php +++ b/admin/custom_fields.php @@ -222,7 +222,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
      -
      @@ -231,7 +231,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
      -
      @@ -1202,8 +1202,8 @@ function cf_validate() break; case 'readonly': - $max_length = hesk_POST('max_length'); - $value = hesk_POST('default_value'); + $max_length = hesk_POST('readonly_max_length'); + $value = hesk_POST('readonly_default_value'); $cf['value'] = array('default_value' => $value, 'max_length' => $max_length); break; From 80b6ef4c9b69be378c3be84741b212305507e449 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 27 Mar 2017 21:52:34 -0400 Subject: [PATCH 10/22] #503 tweak message format, also fix some missing changes for the calendar fix --- admin/admin_ticket.php | 44 ++++++++++++------- .../mods-for-hesk-calendar-admin-readonly.js | 1 + .../mods-for-hesk-calendar-readonly.js | 1 + 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 58014f08..8d623e08 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -1609,15 +1609,22 @@ function mfh_print_message() { ?>
    - +
    +
    + +
    +
    + +
    +

    - +
    +
    + +
    +
    + +
    +
    Date: Tue, 28 Mar 2017 21:21:17 -0400 Subject: [PATCH 11/22] Fixes #463 Support suggested KB articles when rich text is enabled --- hesk_javascript.js | 5 +++++ index.php | 1 + suggest_articles.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hesk_javascript.js b/hesk_javascript.js index a218ee1d..dd5c0a1a 100644 --- a/hesk_javascript.js +++ b/hesk_javascript.js @@ -168,6 +168,11 @@ function hesk_suggestKB() { var d = document.form1; var s = d.subject.value; var m = d.message.value; + + if ($('textarea[name="message"]').data('rich-text-enabled') && tinyMCE.get('message') !== undefined) { + m = tinyMCE.get('message').getContent(); + } + var element = document.getElementById('kb_suggestions'); if (s != '' && m != '' && (heskKBquery != s + " " + m || heskKBfailed == true)) { diff --git a/index.php b/index.php index caa38350..bddb2cd8 100644 --- a/index.php +++ b/index.php @@ -680,6 +680,7 @@ function print_add_ticket()