From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import

---
 interface/web/sites/form/web_domain.tform.php |  168 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 139 insertions(+), 29 deletions(-)

diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 34cbbc8..f2c6fa7 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -29,6 +29,11 @@
 	Hint:
 	The ID field of the database table is not part of the datafield definition.
 	The ID field must be always auto incement (int or bigint).
+	
+	Search:
+	- searchable = 1 or searchable = 2 include the field in the search
+	- searchable = 1: this field will be the title of the search result
+	- searchable = 2: this field will be included in the description of the search result
 
 
 */
@@ -57,6 +62,15 @@
 	$web_domain_edit_readonly = true;
 }
 
+$wildcard_available = true;
+$ssl_available = true;
+if(!$app->auth->is_admin()) {
+    $client_group_id = $_SESSION["s"]["user"]["default_group"];
+	$client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+    
+    if($client['limit_wildcard'] != 'y') $wildcard_available = false;
+    if($client['limit_ssl'] != 'y') $ssl_available = false;
+}
 
 $form["tabs"]['domain'] = array (
 	'title' 	=> "Domain",
@@ -71,6 +85,9 @@
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
+			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'no_server_error'),
+                                    ),
 			'datasource'	=> array ( 	'type'	=> 'SQL',
 										'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
 										'keyfield'=> 'server_id',
@@ -87,7 +104,8 @@
 										'keyfield'=> 'ip_address',
 										'valuefield'=> 'ip_address'
 									 ),*/
-			'value'		=> ''
+			'value'		=> '',
+			'searchable' => 2
 		),
 		'ipv6_address' => array (
 			'datatype'	=> 'VARCHAR',
@@ -98,23 +116,29 @@
 										'keyfield'=> 'ip_address',
 										'valuefield'=> 'ip_address'
 									 ),*/
-			'value'		=> ''
+			'value'		=> '',
+			'searchable' => 2
 		),
 		'domain' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
-														'errmsg'=> 'domain_error_empty'),
-										1 => array (	'type'	=> 'UNIQUE',
-														'errmsg'=> 'domain_error_unique'),
-										2 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/',
-														'errmsg'=> 'domain_error_regex'),
-									),
+            'filters'   => array( 0 => array( 'event' => 'SAVE',
+                                              'type' => 'IDNTOASCII'),
+                                  1 => array( 'event' => 'SHOW',
+                                              'type' => 'IDNTOUTF8'),
+                                  2 => array( 'event' => 'SAVE',
+                                              'type' => 'TOLOWER')
+                                ),
+            'validators'    => array (  0 => array (    'type'  => 'CUSTOM',
+                                                        'class' => 'validate_domain',
+                                                        'function' => 'web_domain',
+                                                        'errmsg'=> 'domain_error_regex'),
+                                    ),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
-			'maxlength'	=> '255'
+			'maxlength'	=> '255',
+			'searchable' => 1
 		),
 		'type' => array (
 			'datatype'	=> 'VARCHAR',
@@ -195,7 +219,12 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'SELECT',
 			'default'	=> 'www',
-			'value'		=> array('none' => 'none_txt', 'www' => 'www.', '*' => '*.')
+            'validators'    => array (  0 => array (    'type'  => 'CUSTOM',
+                                                        'class' => 'validate_domain',
+                                                        'function' => 'web_domain_autosub',
+                                                        'errmsg'=> 'domain_error_autosub'),
+                                    ),
+			'value'		=> ($wildcard_available ? array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') : array('none' => 'none_txt', 'www' => 'www.'))
 		),
 		'ssl' => array (
 			'datatype'	=> 'VARCHAR',
@@ -208,7 +237,25 @@
 			'formtype'	=> 'SELECT',
 			'default'	=> 'fast-cgi',
 			'valuelimit' => 'client:web_php_options',
-			'value'		=> array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP')
+			'value'		=> array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM'),
+			'searchable' => 2
+		),
+		'fastcgi_php_version' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'SELECT',
+			'default'	=> '',
+			/*'datasource'	=> array ( 	'type'	=> 'SQL',
+										'querystring' => "SELECT ip_address,ip_address FROM server_ip WHERE ip_type = 'IPv4' AND {AUTHSQL} ORDER BY ip_address",
+										'keyfield'=> 'ip_address',
+										'valuefield'=> 'ip_address'
+									 ),*/
+			'value'		=> ''
+		),
+		'perl' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'n',
+			'value'		=> array(0 => 'n',1 => 'y')
 		),
 		'ruby' => array (
 			'datatype'	=> 'VARCHAR',
@@ -248,12 +295,12 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
-			'value'		=> array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent')
+			'value'		=> array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
 		),
 		'redirect_path' => array (
 			'datatype'	=> 'VARCHAR',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
+														'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
 														'errmsg'=> 'redirect_error_regex'),
 									),
 			'formtype'	=> 'TEXT',
@@ -266,7 +313,15 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
-			'value'		=> array('' => 'no_redirect_txt', 'non_www_to_www' => 'non_www_to_www_txt', 'www_to_non_www' => 'www_to_non_www_txt')
+			'value'		=> array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
+		),
+		'rewrite_rules' => array (
+			'datatype'	=> 'TEXT',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
 		),
 	##################################
 	# ENDE Datatable fields
@@ -274,6 +329,7 @@
 	)
 );
 
+if($ssl_available) {
 $form["tabs"]['ssl'] = array (
 	'title' 	=> "SSL",
 	'width' 	=> 100,
@@ -287,7 +343,7 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
+														'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
 														'errmsg'=> 'ssl_state_error_regex'),
 									),
 			'default'	=> '',
@@ -299,7 +355,7 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
+														'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
 														'errmsg'=> 'ssl_locality_error_regex'),
 									),
 			'default'	=> '',
@@ -311,7 +367,7 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
+														'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
 														'errmsg'=> 'ssl_organisation_error_regex'),
 									),
 			'default'	=> '',
@@ -323,7 +379,7 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
+														'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
 														'errmsg'=> 'ssl_organistaion_unit_error_regex'),
 									),
 			'default'	=> '',
@@ -336,7 +392,7 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(([.]{0})|([A-Z]{2,2}))$/',
+														'regex' => '/^(([\.]{0})|([A-Z]{2,2}))$/',
 														'errmsg'=> 'ssl_country_error_regex'),
 									),
 			'default'	=> '',
@@ -363,6 +419,14 @@
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
+		),
+		'ssl_key' => array (
+			'datatype'	=> 'TEXT',
+			'formtype'	=> 'TEXTAREA',
+			'default'	=> '',
+			'value'		=> '',
+			'cols'		=> '30',
+			'rows'		=> '10'
 		),
 		'ssl_request' => array (
 			'datatype'	=> 'TEXT',
@@ -399,6 +463,7 @@
 	##################################
 	)
 );
+}
 
 //* Statistics
 $form["tabs"]['stats'] = array (
@@ -431,7 +496,7 @@
 	)
 );
 
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
+// if($_SESSION["s"]["user"]["typ"] == 'admin') {
 
 //* Backup
 $form["tabs"]['backup'] = array (
@@ -447,7 +512,7 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
-			'value'		=> array('none' => 'No backup', 'daily' => 'Daily', 'weekly' => 'Weekly', 'monthly' => 'Monthly')
+			'value'		=> array('none' => 'no_backup_txt', 'daily' => 'daily_backup_txt', 'weekly' => 'weekly_backup_txt', 'monthly' => 'monthly_backup_txt')
 		),
 		'backup_copies' => array (
 			'datatype'	=> 'INTEGER',
@@ -458,10 +523,17 @@
 	##################################
 	# ENDE Datatable fields
 	##################################
+	),
+	'plugins' => array (
+     	'backup_records' => array (
+         	'class'   => 'plugin_backuplist',
+     		'options' => array(
+			)
+        )
 	)
 );
 
-}
+// }
 
 if($_SESSION["s"]["user"]["typ"] == 'admin') {
 
@@ -524,6 +596,12 @@
 			'default'	=> 'n',
 			'value'		=> array(0 => 'n',1 => 'y')
 		),
+		'pm' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'SELECT',
+			'default'	=> 'dynamic',
+			'value'		=> array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand (PHP Version >= 5.3.9)')
+		),
 		'pm_max_children' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
@@ -531,7 +609,7 @@
 														'regex' => '/^([1-9][0-9]{0,10})$/',
 														'errmsg'=> 'pm_max_children_error_regex'),
 									),
-			'default'	=> '50',
+			'default'	=> '10',
 			'value'		=> '',
 			'width'		=> '3',
 			'maxlength'	=> '3'
@@ -543,7 +621,7 @@
 														'regex' => '/^([1-9][0-9]{0,10})$/',
 														'errmsg'=> 'pm_start_servers_error_regex'),
 									),
-			'default'	=> '20',
+			'default'	=> '2',
 			'value'		=> '',
 			'width'		=> '3',
 			'maxlength'	=> '3'
@@ -555,7 +633,7 @@
 														'regex' => '/^([1-9][0-9]{0,10})$/',
 														'errmsg'=> 'pm_min_spare_servers_error_regex'),
 									),
-			'default'	=> '5',
+			'default'	=> '1',
 			'value'		=> '',
 			'width'		=> '3',
 			'maxlength'	=> '3'
@@ -567,10 +645,34 @@
 														'regex' => '/^([1-9][0-9]{0,10})$/',
 														'errmsg'=> 'pm_max_spare_servers_error_regex'),
 									),
-			'default'	=> '35',
+			'default'	=> '5',
 			'value'		=> '',
 			'width'		=> '3',
 			'maxlength'	=> '3'
+		),
+		'pm_process_idle_timeout' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
+														'regex' => '/^([1-9][0-9]{0,10})$/',
+														'errmsg'=> 'pm_process_idle_timeout_error_regex'),
+									),
+			'default'	=> '10',
+			'value'		=> '',
+			'width'		=> '3',
+			'maxlength'	=> '6'
+		),
+		'pm_max_requests' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
+														'regex' => '/^([0-9]{1,11})$/',
+														'errmsg'=> 'pm_max_requests_error_regex'),
+									),
+			'default'	=> '0',
+			'value'		=> '',
+			'width'		=> '3',
+			'maxlength'	=> '6'
 		),
 		'php_open_basedir' => array (
 			'datatype'	=> 'VARCHAR',
@@ -606,7 +708,15 @@
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
-		)
+		),
+		'proxy_directives' => array (
+			'datatype'	=> 'TEXT',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################

--
Gitblit v1.9.1