From 6dfc1f8aef2d75f5ca8fe694fb8ef27ef885b12c Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Sat, 01 May 2010 18:15:28 -0400
Subject: [PATCH] Added a new module called "domain". With this module you can manage all domains (web + mail). Per default this module is not active. To activate it, you have to change the System Interface Config -> domains -> use the domain module. You also have to activate the domain-module for the admin (and for every client if you want). Important: you can not use this module if you have reseller!

---
 interface/web/admin/form/server_config.tform.php |  274 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 267 insertions(+), 7 deletions(-)

diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index a40e47a..631df03 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -68,8 +68,8 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'default'	=> '192.168.0.105',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
-														'errmsg'=> 'ip_address_error_empty'),
+			'validators'	=> array ( 	0 => array (	'type'	=> 'ISIPV4',
+														'errmsg'=> 'ip_address_error_wrong'),
 									),
 			'value'		=> '',
 			'width'		=> '15',
@@ -79,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',
@@ -90,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',
@@ -116,6 +116,14 @@
 														'errmsg'=> 'nameservers_error_empty'),
 									),
 			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'loglevel' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'SELECT',
+			'default'	=> '2',
+			'value'		=> array('0' => 'Debug', '1' => 'Warnings', '2' => 'Errors'),
 			'width'		=> '40',
 			'maxlength'	=> '255'
 		),
@@ -160,6 +168,18 @@
 			'value'		=> '',
 			'width'		=> '40',
 			'maxlength'	=> '255'
+		),
+		'pop3_imap_daemon' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'SELECT',
+			'default'	=> '20',
+			'value'		=> array('courier' => 'Courier', 'dovecot' => 'Dovecot')
+		),
+		'mail_filter_syntax' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'SELECT',
+			'default'	=> '20',
+			'value'		=> array('maildrop' => 'Maildrop', 'sieve' => 'Sieve')
 		),
 		'mailuser_uid' => array (
 			'datatype'	=> 'INTEGER',
@@ -284,6 +304,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',
@@ -323,6 +354,155 @@
 			'default'	=> '',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
 														'errmsg'=> 'vhost_conf_enabled_dir_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'security_level' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'SELECT',
+			'default'	=> '20',
+			'value'		=> array('10' => 'Medium', '20' => 'High')
+		),
+		'user' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'apache_user_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'group' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'apache_group_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'php_open_basedir' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'php_open_basedir_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'htaccess_allow_override' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'htaccess_allow_override_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'apps_vhost_port' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '8081',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'apps_vhost_port_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'apps_vhost_ip' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '_default_',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'apps_vhost_ip_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'apps_vhost_servername' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+	##################################
+	# ENDE Datatable fields
+	##################################
+	)
+);
+
+$form["tabs"]['dns'] = array (
+	'title' 	=> "DNS",
+	'width' 	=> 60,
+	'template' 	=> "templates/server_config_dns_edit.htm",
+	'fields' 	=> array (
+	##################################
+	# Begin Datatable fields
+	##################################
+		'bind_user' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'bind_user_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'bind_group' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'bind_group_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'bind_zonefiles_dir' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'bind_zonefiles_dir_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'named_conf_path' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'named_conf_path_error_empty'),
+									),
+			'value'		=> '',
+			'width'		=> '40',
+			'maxlength'	=> '255'
+		),
+		'named_conf_local_path' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'named_conf_local_path_error_empty'),
 									),
 			'value'		=> '',
 			'width'		=> '40',
@@ -467,6 +647,17 @@
 			'width'		=> '40',
 			'maxlength'	=> '1000'
 		),
+        'jailkit_chroot_cron_programs' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'jailkit_chroot_cron_programs_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '1000'
+        ),
 	##################################
 	# ENDE Datatable fields
 	##################################
@@ -474,10 +665,79 @@
 );
 
 
+$form["tabs"]['vlogger'] = array (
+    'title'     => "vlogger",
+    'width'     => 80,
+    'template'  => "templates/server_config_vlogger_edit.htm",
+    'fields'    => array (
+    ##################################
+    # Begin Datatable fields
+    ##################################
+        'config_dir' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'vlogger_config_dir_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+    ##################################
+    # ENDE Datatable fields
+    ##################################
+    )
+);
 
 
 
-
+$form["tabs"]['cron'] = array (
+    'title'     => "Cron",
+    'width'     => 80,
+    'template'  => "templates/server_config_cron_edit.htm",
+    'fields'    => array (
+    ##################################
+    # Begin Datatable fields
+    ##################################
+        'init_script' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'cron_init_script_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+        'crontab_dir' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'crontab_dir_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+        'wget' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'cron_wget_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+    ##################################
+    # ENDE Datatable fields
+    ##################################
+    )
+);
 
 
 

--
Gitblit v1.9.1