From a3ec01f5d062bed021961d5b19f9efe2963fea15 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Sep 2008 16:16:01 +0000
Subject: [PATCH] Added priority column to DNS records list.
---
install/lib/installer_base.lib.php | 6 ++++--
interface/lib/classes/plugin_listview.inc.php | 2 +-
interface/web/dns/lib/lang/en_dns_a_list.lng | 1 +
interface/web/dns/lib/lang/en_dns_soa.lng | 2 +-
interface/web/dns/list/dns_a.list.php | 9 +++++++++
interface/web/dns/templates/dns_a_list.htm | 9 ++++++---
6 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 711c838f30..79c7ef6ce6 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -368,8 +368,10 @@ class installer_base {
wf($cf['vmail_mailbox_base'].'/.'.$configfile, $content);
//* Create the directory for the custom mailfilters
- $command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
- caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ if(!is_dir($cf['vmail_mailbox_base'].'/mailfilters')) {
+ $command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
+ caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ }
//* Chmod and chown the .mailfilter file
$command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';
diff --git a/interface/lib/classes/plugin_listview.inc.php b/interface/lib/classes/plugin_listview.inc.php
index f7e37f9737..dcd2803368 100644
--- a/interface/lib/classes/plugin_listview.inc.php
+++ b/interface/lib/classes/plugin_listview.inc.php
@@ -79,7 +79,7 @@ class plugin_listview extends plugin_base {
$rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'list_icon_true.png':'list_icon_false.png';
}
//* substitute value for select field
- $rec[$key] = $field['value'][$rec[$key]];
+ @$rec[$key] = $field['value'][$rec[$key]];
}
// Create a lowercase version of every item
$rec[$key.'_lowercase'] = strtolower($rec[$key]);
diff --git a/interface/web/dns/lib/lang/en_dns_a_list.lng b/interface/web/dns/lib/lang/en_dns_a_list.lng
index da211f7693..4832451a35 100644
--- a/interface/web/dns/lib/lang/en_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/en_dns_a_list.lng
@@ -5,6 +5,7 @@ $wb["server_id_txt"] = 'Server';
$wb["zone_txt"] = 'Zone';
$wb["name_txt"] = 'Name';
$wb["data_txt"] = 'Data';
+$wb["aux_txt"] = 'Priority';
$wb["type_txt"] = 'Type';
$wb["page_txt"] = 'Page';
$wb["page_of_txt"] = 'of';
diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng
index 9b80834e66..f03c0c44b3 100644
--- a/interface/web/dns/lib/lang/en_dns_soa.lng
+++ b/interface/web/dns/lib/lang/en_dns_soa.lng
@@ -11,7 +11,7 @@ $wb["retry_txt"] = 'Retry';
$wb["expire_txt"] = 'Expire';
$wb["minimum_txt"] = 'Minimum';
$wb["ttl_txt"] = 'TTL';
-$wb["xfer_txt"] = 'Allow zone transfers to these IPs (comma separated list)';
+$wb["xfer_txt"] = 'Allow zone transfers to <br />these IPs (comma separated list)';
$wb["active_txt"] = 'Active';
$wb["limit_dns_zone_txt"] = 'The max. number of DNS zones for your account is reached.';
$wb["client_txt"] = 'Client';
diff --git a/interface/web/dns/list/dns_a.list.php b/interface/web/dns/list/dns_a.list.php
index 9e6ed6c99e..f079d463bd 100644
--- a/interface/web/dns/list/dns_a.list.php
+++ b/interface/web/dns/list/dns_a.list.php
@@ -104,6 +104,15 @@ $liste["item"][] = array( 'field' => "data",
'width' => "",
'value' => "");
+$liste["item"][] = array( 'field' => "aux",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
$liste["item"][] = array( 'field' => "type",
'datatype' => "VARCHAR",
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index ed4129d532..b6949a5572 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -15,13 +15,15 @@ Add: <input type="button" value="A" class="button" onClick="loadContent('dns/dns
<td class="tblHead"><tmpl_var name="type_txt"></td>
<td class="tblHead"><tmpl_var name="name_txt"></td>
<td class="tblHead"><tmpl_var name="data_txt"></td>
+ <td class="tblHead"><tmpl_var name="aux_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
<td class="frmText11"><select name="search_active" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td>
<td class="frmText11"><select name="search_type" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td>
- <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" width="10" /></td>
- <td class="frmText11"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" class="text" width="10" /></td>
+ <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" size="20" /></td>
+ <td class="frmText11"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" class="text" size="20" /></td>
+ <td class="frmText11"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" class="text" size="5" /></td>
<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>
</tr>
<tmpl_loop name="records">
@@ -30,10 +32,11 @@ Add: <input type="button" value="A" class="button" onClick="loadContent('dns/dns
<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>
<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>
<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>
+ <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>
<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>
</tr>
</tmpl_loop>
<tr>
- <td colspan="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
+ <td colspan="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
</tr>
</table>
\ No newline at end of file
--
GitLab