From 6d826cf032b50b42dc56caf6998db5bd6b3f1bd5 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 12 Oct 2011 07:16:14 -0400
Subject: [PATCH] - Fixed #1799.
---
interface/web/help/lib/module.conf.php | 25 +++++++++++++++++--------
interface/web/help/version.php | 6 ++++--
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/interface/web/help/lib/module.conf.php b/interface/web/help/lib/module.conf.php
index 06144a1..b99280e 100644
--- a/interface/web/help/lib/module.conf.php
+++ b/interface/web/help/lib/module.conf.php
@@ -10,10 +10,15 @@
$module['template'] = 'module.tpl.htm';
//* The page that is displayed when the module is loaded. the path must is relative to the web directory
-if(isset($_GET['go2_faq_sections_list']))
+if(isset($_GET['go2_faq_sections_list'])){
$module['startpage'] = 'help/faq_sections_list.php';
-else
- $module['startpage'] = 'help/version.php';
+} else {
+ if($_SESSION['s']['user']['typ'] == 'admin') {
+ $module['startpage'] = 'help/version.php';
+ } else {
+ $module['startpage'] = 'help/support_message_list.php';
+ }
+}
//* The width of the tab. Normally you should leave this empty and let the browser define the width automatically.
$module['tab_width'] = '';
@@ -52,24 +57,28 @@
$itemsfaq[] = array( 'title' => 'Manage Sections',
'target' => 'content',
'link' => 'help/faq_sections_list.php');
+
+ $module['nav'][] = array( 'title' => 'FAQ',
+ 'open' => 1,
+ 'items' => $itemsfaq);
}
else
{ //* the user
$sql = "SELECT * FROM help_faq_sections";
$res = $app->db->queryAllRecords($sql);
//* all the content sections
- if(is_array($res)) {
+ if(is_array($res) && !empty($res)) {
foreach($res as $v) {
$itemsfaq[] = array( 'title' => $v['hfs_name'],
'target' => 'content',
'link' => 'help/faq_list.php?hfs_id='.$v['hfs_id']);
}
+ // Display 'FAQ' menu only if there are sections
+ $module['nav'][] = array( 'title' => 'FAQ',
+ 'open' => 1,
+ 'items' => $itemsfaq);
}
}
-
-$module['nav'][] = array( 'title' => 'FAQ',
- 'open' => 1,
- 'items' => $itemsfaq);
//* -- end of the FAQ menu section
diff --git a/interface/web/help/version.php b/interface/web/help/version.php
index e53143c..dc0577e 100644
--- a/interface/web/help/version.php
+++ b/interface/web/help/version.php
@@ -43,8 +43,10 @@
require_once('../../lib/app.inc.php');
//* Check permissions for module
-$app->auth->check_module_permissions('admin');
+$app->auth->check_module_permissions('help');
-echo '<p> </p><p> </p><p class="frmTextHead" style="text-align:center;">'.$app->lng('ISPConfig Version:').' '.ISPC_APP_VERSION.'</p>';
+if($_SESSION['s']['user']['typ'] == 'admin') {
+ echo '<p> </p><p> </p><p class="frmTextHead" style="text-align:center;">'.$app->lng('ISPConfig Version:').' '.ISPC_APP_VERSION.'</p>';
+}
?>
\ No newline at end of file
--
Gitblit v1.9.1