Skip to content

Commit 7d4fdb7

Browse files
committed
Implemented: FS#1253 - Set SRV priority
1 parent fd4cfde commit 7d4fdb7

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

interface/lib/classes/remoting.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2060,7 +2060,7 @@ private function deleteQuery($formdef_file, $primary_id)
20602060
$app->uses('remoting_lib');
20612061

20622062
//* load the user profile of the client
2063-
$app->remoting_lib->loadUserProfile($client_id);
2063+
$app->remoting_lib->loadUserProfile(0);
20642064

20652065
//* Load the form definition
20662066
$app->remoting_lib->loadFormDef($formdef_file);

interface/lib/classes/remoting_lib.inc.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,10 @@ function ispconfig_sysuser_delete($client_id){
696696

697697
function datalogSave($action,$primary_id, $record_old, $record_new) {
698698
global $app,$conf;
699+
700+
$app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new);
701+
return true;
702+
/*
699703
700704
if(stristr($this->formDef['db_table'],'.')) {
701705
$escape = '';
@@ -752,11 +756,6 @@ function datalogSave($action,$primary_id, $record_old, $record_new) {
752756
}
753757
}
754758
755-
/*
756-
echo "<pre>";
757-
print_r($diffrec_full);
758-
echo "</pre>";
759-
*/
760759
761760
// Insert the server_id, if the record has a server_id
762761
$server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0;
@@ -776,6 +775,7 @@ function datalogSave($action,$primary_id, $record_old, $record_new) {
776775
}
777776
778777
return true;
778+
*/
779779

780780
}
781781

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
'width' => '30',
109109
'maxlength' => '255'
110110
),
111-
/*
112111
'aux' => array (
113112
'datatype' => 'INTEGER',
114113
'formtype' => 'TEXT',
@@ -117,7 +116,6 @@
117116
'width' => '10',
118117
'maxlength' => '10'
119118
),
120-
*/
121119
'ttl' => array (
122120
'datatype' => 'INTEGER',
123121
'formtype' => 'TEXT',

interface/web/dns/lib/lang/en_dns_srv.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $wb["type_txt"] = 'type';
66
$wb["data_txt"] = 'Server Record';
77
$wb["ttl_txt"] = 'TTL';
88
$wb["active_txt"] = 'Active';
9+
$wb["aux_txt"] = 'Priority';
910
$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
1011
$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
1112
$wb["name_error_empty"] = 'The hostname is empty.';

interface/web/dns/templates/dns_srv_edit.htm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
1313
<label for="data">{tmpl_var name='data_txt'}</label>
1414
<input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
1515
</div>
16+
<div class="ctrlHolder">
17+
<label for="aux">{tmpl_var name='aux_txt'}</label>
18+
<input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
19+
</div>
1620
<div class="ctrlHolder">
1721
<label for="ttl">{tmpl_var name='ttl_txt'}</label>
1822
<input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />

server/conf/bind_pri.domain.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $TTL {tmpl_var name='ttl'}
3939
{tmpl_var name='name'} RP {tmpl_var name='data'}
4040
</tmpl_if>
4141
<tmpl_if name="type" op='==' value='SRV'>
42-
{tmpl_var name='name'} SRV 0 {tmpl_var name='data'}
42+
{tmpl_var name='name'} SRV {tmpl_var name='aux'} {tmpl_var name='data'}
4343
</tmpl_if>
4444
<tmpl_if name="type" op='==' value='TXT'>
4545
{tmpl_var name='name'} TXT {tmpl_var name='data'}

0 commit comments

Comments
 (0)