From d47a47fdef825d0ff9e41e0b1f23a79594f79a62 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Thu, 17 Oct 2013 21:59:11 +0000
Subject: [PATCH] Include category name and description in KB search
---
include/client/knowledgebase.inc.php | 5 ++++-
include/staff/faq-categories.inc.php | 10 +++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/client/knowledgebase.inc.php b/include/client/knowledgebase.inc.php
index 4d75bcba5..1d00ca59c 100644
--- a/include/client/knowledgebase.inc.php
+++ b/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';
diff --git a/include/staff/faq-categories.inc.php b/include/staff/faq-categories.inc.php
index 8422d1a43..cf8d79650 100644
--- a/include/staff/faq-categories.inc.php
+++ b/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';
--
GitLab