diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 6cb47183d95dc9ee13e73651e67630db4364de88..4efb6fc3b12abba34e08d3445c6b46e254d0dc2c 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -865,11 +865,11 @@ class installer_dist extends installer_base {
if($conf['nginx']['installed'] == true){
$command = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- if(is_user('ispapps')){
+ //if(is_user('ispapps')){
// Allow the ispapps vhost access to /etc/squirrelmail
- $command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- }
+ //$command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
+ //caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ //}
if(is_group('ispapps')){
$command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 5aa5de18ff5c28339a69a73a4ac85d2abeee65cc..ffe5ef2c26a5744c0ed79035838e3bf5d2c3b18a 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -653,6 +653,7 @@ class installer extends installer_base
if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
$fpm_socket = $socket_dir.'apps.sock';
+ $cgi_socket = escapeshellcmd($conf['nginx']['cgi_socket']);
$content = str_replace('{apps_vhost_ip}', $apps_vhost_ip, $content);
$content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
@@ -660,6 +661,7 @@ class installer extends installer_base
$content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
//$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
$content = str_replace('{fpm_socket}', $fpm_socket, $content);
+ $content = str_replace('{cgi_socket}', $cgi_socket, $content);
wf($vhost_conf_dir.'/apps.vhost', $content);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 232efe761155f6cf4058a28700b4a6178952f83e..b0cbfd650e4b637333f5e6d1ebcb3b05213f639c 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1500,6 +1500,7 @@ class installer_base {
if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
$fpm_socket = $socket_dir.'apps.sock';
+ $cgi_socket = escapeshellcmd($conf['nginx']['cgi_socket']);
$content = str_replace('{apps_vhost_ip}', $apps_vhost_ip, $content);
$content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
@@ -1507,6 +1508,7 @@ class installer_base {
$content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
//$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
$content = str_replace('{fpm_socket}', $fpm_socket, $content);
+ $content = str_replace('{cgi_socket}', $cgi_socket, $content);
wf($vhost_conf_dir.'/apps.vhost', $content);
diff --git a/install/sql/incremental/upd_0026.sql b/install/sql/incremental/upd_0026.sql
new file mode 100644
index 0000000000000000000000000000000000000000..b5787a925ee3e1c9432e51313bc6945c8987c2f5
--- /dev/null
+++ b/install/sql/incremental/upd_0026.sql
@@ -0,0 +1 @@
+ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 96d04f6dbef4b55f1f0bce6b0d7d3c0cb442431a..ff5b2ef9c9fa59e7c0cd4224970b7d8ccc4c1b69 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1026,7 +1026,7 @@ CREATE TABLE `shell_user` (
`shell` varchar(255) NOT NULL default '/bin/bash',
`dir` varchar(255) default NULL,
`chroot` varchar(255) NOT NULL,
- `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
+ `ssh_rsa` text NOT NULL,
PRIMARY KEY (`shell_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index d2517f2dc963f4931288a20dc8b4aa22245be80b..99d4402c476a4f0a6b92e1f5d156ed82bca5c72c 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -122,7 +122,7 @@ $conf['init_scripts'] = '/etc/init.d';
//** Interface
-$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';
+$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools,help';
//** Demo mode
/* The demo mode is an option to restrict certain actions in the interface like
diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
index c7e58a3a2c6665f52b1221b8ffab3bf5c6014890..9de75dde6d5dc41e1778f52c4b02923c1f8f02ae 100644
--- a/install/tpl/nginx_apps.vhost.master
+++ b/install/tpl/nginx_apps.vhost.master
@@ -38,9 +38,15 @@ server {
try_files $uri =404;
root /usr/share/;
include /etc/nginx/fastcgi_params;
- fastcgi_pass unix:{fpm_socket};
+ # To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
+ fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $request_filename;
+ fastcgi_param PATH_INFO $fastcgi_script_name;
+ fastcgi_buffer_size 128k;
+ fastcgi_buffers 256 4k;
+ fastcgi_busy_buffers_size 256k;
+ fastcgi_temp_file_write_size 256k;
}
location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
root /usr/share/;
@@ -57,9 +63,15 @@ server {
try_files $uri =404;
root /usr/share/;
include /etc/nginx/fastcgi_params;
- fastcgi_pass unix:{fpm_socket};
+ # To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
+ fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $request_filename;
+ fastcgi_param PATH_INFO $fastcgi_script_name;
+ fastcgi_buffer_size 128k;
+ fastcgi_buffers 256 4k;
+ fastcgi_busy_buffers_size 256k;
+ fastcgi_temp_file_write_size 256k;
}
location ~* ^/squirrelmail/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
root /usr/share/;
@@ -68,4 +80,24 @@ server {
location /webmail {
rewrite ^/* /squirrelmail last;
}
+
+ location /cgi-bin/mailman {
+ root /usr/lib/;
+ fastcgi_split_path_info (^/cgi-bin/mailman/[^/]*)(.*)$;
+ include /etc/nginx/fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+ fastcgi_intercept_errors on;
+ fastcgi_pass unix:{cgi_socket};
+ }
+
+ location /images/mailman {
+ alias /usr/share/images/mailman;
+ }
+
+ location /pipermail {
+ alias /var/lib/mailman/archives/public;
+ autoindex on;
+ }
}
\ No newline at end of file
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index d7a27e01a7d92c5542a5e80bb4fe66cd98d82197..8817e00031551256fb14dc07401772999d247a4a 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -103,7 +103,7 @@ wget=/usr/bin/wget
[rescue]
try_rescue=n
-do_not_try_rescue_apache=n
+do_not_try_rescue_httpd=n
do_not_try_rescue_mysql=n
do_not_try_rescue_mail=n
diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php
index 52ba34ca57e9ef9cb1d7440878c43551a3b681d9..43538d6b09399ca1972b5aedf101156dca976020 100644
--- a/interface/lib/classes/custom_datasource.inc.php
+++ b/interface/lib/classes/custom_datasource.inc.php
@@ -63,6 +63,31 @@ class custom_datasource {
return $records_new;
}
+ function webdav_domains($field, $record) {
+ global $app, $conf;
+
+ $servers = $app->db->queryAllRecords("SELECT * FROM server WHERE active = 1 AND mirror_server_id = 0");
+ $server_ids = array();
+ $app->uses('getconf');
+ if(is_array($servers) && !empty($servers)){
+ foreach($servers as $server){
+ $web_config = $app->getconf->get_server_config($server['server_id'], 'web');
+ if($web_config['server_type'] != 'nginx') $server_ids[] = $server['server_id'];
+ }
+ }
+ $server_ids = implode(',', $server_ids);
+ $records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND server_id IN (".$server_ids.") AND ".$app->tform->getAuthSQL('r')." ORDER BY domain");
+
+ $records_new = array();
+ if(is_array($records)) {
+ foreach($records as $rec) {
+ $key = $rec['domain_id'];
+ $records_new[$key] = $rec['domain'];
+ }
+ }
+ return $records_new;
+ }
+
function client_servers($field, $record) {
global $app, $conf;
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index f55df7b6a900f6ffad36a1079bd33aaee432301d..a5843d660329b03fbcd5babfce6dcb8ee5d25e3f 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -282,7 +282,7 @@ class listform {
public function decode($record)
{
global $conf, $app;
- if(is_array($record)) {
+ if(is_array($record) && count($record) > 0) {
foreach($this->listDef['item'] as $field){
$key = $field['field'];
if(isset($record[$key])) {
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 70d6652080f31030b4f2b31bd1c7d510edbf7a15..a35aca9257c2fddd7305983edf3568d92a69ee7d 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -86,15 +86,17 @@ class listform_actions {
$rec['bgcolor'] = $this->DataRowColor;
//* substitute value for select fields
- foreach($app->listform->listDef['item'] as $field) {
- $key = $field['field'];
- if(isset($field['formtype']) && $field['formtype'] == 'SELECT') {
- if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') {
- // Set a additional image variable for bolean fields
- $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png';
+ if(is_array($app->listform->listDef['item']) && count($app->listform->listDef['item']) > 0) {
+ foreach($app->listform->listDef['item'] as $field) {
+ $key = $field['field'];
+ if(isset($field['formtype']) && $field['formtype'] == 'SELECT') {
+ if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') {
+ // Set a additional image variable for bolean fields
+ $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png';
+ }
+ //* substitute value for select field
+ $rec[$key] = @$field['value'][$rec[$key]];
}
- //* substitute value for select field
- $rec[$key] = @$field['value'][$rec[$key]];
}
}
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 0dfed21eda0454888a0ce409e359e9883f39ecfc..c3e0697c2499c2606d73d02db90a65e41744aae1 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1353,6 +1353,12 @@ class remoting {
if($params['system_user'] == '') $params['system_user'] = '-';
if($params['system_group'] == '') $params['system_group'] = '-';
+ //* Set a few defaults for nginx servers
+ if($params['pm_max_children'] == '') $params['pm_max_children'] = 1;
+ if($params['pm_start_servers'] == '') $params['pm_start_servers'] = 1;
+ if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1;
+ if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1;
+
$domain_id = $this->insertQuery('../sites/form/web_domain.tform.php',$client_id,$params, 'sites:web_domain:on_after_insert');
if ($readonly === true)
$app->db->query("UPDATE web_domain SET `sys_userid` = '1' WHERE domain_id = ".$domain_id);
@@ -2521,8 +2527,8 @@ class remoting {
return false;
}
$client_id = intval($client_id);
- $sql = "SELECT database_id, database_name, database_user, database_password FROM web_database WHERE sys_userid = $client_id ";
- $all = $app->db->queryAllRecords($sql);
+ $sql = "SELECT d.database_id, d.database_name, d.database_user, d.database_password FROM web_database d INNER JOIN sys_user s on(d.sys_groupid = s.default_group) WHERE client_id = $client_id";
+ $all = $app->db->queryAllRecords($sql);
return $all;
}
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
index 820a6899d014e319089577c66141d10c705fc79b..937d88a3e6783270871f5da8406660daa56f976d 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -33,6 +33,12 @@ $wb['top_menu_domain'] = 'Domene';
$wb['top_menu_dashboard'] = 'Početna';
$wb['toolsarea_head_txt'] = 'Postavke';
$wb['latest_news_txt'] = 'Vijesti';
+$wb['error_301'] = 'Ne možete koristiti ovaj modul.';
+$wb['error_302'] = 'Greška u modulu.';
+$wb['error_1001'] = 'Korisničko ime i šifra ne mogu biti prazni!';
+$wb['error_1002'] = 'Korisničko ime i/ili šifra nisu ispravni!';
+$wb['error_1003'] = 'Korisničko ime je deaktivirano!';
+$wb['top_menu_vm'] = 'VServer';
$wb['daynamesmin_su'] = 'Su';
$wb['daynamesmin_mo'] = 'Mo';
$wb['daynamesmin_tu'] = 'Tu';
@@ -61,10 +67,4 @@ $wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['error_301'] = 'Module not permitted for the current user.';
-$wb['error_302'] = 'Module invalid.';
-$wb['error_1001'] = 'The username and password cannot be empty !';
-$wb['error_1002'] = 'The username and/or password are not correct !';
-$wb['error_1003'] = 'The username is deactivated!';
-$wb['top_menu_vm'] = 'VServer';
?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index db062caaf35f676186230e603b2b094ed7075b99..772267ac07e69f2890bfd9c482da11aae4cf7d36 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -1,20 +1,15 @@
'0',
'value' => array(0 => 0,1 => 1)
),
- 'proxy_server' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'CHECKBOX',
- 'default' => '0',
- 'value' => array(0 => 0,1 => 1)
- ),
- 'firewall_server' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'CHECKBOX',
- 'default' => '0',
- 'value' => array(0 => 0,1 => 1)
- ),
'mirror_server_id' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 1c4683171623eb2e2d922cff54d8903f3124121d..f9ec365db0f3d2ecf9efd78dd11ed017b7b6b7e5 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -1053,7 +1053,7 @@ $form["tabs"]['rescue'] = array(
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
- 'do_not_try_rescue_apache' => array(
+ 'do_not_try_rescue_httpd' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index 2588921d7e7619783dc62a90aa23c3077f50b37d..44f4f74f4ea65b8ea950a83ed8461dd7df61d957 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 629d48d5beedbc8d57e7157ee5830a9100c7d54f..1d570d4c984b209156d354d80795659c94e574b6 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index ca63e458c2820977c86176d1f0f7c454dca534ae..64f7056ef7637a8ae2d390a11ab565d30907c7e4 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index a805edbc511d05f1aa8cf6a30aa59f6c0018e607..2518aba18b8e9e3e2237d3697434f25f9fd40e1d 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 55552b05b4c51a9d23ba9420b22772620d6a3167..71bc79fb14eb83edbd9eeb8b9720c924dc5956cc 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -143,10 +143,10 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM Socket-Verzeichnis';
$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM Socket-Verzeichnis ist leer.';
$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
$wb['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.';
-$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
-$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
-$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
-$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['try_rescue_txt'] = 'Aktiviere Service Monitoring und Neustart bei Unerreichbarkeit';
+$wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring';
+$wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere Email Monitoring';
+$wb['rescue_description_txt'] = 'Information: Falls Sie MySQL stoppen möchten, wählen Sie die "Deaktiviere MySQL Monitoring" Checkbox und warten Sie 2-3 Minuten. Falls Sie nicht 2-3 Minuten warten, wird Rescue versuchen, MySQL neu zu starten!';
$wb['enable_sni_txt'] = 'Enable SNI';
?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 88399a345fffb0633153c66d0b73a0d9f3999ff0..8a9096c32a0b87f5ae0eabc9cf8c233b012a72b8 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 956abdd818fedcf591a3734b93e15c04c9d0de8b..b3e9f60a0d6df9678e5897ee34a7d9ee424ca4e1 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -144,10 +144,10 @@ $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"] = 'Enable service monitoring and restart on failure';
-$wb["do_not_try_rescue_apache_txt"] = 'Disable apache monitoring';
+$wb["do_not_try_rescue_httpd_txt"] = 'Disable HTTPD monitoring';
$wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
$wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring';
-$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["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["realtime_blackhole_list_txt"] = 'Real-time Blackhole List';
$wb["realtime_blackhole_list_note_txt"] = '(Separate RBL\'s with commas)';
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index aca475c021fcd4ccaad1e128711b84e1b6fe4525..38e83cf43b10949cbd22ff8aadc2e8a02d09b4e1 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 74abf1b2423e7ee1a2a409fca1b7e608f27d127f..d04966ba270a490fd694e1dd112cd1d99634f958 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 926a632bcd0cef96431b74ea8cdfcc61b85ae8a9..f6437c1dd64aa6db24bede53b56a20f6a8ef2107 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/hr.lng b/interface/web/admin/lib/lang/hr.lng
index ca775c5b016aaa1845f0ddcb0644aa6f6296f135..0f6e4717f6dc1c483517a31b6f3bb06db317008e 100644
--- a/interface/web/admin/lib/lang/hr.lng
+++ b/interface/web/admin/lib/lang/hr.lng
@@ -1,43 +1,43 @@
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index ce5c505de01d2eb8ce5f31587784ed2f49466b73..3110f4f488dbf0377d3c64525dec1a629f3ae9c7 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 0f701237ff277f7ec66097027982f823d4a4b27c..6a1c67e35157b6d652c29522a64faf39960edc75 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 30482632f34fcb7a5b6f79820a7018836c553f96..cab99a14fa5b5d17a97ce08878e3911de593ac1d 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/it.lng b/interface/web/admin/lib/lang/it.lng
index b9000c05caf1885936b27913b5987620a5d4d6d9..884dd8afa170e63c7af8df7a95ec63b4ac86b62f 100644
--- a/interface/web/admin/lib/lang/it.lng
+++ b/interface/web/admin/lib/lang/it.lng
@@ -1,4 +1,6 @@
diff --git a/interface/web/admin/lib/lang/it_firewall.lng b/interface/web/admin/lib/lang/it_firewall.lng
index c58341df892d70b42cf4ec15676075ad0d4b7e6e..6a7ae5e3c226b358132e8613802c34228cf80962 100644
--- a/interface/web/admin/lib/lang/it_firewall.lng
+++ b/interface/web/admin/lib/lang/it_firewall.lng
@@ -5,7 +5,7 @@ $wb['udp_port_txt'] = 'Apri porte UDP';
$wb['tcp_port_help_txt'] = 'Separate dalla virgola';
$wb['udp_port_help_txt'] = 'Separate dalle virgola';
$wb['active_txt'] = 'Attivo';
-$wb['firewall_error_unique'] = 'Cè già un record firewall per questo server.';
+$wb['firewall_error_unique'] = 'Cé già un record firewall per questo server.';
$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
?>
diff --git a/interface/web/admin/lib/lang/it_firewall_list.lng b/interface/web/admin/lib/lang/it_firewall_list.lng
index 24a34be1c121271493b5c469f3defce76a660523..b812994c632aef9531f57f69508327eadf12bc4b 100644
--- a/interface/web/admin/lib/lang/it_firewall_list.lng
+++ b/interface/web/admin/lib/lang/it_firewall_list.lng
@@ -1,8 +1,8 @@
diff --git a/interface/web/admin/lib/lang/it_groups_list.lng b/interface/web/admin/lib/lang/it_groups_list.lng
index f1d8e2c1a33b92ad997cc3373de412aacf5202dc..c4650da01fd9534c7ad3c14e3d00fc3b4a7d6f1a 100644
--- a/interface/web/admin/lib/lang/it_groups_list.lng
+++ b/interface/web/admin/lib/lang/it_groups_list.lng
@@ -1,7 +1,7 @@
WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['list_head_txt'] = 'Gruppi utenti sistema';
+$wb['description_txt'] = 'Descrizione';
+$wb['name_txt'] = 'Gruppo';
+$wb['add_new_record_txt'] = 'Aggiungi nuovo gruppo';
+$wb['warning_txt'] = 'ATTENZIONE: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
?>
diff --git a/interface/web/admin/lib/lang/it_language_complete.lng b/interface/web/admin/lib/lang/it_language_complete.lng
index b5200ff9df30536d461edf601236bc2e91112af7..84e629e100b9045109a31dbcce899f0377fb44df 100644
--- a/interface/web/admin/lib/lang/it_language_complete.lng
+++ b/interface/web/admin/lib/lang/it_language_complete.lng
@@ -2,6 +2,6 @@
$wb['list_head_txt'] = 'Merge the selected language file with the english master language file. This adds missing strings from the english master language files to the selected language.';
$wb['language_select_txt'] = 'Select language';
$wb['btn_save_txt'] = 'Merge files now';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['btn_cancel_txt'] = 'Annulla';
$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. This adds missing strings from the english master language files to the selected language.';
?>
diff --git a/interface/web/admin/lib/lang/it_language_edit.lng b/interface/web/admin/lib/lang/it_language_edit.lng
index 4c50e883e6933c8a9449319b4524216e9adac9f5..242642432cbcb5ad30302674e3a21f3e3d506929 100644
--- a/interface/web/admin/lib/lang/it_language_edit.lng
+++ b/interface/web/admin/lib/lang/it_language_edit.lng
@@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Language file editor';
$wb['language_select_txt'] = 'Select language';
$wb['module_txt'] = 'Module';
$wb['lang_file_txt'] = 'Language file';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['btn_save_txt'] = 'Salva';
+$wb['btn_cancel_txt'] = 'Annulla';
?>
diff --git a/interface/web/admin/lib/lang/it_language_export.lng b/interface/web/admin/lib/lang/it_language_export.lng
index f45d47b17c7e0e208e49a14fdabe76ed41f52367..bce6b70bf2aae47c05bc79710bddca4817d3ad26 100644
--- a/interface/web/admin/lib/lang/it_language_export.lng
+++ b/interface/web/admin/lib/lang/it_language_export.lng
@@ -2,5 +2,5 @@
$wb['list_head_txt'] = 'Export language files';
$wb['language_select_txt'] = 'Select language';
$wb['btn_save_txt'] = 'Export the selected language file set';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['btn_cancel_txt'] = 'Annulla';
?>
diff --git a/interface/web/admin/lib/lang/it_language_import.lng b/interface/web/admin/lib/lang/it_language_import.lng
index 4c31ec3de3606dcb7aebf451f711ff2dd41a8981..97625572386d8b9b6135a1cbe28842ea19c3c7dc 100644
--- a/interface/web/admin/lib/lang/it_language_import.lng
+++ b/interface/web/admin/lib/lang/it_language_import.lng
@@ -1,8 +1,8 @@
diff --git a/interface/web/admin/lib/lang/it_package_install.lng b/interface/web/admin/lib/lang/it_package_install.lng
index 574dd1162989badc8499f5af31451a43673bf4da..6218f7959064d2cc6d387da98ad61f6f5071b8d2 100644
--- a/interface/web/admin/lib/lang/it_package_install.lng
+++ b/interface/web/admin/lib/lang/it_package_install.lng
@@ -1,7 +1,7 @@
diff --git a/interface/web/admin/lib/lang/it_remote_user_list.lng b/interface/web/admin/lib/lang/it_remote_user_list.lng
index 152a75fba4c8917a1829b6960df7291e583d34a7..4d7c70c3c68d4389880c11354839dd5afd4f9719 100644
--- a/interface/web/admin/lib/lang/it_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/it_remote_user_list.lng
@@ -1,7 +1,7 @@
diff --git a/interface/web/admin/lib/lang/it_server.lng b/interface/web/admin/lib/lang/it_server.lng
index abf8de2956acb347c1a9415b84e72d4c475fa6e4..18966e4a438728fdf6cc7e18518f0ae3e58539cc 100644
--- a/interface/web/admin/lib/lang/it_server.lng
+++ b/interface/web/admin/lib/lang/it_server.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 6904e797d01f5b28820887e605a19a34cf06714d..b9ba257a8854a92d33823c320c2f9c391459ee8c 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -4,7 +4,6 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
$wb['website_path_txt'] = 'Website path';
$wb['website_symlinks_txt'] = 'Website symlinks';
-$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
@@ -70,11 +69,11 @@ $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['backup_dir_txt'] = 'Backup directory';
+$wb['backup_dir_txt'] = 'Directory di backup';
$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['php_ini_path_cgi_txt'] = 'Percorso php.ini CGI';
+$wb['php_ini_path_apache_txt'] = 'Percorso php.ini apache';
+$wb['check_apache_config_txt'] = 'Testa al riavvio la configurazione di apache';
$wb['ufw_enable_txt'] = 'Enable';
$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
$wb['ufw_ipv6_txt'] = 'Enable IPv6';
@@ -83,6 +82,7 @@ $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['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
$wb['CA_path_txt'] = 'CA Path';
$wb['CA_pass_txt'] = 'CA passphrase';
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
-$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['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';
?>
diff --git a/interface/web/admin/lib/lang/it_server_ip.lng b/interface/web/admin/lib/lang/it_server_ip.lng
index 88d8a2f6043c7655289f1cc985fa40a20aa36393..86758810bdf5c165baf3305fa355ad8eeab0f79f 100644
--- a/interface/web/admin/lib/lang/it_server_ip.lng
+++ b/interface/web/admin/lib/lang/it_server_ip.lng
@@ -1,9 +1,9 @@
diff --git a/interface/web/admin/lib/lang/it_software_update_list.lng b/interface/web/admin/lib/lang/it_software_update_list.lng
index d45ee9ac47f6dc3a1b7da4c2afb11b24cc5b1709..0a1819661c1424de55aa590caa052a084143af5d 100644
--- a/interface/web/admin/lib/lang/it_software_update_list.lng
+++ b/interface/web/admin/lib/lang/it_software_update_list.lng
@@ -1,8 +1,8 @@
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index dd5b9f3dc8035ef43761fd9ef522ba8ac543ead3..b263405cb6a898734e1c7a900c5f64920f993545 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -1,9 +1,9 @@
diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng
index 8e70364aa7e32dfaa3066c953250a7af61b1bdfe..ed49fa9b81fc1519e6a6d8655ccbf63a96ecbcc2 100644
--- a/interface/web/admin/lib/lang/it_users.lng
+++ b/interface/web/admin/lib/lang/it_users.lng
@@ -1,28 +1,28 @@
diff --git a/interface/web/admin/lib/lang/it_users_list.lng b/interface/web/admin/lib/lang/it_users_list.lng
index 35598d33fff7ebc527da1b652f070ee1329b362a..fdee4eb06fb322a90731efea10c96659e8b05c75 100644
--- a/interface/web/admin/lib/lang/it_users_list.lng
+++ b/interface/web/admin/lib/lang/it_users_list.lng
@@ -5,5 +5,5 @@ $wb['name_txt'] = 'Nome';
$wb['vorname_txt'] = 'Cognome';
$wb['ort_txt'] = 'Città';
$wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = 'WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = 'ATTENZIONE: non editare o modificare alcuna impostazione utente in questa schermata. Usare piuttosto le impostazioni Cliente/Rivenditore del modulo Clienti. Modificare Utenti o gruppi in questa schermata può provocare la perdita di dati.';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 98cb5d1ff8eb307657dcac42e0ed114d8963f263..778009ec67eb2f45f86ad7eaaf2bf5d4597b6a6c 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 51ea4235ea38b8ca66b4c0e943c7eef7fb9dfe66..ac60ba57d8bf35ef01bc2071bbc3ea6fde553f08 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 6a84e037c255bd430d6423041e2eee5536e0b947..28d888bfbb70386a694bd0a0819d032643745d4b 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 850a99eb46f3c080916f96444021a9307c422c6a..642d0c92130b3279a5b8e9691c337a6f489411d1 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 440df7c0354345d6c2fd77124ba2eff896835edd..dd7a521ac7a60a324db64117e062dbbab0c830ce 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 125de99291260755320b36c0c2bbd2e3df726398..87e40efbd5f64ae407278d17a007f7bc980cd460 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 629d48d5beedbc8d57e7157ee5830a9100c7d54f..1d570d4c984b209156d354d80795659c94e574b6 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index ebb685927de133f4b15f68a63670a5575df3753e..69308b986186a6992266ecde2c1d9469fa41a016 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index f4d29a7215dbf96d484313311421ce1f58d7ea10..fd0f14717d3b47c0608d136243023ab66c08df56 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -144,9 +144,9 @@ $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'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
$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'] = 'Disable HTTPD monitoring';
?>
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
index d03b389e2ad60a8404581ab64e956d6b689eec33..12dd2375679e12c39edebf6d715759f1125ad66a 100644
--- a/interface/web/admin/templates/language_export.htm
+++ b/interface/web/admin/templates/language_export.htm
@@ -7,7 +7,7 @@