From 7bc0bcdf33dba22dcae84bd1d3e65898b742a4bc Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Mon, 27 Jan 2014 13:44:09 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master'

---
 interface/web/sites/lib/module.conf.php |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index 92e1c12..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,8 @@
 {
 	$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');
@@ -50,8 +50,8 @@
 	if($sys_config['vhost_aliasdomains'] == 'y') {
 		$items[] = array(   'title'  => "Aliasdomain (Vhost)",
 				'target'  => 'content',
-				'link'      => 'sites/web_vhost_aliasdomain_list.php',
-				'html_id'   => 'subdomain_list');
+				'link'      => 'sites/web_vhost_domain_list.php?type=aliasdomain',
+				'html_id'   => 'childdomain_list');
 	}
 }
 

--
Gitblit v1.9.1