From 6e8071c5e2eb86a280180638a73ad80e7264f133 Mon Sep 17 00:00:00 2001
From: Dominik Müller <info@profi-webdesign.net>
Date: Sun, 19 Jan 2014 17:13:54 -0500
Subject: [PATCH] Merge branch 'vhostalias' of /home/git/repositories/renky/ispconfig3

---
 interface/web/admin/form/system_config.tform.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 6c0e8da..eaa0f6f 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -154,6 +154,12 @@
 			'default' => 'n',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
+		'vhost_aliasdomains' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
 		'client_username_web_check_disabled' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

--
Gitblit v1.9.1