Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

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

@@ -117,7 +117,7 @@
            ),
            2 => array ( 
               'type' => 'REGEX', 
               'regex' => "/^((?!v=DMARC).)*$/s", 
               'regex' => "/^((?!v=DMARC1; ).)*$/s", 
               'errmsg'=> 'invalid_type_dmarc'),
            3 => array ( 
               'type' => 'REGEX', 
@@ -137,7 +137,7 @@
               'range' => '60:',
               'errmsg'=> 'ttl_range_error'),
         ),
         'default' => '86400',
         'default' => '3600',
         'value'  => '',
         'width'  => '10',
         'maxlength' => '10'
@@ -170,6 +170,10 @@
   )
);



if($_SESSION["s"]["user"]["typ"] == 'admin') {
   unset($form["tabs"]['dns']['fields']['data']['validators']);
   $form["tabs"]['dns']['fields']['data']['validators'][0]['type'] = 'NOTEMPTY';
   $form["tabs"]['dns']['fields']['data']['validators'][0]['errmsg'] = 'data_error_empty';
   $form["tabs"]['dns']['fields']['data']['maxlength'] = 512;
}
?>