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

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

See merge request !48

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)) {

index.php

@@ -680,6 +680,7 @@ function print_add_ticket()
                             <div class="col-sm-9">
                         <textarea placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" name="message"
                                   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'])) {
                             echo ' class="isError" ';
                         } ?> data-error="<?php echo htmlspecialchars($hesklang['enter_message']); ?>"

suggest_articles.php

@@ -23,7 +23,7 @@ hesk_load_database_functions();
 header('Content-Type: text/html; charset=' . $hesklang['ENCODING']);
 
 /* 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();