Merge pull request #781 from protich/issue/kb_category_search

Include category when searching the knowledge base 

Reviewed-By: Jared Hancock <jared@osticket.com>

include/client/knowledgebase.inc.php

@@ -72,7 +72,10 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
     if($_REQUEST['q']) {
         $sql.=" AND (question LIKE ('%".db_input($_REQUEST['q'],false)."%')
                  OR answer LIKE ('%".db_input($_REQUEST['q'],false)."%')
-                 OR keywords LIKE ('%".db_input($_REQUEST['q'],false)."%'))";
+                 OR keywords LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 OR cat.name LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 OR cat.description LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 )";
     }
 
     $sql.=' GROUP BY faq.faq_id';

include/staff/faq-categories.inc.php

@@ -56,6 +56,7 @@ if(!defined('OSTSTAFFINC') || !$thisstaff) die('Access Denied');
 if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
     $sql='SELECT faq.faq_id, question, ispublished, count(attach.file_id) as attachments, count(ft.topic_id) as topics '
         .' FROM '.FAQ_TABLE.' faq '
+        .' LEFT JOIN '.FAQ_CATEGORY.' cat ON(cat.category_id=faq.category_id) '
         .' LEFT JOIN '.FAQ_TOPIC_TABLE.' ft ON(ft.faq_id=faq.faq_id) '
         .' LEFT JOIN '.FAQ_ATTACHMENT_TABLE.' attach ON(attach.faq_id=faq.faq_id) '
         .' WHERE 1 ';
@@ -67,9 +68,12 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
         $sql.=' AND ft.topic_id='.db_input($_REQUEST['topicId']);
 
     if($_REQUEST['q']) {
-        $sql.=" AND question LIKE ('%".db_input($_REQUEST['q'],false)."%') 
-                 OR answer LIKE ('%".db_input($_REQUEST['q'],false)."%') 
-                 OR keywords LIKE ('%".db_input($_REQUEST['q'],false)."%') ";
+        $sql.=" AND (question LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 OR answer LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 OR keywords LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 OR cat.name LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 OR cat.description LIKE ('%".db_input($_REQUEST['q'],false)."%')
+                 )";
     }
 
     $sql.=' GROUP BY faq.faq_id';