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/web_domain.tform.php | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 4c6bed4..13efa72 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -248,12 +248,12 @@
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,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')
),
'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})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
'errmsg'=> 'redirect_error_regex'),
),
'formtype' => 'TEXT',
@@ -287,7 +287,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 +299,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 +311,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 +323,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' => '',
@@ -331,17 +331,30 @@
'width' => '30',
'maxlength' => '255'
),
+ /*
'ssl_country' => array (
'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' => '',
'value' => '',
'width' => '2',
'maxlength' => '2'
+ ),
+ */
+ 'ssl_country' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
+ 'keyfield'=> 'iso',
+ 'valuefield'=> 'printable_name'
+ ),
+ 'value' => ''
),
'ssl_domain' => array (
'datatype' => 'VARCHAR',
@@ -518,7 +531,7 @@
'regex' => '/^([1-9][0-9]{0,10})$/',
'errmsg'=> 'pm_max_children_error_regex'),
),
- 'default' => '50',
+ 'default' => '10',
'value' => '',
'width' => '3',
'maxlength' => '3'
@@ -530,7 +543,7 @@
'regex' => '/^([1-9][0-9]{0,10})$/',
'errmsg'=> 'pm_start_servers_error_regex'),
),
- 'default' => '20',
+ 'default' => '2',
'value' => '',
'width' => '3',
'maxlength' => '3'
@@ -542,7 +555,7 @@
'regex' => '/^([1-9][0-9]{0,10})$/',
'errmsg'=> 'pm_min_spare_servers_error_regex'),
),
- 'default' => '5',
+ 'default' => '1',
'value' => '',
'width' => '3',
'maxlength' => '3'
@@ -554,7 +567,7 @@
'regex' => '/^([1-9][0-9]{0,10})$/',
'errmsg'=> 'pm_max_spare_servers_error_regex'),
),
- 'default' => '35',
+ 'default' => '5',
'value' => '',
'width' => '3',
'maxlength' => '3'
--
Gitblit v1.9.1