From e60d4c7e35e5dd3a5f4fb1d5b3a25345b6275146 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 24 Jan 2014 06:41:38 -0500
Subject: [PATCH] Merge remote-tracking branch 'renky/vhostalias'
---
interface/web/sites/lib/module.conf.php | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index c79f3ee..02478fc 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -24,7 +24,7 @@
$items[] = array( 'title' => "Subdomain",
'target' => 'content',
'link' => 'sites/web_childdomain_list.php?type=subdomain',
- 'html_id' => 'subdomain_list');
+ 'html_id' => 'childdomain_list');
// read web config
$app->uses('getconf');
@@ -33,7 +33,7 @@
$items[] = array( 'title' => "Subdomain (Vhost)",
'target' => 'content',
'link' => 'sites/web_vhost_subdomain_list.php',
- 'html_id' => 'subdomain_list');
+ 'html_id' => 'childdomain_list');
}
}
@@ -42,7 +42,17 @@
$items[] = array( 'title' => "Aliasdomain",
'target' => 'content',
'link' => 'sites/web_childdomain_list.php?type=aliasdomain',
- 'html_id' => 'aliasdomain_list');
+ '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_aliasdomain_list.php',
+ 'html_id' => 'childdomain_list');
+ }
}
if(count($items))
--
Gitblit v1.9.1