tbrehm
2010-07-19 7d4fdb7f83e4c24f02dcde6363ce95cd6eddb243
Implemented: FS#1253 - Set SRV priority
6 files modified
21 ■■■■■ changed files
interface/lib/classes/remoting.inc.php 2 ●●● patch | view | raw | blame | history
interface/lib/classes/remoting_lib.inc.php 10 ●●●● patch | view | raw | blame | history
interface/web/dns/form/dns_srv.tform.php 2 ●●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_srv.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/templates/dns_srv_edit.htm 4 ●●●● patch | view | raw | blame | history
server/conf/bind_pri.domain.master 2 ●●● patch | view | raw | blame | history
interface/lib/classes/remoting.inc.php
@@ -2060,7 +2060,7 @@
        $app->uses('remoting_lib');
        
        //* load the user profile of the client
        $app->remoting_lib->loadUserProfile($client_id);
        $app->remoting_lib->loadUserProfile(0);
        
        //* Load the form definition
        $app->remoting_lib->loadFormDef($formdef_file);
interface/lib/classes/remoting_lib.inc.php
@@ -696,6 +696,10 @@
        function datalogSave($action,$primary_id, $record_old, $record_new) {
                global $app,$conf;
                $app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new);
                return true;
                /*
                if(stristr($this->formDef['db_table'],'.')) {
                        $escape = '';
@@ -752,11 +756,6 @@
                        }
                }
                
                /*
                echo "<pre>";
                print_r($diffrec_full);
                echo "</pre>";
                */
                
                // Insert the server_id, if the record has a server_id
                $server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0;
@@ -776,6 +775,7 @@
                }
                return true;
                */
        }
interface/web/dns/form/dns_srv.tform.php
@@ -108,7 +108,6 @@
            'width'        => '30',
            'maxlength'    => '255'
        ),
        /*
        'aux' => array (
            'datatype'    => 'INTEGER',
            'formtype'    => 'TEXT',
@@ -117,7 +116,6 @@
            'width'        => '10',
            'maxlength'    => '10'
        ),
        */
        'ttl' => array (
            'datatype'    => 'INTEGER',
            'formtype'    => 'TEXT',
interface/web/dns/lib/lang/en_dns_srv.lng
@@ -6,6 +6,7 @@
$wb["data_txt"] = 'Server Record';
$wb["ttl_txt"] = 'TTL';
$wb["active_txt"] = 'Active';
$wb["aux_txt"] = 'Priority';
$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
$wb["name_error_empty"] = 'The hostname is empty.';
interface/web/dns/templates/dns_srv_edit.htm
@@ -13,6 +13,10 @@
          <label for="data">{tmpl_var name='data_txt'}</label>
        <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
      <div class="ctrlHolder">
          <label for="aux">{tmpl_var name='aux_txt'}</label>
        <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
            </div>
      <div class="ctrlHolder">
          <label for="ttl">{tmpl_var name='ttl_txt'}</label>
        <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
server/conf/bind_pri.domain.master
@@ -39,7 +39,7 @@
{tmpl_var name='name'}      RP        {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='SRV'>
{tmpl_var name='name'}      SRV        0 {tmpl_var name='data'}
{tmpl_var name='name'}      SRV        {tmpl_var name='aux'} {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='TXT'>
{tmpl_var name='name'}      TXT        {tmpl_var name='data'}