Merged revisions 3922-3958 from stable branch.

tbrehm

2013-04-19 3f478f7b37eb314c7dba33af10e8d32d5f2fa579

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

@@ -91,9 +91,11 @@
                                ),
         'validators'   => array (    0 => array (   'type'   => 'NOTEMPTY',
                                          'errmsg'=> 'origin_error_empty'),
                              /*
                              1 => array (   'type'   => 'UNIQUE',
                                          'errmsg'=> 'origin_error_unique'),
                              2 => array (   'type'   => 'REGEX',
                              */
                              1 => array (   'type'   => 'REGEX',
                                          'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
                                          'errmsg'=> 'origin_error_regex'),
                           ),