From 8ab3cdc09cfbac3157e996664616c229214f6c8d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 21 Oct 2011 06:03:56 -0400
Subject: [PATCH] Merged revisions 2681-2739 from 3.0.4 stable branch.

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

diff --git a/interface/web/admin/form/server.tform.php b/interface/web/admin/form/server.tform.php
index bd556b2..20947c8 100644
--- a/interface/web/admin/form/server.tform.php
+++ b/interface/web/admin/form/server.tform.php
@@ -102,18 +102,6 @@
 			'default'	=> '0',
 			'value'		=> array(0 => 0,1 => 1)
 		),
-		'proxy_server' => array (
-			'datatype'	=> 'INTEGER',
-			'formtype'	=> 'CHECKBOX',
-			'default'	=> '0',
-			'value'		=> array(0 => 0,1 => 1)
-		),
-		'firewall_server' => array (
-			'datatype'	=> 'INTEGER',
-			'formtype'	=> 'CHECKBOX',
-			'default'	=> '0',
-			'value'		=> array(0 => 0,1 => 1)
-		),
 		'mirror_server_id' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',

--
Gitblit v1.9.1