Skip to content

Commit f6ee7a1

Browse files
falkotimmefalkotimme
committed
1 parent 040f8cf commit f6ee7a1

File tree

10 files changed

+917
-860
lines changed

10 files changed

+917
-860
lines changed

‎interface/lib/classes/tform.inc.php‎

Lines changed: 828 additions & 820 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
'ttl' => array (
119119
'datatype' => 'INTEGER',
120120
'formtype' => 'TEXT',
121-
'validators' => array (0 => array ('type' => 'NOTEMPTY',
122-
'errmsg'=> 'rr_ttl_error_empty'),
121+
'validators' => array (0 => array ('type' => 'ISPOSITIVE',
122+
'errmsg'=> 'rr_ttl_error_notpositive'),
123123
),
124124
'default' => '86400',
125125
'value' => '86400',

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@
109109
'serial' => array (
110110
'datatype' => 'INTEGER',
111111
'formtype' => 'TEXT',
112+
'validators' => array (0 => array ( 'type' => 'ISPOSITIVE',
113+
'errmsg'=> 'serial_error_notpositive'),
114+
),
112115
'default' => date("Ymd").'01',
113116
'value' => date("Ymd").'01',
114117
'width' => '30',
@@ -117,6 +120,9 @@
117120
'refresh' => array (
118121
'datatype' => 'INTEGER',
119122
'formtype' => 'TEXT',
123+
'validators' => array (0 => array ( 'type' => 'ISPOSITIVE',
124+
'errmsg'=> 'refresh_error_notpositive'),
125+
),
120126
'default' => $conf['default_refresh'],
121127
'value' => $conf['default_refresh'],
122128
'width' => '30',
@@ -125,6 +131,9 @@
125131
'retry' => array (
126132
'datatype' => 'INTEGER',
127133
'formtype' => 'TEXT',
134+
'validators' => array (0 => array ( 'type' => 'ISPOSITIVE',
135+
'errmsg'=> 'retry_error_notpositive'),
136+
),
128137
'default' => $conf['default_retry'],
129138
'value' => $conf['default_retry'],
130139
'width' => '30',
@@ -133,6 +142,9 @@
133142
'expire' => array (
134143
'datatype' => 'INTEGER',
135144
'formtype' => 'TEXT',
145+
'validators' => array (0 => array ( 'type' => 'ISPOSITIVE',
146+
'errmsg'=> 'expire_error_notpositive'),
147+
),
136148
'default' => $conf['default_expire'],
137149
'value' => $conf['default_expire'],
138150
'width' => '30',
@@ -141,6 +153,9 @@
141153
'minimum' => array (
142154
'datatype' => 'INTEGER',
143155
'formtype' => 'TEXT',
156+
'validators' => array (0 => array ( 'type' => 'ISPOSITIVE',
157+
'errmsg'=> 'minimum_error_notpositive'),
158+
),
144159
'default' => $conf['default_minimum_ttl'],
145160
'value' => $conf['default_minimum_ttl'],
146161
'width' => '30',
@@ -149,6 +164,9 @@
149164
'ttl' => array (
150165
'datatype' => 'INTEGER',
151166
'formtype' => 'TEXT',
167+
'validators' => array (0 => array ( 'type' => 'ISPOSITIVE',
168+
'errmsg'=> 'ttl_error_notpositive'),
169+
),
152170
'default' => $conf['default_ttl'],
153171
'value' => $conf['default_ttl'],
154172
'width' => '30',

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?php
2-
$wb["zone_txt"] = 'zone';
3-
$wb["name_txt"] = 'name';
4-
$wb["type_txt"] = 'type';
5-
$wb["data_txt"] = 'data';
6-
$wb["aux_txt"] = 'aux';
7-
$wb["ttl_txt"] = 'ttl';
2+
$wb["zone_txt"] = 'Zone';
3+
$wb["name_txt"] = 'Name';
4+
$wb["type_txt"] = 'Type';
5+
$wb["data_txt"] = 'Data';
6+
$wb["aux_txt"] = 'Preference/Priority';
7+
$wb["ttl_txt"] = 'TTL';
88
$wb["btn_save_txt"] = 'Save';
99
$wb["btn_cancel_txt"] = 'Cancel';
10+
$wb["rr_data_error_empty"] = 'The data field must not be empty!';
11+
$wb["rr_ttl_error_notpositive"] = 'The TTL must be positive!';
1012
?>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?php
2-
$wb["list_head_txt"] = 'rr';
3-
$wb["name_txt"] = 'name';
4-
$wb["type_txt"] = 'type';
5-
$wb["data_txt"] = 'data';
6-
$wb["aux_txt"] = 'aux';
7-
$wb["ttl_txt"] = 'ttl';
2+
$wb["list_head_txt"] = 'Records';
3+
$wb["name_txt"] = 'Name';
4+
$wb["type_txt"] = 'Type';
5+
$wb["data_txt"] = 'Data';
6+
$wb["aux_txt"] = 'Preference/Priority';
7+
$wb["ttl_txt"] = 'TTL';
88
$wb["page_txt"] = 'Page';
99
$wb["page_of_txt"] = 'of';
1010
$wb["page_next_txt"] = 'Next';
1111
$wb["page_back_txt"] = 'Back';
1212
$wb["delete_txt"] = 'Delete';
1313
$wb["filter_txt"] = 'Filter';
14+
$wb["add_new_record_txt"] = 'Add New Record';
1415
?>

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

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
<?php
2-
$wb["origin_txt"] = 'origin';
3-
$wb["ns_txt"] = 'ns';
4-
$wb["mbox_txt"] = 'mbox';
5-
$wb["serial_txt"] = 'serial';
6-
$wb["refresh_txt"] = 'refresh';
7-
$wb["retry_txt"] = 'retry';
8-
$wb["expire_txt"] = 'expire';
9-
$wb["minimum_txt"] = 'minimum';
10-
$wb["ttl_txt"] = 'ttl';
11-
$wb["active_txt"] = 'active';
12-
$wb["xfer_txt"] = 'xfer';
2+
$wb["origin_txt"] = 'Origin';
3+
$wb["ns_txt"] = 'Name Server';
4+
$wb["mbox_txt"] = 'Admin Email';
5+
$wb["serial_txt"] = 'Serial No.';
6+
$wb["refresh_txt"] = 'Refresh';
7+
$wb["retry_txt"] = 'Retry';
8+
$wb["expire_txt"] = 'Expire';
9+
$wb["minimum_txt"] = 'Minimum TTL';
10+
$wb["ttl_txt"] = 'TTL';
11+
$wb["active_txt"] = 'Active';
12+
$wb["xfer_txt"] = 'Zone Transfers';
1313
$wb["btn_save_txt"] = 'Save';
1414
$wb["btn_cancel_txt"] = 'Cancel';
15+
$wb["soa_error_empty"] = 'The origin must not be empty!';
16+
$wb["soa_error_unique"] = 'This origin does already exist! The origin must be unique!';
17+
$wb["ns_error_empty"] = 'The name server must not be empty!';
18+
$wb["mbox_error_empty"] = 'The admin email address must not be empty!';
19+
$wb["serial_error_notpositive"] = 'The serial no. must be positive!';
20+
$wb["refresh_error_notpositive"] = 'The refresh must be positive!';
21+
$wb["retry_error_notpositive"] = 'The retry must be positive!';
22+
$wb["expire_error_notpositive"] = 'The expire must be positive!';
23+
$wb["minimum_error_notpositive"] = 'The minimum TTL must be positive!';
24+
$wb["ttl_error_notpositive"] = 'The TTL must be positive!';
1525
?>

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
<?php
2-
$wb["list_head_txt"] = 'soa';
3-
$wb["origin_txt"] = 'origin';
4-
$wb["ns_txt"] = 'ns';
5-
$wb["mbox_txt"] = 'mbox';
6-
$wb["serial_txt"] = 'serial';
7-
$wb["refresh_txt"] = 'refresh';
8-
$wb["retry_txt"] = 'retry';
9-
$wb["expire_txt"] = 'expire';
10-
$wb["minimum_txt"] = 'minimum';
11-
$wb["ttl_txt"] = 'ttl';
12-
$wb["active_txt"] = 'active';
13-
$wb["xfer_txt"] = 'xfer';
2+
$wb["list_head_txt"] = 'Zones (SOA)';
3+
$wb["origin_txt"] = 'Origin';
4+
$wb["ns_txt"] = 'Name Server';
5+
$wb["mbox_txt"] = 'Admin Email';
6+
$wb["serial_txt"] = 'Serial No.';
7+
$wb["refresh_txt"] = 'Refresh';
8+
$wb["retry_txt"] = 'Retry';
9+
$wb["expire_txt"] = 'Expire';
10+
$wb["minimum_txt"] = 'Minimum TTL';
11+
$wb["ttl_txt"] = 'TTL';
12+
$wb["active_txt"] = 'Active';
13+
$wb["xfer_txt"] = 'Zone Transfer';
1414
$wb["page_txt"] = 'Page';
1515
$wb["page_of_txt"] = 'of';
1616
$wb["page_next_txt"] = 'Next';
1717
$wb["page_back_txt"] = 'Back';
1818
$wb["delete_txt"] = 'Delete';
1919
$wb["filter_txt"] = 'Filter';
20+
$wb["Y"] = 'Yes';
21+
$wb["N"] = 'No';
22+
$wb["add_new_record_txt"] = 'Add New Zone';
2023
?>

‎interface/web/dns/list/soa.list.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
'width' => "",
6666
'value' => "");
6767

68+
/*
6869
$liste["item"][] = array( 'field' => "mbox",
6970
'datatype' => "VARCHAR",
7071
'formtype' => "TEXT",
@@ -118,6 +119,7 @@
118119
'suffix' => "",
119120
'width' => "",
120121
'value' => "");
122+
*/
121123

122124
$liste["item"][] = array( 'field' => "ttl",
123125
'datatype' => "INTEGER",
@@ -137,6 +139,7 @@
137139
'width' => "",
138140
'value' => "");
139141

142+
/*
140143
$liste["item"][] = array( 'field' => "xfer",
141144
'datatype' => "VARCHAR",
142145
'formtype' => "TEXT",
@@ -145,6 +148,6 @@
145148
'suffix' => "%",
146149
'width' => "",
147150
'value' => "");
148-
151+
*/
149152

150153
?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<td width="366" class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="30" maxlength="255"></td>
3737
</tr>
3838
<tr>
39-
<td width="126" class="frmText11">{tmpl_var name='active_txt'}:</td>
39+
<td width="126" class="frmText11" valign="top">{tmpl_var name='active_txt'}:</td>
4040
<td width="366" class="frmText11">{tmpl_var name='active'}</td>
4141
</tr>
4242
<tr>

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,62 @@
55
<tr>
66
<td class="tblHead"><tmpl_var name="origin_txt"></td>
77
<td class="tblHead"><tmpl_var name="ns_txt"></td>
8+
<!--
89
<td class="tblHead"><tmpl_var name="mbox_txt"></td>
910
<td class="tblHead"><tmpl_var name="serial_txt"></td>
1011
<td class="tblHead"><tmpl_var name="refresh_txt"></td>
1112
<td class="tblHead"><tmpl_var name="retry_txt"></td>
1213
<td class="tblHead"><tmpl_var name="expire_txt"></td>
1314
<td class="tblHead"><tmpl_var name="minimum_txt"></td>
15+
//-->
1416
<td class="tblHead"><tmpl_var name="ttl_txt"></td>
1517
<td class="tblHead"><tmpl_var name="active_txt"></td>
18+
<!--
1619
<td class="tblHead"><tmpl_var name="xfer_txt"></td>
20+
//-->
1721
<td class="tblHead">&nbsp;</td>
1822
</tr>
1923
<tr>
2024
<td class="frmText11"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" class="text" /></td>
2125
<td class="frmText11"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" class="text" /></td>
26+
<!--
2227
<td class="frmText11"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" class="text" /></td>
2328
<td class="frmText11"><input type="text" name="search_serial" value="{tmpl_var name='search_serial'}" class="text" /></td>
2429
<td class="frmText11"><input type="text" name="search_refresh" value="{tmpl_var name='search_refresh'}" class="text" /></td>
2530
<td class="frmText11"><input type="text" name="search_retry" value="{tmpl_var name='search_retry'}" class="text" /></td>
2631
<td class="frmText11"><input type="text" name="search_expire" value="{tmpl_var name='search_expire'}" class="text" /></td>
2732
<td class="frmText11"><input type="text" name="search_minimum" value="{tmpl_var name='search_minimum'}" class="text" /></td>
33+
//-->
2834
<td class="frmText11"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" class="text" /></td>
2935
<td class="frmText11"><input type="text" name="search_active" value="{tmpl_var name='search_active'}" class="text" /></td>
36+
<!--
3037
<td class="frmText11"><input type="text" name="search_xfer" value="{tmpl_var name='search_xfer'}" class="text" /></td>
38+
//-->
3139
<td class="frmText11" align="right"><input name="Filter" type="submit" id="Filter" value="{tmpl_var name="filter_txt"}"></td>
3240
</tr>
3341
<tmpl_loop name="records">
3442
<tr bgcolor="{tmpl_var name="bgcolor"}">
3543
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="origin"}</a></td>
3644
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="ns"}</a></td>
45+
<!--
3746
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="mbox"}</a></td>
3847
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="serial"}</a></td>
3948
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="refresh"}</a></td>
4049
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="retry"}</a></td>
4150
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="expire"}</a></td>
4251
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="minimum"}</a></td>
52+
//-->
4353
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="ttl"}</a></td>
4454
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="active"}</a></td>
55+
<!--
4556
<td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="xfer"}</a></td>
57+
//-->
4658
<td class="frmText11" align="right">[<a href="javascript: del_record('soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
4759
</tr>
4860
</tmpl_loop>
4961

5062
<tr>
51-
<td colspan="12" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
63+
<td colspan="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
5264
</tr>
5365
</table>
5466
</form>

0 commit comments

Comments
 (0)