Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '463-suggest-kb-rich-text' into '3-0-4'

Browse Source 
Fixes #463 Support suggested KB articles when rich text is enabled

See merge request !48
This commit is contained in:
Mike Koch 2017-03-29 01:22:22 +00:00
commit 60c5be549c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hesk_javascript.js
View File

@ -168,6 +168,11 @@ function hesk_suggestKB() {
var d = document.form1; var d = document.form1;
var s = d.subject.value; var s = d.subject.value;
var m = d.message.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'); var element = document.getElementById('kb_suggestions');
if (s != '' && m != '' && (heskKBquery != s + " " + m || heskKBfailed == true)) { if (s != '' && m != '' && (heskKBquery != s + " " + m || heskKBfailed == true)) {

1
index.php
View File

@ -680,6 +680,7 @@ function print_add_ticket()
<div class="col-sm-9"> <div class="col-sm-9">
<textarea placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" name="message" <textarea placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" name="message"
id="message" class="form-control htmlEditor" rows="12" id="message" class="form-control htmlEditor" rows="12"
data-rich-text-enabled="<?php echo $modsForHesk_settings['rich_text_for_tickets_for_customers']; ?>"
cols="60" <?php if (in_array('message', $_SESSION['iserror'])) { cols="60" <?php if (in_array('message', $_SESSION['iserror'])) {
echo ' class="isError" '; echo ' class="isError" ';
} ?> data-error="<?php echo htmlspecialchars($hesklang['enter_message']); ?>" } ?> data-error="<?php echo htmlspecialchars($hesklang['enter_message']); ?>"

2
suggest_articles.php
View File

@ -23,7 +23,7 @@ hesk_load_database_functions();
header('Content-Type: text/html; charset=' . $hesklang['ENCODING']); header('Content-Type: text/html; charset=' . $hesklang['ENCODING']);
/* Get the search query composed of the subject and message */ /* Get the search query composed of the subject and message */
$query = hesk_REQUEST('q') or die(''); $query = strip_tags(html_entity_decode(hesk_REQUEST('q'))) or die('');
hesk_dbConnect(); hesk_dbConnect();