From 8ec1d88214d82a625af71a50155895d3b202deaf Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Thu, 13 Sep 2012 04:13:56 -0400
Subject: [PATCH] Fixed: FS#2426 - Auto subdomains are ignored when checking if domain is unique Implemented: FS#2427 - Allow wildcard subdomain creation on limit_wildcard = y
---
interface/web/sites/form/web_domain.tform.php | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 467376c..1deec48 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -119,14 +119,11 @@
'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'),
- ),
+ 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_domain',
+ 'function' => 'web_domain',
+ 'errmsg'=> 'domain_error_regex'),
+ ),
'filters' => array ( 0 => array ( 'event' => 'SAVE',
'type' => 'TOLOWER'),
),
--
Gitblit v1.9.1