From 2c117f14cb5ebb65e955b80af7ad606a24ac3c87 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Sat, 20 Nov 2021 10:45:31 +0000 Subject: [PATCH] HESK v3.2.4 --- hesk/admin/admin_main.php | 2 +- hesk/admin/admin_reply_ticket.php | 3 +- hesk/admin/admin_settings_general.php | 4 +- hesk/admin/admin_settings_save.php | 5 +- hesk/admin/admin_submit_ticket.php | 3 +- hesk/admin/admin_ticket.php | 25 +- hesk/admin/custom_statuses.php | 3 +- hesk/admin/edit_post.php | 7 +- hesk/admin/email_templates.php | 4 +- hesk/admin/export.php | 2 +- hesk/admin/find_tickets.php | 1 + hesk/admin/mail.php | 7 +- hesk/admin/manage_canned.php | 46 +- hesk/admin/manage_users.php | 4 +- hesk/admin/new_ticket.php | 157 +- hesk/cron/email_overdue_tickets.php | 5 +- hesk/css/app.css | 205 +- hesk/css/app.min.css | 2 +- hesk/docs/changelog.html | 43 +- hesk/docs/index.html | 2 +- hesk/docs/quick-guide.html | 2 +- hesk/docs/step-by-step-guide.html | 2 +- hesk/hesk_settings.inc.php | 5 +- hesk/inc/admin_functions.inc.php | 9 +- hesk/inc/admin_settings_demo.inc.php | 1 + hesk/inc/admin_settings_status.inc.php | 26 +- hesk/inc/common.inc.php | 7 +- hesk/inc/database.inc.php | 9 +- hesk/inc/database_mysqli.inc.php | 9 +- hesk/inc/email_functions.inc.php | 52 +- hesk/inc/header.inc.php | 4 +- hesk/inc/mail/smtp.php | 17 +- hesk/inc/pipe_functions.inc.php | 5 +- hesk/inc/posting_functions.inc.php | 13 + hesk/inc/setup_functions.inc.php | 6 +- hesk/inc/show_admin_nav.inc.php | 6 +- hesk/inc/ticket_list.inc.php | 10 +- .../tiny_mce/5.6.2/icons/default/icons.min.js | 1 - .../5.6.2/plugins/advlist/plugin.min.js | 9 - .../5.6.2/plugins/anchor/plugin.min.js | 9 - .../5.6.2/plugins/autolink/plugin.min.js | 9 - .../5.6.2/plugins/autoresize/plugin.min.js | 9 - .../5.6.2/plugins/autosave/plugin.min.js | 9 - .../5.6.2/plugins/bbcode/plugin.min.js | 9 - .../5.6.2/plugins/charmap/plugin.min.js | 9 - .../tiny_mce/5.6.2/plugins/code/plugin.min.js | 9 - .../5.6.2/plugins/codesample/plugin.min.js | 9 - .../plugins/directionality/plugin.min.js | 9 - .../5.6.2/plugins/emoticons/js/emojiimages.js | 9424 ----------------- .../plugins/emoticons/js/emojiimages.min.js | 3 - .../5.6.2/plugins/emoticons/js/emojis.min.js | 2 - .../5.6.2/plugins/emoticons/plugin.min.js | 9 - .../5.6.2/plugins/fullpage/plugin.min.js | 9 - .../5.6.2/plugins/fullscreen/plugin.min.js | 9 - .../tiny_mce/5.6.2/plugins/help/plugin.min.js | 9 - .../tiny_mce/5.6.2/plugins/hr/plugin.min.js | 9 - .../5.6.2/plugins/image/plugin.min.js | 9 - .../5.6.2/plugins/imagetools/plugin.min.js | 9 - .../5.6.2/plugins/importcss/plugin.min.js | 9 - .../plugins/insertdatetime/plugin.min.js | 9 - .../5.6.2/plugins/legacyoutput/plugin.min.js | 9 - .../tiny_mce/5.6.2/plugins/link/plugin.min.js | 9 - .../5.6.2/plugins/lists/plugin.min.js | 9 - .../5.6.2/plugins/media/plugin.min.js | 9 - .../5.6.2/plugins/nonbreaking/plugin.min.js | 9 - .../5.6.2/plugins/noneditable/plugin.min.js | 9 - .../5.6.2/plugins/pagebreak/plugin.min.js | 9 - .../5.6.2/plugins/paste/plugin.min.js | 9 - .../5.6.2/plugins/preview/plugin.min.js | 9 - .../5.6.2/plugins/print/plugin.min.js | 9 - .../5.6.2/plugins/quickbars/plugin.min.js | 9 - .../tiny_mce/5.6.2/plugins/save/plugin.min.js | 9 - .../5.6.2/plugins/searchreplace/plugin.min.js | 9 - .../5.6.2/plugins/spellchecker/plugin.min.js | 9 - .../5.6.2/plugins/tabfocus/plugin.min.js | 9 - .../5.6.2/plugins/table/plugin.min.js | 9 - .../5.6.2/plugins/template/plugin.min.js | 9 - .../5.6.2/plugins/textpattern/plugin.min.js | 9 - .../tiny_mce/5.6.2/plugins/toc/plugin.min.js | 9 - .../5.6.2/plugins/visualblocks/plugin.min.js | 9 - .../5.6.2/plugins/visualchars/plugin.min.js | 9 - .../5.6.2/plugins/wordcount/plugin.min.js | 9 - .../ui/oxide-dark/content.inline.min.css | 7 - .../5.6.2/skins/ui/oxide-dark/content.min.css | 7 - .../5.6.2/skins/ui/oxide-dark/skin.min.css | 7 - .../skins/ui/oxide/content.inline.min.css | 7 - .../5.6.2/skins/ui/oxide/content.min.css | 7 - .../5.6.2/skins/ui/oxide/skin.min.css | 7 - .../tiny_mce/5.6.2/themes/mobile/theme.min.js | 9 - .../tiny_mce/5.6.2/themes/silver/theme.min.js | 9 - hesk/inc/tiny_mce/5.6.2/tinymce.min.js | 9 - .../tiny_mce/5.9.2/icons/default/icons.min.js | 1 + .../{5.6.2 => 5.9.2}/jquery.tinymce.min.js | 81 +- .../langs/readme.md => 5.9.2/langs/README.md} | 0 .../inc/tiny_mce/{5.6.2 => 5.9.2}/license.txt | 0 .../5.9.2/plugins/advlist/plugin.min.js | 9 + .../5.9.2/plugins/anchor/plugin.min.js | 9 + .../5.9.2/plugins/autolink/plugin.min.js | 9 + .../5.9.2/plugins/autoresize/plugin.min.js | 9 + .../5.9.2/plugins/autosave/plugin.min.js | 9 + .../5.9.2/plugins/bbcode/plugin.min.js | 9 + .../5.9.2/plugins/charmap/plugin.min.js | 9 + .../tiny_mce/5.9.2/plugins/code/plugin.min.js | 9 + .../5.9.2/plugins/codesample/plugin.min.js | 9 + .../plugins/colorpicker/plugin.min.js | 2 +- .../plugins/contextmenu/plugin.min.js | 2 +- .../plugins/directionality/plugin.min.js | 9 + .../5.9.2/plugins/emoticons/js/emojiimages.js | 9424 +++++++++++++++++ .../plugins/emoticons/js/emojiimages.min.js | 3 + .../plugins/emoticons/js/emojis.js | 3144 +++--- .../5.9.2/plugins/emoticons/js/emojis.min.js | 2 + .../5.9.2/plugins/emoticons/plugin.min.js | 9 + .../5.9.2/plugins/fullpage/plugin.min.js | 9 + .../5.9.2/plugins/fullscreen/plugin.min.js | 9 + .../tiny_mce/5.9.2/plugins/help/plugin.min.js | 9 + .../tiny_mce/5.9.2/plugins/hr/plugin.min.js | 9 + .../5.9.2/plugins/image/plugin.min.js | 9 + .../5.9.2/plugins/imagetools/plugin.min.js | 9 + .../5.9.2/plugins/importcss/plugin.min.js | 9 + .../plugins/insertdatetime/plugin.min.js | 9 + .../5.9.2/plugins/legacyoutput/plugin.min.js | 9 + .../tiny_mce/5.9.2/plugins/link/plugin.min.js | 9 + .../5.9.2/plugins/lists/plugin.min.js | 9 + .../5.9.2/plugins/media/plugin.min.js | 9 + .../5.9.2/plugins/nonbreaking/plugin.min.js | 9 + .../5.9.2/plugins/noneditable/plugin.min.js | 9 + .../5.9.2/plugins/pagebreak/plugin.min.js | 9 + .../5.9.2/plugins/paste/plugin.min.js | 9 + .../5.9.2/plugins/preview/plugin.min.js | 9 + .../5.9.2/plugins/print/plugin.min.js | 9 + .../5.9.2/plugins/quickbars/plugin.min.js | 9 + .../tiny_mce/5.9.2/plugins/save/plugin.min.js | 9 + .../5.9.2/plugins/searchreplace/plugin.min.js | 9 + .../5.9.2/plugins/spellchecker/plugin.min.js | 9 + .../5.9.2/plugins/tabfocus/plugin.min.js | 9 + .../5.9.2/plugins/table/plugin.min.js | 9 + .../5.9.2/plugins/template/plugin.min.js | 9 + .../plugins/textcolor/plugin.min.js | 2 +- .../5.9.2/plugins/textpattern/plugin.min.js | 9 + .../tiny_mce/5.9.2/plugins/toc/plugin.min.js | 9 + .../5.9.2/plugins/visualblocks/plugin.min.js | 9 + .../5.9.2/plugins/visualchars/plugin.min.js | 9 + .../5.9.2/plugins/wordcount/plugin.min.js | 9 + .../skins/content/dark/content.min.css | 0 .../skins/content/default/content.min.css | 0 .../skins/content/document/content.min.css | 0 .../skins/content/writer/content.min.css | 0 .../ui/oxide-dark/content.inline.min.css | 7 + .../5.9.2/skins/ui/oxide-dark/content.min.css | 7 + .../ui/oxide-dark/content.mobile.min.css | 0 .../ui/oxide-dark/fonts/tinymce-mobile.woff | Bin .../5.9.2/skins/ui/oxide-dark/skin.min.css | 7 + .../skins/ui/oxide-dark/skin.mobile.min.css | 0 .../ui/oxide-dark}/skin.shadowdom.min.css | 2 +- .../skins/ui/oxide/content.inline.min.css | 7 + .../5.9.2/skins/ui/oxide/content.min.css | 7 + .../skins/ui/oxide/content.mobile.min.css | 0 .../skins/ui/oxide/fonts/tinymce-mobile.woff | Bin .../5.9.2/skins/ui/oxide/skin.min.css | 7 + .../skins/ui/oxide/skin.mobile.min.css | 0 .../skins/ui/oxide}/skin.shadowdom.min.css | 2 +- .../tiny_mce/5.9.2/themes/mobile/theme.min.js | 9 + .../tiny_mce/5.9.2/themes/silver/theme.min.js | 9 + .../tiny_mce/{5.6.2 => 5.9.2}/tinymce.d.ts | 1128 +- hesk/inc/tiny_mce/5.9.2/tinymce.min.js | 9 + hesk/inc/tiny_mce/tinymce.inc.php | 2 +- hesk/index.php | 16 +- hesk/install/install.php | 5 +- hesk/install/install_functions.inc.php | 12 +- hesk/install/update.php | 24 +- hesk/js/hesk_javascript.js | 32 +- hesk/js/hesk_javascript.min.js | 105 +- .../customer/create-ticket/create-ticket.php | 32 +- hesk/theme/hesk3/customer/css/app.css | 40 +- hesk/theme/hesk3/customer/css/app.min.css | 2 +- hesk/theme/hesk3/customer/error.php | 2 +- .../hesk3/customer/util/custom-fields.php | 2 +- hesk/theme/hesk3/customer/util/kb-search.php | 32 +- .../customer/view-ticket/view-ticket.php | 30 +- hesk/theme/hesk3/print-ticket.php | 6 +- 180 files changed, 12764 insertions(+), 12390 deletions(-) delete mode 100644 hesk/inc/tiny_mce/5.6.2/icons/default/icons.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/advlist/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/anchor/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/autolink/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/autoresize/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/autosave/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/bbcode/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/charmap/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/code/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/codesample/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/directionality/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/emoticons/js/emojiimages.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/emoticons/js/emojiimages.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/emoticons/js/emojis.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/emoticons/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/fullpage/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/fullscreen/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/help/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/hr/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/image/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/imagetools/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/importcss/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/insertdatetime/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/legacyoutput/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/link/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/lists/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/media/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/nonbreaking/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/noneditable/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/pagebreak/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/paste/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/preview/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/print/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/quickbars/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/save/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/searchreplace/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/spellchecker/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/tabfocus/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/table/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/template/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/textpattern/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/toc/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/visualblocks/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/visualchars/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/plugins/wordcount/plugin.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/skins/ui/oxide-dark/content.inline.min.css delete mode 100644 hesk/inc/tiny_mce/5.6.2/skins/ui/oxide-dark/content.min.css delete mode 100644 hesk/inc/tiny_mce/5.6.2/skins/ui/oxide-dark/skin.min.css delete mode 100644 hesk/inc/tiny_mce/5.6.2/skins/ui/oxide/content.inline.min.css delete mode 100644 hesk/inc/tiny_mce/5.6.2/skins/ui/oxide/content.min.css delete mode 100644 hesk/inc/tiny_mce/5.6.2/skins/ui/oxide/skin.min.css delete mode 100644 hesk/inc/tiny_mce/5.6.2/themes/mobile/theme.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/themes/silver/theme.min.js delete mode 100644 hesk/inc/tiny_mce/5.6.2/tinymce.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/icons/default/icons.min.js rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/jquery.tinymce.min.js (63%) rename hesk/inc/tiny_mce/{5.6.2/langs/readme.md => 5.9.2/langs/README.md} (100%) rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/license.txt (100%) create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/advlist/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/anchor/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/autolink/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/autoresize/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/autosave/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/bbcode/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/charmap/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/code/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/codesample/plugin.min.js rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/plugins/colorpicker/plugin.min.js (93%) rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/plugins/contextmenu/plugin.min.js (93%) create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/directionality/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/emoticons/js/emojiimages.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/emoticons/js/emojiimages.min.js rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/plugins/emoticons/js/emojis.js (81%) create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/emoticons/js/emojis.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/emoticons/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/fullpage/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/fullscreen/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/help/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/hr/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/image/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/imagetools/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/importcss/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/insertdatetime/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/legacyoutput/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/link/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/lists/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/media/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/nonbreaking/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/noneditable/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/pagebreak/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/paste/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/preview/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/print/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/quickbars/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/save/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/searchreplace/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/spellchecker/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/tabfocus/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/table/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/template/plugin.min.js rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/plugins/textcolor/plugin.min.js (93%) create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/textpattern/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/toc/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/visualblocks/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/visualchars/plugin.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/plugins/wordcount/plugin.min.js rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/content/dark/content.min.css (100%) rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/content/default/content.min.css (100%) rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/content/document/content.min.css (100%) rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/content/writer/content.min.css (100%) create mode 100644 hesk/inc/tiny_mce/5.9.2/skins/ui/oxide-dark/content.inline.min.css create mode 100644 hesk/inc/tiny_mce/5.9.2/skins/ui/oxide-dark/content.min.css rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/ui/oxide-dark/content.mobile.min.css (100%) rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/ui/oxide-dark/fonts/tinymce-mobile.woff (100%) create mode 100644 hesk/inc/tiny_mce/5.9.2/skins/ui/oxide-dark/skin.min.css rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/ui/oxide-dark/skin.mobile.min.css (100%) rename hesk/inc/tiny_mce/{5.6.2/skins/ui/oxide => 5.9.2/skins/ui/oxide-dark}/skin.shadowdom.min.css (74%) create mode 100644 hesk/inc/tiny_mce/5.9.2/skins/ui/oxide/content.inline.min.css create mode 100644 hesk/inc/tiny_mce/5.9.2/skins/ui/oxide/content.min.css rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/ui/oxide/content.mobile.min.css (100%) rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/ui/oxide/fonts/tinymce-mobile.woff (100%) create mode 100644 hesk/inc/tiny_mce/5.9.2/skins/ui/oxide/skin.min.css rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/skins/ui/oxide/skin.mobile.min.css (100%) rename hesk/inc/tiny_mce/{5.6.2/skins/ui/oxide-dark => 5.9.2/skins/ui/oxide}/skin.shadowdom.min.css (74%) create mode 100644 hesk/inc/tiny_mce/5.9.2/themes/mobile/theme.min.js create mode 100644 hesk/inc/tiny_mce/5.9.2/themes/silver/theme.min.js rename hesk/inc/tiny_mce/{5.6.2 => 5.9.2}/tinymce.d.ts (77%) create mode 100644 hesk/inc/tiny_mce/5.9.2/tinymce.min.js diff --git a/hesk/admin/admin_main.php b/hesk/admin/admin_main.php index 32a37cb..2af6364 100644 --- a/hesk/admin/admin_main.php +++ b/hesk/admin/admin_main.php @@ -57,7 +57,7 @@ if (hesk_checkPermission('can_view_tickets',0)) $_SESSION['default_list'] = ''; } /* Get default settings */ - else + elseif (empty($_GET)) { parse_str($_SESSION['default_list'],$defaults); $_GET = isset($_GET) && is_array($_GET) ? array_merge($_GET, $defaults) : $defaults; diff --git a/hesk/admin/admin_reply_ticket.php b/hesk/admin/admin_reply_ticket.php index 18b0e93..3bc4037 100644 --- a/hesk/admin/admin_reply_ticket.php +++ b/hesk/admin/admin_reply_ticket.php @@ -105,8 +105,9 @@ if (strlen($message)) $message = convert_html_to_text($message_html); $message = fix_newlines($message); - // Re-encode the message + // Prepare plain message for storage as HTML $message = hesk_htmlspecialchars($message); + // nl2br done after adding signature } elseif ($hesk_settings['staff_ticket_formatting'] == 0) { $message_html = hesk_makeURL($message_html); $message_html = nl2br($message_html); diff --git a/hesk/admin/admin_settings_general.php b/hesk/admin/admin_settings_general.php index 636d17c..814b158 100644 --- a/hesk/admin/admin_settings_general.php +++ b/hesk/admin/admin_settings_general.php @@ -349,7 +349,7 @@ hesk_handle_messages(); - +
- +