diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index c67c7fac3ad81dcaa5dddbf47b47bfc9b6d0c91b..e45a57453d42467b783b7c0f860baa9bcf7058e7 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -66,7 +66,6 @@ class listform_actions {
// Getting Datasets from DB
$records = $app->db->queryAllRecords($this->getQueryString());
-
$this->DataRowColor = "#FFFFFF";
$records_new = '';
if(is_array($records)) {
@@ -139,7 +138,12 @@ class listform_actions {
{
global $app;
- //* Set Language File
+ //* Set global Language File
+ $lng_file = ISPC_LIB_PATH.'/lang/'.$_SESSION['s']['language'].'.lng';
+ include($lng_file);
+ $app->tpl->setVar($wb);
+
+ //* Set local Language File
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_'.$app->listform->listDef['name'].'_list.lng';
include($lng_file);
$app->tpl->setVar($wb);
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index 8a70373de079a620d0c684678a54c293a08d41aa..0233420d2c24f618dca017f36803c15fb17659ef 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -76,7 +76,7 @@ class listform_tpl_generator {
$html .= " <td class=\"frmText11\"><a href=\"#\" onClick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\" class=\"frmText11\">{tmpl_var name=\"".$key."\"}</a></td>\r\n";
}
- $html .= " <td class=\"frmText11\" align=\"right\">[<a href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');\" class=\"frmText11\">{tmpl_var name='delete_txt'}</a>]</td>
+ $html .= " <td class=\"frmText11\" align=\"right\">[<a href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\" class=\"frmText11\">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
";
diff --git a/interface/web/admin/templates/dbsync_list.htm b/interface/web/admin/templates/dbsync_list.htm
index 5c2cda3c8a0afa52a3eaaa348ba0b0875bf526f6..54dd51401acb684c64914d2bfde965b46de1fbc0 100644
--- a/interface/web/admin/templates/dbsync_list.htm
+++ b/interface/web/admin/templates/dbsync_list.htm
@@ -2,23 +2,23 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/dbsync_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="jobname_txt"></td>
- <td class="tblHead"><tmpl_var name="db_host_txt"></td>
- <td class="tblHead"><tmpl_var name="db_name_txt"></td>
+ <td class="tblHead"><tmpl_var name="jobname_txt"></td>
+ <td class="tblHead"><tmpl_var name="db_host_txt"></td>
+ <td class="tblHead"><tmpl_var name="db_name_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_db_host" value="{tmpl_var name='search_db_host'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_db_name" value="{tmpl_var name='search_db_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_db_host" value="{tmpl_var name='search_db_host'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_db_name" value="{tmpl_var name='search_db_name'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/dbsync_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_host"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_name"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('admin/dbsync_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_host"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_name"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('admin/dbsync_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/filesync_list.htm b/interface/web/admin/templates/filesync_list.htm
index a33599be477740ff891809318a2869adcae0f9b5..54bcc92f39573eb8db5284e3d417a127b8c492d9 100644
--- a/interface/web/admin/templates/filesync_list.htm
+++ b/interface/web/admin/templates/filesync_list.htm
@@ -2,23 +2,23 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/filesync_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="jobname_txt"></td>
- <td class="tblHead"><tmpl_var name="ftp_host_txt"></td>
- <td class="tblHead"><tmpl_var name="local_path_txt"></td>
+ <td class="tblHead"><tmpl_var name="jobname_txt"></td>
+ <td class="tblHead"><tmpl_var name="ftp_host_txt"></td>
+ <td class="tblHead"><tmpl_var name="local_path_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_ftp_host" value="{tmpl_var name='search_ftp_host'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_local_path" value="{tmpl_var name='search_local_path'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_ftp_host" value="{tmpl_var name='search_ftp_host'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_local_path" value="{tmpl_var name='search_local_path'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/filesync_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ftp_host"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="local_path"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('admin/filesync_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ftp_host"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="local_path"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('admin/filesync_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm
index af0cc4a4ef106ffc2fff8e7ccd08c0ea02d228f4..b65196457b1df63b7eeffae76ecf6451920f29ae 100644
--- a/interface/web/admin/templates/groups_list.htm
+++ b/interface/web/admin/templates/groups_list.htm
@@ -2,20 +2,20 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/groups_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="name_txt"></td>
- <td class="tblHead"><tmpl_var name="description_txt"></td>
+ <td class="tblHead"><tmpl_var name="name_txt"></td>
+ <td class="tblHead"><tmpl_var name="description_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/groups_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="description"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="description"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index d6ab661b104665df308c734515b57f909c1b505f..8c19c38bb5d2d84684372fe8faacf9e28091f0db 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -2,20 +2,20 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/server_ip_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="ip_address_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="ip_address_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" class="text" /></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/server_ip_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ip_address"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ip_address"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
index 80082cca546a50e53a51959da70361a6da6ddd1c..658e792682e2c4807ffd24671ca44ec9f2379257 100644
--- a/interface/web/admin/templates/server_list.htm
+++ b/interface/web/admin/templates/server_list.htm
@@ -2,35 +2,35 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/server_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="server_name_txt"></td>
- <td class="tblHead"><tmpl_var name="mail_server_txt"></td>
- <td class="tblHead"><tmpl_var name="web_server_txt"></td>
- <td class="tblHead"><tmpl_var name="dns_server_txt"></td>
- <td class="tblHead"><tmpl_var name="file_server_txt"></td>
- <td class="tblHead"><tmpl_var name="db_server_txt"></td>
- <td class="tblHead"><tmpl_var name="vserver_server_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_name_txt"></td>
+ <td class="tblHead"><tmpl_var name="mail_server_txt"></td>
+ <td class="tblHead"><tmpl_var name="web_server_txt"></td>
+ <td class="tblHead"><tmpl_var name="dns_server_txt"></td>
+ <td class="tblHead"><tmpl_var name="file_server_txt"></td>
+ <td class="tblHead"><tmpl_var name="db_server_txt"></td>
+ <td class="tblHead"><tmpl_var name="vserver_server_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_mail_server" value="{tmpl_var name='search_mail_server'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_web_server" value="{tmpl_var name='search_web_server'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_dns_server" value="{tmpl_var name='search_dns_server'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_file_server" value="{tmpl_var name='search_file_server'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_db_server" value="{tmpl_var name='search_db_server'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_vserver_server" value="{tmpl_var name='search_vserver_server'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_mail_server" value="{tmpl_var name='search_mail_server'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_web_server" value="{tmpl_var name='search_web_server'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_dns_server" value="{tmpl_var name='search_dns_server'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_file_server" value="{tmpl_var name='search_file_server'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_db_server" value="{tmpl_var name='search_db_server'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_vserver_server" value="{tmpl_var name='search_vserver_server'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/server_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_name"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="mail_server"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="web_server"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="dns_server"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="file_server"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_server"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="vserver_server"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="mail_server"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="web_server"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="dns_server"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="file_server"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_server"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="vserver_server"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 3c4b7e658f0e12fa0a00edce662c995afd62019c..f8a669c1adeb8ae2ebfba44c119b26ffb0adc35a 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/users_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="username_txt"></td>
- <td class="tblHead"><tmpl_var name="vorname_txt"></td>
- <td class="tblHead"><tmpl_var name="name_txt"></td>
- <td class="tblHead"><tmpl_var name="ort_txt"></td>
+ <td class="tblHead"><tmpl_var name="username_txt"></td>
+ <td class="tblHead"><tmpl_var name="vorname_txt"></td>
+ <td class="tblHead"><tmpl_var name="name_txt"></td>
+ <td class="tblHead"><tmpl_var name="ort_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_vorname" value="{tmpl_var name='search_vorname'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_ort" value="{tmpl_var name='search_ort'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_vorname" value="{tmpl_var name='search_vorname'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_ort" value="{tmpl_var name='search_ort'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/users_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="vorname"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ort"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="vorname"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ort"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index 8404f765c8429aee442f9cc4fb6e4c73099ca3ca..6f4418e9549f3718a39124ba2257439437a5e683 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('client/client_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="company_name_txt"></td>
- <td class="tblHead"><tmpl_var name="contact_name_txt"></td>
- <td class="tblHead"><tmpl_var name="city_txt"></td>
- <td class="tblHead"><tmpl_var name="country_txt"></td>
+ <td class="tblHead"><tmpl_var name="company_name_txt"></td>
+ <td class="tblHead"><tmpl_var name="contact_name_txt"></td>
+ <td class="tblHead"><tmpl_var name="city_txt"></td>
+ <td class="tblHead"><tmpl_var name="country_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','client/client_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="company_name"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="contact_name"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="city"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="country"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="company_name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="contact_name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="city"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="country"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index 38a22ec061908115bd991c26c3c77b8620c9fd68..9f143907d89214378ee4845d7ae3bd7983abe7a4 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -30,7 +30,7 @@ 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" align="right">[<a href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</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">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
<tr>
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index 58ea33015846d54611f422e471ee9e97deb88fae..719366815924dc576e18beef17bc82962935a03b 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -2,29 +2,29 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('dns/dns_soa_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="origin_txt"></td>
- <td class="tblHead"><tmpl_var name="ns_txt"></td>
- <td class="tblHead"><tmpl_var name="mbox_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="origin_txt"></td>
+ <td class="tblHead"><tmpl_var name="ns_txt"></td>
+ <td class="tblHead"><tmpl_var name="mbox_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="origin"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ns"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="mbox"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="origin"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ns"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="mbox"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/js/scrigo.js b/interface/web/js/scrigo.js
index f3ba6dcb69e38a288cfa8ac6711c205a3cde6fb2..df43d2f876c524b01764fdccd5b83e61964c90bb 100644
--- a/interface/web/js/scrigo.js
+++ b/interface/web/js/scrigo.js
@@ -241,8 +241,8 @@ function reportError(request)
alert('Sorry. There was an error.');
}
- function del_record(link) {
- if(window.confirm("<tmpl_var name='delete_confirmation'>")) {
+function del_record(link,confirmation) {
+ if(window.confirm(confirmation)) {
loadContent(link);
}
}
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
index 05e61ce1c78ba59fabe4f23e9205896cb6543b09..ad8fcb9f7a24a193ccefd0be49289e4c17f02756 100644
--- a/interface/web/mail/templates/mail_alias_list.htm
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -2,23 +2,23 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_alias_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="source_txt"></td>
- <td class="tblHead"><tmpl_var name="destination_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="source_txt"></td>
+ <td class="tblHead"><tmpl_var name="destination_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
index cc78407d5c0b0b774e080f95e7eb5e2a690d77d5..1caff0082789a2861d6321212eaf4f8fd7404556 100644
--- a/interface/web/mail/templates/mail_blacklist_list.htm
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_blacklist_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="source_txt"></td>
- <td class="tblHead"><tmpl_var name="type_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="source_txt"></td>
+ <td class="tblHead"><tmpl_var name="type_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
- <td class="frmText11"><select name="search_type" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_type'}</select></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
+ <td class="frmText11"><select name="search_type" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_type'}</select></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
index 2a6b9a47a121e067fa280040a5ea78bec2148065..6f92b53e4452be307527a91556e0680223c61180 100644
--- a/interface/web/mail/templates/mail_content_filter_list.htm
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_content_filter_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="pattern_txt"></td>
- <td class="tblHead"><tmpl_var name="action_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="pattern_txt"></td>
+ <td class="tblHead"><tmpl_var name="action_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" class="text" /></td>
- <td class="frmText11"><select name="search_action" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_action'}</select></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" class="text" /></td>
+ <td class="frmText11"><select name="search_action" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_action'}</select></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="pattern"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="action"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="pattern"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="action"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
index d0611aa6ee714ec55ebbcdb26e3bf111de758c16..b2026a9f809bde7053c12ac692ab5f0372b5a2fd 100644
--- a/interface/web/mail/templates/mail_domain_catchall_list.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -2,23 +2,23 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="source_txt"></td>
- <td class="tblHead"><tmpl_var name="destination_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="source_txt"></td>
+ <td class="tblHead"><tmpl_var name="destination_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
index b4c0b6e25d85c76ab4b4dd9955d0f984280c9ac9..e628405e6dbc2b45c0cd06c6dc3c400a0d73cdb8 100644
--- a/interface/web/mail/templates/mail_domain_list.htm
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -18,7 +18,7 @@
<td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
<td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
<td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
<tr>
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
index 76242c9c8515334d69f4859d20311fd09c5a7ae2..0f88d2378c82248987452c30be9da18cfe3753be 100644
--- a/interface/web/mail/templates/mail_forward_list.htm
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -2,23 +2,23 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_forward_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="source_txt"></td>
- <td class="tblHead"><tmpl_var name="destination_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="source_txt"></td>
+ <td class="tblHead"><tmpl_var name="destination_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
index 4a54e706256b3351d7d44f0cc12ef14f590975a5..f2eb35eec4d8f0c0f3df74c4ae7e2132f46010f2 100644
--- a/interface/web/mail/templates/mail_get_list.htm
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -2,29 +2,29 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_get_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="source_server_txt"></td>
- <td class="tblHead"><tmpl_var name="source_username_txt"></td>
- <td class="tblHead"><tmpl_var name="destination_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="source_server_txt"></td>
+ <td class="tblHead"><tmpl_var name="source_username_txt"></td>
+ <td class="tblHead"><tmpl_var name="destination_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_get_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source_server"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source_username"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source_server"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source_username"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index b20b5b54c4e4555db14efe0678303bfcb96bd307..08dcae1f3c74b5be5e8a8fa8efade68153bd4f2e 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -2,20 +2,20 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_user_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="email_txt"></td>
- <td class="tblHead"><tmpl_var name="autoresponder_txt"></td>
+ <td class="tblHead"><tmpl_var name="email_txt"></td>
+ <td class="tblHead"><tmpl_var name="autoresponder_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
- <td class="frmText11"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_user_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="autoresponder"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="autoresponder"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm
index 55b379aaa88197cd4a09d823e94ee4daa454b3f5..09a1db88dfa3f472e009f2da9a681c11ffd2e1d0 100644
--- a/interface/web/mail/templates/mail_whitelist_list.htm
+++ b/interface/web/mail/templates/mail_whitelist_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_whitelist_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="source_txt"></td>
- <td class="tblHead"><tmpl_var name="type_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="source_txt"></td>
+ <td class="tblHead"><tmpl_var name="type_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
- <td class="frmText11"><select name="search_type" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_type'}</select></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
+ <td class="frmText11"><select name="search_type" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_type'}</select></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm
index a475a1054cb8cf4f1cbf4e3ddd5b9f47ff40054d..29ab3cbc84bf9d4e9ac8e1ffe9b2ead60d2b1db4 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_list.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -2,29 +2,29 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="priority_txt"></td>
- <td class="tblHead"><tmpl_var name="rid_txt"></td>
- <td class="tblHead"><tmpl_var name="email_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="priority_txt"></td>
+ <td class="tblHead"><tmpl_var name="rid_txt"></td>
+ <td class="tblHead"><tmpl_var name="email_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_priority'}</select></td>
- <td class="frmText11"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_rid'}</select></td>
- <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_priority'}</select></td>
+ <td class="frmText11"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_rid'}</select></td>
+ <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="rid"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="rid"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm
index f2126cbdcb345b0b284e5c1d65e1ee367b1368ee..dce196c94e632e2d0161283560098c8a0e75f255 100644
--- a/interface/web/mail/templates/spamfilter_policy_list.htm
+++ b/interface/web/mail/templates/spamfilter_policy_list.htm
@@ -2,29 +2,29 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/spamfilter_policy_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="policy_name_txt"></td>
- <td class="tblHead"><tmpl_var name="virus_lover_txt"></td>
- <td class="tblHead"><tmpl_var name="spam_lover_txt"></td>
- <td class="tblHead"><tmpl_var name="banned_files_lover_txt"></td>
- <td class="tblHead"><tmpl_var name="bad_header_lover_txt"></td>
+ <td class="tblHead"><tmpl_var name="policy_name_txt"></td>
+ <td class="tblHead"><tmpl_var name="virus_lover_txt"></td>
+ <td class="tblHead"><tmpl_var name="spam_lover_txt"></td>
+ <td class="tblHead"><tmpl_var name="banned_files_lover_txt"></td>
+ <td class="tblHead"><tmpl_var name="bad_header_lover_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" class="text" /></td>
- <td class="frmText11"><select name="search_virus_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_virus_lover'}</select></td>
- <td class="frmText11"><select name="search_spam_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_spam_lover'}</select></td>
- <td class="frmText11"><select name="search_banned_files_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_banned_files_lover'}</select></td>
- <td class="frmText11"><select name="search_bad_header_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_bad_header_lover'}</select></td>
+ <td class="frmText11"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" class="text" /></td>
+ <td class="frmText11"><select name="search_virus_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_virus_lover'}</select></td>
+ <td class="frmText11"><select name="search_spam_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_spam_lover'}</select></td>
+ <td class="frmText11"><select name="search_banned_files_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_banned_files_lover'}</select></td>
+ <td class="frmText11"><select name="search_bad_header_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_bad_header_lover'}</select></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="policy_name"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="virus_lover"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="spam_lover"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="banned_files_lover"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="bad_header_lover"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="policy_name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="virus_lover"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="spam_lover"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="banned_files_lover"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="bad_header_lover"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm
index 4b160de1336a9aaa2d6febe8b06599892d5c4717..f86398ce087e72dcda0e405f68312b7ad7ef1782 100644
--- a/interface/web/mail/templates/spamfilter_users_list.htm
+++ b/interface/web/mail/templates/spamfilter_users_list.htm
@@ -2,29 +2,29 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/spamfilter_users_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="local_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="priority_txt"></td>
- <td class="tblHead"><tmpl_var name="policy_id_txt"></td>
- <td class="tblHead"><tmpl_var name="fullname_txt"></td>
+ <td class="tblHead"><tmpl_var name="local_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="priority_txt"></td>
+ <td class="tblHead"><tmpl_var name="policy_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="fullname_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_local" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_local'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_priority'}</select></td>
- <td class="frmText11"><select name="search_policy_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_policy_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" class="text" /></td>
+ <td class="frmText11"><select name="search_local" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_local'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_priority'}</select></td>
+ <td class="frmText11"><select name="search_policy_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_policy_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="local"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="policy_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="fullname"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="local"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="policy_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="fullname"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm
index 9c050d6adf40bb33155622dc5f5b3e070804b107..8c449feddea89a6df8d9067b44a06a16aba31d51 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_list.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -2,29 +2,29 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="priority_txt"></td>
- <td class="tblHead"><tmpl_var name="rid_txt"></td>
- <td class="tblHead"><tmpl_var name="email_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="priority_txt"></td>
+ <td class="tblHead"><tmpl_var name="rid_txt"></td>
+ <td class="tblHead"><tmpl_var name="email_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_priority'}</select></td>
- <td class="frmText11"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_rid'}</select></td>
- <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_priority'}</select></td>
+ <td class="frmText11"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_rid'}</select></td>
+ <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="rid"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="rid"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
index 59b89f63c1a1b89996700d5a59b37e2d6abb026e..ee5d4365a810fd7af66786c84a61e21428e32f57 100644
--- a/interface/web/sites/templates/ftp_user_list.htm
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('sites/ftp_user_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
- <td class="tblHead"><tmpl_var name="username_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="username_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
index 69a8b9f74fd42023c7042931355bc350aa1c9647..0c424bc392bb5f495796d19949daedc49d68851f 100644
--- a/interface/web/sites/templates/shell_user_list.htm
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('sites/shell_user_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
- <td class="tblHead"><tmpl_var name="username_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="username_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','sites/shell_user_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm
index bc632bb184d3ead740dcc750c1c37b7c0bc31a58..270325f31547a18c8ca1262c3d87f98825ef1c6b 100644
--- a/interface/web/sites/templates/web_aliasdomain_list.htm
+++ b/interface/web/sites/templates/web_aliasdomain_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('sites/web_aliasdomain_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
- <td class="tblHead"><tmpl_var name="domain_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="domain_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm
index ed77d8fb312ad6c8f4290a79948412f1f3b2ee3b..bfdef742fb4da11dc2349e91e64d1360ab98c19e 100644
--- a/interface/web/sites/templates/web_domain_list.htm
+++ b/interface/web/sites/templates/web_domain_list.htm
@@ -2,23 +2,23 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('sites/web_domain_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="domain_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="domain_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','sites/web_domain_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
index 02033c34aa830915f29b2db647df3b04338f1dba..70c491e75cc49d961df60d3f69229c9a2933b717 100644
--- a/interface/web/sites/templates/web_subdomain_list.htm
+++ b/interface/web/sites/templates/web_subdomain_list.htm
@@ -2,26 +2,26 @@
<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('sites/web_subdomain_edit.php');" /><div class="buttonEnding"></div><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
<tr>
- <td class="tblHead"><tmpl_var name="active_txt"></td>
- <td class="tblHead"><tmpl_var name="server_id_txt"></td>
- <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
- <td class="tblHead"><tmpl_var name="domain_txt"></td>
+ <td class="tblHead"><tmpl_var name="active_txt"></td>
+ <td class="tblHead"><tmpl_var name="server_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
+ <td class="tblHead"><tmpl_var name="domain_txt"></td>
<td class="tblHead"> </td>
</tr>
<tr>
- <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" class="text" /></td>
+ <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="frmText11"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" class="text" /></td>
<td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><div class="buttonEnding"></div></td>
</tr>
<tmpl_loop name="records">
<tr bgcolor="{tmpl_var name="bgcolor"}">
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
</tr>
</tmpl_loop>