From 0a8f0e4ece06642808c1b52d7ea9c4af3ea356a1 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 22 Oct 2012 07:18:05 -0400
Subject: [PATCH] Fixed: FS#2362 - client_id from remoting.inc.php functions is ignored
---
interface/web/sites/lib/module.conf.php | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index aa0cb67..982cb90 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -21,13 +21,20 @@
if($app->auth->get_client_limit($userid,'web_subdomain') != 0)
{
+$items[] = array( 'title' => "Subdomain",
+ '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');
-$items[] = array( 'title' => "Subdomain",
+ if($sys_config['vhost_subdomains'] == 'y') {
+$items[] = array( 'title' => "Subdomain (Vhost)",
'target' => 'content',
- 'link' => 'sites/' . ($sys_config['vhost_subdomains'] == 'y' ? 'web_vhost_subdomain_list.php' : 'web_subdomain_list.php'),
+ 'link' => 'sites/web_vhost_subdomain_list.php',
'html_id' => 'subdomain_list');
+ }
}
if($app->auth->get_client_limit($userid,'web_aliasdomain') != 0)
@@ -55,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,
@@ -104,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)
@@ -123,7 +129,7 @@
$module["nav"][] = array( 'title' => 'Command Line',
'open' => 1,
'items' => $items);
-
+}
// APS menu
$items = array();
--
Gitblit v1.9.1