From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6

---
 interface/web/sites/form/database.tform.php |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php
index be6998a..ffb711f 100644
--- a/interface/web/sites/form/database.tform.php
+++ b/interface/web/sites/form/database.tform.php
@@ -80,9 +80,7 @@
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
 														'errmsg'=> 'database_name_error_empty'),
-										1 => array (	'type'	=> 'UNIQUE',
-														'errmsg'=> 'database_name_error_unique'),
-										2 => array (	'type'	=> 'REGEX',
+										1 => array (	'type'	=> 'REGEX',
 														'regex' => '/^[a-zA-Z0-9_]{2,64}$/',
 														'errmsg'=> 'database_name_error_regex'),
 									),
@@ -109,7 +107,8 @@
 		),
 		'database_password' => array (
 			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'TEXT',
+			'formtype'	=> 'PASSWORD',
+			'encryption' => 'MYSQL',
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -124,7 +123,7 @@
 		'remote_access' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',
-			'default'	=> 'y',
+			'default'	=> 'n',
 			'value'		=> array(0 => 'n',1 => 'y')
 		),
 		'active' => array (
@@ -133,18 +132,18 @@
 			'default'	=> 'y',
 			'value'		=> array(0 => 'n',1 => 'y')
 		),
-    'remote_ips' => array (
-      'datatype'  => 'TEXT',
-      'formtype'  => 'TEXT',
-      'validators'  => array (  0 => array (  'type' => 'CUSTOM',
-                                              'class' => 'validate_database',
-                                              'function' => 'valid_ip_list',
-                                              'errmsg' => 'database_remote_error_ips'),
-                             ),
-      'default' => '',
-      'value'   => '',
-      'width'   => '60'
-    ),
+	    'remote_ips' => array (
+	      'datatype'  => 'TEXT',
+	      'formtype'  => 'TEXT',
+	      'validators'  => array (  0 => array (  'type' => 'CUSTOM',
+	                                              'class' => 'validate_database',
+	                                              'function' => 'valid_ip_list',
+	                                              'errmsg' => 'database_remote_error_ips'),
+	                             ),
+	      'default' => '',
+	      'value'   => '',
+	      'width'   => '60'
+	    ),
 	##################################
 	# ENDE Datatable fields
 	##################################

--
Gitblit v1.9.1