Merged these revisions from trunk: 2153-2164,2166,2168,2171

tbrehm

2011-01-11 04620b7ff00c194ae1bf4c398ebcb26d5c950b6a

 interface/web/dns/form/dns_soa.tform.php

@@ -82,7 +82,7 @@
                              1 => array (   'type'   => 'UNIQUE',
                                          'errmsg'=> 'origin_error_unique'),
                              2 => array (   'type'   => 'REGEX',
                                          'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z\-]{2,10}[\.]{0,1}$/',
                                          'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/',
                                          'errmsg'=> 'origin_error_regex'),
                           ),
         'default'   => '',