From 1a58df6d5465130d1ce2a092d03060fe744042ed Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Nov 2012 13:21:44 -0500
Subject: [PATCH] Fixed: FS#2555 - Mail domain delete function deletes forwards while it shall delete aliases only
---
interface/web/dns/form/dns_srv.tform.php | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/interface/web/dns/form/dns_srv.tform.php b/interface/web/dns/form/dns_srv.tform.php
index a5e0004..736bbc9 100644
--- a/interface/web/dns/form/dns_srv.tform.php
+++ b/interface/web/dns/form/dns_srv.tform.php
@@ -32,6 +32,7 @@
*/
+global $app;
$form["title"] = "DNS SRV";
$form["description"] = "";
@@ -69,7 +70,7 @@
'zone' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
- 'default' => @intval($_REQUEST["zone"]),
+ 'default' => @$app->functions->intval($_REQUEST["zone"]),
'value' => '',
'width' => '30',
'maxlength' => '255'
@@ -77,8 +78,15 @@
'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}$/',
+ 'regex' => '/^[\w\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
@@ -99,16 +107,15 @@
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
- 1 => array ( 'type' => 'REGEX',
- 'regex' => '/^[\w\.\-]{0,64}\s[\w\.\-]{0,64}\s[\w\.\-]{0,64}$/',
- 'errmsg'=> 'srv_error_regex'),
+ 1 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[\w\.\-]{0,64}\s[\w\.\-]{0,64}\s[\w\.\-]{0,64}$/',
+ 'errmsg'=> 'srv_error_regex'),
),
'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
),
- /*
'aux' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -117,7 +124,6 @@
'width' => '10',
'maxlength' => '10'
),
- */
'ttl' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
--
Gitblit v1.9.1