@ -113,6 +113,7 @@ function hesk_kb_header($kb_link, $catid=1)
global $hesk_settings, $hesklang, $can_man_kb;
/* Print admin navigation */
require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?>
@ -152,8 +153,6 @@ function hesk_kb_search($query)
define('HESK_NO_ROBOTS',1);
/* Print header */
require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
hesk_kb_header($hesk_settings['kb_link']);
$res = hesk_dbQuery('SELECT t1.`id`, t1.`subject`, LEFT(`t1`.`content`, '.max(200, $hesk_settings['kb_substrart'] * 2).') AS `content`, t1.`rating` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'kb_articles` AS t1 LEFT JOIN `'.hesk_dbEscape($hesk_settings['db_pfix']).'kb_categories` AS t2 ON t1.`catid` = t2.`id` '." WHERE t1.`type` IN ('0','1') AND MATCH(`subject`,`content`,`keywords`) AGAINST ('".hesk_dbEscape($query)."') LIMIT ".intval($hesk_settings['kb_search_limit']));
@ -232,7 +231,6 @@ function hesk_show_kb_article($artid)
// Print header
$hesk_settings['tmp_title'] = $article['subject'];
require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
hesk_kb_header($hesk_settings['kb_link'], $article['catid']);
// Update views by 1
@ -258,10 +256,22 @@ function hesk_show_kb_article($artid)
echo '< / p > ';
}
// TODO Check how this looks
// Related articles
if ($hesk_settings['kb_related'])
if ($article['catid']==1)
{
$link = 'knowledgebase_private.php';
}
else
{
$link = 'knowledgebase_private.php?category='.$article['catid'];
}
?>
< br > < br >
< div class = "row" >
<?php
$showRelated = false;
$column = 'col-md-12';
require(HESK_PATH . 'inc/mail/email_parser.php');
$query = hesk_dbEscape( $article['subject'] . ' ' . convert_html_to_text($article['content']) );
@ -292,28 +302,12 @@ function hesk_show_kb_article($artid)
}
// Print related articles if we have any valid matches
if ( count($related_articles) )
{
echo '< fieldset > < legend > '.$hesklang['relart'].'< / legend > ';
foreach ($related_articles as $id => $subject)
{
echo '< img src = "'.HESK_PATH.'img/article_text.png" width = "16" height = "16" border = "0" alt = "" style = "vertical-align:middle;padding:2px;" / > < a href = "knowledgebase_private.php?article='.$id.'" > '.$subject.'< / a > < br / > ';
}
echo '< / fieldset > ';
}
}
if ($article['catid']==1)
{
$link = 'knowledgebase_private.php';
}
else
{
$link = 'knowledgebase_private.php?category='.$article['catid'];
if ( count($related_articles) ) {
$column = 'col-md-6';
$showRelated = true;
}
?>
< br > < br >
< div class = " <?php echo $column ; ?> col-sm-12" >
< h4 > <?php echo $hesklang [ 'ad' ]; ?> </ h4 >
< div class = "footerWithBorder blankSpace" > < / div >
< table border = "0" >
@ -334,6 +328,21 @@ function hesk_show_kb_article($artid)
< td > <?php echo ( isset ( $_GET [ 'rated' ]) ? $article [ 'views' ] : $article [ 'views' ] + 1 ); ?> </ td >
< / tr >
< / table >
< / div >
<?php if ( $showRelated ) { ?>
< div class = "col-md-6 col-sm-12" >
< h4 > <?php echo $hesklang [ 'relart' ]; ?> </ h4 >
< div class = "footerWithBorder blankSpace" > < / div >
<?php
// Related articles
foreach ($related_articles as $id => $subject)
{
echo '< span class = "glyphicon glyphicon-file" style = "font-size: 16px;" > < / span > < a href = "knowledgebase_private.php?article='.$id.'" > '.$subject.'< / a > < br / > ';
}
?>
< / div >
<?php } ?>
< / div >
<?php
if (!isset($_GET['back']))
@ -358,7 +367,6 @@ function hesk_show_kb_category($catid, $is_search = 0) {
if ($is_search == 0)
{
/* Print header */
require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
hesk_kb_header($hesk_settings['kb_link'], $catid);
if ($catid == 1)