Skip to content

Commit a3ec01f

Browse files
committed
Added priority column to DNS records list.
1 parent 20aa6b4 commit a3ec01f

File tree

6 files changed

+22
-7
lines changed

6 files changed

+22
-7
lines changed

install/lib/installer_base.lib.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,10 @@ public function configure_postfix($options = '')
368368
wf($cf['vmail_mailbox_base'].'/.'.$configfile, $content);
369369

370370
//* Create the directory for the custom mailfilters
371-
$command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
372-
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
371+
if(!is_dir($cf['vmail_mailbox_base'].'/mailfilters')) {
372+
$command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
373+
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
374+
}
373375

374376
//* Chmod and chown the .mailfilter file
375377
$command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';

interface/lib/classes/plugin_listview.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function onShow() {
7979
$rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'list_icon_true.png':'list_icon_false.png';
8080
}
8181
//* substitute value for select field
82-
$rec[$key] = $field['value'][$rec[$key]];
82+
@$rec[$key] = $field['value'][$rec[$key]];
8383
}
8484
// Create a lowercase version of every item
8585
$rec[$key.'_lowercase'] = strtolower($rec[$key]);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $wb["server_id_txt"] = 'Server';
55
$wb["zone_txt"] = 'Zone';
66
$wb["name_txt"] = 'Name';
77
$wb["data_txt"] = 'Data';
8+
$wb["aux_txt"] = 'Priority';
89
$wb["type_txt"] = 'Type';
910
$wb["page_txt"] = 'Page';
1011
$wb["page_of_txt"] = 'of';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $wb["retry_txt"] = 'Retry';
1111
$wb["expire_txt"] = 'Expire';
1212
$wb["minimum_txt"] = 'Minimum';
1313
$wb["ttl_txt"] = 'TTL';
14-
$wb["xfer_txt"] = 'Allow zone transfers to these IPs (comma separated list)';
14+
$wb["xfer_txt"] = 'Allow zone transfers to <br />these IPs (comma separated list)';
1515
$wb["active_txt"] = 'Active';
1616
$wb["limit_dns_zone_txt"] = 'The max. number of DNS zones for your account is reached.';
1717
$wb["client_txt"] = 'Client';

interface/web/dns/list/dns_a.list.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,15 @@
104104
'width' => "",
105105
'value' => "");
106106

107+
$liste["item"][] = array( 'field' => "aux",
108+
'datatype' => "VARCHAR",
109+
'formtype' => "TEXT",
110+
'op' => "like",
111+
'prefix' => "%",
112+
'suffix' => "%",
113+
'width' => "",
114+
'value' => "");
115+
107116

108117
$liste["item"][] = array( 'field' => "type",
109118
'datatype' => "VARCHAR",

interface/web/dns/templates/dns_a_list.htm

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
<td class="tblHead"><tmpl_var name="type_txt"></td>
1616
<td class="tblHead"><tmpl_var name="name_txt"></td>
1717
<td class="tblHead"><tmpl_var name="data_txt"></td>
18+
<td class="tblHead"><tmpl_var name="aux_txt"></td>
1819
<td class="tblHead">&nbsp;</td>
1920
</tr>
2021
<tr>
2122
<td class="frmText11"><select name="search_active" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td>
2223
<td class="frmText11"><select name="search_type" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td>
23-
<td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" width="10" /></td>
24-
<td class="frmText11"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" class="text" width="10" /></td>
24+
<td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" size="20" /></td>
25+
<td class="frmText11"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" class="text" size="20" /></td>
26+
<td class="frmText11"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" class="text" size="5" /></td>
2527
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><div class="buttonEnding"></div></td>
2628
</tr>
2729
<tmpl_loop name="records">
@@ -30,10 +32,11 @@
3032
<td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
3133
<td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
3234
<td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="data"}</a></td>
35+
<td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="aux"}</a></td>
3336
<td class="frmText11" align="right"><a href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/list_icon_delete.png" alt="{tmpl_var name='delete_txt'}" border="0" /></a></td>
3437
</tr>
3538
</tmpl_loop>
3639
<tr>
37-
<td colspan="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
40+
<td colspan="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
3841
</tr>
3942
</table>

0 commit comments

Comments
 (0)