Skip to content

Commit 66e957e

Browse files
tbrehmtbrehm
committed
Added: FS#938 - Add also_notify and update_acl to mydns table
1 parent 3d229b0 commit 66e957e

File tree

4 files changed

+115
-86
lines changed

4 files changed

+115
-86
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ CREATE TABLE `dns_soa` (
231231
`ttl` int(11) unsigned NOT NULL default '86400',
232232
`active` enum('N','Y') NOT NULL,
233233
`xfer` varchar(255) NOT NULL,
234+
`also_notify` varchar(255) default NULL,
235+
`update_acl` varchar(255) default NULL,
234236
PRIMARY KEY (`id`),
235237
UNIQUE KEY `origin` (`origin`),
236238
KEY `active` (`active`)

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,22 @@
172172
'width' => '30',
173173
'maxlength' => '255'
174174
),
175+
'also_notify' => array (
176+
'datatype' => 'VARCHAR',
177+
'formtype' => 'TEXT',
178+
'default' => '',
179+
'value' => '',
180+
'width' => '30',
181+
'maxlength' => '255'
182+
),
183+
'update_acl' => array (
184+
'datatype' => 'VARCHAR',
185+
'formtype' => 'TEXT',
186+
'default' => '',
187+
'value' => '',
188+
'width' => '30',
189+
'maxlength' => '255'
190+
),
175191
'active' => array (
176192
'datatype' => 'VARCHAR',
177193
'formtype' => 'CHECKBOX',

‎interface/web/dns/lib/lang/en_dns_soa.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ $wb["origin_error_regex"] = 'Zone has a invalid format.';
2121
$wb["ns_error_regex"] = 'NS has a invalid format.';
2222
$wb["mbox_error_empty"] = 'Email is empty.';
2323
$wb["mbox_error_regex"] = 'Email format invalid.';
24+
$wb["also_notify_txt"] = 'Also Notify';
25+
$wb["update_acl_txt"] = 'Update ACL';
2426
?>

‎interface/web/dns/templates/dns_soa_edit.htm‎

Lines changed: 95 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,95 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
<p><tmpl_var name="list_desc_txt"></p>
3-
4-
<div class="panel panel_dns_soa">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>DNS Zone</legend>
8-
<tmpl_if name="is_admin">
9-
<div class="ctrlHolder">
10-
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
11-
<select name="server_id" id="server_id" class="selectInput">
12-
{tmpl_var name='server_id'}
13-
</select>
14-
</div>
15-
<div class="ctrlHolder">
16-
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
17-
<select name="client_group_id" id="client_group_id" class="selectInput">
18-
{tmpl_var name='client_group_id'}
19-
</select>
20-
</div>
21-
</tmpl_if>
22-
<tmpl_if name="is_reseller">
23-
<div class="ctrlHolder">
24-
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
25-
<select name="client_group_id" id="client_group_id" class="selectInput">
26-
{tmpl_var name='client_group_id'}
27-
</select>
28-
</div>
29-
</tmpl_if>
30-
<div class="ctrlHolder">
31-
<label for="origin">{tmpl_var name='origin_txt'}</label>
32-
<input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
33-
<p class="formHint">e.g. domain.tld.</p>
34-
</div>
35-
<div class="ctrlHolder">
36-
<label for="ns">{tmpl_var name='ns_txt'}</label>
37-
<input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
38-
<p class="formHint">e.g. ns1.domain.tld.</p>
39-
</div>
40-
<div class="ctrlHolder">
41-
<label for="mbox">{tmpl_var name='mbox_txt'}</label>
42-
<input name="mbox" id="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255" type="text" class="textInput" />
43-
<p class="formHint"> e.g. webmaster.domain.tld.</p>
44-
</div>
45-
<div class="ctrlHolder">
46-
<label for="refresh">{tmpl_var name='refresh_txt'}</label>
47-
<input name="refresh" id="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
48-
</div>
49-
<div class="ctrlHolder">
50-
<label for="retry">{tmpl_var name='retry_txt'}</label>
51-
<input name="retry" id="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
52-
</div>
53-
<div class="ctrlHolder">
54-
<label for="expire">{tmpl_var name='expire_txt'}</label>
55-
<input name="expire" id="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
56-
</div>
57-
<div class="ctrlHolder">
58-
<label for="minimum">{tmpl_var name='minimum_txt'}</label>
59-
<input name="minimum" id="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
60-
</div>
61-
<div class="ctrlHolder">
62-
<label for="ttl">{tmpl_var name='ttl_txt'}</label>
63-
<input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
64-
</div>
65-
<div class="ctrlHolder">
66-
<label for="xfer">{tmpl_var name='xfer_txt'}</label>
67-
<input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
68-
</div>
69-
<div class="ctrlHolder">
70-
<p class="label">{tmpl_var name='active_txt'}</p>
71-
<div class="multiField">
72-
{tmpl_var name='active'}
73-
</div>
74-
</div>
75-
</fieldset>
76-
77-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
78-
<input name="serial" type="hidden" value="{tmpl_var name='serial'}">
79-
80-
<div class="buttonHolder buttons">
81-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
82-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
83-
</div>
84-
</div>
85-
86-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<div class="panel panel_dns_soa">
5+
6+
<div class="pnl_formsarea">
7+
<fieldset class="inlineLabels"><legend>DNS Zone</legend>
8+
<tmpl_if name="is_admin">
9+
<div class="ctrlHolder">
10+
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
11+
<select name="server_id" id="server_id" class="selectInput">
12+
{tmpl_var name='server_id'}
13+
</select>
14+
</div>
15+
<div class="ctrlHolder">
16+
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
17+
<select name="client_group_id" id="client_group_id" class="selectInput">
18+
{tmpl_var name='client_group_id'}
19+
</select>
20+
</div>
21+
</tmpl_if>
22+
<tmpl_if name="is_reseller">
23+
<div class="ctrlHolder">
24+
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
25+
<select name="client_group_id" id="client_group_id" class="selectInput">
26+
{tmpl_var name='client_group_id'}
27+
</select>
28+
</div>
29+
</tmpl_if>
30+
<div class="ctrlHolder">
31+
<label for="origin">{tmpl_var name='origin_txt'}</label>
32+
<input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
33+
<p class="formHint">e.g. domain.tld.</p>
34+
</div>
35+
<div class="ctrlHolder">
36+
<label for="ns">{tmpl_var name='ns_txt'}</label>
37+
<input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
38+
<p class="formHint">e.g. ns1.domain.tld.</p>
39+
</div>
40+
<div class="ctrlHolder">
41+
<label for="mbox">{tmpl_var name='mbox_txt'}</label>
42+
<input name="mbox" id="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255" type="text" class="textInput" />
43+
<p class="formHint"> e.g. webmaster.domain.tld.</p>
44+
</div>
45+
<div class="ctrlHolder">
46+
<label for="refresh">{tmpl_var name='refresh_txt'}</label>
47+
<input name="refresh" id="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
48+
</div>
49+
<div class="ctrlHolder">
50+
<label for="retry">{tmpl_var name='retry_txt'}</label>
51+
<input name="retry" id="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
52+
</div>
53+
<div class="ctrlHolder">
54+
<label for="expire">{tmpl_var name='expire_txt'}</label>
55+
<input name="expire" id="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
56+
</div>
57+
<div class="ctrlHolder">
58+
<label for="minimum">{tmpl_var name='minimum_txt'}</label>
59+
<input name="minimum" id="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
60+
</div>
61+
<div class="ctrlHolder">
62+
<label for="ttl">{tmpl_var name='ttl_txt'}</label>
63+
<input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
64+
</div>
65+
<div class="ctrlHolder">
66+
<label for="xfer">{tmpl_var name='xfer_txt'}</label>
67+
<input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
68+
</div>
69+
<div class="ctrlHolder">
70+
<label for="also_notify">{tmpl_var name='also_notify_txt'}</label>
71+
<input name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" size="30" maxlength="255" type="text" class="textInput" />
72+
</div>
73+
<div class="ctrlHolder">
74+
<label for="update_acl">{tmpl_var name='update_acl_txt'}</label>
75+
<input name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" size="30" maxlength="255" type="text" class="textInput" />
76+
</div>
77+
78+
<div class="ctrlHolder">
79+
<p class="label">{tmpl_var name='active_txt'}</p>
80+
<div class="multiField">
81+
{tmpl_var name='active'}
82+
</div>
83+
</div>
84+
</fieldset>
85+
86+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
87+
<input name="serial" type="hidden" value="{tmpl_var name='serial'}">
88+
89+
<div class="buttonHolder buttons">
90+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
91+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
92+
</div>
93+
</div>
94+
95+
</div>

0 commit comments

Comments
 (0)