Merged Revisions 3771-3801 from stable branch.

tbrehm

2013-02-12 72695f0356210b5ca68d33d09e91c00ed9d6c2b6

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

@@ -217,8 +217,9 @@
      'xfer' => array (
         'datatype'   => 'VARCHAR',
         'formtype'   => 'TEXT',
         'validators'   => array (    0 => array (   'type'   => 'REGEX',
                                          'regex' => '/^[0-9\.\,]{0,255}$/',
         'validators'   => array (    0 => array (   'type'   => 'ISIP',
                                          'allowempty' => 'y',
                                          'separator' => ',',
                                          'errmsg'=> 'xfer_error_regex'),
                           ),
         'default'   => '',
@@ -229,13 +230,11 @@
      'also_notify' => array (
         'datatype'   => 'VARCHAR',
         'formtype'   => 'TEXT',
         'validators'    => array (  0 => array (   'type'   => 'REGEX',
                                          'regex' => '/^(((25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})\.){3}(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(;){0,1}(\ ){0,1}){0,10}$/',
         'validators'    => array (  0 => array (   'type'   => 'ISIP',
                                          'allowempty' => 'y',
                                          'separator' => ',',
                                          'errmsg'=> 'also_notify_error_regex'
                                       ),
//                              0 => array (    'type'  => 'ISIPV4',
//                                          'errmsg'=> 'also_notify_error_regex'
//                                       ),
                           ),
         'default'   => '',
         'value'      => '',