Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/client/form/reseller.tform.php

@@ -894,6 +894,17 @@
         'rows'      => '',
         'cols'      => ''
      ),
      'default_slave_dnsserver' => array (
         'datatype'   => 'INTEGER',
         'formtype'   => 'SELECT',
         'default'   => '1',
         'datasource'   => array (    'type'   => 'SQL',
                              'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
                              'keyfield'=> 'server_id',
                              'valuefield'=> 'server_name'
                            ),
         'value'      => ''
      ),
                'limit_dns_slave_zone' => array (
                        'datatype'      => 'INTEGER',
                        'formtype'      => 'TEXT',