From cc0a1a54a12f6998a68dcbb39015e9e8adc5edf7 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Fri, 23 May 2008 15:26:52 +0000 Subject: [PATCH] Missing language text replacement for in list forms added. --- .../lib/classes/listform_actions.inc.php | 8 +++- .../classes/listform_tpl_generator.inc.php | 2 +- interface/web/admin/templates/dbsync_list.htm | 20 ++++----- .../web/admin/templates/filesync_list.htm | 20 ++++----- interface/web/admin/templates/groups_list.htm | 14 +++--- .../web/admin/templates/server_ip_list.htm | 14 +++--- interface/web/admin/templates/server_list.htm | 44 +++++++++---------- interface/web/admin/templates/users_list.htm | 26 +++++------ .../web/client/templates/clients_list.htm | 26 +++++------ interface/web/dns/templates/dns_a_list.htm | 2 +- interface/web/dns/templates/dns_soa_list.htm | 32 +++++++------- interface/web/js/scrigo.js | 4 +- .../web/mail/templates/mail_alias_list.htm | 20 ++++----- .../mail/templates/mail_blacklist_list.htm | 26 +++++------ .../templates/mail_content_filter_list.htm | 26 +++++------ .../templates/mail_domain_catchall_list.htm | 20 ++++----- .../web/mail/templates/mail_domain_list.htm | 2 +- .../web/mail/templates/mail_forward_list.htm | 20 ++++----- .../web/mail/templates/mail_get_list.htm | 32 +++++++------- .../web/mail/templates/mail_user_list.htm | 14 +++--- .../mail/templates/mail_whitelist_list.htm | 26 +++++------ .../templates/spamfilter_blacklist_list.htm | 32 +++++++------- .../mail/templates/spamfilter_policy_list.htm | 32 +++++++------- .../mail/templates/spamfilter_users_list.htm | 32 +++++++------- .../templates/spamfilter_whitelist_list.htm | 32 +++++++------- .../web/sites/templates/ftp_user_list.htm | 26 +++++------ .../web/sites/templates/shell_user_list.htm | 26 +++++------ .../sites/templates/web_aliasdomain_list.htm | 26 +++++------ .../web/sites/templates/web_domain_list.htm | 20 ++++----- .../sites/templates/web_subdomain_list.htm | 26 +++++------ 30 files changed, 327 insertions(+), 323 deletions(-) diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php index c67c7fac3a..e45a57453d 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 8a70373de0..0233420d2c 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 .= " {tmpl_var name=\"".$key."\"}\r\n"; } - $html .= " [{tmpl_var name='delete_txt'}] + $html .= " [{tmpl_var name='delete_txt'}] "; diff --git a/interface/web/admin/templates/dbsync_list.htm b/interface/web/admin/templates/dbsync_list.htm index 5c2cda3c8a..54dd51401a 100644 --- a/interface/web/admin/templates/dbsync_list.htm +++ b/interface/web/admin/templates/dbsync_list.htm @@ -2,23 +2,23 @@


- - - + + + - - - + + + - - - - + + + + diff --git a/interface/web/admin/templates/filesync_list.htm b/interface/web/admin/templates/filesync_list.htm index a33599be47..54bcc92f39 100644 --- a/interface/web/admin/templates/filesync_list.htm +++ b/interface/web/admin/templates/filesync_list.htm @@ -2,23 +2,23 @@


 
{tmpl_var name="jobname"}{tmpl_var name="db_host"}{tmpl_var name="db_name"}[{tmpl_var name='delete_txt'}]{tmpl_var name="jobname"}{tmpl_var name="db_host"}{tmpl_var name="db_name"}[{tmpl_var name='delete_txt'}]
- - - + + + - - - + + + - - - - + + + + diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm index af0cc4a4ef..b65196457b 100644 --- a/interface/web/admin/templates/groups_list.htm +++ b/interface/web/admin/templates/groups_list.htm @@ -2,20 +2,20 @@


 
{tmpl_var name="jobname"}{tmpl_var name="ftp_host"}{tmpl_var name="local_path"}[{tmpl_var name='delete_txt'}]{tmpl_var name="jobname"}{tmpl_var name="ftp_host"}{tmpl_var name="local_path"}[{tmpl_var name='delete_txt'}]
- - + + - - + + - - - + + + diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm index d6ab661b10..8c19c38bb5 100644 --- a/interface/web/admin/templates/server_ip_list.htm +++ b/interface/web/admin/templates/server_ip_list.htm @@ -2,20 +2,20 @@


 
{tmpl_var name="name"}{tmpl_var name="description"}[{tmpl_var name='delete_txt'}]{tmpl_var name="name"}{tmpl_var name="description"}[{tmpl_var name='delete_txt'}]
- - + + - - + + - - - + + + diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm index 80082cca54..658e792682 100644 --- a/interface/web/admin/templates/server_list.htm +++ b/interface/web/admin/templates/server_list.htm @@ -2,35 +2,35 @@


 
{tmpl_var name="server_id"}{tmpl_var name="ip_address"}[{tmpl_var name='delete_txt'}]{tmpl_var name="server_id"}{tmpl_var name="ip_address"}[{tmpl_var name='delete_txt'}]
- - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index 3c4b7e658f..f8a669c1ad 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="server_name"}{tmpl_var name="mail_server"}{tmpl_var name="web_server"}{tmpl_var name="dns_server"}{tmpl_var name="file_server"}{tmpl_var name="db_server"}{tmpl_var name="vserver_server"}[{tmpl_var name='delete_txt'}]{tmpl_var name="server_name"}{tmpl_var name="mail_server"}{tmpl_var name="web_server"}{tmpl_var name="dns_server"}{tmpl_var name="file_server"}{tmpl_var name="db_server"}{tmpl_var name="vserver_server"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index 8404f765c8..6f4418e954 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="username"}{tmpl_var name="vorname"}{tmpl_var name="name"}{tmpl_var name="ort"}[{tmpl_var name='delete_txt'}]{tmpl_var name="username"}{tmpl_var name="vorname"}{tmpl_var name="name"}{tmpl_var name="ort"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 38a22ec061..9f143907d8 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -30,7 +30,7 @@ Add: {tmpl_var name="type"} - + diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm index 58ea330158..7193668159 100644 --- a/interface/web/dns/templates/dns_soa_list.htm +++ b/interface/web/dns/templates/dns_soa_list.htm @@ -2,29 +2,29 @@


 
{tmpl_var name="company_name"}{tmpl_var name="contact_name"}{tmpl_var name="city"}{tmpl_var name="country"}[{tmpl_var name='delete_txt'}]{tmpl_var name="company_name"}{tmpl_var name="contact_name"}{tmpl_var name="city"}{tmpl_var name="country"}[{tmpl_var name='delete_txt'}]
{tmpl_var name="name"} {tmpl_var name="data"}[{tmpl_var name='delete_txt'}][{tmpl_var name='delete_txt'}]
- - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + diff --git a/interface/web/js/scrigo.js b/interface/web/js/scrigo.js index f3ba6dcb69..df43d2f876 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("")) { +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 05e61ce1c7..ad8fcb9f7a 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -2,23 +2,23 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="origin"}{tmpl_var name="ns"}{tmpl_var name="mbox"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="origin"}{tmpl_var name="ns"}{tmpl_var name="mbox"}[{tmpl_var name='delete_txt'}]
- - - + + + - - - + + + - - - - + + + + diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm index cc78407d5c..1caff00827 100644 --- a/interface/web/mail/templates/mail_blacklist_list.htm +++ b/interface/web/mail/templates/mail_blacklist_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm index 2a6b9a47a1..6f92b53e44 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 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"}{tmpl_var name="type"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"}{tmpl_var name="type"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm index d0611aa6ee..b2026a9f80 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 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="pattern"}{tmpl_var name="action"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="pattern"}{tmpl_var name="action"}[{tmpl_var name='delete_txt'}]
- - - + + + - - - + + + - - - - + + + + diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index b4c0b6e25d..e628405e6d 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -18,7 +18,7 @@ - + diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index 76242c9c85..0f88d2378c 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -2,23 +2,23 @@


 
{tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="domain"}[{tmpl_var name='delete_txt'}][{tmpl_var name='delete_txt'}]
- - - + + + - - - + + + - - - - + + + + diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index 4a54e70625..f2eb35eec4 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -2,29 +2,29 @@


 
{tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]
- - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index b20b5b54c4..08dcae1f3c 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -2,20 +2,20 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source_server"}{tmpl_var name="source_username"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source_server"}{tmpl_var name="source_username"}{tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]
- - + + - - + + - - - + + + diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index 55b379aaa8..09a1db88df 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="email"}{tmpl_var name="autoresponder"}[{tmpl_var name='delete_txt'}]{tmpl_var name="email"}{tmpl_var name="autoresponder"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index a475a1054c..29ab3cbc84 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -2,29 +2,29 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"}{tmpl_var name="type"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"}{tmpl_var name="type"}[{tmpl_var name='delete_txt'}]
- - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm index f2126cbdcb..dce196c94e 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -2,29 +2,29 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"}[{tmpl_var name='delete_txt'}]
- - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm index 4b160de133..f86398ce08 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -2,29 +2,29 @@


 
{tmpl_var name="policy_name"}{tmpl_var name="virus_lover"}{tmpl_var name="spam_lover"}{tmpl_var name="banned_files_lover"}{tmpl_var name="bad_header_lover"}[{tmpl_var name='delete_txt'}]{tmpl_var name="policy_name"}{tmpl_var name="virus_lover"}{tmpl_var name="spam_lover"}{tmpl_var name="banned_files_lover"}{tmpl_var name="bad_header_lover"}[{tmpl_var name='delete_txt'}]
- - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm index 9c050d6adf..8c449fedde 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -2,29 +2,29 @@


 
{tmpl_var name="local"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="policy_id"}{tmpl_var name="fullname"}[{tmpl_var name='delete_txt'}]{tmpl_var name="local"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="policy_id"}{tmpl_var name="fullname"}[{tmpl_var name='delete_txt'}]
- - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index 59b89f63c1..ee5d4365a8 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm index 69a8b9f74f..0c424bc392 100644 --- a/interface/web/sites/templates/shell_user_list.htm +++ b/interface/web/sites/templates/shell_user_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="username"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="username"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm index bc632bb184..270325f315 100644 --- a/interface/web/sites/templates/web_aliasdomain_list.htm +++ b/interface/web/sites/templates/web_aliasdomain_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="username"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="username"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm index ed77d8fb31..bfdef742fb 100644 --- a/interface/web/sites/templates/web_domain_list.htm +++ b/interface/web/sites/templates/web_domain_list.htm @@ -2,23 +2,23 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]
- - - + + + - - - + + + - - - - + + + + diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm index 02033c34aa..70c491e75c 100644 --- a/interface/web/sites/templates/web_subdomain_list.htm +++ b/interface/web/sites/templates/web_subdomain_list.htm @@ -2,26 +2,26 @@


 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]
- - - - + + + + - - - - + + + + - - - - - + + + + + -- GitLab
 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]