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 .= " {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 5c2cda3c8a0afa52a3eaaa348ba0b0875bf526f6..54dd51401acb684c64914d2bfde965b46de1fbc0 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 a33599be477740ff891809318a2869adcae0f9b5..54bcc92f39573eb8db5284e3d417a127b8c492d9 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 af0cc4a4ef106ffc2fff8e7ccd08c0ea02d228f4..b65196457b1df63b7eeffae76ecf6451920f29ae 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 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 @@


 
{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 80082cca546a50e53a51959da70361a6da6ddd1c..658e792682e2c4807ffd24671ca44ec9f2379257 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 3c4b7e658f0e12fa0a00edce662c995afd62019c..f8a669c1adeb8ae2ebfba44c119b26ffb0adc35a 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 8404f765c8429aee442f9cc4fb6e4c73099ca3ca..6f4418e9549f3718a39124ba2257439437a5e683 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 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: {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 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 @@


 
{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 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("")) { +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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@ - + 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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 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 @@


 
{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'}]
- - - - + + + + - - - - + + + + - - - - - + + + + +
 
{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'}]