From 11c8f36af084f676b60248ad4e6d15e99f8652b4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Jun 2009 13:38:59 -0400
Subject: [PATCH] Fixed: FS#758 - disabling mail filter rules doesn't work 

---
 interface/web/admin/form/server_config.tform.php |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index f3e2a5a..754000b 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -58,12 +58,18 @@
 	##################################
 	# Begin Datatable fields
 	##################################
+		'auto_network_configuration' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'n',
+			'value'		=> array(0 => 'n',1 => 'y')
+		),
 		'ip_address' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'default'	=> '192.168.0.100',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
-														'errmsg'=> 'ip_address_error_empty'),
+			'default'	=> '192.168.0.105',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'ISIPV4',
+														'errmsg'=> 'ip_address_error_wrong'),
 									),
 			'value'		=> '',
 			'width'		=> '15',
@@ -73,8 +79,8 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'default'	=> '255.255.255.0',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
-														'errmsg'=> 'netmask_error_empty'),
+			'validators'	=> array ( 	0 => array (	'type'	=> 'ISIPV4',
+														'errmsg'=> 'netmask_error_wrong'),
 									),
 			'value'		=> '',
 			'width'		=> '15',
@@ -84,8 +90,8 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'default'	=> '192.168.0.1',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
-														'errmsg'=> 'gateway_error_empty'),
+			'validators'	=> array ( 	0 => array (	'type'	=> 'ISIPV4',
+														'errmsg'=> 'gateway_error_wrong'),
 									),
 			'value'		=> '',
 			'width'		=> '15',
@@ -94,7 +100,7 @@
 		'hostname' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'default'	=> 'server1.example.com',
+			'default'	=> 'server1.domain.tld',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
 														'errmsg'=> 'hostname_error_empty'),
 									),
@@ -278,6 +284,17 @@
 	##################################
 	# Begin Datatable fields
 	##################################
+		'website_basedir' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'website_basedir_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
 		'website_path' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',

--
Gitblit v1.9.1