From 2b3f112874ad7ec2bc4da52cd51e80b039d9706d Mon Sep 17 00:00:00 2001
From: root <root@akxnet.de>
Date: Thu, 13 Feb 2014 07:31:51 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/sites/lib/module.conf.php | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index 7bb6f8e..0a61e06 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -15,7 +15,7 @@
{
$items[] = array( 'title' => "Website",
'target' => 'content',
- 'link' => 'sites/web_domain_list.php',
+ 'link' => 'sites/web_vhost_domain_list.php?type=domain',
'html_id' => 'domain_list');
}
@@ -23,8 +23,8 @@
{
$items[] = array( 'title' => "Subdomain",
'target' => 'content',
- 'link' => 'sites/web_subdomain_list.php',
- 'html_id' => 'subdomain_list');
+ 'link' => 'sites/web_childdomain_list.php?type=subdomain',
+ 'html_id' => 'childdomain_list');
// read web config
$app->uses('getconf');
@@ -32,8 +32,8 @@
if($sys_config['vhost_subdomains'] == 'y') {
$items[] = array( 'title' => "Subdomain (Vhost)",
'target' => 'content',
- 'link' => 'sites/web_vhost_subdomain_list.php',
- 'html_id' => 'subdomain_list');
+ 'link' => 'sites/web_vhost_domain_list.php?type=subdomain',
+ 'html_id' => 'childdomain_list');
}
}
@@ -41,8 +41,18 @@
{
$items[] = array( 'title' => "Aliasdomain",
'target' => 'content',
- 'link' => 'sites/web_aliasdomain_list.php',
- 'html_id' => 'aliasdomain_list');
+ 'link' => 'sites/web_childdomain_list.php?type=aliasdomain',
+ 'html_id' => 'childdomain_list');
+
+ // read web config
+ $app->uses('getconf');
+ $sys_config = $app->getconf->get_global_config('sites');
+ if($sys_config['vhost_aliasdomains'] == 'y') {
+ $items[] = array( 'title' => "Aliasdomain (Vhost)",
+ 'target' => 'content',
+ 'link' => 'sites/web_vhost_domain_list.php?type=aliasdomain',
+ 'html_id' => 'childdomain_list');
+ }
}
if(count($items))
--
Gitblit v1.9.1