@@ -99,6 +101,11 @@ class listform_tpl_generator {
+
+
uneven\">
+
{tmpl_var name='globalsearch_noresults_text_txt'}
+
+
";
$html .= '
diff --git a/interface/lib/classes/searchform.inc.php b/interface/lib/classes/searchform.inc.php
index ef18baf446891dd089a13ba850ca30f691b5ec83..e87547a9d97ed19ebd2db2e868fcfb644056bea8 100644
--- a/interface/lib/classes/searchform.inc.php
+++ b/interface/lib/classes/searchform.inc.php
@@ -208,6 +208,8 @@ class searchform {
$content .= ' '.$app->lng('Page').' '.$vars['next_page'].' '.$app->lng('of').' '.$vars['max_pages'].' ';
if($vars['show_page_next'] == 1){
$content .= ' ';
+ } else{
+ $content .= ' ';
}
$content .= '';
return $content;
diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php
index 564fad5427563a1680461814bc0c908b9dbfc4cd..b0da004cf3f0a3abc56cc7f8a180f45435998e0a 100644
--- a/interface/lib/classes/simplepie.inc.php
+++ b/interface/lib/classes/simplepie.inc.php
@@ -9103,7 +9103,7 @@ class SimplePie_Misc
return $time;
}
- function absolutize_url($relative, $base)
+ static function absolutize_url($relative, $base)
{
$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
return $iri->get_iri();
@@ -9163,7 +9163,7 @@ class SimplePie_Misc
return $output . $input;
}
- function get_element($realname, $string)
+ static function get_element($realname, $string)
{
$return = array();
$name = preg_quote($realname, '/');
@@ -11006,7 +11006,7 @@ class SimplePie_Misc
}
}
- function atom_10_construct_type($attribs)
+ static function atom_10_construct_type($attribs)
{
if (isset($attribs['']['type']))
{
@@ -11059,7 +11059,7 @@ class SimplePie_Misc
}
}
- function is_isegment_nz_nc($string)
+ static function is_isegment_nz_nc($string)
{
return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
}
@@ -11699,7 +11699,7 @@ class SimplePie_IRI
* @param string $relative Relative IRI
* @return SimplePie_IRI
*/
- function absolutize($base, $relative)
+ static function absolutize($base, $relative)
{
$relative = (string) $relative;
if ($relative !== '')
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index bd28db4f3ae0e51e9cba06d398e901d0aba4ab79..9f696aff76fa845ba47a6d23e2c9f8aa609443c2 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -937,31 +937,44 @@ class tform {
}
break;
case 'ISIP':
- //* Check if its a IPv4 or IPv6 address
- if(function_exists('filter_var')) {
- if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
- $errmsg = $validator['errmsg'];
- if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
- } else {
- $this->errorMessage .= $errmsg." \r\n";
- }
- }
+ if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
+ if($validator['allowempty'] == 'y' && $field_value == '') {
+ //* Do nothing
} else {
- //* Check content with regex, if we use php < 5.2
- $ip_ok = 0;
- if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
- $ip_ok = 1;
- }
- if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
- $ip_ok = 1;
+ //* Check if its a IPv4 or IPv6 address
+ if(isset($validator['separator']) && $validator['separator'] != '') {
+ //* When the field may contain several IP addresses, split them by the char defined as separator
+ $field_value_array = explode($validator['separator'],$field_value);
+ } else {
+ $field_value_array[] = $field_value;
}
- if($ip_ok == 0) {
- $errmsg = $validator['errmsg'];
- if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
+ foreach($field_value_array as $field_value) {
+ if(function_exists('filter_var')) {
+ if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
+ } else {
+ $this->errorMessage .= $errmsg." \r\n";
+ }
+ }
} else {
- $this->errorMessage .= $errmsg." \r\n";
+ //* Check content with regex, if we use php < 5.2
+ $ip_ok = 0;
+ if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
+ $ip_ok = 1;
+ }
+ if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+ $ip_ok = 1;
+ }
+ if($ip_ok == 0) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
+ } else {
+ $this->errorMessage .= $errmsg." \r\n";
+ }
+ }
}
}
}
diff --git a/interface/lib/classes/tpl_error.inc.php b/interface/lib/classes/tpl_error.inc.php
index 5f6360978c89b616843f6ebeb38f84802b84741f..a4095d8188fb038fbbba17b17cff40982ead8eac 100644
--- a/interface/lib/classes/tpl_error.inc.php
+++ b/interface/lib/classes/tpl_error.inc.php
@@ -31,7 +31,7 @@ class vlibTemplateError {
| DO NOT TOUCH ANYTHING IN THIS CLASS IT MAY NOT WORK OTHERWISE |
\-----------------------------------------------------------------------------*/
- function raiseError ($code, $level = null, $extra=null) {
+ public static function raiseError ($code, $level = null, $extra=null) {
if (!($level & error_reporting())&& $level != KILL) return; // binary AND checks for reporting level
$error_codes = array(
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index a0cf367882147075f889ca819eea34f3291130af..43b46498cb571c8be0fa01c2682f0fe4bd3f5610 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -132,4 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro
$wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
?>
-
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index f73f4e242d4a06613f1ca8f4ad66c5de329771bd..60e9bd30d14054f51dc58bfc7103c7e7ec9655b2 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -131,4 +131,6 @@ $wb['datalog_status_d_web_folder'] = 'Delete folder protection';
$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
+
+$wb['login_as_txt'] = 'Log in as';
?>
diff --git a/interface/web/admin/lib/lang/ar_login_as.lng b/interface/web/admin/lib/lang/ar_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/ar_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index 1ad2bd8275ba2005bfd40a23d9dba87bb03ba34b..ef609bb052cb6930a767f124bef92ea0472e19f5 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng
index 8abda49849acf86cf33f70782de639e659156719..2ed24d890c8f3b93f21f31e64faf98af4ef97cc7 100644
--- a/interface/web/admin/lib/lang/ar_users.lng
+++ b/interface/web/admin/lib/lang/ar_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/bg_login_as.lng b/interface/web/admin/lib/lang/bg_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/bg_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index d35ad21ab837e0b7a448117785d8b02648e1d323..5c2b5f6c5dc86a859578ec88e9001ef6182d40f7 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -170,7 +170,4 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
$wb['website_autoalias_note_txt'] = 'Placeholders:';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng
index b5dcbca37d74c03e0081e13fda4313e7fdc620de..c9522f4e3d1d942f0c11556688e81e8d32b14f0e 100644
--- a/interface/web/admin/lib/lang/bg_users.lng
+++ b/interface/web/admin/lib/lang/bg_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/br_login_as.lng b/interface/web/admin/lib/lang/br_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/br_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index 25026796ae10b98bcb78d496d139eb17bf692248..c7237996be76bf3f537b84ba23ac358110dce585 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng
index c5f3d07c410a53414b340c2b5739d803744e2886..34296eced6c61e6dd1528c051ed3850e6f984360 100644
--- a/interface/web/admin/lib/lang/br_users.lng
+++ b/interface/web/admin/lib/lang/br_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index 8c80d1292df23d3b0ef4b644253e0bee6e28ecff..23a64d8ba26d1f3c03cbb31b41ac6703509bd51e 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -49,4 +49,3 @@ $wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
$wb['Directive Snippets'] = 'Directive Snippets';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng
index 9a579d25e3b7a687d9b9ec7facc0a9cccbfddee9..085aec4d40d6de89f9eedf1b09b4fb95eb92de95 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -8,4 +8,3 @@ $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
index cf1bb28c772e72033df780efd24d61a186798c98..c8cedfe36d4dbd6b642e52f59afef7210336a23a 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -6,4 +6,3 @@ $wb['type_txt'] = 'Verze';
$wb['add_new_record_txt'] = 'Add Directive Snippet';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index df9386ae66d7115a96d5e49b44755f60caaa460d..abe744f065e18def6aa6d3d5720d1913365f5943 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -10,4 +10,3 @@ $wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolen
$wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng
index da1af438deb23ac2f7a8c6e5397b7a8797f04cd1..76ee5c0f76e6bf855067464871ec42a42dbd1401 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -7,4 +7,3 @@ $wb['udp_port_txt'] = 'Otevřené UDP porty';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng
index 0f1a6be926302278b2257ef58e0e2d132fe08e3e..b7bb634f5eaabfb3f2e3190777fbce6684282313 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -4,4 +4,3 @@ $wb['name_txt'] = 'Skupina';
$wb['name_err'] = 'Skupina musí mít min. 1, max. 30 znaků.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng
index f285b382b947dc2a29fc1a75f46e9b12014ae6ef..9bc2c9eb720bdd292f108967049a9ed63f6c3e08 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Přidat skupinu';
$wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index 4e2b8a4a3e76cf37d39e77bc2a8f8297875bf563..b7d736e15dd4d3fb02bffc6df466652d63439b93 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -2,14 +2,13 @@
$wb['server_id_txt'] = 'Server';
$wb['multiport_txt'] = 'Multi Port';
$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
+$wb['protocol_txt'] = 'Protokol';
+$wb['table_txt'] = 'Tabulka';
$wb['target_txt'] = 'Cíl';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
+$wb['state_txt'] = 'Stav';
+$wb['destination_ip_txt'] = 'Cílové adresy';
+$wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'Aktivní';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index 99dab0148f17ad4a25a9596288075ceabf4265a1..02177f6d996733c56ad3970b3ad2dc698b869b88 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -4,14 +4,13 @@ $wb['add_new_rule_txt'] = 'Add IPTables Rule';
$wb['server_id_txt'] = 'Server';
$wb['multiport_txt'] = 'Multi Port';
$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
+$wb['protocol_txt'] = 'Protokol';
+$wb['table_txt'] = 'Tabulka';
$wb['target_txt'] = 'Cíl';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
+$wb['state_txt'] = 'Stav';
+$wb['destination_ip_txt'] = 'Cílové adresy';
+$wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'Aktivní';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index d95f12eb35ecf997e55dc41e32c75ca4582a40e5..3af00bf303e5f15abc449cdb5e25fd8e45fc5ca8 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -7,4 +7,3 @@ $wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng
index eb222b3bd031ce42e91fbe2089a0b462587e4f52..5f1b2f75b11fcdc3bb910cb2c0c7fc018086045e 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -6,4 +6,3 @@ $wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng
index f880e6dbe71644cf41d9e852302867cbbd9e7084..086e166bbac2477df48a58d4b797241260005bc9 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -7,4 +7,3 @@ $wb['btn_save_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 7ffdccf5229e62c2ac1ea2487fdee62b07433b4f..54f138a2ea16aa69199ce70d023e2a584dd8e1d2 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -5,4 +5,3 @@ $wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru';
$wb['btn_cancel_txt'] = 'Zpět';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng
index 17dfa89aafad1c7318c66f0f2431106cfb9679c1..11e42f8041eef086acce587ebd60fa8c75ac58ec 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -7,4 +7,3 @@ $wb['btn_cancel_txt'] = 'Zpět';
$wb['ignore_version_txt'] = 'Přeskočit kontrolu verze ISPConfigu.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng
index 77810e0a759bcf331ae60e9dfda4073057dd5ace..49614e0529a3c16e4ee75bf6811a0e8d1450c842 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Jazykový soubor';
$wb['lang_file_date_txt'] = 'Poslední úprava';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/cz_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index 6f77e49079d71c3b8ad971912aa5868af0523401..aec170b2fba74aa358b62b9a7e1faeb40fad018b 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -6,4 +6,3 @@ $wb['repo_password_txt'] = 'Password (optional)';
$wb['active_txt'] = 'Aktivní';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index 561db1e89c10f41d107fbe24ad19008fa661ecc9..536ccfb357635150d618d05f6b991b613abf2640 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -11,4 +11,3 @@ $wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci';
$wb['ispconfig_update_text'] = 'Přihlaste se jako uživatel root na terminal (shell) serveru a proveďte příkaz
ispconfig_update.sh
spustí se ISPConfig aktualizace.
Klikněte zde pro podrobnější informace o provedení aktualizace';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng
index 4bb34c4d4aefe29a326dc044bb480299842c0ff4..d35c800c5cc89d159a19ed6aa94c6dc95ad3725a 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -46,4 +46,3 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng
index 1b40308735bbc3df08d0b6dd7488ae11d4196e67..c466a2a8b5c6ee6d135a528be50ac5287123becc 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Uživatel';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng
index 9d44fd27c840ef95abe4fea148e6c93572f5799d..ced7e5fb338875042032596af66a009161dcdc04 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -14,4 +14,3 @@ $wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 3696fedb8f0aaf29dcca53d614b47add02010d82..d0d7f488ca27975134e54d5e11670d7c61a935f5 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -9,14 +9,14 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'Website config adresář';
$wb['vhost_conf_dir_txt'] = 'Vhost config adresář';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled adresář';
-$wb['getmail_config_dir_txt'] = 'Getmail config adresář';
+$wb['getmail_config_dir_txt'] = 'Getmail složka pro konfigurace';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';
$wb['fastcgi_alias_txt'] = 'FastCGI alias';
-$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini cesta';
+$wb['fastcgi_phpini_path_txt'] = 'FastCGI cesta k adresáři kde je umístěn php.ini';
$wb['fastcgi_children_txt'] = 'FastCGI děti';
$wb['fastcgi_max_requests_txt'] = 'FastCGI max. požadavků';
-$wb['fastcgi_bin_txt'] = 'FastCGI bin';
+$wb['fastcgi_bin_txt'] = 'FastCGI cesta k binarnímu balíčku';
$wb['module_txt'] = 'Modul';
$wb['maildir_path_txt'] = 'Cesta k mail adresáři';
$wb['homedir_path_txt'] = 'Cesta k domácímu adresáři';
@@ -32,15 +32,15 @@ $wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
$wb['ip_address_txt'] = 'IP adresa';
$wb['netmask_txt'] = 'Maska';
$wb['gateway_txt'] = 'Brána';
-$wb['hostname_txt'] = 'Hostname';
-$wb['nameservers_txt'] = 'Jmenné servery';
+$wb['hostname_txt'] = 'Název hostitele (hostname)';
+$wb['nameservers_txt'] = 'Jmenné servery (DNS)';
$wb['auto_network_configuration_txt'] = 'Konfigurace sítě';
$wb['ip_address_error_wrong'] = 'Neplatný formát IP adresy.';
$wb['netmask_error_wrong'] = 'Neplatný formát síťové masky.';
$wb['gateway_error_wrong'] = 'Neplatný formát brány.';
-$wb['hostname_error_empty'] = 'Hostname je prázdný.';
+$wb['hostname_error_empty'] = 'Název hostitele (hostname) je prázdný.';
$wb['nameservers_error_empty'] = 'Jmenný server je prázdný.';
-$wb['config_dir_txt'] = 'Vlogger config adresář';
+$wb['config_dir_txt'] = 'Vlogger cesta k vlogger-dbi.conf';
$wb['init_script_txt'] = 'Název cron init skriptu';
$wb['crontab_dir_txt'] = 'Cesta k individuálním cron tabulkám';
$wb['wget_txt'] = 'Cesta k wget programu';
@@ -54,7 +54,7 @@ $wb['apps_vhost_servername_txt'] = 'Apps-vhost doména';
$wb['bind_user_txt'] = 'BIND uživatel';
$wb['bind_group_txt'] = 'BIND skupina';
$wb['bind_zonefiles_dir_txt'] = 'BIND adresář se zónovými soubory';
-$wb['named_conf_path_txt'] = 'BIND named.conf cesta';
+$wb['named_conf_path_txt'] = 'BIND named.conf cesta k souboru';
$wb['bind_user_error_empty'] = 'BIND uživatel je prázdný.';
$wb['bind_group_error_empty'] = 'BIND skupina je prázdná.';
$wb['bind_zonefiles_dir_error_empty'] = 'BIND adresář se zónovými soubory je prázdný.';
@@ -63,37 +63,37 @@ $wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local cesta je práz
$wb['mail_filter_syntax_txt'] = 'Syntaxe mailového filtru';
$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP démon';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['php_open_basedir_error_empty'] = 'PHP open_basedir ije prázdný.';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir je prázdný.';
$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride je prázdný.';
-$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
-$wb['awstats_data_dir_txt'] = 'awstats data folder';
-$wb['awstats_pl_txt'] = 'awstats.pl script';
-$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['awstats_conf_dir_txt'] = 'awstats složka pro konfigurace';
+$wb['awstats_data_dir_txt'] = 'awstats složka pro data';
+$wb['awstats_pl_txt'] = 'awstats.pl cesta ke skriptu';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl cesta ke skriptu';
$wb['backup_dir_txt'] = 'Adresář pro zálohy';
-$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
-$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
-$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
-$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
-$wb['CA_path_txt'] = 'CA Path';
-$wb['CA_pass_txt'] = 'CA passphrase';
-$wb['ufw_enable_txt'] = 'Enable';
-$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
-$wb['ufw_ipv6_txt'] = 'Enable IPv6';
-$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local cesta k souboru';
+$wb['php_ini_path_cgi_txt'] = 'Cesta k CGI php.ini';
+$wb['php_ini_path_apache_txt'] = 'Cesta k Apache php.ini';
+$wb['check_apache_config_txt'] = 'Provést test konfigurace apache před restartováním';
+$wb['CA_path_txt'] = 'CA cesta';
+$wb['CA_pass_txt'] = 'CA heslo';
+$wb['ufw_enable_txt'] = 'Aktivovat';
+$wb['ufw_manage_builtins_txt'] = 'Správa vestavěných pravidel';
+$wb['ufw_ipv6_txt'] = 'Aktivovat IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Standardní vstupní politika';
$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
-$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['ufw_log_level_txt'] = 'Úroveň logování';
$wb['network_config_warning_txt'] = 'Možnost konfigurace sítě je k dispozici pouze pro Debian a Ubuntu servery. Nepoužívejte tuto volbu, pokud vaše síťové rozhraní není eth0.';
$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
-$wb['server_type_txt'] = 'Server Type';
+$wb['server_type_txt'] = 'Typ serveru';
$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
$wb['nginx_user_txt'] = 'Nginx user';
$wb['nginx_group_txt'] = 'Nginx group';
$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
-$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['backup_dir_error_empty'] = 'Adresář se zálohou je prázdný.';
$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
@@ -143,11 +143,11 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
$wb['try_rescue_txt'] = 'Povolit monitorování služeb a restartovat při selhání';
-$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL sledování';
-$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail sledování';
-$wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes. if you do not wait 2-3 minutes, rescue will try to restart mysql!';
-$wb['enable_sni_txt'] = 'Enable SNI';
-$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD sledování';
+$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL monitorování';
+$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail monitorování';
+$wb['rescue_description_txt'] = 'Informace: Pokud chcete např. vypnout MySQL zatrhněte políčko \\"Zakázat MySQL monitorování\\" změna se provede do 2-3 minut. Pokud nepočkáte 2-3 minuty, monitorování restartuje mysql!!';
+$wb['enable_sni_txt'] = 'Aktivovat SNI (Server Name Indication)';
+$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD monitorování';
$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
@@ -159,20 +159,24 @@ $wb['backup_mode_userzip'] = 'Zálohování všech souborů v adresáři web jak
$wb['backup_mode_rootgz'] = 'Zálohování všech souborů v adresáři web jako uživatel root';
$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
$wb['realtime_blackhole_list_note_txt'] = '(Samostatná RBL se odděluje čárkou)';
-$wb['ssl_settings_txt'] = 'SSL Settings';
-$wb['permissions_txt'] = 'Permissions';
-$wb['php_settings_txt'] = 'PHP Settings';
-$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
-$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['ssl_settings_txt'] = 'SSL Nastavení';
+$wb['permissions_txt'] = 'Nastavit oprávnění';
+$wb['php_settings_txt'] = 'PHP Nastavení';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Nastavení';
+$wb['awstats_settings_txt'] = 'AWStats Nastavení';
$wb['firewall_txt'] = 'Firewall';
$wb['mailbox_quota_stats_txt'] = 'Statistika kvóty poštovní schránky';
-$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
+$wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
-$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
-$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi';
+$wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi';
$wb['v6_prefix_txt'] = 'IPv6 Prefix';
$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
+$wb['php_ini_check_minutes_txt'] = 'Check system php.ini files for changes each';
+$wb['php_ini_check_minutes_info_txt'] = 'minutes (0 disables checking)';
+$wb['php_ini_check_minutes_error_empty'] = 'Invalid value for php.ini checking.';
+$wb['sendmail_path_txt'] = 'Sendmail Path';
+$wb['sendmail_path_error_empty'] = 'Sendmail Path is empty.';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 8589dbc9d16f2eda14e03769bc6a2ffbc8a42371..9a56c34e2add4a15751ed65e019e80b7b2469858 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Konfigurace serveru';
$wb['server_name_txt'] = 'Server';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index 634898abfcdceffe572aa5caf4340289ba919a17..111286c418299750a039e78b241af9825eca8bbc 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -10,4 +10,3 @@ $wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng
index 2a47ca75917b4dde544382f9d99a027407c735b9..3aaa3abb098f39017b144d985827a1fd95e7ce89 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -9,4 +9,3 @@ $wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['ip_type_txt'] = 'Verze';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index e7a2efd805ccf0ac030968b53abd6251b3a7faac..437f376284d03b7c03ddccfbf69bac0e989cbc50 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -12,4 +12,3 @@ $wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 59cf3c7365046db053b32658451a67f21b2947a1..fc8f7ad4afb3c4a4c855ab7d5ea7d6b4d9f61399 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -15,4 +15,3 @@ $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng
index e0b43a4a996b6ebb49c9d231793446ebfcd73abc..25b95f9c4d7ec65e4b1abae68f3dcd06df5d33df 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -6,4 +6,3 @@ $wb['client_id_txt'] = 'Klient';
$wb['name_txt'] = 'Verze PHP';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index 1a9becc5f2465abd9912e903407ae8ce98a27fdf..d80ffa0476f58feb865b07d57ec32dbaf982ab4c 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -5,4 +5,3 @@ $wb['btn_save_txt'] = 'Start Installation';
$wb['btn_cancel_txt'] = 'Zrušit';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
index 80f729c9d50ddac0b850e5a7e5ba56b8c2651b29..2f1feced3782f994f1eec7266f34eca74d98c448 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -4,9 +4,8 @@ $wb['installed_txt'] = 'Stav';
$wb['package_title_txt'] = 'Balíček';
$wb['package_description_txt'] = 'Popis';
$wb['action_txt'] = 'Akce';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
+$wb['toolsarea_head_txt'] = 'Balíčky';
+$wb['repoupdate_txt'] = 'Aktualizace seznamu balíků';
+$wb['package_id_txt'] = 'místní App-ID';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index f48a2c4a363aff9694042db16e2ee7b71de90fc1..843bab668722c0404eef990059bca584a9abb9f4 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -6,4 +6,3 @@ $wb['repo_password_txt'] = 'Heslo (volitelné)';
$wb['active_txt'] = 'Aktivní';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
index 4ae3c662d86ab872011ea7f14dfd83e77d9468fe..d45b792fbcc0c14541b9df281aae1e38a101a791 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -5,4 +5,3 @@ $wb['repo_name_txt'] = 'Repozitář';
$wb['repo_url_txt'] = 'URL';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
index c1aa17fcdef8880c4521d7f802dd8c12b71283b8..f95d8c3159c648743fb083b5aded3ffee061cca2 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -7,4 +7,3 @@ $wb['version_txt'] = 'Verze';
$wb['action_txt'] = 'Akce';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 2b0a31739910c34210a9de8619f9cf673ca2ebdc..0b6479e599e0d5ff28b6423d90192a2e8534b87f 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -46,6 +46,8 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
$wb['use_loadindicator_txt'] = 'Use Load Indicator';
$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
+$wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox detail';
+$wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail';
+$wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
index edf66963d4555510e745627e697caedfc887a274..efecb6d979a0996d011b8f50768f5d8a344a1bb6 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -17,4 +17,3 @@ $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index 28bf9c9b2e396e60d7122d6159db038cd12d9779..0324f16a8ddafe265a26a433554d97a029b66fb6 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -29,7 +29,6 @@ $wb['generate_password_txt'] = 'Generovat heslo';
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\"';
+$wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\\"';
?>
-
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index 4e7e34c278476d0aab66310ec2029acf00fca76b..37b0e7e29b5c1e96a104e1393b8bca74a44319dc 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -1,11 +1,10 @@
VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!';
$wb['groups_txt'] = 'Skupiny';
?>
-
diff --git a/interface/web/admin/lib/lang/de_login_as.lng b/interface/web/admin/lib/lang/de_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..f905b45115ce496317ec18b4e0cede40b22ba8d8
--- /dev/null
+++ b/interface/web/admin/lib/lang/de_login_as.lng
@@ -0,0 +1,11 @@
+
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 670fbe02c514415c454dc9e2e2c400be8f487e5c..b08dc3b8bf583cb3439b6fe4fcc670c12983f4ba 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -170,9 +170,6 @@ $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren';
$wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)';
$wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Transfer Limits an den Administrator senden';
$wb['overtraffic_notify_client_txt'] = 'Überschreiten des Transfer Limits an den Kunden senden';
-$wb['v6_prefix_txt'] = 'IPv6 Präfix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 auf dem Mirror';
-$wb['v6_prefix_wrong'] = 'Falsches IPv6 Netzmasken Format.';
$wb['php_ini_check_minutes_txt'] = 'Prüfe System php.ini Dateien auf Änderungen alle';
$wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)';
$wb['php_ini_check_minutes_error_empty'] = 'Der Wert für die Einstellung der php.ini Prüfung ist ungültig.';
diff --git a/interface/web/admin/lib/lang/el_login_as.lng b/interface/web/admin/lib/lang/el_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/el_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index c580600fe737270d4453881559291d3d2dbc55b2..5768d3f79ce723603c35b1c77d2cf86117990727 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index 993d697b1e32d5a4c2a0c1df5c36a2f3deb88495..3323424f102fd37e0803c79f6a26da2faa77fbb4 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/en_login_as.lng b/interface/web/admin/lib/lang/en_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/en_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_login_as.lng b/interface/web/admin/lib/lang/es_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/es_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 9a25490c3208e10286cac55dd9a4d4c5a6fbc417..431076408815e39bbb64031b548af42ab5e13d78 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/es_users.lng b/interface/web/admin/lib/lang/es_users.lng
index eee23b1c5724dfd96e6a531e49347ea801b9b628..5a408e86f607dc85d152da787b8a7ec1c2c462cc 100644
--- a/interface/web/admin/lib/lang/es_users.lng
+++ b/interface/web/admin/lib/lang/es_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/fi_login_as.lng b/interface/web/admin/lib/lang/fi_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/fi_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 4865f2a9e868a90ec062a739a6c9aa4c3998e7bb..d56ca7508dd69dc16c6430c7f6538c39448ad1b4 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng
index c123ca998e4c5647c41c96cdc53bca1d49f1efb6..f19be64b79ffa039429d598e9f1872f61dce1fac 100755
--- a/interface/web/admin/lib/lang/fi_users.lng
+++ b/interface/web/admin/lib/lang/fi_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/fr_directive_snippets.lng b/interface/web/admin/lib/lang/fr_directive_snippets.lng
index ee40ab06f9c236b846ebe8daec35f7603aefe520..d836ab0da0d88fc0a5c4aa9e78eaa5b7d3fd557d 100644
--- a/interface/web/admin/lib/lang/fr_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/fr_directive_snippets.lng
@@ -1,9 +1,9 @@
\ No newline at end of file
+$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['snippet_txt'] = 'Snippet';
+$wb['active_txt'] = 'Active';
+$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
+$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
+?>
diff --git a/interface/web/admin/lib/lang/fr_directive_snippets_list.lng b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng
index 702e7e250480306e6f717010d84662c0e03d41e1..4124ea34641c48c25db6319110a5f119264242e6 100644
--- a/interface/web/admin/lib/lang/fr_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng
@@ -1,7 +1,7 @@
\ No newline at end of file
+$wb['list_head_txt'] = 'Directive Snippets';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
+?>
diff --git a/interface/web/admin/lib/lang/fr_login_as.lng b/interface/web/admin/lib/lang/fr_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/fr_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index ce25160f0e4e49fa698d5e85b67cc48748c62475..595596c60a9022f2049206fb828a33b0ce1e4e0d 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng
index 85e24cfc17697ac9c1020cc48bfa625f3c73ee2d..0d581155ed1438849726d52a8e508d9c5018f0ec 100644
--- a/interface/web/admin/lib/lang/fr_users.lng
+++ b/interface/web/admin/lib/lang/fr_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/hr_login_as.lng b/interface/web/admin/lib/lang/hr_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/hr_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index 79a0397aa7db2c6a5bafe0199535367c1529c7c5..5c9e7d0ed9fc2bf07d91bb6af40058f68070e517 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng
index 4f0f1e98441d035dc5f8a089ca3fccd385d49b54..ca9f3cb29ab54b97b06b8f007475da512382e684 100644
--- a/interface/web/admin/lib/lang/hr_users.lng
+++ b/interface/web/admin/lib/lang/hr_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/hu_login_as.lng b/interface/web/admin/lib/lang/hu_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/hu_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 7cb7938603593c3d55c99db861bdb09d697b5573..c3a6806a84a29fd5ecb0b38bca647037f66846e8 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng
index 9ffde2170187693adb895af091c68b426016b428..7d26ff9972af9e2b58d896ac81f11c8357a566f4 100644
--- a/interface/web/admin/lib/lang/hu_users.lng
+++ b/interface/web/admin/lib/lang/hu_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/id_login_as.lng b/interface/web/admin/lib/lang/id_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/id_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index c875b78122c680f2d167b159908a0fa904e51f94..34ea127fe85f82957fc0d617c7bdbd5f2693cbd3 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng
index 1703841da25107785a2bade411b99584d0230948..8766690a2be36f7bfb1c51cf371b0e0f1b8a2f0d 100644
--- a/interface/web/admin/lib/lang/id_users.lng
+++ b/interface/web/admin/lib/lang/id_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/it_login_as.lng b/interface/web/admin/lib/lang/it_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/it_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 0b5e31f45ca70cb63184e1d4cb1a02d61c9b07a8..9a32425b42486727067cd0160d7b690fbf4ab2d1 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng
index 3e141ed4362b1b08c8b922d9e18f6ddbdd341c77..3a42baaa244f8d99046535e850636422abf80f46 100644
--- a/interface/web/admin/lib/lang/it_users.lng
+++ b/interface/web/admin/lib/lang/it_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/ja_login_as.lng b/interface/web/admin/lib/lang/ja_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/ja_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 09536687f4ac1c0f4ac96dfef245ee977fe70fc3..2cd8c38a313481f65abc1731461de722861ae7cf 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng
index d70389fe8ae98d211a5ef554da9cfbe9d611f1e9..ea0db7ab41fe1e39956454a48540806d4e390123 100644
--- a/interface/web/admin/lib/lang/ja_users.lng
+++ b/interface/web/admin/lib/lang/ja_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/nl_login_as.lng b/interface/web/admin/lib/lang/nl_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/nl_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index f178da32a671a23e10e780e7b4f8791104684af9..4cb30925626acbf046cd805f9d641d2db976c899 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng
index 613802f16996fda8e04f2d6ca04bfdf2e19b3045..b65f9a5fa1f8c7bfe106a2eb97d34dc882c4718e 100644
--- a/interface/web/admin/lib/lang/nl_users.lng
+++ b/interface/web/admin/lib/lang/nl_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/pl_login_as.lng b/interface/web/admin/lib/lang/pl_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/pl_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 586a64e0fc5eb33c6f4eb2759d547d015d406814..ac1d280e28793b70ccc12c47d657e32b852df3c7 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index 477eab2c40f5c1b054494eff65c2362fc9dfd730..7fcc601446254aa0151fc7771c127203fcb6fa2d 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/pt_login_as.lng b/interface/web/admin/lib/lang/pt_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/pt_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index f434b0ffcb6aed9110c13b54000449fea6f67280..3470e28a722ce57ce2a86f6620948299ad80e6da 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng
index e09048d6c253dff318d7f160d4d58584934f40da..9aaa66350a9504ebcc90d02ca2a55b9850adfc7d 100644
--- a/interface/web/admin/lib/lang/pt_users.lng
+++ b/interface/web/admin/lib/lang/pt_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/ro_login_as.lng b/interface/web/admin/lib/lang/ro_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/ro_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 26f1b89cc612575d441ce46620ae9f73cd57c5e3..56ce46cc5a3c1c8636694784301fbb41bf57baf5 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng
index 8abda49849acf86cf33f70782de639e659156719..2ed24d890c8f3b93f21f31e64faf98af4ef97cc7 100644
--- a/interface/web/admin/lib/lang/ro_users.lng
+++ b/interface/web/admin/lib/lang/ro_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/ru_login_as.lng b/interface/web/admin/lib/lang/ru_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/ru_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 8745232546315d842d94ce5141ccbfb7ee1664e2..fd76bf6db6f590f7753bb83c6006b09fa7fd3176 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng
index 6156d22359f6bab93c0fc64affd3be1bb3056b16..495d9f1ca30321ca3a5cbd9dd0c52ff8c62a727b 100644
--- a/interface/web/admin/lib/lang/ru_users.lng
+++ b/interface/web/admin/lib/lang/ru_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/se_login_as.lng b/interface/web/admin/lib/lang/se_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/se_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 5baef7e364a0e5dc8f0a33e608679f61906d266a..0d16cedb90447ce3a59e4e6f1d8158d5df8adbb4 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng
index 5d92d301dfab5c05caa1c1f98e19efea36b373a0..76cb33ae8e1bb0ae7cb4ec822b9a40897adaa52f 100644
--- a/interface/web/admin/lib/lang/se_users.lng
+++ b/interface/web/admin/lib/lang/se_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/sk_login_as.lng b/interface/web/admin/lib/lang/sk_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/sk_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 92841b8c2da316c506b6336010682907a0ff9e25..d2f27c7cbe6d9cecbb6192e19388d02685582295 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng
index fc389c5562c146b393543aef4d36475d097fc8f1..aee901f21695c301a58161aba3393625e7e713b0 100644
--- a/interface/web/admin/lib/lang/sk_users.lng
+++ b/interface/web/admin/lib/lang/sk_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/lib/lang/tr_login_as.lng b/interface/web/admin/lib/lang/tr_login_as.lng
new file mode 100644
index 0000000000000000000000000000000000000000..88d4850c12bcc82b681e6983d5dc108588d20a8c
--- /dev/null
+++ b/interface/web/admin/lib/lang/tr_login_as.lng
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index c8972108735e28ec2acc81b05d667dc078ba3f2a..a94949020185fd8a7a2bf89cd27a4d49aa1a6311 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['v6_prefix_txt'] = 'IPv6 Prefix';
-$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
-$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/lib/lang/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng
index 455d8c7987898c3f9f9a1b8f6c8704efd95d260b..3508a832f865edcc735e56e53fe9eca61eb63934 100644
--- a/interface/web/admin/lib/lang/tr_users.lng
+++ b/interface/web/admin/lib/lang/tr_users.lng
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
?>
diff --git a/interface/web/admin/login_as.php b/interface/web/admin/login_as.php
index 6c6b48788f3cd08e7409cdaa36aea16b95970163..f7103b7aad5d187c4a3b495fd2f08af9cdd7d8d3 100644
--- a/interface/web/admin/login_as.php
+++ b/interface/web/admin/login_as.php
@@ -67,10 +67,14 @@ $dbData = $app->db->queryOneRecord(
* Now generate the login-Form
* TODO: move the login_as form to a template file -> themeability
*/
+
+ $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_login_as.lng';
+include($lng_file);
+
echo '
- Do you want to login as user ' . $dbData['username'] . '?
- If you do so, you can "go back" by clicking at logout.
+ '.$wb['login_1_txt'].' ' . $dbData['username'] . '?
+ '.$wb['login_2_txt'].'
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/remote_action_osupdate.htm b/interface/web/admin/templates/remote_action_osupdate.htm
index 05f2b296362fa8f5efd4cb2a163f6d1907561a4b..b941b83ca864569dbea3d14450f156b511b93691 100644
--- a/interface/web/admin/templates/remote_action_osupdate.htm
+++ b/interface/web/admin/templates/remote_action_osupdate.htm
@@ -7,7 +7,7 @@
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index f86de154c1c8ccf4fd23653729429a3335128fa7..14f211e00139c1f1d906984fad300cc897f37b52 100644
--- a/interface/web/client/client_del.php
+++ b/interface/web/client/client_del.php
@@ -112,7 +112,7 @@ class page_action extends tform_actions {
- function onAfterDelete() {
+ function onBeforeDelete() {
global $app, $conf;
$client_id = $app->functions->intval($this->dataRecord['client_id']);
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index aab26b28fd1883dd218030375f479f41af8c57d3..9732186e82d4508f85646e97c50f94d639e066c3 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 5b4e19ad6621a5685fd1801e4ea6599043748cbe..8e16a792bcd5fd1ea36221e1ec117bc048ba49c0 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index bbdcb0c692b11f8f8f338d7c937d63da6a8730ed..f50fa77fff6de0564ad0d7beb3bec29d1f60097e 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index 9c1d91cc2010a9df662ca6da90746e2f23d4c8e0..fa1c78df750a6461120bf2a67bd24d66758f86b8 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -24,4 +24,3 @@ $wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu';
$wb['error_client_group_id_empty'] = 'Musíte vybrat zákazníka ';
?>
-
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 12da7e8da9e36a4ab3cabe46e3f2d5af51215e08..66bb8d12e3a54f1acbf65569b2b88d0136d18173 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -1,18 +1,18 @@
-
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index cb4b143b114e60231c13db1cf3d87a356df4f1fc..c47f934f6f86156d57ed89c30aa2b7fbcec17c0d 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -8,4 +8,3 @@ $wb['description_txt'] = 'Popis';
$wb['active_txt'] = 'Aktivní';
?>
-
diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng
index 24025510de0da4c0ceaab32d786f5f6cd745d297..5895f82defae91090208bd4556bc92458262d846 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -9,4 +9,3 @@ $wb['delete_txt'] = 'Smazat';
$wb['active_txt'] = 'Aktivní';
?>
-
diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng
index a759ab6a94569eb0c497af259e4aec514c85e54c..f564b37a15425053e118edf16ae077508846cc0d 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -5,4 +5,3 @@ $wb['btn_save_txt'] = 'Smazat klienta';
$wb['btn_cancel_txt'] = 'Zrušit bez smazání klienta';
?>
-
diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng
index f1c3870bca3595faf7e29e788e4eb23b92c6ea5d..401908daedf9dd902937b3ae44b6faebc856e22c 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -17,4 +17,3 @@ $wb['all_clients_txt'] = 'Všichni klienti';
$wb['variables_txt'] = 'Výběr (možnosti):';
?>
-
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 9f5ad6cff00457e5704a48e85ff78d42c7013ecc..8c3aac87e144adc413992d39b1ddf3778c96ece5 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -1,14 +1,14 @@
-
diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng
index 7d9e9238d4865d4f0b51de4badc40c8621104f39..bd2b066c39827f87bf487bc8b9fac6049b212a9a 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -4,4 +4,3 @@ $wb['template_type_txt'] = 'Typ';
$wb['template_name_txt'] = 'Název šablony';
?>
-
diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng
index aad49997e4bc1032db38afd437ef70005a3e292b..bceac34bc8cedbed12afded909dc1fabee7abff3 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -6,8 +6,7 @@ $wb['contact_name_txt'] = 'Název kontaktu';
$wb['city_txt'] = 'Město';
$wb['country_txt'] = 'Stát';
$wb['add_new_record_txt'] = 'Přidat klienta';
-$wb['username_txt'] = 'Username';
-$wb['customer_no_txt'] = 'Customer No.';
+$wb['username_txt'] = 'Uživatelské jméno';
+$wb['customer_no_txt'] = 'Zákaznické číslo';
?>
-
diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng
index 26117aef5ffb3841ebc4bede418151191ecbd7e4..09e1d8e22d708170d1e6b9a131d023d7ce474aa8 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -5,4 +5,3 @@ $wb['domain_error_regex'] = 'This domain-name is not allowed';
$wb['Domain'] = 'Doména';
?>
-
diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng
index 924f5de13ba108ddbf48262e77c37fefa7704d7c..88df8383cd78044fb5a03d33331b6f38df5325af 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -1,8 +1,7 @@
-
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index af56780a3fe98b2526c5868e4f7fa64b36b606f7..c860b6694eca22e62394502343f20e164f0b1c32 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -1,17 +1,17 @@
0';
-$wb['limit_web_quota_txt'] = 'Web kvóta';
+$wb['limit_web_quota_txt'] = 'Webová kvóta';
$wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
$wb['customer_no_txt'] = 'Zákaznické číslo';
$wb['vat_id_txt'] = 'DIČ';
$wb['required_fields_txt'] = '* Povinná pole';
-$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
+$wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
+$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailových konferencí';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
+$wb['limit_openvz_vm_txt'] = 'Max. počet virtuálních serverů';
$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
@@ -109,36 +109,35 @@ $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one
$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
$wb['add_additional_template_txt'] = 'Přidat dodatečnou šablonu';
$wb['delete_additional_template_txt'] = 'Smazat dodatečnou šablonu';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
+$wb['limit_cgi_txt'] = 'CGI - dostupná volba pro klienta';
+$wb['limit_ssi_txt'] = 'SSI - dostupná volba pro klienta';
+$wb['limit_perl_txt'] = 'Perl - dostupná volba pro klienta';
+$wb['limit_ruby_txt'] = 'Ruby - dostupná volba pro klienta';
+$wb['limit_python_txt'] = 'Python - dostupná volba pro klienta';
+$wb['force_suexec_txt'] = 'SuEXEC - povinné pro klienta';
+$wb['limit_hterror_txt'] = 'Vlastní Error (chybové) dokumenty';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta';
+$wb['web_limits_txt'] = 'Webové limity';
+$wb['email_limits_txt'] = 'E-mailové limity';
+$wb['database_limits_txt'] = 'Databázové limity';
+$wb['cron_job_limits_txt'] = 'Cron pracovní limity';
+$wb['dns_limits_txt'] = 'DNS limity';
+$wb['virtualization_limits_txt'] = 'Virtualizace limity';
$wb['generate_password_txt'] = 'Generovat heslo';
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['email_error_isemail'] = 'Please enter a valid email address.';
-$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
-$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
+$wb['customer_no_error_unique'] = 'Zákaznické číslo musí být jedinečné (nebo prázdné).';
+$wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mail addresu.';
+$wb['paypal_email_txt'] = 'PayPal e-mail';
+$wb['company_id_txt'] = 'IČO';
+$wb['bank_account_number_txt'] = 'Číslo účtu';
+$wb['bank_account_owner_txt'] = 'Bankovní účet vlastníka';
+$wb['bank_code_txt'] = 'Kód banky';
+$wb['bank_name_txt'] = 'Název banky';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
?>
-
diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng
index 31226ce87a5bd29516f9fa0b2942e42ba0d31483..859c97f1c278162e0c07398229f1549123b2f0e9 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -6,8 +6,7 @@ $wb['contact_name_txt'] = 'Název kontaktu';
$wb['city_txt'] = 'Město';
$wb['country_txt'] = 'Stát';
$wb['add_new_record_txt'] = 'Přidat distributora';
-$wb['customer_no_txt'] = 'Customer No.';
-$wb['username_txt'] = 'Username';
+$wb['customer_no_txt'] = 'Zákaznické číslo';
+$wb['username_txt'] = 'Uživatelské jméno';
?>
-
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 1f752efd9f9497b1a1942fba1d0007e84b004e41..586c8b80a9a9f7c7728867c5c71e9f5feae0f428 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -139,5 +139,5 @@ $wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder
$wb['email_error_isemail'] = 'Bitte geben Sie eine gültige Email-Adresse an.';
$wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal-E-Mail-Adresse an.';
$wb['paypal_email_txt'] = 'PayPal-E-Mail';
-$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht \"Custom\" gewählt ist.';
+$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht \\"Custom\\" gewählt ist.';
?>
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 641746e48031b6d193bbcdf7e349939d9bf63efe..27d5531f489f6d2a9048fade25b45fc481e82b77 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index c9255e86002f2971e8dda07f501b1b6cef6ce10b..1bb597150cf20bcd7fa2b9cba3c081457eff4eae 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index 5908aa9c8b4247f9b231329a364f9350c2d82ad9..b83d912d28a0a8a05b767b38cb44d4c550de5fe4 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 7a174e80f78654080cf927b9ac01eea5f38e69c2..cb8ef3861aab726a150a678380ac0038f0543085 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index d6f3f76c3bc21c37938890b30798b644f1345a74..105715d81c44d157e0441a6d20f9945135934784 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index 5c7668fc03c14acbfb5635cc7de07fa58169a530..f9834008cd79c96919dfd4677e5cfb2481cdd8c8 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index a346cd8b034ea372b57bef9fc744a27040bfe6e0..2b87ab26bcf6e9012ccf9911c6d92f7103b5fb51 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 9312ada5512686bd84d7f5bd025e183776e70a7f..aa7dee3bfcf82dce162d5cd263888654fbfb1a47 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index 74aa3409e89a62956924e3e2c80da7679c2c6ffe..ab212ee35c586eb296153b23ecc7425e90a4c93b 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 62e43bc3322066ed5f031ff247e7093714cf71d1..f0ffa3f398d9d277015eb4cacc79a1072a694b26 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index b7a5d339f5e914b25dead8b10e1ddf0c08ec5499..2d7aade174e877fe1bb7f9926654936f8612f1c1 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index 30283d5f2aebb876004daa18ec82b5b0ed3b2193..340a24300304a1096d7a83f93994dd56aff11962 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index f091e85a8d92a80586fe4332586c2aed8f9a698f..bbce82597ec203f123d2911739f30a1e75a2b1fb 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 5c3a63037f1fe836d0a59dd5c100cb91f05c714a..5893a19285844cefe37927d1cd7a987704ae1705 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index ce964232d9157eb3e8ed3ce96ac9c0dd22206f33..910caea924e662e3088fdbde64b76c7b09b8aee6 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index 01e9f4d62d54eecd80a92e47006ad0c3eeb6f295..91afc026b7143c64807199a29cc8d83eea0a5c61 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 9c058f40899320685d02eb7c2453e973fe3c27bf..866a5f43a1b51a11568c2788af4ffd5b0882a076 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -139,5 +139,5 @@ $wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
?>
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm
index 036f38d9fcaed0dba9b1af3030c2bcb35126145e..a0d7991d9efd0c9d6777d2b1454a7a2f269db849 100644
--- a/interface/web/client/templates/client_circle_list.htm
+++ b/interface/web/client/templates/client_circle_list.htm
@@ -46,6 +46,11 @@
-
-
\ No newline at end of file
+
diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm
index 950c1679b1136c1fe60ef7e287793ec7e5ddb3b3..298b9073bba44607228b4b40aea37b1393d3c2d8 100644
--- a/interface/web/help/templates/help_faq_sections_list.htm
+++ b/interface/web/help/templates/help_faq_sections_list.htm
@@ -35,6 +35,11 @@
+
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 1fee3c03b13e19b1067e34fecafd988fc8b8ff1c..5ade79bf642c04d97d0a65a08f73804ad4a25cc3 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -24,7 +24,7 @@ $wb['Status of services'] = 'Stav služeb';
$wb['No Refresh'] = 'Neobnovovat';
$wb['minutes'] = 'minut';
$wb['Show Overview'] = 'Zobrazit přehled';
-$wb['System State (All Servers)'] = 'Stav systému (všechny servery)';
+$wb['System State (All Servers)'] = 'Stav systému (servery)';
$wb['Hardware-Information'] = 'Informace o hardwaru';
$wb['Show CPU info'] = 'Zobrazit CPU informace';
$wb['Server State'] = 'Stav serveru';
@@ -134,13 +134,13 @@ $wb['monitor_title_raidstate_txt'] = 'Stav pole RAID';
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter log';
$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban log';
$wb['monitor_updates_nosupport_txt'] = 'Vaše distribuce nepodporuje toto monitorování';
-$wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID. We cant find any of them at your server.
This means we can not support your RAID yet.';
-$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok';
+$wb['monitor_nosupportedraid1_txt'] = 'V současné době, podporujeme nástroje mdadm nebo MPT-stav pro sledování sofwarových RAID polí. Nemůžeme najít žádné z nich na serveru.
To znamená, že nemůžeme monitorovat váš RAID.';
+$wb['monitor_serverstate_beancounterok_txt'] = 'Soubor čítačů (limitů) je v pořádku';
$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter';
-$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter';
-$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter';
-$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter';
-$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
+$wb['monitor_serverstate_beancounterwarning_txt'] = 'Některé čítače (limity) vykazují selhání.';
+$wb['monitor_serverstate_beancountercritical_txt'] = 'Existuje mnoho selhání čítačů (limitů)';
+$wb['monitor_serverstate_beancountererror_txt'] = 'Existuje příliš mnoho selhání čítačů (limitů)';
+$wb['monitor_title_beancounter_txt'] = 'OpenVz VE čítače (limity)';
$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information';
$wb['monitor_title_iptables_txt'] = 'IPTables Pravidla';
$wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log';
@@ -148,4 +148,3 @@ $wb['Show IPTables'] = 'Zobrazit IPTables pravidla';
$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
?>
-
diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng
index 70adcad1abbc69fd737747fa997e6c4ce912c68d..29d8cbb448aac6ac01e0976ca67a10ddb0d1cdba 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -7,4 +7,3 @@ $wb['action_txt'] = 'Akce';
$wb['status_txt'] = 'Stav';
?>
-
diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng
index 85cd4b3b01cfd8a0eab279a97fd323850924ae07..864232ed0d2a22df2a4478c85f0ed1963ff03c15 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -6,4 +6,3 @@ $wb['loglevel_txt'] = 'Logovací úroveň';
$wb['message_txt'] = 'Zpráva';
?>
-
diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm
index ac9a8c0077b9c949297203cb9b0898f1db18cfa5..480aa94712d0845a5dc805d5d752facca61f8936 100644
--- a/interface/web/monitor/templates/datalog_list.htm
+++ b/interface/web/monitor/templates/datalog_list.htm
@@ -36,6 +36,11 @@
+
+
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index b6ac8c3c28e4c8ce2027ee1275a4b90a6c9ce1b1..bf02a7bc460337cc1f2f60493853a08892c04042 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -41,6 +41,24 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Allow from all
+# Allow access to mailman on OpenSuSE
+
+ AllowOverride All
+ order allow,deny
+ allow from all
+
+
+
+ order allow,deny
+ allow from all
+
+
+
+ Options +FollowSymLinks
+ order allow,deny
+ allow from all
+
+
# allow path to awstats and alias for awstats icons
Order allow,deny
diff --git a/server/conf/apps_php_fpm_pool.conf.master b/server/conf/apps_php_fpm_pool.conf.master
index 2cc72583ce476ec0cf1a707b5a645def55c4330c..ce6a92fcfba48ab25848ab56ce763634fd01544e 100644
--- a/server/conf/apps_php_fpm_pool.conf.master
+++ b/server/conf/apps_php_fpm_pool.conf.master
@@ -10,9 +10,9 @@ group = {fpm_group}
pm = dynamic
pm.max_children = 50
-pm.start_servers = 20
-pm.min_spare_servers = 5
-pm.max_spare_servers = 35
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 5
chdir = /
diff --git a/server/conf/index/robots.txt b/server/conf/index/robots.txt
index eb0536286f3081c6c0646817037faf5446e3547d..7d329b1db3f0b9383f111d23fc0c945b7e957017 100644
--- a/server/conf/index/robots.txt
+++ b/server/conf/index/robots.txt
@@ -1,2 +1 @@
User-agent: *
-Disallow:
diff --git a/server/conf/mm_cfg.py.master b/server/conf/mm_cfg.py.master
index 9ec47a727ea678448d6eaed24fd56fdda2d4c17d..3dcf5a6a6156f50ce3feba2a3518d0ab40853a5d 100644
--- a/server/conf/mm_cfg.py.master
+++ b/server/conf/mm_cfg.py.master
@@ -102,5 +102,7 @@ POSTFIX_STYLE_VIRTUAL_DOMAINS = [{virtual_domains}]
# http://www.jamesh.id.au/articles/mailman-spamassassin/
# GLOBAL_PIPELINE.insert(1, 'SpamAssassin')
+POSTFIX_MAP_CMD = '/etc/mailman/virtual_to_transport.sh'
+
# Note - if you're looking for something that is imported from mm_cfg, but you
# didn't find it above, it's probably in /usr/lib/mailman/Mailman/Defaults.py.
\ No newline at end of file
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 6045087aa5ab8f262143215de610b64f672c2bd9..a89468e6560342e1353e3aeaac2dd0e3c1bb35c9 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -495,6 +495,13 @@ foreach($records as $rec) {
exec('rm -f '.$logfile);
}
+//* Delete old logfiles in /var/log/ispconfig/httpd/ that were created by vlogger for the hostname of the server
+exec('hostname -f', $tmp_hostname);
+if($tmp_hostname[0] != '' && is_dir('/var/log/ispconfig/httpd/'.$tmp_hostname[0])) {
+ exec('cd /var/log/ispconfig/httpd/'.$tmp_hostname[0]."; find . -mtime +30 -name '*.log' | xargs rm > /dev/null 2> /dev/null");
+}
+unset($tmp_hostname);
+
#######################################################################################################
// Rotate the ispconfig.log file
#######################################################################################################
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 005bd1abe35ae7f319df0116ee77b068fc22594e..09d6640e11cc18b88ea124a7ce64f6760d6f00de 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -45,6 +45,7 @@ class db extends mysqli
public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location
public $show_error_messages = false; // false in server, true in interface
+ private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
// constructor
public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL) {
@@ -59,11 +60,20 @@ class db extends mysqli
$this->dbClientFlags = $conf['db_client_flags'];
parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
- if ($this->connect_error) {
+ $try = 0;
+ while(!is_null($this->connect_error) && $try < 10) {
+ if($try > 8) sleep(5);
+ elseif($try > 0) sleep(1);
+
+ $try++;
$this->updateError('DB::__construct');
- } else {
- $this->setCharacterEncoding();
+
+ parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
}
+
+ if(is_null($this->connect_error)) $this->isConnected = true;
+
+ $this->setCharacterEncoding();
}
public function __destruct() {
@@ -79,7 +89,7 @@ class db extends mysqli
public function updateError($location) {
global $app;
- if($this->connect_error) {
+ if(!is_null($this->connect_error)) {
$this->errorNumber = $this->connect_errno;
$this->errorMessage = $this->connect_error;
} else {
@@ -103,22 +113,24 @@ class db extends mysqli
}
private function setCharacterEncoding() {
+ if($this->isConnected == false) return false;
parent::query( 'SET NAMES '.$this->dbCharset);
parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
}
public function query($queryString) {
+ if($this->isConnected == false) return false;
$try = 0;
do {
$try++;
- $ok = parent::ping();
+ $ok = $this->ping();
if(!$ok) {
- if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
+ if(!$this->real_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName)) {
if($try > 9) {
$this->updateError('DB::query -> reconnect');
return false;
} else {
- sleep(1);
+ sleep(($try > 7 ? 5 : 1));
}
} else {
$this->setCharacterEncoding();
@@ -468,7 +480,7 @@ public function toLower($record) {
// gibt Array mit Tabellennamen zur�ck
public function getTables($database_name = '') {
-
+ if($this->isConnected == false) return false;
if($database_name == '') $database_name = $this->dbName;
$result = parent::query("SHOW TABLES FROM $database_name");
for ($i = 0; $i < $result->num_rows; $i++) {
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index ce29432b6f2db3d1f6f8294b075fd12123e5291b..57ab22cb31a0ecae778f780aa054fb97e033bc22 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -183,13 +183,11 @@ class modules {
if($replication_error == false) {
if(is_array($data['old']) || is_array($data['new'])) {
+ $app->db->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf['server_id']);
$this->raiseTableHook($d['dbtable'],$d['action'],$data);
} else {
$app->log('Data array was empty for datalog_id '.$d['datalog_id'],LOGLEVEL_WARN);
}
- //$this->raiseTableHook($d["dbtable"],$d["action"],$data);
- //$app->dbmaster->query("DELETE FROM sys_datalog WHERE datalog_id = ".$d["datalog_id"]);
- //$app->log("Deleting sys_datalog ID ".$d["datalog_id"],LOGLEVEL_DEBUG);
$app->dbmaster->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf['server_id']);
$app->log('Processed datalog_id '.$d['datalog_id'],LOGLEVEL_DEBUG);
} else {
diff --git a/server/lib/classes/tpl_error.inc.php b/server/lib/classes/tpl_error.inc.php
index d15b80a2ca183e2c50c4caadf8cfa9edeb445412..171a04f8bfd04591577da5be4b01a7df456e765c 100644
--- a/server/lib/classes/tpl_error.inc.php
+++ b/server/lib/classes/tpl_error.inc.php
@@ -31,7 +31,7 @@ class vlibTemplateError {
| DO NOT TOUCH ANYTHING IN THIS CLASS IT MAY NOT WORK OTHERWISE |
\-----------------------------------------------------------------------------*/
- function raiseError ($code, $level = null, $extra=null) {
+ public static function raiseError ($code, $level = null, $extra=null) {
if (!($level & error_reporting())&& $level != KILL) return; // binary AND checks for reporting level
$error_codes = array(
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7c0e7f96194f03290a07fadde7214a4903617a68..1892db178d3367a9c6b4fddcb840dab50c1775a0 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -332,7 +332,17 @@ class apache2_plugin {
if(trim($data["new"]["ssl_request"]) != '') $app->system->file_put_contents($csr_file,$data["new"]["ssl_request"]);
if(trim($data["new"]["ssl_cert"]) != '') $app->system->file_put_contents($crt_file,$data["new"]["ssl_cert"]);
if(trim($data["new"]["ssl_bundle"]) != '') $app->system->file_put_contents($bundle_file,$data["new"]["ssl_bundle"]);
- if(trim($data["new"]["ssl_key"]) != '') $app->system->file_put_contents($key_file2,$data["new"]["ssl_key"]);
+
+ //* Write the key file, if field is empty then import the key into the db
+ if(trim($data["new"]["ssl_key"]) != '') {
+ $app->system->file_put_contents($key_file2,$data["new"]["ssl_key"]);
+ } else {
+ $ssl_key2 = $app->db->quote($app->system->file_get_contents($key_file2));
+ /* Update the DB of the (local) Server */
+ $app->db->query("UPDATE web_domain SET ssl_key = '$ssl_key2' WHERE domain = '".$data['new']['domain']."'");
+ /* Update also the master-DB of the Server-Farm */
+ $app->dbmaster->query("UPDATE web_domain SET ssl_key = '$ssl_key2' WHERE domain = '".$data['new']['domain']."'");
+ }
/* Update the DB of the (local) Server */
$app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
@@ -509,41 +519,45 @@ class apache2_plugin {
//* Remove protection of old folders
$app->system->web_folder_protection($data['old']['document_root'],false);
-
- //* Move the site data
- $tmp_docroot = explode('/',$data['new']['document_root']);
- unset($tmp_docroot[count($tmp_docroot)-1]);
- $new_dir = implode('/',$tmp_docroot);
-
- $tmp_docroot = explode('/',$data['old']['document_root']);
- unset($tmp_docroot[count($tmp_docroot)-1]);
- $old_dir = implode('/',$tmp_docroot);
-
- //* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path
- if(@is_dir($data['new']['document_root'])) {
- $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d'));
- $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d'),LOGLEVEL_DEBUG);
- }
-
- //* Create new base directory, if it does not exist yet
- if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir);
- exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir));
- //$app->system->rename($data['old']['document_root'],$new_dir);
- $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG);
-
- // Handle the change in php_open_basedir
- $data['new']['php_open_basedir'] = str_replace($data['old']['document_root'],$data['new']['document_root'],$data['old']['php_open_basedir']);
-
- //* Change the owner of the website files to the new website owner
- exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir);
-
- //* Change the home directory and group of the website user
- $command = 'usermod';
- $command .= ' --home '.escapeshellcmd($data['new']['document_root']);
- $command .= ' --gid '.escapeshellcmd($data['new']['system_group']);
- $command .= ' '.escapeshellcmd($data['new']['system_user']);
- exec($command);
-
+
+ if($data["new"]["type"] != "vhostsubdomain") {
+ //* Move the site data
+ $tmp_docroot = explode('/',$data['new']['document_root']);
+ unset($tmp_docroot[count($tmp_docroot)-1]);
+ $new_dir = implode('/',$tmp_docroot);
+
+ $tmp_docroot = explode('/',$data['old']['document_root']);
+ unset($tmp_docroot[count($tmp_docroot)-1]);
+ $old_dir = implode('/',$tmp_docroot);
+
+ //* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path
+ if(@is_dir($data['new']['document_root'])) {
+ $app->system->web_folder_protection($data['new']['document_root'],false);
+ $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'));
+ $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'),LOGLEVEL_DEBUG);
+ }
+
+ //* Create new base directory, if it does not exist yet
+ if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir);
+ $app->system->web_folder_protection($data['old']['document_root'],false);
+ exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir));
+ //$app->system->rename($data['old']['document_root'],$new_dir);
+ $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG);
+
+ // Handle the change in php_open_basedir
+ $data['new']['php_open_basedir'] = str_replace($data['old']['document_root'],$data['new']['document_root'],$data['old']['php_open_basedir']);
+
+ //* Change the owner of the website files to the new website owner
+ exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir);
+
+ //* Change the home directory and group of the website user
+ $command = 'usermod';
+ $command .= ' --home '.escapeshellcmd($data['new']['document_root']);
+ $command .= ' --gid '.escapeshellcmd($data['new']['system_group']);
+ $command .= ' '.escapeshellcmd($data['new']['system_user']);
+ exec($command);
+ }
+
if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
//* Change the log mount
@@ -911,6 +925,13 @@ class apache2_plugin {
$master_php_ini_path = $web_config['php_ini_path_cgi'];
}
}
+
+ //* Add php.ini to the path in case that the master_php_ini_path is a directory
+ if($master_php_ini_path != '' && is_dir($master_php_ini_path) && is_file($master_php_ini_path.'/php.ini')) {
+ if(substr($master_php_ini_path,-1) == '/') $master_php_ini_path = substr($master_php_ini_path,0,-1);
+ $master_php_ini_path .= '/php.ini';
+ }
+
if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
$php_ini_content .= $app->system->file_get_contents($master_php_ini_path)."\n";
}
@@ -1197,6 +1218,7 @@ class apache2_plugin {
if(trim($data['new']['fastcgi_php_version']) != ''){
$default_fastcgi_php = false;
list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version']));
+ if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir);
if(substr($custom_fastcgi_php_ini_dir,-1) != '/') $custom_fastcgi_php_ini_dir .= '/';
} else {
$default_fastcgi_php = true;
@@ -1506,7 +1528,7 @@ class apache2_plugin {
$app->system->web_folder_protection($data['new']['document_root'],false);
$app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file);
$app->system->web_folder_protection($data['new']['document_root'],true);
- $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0750);
+ $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0755);
unset($htp_file);
}
}
@@ -2743,6 +2765,17 @@ class apache2_plugin {
$client_dir = $web_config['website_basedir'].'/clients/client'.$client_id;
if(is_dir($client_dir) && !stristr($client_dir,'..')) {
+ // remove symlinks from $client_dir
+ $files = array_diff(scandir($client_dir), array('.','..'));
+ if(is_array($files) && !empty($files)){
+ foreach($files as $file){
+ if(is_link($client_dir.'/'.$file)){
+ unlink($client_dir.'/'.$file);
+ $app->log('Removed symlink: '.$client_dir.'/'.$file,LOGLEVEL_DEBUG);
+ }
+ }
+ }
+
@rmdir($client_dir);
$app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 1c37a5a8101e77701ff654d6564b15685877a13f..7fa3570e36570fab5d498d3410161b0da670fd8b 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -446,12 +446,14 @@ class nginx_plugin {
//* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path
if(@is_dir($data['new']['document_root'])) {
- $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d'));
- $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d'),LOGLEVEL_DEBUG);
+ $app->system->web_folder_protection($data['new']['document_root'],false);
+ $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'));
+ $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'),LOGLEVEL_DEBUG);
}
//* Create new base directory, if it does not exist yet
if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir);
+ $app->system->web_folder_protection($data['old']['document_root'],false);
exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir));
//$app->system->rename($data['old']['document_root'],$new_dir);
$app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG);
@@ -2439,6 +2441,17 @@ class nginx_plugin {
$client_dir = $web_config['website_basedir'].'/clients/client'.$client_id;
if(is_dir($client_dir) && !stristr($client_dir,'..')) {
+ // remove symlinks from $client_dir
+ $files = array_diff(scandir($client_dir), array('.','..'));
+ if(is_array($files) && !empty($files)){
+ foreach($files as $file){
+ if(is_link($client_dir.'/'.$file)){
+ unlink($client_dir.'/'.$file);
+ $app->log('Removed symlink: '.$client_dir.'/'.$file,LOGLEVEL_DEBUG);
+ }
+ }
+ }
+
@rmdir($client_dir);
$app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
}
diff --git a/server/server.php b/server/server.php
index be710eec66e24118323dd0725b0c230275c6b5ea..e669c6ecc554a541a36c206b8c5002155015fa83 100644
--- a/server/server.php
+++ b/server/server.php
@@ -45,7 +45,13 @@ if ($app->dbmaster->connect_error == NULL) {
if(!is_array($server_db_record)) die('Unable to load the server configuration from database.');
- $conf['last_datalog_id'] = (int) $server_db_record['updated'];
+ //* Get the number of the last processed datalog_id, if the id of the local server
+ //* is > then the one of the remote system, then use the local ID as we might not have
+ //* reached the remote server during the last run then.
+ $local_server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE server_id = " . $conf['server_id']);
+ $conf['last_datalog_id'] = (int) max($server_db_record['updated'],$local_server_db_record['updated']);
+ unset($local_server_db_record);
+
$conf['mirror_server_id'] = (int) $server_db_record['mirror_server_id'];
// Load the ini_parser