Skip to content

Commit cc0a1a5

Browse files
tbrehmtbrehm
committed
Missing language text replacement for <tmpl_var ... delete_donfirmation'> in list forms added.
1 parent 47e3bb6 commit cc0a1a5

30 files changed

+327
-323
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public function onLoad()
6666
// Getting Datasets from DB
6767
$records = $app->db->queryAllRecords($this->getQueryString());
6868

69-
7069
$this->DataRowColor = "#FFFFFF";
7170
$records_new = '';
7271
if(is_array($records)) {
@@ -139,7 +138,12 @@ private function onShow()
139138
{
140139
global $app;
141140

142-
//* Set Language File
141+
//* Set global Language File
142+
$lng_file = ISPC_LIB_PATH.'/lang/'.$_SESSION['s']['language'].'.lng';
143+
include($lng_file);
144+
$app->tpl->setVar($wb);
145+
146+
//* Set local Language File
143147
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_'.$app->listform->listDef['name'].'_list.lng';
144148
include($lng_file);
145149
$app->tpl->setVar($wb);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function buildHTML($listDef,$module = '') {
7676
$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";
7777
}
7878

79-
$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>
79+
$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>
8080
</tr>
8181
</tmpl_loop>
8282
";

‎interface/web/admin/templates/dbsync_list.htm‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
<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 />
33
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
44
<tr>
5-
<td class="tblHead"><tmpl_var name="jobname_txt"></td>
6-
<td class="tblHead"><tmpl_var name="db_host_txt"></td>
7-
<td class="tblHead"><tmpl_var name="db_name_txt"></td>
5+
<td class="tblHead"><tmpl_var name="jobname_txt"></td>
6+
<td class="tblHead"><tmpl_var name="db_host_txt"></td>
7+
<td class="tblHead"><tmpl_var name="db_name_txt"></td>
88
<td class="tblHead">&nbsp;</td>
99
</tr>
1010
<tr>
11-
<td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
12-
<td class="frmText11"><input type="text" name="search_db_host" value="{tmpl_var name='search_db_host'}" class="text" /></td>
13-
<td class="frmText11"><input type="text" name="search_db_name" value="{tmpl_var name='search_db_name'}" class="text" /></td>
11+
<td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
12+
<td class="frmText11"><input type="text" name="search_db_host" value="{tmpl_var name='search_db_host'}" class="text" /></td>
13+
<td class="frmText11"><input type="text" name="search_db_name" value="{tmpl_var name='search_db_name'}" class="text" /></td>
1414
<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>
1515
</tr>
1616
<tmpl_loop name="records">
1717
<tr bgcolor="{tmpl_var name="bgcolor"}">
18-
<td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
19-
<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>
20-
<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>
21-
<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>
18+
<td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
19+
<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>
20+
<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>
21+
<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>
2222
</tr>
2323
</tmpl_loop>
2424

‎interface/web/admin/templates/filesync_list.htm‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
<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 />
33
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
44
<tr>
5-
<td class="tblHead"><tmpl_var name="jobname_txt"></td>
6-
<td class="tblHead"><tmpl_var name="ftp_host_txt"></td>
7-
<td class="tblHead"><tmpl_var name="local_path_txt"></td>
5+
<td class="tblHead"><tmpl_var name="jobname_txt"></td>
6+
<td class="tblHead"><tmpl_var name="ftp_host_txt"></td>
7+
<td class="tblHead"><tmpl_var name="local_path_txt"></td>
88
<td class="tblHead">&nbsp;</td>
99
</tr>
1010
<tr>
11-
<td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
12-
<td class="frmText11"><input type="text" name="search_ftp_host" value="{tmpl_var name='search_ftp_host'}" class="text" /></td>
13-
<td class="frmText11"><input type="text" name="search_local_path" value="{tmpl_var name='search_local_path'}" class="text" /></td>
11+
<td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
12+
<td class="frmText11"><input type="text" name="search_ftp_host" value="{tmpl_var name='search_ftp_host'}" class="text" /></td>
13+
<td class="frmText11"><input type="text" name="search_local_path" value="{tmpl_var name='search_local_path'}" class="text" /></td>
1414
<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>
1515
</tr>
1616
<tmpl_loop name="records">
1717
<tr bgcolor="{tmpl_var name="bgcolor"}">
18-
<td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
19-
<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>
20-
<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>
21-
<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>
18+
<td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
19+
<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>
20+
<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>
21+
<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>
2222
</tr>
2323
</tmpl_loop>
2424

‎interface/web/admin/templates/groups_list.htm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
<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 />
33
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
44
<tr>
5-
<td class="tblHead"><tmpl_var name="name_txt"></td>
6-
<td class="tblHead"><tmpl_var name="description_txt"></td>
5+
<td class="tblHead"><tmpl_var name="name_txt"></td>
6+
<td class="tblHead"><tmpl_var name="description_txt"></td>
77
<td class="tblHead">&nbsp;</td>
88
</tr>
99
<tr>
10-
<td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
11-
<td class="frmText11"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" class="text" /></td>
10+
<td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
11+
<td class="frmText11"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" class="text" /></td>
1212
<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>
1313
</tr>
1414
<tmpl_loop name="records">
1515
<tr bgcolor="{tmpl_var name="bgcolor"}">
16-
<td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
17-
<td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="description"}</a></td>
18-
<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>
16+
<td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
17+
<td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="description"}</a></td>
18+
<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>
1919
</tr>
2020
</tmpl_loop>
2121

‎interface/web/admin/templates/server_ip_list.htm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
<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 />
33
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
44
<tr>
5-
<td class="tblHead"><tmpl_var name="server_id_txt"></td>
6-
<td class="tblHead"><tmpl_var name="ip_address_txt"></td>
5+
<td class="tblHead"><tmpl_var name="server_id_txt"></td>
6+
<td class="tblHead"><tmpl_var name="ip_address_txt"></td>
77
<td class="tblHead">&nbsp;</td>
88
</tr>
99
<tr>
10-
<td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
11-
<td class="frmText11"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" class="text" /></td>
10+
<td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
11+
<td class="frmText11"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" class="text" /></td>
1212
<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>
1313
</tr>
1414
<tmpl_loop name="records">
1515
<tr bgcolor="{tmpl_var name="bgcolor"}">
16-
<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>
17-
<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>
18-
<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>
16+
<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>
17+
<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>
18+
<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>
1919
</tr>
2020
</tmpl_loop>
2121

‎interface/web/admin/templates/server_list.htm‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
<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 />
33
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
44
<tr>
5-
<td class="tblHead"><tmpl_var name="server_name_txt"></td>
6-
<td class="tblHead"><tmpl_var name="mail_server_txt"></td>
7-
<td class="tblHead"><tmpl_var name="web_server_txt"></td>
8-
<td class="tblHead"><tmpl_var name="dns_server_txt"></td>
9-
<td class="tblHead"><tmpl_var name="file_server_txt"></td>
10-
<td class="tblHead"><tmpl_var name="db_server_txt"></td>
11-
<td class="tblHead"><tmpl_var name="vserver_server_txt"></td>
5+
<td class="tblHead"><tmpl_var name="server_name_txt"></td>
6+
<td class="tblHead"><tmpl_var name="mail_server_txt"></td>
7+
<td class="tblHead"><tmpl_var name="web_server_txt"></td>
8+
<td class="tblHead"><tmpl_var name="dns_server_txt"></td>
9+
<td class="tblHead"><tmpl_var name="file_server_txt"></td>
10+
<td class="tblHead"><tmpl_var name="db_server_txt"></td>
11+
<td class="tblHead"><tmpl_var name="vserver_server_txt"></td>
1212
<td class="tblHead">&nbsp;</td>
1313
</tr>
1414
<tr>
15-
<td class="frmText11"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" class="text" /></td>
16-
<td class="frmText11"><input type="text" name="search_mail_server" value="{tmpl_var name='search_mail_server'}" class="text" /></td>
17-
<td class="frmText11"><input type="text" name="search_web_server" value="{tmpl_var name='search_web_server'}" class="text" /></td>
18-
<td class="frmText11"><input type="text" name="search_dns_server" value="{tmpl_var name='search_dns_server'}" class="text" /></td>
19-
<td class="frmText11"><input type="text" name="search_file_server" value="{tmpl_var name='search_file_server'}" class="text" /></td>
20-
<td class="frmText11"><input type="text" name="search_db_server" value="{tmpl_var name='search_db_server'}" class="text" /></td>
21-
<td class="frmText11"><input type="text" name="search_vserver_server" value="{tmpl_var name='search_vserver_server'}" class="text" /></td>
15+
<td class="frmText11"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" class="text" /></td>
16+
<td class="frmText11"><input type="text" name="search_mail_server" value="{tmpl_var name='search_mail_server'}" class="text" /></td>
17+
<td class="frmText11"><input type="text" name="search_web_server" value="{tmpl_var name='search_web_server'}" class="text" /></td>
18+
<td class="frmText11"><input type="text" name="search_dns_server" value="{tmpl_var name='search_dns_server'}" class="text" /></td>
19+
<td class="frmText11"><input type="text" name="search_file_server" value="{tmpl_var name='search_file_server'}" class="text" /></td>
20+
<td class="frmText11"><input type="text" name="search_db_server" value="{tmpl_var name='search_db_server'}" class="text" /></td>
21+
<td class="frmText11"><input type="text" name="search_vserver_server" value="{tmpl_var name='search_vserver_server'}" class="text" /></td>
2222
<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>
2323
</tr>
2424
<tmpl_loop name="records">
2525
<tr bgcolor="{tmpl_var name="bgcolor"}">
26-
<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>
27-
<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>
28-
<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>
29-
<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>
30-
<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>
31-
<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>
32-
<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>
33-
<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>
26+
<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>
27+
<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>
28+
<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>
29+
<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>
30+
<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>
31+
<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>
32+
<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>
33+
<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>
3434
</tr>
3535
</tmpl_loop>
3636

0 commit comments

Comments
 (0)