mike-koch · Nov 5, 2017 · Nov 9, 2017 · Nov 10, 2017 · Nov 11, 2017 · Nov 12, 2017
Showing 329 changed files with 16,393 additions and 6,141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,16 @@
 api/vendor
 api/Tests/integration_test_mfh_settings.php
 
+# Mac Files
+.DS_Store
+
 # HESK Files
 admin/admin_suggest_articles.php
 admin/archive.php
 admin/custom_statuses.php
 admin/email_templates.php
 admin/generate_spam_question.php
+admin/resend_notification.php
 admin/test_connection.php
 attachments/index.htm
 cache/
@@ -19,6 +23,7 @@ header.txt
 hesk_settings.inc.php
 img/add_article.png
 img/add_category.png
+img/anonymize.png
 img/article_text.png
 img/autoassign_off.png
 img/autoassign_on.png
@@ -34,8 +39,10 @@ img/delete.png
 img/delete_off.png
 img/delete_ticket.png
 img/edit.png
+img/email.png
 img/error.png
 img/existingticket.png
+img/export.png
 img/flag_critical.png
 img/flag_high.png
 img/flag_low.png
@@ -81,6 +88,7 @@ img/lock.png
 img/login.png
 img/mail.png
 img/manage.png
+img/menu.png
 img/minus.gif
 img/minusbottom.gif
 img/minustop.gif
@@ -197,59 +205,60 @@ inc/tabs/tabber-minimized.js
 inc/tabs/tabber.css
 inc/timer/hesk_timer.js
 inc/timer/index.htm
-inc/tiny_mce/3.5.11/langs/en.js
-inc/tiny_mce/3.5.11/license.txt
-inc/tiny_mce/3.5.11/themes/advanced/about.htm
-inc/tiny_mce/3.5.11/themes/advanced/anchor.htm
-inc/tiny_mce/3.5.11/themes/advanced/charmap.htm
-inc/tiny_mce/3.5.11/themes/advanced/color_picker.htm
-inc/tiny_mce/3.5.11/themes/advanced/editor_template.js
-inc/tiny_mce/3.5.11/themes/advanced/image.htm
-inc/tiny_mce/3.5.11/themes/advanced/img/colorpicker.jpg
-inc/tiny_mce/3.5.11/themes/advanced/img/flash.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/icons.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/iframe.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/pagebreak.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/quicktime.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/realmedia.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/shockwave.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/trans.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/video.gif
-inc/tiny_mce/3.5.11/themes/advanced/img/windowsmedia.gif
-inc/tiny_mce/3.5.11/themes/advanced/js/about.js
-inc/tiny_mce/3.5.11/themes/advanced/js/anchor.js
-inc/tiny_mce/3.5.11/themes/advanced/js/charmap.js
-inc/tiny_mce/3.5.11/themes/advanced/js/color_picker.js
-inc/tiny_mce/3.5.11/themes/advanced/js/image.js
-inc/tiny_mce/3.5.11/themes/advanced/js/link.js
-inc/tiny_mce/3.5.11/themes/advanced/js/source_editor.js
-inc/tiny_mce/3.5.11/themes/advanced/langs/en.js
-inc/tiny_mce/3.5.11/themes/advanced/langs/en_dlg.js
-inc/tiny_mce/3.5.11/themes/advanced/link.htm
-inc/tiny_mce/3.5.11/themes/advanced/shortcuts.htm
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/content.css
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/dialog.css
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/img/buttons.png
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/img/items.gif
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/img/menu_arrow.gif
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/img/menu_check.gif
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/img/progress.gif
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/img/tabs.gif
-inc/tiny_mce/3.5.11/themes/advanced/skins/default/ui.css
-inc/tiny_mce/3.5.11/themes/advanced/source_editor.htm
-inc/tiny_mce/3.5.11/tiny_mce.js
-inc/tiny_mce/3.5.11/tiny_mce_popup.js
-inc/tiny_mce/3.5.11/utils/editable_selects.js
-inc/tiny_mce/3.5.11/utils/form_utils.js
-inc/tiny_mce/3.5.11/utils/mctabs.js
-inc/tiny_mce/3.5.11/utils/validate.js
+inc/tiny_mce/3.5.12/langs/en.js
+inc/tiny_mce/3.5.12/license.txt
+inc/tiny_mce/3.5.12/themes/advanced/about.htm
+inc/tiny_mce/3.5.12/themes/advanced/anchor.htm
+inc/tiny_mce/3.5.12/themes/advanced/charmap.htm
+inc/tiny_mce/3.5.12/themes/advanced/color_picker.htm
+inc/tiny_mce/3.5.12/themes/advanced/editor_template.js
+inc/tiny_mce/3.5.12/themes/advanced/image.htm
+inc/tiny_mce/3.5.12/themes/advanced/img/colorpicker.jpg
+inc/tiny_mce/3.5.12/themes/advanced/img/flash.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/icons.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/iframe.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/pagebreak.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/quicktime.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/realmedia.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/shockwave.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/trans.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/video.gif
+inc/tiny_mce/3.5.12/themes/advanced/img/windowsmedia.gif
+inc/tiny_mce/3.5.12/themes/advanced/js/about.js
+inc/tiny_mce/3.5.12/themes/advanced/js/anchor.js
+inc/tiny_mce/3.5.12/themes/advanced/js/charmap.js
+inc/tiny_mce/3.5.12/themes/advanced/js/color_picker.js
+inc/tiny_mce/3.5.12/themes/advanced/js/image.js
+inc/tiny_mce/3.5.12/themes/advanced/js/link.js
+inc/tiny_mce/3.5.12/themes/advanced/js/source_editor.js
+inc/tiny_mce/3.5.12/themes/advanced/langs/en.js
+inc/tiny_mce/3.5.12/themes/advanced/langs/en_dlg.js
+inc/tiny_mce/3.5.12/themes/advanced/link.htm
+inc/tiny_mce/3.5.12/themes/advanced/shortcuts.htm
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/content.css
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/dialog.css
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/img/buttons.png
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/img/items.gif
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/img/menu_arrow.gif
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/img/menu_check.gif
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/img/progress.gif
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/img/tabs.gif
+inc/tiny_mce/3.5.12/themes/advanced/skins/default/ui.css
+inc/tiny_mce/3.5.12/themes/advanced/source_editor.htm
+inc/tiny_mce/3.5.12/tiny_mce.js
+inc/tiny_mce/3.5.12/tiny_mce_popup.js
+inc/tiny_mce/3.5.12/utils/editable_selects.js
+inc/tiny_mce/3.5.12/utils/form_utils.js
+inc/tiny_mce/3.5.12/utils/mctabs.js
+inc/tiny_mce/3.5.12/utils/validate.js
 inc/treemenu/TreeMenu.php
 inc/treemenu/index.htm
 inc/zip/Zip.php
 inc/zip/index.htm
 inc/zip/pclzip.lib.php
 install/hesk.png
 install/update.php
+language/en/help_files
 language/en/emails/category_moved.txt
 language/en/emails/forgot_ticket_id.txt
 language/en/emails/index.htm
@@ -260,9 +269,8 @@ language/en/emails/new_ticket.txt
 language/en/emails/new_ticket_staff.txt
 language/en/emails/ticket_assigned_to_you.txt
 language/en/index.htm
+language/en/text.php
 language/index.htm
-language/*
-!language/en
 print_sec_img.php
 rate.php
 readme.html

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,6 +6,12 @@ stages:
 before_script:
   - bash ci/docker_install.sh > /dev/null
 
+validate:7.2:
+  image: php:7.2
+  stage: validate
+  script:
+    - bash ci/php_lint.sh ./
+
 validate:7.1:
   image: php:7.1
   stage: validate
@@ -36,27 +42,8 @@ validate:5.4:
   script:
     - bash ci/php_lint.sh ./
 
-validate:5.3:
-  image: php:5.3
-  stage: validate
-  script:
-    - bash ci/php_lint.sh ./
-
-test:7.1:
-  image: php:7.1
-  stage: test
-  script:
-    - cd api
-    - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-    - php composer-setup.php
-    - php -r "unlink('composer-setup.php');"
-    - php composer.phar update
-    - php composer.phar install
-    - cd Tests
-    - phpunit
-
-test:7.0:
-  image: php:7.0
+test:7.3:
+  image: php:7.3
   stage: test
   script:
     - cd api
@@ -66,7 +53,6 @@ test:7.0:
     - php composer.phar update
     - php composer.phar install
     - cd Tests
-    - phpunit
 
 package:
   image: tetraweb/php

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-## [Mods for HESK](http://mods-for-hesk.mkochcs.com)  [![Number of Downloads](https://img.shields.io/github/downloads/mkoch227/Mods-for-HESK/latest/total.svg)](https://www.github.com/mkoch227/Mods-for-HESK/releases) [![Current Release](https://img.shields.io/github/release/mkoch227/Mods-for-HESK.svg)](https://www.github.com/mkoch227/Mods-for-HESK/releases) [![Project Status](https://img.shields.io/badge/status-maintained-brightgreen.svg)](https://www.github.com/mkoch227/Mods-for-HESK)
+## [Mods for HESK](https://mods-for-hesk.com)  [![Number of Downloads](https://img.shields.io/github/downloads/mkoch227/Mods-for-HESK/latest/total.svg)](https://www.github.com/mkoch227/Mods-for-HESK/releases) [![Current Release](https://img.shields.io/github/release/mkoch227/Mods-for-HESK.svg)](https://www.github.com/mkoch227/Mods-for-HESK/releases) [![Project Status](https://img.shields.io/badge/status-maintained-brightgreen.svg)](https://www.github.com/mkoch227/Mods-for-HESK)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/mkoch227/Mods-for-HESK/blob/master/LICENSE)
 [![Join the chat at https://gitter.im/mkoch227/Mods-for-HESK](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mkoch227/Mods-for-HESK?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
 
-Mods for HESK is a set of modifications for [HESK](https://www.hesk.com) v2.7.x, a free and popular helpdesk solution.
+Mods for HESK is a set of modifications for [HESK](https://www.hesk.com) v2.x, a free and popular helpdesk solution.
 
 ## Features
 <table>
@@ -49,7 +49,7 @@ The latest version available for download can be downloaded from https://mods-fo
 The `master` branch will always contain the latest release.
 
 ## Installation
-Visit [https://mods-for-hesk.mkochcs.com/download.php](https://mods-for-hesk.mkochcs.com/download.php) for installation instructions.
+Visit [https://mods-for-hesk.mkochcs.com/download.php](https://mods-for-hesk.com/download) for installation instructions.
 
 ## Languages / Support
 Please visit https://developers.phpjunkyard.com/viewforum.php?f=19 for translation instructions and support.  

diff --git a/admin/admin_main.php b/admin/admin_main.php
@@ -22,6 +22,7 @@
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
+require(HESK_PATH . 'inc/category_groups.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
 require(HESK_PATH . 'inc/mail_functions.inc.php');
@@ -54,7 +55,15 @@
 ?>
 <div class="content-wrapper">
     <section class="content">
-    <?php hesk_handle_messages(); ?>
+    <?php
+    // Service messages
+    $service_messages = mfh_get_service_messages('STAFF_HOME');
+    foreach ($service_messages as $sm) {
+        hesk_service_message($sm);
+    }
+
+    hesk_handle_messages();
+    ?>
     <div class="box">
         <div class="box-header with-border">
             <h1 class="box-title">
@@ -100,23 +109,17 @@
         </div>
     </div>
     <?php
-    $hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI
-        CdoZXNrX2xpY2Vuc2UucGhwJykpDQp7DQokaCA9ICghZW1wdHkoJF9TRVJWRVJbJ0hUVFBfSE9TVCddK
-        SkgPyAkX1NFUlZFUlsnSFRUUF9IT1NUJ10gOiAoKCFlbXB0eSgkX1NFUlZFUlsnU0VSVkVSX05BTUUnX
-        SkpID8gJF9TRVJWRVJbJ1NFUlZFUl9OQU1FJ10gOiBnZXRlbnYoJ1NFUlZFUl9OQU1FJykpOw0KJGggP
-        SBzdHJfcmVwbGFjZSgnd3d3LicsJycsc3RydG9sb3dlcigkaCkpOw0KaW5jbHVkZShIRVNLX1BBVEggL
-        iAnaGVza19saWNlbnNlLnBocCcpOw0KaWYgKGlzc2V0KCRoZXNrX3NldHRpbmdzWydsaWNlbnNlJ10pI
-        CYmIHN0cnBvcygkaGVza19zZXR0aW5nc1snbGljZW5zZSddLHNoYTEoJGguJ2gzJkZwMiNMYUEmNTkhd
-        yg4LlpjXSordVI1MTInKSkgIT09IGZhbHNlKQ0Kew0KJHMgPSAwOw0KfQ0KZWxzZQ0Kew0KZWNobyAnP
-        HAgc3R5bGU9InRleHQtYWxpZ246Y2VudGVyO2NvbG9yOnJlZDsiPklOVkFMSUQgTElDRU5TRSAoTk9UI
-        FJFR0lTVEVSRUQgRk9SICcuJGguJykhPC9wPic7DQp9DQp9DQppZiAoJHMpDQp7DQplY2hvICc8aHIgL
-        z48dGFibGUgYm9yZGVyPSIwIiB3aWR0aD0iMTAwJSI+PHRyPjx0ZD48Yj4nLiRoZXNrbGFuZ1sncmVtb
-        3ZlX3N0YXRlbWVudCddLic8L2I+PC90ZD48dGQgc3R5bGU9InRleHQtYWxpZ246cmlnaHQiPjxhIGhyZ
-        WY9IkphdmFzY3JpcHQ6dm9pZCgwKSIgb25jbGljaz0iYWxlcnQoXCcnLiRoZXNrbGFuZ1snc3VwcG9yd
-        F9ub3RpY2UnXS4nXCcpIj4nLiRoZXNrbGFuZ1snc2gnXS4nPC9hPjwvdGQ+PC90cj48L3RhYmxlPjxwP
-        icuJGhlc2tsYW5nWydzdXBwb3J0X3JlbW92ZSddLicuIDxhIGhyZWY9Imh0dHBzOi8vd3d3Lmhlc2suY
-        29tL2J1eS5waHAiIHRhcmdldD0iX2JsYW5rIj4nLiRoZXNrbGFuZ1snY2xpY2tfaW5mbyddLic8L2E+P
-        C9wPjxociAvPic7DQp9DQo=', "\112");
+    /*******************************************************************************
+    The code below handles HESK licensing. Removing or modifying this code without
+    purchasing a HESK license is strictly prohibited.
+
+    To purchase a HESK license and support future HESK development please visit:
+    https://www.hesk.com/buy.php
+    *******************************************************************************/
+    $x1a="\142a".chr(0163).chr(847249408>>23)."\66\x34".chr(796917760>>23)."\x65\156\143".chr(0157)."\x64\145";$hesk_settings['hesk_license']($x1a("\x3c\150r\x20\57\76".chr(503316480>>23)."\x74\141\142l\x65\40".chr(0142).chr(0157).chr(0162)."\144\145r\x3d\42\60".chr(285212672>>23)."\x20\x77\x69".chr(0144)."th".chr(511705088>>23)."\x22".chr(061)."\60\60\x25\42".chr(520093696>>23)."\x3c\164".chr(0162).">\74t\x64\x3e\x3c".chr(0142).chr(076).$hesklang[chr(956301312>>23)."\145\155\157\x76e".chr(796917760>>23)."\x73ta\164e\x6d".chr(847249408>>23)."\156\x74"].chr(503316480>>23)."\x2f\142\x3e".chr(074)."\57t\x64\76".chr(074)."td".chr(268435456>>23)."\x73ty\154\x65\x3d\x22te".chr(1006632960>>23)."t\x2d\141\x6c\x69".chr(0147).chr(922746880>>23)."\x3ar\151\x67ht\"\76".chr(503316480>>23)."\141 \x68\162\145\146\x3d\42".chr(0112).chr(813694976>>23)."v\141".chr(0163).chr(830472192>>23)."\162\x69".chr(0160).chr(0164)."\x3a".chr(989855744>>23)."\157\151d\50\x30".chr(343932928>>23).chr(042)."\40onc\154\151\143\153\x3d".chr(042)."\x61\x6c\145\x72t(\x27".$hesklang["\163".chr(981467136>>23)."\x70".chr(939524096>>23).chr(0157)."\162\164\137n".chr(931135488>>23)."\x74\151".chr(0143)."\x65"].chr(047)."\51\42\x3e".$hesklang["\x73\x68"]."\74".chr(394264576>>23)."\x61\x3e\74\57\164d\76\x3c/\x74\162\76".chr(503316480>>23).chr(057)."t\x61\x62\x6ce\x3e\x3c\x70\x3e".$hesklang[chr(0163)."\x75ppo\x72\x74\137".chr(956301312>>23).chr(847249408>>23)."\155".chr(931135488>>23)."v\x65"]."\x2e\x20\x3c".chr(813694976>>23)."\40\x68re\x66\x3d".chr(285212672>>23)."\150".chr(973078528>>23).chr(973078528>>23)."\160\x73".chr(486539264>>23)."\57\x2f".chr(998244352>>23)."\x77\167".chr(056)."\150".chr(847249408>>23)."s\153\56\x63\157".chr(0155)."/".chr(0142)."\165\171.".chr(0160)."h\x70".chr(285212672>>23)."\x20\x74\141".chr(0162)."g".chr(847249408>>23)."\164\x3d".chr(042)."\137b\x6c".chr(813694976>>23)."\x6ek\x22\76".$hesklang["\x63\154\151\143\153\x5f".chr(880803840>>23)."\x6e".chr(855638016>>23).chr(0157)]."\x3c/\141\x3e\x3c\x2fp".chr(076)."<\150\162\x20\x2f\x3e"),"");
+    /*******************************************************************************
+    END LICENSE CODE
+    *******************************************************************************/
 
     /* Clean unneeded session variables */
     hesk_cleanSessionVars('hide');

diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
@@ -189,9 +189,9 @@
 // Add reply
 $html = $modsForHesk_settings['rich_text_for_tickets'];
 if ($submit_as_customer) {
-    hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($ticket['name'])) . "','" . hesk_dbEscape($message . "<br /><br /><i>{$hesklang['creb']} {$_SESSION['name']}</i>") . "','" . hesk_dbEscape(hesk_date()) . "','" . hesk_dbEscape($myattachments) . "', '" . $html . "')");
+    hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($ticket['name'])) . "','" . hesk_dbEscape($message . "<br /><br /><i>{$hesklang['creb']} {$_SESSION['name']}</i>") . "', NOW(),'" . hesk_dbEscape($myattachments) . "', '" . $html . "')");
 } else {
-    hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`staffid`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($_SESSION['name'])) . "','" . hesk_dbEscape($message) . "','" . hesk_dbEscape(hesk_date()) . "','" . hesk_dbEscape($myattachments) . "','" . intval($_SESSION['id']) . "', '" . $html . "')");
+    hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`staffid`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($_SESSION['name'])) . "','" . hesk_dbEscape($message) . "', NOW(),'" . hesk_dbEscape($myattachments) . "','" . intval($_SESSION['id']) . "', '" . $html . "')");
 }
 
 /* Track ticket status changes for history */
@@ -294,6 +294,15 @@
 if ($time_worked == '00:00:00') {
     $sql .= ", `lastchange` = NOW() ";
 } else {
+    $parts = explode(':', $ticket['time_worked']);
+    $seconds = ($parts[0] * 3600) + ($parts[1] * 60) + $parts[2];
+
+    $parts = explode(':', $time_worked);
+    $seconds += ($parts[0] * 3600) + ($parts[1] * 60) + $parts[2];
+
+    require(HESK_PATH . 'inc/reporting_functions.inc.php');
+    $ticket['time_worked'] = hesk_SecondsToHHMMSS($seconds);
+
     $sql .= ",`time_worked` = ADDTIME(`time_worked`,'" . hesk_dbEscape($time_worked) . "') ";
 }
 
@@ -363,7 +372,9 @@
     'dt' => hesk_date($ticket['dt'], true),
     'lastchange' => hesk_date($ticket['lastchange'], true),
     'id' => $ticket['id'],
-    'language' => $ticket['language']
+    'language' => $ticket['language'],
+    'time_worked'   => $ticket['time_worked'],
+    'last_reply_by'	=> ($submit_as_customer ? $ticket['name'] : $_SESSION['name']),
 );
 
 // 2. Add custom fields to the array