From fb3a98c0f06fb14a188e5a020936768fa04cb205 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 22 Oct 2010 06:24:31 -0400
Subject: [PATCH] Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)

---
 interface/web/admin/form/server.tform.php |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/web/admin/form/server.tform.php b/interface/web/admin/form/server.tform.php
index 80b672e..20947c8 100644
--- a/interface/web/admin/form/server.tform.php
+++ b/interface/web/admin/form/server.tform.php
@@ -102,6 +102,12 @@
 			'default'	=> '0',
 			'value'		=> array(0 => 0,1 => 1)
 		),
+		'mirror_server_id' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> ''
+		),
 		/*
 		'update' => array (
 			'datatype'	=> 'INTEGER',
@@ -122,7 +128,7 @@
 	)
 );
 
-
+/*
 $form["tabs"]['config'] = array (
 	'title' 	=> "Config",
 	'width' 	=> 100,
@@ -146,6 +152,6 @@
 	##################################
 	)
 );
-
+*/
 
 ?>
\ No newline at end of file

--
Gitblit v1.9.1