From 0efb2250f3f6fc3d0f508449a506819863bdc411 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 17 Apr 2015 16:27:08 -0400 Subject: [PATCH] #216 Starting on fixing the knowledgebase --- inc/knowledgebase_functions.inc.php | 253 +++++++++++++--------------- language/en/text.php | 4 + 2 files changed, 123 insertions(+), 134 deletions(-) diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php index 83669206..0443bf2d 100644 --- a/inc/knowledgebase_functions.inc.php +++ b/inc/knowledgebase_functions.inc.php @@ -90,78 +90,70 @@ function hesk_kbTopArticles($how_many, $index = 1) } ?> - -

-
- - - - - ' . $hesklang['views'] . ''; - } - ?> - - -
- - +
+

+
+ + + + + '.$hesklang['noa'].'
 

'; - return true; - } - - /* We have some results, print them out */ - ?> -
-
 
- - - - '; - } - ?> - -
- - - - - '; - - if ($hesk_settings['kb_views']) - { - echo ''; - } - - echo ' - -
 ' . $article['subject'] . '' . $article['views'] . '
-
+ /* Show number of views? */ + if ($hesk_settings['kb_views'] && hesk_dbNumRows($res) != 0) + { + echo '' . $hesklang['views'] . ''; + } + ?> + + + + '.$hesklang['noa'].''; + return true; + } + + /* We have some results, print them out */ + $colspan = ''; + if (!$hesk_settings['kb_views']) { + $colspan = 'colspan="2"'; + } + while ($article = hesk_dbFetchAssoc($res)) + { + echo ' + + + '.$article['subject'].' + + '; + if ($hesk_settings['kb_views']) { + echo ''.$article['views'].''; + } + echo ''; + } + ?> + + -
-

-
- - - - ' . $hesklang['dta'] . ''; - } - ?> - - -
- - +
+

+
+ + + +  '; + if ($hesk_settings['kb_date']) + { + echo ''; + } + } + ?> + + + + '.$hesklang['noa'].'
 

'; - return true; - } - - /* We have some results, print them out */ - ?> -
-
' . $hesklang['dta'] . '
- - - - '; - } - ?> - -
- - - - - '; - - if ($hesk_settings['kb_date']) - { - echo ''; - } - - echo ' - -
 ' . $article['subject'] . '' . hesk_date($article['dt'], true) . '
-
+ /* If no results found end here */ + if (hesk_dbNumRows($res) == 0) + { + $colspan = ''; + if ($hesk_settings['kb_date']) { + $colspan = 'colspan="2"'; + } + echo ''.$hesklang['noa'].''; + return true; + } + + /* We have some results, print them out */ + $colspan = $hesk_settings['kb_date'] ? '' : 'colspan="2"'; + while ($article = hesk_dbFetchAssoc($res)) + { + echo ' + + + '.$article['subject'].' + '; + if ($hesk_settings['kb_date']) { + echo '' . hesk_date($article['dt'], true) . ''; + } + echo ''; + } ?> - -   - +