From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
interface/web/dns/form/dns_cname.tform.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php
index ca2419b..5fdf8c9 100644
--- a/interface/web/dns/form/dns_cname.tform.php
+++ b/interface/web/dns/form/dns_cname.tform.php
@@ -86,7 +86,7 @@
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
+ 'regex' => '/^[a-zA-Z0-9\.\-\*\_]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
@@ -140,7 +140,7 @@
'range' => '60:',
'errmsg'=> 'ttl_range_error'),
),
- 'default' => '86400',
+ 'default' => '3600',
'value' => '',
'width' => '10',
'maxlength' => '10'
--
Gitblit v1.9.1