From c27941663bf568a0b49662a38e43a4e972bad47f Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 07 Aug 2012 02:29:14 -0400
Subject: [PATCH] added support for extended generatePassword function

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

diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index ef9603b..f98a20e 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -33,16 +33,16 @@
 
 */
 
-$form["title"] 			= "System Config";
-$form["description"] 	= "";
-$form["name"] 			= "system_config";
-$form["action"]			= "system_config_edit.php";
-$form["db_table"]		= "sys_ini";
+$form["title"] 		= "System Config";
+$form["description"] 	= "system_config_desc_txt";
+$form["name"] 		= "system_config";
+$form["action"]		= "system_config_edit.php";
+$form["db_table"]	= "sys_ini";
 $form["db_table_idx"]	= "sysini_id";
-$form["db_history"]		= "yes";
+$form["db_history"]	= "yes";
 $form["tab_default"]	= "sites";
 $form["list_default"]	= "server_list.php";
-$form["auth"]			= 'yes'; // yes / no
+$form["auth"]		= 'yes'; // yes / no
 
 $form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
 $form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
@@ -61,10 +61,10 @@
 		'dbname_prefix' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
-														'errmsg'=> 'dbname_prefix_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+                                                                'errmsg'=> 'dbname_prefix_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -73,10 +73,10 @@
 		'dbuser_prefix' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
-														'errmsg'=> 'dbuser_prefix_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+                                                                'errmsg'=> 'dbuser_prefix_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -85,10 +85,10 @@
 		'ftpuser_prefix' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
-														'errmsg'=> 'ftpuser_prefix_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+                                                                'errmsg'=> 'ftpuser_prefix_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -97,10 +97,10 @@
 		'shelluser_prefix' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
-														'errmsg'=> 'shelluser_prefix_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+                                                                'errmsg'=> 'shelluser_prefix_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -109,10 +109,10 @@
 		'webdavuser_prefix' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
-														'errmsg'=> 'webdavuser_prefix_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+                                                                'errmsg'=> 'webdavuser_prefix_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -127,10 +127,10 @@
 		'phpmyadmin_url' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
-														'errmsg'=> 'phpmyadmin_url_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
+                                                                'errmsg'=> 'phpmyadmin_url_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -139,10 +139,10 @@
 		'webftp_url' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
-														'errmsg'=> 'webftp_url_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
+                                                                'errmsg'=> 'webftp_url_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -177,10 +177,10 @@
 		'webmail_url' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
-														'errmsg'=> 'webmail_url_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
+                                                                'errmsg'=> 'webmail_url_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -195,10 +195,10 @@
 		'mailmailinglist_url' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
-														'errmsg'=> 'mailinglist_url_error_regex'),
-										),
+			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
+                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
+                                                                'errmsg'=> 'mailinglist_url_error_regex'),
+                                                ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',

--
Gitblit v1.9.1