diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index b0e1f3b0211a12100cc17e215d61946e77584172..fcb6055c6f672afa98971101cc1f17a8447f0c12 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -32,7 +32,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//* This class is loaded automatically by the ispconfig framework.
class functions {
-
+ var $idn_converter = null;
+ var $idn_converter_name = '';
public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'application/pdf', $filename = '', $cc = '', $bcc = '', $from_name = '') {
global $app,$conf;
@@ -310,6 +311,72 @@ class functions {
return intval($string);
}
}
+
+ /** IDN converter wrapper.
+ * all converter classes should be placed in ISPC_CLASS_PATH.'/idn/'
+ */
+ public function idn_encode($domain) {
+ if($domain == '') return '';
+ if(preg_match('/^[0-9\.]+$/', $domain)) return $domain; // may be an ip address - anyway does not need to bee encoded
+
+ // get domain and user part if it is an email
+ $user_part = false;
+ if(strpos($domain, '@') !== false) {
+ $user_part = substr($domain, 0, strrpos($domain, '@'));
+ $domain = substr($domain, strrpos($domain, '@') + 1);
+ }
+
+ if(function_exists('idn_to_ascii')) {
+ $domain = idn_to_ascii($domain);
+ } elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
+ /* use idna class:
+ * @author Matthias Sommerfeld <mso@phlylabs.de>
+ * @copyright 2004-2011 phlyLabs Berlin, http://phlylabs.de
+ * @version 0.8.0 2011-03-11
+ */
+
+ if(!is_object($this->idn_converter) || $this->idn_converter_name != 'idna_convert.class') {
+ include_once(ISPC_CLASS_PATH.'/idn/idna_convert.class.php');
+ $this->idn_converter = new idna_convert(array('idn_version' => 2008));
+ $this->idn_converter_name = 'idna_convert.class';
+ }
+ $domain = $this->idn_converter->encode($domain);
+ }
+
+ if($user_part !== false) return $user_part . '@' . $domain;
+ else return $domain;
+ }
+
+ public function idn_decode($domain) {
+ if($domain == '') return '';
+ if(preg_match('/^[0-9\.]+$/', $domain)) return $domain; // may be an ip address - anyway does not need to bee decoded
+
+ // get domain and user part if it is an email
+ $user_part = false;
+ if(strpos($domain, '@') !== false) {
+ $user_part = substr($domain, 0, strrpos($domain, '@'));
+ $domain = substr($domain, strrpos($domain, '@') + 1);
+ }
+ if(function_exists('idn_to_utf8')) {
+ $domain = idn_to_utf8($domain);
+ } elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
+ /* use idna class:
+ * @author Matthias Sommerfeld <mso@phlylabs.de>
+ * @copyright 2004-2011 phlyLabs Berlin, http://phlylabs.de
+ * @version 0.8.0 2011-03-11
+ */
+
+ if(!is_object($this->idn_converter) || $this->idn_converter_name != 'idna_convert.class') {
+ include_once(ISPC_CLASS_PATH.'/idn/idna_convert.class.php');
+ $this->idn_converter = new idna_convert(array('idn_version' => 2008));
+ $this->idn_converter_name = 'idna_convert.class';
+ }
+ $domain = $this->idn_converter->decode($domain);
+ }
+
+ if($user_part !== false) return $user_part . '@' . $domain;
+ else return $domain;
+ }
}
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 4b6b7c1a0fc5b5c97666ac1030d78d08f8582194..6128022acd4689bbf2c1c93c0c018c9aeae79fb3 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -291,6 +291,11 @@ class listform {
if(is_array($record) && count($record) > 0 && is_array($this->listDef['item'])) {
foreach($this->listDef['item'] as $field){
$key = $field['field'];
+ //* Apply filter to record value.
+ if(isset($field['filters']) && is_array($field['filters'])) {
+ $app->uses('tform');
+ $record[$key] = $app->tform->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SHOW');
+ }
if(isset($record[$key])) {
switch ($field['datatype']){
case 'VARCHAR':
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 67ad855921c4e666c5080fdf6098f5563ffb69e3..40db6e072e5978b84c7957226322066129b8fcb9 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -418,18 +418,10 @@ class remoting_lib {
$returnval = strtoupper($field_value);
break;
case 'IDNTOASCII':
- if(function_exists('idn_to_ascii')) {
- $returnval = idn_to_ascii($field_value);
- } else {
- $returnval = $field_value;
- }
+ $returnval = $app->functions->idn_encode($field_value);
break;
case 'IDNTOUTF8':
- if(function_exists('idn_to_utf8')) {
- $returnval = idn_to_utf8($field_value);
- } else {
- $returnval = $field_value;
- }
+ $returnval = $app->functions->idn_decode($field_value);
break;
default:
$this->errorMessage .= "Unknown Filter: ".$filter['type'];
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index cfb04b416265a308b449925e71bc3707b1315395..b6cc343e6e96403dd3bc0808cf5abdb1cbb8a623 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -629,7 +629,6 @@ class tform {
if(isset($field['filters']) && is_array($field['filters'])) {
$record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SAVE');
}
-
//* Validate record value
if(isset($field['validators']) && is_array($field['validators'])) {
$this->validateField($key, (isset($record[$key]))?$record[$key]:'', $field['validators']);
@@ -738,24 +737,16 @@ class tform {
if($filter['event'] == $filter_event) {
switch ($filter['type']) {
case 'TOLOWER':
- $returnval = strtolower($field_value);
+ $returnval = strtolower($returnval);
break;
case 'TOUPPER':
- $returnval = strtoupper($field_value);
+ $returnval = strtoupper($returnval);
break;
case 'IDNTOASCII':
- if(function_exists('idn_to_ascii')) {
- $returnval = idn_to_ascii($field_value);
- } else {
- $returnval = $field_value;
- }
+ $returnval = $app->functions->idn_encode($returnval);
break;
case 'IDNTOUTF8':
- if(function_exists('idn_to_utf8')) {
- $returnval = idn_to_utf8($field_value);
- } else {
- $returnval = $field_value;
- }
+ $returnval = $app->functions->idn_decode($returnval);
break;
default:
$this->errorMessage .= "Unknown Filter: ".$filter['type'];
@@ -763,8 +754,7 @@ class tform {
}
}
}
-
- return $returnval;
+ return $returnval;
}
/**
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 2cf2170ecc1d7e121fbb946407921dc631171b89..b16b5928eb12799e2e311434994720be58e254c0 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -109,6 +109,13 @@ $form["tabs"]['server'] = array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => 'server1.domain.tld',
+ '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' => 'NOTEMPTY',
'errmsg' => 'hostname_error_empty'),
),
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 370e57f608cc74e43d6e3c99c7e5a20171598761..7020ee2b146a270d248996a3ba18c129624e3f56 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -212,6 +212,13 @@ $form["tabs"]['mail'] = array (
),
'admin_mail' => array (
'datatype' => 'VARCHAR',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'formtype' => 'TEXT',
'default' => '',
'value' => '',
@@ -234,6 +241,13 @@ $form["tabs"]['mail'] = array (
),
'smtp_host' => array (
'datatype' => 'VARCHAR',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'formtype' => 'TEXT',
'default' => '',
'value' => '',
diff --git a/interface/web/admin/list/server.list.php b/interface/web/admin/list/server.list.php
index 2d98c1f0d391e2bc0694e6d7cf0b1ba30c15ac51..acca81a92f8c3cbf2b3117e170a3d26247b96332 100644
--- a/interface/web/admin/list/server.list.php
+++ b/interface/web/admin/list/server.list.php
@@ -46,6 +46,9 @@ $liste['auth'] = 'yes';
$liste['item'][] = array( 'field' => 'server_name',
'datatype' => 'VARCHAR',
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => 'TEXT',
'op' => 'like',
'prefix' => '%',
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 20c46c2b690e13e4a25def133c2b4b88141a82e7..4faaa6d368144e3baffcd07f7be4b6b367a9fb3a 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -285,6 +285,13 @@ $form["tabs"]['address'] = array (
'email' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
'value' => '',
'separator' => '',
diff --git a/interface/web/client/form/domain.tform.php b/interface/web/client/form/domain.tform.php
index 2617fc23b55bb779423e3134ce882cff09215938..40f9a90a8e072aca87a2c39446d4cc726212ed4a 100644
--- a/interface/web/client/form/domain.tform.php
+++ b/interface/web/client/form/domain.tform.php
@@ -88,6 +88,13 @@ $form["tabs"]['domain'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'domain_error_empty'),
1 => array ( 'type' => 'UNIQUE',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index f437b2e92b19599459614dbdd50fa529e4b2611a..1669e36bfc56789a32ba4ca398b4ba1f507a416d 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -286,6 +286,13 @@ $form["tabs"]['address'] = array (
'email' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
'value' => '',
'separator' => '',
diff --git a/interface/web/client/list/domain.list.php b/interface/web/client/list/domain.list.php
index e9630e388a621aa77991409b56c03a36cb561340..a7534a228cb1a95790c7cfb98722b3d066948e43 100644
--- a/interface/web/client/list/domain.list.php
+++ b/interface/web/client/list/domain.list.php
@@ -75,6 +75,9 @@ $liste["auth"] = "yes";
*****************************************************/
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "LIKE",
'prefix' => "%",
diff --git a/interface/web/dns/form/dns_a.tform.php b/interface/web/dns/form/dns_a.tform.php
index 50950c0850f5c361a020a91ddf4634528f4c350a..bbd0d0107a6110cfb29098642e7ffc9b2a21eb14 100644
--- a/interface/web/dns/form/dns_a.tform.php
+++ b/interface/web/dns/form/dns_a.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-\*]{0,64}$/',
'errmsg'=> 'name_error_regex'),
diff --git a/interface/web/dns/form/dns_alias.tform.php b/interface/web/dns/form/dns_alias.tform.php
index c998f8151a9ddf83d70c05e476d61d5e2a7f8dfa..b358b720c7f8ad22d3631e826c2122b52dab2996 100644
--- a/interface/web/dns/form/dns_alias.tform.php
+++ b/interface/web/dns/form/dns_alias.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'name_error_empty'),
1 => array ( 'type' => 'REGEX',
@@ -100,6 +107,13 @@ $form["tabs"]['dns'] = array (
'data' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php
index c9e9d9bcda7b74996d0600e230e4b28bc317f1a6..ccfef7368457b3ddb8a43e635ffd388361c47f69 100644
--- a/interface/web/dns/form/dns_cname.tform.php
+++ b/interface/web/dns/form/dns_cname.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-\*]{0,255}$/',
'errmsg'=> 'name_error_regex'),
@@ -98,6 +105,13 @@ $form["tabs"]['dns'] = array (
'data' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
diff --git a/interface/web/dns/form/dns_hinfo.tform.php b/interface/web/dns/form/dns_hinfo.tform.php
index 556d573447f7b175b842734c2b98347e9d9e7731..70971cf77ef4805d45d52bb93cb6121b3bd1cd0c 100644
--- a/interface/web/dns/form/dns_hinfo.tform.php
+++ b/interface/web/dns/form/dns_hinfo.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'name_error_empty'),
1 => array ( 'type' => 'REGEX',
diff --git a/interface/web/dns/form/dns_mx.tform.php b/interface/web/dns/form/dns_mx.tform.php
index df8ef726348678adb637932ee479e74fcf9275a5..a1f7b78b9c3cca8aff3db36edee12a7a7ca284a9 100644
--- a/interface/web/dns/form/dns_mx.tform.php
+++ b/interface/web/dns/form/dns_mx.tform.php
@@ -79,6 +79,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-\*]{0,255}$/',
'errmsg'=> 'name_error_regex'),
@@ -99,6 +106,13 @@ $form["tabs"]['dns'] = array (
'data' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
diff --git a/interface/web/dns/form/dns_ns.tform.php b/interface/web/dns/form/dns_ns.tform.php
index 2efa866fa45a54551d75feaa28c49dddcacd7a9e..00a842f8496c139dcbfcf124b514542fdcd6a2de 100644
--- a/interface/web/dns/form/dns_ns.tform.php
+++ b/interface/web/dns/form/dns_ns.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
@@ -98,6 +105,13 @@ $form["tabs"]['dns'] = array (
'data' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
diff --git a/interface/web/dns/form/dns_ptr.tform.php b/interface/web/dns/form/dns_ptr.tform.php
index 4b1a2d82448946644067bad47436d129e25a5554..68ea83c54d4fc441f44230759d7fe5aadf6f9051 100644
--- a/interface/web/dns/form/dns_ptr.tform.php
+++ b/interface/web/dns/form/dns_ptr.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-]{1,256}$/',
'errmsg'=> 'name_error_regex'),
@@ -98,6 +105,13 @@ $form["tabs"]['dns'] = array (
'data' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
diff --git a/interface/web/dns/form/dns_rp.tform.php b/interface/web/dns/form/dns_rp.tform.php
index 35737a27a1ebbc1baf40d3d677607706933b147b..f6a6ef5ee1ab22e736de46e0828e9de437b56377 100644
--- a/interface/web/dns/form/dns_rp.tform.php
+++ b/interface/web/dns/form/dns_rp.tform.php
@@ -75,6 +75,13 @@ $form["tabs"]['dns'] = array (
'width' => '30',
'maxlength' => '255'
),
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php
index a1dea941fc34999eff34c058b1b074f784b54f9c..038f26bd9d28d17a79b3b4569ce2a069ef78d35f 100644
--- a/interface/web/dns/form/dns_slave.tform.php
+++ b/interface/web/dns/form/dns_slave.tform.php
@@ -82,6 +82,13 @@ $form["tabs"]['dns_slave'] = array (
'origin' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'origin_error_empty'),
1 => array ( 'type' => 'UNIQUE',
@@ -99,6 +106,13 @@ $form["tabs"]['dns_slave'] = array (
'ns' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'errmsg'=> 'ns_error_regex'),
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 175bb12ee66f4045fe87a08f72ca2579d7788499..00c2aacebe09d5caa27d5bf5207aaa290f6ce09e 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -83,6 +83,13 @@ $form["tabs"]['dns_soa'] = array (
'origin' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'origin_error_empty'),
1 => array ( 'type' => 'UNIQUE',
@@ -100,6 +107,13 @@ $form["tabs"]['dns_soa'] = array (
'ns' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'errmsg'=> 'ns_error_regex'),
@@ -113,6 +127,13 @@ $form["tabs"]['dns_soa'] = array (
'mbox' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'mbox_error_empty'),
1 => array ( 'type' => 'REGEX',
diff --git a/interface/web/dns/form/dns_srv.tform.php b/interface/web/dns/form/dns_srv.tform.php
index 25f3584ae4fdf4400c1fe90eea020bef14222335..736bbc920607f2b8be48aaf968f3eedb99333e87 100644
--- a/interface/web/dns/form/dns_srv.tform.php
+++ b/interface/web/dns/form/dns_srv.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
diff --git a/interface/web/dns/form/dns_txt.tform.php b/interface/web/dns/form/dns_txt.tform.php
index ad68d9781cccaf0fdcb7a49b252d7aa250e5fce3..c59fa75e553eed830ed3de71387577787de905a7 100644
--- a/interface/web/dns/form/dns_txt.tform.php
+++ b/interface/web/dns/form/dns_txt.tform.php
@@ -78,6 +78,13 @@ $form["tabs"]['dns'] = array (
'name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^[\w\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
diff --git a/interface/web/dns/list/dns_a.list.php b/interface/web/dns/list/dns_a.list.php
index 7484195b9c89ac14c8217dc8b1921d13e550e224..75076d017bbc2d9d87571b412ff750a9d522663f 100644
--- a/interface/web/dns/list/dns_a.list.php
+++ b/interface/web/dns/list/dns_a.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "zone",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/dns/list/dns_slave.list.php b/interface/web/dns/list/dns_slave.list.php
index 1e6354434f171f127220b64cdfcea0e7d34c420d..5276557170899fa471b7be1ba46e62745e09f745 100644
--- a/interface/web/dns/list/dns_slave.list.php
+++ b/interface/web/dns/list/dns_slave.list.php
@@ -73,6 +73,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "origin",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
@@ -83,6 +86,9 @@ $liste["item"][] = array( 'field' => "origin",
$liste["item"][] = array( 'field' => "ns",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/dns/list/dns_soa.list.php b/interface/web/dns/list/dns_soa.list.php
index 89cc766d1dcac4ffb9b72a809372508c5eb904e1..46ec9c9b8f935531988b1770b63794fb588e9399 100644
--- a/interface/web/dns/list/dns_soa.list.php
+++ b/interface/web/dns/list/dns_soa.list.php
@@ -73,6 +73,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "origin",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
@@ -83,6 +86,9 @@ $liste["item"][] = array( 'field' => "origin",
$liste["item"][] = array( 'field' => "ns",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
@@ -93,6 +99,9 @@ $liste["item"][] = array( 'field' => "ns",
$liste["item"][] = array( 'field' => "mbox",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/form/mail_alias.tform.php b/interface/web/mail/form/mail_alias.tform.php
index 072f622002e690b3ea139751d2dac9f017dbbb9e..181cdc9f389755ba27d3652e1f719dacc6e983a7 100644
--- a/interface/web/mail/form/mail_alias.tform.php
+++ b/interface/web/mail/form/mail_alias.tform.php
@@ -74,6 +74,13 @@ $form["tabs"]['alias'] = array (
'source' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
),
@@ -86,6 +93,13 @@ $form["tabs"]['alias'] = array (
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT email FROM mail_user WHERE {AUTHSQL} ORDER BY email',
diff --git a/interface/web/mail/form/mail_aliasdomain.tform.php b/interface/web/mail/form/mail_aliasdomain.tform.php
index 754209f3abbf7258f1c5d27c25b212d06dae59ba..29ed73f9853053b0bba227cead9c6ab8485622ce 100644
--- a/interface/web/mail/form/mail_aliasdomain.tform.php
+++ b/interface/web/mail/form/mail_aliasdomain.tform.php
@@ -74,6 +74,13 @@ $form["tabs"]['alias'] = array (
'source' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'source_error_empty'),
1 => array ( 'type' => 'UNIQUE',
@@ -91,6 +98,13 @@ $form["tabs"]['alias'] = array (
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
'value' => '',
'width' => '30',
diff --git a/interface/web/mail/form/mail_domain.tform.php b/interface/web/mail/form/mail_domain.tform.php
index 9396b814b8d0100b2555e2a9a6cbf625e54fdfc7..506f934e385925a45d51f35704b4b5303bcf53ca 100644
--- a/interface/web/mail/form/mail_domain.tform.php
+++ b/interface/web/mail/form/mail_domain.tform.php
@@ -77,9 +77,13 @@ $form["tabs"]['domain'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'filters' => array ( 0 => array ( 'type' => 'TOLOWER',
- 'event'=> 'SAVE'),
- ),
+ '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' => 'NOTEMPTY',
'errmsg'=> 'domain_error_empty'),
1 => array ( 'type' => 'UNIQUE',
diff --git a/interface/web/mail/form/mail_domain_catchall.tform.php b/interface/web/mail/form/mail_domain_catchall.tform.php
index b308ed6c9cebe31ca863b2ae2f7a6ff97f9d104b..ea8fb564aa664d6f1f491b73bcdc0f63c406340f 100644
--- a/interface/web/mail/form/mail_domain_catchall.tform.php
+++ b/interface/web/mail/form/mail_domain_catchall.tform.php
@@ -74,6 +74,13 @@ $form["tabs"]['catchall'] = array (
'source' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'domain_error_empty'),
1 => array ( 'type' => 'UNIQUE',
@@ -91,6 +98,13 @@ $form["tabs"]['catchall'] = array (
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
/*
'datasource' => array ( 'type' => 'SQL',
diff --git a/interface/web/mail/form/mail_forward.tform.php b/interface/web/mail/form/mail_forward.tform.php
index b8f25758eb3cdef264b38615ea671b74871b353a..cdfb785f345c0e16d4512f0c2d9032c4d520b521 100644
--- a/interface/web/mail/form/mail_forward.tform.php
+++ b/interface/web/mail/form/mail_forward.tform.php
@@ -74,6 +74,13 @@ $form["tabs"]['forward'] = array (
'source' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
),
@@ -86,6 +93,13 @@ $form["tabs"]['forward'] = array (
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
'value' => '',
'width' => '30',
diff --git a/interface/web/mail/form/mail_get.tform.php b/interface/web/mail/form/mail_get.tform.php
index 4086eb90e2628b4cc6e7bbe55429656ce6160bd0..e23c4e1b24da403682795385c7343f16cf9d1ef9 100644
--- a/interface/web/mail/form/mail_get.tform.php
+++ b/interface/web/mail/form/mail_get.tform.php
@@ -84,6 +84,13 @@ $form["tabs"]['mailget'] = array (
'source_server' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'source_server_error_isempty'),
1 => array ( 'type' => 'REGEX',
@@ -134,6 +141,13 @@ $form["tabs"]['mailget'] = array (
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT email FROM mail_user WHERE {AUTHSQL} ORDER BY email',
diff --git a/interface/web/mail/form/mail_mailinglist.tform.php b/interface/web/mail/form/mail_mailinglist.tform.php
index 93bd8c206f216955920d805d882ae6a9a1457885..7ccf1f6ef7e5bb85d4dab642be55b11abbb190bb 100644
--- a/interface/web/mail/form/mail_mailinglist.tform.php
+++ b/interface/web/mail/form/mail_mailinglist.tform.php
@@ -77,6 +77,13 @@ $form["tabs"]['mailinglist'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'domain_error_empty'),
1 => array ( 'type' => 'REGEX',
@@ -104,6 +111,13 @@ $form["tabs"]['mailinglist'] = array (
'email' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
),
diff --git a/interface/web/mail/form/mail_transport.tform.php b/interface/web/mail/form/mail_transport.tform.php
index d7935a6faca4081b153ce04a6bc8b13998ab5b65..a7ae27d990b668246b6bc9662aa278243ceddde4 100644
--- a/interface/web/mail/form/mail_transport.tform.php
+++ b/interface/web/mail/form/mail_transport.tform.php
@@ -77,6 +77,13 @@ $form["tabs"]['transport'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'default' => '',
'value' => '',
'width' => '30',
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 0dd7c8f984b7f6f88a4fb4a1947b407ca7844a3d..f01e96eda1a38edbef75aded3fd019fe043094dc 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -75,6 +75,13 @@ $form["tabs"]['mailuser'] = array (
'email' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
1 => array ( 'type' => 'UNIQUE',
@@ -136,6 +143,13 @@ $form["tabs"]['mailuser'] = array (
'cc' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
'errmsg'=> 'cc_error_isemail'),
diff --git a/interface/web/mail/form/spamfilter_config.tform.php b/interface/web/mail/form/spamfilter_config.tform.php
index 3f5d582e23324c45bfdbdc508a63fb08989c6ea6..224cb606c958f63d33ac825447525647b1e2e1f9 100644
--- a/interface/web/mail/form/spamfilter_config.tform.php
+++ b/interface/web/mail/form/spamfilter_config.tform.php
@@ -95,6 +95,13 @@ $form["tabs"]['server'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => 'server1.domain.tld',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'hostname_error_empty'),
),
diff --git a/interface/web/mail/form/spamfilter_users.tform.php b/interface/web/mail/form/spamfilter_users.tform.php
index b14fb78eb60eaeba018825456f7159fc5b5965b0..980a64fd3ff87f9aa765bb5cda30967ab97349fc 100644
--- a/interface/web/mail/form/spamfilter_users.tform.php
+++ b/interface/web/mail/form/spamfilter_users.tform.php
@@ -90,6 +90,13 @@ $form["tabs"]['users'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'email_error_notempty'),
),
diff --git a/interface/web/mail/form/spamfilter_whitelist.tform.php b/interface/web/mail/form/spamfilter_whitelist.tform.php
index 4d476a75dc32f61a99d02942e11160fb9ddab4e0..73d53f887dc952b3c9bf01947751483606cf38fc 100644
--- a/interface/web/mail/form/spamfilter_whitelist.tform.php
+++ b/interface/web/mail/form/spamfilter_whitelist.tform.php
@@ -90,6 +90,13 @@ $form["tabs"]['whitelist'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'email_error_notempty'),
),
diff --git a/interface/web/mail/list/mail_alias.list.php b/interface/web/mail/list/mail_alias.list.php
index 2b5e773cb72684c776d8de56c6da340702cd90da..101644410b298a3f4036de0d959ff9cfef49fc4a 100644
--- a/interface/web/mail/list/mail_alias.list.php
+++ b/interface/web/mail/list/mail_alias.list.php
@@ -59,6 +59,9 @@ $liste["item"][] = array( 'field' => "active",
$liste["item"][] = array( 'field' => "source",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
@@ -68,6 +71,9 @@ $liste["item"][] = array( 'field' => "source",
$liste["item"][] = array( 'field' => "destination",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_aliasdomain.list.php b/interface/web/mail/list/mail_aliasdomain.list.php
index aa11ded0a4752ca689887eef4f447d64cdb635f7..f4385d8efc6d1ed4efc36015eeedecc23b72a2a6 100644
--- a/interface/web/mail/list/mail_aliasdomain.list.php
+++ b/interface/web/mail/list/mail_aliasdomain.list.php
@@ -59,6 +59,9 @@ $liste["item"][] = array( 'field' => "active",
$liste["item"][] = array( 'field' => "source",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
@@ -68,6 +71,9 @@ $liste["item"][] = array( 'field' => "source",
$liste["item"][] = array( 'field' => "destination",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_domain.list.php b/interface/web/mail/list/mail_domain.list.php
index 310ec88b1a2a32c436ca3cefe6a64d35f16dd758..0012e1c83bd7a6fc54dae5f26205d4df9ed75b26 100644
--- a/interface/web/mail/list/mail_domain.list.php
+++ b/interface/web/mail/list/mail_domain.list.php
@@ -95,6 +95,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_domain_catchall.list.php b/interface/web/mail/list/mail_domain_catchall.list.php
index 99b8c2cbf18aa7927dd32159fc20fef1d2c5c9bb..07f7e9f14866393b6b6ca6555ce45ad59eb64c41 100644
--- a/interface/web/mail/list/mail_domain_catchall.list.php
+++ b/interface/web/mail/list/mail_domain_catchall.list.php
@@ -59,6 +59,9 @@ $liste["item"][] = array( 'field' => "active",
$liste["item"][] = array( 'field' => "source",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
@@ -68,6 +71,9 @@ $liste["item"][] = array( 'field' => "source",
$liste["item"][] = array( 'field' => "destination",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_forward.list.php b/interface/web/mail/list/mail_forward.list.php
index 6f1e230c5a584df901955c1c5d7cf8842755416d..5aae2bb4a312351cd91e457f3262e84dc90e794d 100644
--- a/interface/web/mail/list/mail_forward.list.php
+++ b/interface/web/mail/list/mail_forward.list.php
@@ -59,6 +59,9 @@ $liste["item"][] = array( 'field' => "active",
$liste["item"][] = array( 'field' => "source",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
@@ -68,6 +71,9 @@ $liste["item"][] = array( 'field' => "source",
$liste["item"][] = array( 'field' => "destination",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_get.list.php b/interface/web/mail/list/mail_get.list.php
index 7e532f47172697898c47e8d00b8312898d90f6d4..bcce2c07747cea50899125ed9bcb468abbb57e43 100644
--- a/interface/web/mail/list/mail_get.list.php
+++ b/interface/web/mail/list/mail_get.list.php
@@ -91,6 +91,9 @@ $liste["item"][] = array( 'field' => "source_username",
$liste["item"][] = array( 'field' => "destination",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_mailinglist.list.php b/interface/web/mail/list/mail_mailinglist.list.php
index 27657d51d31bf3055725055ebf1701ee3939a84c..4bc3b0612bfeb8b11d6c3b2fa72005ae6904a6a1 100644
--- a/interface/web/mail/list/mail_mailinglist.list.php
+++ b/interface/web/mail/list/mail_mailinglist.list.php
@@ -57,6 +57,9 @@ $liste["item"][] = array( 'field' => "listname",
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_transport.list.php b/interface/web/mail/list/mail_transport.list.php
index d882c6fb8c2ec9ceaf5017b36c9bfc23cccad962..ccea270ea77b860aa99ae91b69460ca0f492fb1b 100644
--- a/interface/web/mail/list/mail_transport.list.php
+++ b/interface/web/mail/list/mail_transport.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_user.list.php b/interface/web/mail/list/mail_user.list.php
index 8306001e24bda3caa140015450e0a73c70f652f9..7e7868391fd8baa188fee0b124e18fa65ab1710e 100644
--- a/interface/web/mail/list/mail_user.list.php
+++ b/interface/web/mail/list/mail_user.list.php
@@ -49,6 +49,9 @@ $liste["auth"] = "yes";
$liste["item"][] = array( 'field' => "email",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/mail_user_stats.list.php b/interface/web/mail/list/mail_user_stats.list.php
index 8705defb1f796a66a6384d8e59bdb86da2c78380..aa144313ffaa78692f30a703bf0a5f78ee0f1390 100644
--- a/interface/web/mail/list/mail_user_stats.list.php
+++ b/interface/web/mail/list/mail_user_stats.list.php
@@ -49,6 +49,9 @@ $liste["auth"] = "yes";
$liste["item"][] = array( 'field' => "email",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/list/user_quota_stats.list.php b/interface/web/mail/list/user_quota_stats.list.php
index 0472afb26966cfbfead82b50205d1e7df86fca51..1123b935ec0e61ce0f749fdb2f15723487e150e1 100644
--- a/interface/web/mail/list/user_quota_stats.list.php
+++ b/interface/web/mail/list/user_quota_stats.list.php
@@ -47,6 +47,9 @@ $liste["auth"] = "yes";
$liste["item"][] = array( 'field' => "email",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index ce5e7cc2574fd3408cda51379aaec13dbab1ae12..7c1d7dff3897fbdd670f05b8ce688fc40550d0de 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -140,7 +140,7 @@ class page_action extends tform_actions {
if ($domain['domain'] == $this->dataRecord["domain"]) {
$domain_select .= " selected";
}
- $domain_select .= ">" . $domain['domain'] . "</option>\r\n";
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
}
}
else {
diff --git a/interface/web/mailuser/form/mail_user_cc.tform.php b/interface/web/mailuser/form/mail_user_cc.tform.php
index c46bed18651883cf7411f624a90661aac2b06928..222745d9c2010a54c2f095de44805745b00d9433 100644
--- a/interface/web/mailuser/form/mail_user_cc.tform.php
+++ b/interface/web/mailuser/form/mail_user_cc.tform.php
@@ -61,6 +61,13 @@ $form["tabs"]['mailuser'] = array (
'cc' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'REGEX',
'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z\-]{2,10}){0,1}$/i',
'errmsg'=> 'cc_error_isemail'),
diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php
index 342272e95587adad4a322ef6fe7bc31939e20fe4..d77d584d3863248bb29cc95255a64d900b8bdcae 100644
--- a/interface/web/sites/form/web_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_aliasdomain.tform.php
@@ -72,6 +72,13 @@ $form["tabs"]['domain'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'alias_domain',
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 673662fa354b903af8e433e82d80e7b2d49d6287..6b1d7f770ddff6037b93363f4919a6811088510b 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -119,14 +119,18 @@ $form["tabs"]['domain'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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'),
),
- 'filters' => array ( 0 => array ( 'event' => 'SAVE',
- 'type' => 'TOLOWER'),
- ),
'default' => '',
'value' => '',
'width' => '30',
diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php
index d8d6c2c523628b00bf31241ff140ad2568ddc2fe..633786a614f73d0c89c41e34bcbfcb66e69f4411 100644
--- a/interface/web/sites/form/web_subdomain.tform.php
+++ b/interface/web/sites/form/web_subdomain.tform.php
@@ -72,6 +72,13 @@ $form["tabs"]['domain'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'sub_domain',
diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php
index 3440eba590655a6a46a46bcfde88ee324913d79f..da017c401f05e375e3cae4c163357075ae2ef597 100644
--- a/interface/web/sites/form/web_vhost_subdomain.tform.php
+++ b/interface/web/sites/form/web_vhost_subdomain.tform.php
@@ -111,6 +111,13 @@ $form["tabs"]['domain'] = array (
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'sub_domain',
diff --git a/interface/web/sites/list/ftp_user.list.php b/interface/web/sites/list/ftp_user.list.php
index 45f0a90fa4f581868dcb413e172729ee5e96d2f5..2c64a948762ec22c2aa1567a322fd6763b9595a4 100644
--- a/interface/web/sites/list/ftp_user.list.php
+++ b/interface/web/sites/list/ftp_user.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "parent_domain_id",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
diff --git a/interface/web/sites/list/shell_user.list.php b/interface/web/sites/list/shell_user.list.php
index ac4de6e0457719e934bbed90a0f34e208afa2e6f..2dd2b4ea21142af7f638536a99291a4f1426aaf7 100644
--- a/interface/web/sites/list/shell_user.list.php
+++ b/interface/web/sites/list/shell_user.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "parent_domain_id",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
diff --git a/interface/web/sites/list/user_quota_stats.list.php b/interface/web/sites/list/user_quota_stats.list.php
index b43fc9819fb5583966071173eb09468607413e12..c3999c29d8b38c4c115654c78eed50b1d135b45a 100644
--- a/interface/web/sites/list/user_quota_stats.list.php
+++ b/interface/web/sites/list/user_quota_stats.list.php
@@ -49,6 +49,9 @@ $liste["auth"] = "yes";
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/sites/list/web_aliasdomain.list.php b/interface/web/sites/list/web_aliasdomain.list.php
index dcff7d10f7d3082629881edc73d9d24adb9043fd..a6921565dadf7430d10a83a0753ad5c2c85391a9 100644
--- a/interface/web/sites/list/web_aliasdomain.list.php
+++ b/interface/web/sites/list/web_aliasdomain.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "parent_domain_id",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
@@ -88,6 +91,9 @@ $liste["item"][] = array( 'field' => "parent_domain_id",
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/sites/list/web_domain.list.php b/interface/web/sites/list/web_domain.list.php
index e8633091efe86e591027f0ef7a43da4b8183179a..8f98f6e13269ebe5db1ad7db455567f4eacba96f 100644
--- a/interface/web/sites/list/web_domain.list.php
+++ b/interface/web/sites/list/web_domain.list.php
@@ -102,6 +102,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/sites/list/web_folder.list.php b/interface/web/sites/list/web_folder.list.php
index b8b22a0a7cea364fb35c52ca4b0f506847970de9..dfcb3799d735160698a653d0649792181c0cd613 100644
--- a/interface/web/sites/list/web_folder.list.php
+++ b/interface/web/sites/list/web_folder.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "parent_domain_id",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
diff --git a/interface/web/sites/list/web_folder_user.list.php b/interface/web/sites/list/web_folder_user.list.php
index 5b8324ace92049792a2b1b6e7495238249b48feb..f2843660d33f704af4d484650549b44e105ef59e 100644
--- a/interface/web/sites/list/web_folder_user.list.php
+++ b/interface/web/sites/list/web_folder_user.list.php
@@ -62,6 +62,9 @@ $liste["item"][] = array( 'field' => "active",
$liste["item"][] = array( 'field' => "web_folder_id",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
diff --git a/interface/web/sites/list/web_sites_stats.list.php b/interface/web/sites/list/web_sites_stats.list.php
index c6ffd3ee4be35b1a542a37fc2c4ceec64566950f..8539c7e55669018cd73174ece016f44f24ec5140 100644
--- a/interface/web/sites/list/web_sites_stats.list.php
+++ b/interface/web/sites/list/web_sites_stats.list.php
@@ -49,6 +49,9 @@ $liste["auth"] = "yes";
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/sites/list/web_subdomain.list.php b/interface/web/sites/list/web_subdomain.list.php
index 2664f447e29c13105f4f9bd56a7a76a2600d7b00..637de0e14e77ce4899650733ca30b54a9deae947 100644
--- a/interface/web/sites/list/web_subdomain.list.php
+++ b/interface/web/sites/list/web_subdomain.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "parent_domain_id",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
@@ -88,6 +91,9 @@ $liste["item"][] = array( 'field' => "parent_domain_id",
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/sites/list/web_vhost_subdomain.list.php b/interface/web/sites/list/web_vhost_subdomain.list.php
index 7b7a8d7706cbd5145993383c1f921fa9b7756513..192613c298a3dade41ced5958b02215c58dc1cc2 100644
--- a/interface/web/sites/list/web_vhost_subdomain.list.php
+++ b/interface/web/sites/list/web_vhost_subdomain.list.php
@@ -74,6 +74,9 @@ $liste["item"][] = array( 'field' => "server_id",
$liste["item"][] = array( 'field' => "parent_domain_id",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
@@ -88,6 +91,9 @@ $liste["item"][] = array( 'field' => "parent_domain_id",
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index 47fdf4cac7738fdf841597284e56bc1c2c0d5027..6025fc956adda25fa5ac3919622d68ffbe9128e2 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -99,7 +99,7 @@ class page_action extends tform_actions {
if ($domain['domain'] == $this->dataRecord["domain"]) {
$domain_select .= " selected";
}
- $domain_select .= ">" . $domain['domain'] . "</option>\r\n";
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
}
}
else {
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index ca57df34bc94027891f175025591482368646538..142c7d2a30e2d39091e33e2e555b337b9dfd6b65 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -432,7 +432,7 @@ class page_action extends tform_actions {
if ($domain['domain'] == $this->dataRecord["domain"]) {
$domain_select .= " selected";
}
- $domain_select .= ">" . $domain['domain'] . "</option>\r\n";
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
}
}
else {
diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php
index ad0079477659b1f2961af465231849ccd30efe68..577078b08ca6a20ff976d16f3fc0e27b47253d38 100644
--- a/interface/web/sites/web_subdomain_edit.php
+++ b/interface/web/sites/web_subdomain_edit.php
@@ -97,7 +97,7 @@ class page_action extends tform_actions {
$domain_select .= " selected";
$selected_domain = $domain['domain'];
}
- $domain_select .= ">" . $domain['domain'] . "</option>\r\n";
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
}
}
else {
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
index 62e351aed53f3b4591288f1cabcebba6027c458b..761be8801e0188d88f5af40a36d3ee169d8e45af 100644
--- a/interface/web/sites/web_vhost_subdomain_edit.php
+++ b/interface/web/sites/web_vhost_subdomain_edit.php
@@ -252,7 +252,7 @@ class page_action extends tform_actions {
$domain_select .= " selected";
$selected_domain = $domain['domain'];
}
- $domain_select .= ">" . $domain['domain'] . "</option>\r\n";
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
}
}
else {
diff --git a/interface/web/vm/form/openvz_vm.tform.php b/interface/web/vm/form/openvz_vm.tform.php
index 229d9df63d098564adc3ef7489e5e280404e8b81..efd9c842f0328ea03b11ce240671e3ca8bcddd4d 100644
--- a/interface/web/vm/form/openvz_vm.tform.php
+++ b/interface/web/vm/form/openvz_vm.tform.php
@@ -117,6 +117,13 @@ $form["tabs"]['main'] = array (
'hostname' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ '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' => 'NOTEMPTY',
'errmsg'=> 'hostname_error_empty'),
),
diff --git a/interface/web/vm/list/openvz_vm.list.php b/interface/web/vm/list/openvz_vm.list.php
index 0d9c5e6280816e94a518db416cbab2ab78cf4678..016165b0f7805185994ca92730658ad685b6733a 100644
--- a/interface/web/vm/list/openvz_vm.list.php
+++ b/interface/web/vm/list/openvz_vm.list.php
@@ -109,6 +109,9 @@ $liste["item"][] = array( 'field' => "template_id",
$liste["item"][] = array( 'field' => "hostname",
'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",