From 4607fcd48115e88ab59dc7bc1414e59fb6bb7752 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 29 Nov 2012 09:10:15 -0500
Subject: [PATCH] - Bugfix: make sure load indicator gets hidden no matter what is selected in Interface Config.
---
interface/web/sites/lib/module.conf.php | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index fdce4de..982cb90 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -25,6 +25,16 @@
'target' => 'content',
'link' => 'sites/web_subdomain_list.php',
'html_id' => 'subdomain_list');
+
+ // read web config
+ $app->uses('getconf');
+ $sys_config = $app->getconf->get_global_config('sites');
+ if($sys_config['vhost_subdomains'] == 'y') {
+$items[] = array( 'title' => "Subdomain (Vhost)",
+ 'target' => 'content',
+ 'link' => 'sites/web_vhost_subdomain_list.php',
+ 'html_id' => 'subdomain_list');
+ }
}
if($app->auth->get_client_limit($userid,'web_aliasdomain') != 0)
@@ -52,15 +62,12 @@
'link' => 'sites/database_list.php',
'html_id' => 'database_list');
-/*
-Database User (for future development)
$items[] = array( 'title' => "Database User",
'target' => 'content',
'link' => 'sites/database_user_list.php',
'html_id' => 'database_user_list'
);
-*/
$module["nav"][] = array( 'title' => 'Database',
'open' => 1,
@@ -101,6 +108,8 @@
// CMD menu
+if($app->auth->get_client_limit($userid,'shell_user') != 0 OR $app->auth->get_client_limit($userid,'cron') != 0)
+{
$items=array();
if($app->auth->get_client_limit($userid,'shell_user') != 0)
@@ -120,7 +129,7 @@
$module["nav"][] = array( 'title' => 'Command Line',
'open' => 1,
'items' => $items);
-
+}
// APS menu
$items = array();
--
Gitblit v1.9.1